Merge branch 'wwz' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb

src/views/invoicing/components/operatingDetail.vue

@@ -13,6 +13,13 @@
                         <span v-if="tableData.detail.subType==-1">-</span> {{ scope.row.number }} {{ scope.row.unitName }}
                     </template>
                 </el-table-column>
+                <el-table-column label="现有库存" prop="number">
+                    <template v-slot="scope">
+                        {{ returnNowHasNumbr( scope.row)}}
+                       
+                        <!-- {{ scope.row.stockNumber*1 + scope.row.number*1   }} {{ scope.row.unitName }} -->
+                    </template>
+                </el-table-column>
             </el-table>
         </div>
         <div class="head-container">
@@ -43,6 +50,10 @@ export default {
         }
     },
     methods: {
+        //返回现有库存数量
+        returnNowHasNumbr(row){
+            return  row.stockNumber*1 + row.number*1 +row.unitName
+        },
         show(id) {
             this.dialogVisible = true
             this.getTableData(id)

src/views/invoicing/goods_stoks.vue

@@ -96,7 +96,7 @@
             </el-table>
         </div>
         <div class="head-container">
-            <el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
+            <el-pagination @size-change="paginationSizeChange" :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
                 @current-change="paginationChange" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
         </div>
         <invoicingDetail ref="invoicingDetail" />
@@ -149,7 +149,7 @@ export default {
             warnLine: null, // 警戒线
             tableData: {
                 page: 0,
-                size: 5,
+                size: 10,
                 total: 0,
                 sort: 'id',
                 loading: false,
@@ -297,8 +297,16 @@ export default {
                 console.log(error);
             }
         },
+        // 每页条数改变是回调
+        paginationSizeChange(e){
+            console.log(e);
+            this.tableData.size = e
+            this.getTableData()
+
+        },
         // 分页回调
         paginationChange(e) {
+            console.log(e)
             this.tableData.page = e - 1
             this.tableData.list = []
             this.getTableData()