From 447886661d24b9885d7630f63baa8b6454c04a13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Sun, 8 Feb 2026 11:19:53 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=8F=91=E8=B4=A7=E5=8D=95):=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=B7=B2=E6=89=93=E5=8D=B0=E7=8A=B6=E6=80=81=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E5=B9=B6=E8=B0=83=E6=95=B4Excel=E8=A1=8C=E9=AB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在发货单和运单页面添加"已打印"状态选项
调整运单Excel导出模板中多行的行高
---
 klp-ui/src/views/wms/delivery/bills/index.vue      |  1 +
 .../src/views/wms/delivery/components/wayBill.vue  | 14 +++++++++++++-
 klp-ui/src/views/wms/delivery/waybill/index.vue    |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/klp-ui/src/views/wms/delivery/bills/index.vue b/klp-ui/src/views/wms/delivery/bills/index.vue
index 6cb36dde..4194c93e 100644
--- a/klp-ui/src/views/wms/delivery/bills/index.vue
+++ b/klp-ui/src/views/wms/delivery/bills/index.vue
@@ -38,6 +38,7 @@
           <el-select v-model="scope.row.status" placeholder="请选择完成状态" @change="handleStatusChange(scope.row)">
             <el-option label="已发货" :value="1" />
             <el-option label="未发货" :value="0" />
+            <el-option label="已打印" :value="2" />
           </el-select>
         </template>
       </el-table-column>
diff --git a/klp-ui/src/views/wms/delivery/components/wayBill.vue b/klp-ui/src/views/wms/delivery/components/wayBill.vue
index e18961b9..6f71408f 100644
--- a/klp-ui/src/views/wms/delivery/components/wayBill.vue
+++ b/klp-ui/src/views/wms/delivery/components/wayBill.vue
@@ -900,11 +900,23 @@ export default {
 
         // 第一行的行高
         const row1 = worksheet.getRow(1);
-        row1.height = 30;
+        row1.height = 50;
+
+        const row2 = worksheet.getRow(2);
+        row2.height = 40;
+
+        const row3 = worksheet.getRow(3);
+        row3.height = 40;
         // 备注行的行高
         const remarkRow = worksheet.getRow(12);
         remarkRow.height = 100;
 
+        const pickupRow = worksheet.getRow(13);
+        pickupRow.height = 40;
+
+        const footerRow = worksheet.getRow(14);
+        footerRow.height = 40;
+
         // 6. 生成Excel文件并下载
         const buffer = await workbook.xlsx.writeBuffer(); // 生成二进制buffer
         const blob = new Blob([buffer], {
diff --git a/klp-ui/src/views/wms/delivery/waybill/index.vue b/klp-ui/src/views/wms/delivery/waybill/index.vue
index c9488ace..e3034a98 100644
--- a/klp-ui/src/views/wms/delivery/waybill/index.vue
+++ b/klp-ui/src/views/wms/delivery/waybill/index.vue
@@ -45,6 +45,7 @@
                 <el-select v-model="scope.row.status" placeholder="请选择完成状态" @change="handleStatusChange(scope.row)">
                   <el-option label="已发货" :value="1" />
                   <el-option label="未发货" :value="0" />
+                  <el-option label="已打印" :value="2" />
                 </el-select>
               </template>
             </el-table-column>