【修改】bug

src/views/supply/deliver/sum_list.vue

@@ -205,6 +205,11 @@
             <el-table-column align="left" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip>
             </el-table-column>
 
+            <el-table-column align="right" label="未出库数量" prop="compute_wckNum" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ comRefundableQty(scope.row.type, scope.row.salesExamineStatus, scope.row) }}
+              </template>
+            </el-table-column>
             <el-table-column align="right" label="发货数量" prop="refundableQty" min-width="100" show-overflow-tooltip>
             </el-table-column>
             <el-table-column align="right" label="发货金额" prop="payAmount" min-width="100" show-overflow-tooltip>
@@ -238,11 +243,6 @@
                 {{ scope.row.payAmount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="未出库数量" prop="" min-width="100" show-overflow-tooltip>
-              <template slot-scope="scope">
-                {{ comRefundableQty(scope.row.type, scope.row.salesExamineStatus, scope.row) }}
-              </template>
-            </el-table-column>
             <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip>
             </el-table-column>
 
@@ -270,13 +270,13 @@
             </el-table-column>
             <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="200" show-overflow-tooltip>
             </el-table-column>
-            <el-table-column align="left" label="打印次数" prop="printNum" min-width="200" show-overflow-tooltip>
+            <el-table-column align="left" label="打印次数" prop="printNum" min-width="100" show-overflow-tooltip>
             </el-table-column>
-            <el-table-column align="left" label="经销商现金钱包" prop="customerWalletName" min-width="200"
+            <el-table-column align="left" label="经销商现金钱包" prop="customerWalletName" min-width="120"
               show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="经销商返利钱包" prop="customerWalletName2" min-width="200"
+            <el-table-column align="left" label="经销商返利钱包" prop="customerWalletName2" min-width="120"
               show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="200" show-overflow-tooltip>
+            <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="100" show-overflow-tooltip>
             </el-table-column>
 
 
@@ -499,6 +499,7 @@ export default {
         if(newValue && newValue.length) {
           newValue.forEach((item, index) => {
             this.dataList[index].compute_zkeAmount = item.totalDiscAmount + item.payRebateAmount;
+            this.dataList[index].compute_wckNum = this.comRefundableQty(item.type, item.salesExamineStatus, item);
           })
         }
       },
@@ -605,7 +606,7 @@ export default {
       getSumList(params).then((res) => {
         res.data.records.forEach(item => {
           item.notOutNumber = item.salesStatus ? 0 : item.refundableQty;
-          item.sums1 = ['refundableQty'];
+          item.sums1 = ['refundableQty', 'compute_wckNum'];
           item.sums2 = ['payAmount', 'payRebateAmount', 'discAmount', 'totalDiscAmount', 'singlePayPrice', 'compute_zkeAmount'];
         })
         this.dataList = res.data.records;

src/views/supply/engin/engin_list.vue

@@ -132,7 +132,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="经销商编码" sortable prop="customerNumber" min-width="100" show-overflow-tooltip>
+            <el-table-column align="left" label="经销商编码" sortable prop="customerNumber" min-width="110" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerNumber" />
                 <span>{{scope.row.customerNumber}}</span>
@@ -173,27 +173,24 @@
             </el-table-column>
             <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="数量" prop="qty" min-width="100" sortable show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="已订数量" prop="hasOrderQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="可订数量" prop="compute_kdQty" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ computeAllowQty(scope.row.qty, scope.row.hasOrderQty)}}
+              </template>
+            </el-table-column>
             <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
-
               <template slot-scope="scope">
                 {{scope.row.price | numToFixed}}
               </template>
             </el-table-column>
             <el-table-column align="right" label="金额" prop="totalAmount" min-width="100" sortable show-overflow-tooltip>
-
               <template slot-scope="scope">
                 {{scope.row.totalAmount | numToFixed}}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="已订数量" prop="hasOrderQty" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="可订数量" prop="compute_kdQty" min-width="100" show-overflow-tooltip>
-
-              <template slot-scope="scope">
-                {{ computeAllowQty(scope.row.qty, scope.row.hasOrderQty)}}
-              </template>
-            </el-table-column>
-             <el-table-column align="left" label="表体业务员" sortable prop="itemServiceName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="表头业务员" sortable prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
+             <el-table-column align="left" label="表体业务员" sortable prop="itemServiceName" min-width="110" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="表头业务员" sortable prop="serviceName" min-width="110" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="备注" sortable prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表人" sortable prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表日期" sortable prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>

src/views/supply/pickup/sum_list.vue

@@ -42,7 +42,7 @@
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="提货人" prop="takerId">
               <el-select v-model="screenForm.takerId" placeholder="请选择">
-                <el-option v-for="item in pickupManList" :label="item.takerName" :value="item.id">
+                <el-option v-for="item in pickupManList" :key="item.id" :label="item.takerName" :value="item.id">
                 </el-option>
 
               </el-select>
@@ -253,15 +253,6 @@ export default {
   },
 
   methods: {
-    // 查询按钮权限
-    checkBtnRole(value) {
-      // let btnRole = this.$route.meta.roles;
-      // if(!btnRole) {return true}
-      // let index = btnRole.indexOf(value);
-      // return index >= 0;
-      return true;
-    },
-
     // 查询列表
     getList() {
       this.listLoading = true;