From a4b77f9654bd20cd472609c04c327b7e88bf68e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Wed, 4 Mar 2026 13:55:43 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=8F=91=E8=B4=A7=E5=8D=95=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86):=20=E6=B7=BB=E5=8A=A0=E5=AE=9E=E9=99=85=E5=BA=93?=
 =?UTF-8?q?=E5=8C=BA=E6=98=BE=E7=A4=BA=E5=B9=B6=E4=BC=98=E5=8C=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=8A=A0=E8=BD=BD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改发货单明细表格，新增实际库区列显示。同时将数据加载逻辑改为异步方式，并添加卷号对应的实际库区信息查询功能。移除数量列的显示以简化界面。
---
 .../wms/delivery/components/detailTable.vue   | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/klp-ui/src/views/wms/delivery/components/detailTable.vue b/klp-ui/src/views/wms/delivery/components/detailTable.vue
index 9666a1c4..c684bf12 100644
--- a/klp-ui/src/views/wms/delivery/components/detailTable.vue
+++ b/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() {