From 3c9f82add4257b469ff9182a82ca9b9a30ee7266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Tue, 17 Mar 2026 17:07:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=88=97=E5=B9=B6=E4=BC=98=E5=8C=96=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E5=8D=95=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在coil面板的do.vue中添加开始时间列
- 新增widthEdit.vue组件用于宽度编辑
- 修改MaterialTag.vue中的标签显示为厂家名称
- 合并发货单打印功能，添加吨数统计显示
---
 .../coil/panels/LabelRender/MaterialTag.vue   |  4 +-
 klp-ui/src/views/wms/coil/panels/do.vue       |  1 +
 .../views/wms/coil/views/base/widthEdit.vue   | 27 ++++++++
 .../src/views/wms/delivery/waybill/index.vue  | 68 ++-----------------
 4 files changed, 35 insertions(+), 65 deletions(-)
 create mode 100644 klp-ui/src/views/wms/coil/views/base/widthEdit.vue

diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue
index cbc2afd9..d7384576 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue
@@ -54,12 +54,12 @@
               <div
                 style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;"
                 class="label-cell">
-                实际库区
+                厂家名称
               </div>
               <div
                 style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;"
                 class="value-cell">
-                <input type="text" class="nob" :value="content.actualWarehouseName || ''" />
+                {{ content.manufacturer || '' }}
               </div>
             </div>
             <!-- <div style="display: flex; flex: 1; align-items: center;">
diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue
index 7d95db2e..ed371f96 100644
--- a/klp-ui/src/views/wms/coil/panels/do.vue
+++ b/klp-ui/src/views/wms/coil/panels/do.vue
@@ -422,6 +422,7 @@
             </el-table-column>
             <el-table-column label="创建人" prop="createBy"></el-table-column>
             <el-table-column label="操作人" prop="operatorName"></el-table-column>
+            <el-table-column label="开始时间" prop="createTime"></el-table-column>
             <el-table-column label="操作">
               <template slot-scope="scope">
                 <el-button v-if="scope.row.actionStatus === 2" :loading="buttonLoading" icon="el-icon-delete"
diff --git a/klp-ui/src/views/wms/coil/views/base/widthEdit.vue b/klp-ui/src/views/wms/coil/views/base/widthEdit.vue
new file mode 100644
index 00000000..1ad1bfd2
--- /dev/null
+++ b/klp-ui/src/views/wms/coil/views/base/widthEdit.vue
@@ -0,0 +1,27 @@
+<template>
+  <BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
+    :hideType="hideType" :showControl="showControl" :showWidthEdit="showWidthEdit" />
+</template>
+
+<script>
+import BasePage from '../../panels/base.vue';
+
+export default {
+  components: {
+    BasePage
+  },
+  data() {
+    return {
+      qrcode: false,
+      querys: {
+        // dataType: 1,
+      },
+      hideWarehouseQuery: true,
+      showWidthEdit: true,
+      showControl: false,
+      labelType: '2',
+      hideType: false,
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/delivery/waybill/index.vue b/klp-ui/src/views/wms/delivery/waybill/index.vue
index a252f5d5..b3b6548f 100644
--- a/klp-ui/src/views/wms/delivery/waybill/index.vue
+++ b/klp-ui/src/views/wms/delivery/waybill/index.vue
@@ -71,9 +71,9 @@
               <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                   <el-button size="mini" type="text" icon="el-icon-view"
-                    @click.stop="handlePrint(scope.row)">打印发货单</el-button>
+                    @click.stop="handlePrint(scope.row, 0)">打印发货单</el-button>
                   <el-button size="mini" type="text" icon="el-icon-view"
-                    @click.stop="handlePrintSimple(scope.row)">简单打印</el-button>
+                    @click.stop="handlePrint(scope.row, 1)">简单打印</el-button>
                   <el-button size="mini" type="text" icon="el-icon-copy"
                     @click.stop="handleCopy(scope.row)">复制新增</el-button>
                   <el-button size="mini" type="text" icon="el-icon-edit" :disabled="scope.row.status === 1"
@@ -446,9 +446,9 @@ export default {
       }, `deliveryWaybill_${new Date().getTime()}.xlsx`)
     },
     /** 打印发货单 */
-    handlePrint(row) {
+    handlePrint(row, printType) {
       this.loading = true;
-      this.printType = 0;
+      this.printType = printType || 0;
       // 获取发货单明细
       listDeliveryWaybillDetail({
         waybillId: row.waybillId,
@@ -480,7 +480,7 @@ export default {
             const actualWahouseNames = [...new Set(response.rows.filter(item => Boolean(item.actualWarehouseName)).map(item => item.actualWarehouseName.slice(0, 3)))].join(';');
             this.currentWaybill = {
               ...row,
-              pickupLocation: actualWahouseNames || '',
+              pickupLocation: (actualWahouseNames || '') + '；共' + this.currentWaybillDetails.length + '卷，合计' + this.currentWaybillDetails.reduce((acc, item) => acc + parseFloat(item.weight), 0).toFixed(3) + '吨',
             };
             this.currentWaybillDetails = this.currentWaybillDetails.map(item => {
               const actualWarehouseName = response.rows.find(detail => detail.coilId === item.coilId)?.actualWarehouseName || '';
@@ -503,64 +503,6 @@ export default {
         this.loading = false;
       });
     },
-    /** 打印发货单 */
-    handlePrintSimple(row) {
-      this.loading = true;
-      this.printType = 1;
-      // 获取发货单明细
-      listDeliveryWaybillDetail({
-        waybillId: row.waybillId,
-        pageNum: 1,
-        pageSize: 1000 // 获取所有明细
-      }).then(response => {
-        // 处理字段映射，确保与wayBill组件使用的字段名一致
-        this.currentWaybillDetails = response.rows.map(item => ({
-          coilId: item.coilId,
-          productName: item.productName,
-          edgeType: item.edgeType,
-          packageType: item.packaging, // 映射packaging到packageType
-          settlementType: item.settlementType,
-          rawMaterialFactory: item.rawMaterialFactory,
-          coilNumber: item.coilNo, // 映射coilNo到coilNumber
-          specification: item.specification,
-          material: item.material,
-          quantity: item.quantity,
-          weight: item.weight,
-          unitPrice: item.unitPrice || '',
-          // 单价为空时，显示为空字符串
-          remark: item.remark
-        }));
-        const coils = this.currentWaybillDetails.map(item => item.coilId).join(',');
-        if (coils) {
-          listCoilByIds(coils).then(response => {
-            // 取前三位, 然后去抽后用;连接
-            // 设置当前发货单
-            const actualWahouseNames = [...new Set(response.rows.filter(item => Boolean(item.actualWarehouseName)).map(item => item.actualWarehouseName.slice(0, 3)))].join(';');
-            this.currentWaybill = {
-              ...row,
-              pickupLocation: actualWahouseNames || '',
-            };
-            this.currentWaybillDetails = this.currentWaybillDetails.map(item => {
-              const actualWarehouseName = response.rows.find(detail => detail.coilId === item.coilId)?.actualWarehouseName || '';
-              return {
-                ...item,
-                actualWarehouseName: actualWarehouseName,
-              };
-            });
-          });
-        }
-        this.currentWaybill = {
-          ...row,
-        };
-        this.printDialogVisible = true;
-        this.loading = false;
-
-      }).catch(error => {
-        console.error('获取发货单明细失败:', error);
-        this.$modal.msgError('获取发货单明细失败');
-        this.loading = false;
-      });
-    }
   }
 };
 </script>