From 522f3400fc3c0d2d102b44088a7771859f06bc18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Tue, 27 Jan 2026 15:41:29 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E4=BC=98=E5=8C=96=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E5=8D=95=E5=92=8C=E9=92=A2=E5=8D=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改重量单位从kg为T
- 发货单增加仓库位置列和禁用已发货单操作
- 优化钢卷卡片UI样式
- 改进打印功能使用PDF格式
- 增加发货单状态判断和编辑控制
---
 klp-ui/src/views/wms/coil/panels/do.vue       | 120 +++++++------
 .../src/views/wms/coil/panels/stepSplit.vue   |   2 +-
 .../wms/delivery/components/detailTable.vue   |   3 +-
 .../views/wms/delivery/components/wayBill.vue | 163 ++++++++++++------
 .../src/views/wms/delivery/waybill/index.vue  |  65 ++++---
 5 files changed, 220 insertions(+), 133 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue
index d2f6dcf0..560f4c03 100644
--- a/klp-ui/src/views/wms/coil/panels/do.vue
+++ b/klp-ui/src/views/wms/coil/panels/do.vue
@@ -227,64 +227,74 @@
             <el-button size="mini" icon="el-icon-refresh" @click="getStepSplitList">刷新</el-button>
           </div>
           <div v-if="stepSpilt.list.length > 0" style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
-            <div v-for="(item, index) in stepSpilt.list" :key="item.coilId || index" class="coil-card"
-              style="border: 1px solid #e4e7ed; border-radius: 8px; padding: 16px; margin-bottom: 12px; background: linear-gradient(135deg, #f8f9fa 0%, #ffffff 100%); box-shadow: 0 2px 8px rgba(0,0,0,0.05);">
-
-              <!-- 主标题区域 - 突出显示currentCoilNo -->
-              <div class="card-header" style="margin-bottom: 16px; text-align: center;">
-                <div style="display: inline-block; position: relative;">
-                  <!-- <div style="font-size: 12px; color: #909399; margin-bottom: 4px;">卷号</div> -->
-                  <div class="coil-no" style="font-size: 28px; font-weight: 800; color: #409eff; letter-spacing: 1px; 
-                  padding: 4px 16px; background: linear-gradient(135deg, #ecf5ff 0%, #d9ecff 100%); 
-                  border-radius: 6px; display: inline-block; border: 2px solid #a0cfff;">
-                    {{ item.currentCoilNo || 'N/A' }}
-                  </div>
+            <div v-for="(item, index) in stepSpilt.list" :key="item.coilId || index"
+              style="width: 18rem; background-color: #ffffff; border-bottom-left-radius: 0.5rem; border-bottom-right-radius: 0.5rem; border-top: 4px solid #2bf; padding-left: 1rem; padding-right: 1rem; padding-top: 1.25rem; padding-bottom: 1.25rem; display: flex; flex-direction: column; justify-content: space-around; box-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);">
+              <p
+                style="font-size: 1.125rem; line-height: 1.75rem; font-weight: 700; font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';">
+                {{ item.currentCoilNo || 'N/A' }}
+              </p>
+              <div style="padding-top: 0.75rem; padding-bottom: 0.75rem;">
+                <p style="color: #9ca3af; font-size: 0.875rem; line-height: 1.25rem;">
+                <div class="info-item">
+                  <span class="info-label">入场：</span>
+                  <span class="info-value" :title="item.enterCoilNo">{{ item.enterCoilNo || '—' }}</span>
                 </div>
+                <div class="info-item">
+                  <span class="info-label">厂家：</span>
+                  <span class="info-value" :title="item.supplierCoilNo">{{ item.supplierCoilNo || '—' }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">品名：</span>
+                  <span class="info-value">
+                    <el-popover placement="top" width="280" trigger="hover"
+                      popper-class="material-params-popover">
+                      <div class="material-params-content">
+                        <div class="params-list">
+                          <div class="param-item">
+                            <div class="param-row" v-if="item.specification">
+                              <span class="param-label">规格：</span>
+                              <span class="param-value">{{ item.specification }}</span>
+                            </div>
+                            <div class="param-row" v-if="item.material">
+                              <span class="param-label">材质：</span>
+                              <span class="param-value">{{ item.material }}</span>
+                            </div>
+
+                            <div class="param-row" v-if="item.surfaceTreatment">
+                              <span class="param-label">表面处理：</span>
+                              <span class="param-value">{{ item.surfaceTreatment }}</span>
+                            </div>
+                            <div class="param-row" v-if="item.zincLayer">
+                              <span class="param-label">镀层质量：</span>
+                              <span class="param-value">{{ item.zincLayer }}</span>
+                            </div>
+                            <div class="param-row" v-if="item.manufacturer">
+                              <span class="param-label">厂家：</span>
+                              <span class="param-value">{{ item.manufacturer }}</span>
+                            </div>
+                          </div>
+                      
+                        </div>
+                      </div>
+                      <span slot="reference" style="cursor: pointer; color: #2bf;">{{ item.itemName || '—' }}</span>
+                    </el-popover>
+                  </span>
+                </div>
+                </p>
               </div>
-
-              <!-- 详细信息区域 -->
-              <!-- <div class="card-content" style="margin-bottom: 16px;">
-
-                <div class="info-row" style="display: flex; justify-content: space-between; margin-bottom: 10px;">
-                  <div class="info-item" style="flex: 1; text-align: center;">
-                    <div style="font-size: 11px; color: #909399; margin-bottom: 2px;">仓库</div>
-                    <div style="font-size: 14px; font-weight: 600; color: #303133;">
-                      {{ item.warehouseName || '-' }}
-                    </div>
-                  </div>
-
-                  <div style="width: 1px; background: #e4e7ed; margin: 0 8px;"></div>
-
-                  <div class="info-item" style="flex: 1; text-align: center;">
-                    <div style="font-size: 11px; color: #909399; margin-bottom: 2px;">实际仓库</div>
-                    <div style="font-size: 14px; font-weight: 600; color: #303133;">
-                      {{ item.actualWarehouseName || '-' }}
-                    </div>
-                  </div>
+              <div style="display: flex; justify-content: space-between;">
+                <svg-icon icon-class="coil" style="width: 1.5rem; height: 1.5rem;"></svg-icon>
+                <div style="font-size: 0.875rem; line-height: 1.25rem; display: flex; gap: 0.5rem;">
+                  <el-button type="primary" size="mini" @click="handleContinueSplit(item)"
+                    style="min-width: 80px; padding: 5px 15px;">
+                    查看
+                  </el-button>
+                  <el-button size="mini" @click="handleCancelSplit(item)"
+                    style="min-width: 80px; padding: 5px 15px; margin-left: 12px; border-color: #f56c6c; color: #f56c6c;"
+                    :plain="true">
+                    取消
+                  </el-button>
                 </div>
-
-                <div class="weight-info" style="background: linear-gradient(135deg, #f0f9eb 0%, #e1f3d8 100%); 
-                border-radius: 6px; padding: 8px; margin-top: 8px; text-align: center;">
-                  <div style="display: inline-block;">
-                    <div style="font-size: 12px; color: #67c23a; margin-bottom: 2px;">净重</div>
-                    <div style="font-size: 18px; font-weight: 700; color: #67c23a;">
-                      {{ item.netWeight ? `${item.netWeight} kg` : '-' }}
-                    </div>
-                  </div>
-                </div>
-              </div> -->
-
-              <!-- 操作按钮区域 -->
-              <div class="card-actions" style="text-align: center; border-top: 1px solid #ebeef5; padding-top: 12px;">
-                <el-button type="primary" size="mini" @click="handleContinueSplit(item)"
-                  style="min-width: 80px; padding: 5px 15px;">
-                  查看
-                </el-button>
-                <el-button size="mini" @click="handleCancelSplit(item)"
-                  style="min-width: 80px; padding: 5px 15px; margin-left: 12px; border-color: #f56c6c; color: #f56c6c;"
-                  :plain="true">
-                  取消
-                </el-button>
               </div>
             </div>
           </div>
diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
index a74ac4d0..94c77579 100644
--- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue
+++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
@@ -29,7 +29,7 @@
             <el-descriptions-item label="厂家原料卷号">{{ coilInfo.supplierCoilNo || '-' }}</el-descriptions-item>
             <el-descriptions-item label="所在库位">{{ coilInfo.warehouseName || '-' }}</el-descriptions-item>
             <el-descriptions-item label="材料类型">{{ coilInfo.materialType || '-' }}</el-descriptions-item>
-            <el-descriptions-item label="净重">{{ coilInfo.netWeight || '-' }} kg</el-descriptions-item>
+            <el-descriptions-item label="净重">{{ coilInfo.netWeight || '-' }} T</el-descriptions-item>
           </el-descriptions>
           <!-- 已分条钢卷列表 -->
 
diff --git a/klp-ui/src/views/wms/delivery/components/detailTable.vue b/klp-ui/src/views/wms/delivery/components/detailTable.vue
index 02ee1a9d..d33a1b98 100644
--- a/klp-ui/src/views/wms/delivery/components/detailTable.vue
+++ b/klp-ui/src/views/wms/delivery/components/detailTable.vue
@@ -43,13 +43,12 @@
       <el-empty description="请选择发货单查看明细" />
     </div>
 
-
     <!-- 添加或修改发货单明细对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" label-width="80px">
         <el-form-item label="发货钢卷" prop="coilId">
           <div style="display: flex; gap: 10px;">
-            <coil-selector v-model="form.coilId" :use-trigger="true" @select="handleSelect" :rangeMode="true" :rangeData="coilList" />
+            <coil-selector v-model="form.coilId" :use-trigger="true" :filters="{ selectType: 'product', status: 0, excludeBound: true }" @select="handleSelect" />
             <el-checkbox v-model="autoFillForm" label="自动填写表单信息" />
           </div>
         </el-form-item>
diff --git a/klp-ui/src/views/wms/delivery/components/wayBill.vue b/klp-ui/src/views/wms/delivery/components/wayBill.vue
index d722a646..67b435e9 100644
--- a/klp-ui/src/views/wms/delivery/components/wayBill.vue
+++ b/klp-ui/src/views/wms/delivery/components/wayBill.vue
@@ -12,7 +12,7 @@
           <input type="text" class="editable-input date-input transparent-input" v-model="localWaybill.deliveryYear" />
           <span class="label date-label">年</span>
           <input type="text" class="editable-input date-input transparent-input" v-model="localWaybill.deliveryMonth" />
-          <span class="label date-label">月</span>  
+          <span class="label date-label">月</span>
           <input type="text" class="editable-input date-input transparent-input" v-model="localWaybill.deliveryDay" />
           <span class="label date-label">日</span>
         </div>
@@ -22,7 +22,7 @@
         </div>
       </div>
 
-       <div class="waybill-header">
+      <div class="waybill-header">
         <div class="header-left">
           <span class="label">负责人：</span>
           <input type="text" class="editable-input transparent-input" v-model="localWaybill.principal" />
@@ -44,13 +44,14 @@
             <th>品名</th>
             <th>切边</th>
             <th>包装</th>
+            <th>仓库位置</th>
             <th>结算</th>
             <th>原料厂家</th>
             <th>卷号</th>
             <th>规格</th>
             <th>材质</th>
             <th>数量（件）</th>
-            <th>重量（kg）</th>
+            <th>重量（T）</th>
             <th>单价</th>
             <th>备注</th>
           </tr>
@@ -58,7 +59,7 @@
         <tbody>
           <!-- 无明细提示 -->
           <tr v-if="localWaybillDetails.length === 0">
-            <td colspan="12" class="no-data">
+            <td colspan="13" class="no-data">
               <div class="no-data-content">
                 <el-empty description="暂无发货单明细" />
               </div>
@@ -71,6 +72,8 @@
             </td>
             <td><input type="text" class="table-input transparent-input" v-model="item.packageType" />
             </td>
+            <td><input type="text" class="table-input transparent-input" v-model="item.actualWarehouseName" />
+            </td>
             <td><input type="text" class="table-input transparent-input" v-model="item.settlementType" />
             </td>
             <td><input type="text" class="table-input transparent-input" v-model="item.rawMaterialFactory" />
@@ -98,13 +101,15 @@
 
       <!-- 备注说明 -->
       <div class="waybill-remarks">
-        <p>1、品名：冷硬钢卷（酸连轧）、冷轧钢卷（脱脂退火火拉矫）、镀锌卷板，镀锌管料（镀锌分剪料）；2、切边：净边/毛边；3、包装：裸包：周三径四；简包1：周三径四内外护角；简包2：周三径四+防锈纸；普包：周三径四+内外护角+防锈纸+端护板；精包1：周三径四+内外护角+防锈纸+薄膜+端护板+内外护板；精包2：周三径四+内外护角+防锈纸+薄膜+端护板+内外护板+木托。</p>
+        <p>
+          1、品名：冷硬钢卷（酸连轧）、冷轧钢卷（脱脂退火火拉矫）、镀锌卷板，镀锌管料（镀锌分剪料）；2、切边：净边/毛边；3、包装：裸包：周三径四；简包1：周三径四内外护角；简包2：周三径四+防锈纸；普包：周三径四+内外护角+防锈纸+端护板；精包1：周三径四+内外护角+防锈纸+薄膜+端护板+内外护板；精包2：周三径四+内外护角+防锈纸+薄膜+端护板+内外护板+木托。
+        </p>
       </div>
 
       <div class="waybill-pickup-location">
         <!-- <div class="pickup-location-item inline"> -->
-          <span class="label">取货地点：</span>
-          <input type="text" class="editable-input full-input transparent-input" v-model="localWaybill.pickupLocation" />
+        <span class="label">取货地点：</span>
+        <input type="text" class="editable-input full-input transparent-input" v-model="localWaybill.pickupLocation" />
         <!-- </div> -->
       </div>
 
@@ -134,7 +139,8 @@
 
 <script>
 import domtoimage from 'dom-to-image';
-import printJS from 'print-js';
+import { PDFDocument } from 'pdf-lib';
+import html2canvas from 'html2canvas';
 
 export default {
   props: {
@@ -231,15 +237,15 @@ export default {
       // 确保容器在保存图片时能完整显示所有内容
       const originalWidth = node.style.width;
       const originalOverflow = node.style.overflow;
-      
+
       // 临时调整容器样式，确保所有内容可见
       node.style.width = 'auto';
       node.style.overflow = 'visible';
-      
+
       // 获取实际内容宽度
       const contentWidth = node.scrollWidth;
       const contentHeight = node.scrollHeight;
-      
+
       domtoimage.toPng(node, {
         width: contentWidth,
         height: contentHeight,
@@ -266,32 +272,73 @@ export default {
         });
     },
     // 打印发货单
-    printWaybill() {
+    async printWaybill() {
       const node = this.$refs.waybillRef;
       // 确保容器在打印时能完整显示所有内容
       const originalWidth = node.style.width;
+      const originalHeight = node.style.height;
+      const paperWidthMm = 297;
+      const paperHeightMm = 180;
       const originalOverflow = node.style.overflow;
-      
+
       // 临时调整容器样式，确保所有内容可见
       node.style.width = 'auto';
       node.style.overflow = 'visible';
-      
+
       // 获取实际内容宽度
       const contentWidth = node.scrollWidth;
-      
-      printJS({
-        printable: node,
-        maxWidth: contentWidth,
-        type: 'html',
-        scanStyles: true,
-        style: `
-          @page { size: A4 landscape; margin: 1cm; }
-          .waybill-container { width: 100%; max-width: none; overflow: visible; }
-          .waybill-table { width: 100%; table-layout: auto; }
-        `,
-        targetStyles: ['*']
+      const contentHeight = node.scrollHeight;
+
+      // console.log('contentWidth', contentWidth, originalWidth, originalHeight);
+      // 改用html2canvas + pdf-lib打印pdf
+      const canvas = await html2canvas(node, {
+        backgroundColor: '#ffffff',
+        scale: 3,
+        useCORS: true,
+        // 让 html2canvas 为频繁读回优化 Canvas（与批量导出一致）
+        willReadFrequently: true,
+        // 确保按元素尺寸截图，明确指定宽高
+        width: contentWidth,
+        height: contentHeight,
+        windowWidth: contentWidth,
+        windowHeight: contentHeight,
       });
-      
+      // 5. 使用 pdf-lib 生成单页 PDF（占满整张纸，无边距）
+      const mmToPt = 72 / 25.4;
+      const pageWidthPt = paperWidthMm * mmToPt;
+      const pageHeightPt = paperHeightMm * mmToPt;
+
+      const pdfDoc = await PDFDocument.create();
+      console.log('canvas', canvas);
+      const png = canvas.toDataURL('image/png');
+      const imgPng = await pdfDoc.embedPng(png);
+      // 确保页面尺寸正确：宽100mm，高80mm（横向）
+      const page = pdfDoc.addPage([pageWidthPt, pageHeightPt]);
+
+      // 直接拉伸填充整个PDF页面，不留边距，确保占满整张纸
+      // 从(0,0)开始，直接填充整个页面尺寸
+      page.drawImage(imgPng, {
+        x: 0,
+        y: 0,
+        width: pageWidthPt,
+        height: pageHeightPt
+      });
+
+      const pdfBytes = await pdfDoc.save();
+      const blob = new Blob([pdfBytes], { type: 'application/pdf' });
+      const url = URL.createObjectURL(blob);
+
+      const win = window.open(url, '_blank');
+      if (!win) {
+        const a = document.createElement('a');
+        a.href = url;
+        a.download = `标签_${new Date().getTime()}.pdf`;
+        document.body.appendChild(a);
+        a.click();
+        document.body.removeChild(a);
+      }
+
+
       // 恢复原始样式
       setTimeout(() => {
         node.style.width = originalWidth;
@@ -304,7 +351,7 @@ export default {
 
 <style scoped>
 .waybill-container {
-  width: 850px;
+  width: 960px;
   max-width: none;
   min-width: 850px;
   margin: 0 auto;
@@ -407,62 +454,80 @@ export default {
 /* 表格列宽设置 */
 .waybill-table th:nth-child(1),
 .waybill-table td:nth-child(1) {
-  width: 80px; /* 品名 */
+  width: 80px;
+  /* 品名 */
 }
 
 .waybill-table th:nth-child(2),
 .waybill-table td:nth-child(2) {
-  width: 40px; /* 切边 */
+  width: 40px;
+  /* 切边 */
 }
 
 .waybill-table th:nth-child(3),
 .waybill-table td:nth-child(3) {
-  width: 40px; /* 包装 */
+  width: 40px;
+  /* 包装 */
 }
 
 .waybill-table th:nth-child(4),
 .waybill-table td:nth-child(4) {
-  width: 40px; /* 结算 */
+  width: 80px;
+  /* 仓库位置 */
 }
 
 .waybill-table th:nth-child(5),
 .waybill-table td:nth-child(5) {
-  width: 80px; /* 原料厂家 */
+  width: 40px;
+  /* 结算 */
 }
 
 .waybill-table th:nth-child(6),
 .waybill-table td:nth-child(6) {
-  width: 100px; /* 卷号 */
+  width: 80px;
+  /* 原料厂家 */
 }
 
 .waybill-table th:nth-child(7),
 .waybill-table td:nth-child(7) {
-  width: 80px; /* 规格 */
+  width: 100px;
+  /* 卷号 */
 }
 
 .waybill-table th:nth-child(8),
 .waybill-table td:nth-child(8) {
-  width: 40px; /* 材质 */
+  width: 80px;
+  /* 规格 */
 }
 
 .waybill-table th:nth-child(9),
 .waybill-table td:nth-child(9) {
-  width: 60px; /* 数量（件） */
+  width: 40px;
+  /* 材质 */
 }
 
 .waybill-table th:nth-child(10),
 .waybill-table td:nth-child(10) {
-  width: 60px; /* 重量（kg） */
+  width: 60px;
+  /* 数量（件） */
 }
 
 .waybill-table th:nth-child(11),
 .waybill-table td:nth-child(11) {
-  width: 40px; /* 单价 */
+  width: 80px;
+  /* 重量（kg） */
 }
 
 .waybill-table th:nth-child(12),
 .waybill-table td:nth-child(12) {
-  width: 100px; /* 备注 */
+  width: 40px;
+  /* 单价 */
+}
+
+.waybill-table th:nth-child(13),
+.waybill-table td:nth-child(13) {
+  width: 100px;
+  /* 备注 */
 }
 
 .waybill-table th {
@@ -594,23 +659,23 @@ export default {
     box-shadow: none;
     padding: 0;
   }
-  
+
   .waybill-header {
     flex-wrap: nowrap;
     justify-content: space-between;
   }
-  
+
   .waybill-footer {
     flex-wrap: nowrap;
     justify-content: space-between;
   }
-  
+
   .label {
     width: 80px;
     text-align: right;
     white-space: nowrap;
   }
-  
+
   .waybill-actions {
     display: none;
   }
@@ -623,26 +688,26 @@ export default {
     gap: 15px;
     align-items: flex-start;
   }
-  
+
   .waybill-table {
     font-size: 12px;
   }
-  
+
   .waybill-table th,
   .waybill-table td {
     padding: 2px;
   }
-  
+
   .waybill-footer {
     flex-direction: column;
     align-items: flex-start;
     gap: 15px;
   }
-  
+
   .footer-item.inline {
     width: 100%;
   }
-  
+
   .label {
     width: auto;
     text-align: left;
diff --git a/klp-ui/src/views/wms/delivery/waybill/index.vue b/klp-ui/src/views/wms/delivery/waybill/index.vue
index 1b52434e..8dbe6ba4 100644
--- a/klp-ui/src/views/wms/delivery/waybill/index.vue
+++ b/klp-ui/src/views/wms/delivery/waybill/index.vue
@@ -67,10 +67,10 @@
               <template slot-scope="scope">
                 <el-button size="mini" type="text" icon="el-icon-view"
                   @click.stop="handlePrint(scope.row)">打印发货单</el-button>
-                <el-button size="mini" type="text" icon="el-icon-edit"
-                  @click.stop="handleUpdate(scope.row)">修改</el-button>
-                <el-button size="mini" type="text" icon="el-icon-delete"
-                  @click.stop="handleDelete(scope.row)">删除</el-button>
+                <el-button size="mini" type="text" icon="el-icon-edit" :disabled="scope.row.status === 1"
+                  title="已发货的发货单不能修改" @click.stop="handleUpdate(scope.row)">修改</el-button>
+                <el-button size="mini" type="text" icon="el-icon-delete" :disabled="scope.row.status === 1"
+                  title="已发货的发货单不能删除" @click.stop="handleDelete(scope.row)">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -80,13 +80,13 @@
 
           <el-divider style="margin: 20px 0;" />
 
-          <DeliveryWaybillDetail ref="detailTable" :waybillId="waybillId" :coilList="coilList" @add="refreshCoilList" @update="refreshCoilList" @delete="refreshCoilList" />
+          <DeliveryWaybillDetail v-if="canEdit" ref="detailTable" :waybillId="waybillId" :coilList="coilList"
+            @add="refreshCoilList" @update="refreshCoilList" @delete="refreshCoilList" />
+          <el-empty v-else description="已发货，不可修改，点击打印查看详情" />
         </el-card>
       </el-col>
     </el-row>
 
-
-
     <!-- 添加或修改发货单对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -107,12 +107,6 @@
             placeholder="请选择发货时间">
           </el-date-picker>
         </el-form-item>
-        <!-- <el-form-item label="磅房" prop="weighbridge">
-          <el-input v-model="form.weighbridge" placeholder="请输入磅房" />
-        </el-form-item>
-        <el-form-item label="销售" prop="salesPerson">
-          <el-input v-model="form.salesPerson" placeholder="请输入销售" />
-        </el-form-item> -->
         <el-form-item label="负责人" prop="principal">
           <el-input v-model="form.principal" placeholder="请输入负责人" />
         </el-form-item>
@@ -130,7 +124,7 @@
     </el-dialog>
 
     <!-- 打印发货单对话框 -->
-    <el-dialog title="打印发货单" :visible.sync="printDialogVisible" width="900px" append-to-body center>
+    <el-dialog title="打印发货单" :visible.sync="printDialogVisible" width="1000px" append-to-body center>
       <WayBill :waybill="currentWaybill" :waybillDetails="currentWaybillDetails" />
     </el-dialog>
   </div>
@@ -217,7 +211,8 @@ export default {
         planType: 0,
         // auditStatus: 1,
       },
-      coilList: []
+      coilList: [],
+      canEdit: true,
     };
   },
   created() {
@@ -330,6 +325,13 @@ export default {
       this.getList();
     },
     handleRowClick(row) {
+      if (row.status === 1) {
+        this.canEdit = false;
+        this.waybillId = row.waybillId;
+        // this.$modal.msgWarning("已发货的发货单不能操作");
+        return;
+      }
+      this.canEdit = true;
       this.waybillId = row.waybillId;
     },
 
@@ -431,19 +433,30 @@ export default {
           remark: item.remark
         }));
         const coils = this.currentWaybillDetails.map(item => item.coilId).join(',');
-        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 || '',
-          };
-        });
-  
-        // 打开打印对话框
+        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('获取发货单明细失败');