Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/views/wms/coil/merge.vue

@@ -119,6 +119,7 @@
             <el-form size="small" label-width="90px">
               <el-form-item label="卷号">
                 <el-input v-model="targetCoil.currentCoilNo" placeholder="输入目标卷号" :disabled="readonly"></el-input>
+                <current-coil-no :current-coil-no="targetCoil.currentCoilNo" />
               </el-form-item>
               <el-form-item label="班组">
                 <el-select v-model="targetCoil.team" placeholder="请选择班组" style="width: 100%" :disabled="readonly">

klp-ui/src/views/wms/coil/panels/stepSplit.vue

@@ -79,6 +79,7 @@
               </el-form-item>
               <el-form-item label="当前钢卷号" prop="currentCoilNo">
                 <el-input v-model="splitForm.currentCoilNo" placeholder="请输入当前钢卷号" />
+                <current-coil-no :current-coil-no="splitForm.currentCoilNo" />
               </el-form-item>
               <el-form-item label="所在库位" prop="warehouseId">
                 <warehouse-select v-model="splitForm.warehouseId" placeholder="请选择仓库/库区/库位" style="width: 100%;"

klp-ui/src/views/wms/coil/split.vue

@@ -119,6 +119,7 @@
               <el-form size="small" label-width="90px">
                 <el-form-item label="卷号" required>
                   <el-input v-model="item.currentCoilNo" placeholder="输入子卷卷号" :disabled="readonly"></el-input>
+                  <current-coil-no :current-coil-no="item.currentCoilNo" />
                 </el-form-item>
                 <el-form-item label="班组" required>
                   <el-select v-model="item.team" placeholder="请选择班组" style="width: 100%" :disabled="readonly">

klp-ui/src/views/wms/coil/typing.vue

@@ -97,6 +97,7 @@
                   <i class="el-icon-document"></i>
                 </template>
               </el-input>
+              <current-coil-no :current-coil-no="updateForm.currentCoilNo"></current-coil-no>
             </el-form-item>
 
             <el-form-item label="班组" prop="team">

klp-ui/src/views/wms/delivery/components/detailTable.vue

@@ -36,6 +36,7 @@
         <el-table-column label="品名" align="center" prop="productName" />
         <el-table-column label="切边" align="center" prop="edgeType" />
         <el-table-column label="包装" align="center" prop="packaging" />
+        <el-table-column label="实际库区" align="center" prop="actualWarehouseName" />
         <el-table-column label="结算方式" align="center" prop="settlementType" />
         <!-- <el-table-column label="原料厂家" align="center" prop="rawMaterialFactory" /> -->
         <el-table-column label="卷号" align="center" prop="coilNo">
@@ -45,7 +46,7 @@
         </el-table-column>
         <el-table-column label="规格" align="center" prop="specification" />
         <el-table-column label="材质" align="center" prop="material" />
-        <el-table-column label="数量" align="center" prop="quantity" />
+        <!-- <el-table-column label="数量" align="center" prop="quantity" /> -->
         <el-table-column label="重量" align="center" prop="weight" />
         <!-- <el-table-column label="单价" align="center" prop="unitPrice" /> -->
         <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
@@ -121,7 +122,7 @@
         <el-form-item label="单价" prop="unitPrice">
           <el-input v-model="form.unitPrice" placeholder="请输入单价" />
         </el-form-item>
-        <el-form-item label="备注" prop="remark" >
+        <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
@@ -135,6 +136,7 @@
 
 <script>
 import { listDeliveryWaybillDetail, getDeliveryWaybillDetail, delDeliveryWaybillDetail, addDeliveryWaybillDetail, updateDeliveryWaybillDetail, batchAddDeliveryWaybillDetail } from "@/api/wms/deliveryWaybillDetail";
+import { listCoilByIds } from "@/api/wms/coil";
 import CoilSelector from "@/components/CoilSelector";
 
 export default {
@@ -157,7 +159,7 @@ export default {
     waybillId: {
       handler(newVal, oldVal) {
         // if (newVal) {
-          this.getList();
+        this.getList();
         // }
       },
       immediate: true
@@ -222,16 +224,26 @@ export default {
   },
   methods: {
     /** 查询发货单明细列表 */
-    getList() {     
+    async getList() {
       if (!this.waybillId) {
         return;
       }
       this.loading = true;
-      listDeliveryWaybillDetail({ ...this.queryParams, waybillId: this.waybillId }).then(response => {
-        this.deliveryWaybillDetailList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+      const response = await listDeliveryWaybillDetail({ ...this.queryParams, waybillId: this.waybillId })
+      const coils = response.rows.map(item => item.coilId).join(',');
+      if (coils) {
+        const coilResponse = await listCoilByIds(coils);
+        // 查找response中coilId相对应的项，将actualWarehouseName赋值给deliveryWaybillDetailList中
+        response.rows.forEach(item => {
+          const coil = coilResponse.rows.find(c => c.coilId === item.coilId);
+          if (coil) {
+            item.actualWarehouseName = coil.actualWarehouseName;
+          }
+        });
+      }
+      this.deliveryWaybillDetailList = response.rows;
+      this.total = response.total;
+      this.loading = false;
     },
     // 取消按钮
     cancel() {