diff --git a/klp-ui/src/views/wms/delivery/components/wayBill2.vue b/klp-ui/src/views/wms/delivery/components/wayBill2.vue
new file mode 100644
index 00000000..ed2c01be
--- /dev/null
+++ b/klp-ui/src/views/wms/delivery/components/wayBill2.vue
@@ -0,0 +1,1389 @@
+<!-- 发货单组件 -->
+<template>
+  <div>
+    <div class="waybill-container" ref="waybillRef">
+      <div class="waybill-content">
+        <!-- 头部信息 -->
+        <!-- 标题信息 -->
+        <div class="title">科伦普发货单</div>
+        <div class="waybill-header">
+          <div class="header-left">
+            <span class="label">收货单位：</span>
+            <div class="editable-input transparent-input" contenteditable>{{ localWaybill.consigneeUnit }}</div>
+          </div>
+          <div class="header-center">
+            <div class="editable-input date-input transparent-input" contenteditable>{{ localWaybill.deliveryYear }}
+            </div>
+            <span class="label date-label">年</span>
+            <div class="editable-input date-input transparent-input" contenteditable>{{ localWaybill.deliveryMonth }}
+            </div>
+            <span class="label date-label">月</span>
+            <div class="editable-input date-input transparent-input" contenteditable>{{ localWaybill.deliveryDay }}
+            </div>
+            <span class="label date-label">日</span>
+          </div>
+          <div class="header-right">
+            <span class="label">发货单位：</span>
+            <div class="editable-input transparent-input" contenteditable>{{ localWaybill.senderUnit }}</div>
+          </div>
+        </div>
+
+        <div class="waybill-header">
+          <div class="header-left">
+            <span class="label">负责人：</span>
+            <div class="editable-input transparent-input" contenteditable>{{ localWaybill.principal }}</div>
+          </div>
+          <div class="header-right">
+            <span class="label">电话：</span>
+            <div class="editable-input transparent-input" contenteditable>{{ localWaybill.principalPhone }}</div>
+          </div>
+          <div class="header-right">
+            <span class="label">合同号：</span>
+            <div class="editable-input transparent-input" contenteditable>{{ localWaybill.contractCode }}</div>
+          </div>
+          <div class="header-center">
+            <span class="label">车牌：</span>
+            <div class="editable-input transparent-input" contenteditable>{{ localWaybill.licensePlate }}</div>
+          </div>
+        </div>
+
+        <!-- 表格 -->
+        <table class="waybill-table">
+          <thead>
+            <tr>
+              <th>品名</th>
+              <th>切边</th>
+              <th>包装</th>
+              <th>仓库位置</th>
+              <th>结算</th>
+              <th>原料厂家</th>
+              <th>卷号</th>
+              <th>规格</th>
+              <th>材质</th>
+              <!-- <th>数量（件）</th> -->
+              <th>重量(t)</th>
+              <!-- <th>单价</th> -->
+              <th>备注</th>
+            </tr>
+          </thead>
+          <tbody>
+            <!-- 无明细提示 -->
+            <tr v-if="localWaybillDetails.length === 0">
+              <td colspan="12" class="no-data">
+                <div class="no-data-content">
+                  <el-empty description="暂无发货单明细" />
+                </div>
+              </td>
+            </tr>
+            <!-- 明细数据 -->
+            <tr v-for="(item, index) in displayWaybillDetails" :key="index">
+              <td>
+                <div class="table-input transparent-input" contenteditable>{{ item.productName }}</div>
+              </td>
+              <td>
+                <div class="table-input transparent-input" contenteditable>{{ item.edgeType }}</div>
+              </td>
+              <td>
+                <div class="table-input transparent-input" contenteditable>{{ item.packageType }}</div>
+              </td>
+              <td>
+                <div class="table-input transparent-input" contenteditable>{{ item.actualWarehouseName }}</div>
+              </td>
+              <td>
+                <div class="table-input transparent-input" contenteditable>{{ item.settlementType }}</div>
+              </td>
+              <td>
+                <div class="table-input transparent-input" contenteditable>{{ item.rawMaterialFactory }}</div>
+              </td>
+              <td>
+                <div class="table-input transparent-input" contenteditable>{{ item.coilNumber }}</div>
+              </td>
+              <td>
+                <div class="table-input transparent-input" contenteditable>{{ item.specification }}</div>
+              </td>
+              <td>
+                <div class="table-input transparent-input" contenteditable>{{ item.material }}</div>
+              </td>
+              <!-- <td><input type="number" class="table-input transparent-input" v-model.number="item.quantity"
+                placeholder="0" /></td> -->
+              <td><input type="number" class="table-input transparent-input" v-model.number="item.weight"
+                  placeholder="0.00" /></td>
+              <!-- <td>
+                <div class="table-input transparent-input" contenteditable>{{ item.unitPrice }}</div>
+              </td> -->
+              <td>
+                <div class="table-input transparent-input" contenteditable>{{ item.remark }}</div>
+              </td>
+            </tr>
+            <!-- 加粗最后一行的线 -->
+            <tr style="height: 0;">
+              <td style="height: 0;"></td>
+              <td style="height: 0;"></td>
+              <td style="height: 0;"></td>
+              <td style="height: 0;"></td>
+              <td style="height: 0;"></td>
+              <td style="height: 0;"></td>
+              <td style="height: 0;"></td>
+              <td style="height: 0;"></td>
+              <td style="height: 0;"></td>
+              <!-- <td><input type="number" class="table-input transparent-input" v-model.number="item.quantity"
+                placeholder="0" /></td> -->
+              <!-- <td style="height: 0;"></td> -->
+              <td style="height: 0;"></td>
+              <td style="height: 0;"></td>
+            </tr>
+          </tbody>
+        </table>
+
+
+
+        <!-- 备注说明 -->
+        <div class="waybill-remarks">
+          <p>
+            1、品名：冷硬钢卷（酸连轧）、冷轧钢卷（脱脂退火火拉矫）、镀锌卷板，镀锌管料（镀锌分剪料）；2、切边：净边/毛边；3、包装：裸包：周三径四；简包1：周三径四内外护角；简包2：周三径四+防锈纸；普包：周三径四+内外护角+防锈纸+端护板；精包1：周三径四+内外护角+防锈纸+薄膜+端护板+内外护板；精包2：周三径四+内外护角+防锈纸+薄膜+端护板+内外护板+木托。
+          </p>
+        </div>
+
+        <div class="waybill-pickup-location">
+          <!-- <div class="pickup-location-item inline"> -->
+          <span style="font-size: 18px; font-weight: bold;">取货地点：</span>
+          <input type="text" class="editable-input full-input transparent-input"
+            v-model="localWaybill.pickupLocation" />
+          <!-- </div> -->
+        </div>
+
+        <!-- 签名栏 -->
+        <div class="waybill-footer">
+          <!-- <div class="footer-item inline">
+          <span class="label">销售：</span>
+          <div class="editable-input signature-input transparent-input" contenteditable>{{ localWaybill.salesman }}</div>
+        </div> -->
+          <div class="footer-item inline">
+            <span class="label">发货：</span>
+            <div class="editable-input signature-input transparent-input" contenteditable>{{ localWaybill.deliveryman }}
+            </div>
+          </div>
+          <div class="footer-item inline">
+            <span class="label">司机：</span>
+            <div class="editable-input signature-input transparent-input" contenteditable>{{ localWaybill.driver }}
+            </div>
+          </div>
+          <div class="footer-item inline">
+            <span class="label">磅房：</span>
+            <div class="editable-input signature-input transparent-input" contenteditable>{{ localWaybill.weightRoom }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 操作按钮 -->
+    <div class="waybill-actions">
+      <div class="waybill-pagebar">
+        <el-button size="mini" @click="changePage(currentPage - 1)" :disabled="currentPage <= 1">上一页</el-button>
+        <span class="page-info">第 {{ currentPage }} / {{ totalPages }} 页</span>
+        <el-button size="mini" @click="changePage(currentPage + 1)"
+          :disabled="currentPage >= totalPages">下一页</el-button>
+      </div>
+      <el-button type="primary" @click="saveAsImage">保存为图片</el-button>
+      <el-button type="success" @click="printWaybill">打印</el-button>
+      <el-button type="warning" @click="exportExcel">导出Excel</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import domtoimage from 'dom-to-image';
+import { PDFDocument } from 'pdf-lib';
+import html2canvas from 'html2canvas';
+import * as XLSX from 'xlsx';
+import ExcelJS from 'exceljs';
+
+export default {
+  props: {
+    // 组件接收完整的发货单内容, 渲染发货单,这个面板内包括一个保存为图片(已经安装了dom-to-image)和一个打印按钮(已经安装了print-js)
+    waybill: {
+      type: Object,
+      default: () => { }
+    },
+    waybillDetails: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      currentPage: 1,
+      perPage: 7,
+      totalPages: 1,
+      // 本地可编辑的发货单数据
+      localWaybill: {
+        consigneeUnit: '',
+        senderUnit: '',
+        deliveryYear: '',
+        deliveryMonth: '',
+        deliveryDay: '',
+        principal: '',
+        principalPhone: '',
+        licensePlate: '',
+        pickupLocation: ''
+      },
+      // 本地可编辑的发货单明细
+      localWaybillDetails: [],
+      // 预览/打印用明细（每页固定7行，不足补空行）
+      displayWaybillDetails: []
+    };
+  },
+  watch: {
+    // 监听props变化，更新本地数据
+    waybill: {
+      handler(newVal) {
+        if (newVal) {
+          this.localWaybill = {
+            consigneeUnit: newVal.consigneeUnit || '',
+            senderUnit: newVal.senderUnit || '',
+            deliveryYear: this.getYearFromDate(newVal.deliveryTime) || '',
+            deliveryMonth: this.getMonthFromDate(newVal.deliveryTime) || '',
+            deliveryDay: this.getDayFromDate(newVal.deliveryTime) || '',
+            principal: newVal.principal || '',
+            principalPhone: newVal.principalPhone || '',
+            licensePlate: newVal.licensePlate || '',
+            pickupLocation: newVal.pickupLocation || '',
+            contractCode: newVal.contractCode || ''
+          };
+        }
+      },
+      immediate: true,
+      deep: true
+    },
+    waybillDetails: {
+      handler(newVal) {
+        if (newVal && Array.isArray(newVal)) {
+          this.localWaybillDetails = [...newVal];
+        } else {
+          this.localWaybillDetails = [];
+        }
+        this.refreshPagination();
+      },
+      immediate: true,
+      deep: true
+    }
+  },
+  methods: {
+    buildPage(details, page) {
+      const perPage = this.perPage;
+      const src = Array.isArray(details) ? details : [];
+      const start = (page - 1) * perPage;
+      const pageRows = src.slice(start, start + perPage).map((x) => ({ ...x }));
+      while (pageRows.length < perPage) {
+        pageRows.push({
+          productName: '',
+          edgeType: '',
+          packageType: '',
+          actualWarehouseName: '',
+          settlementType: '',
+          rawMaterialFactory: '',
+          coilNumber: '',
+          specification: '',
+          material: '',
+          quantity: '',
+          weight: '',
+          unitPrice: ''
+        });
+      }
+      return pageRows;
+    },
+    readWaybill() {
+      const file = this.$refs.file.files[0];
+      if (!file) {
+        return;
+      }
+      const reader = new FileReader();
+      reader.readAsArrayBuffer(file);
+      reader.onload = (e) => {
+        const data = e.target.result;
+        const wb = XLSX.read(data, { type: 'array' });
+        const ws = wb.Sheets[wb.SheetNames[0]];
+        const json = XLSX.utils.sheet_to_eth(ws);
+        console.log(json);
+        // this.localWaybillDetails = json;
+        // this.refreshPagination();
+      };
+      reader.onerror = (e) => {
+        console.error('读取文件失败:', e);
+      };
+    },
+    refreshPagination() {
+      const src = Array.isArray(this.localWaybillDetails) ? this.localWaybillDetails : [];
+      this.totalPages = Math.max(1, Math.ceil(src.length / this.perPage));
+      if (this.currentPage > this.totalPages) this.currentPage = this.totalPages;
+      if (this.currentPage < 1) this.currentPage = 1;
+      this.displayWaybillDetails = this.buildPage(src, this.currentPage);
+    },
+    changePage(next) {
+      this.currentPage = next;
+      this.refreshPagination();
+    },
+    // 从日期字符串中提取年份
+    getYearFromDate(dateStr) {
+      if (dateStr) {
+        const date = new Date(dateStr);
+        return date.getFullYear().toString();
+      }
+      return '';
+    },
+    // 从日期字符串中提取月份
+    getMonthFromDate(dateStr) {
+      if (dateStr) {
+        const date = new Date(dateStr);
+        return (date.getMonth() + 1).toString();
+      }
+      return '';
+    },
+    // 从日期字符串中提取日
+    getDayFromDate(dateStr) {
+      if (dateStr) {
+        const date = new Date(dateStr);
+        return date.getDate().toString();
+      }
+      return '';
+    },
+    // 保存为图片
+    saveAsImage() {
+      const node = this.$refs.waybillRef;
+      // 确保容器在保存图片时能完整显示所有内容
+      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,
+        style: {
+          width: `${contentWidth}px`,
+          height: `${contentHeight}px`,
+          overflow: 'visible'
+        }
+      })
+        .then(dataUrl => {
+          const link = document.createElement('a');
+          link.download = `发货单_${this.waybill.waybillName || this.waybill.waybillNo || Date.now()}.png`;
+          link.href = dataUrl;
+          link.click();
+        })
+        .catch(error => {
+          console.error('保存图片失败:', error);
+          this.$message.error('保存图片失败');
+        })
+        .finally(() => {
+          // 恢复原始样式
+          node.style.width = originalWidth;
+          node.style.overflow = originalOverflow;
+        });
+    },
+    // 打印发货单
+    async printWaybill() {
+      const node = this.$refs.waybillRef;
+      const paperWidthMm = 241;
+      const paperHeightMm = 140;
+      const safeRightMarginMm = 45;
+      const safeLeftPaddingMm = 6;
+      const safeTopShiftMm = 15;
+      const safeContentWidthMm = paperWidthMm - safeRightMarginMm - safeLeftPaddingMm;
+
+      const mmToPx = (mm) => (mm * 96) / 25.4;
+      const mmToPt = 72 / 25.4;
+      const pageWidthPt = paperWidthMm * mmToPt;
+      const pageHeightPt = paperHeightMm * mmToPt;
+
+      const pageWidthPx = Math.round(mmToPx(paperWidthMm));
+      const pageHeightPx = Math.round(mmToPx(paperHeightMm));
+
+      const allDetails = Array.isArray(this.localWaybillDetails) ? this.localWaybillDetails : [];
+      const totalPages = Math.max(1, Math.ceil(allDetails.length / this.perPage));
+
+      const originalPage = this.currentPage;
+      const originalDisplay = this.displayWaybillDetails;
+
+      const pdfDoc = await PDFDocument.create();
+
+      // 强制让容器内容不被裁剪，以便html2canvas完整捕获
+      const originalStyle = { width: node.style.width, overflow: node.style.overflow };
+      const contentEl = node.querySelector('.waybill-content');
+      const originalContentCssText = contentEl ? contentEl.style.cssText : '';
+
+      node.style.width = 'auto';
+      node.style.overflow = 'visible';
+
+      // 针对“导出PDF再打印”的场景：为打印机右侧不可打印区预留约30mm
+      // 通过缩放内容区域（不换行、不省略），让最终PDF右侧自带留白
+      if (contentEl) {
+        contentEl.style.setProperty('--content-width-mm', String(safeContentWidthMm));
+        contentEl.style.setProperty('--offset-x-mm', String(safeLeftPaddingMm));
+        contentEl.style.setProperty('--offset-y-mm', String(safeTopShiftMm));
+      }
+
+      try {
+        for (let page = 1; page <= totalPages; page++) {
+          this.currentPage = page;
+          this.displayWaybillDetails = this.buildPage(allDetails, page);
+          await this.$nextTick();
+
+          // 固定按纸张尺寸截图：右侧留白来自于 contentEl 的缩放（241 -> 211mm），而不是扩大截图宽度
+          const canvas = await html2canvas(node, {
+            backgroundColor: '#ffffff',
+            scale: 3,
+            useCORS: true,
+            willReadFrequently: true,
+            width: pageWidthPx,
+            height: pageHeightPx,
+            windowWidth: pageWidthPx,
+            windowHeight: pageHeightPx,
+            scrollX: 0,
+            scrollY: 0
+          });
+
+          const png = canvas.toDataURL('image/png');
+          const imgPng = await pdfDoc.embedPng(png);
+          const pdfPage = pdfDoc.addPage([pageWidthPt, pageHeightPt]);
+          pdfPage.drawImage(imgPng, {
+            x: 0,
+            y: 0,
+            width: pageWidthPt,
+            height: pageHeightPt
+          });
+        }
+      } finally {
+        // 恢复截图前的容器样式
+        node.style.width = originalStyle.width;
+        node.style.overflow = originalStyle.overflow;
+        if (contentEl) contentEl.style.cssText = originalContentCssText;
+
+        this.currentPage = originalPage;
+        this.displayWaybillDetails = originalDisplay;
+        this.refreshPagination();
+      }
+
+      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 = `发货单_${this.waybill.waybillName || this.waybill.waybillNo || new Date().getTime()}.pdf`;
+        document.body.appendChild(a);
+        a.click();
+        document.body.removeChild(a);
+      }
+    },
+    async exportExcelByXLSX() {
+      try {
+        // ===== 1. 构建真实数据（确保列数为11列：0-10）=====
+        const headerData = [
+          ['科伦普发货单'], // 标题行（r=0）
+          [
+            `收货单位：${this.localWaybill.consigneeUnit || ''}`,
+            undefined, undefined, undefined,
+            `${this.localWaybill.deliveryYear || ''}年${this.localWaybill.deliveryMonth || ''}月${this.localWaybill.deliveryDay || ''}日`,
+            undefined, undefined,
+            `发货单位：${this.localWaybill.senderUnit || ''}`
+          ], // 收货/日期/发货单位行（r=1）
+          [
+            `负责人：${this.localWaybill.principal || ''}`,
+            undefined, undefined,
+            `电话：${this.localWaybill.principalPhone || ''}`,
+            undefined, undefined,
+            `合同号：${this.localWaybill.contractCode || ''}`,
+            undefined,
+            `车牌：${this.localWaybill.licensePlate || ''}`
+          ], // 负责人/电话/合同号/车牌行（r=2）
+          ["品名", '切边', '包装', '仓库位置', '结算', '原料厂家', '卷号', '规格', '材质', '重量(t)', '备注'], // 表格表头（r=3，11列）
+        ];
+
+        // 表格明细行（确保11列）
+        const detailRows = this.displayWaybillDetails.map(item => [
+          item.productName || '',
+          item.edgeType || '',
+          item.packageType || '',
+          item.actualWarehouseName || '',
+          item.settlementType || '',
+          item.rawMaterialFactory || '',
+          item.coilNumber || '',
+          item.specification || '',
+          item.material || '',
+          item.weight || '',
+          item.remark || '' // 第11列：备注，无多余列
+        ]);
+
+        // 底部备注/取货地点/签名栏（确保列数匹配）
+        const footerData = [
+          [
+            '1、品名：冷硬钢卷（酸连轧）、冷轧钢卷（脱脂退火火拉矫）、镀锌卷板，镀锌管料（镀锌分剪料）；2、切边：净边/毛边；3、包装：裸包：周三径四；简包1：周三径四内外护角；简包2：周三径四+防锈纸；普包：周三径四+内外护角+防锈纸+端护板；精包1：周三径四+内外护角+防锈纸+薄膜+端护板+内外护板；精包2：周三径四+内外护角+防锈纸+薄膜+端护板+内外护板+木托。'
+          ], // 备注行
+          [`取货地点：${this.localWaybill.pickupLocation || ''}`], // 取货地点行
+          [
+            `发货：${this.localWaybill.deliveryman || ''}`,
+            undefined, undefined, undefined,
+            `司机：${this.localWaybill.driver || ''}`,
+            undefined, undefined,
+            `磅房：${this.localWaybill.weightRoom || ''}`
+          ] // 签名栏行
+        ];
+
+        // 合并所有数据行
+        const data = [...headerData, ...detailRows, ...footerData];
+        const titleRowIdx = 0;
+        const headerRow1Idx = 1;
+        const headerRow2Idx = 2;
+        const tableHeaderIdx = 3;
+        const remarkRowIdx = 3 + detailRows.length;
+        const pickupRowIdx = remarkRowIdx + 1;
+        const footerRowIdx = pickupRowIdx + 1;
+
+        // ===== 2. 创建工作表并配置合并（核心：e.c改为10，对应最后一列备注）=====
+        const ws = XLSX.utils.aoa_to_sheet(data);
+        ws["!cellStyles"] = true;
+        ws["!merges"] = [
+          { s: { c: 0, r: titleRowIdx }, e: { c: 10, r: titleRowIdx } }, // 标题合并0-10列（无多余）
+          { s: { c: 0, r: headerRow1Idx }, e: { c: 3, r: headerRow1Idx } }, // 收货单位（0-3）
+          { s: { c: 4, r: headerRow1Idx }, e: { c: 6, r: headerRow1Idx } }, // 日期（4-7）
+          { s: { c: 8, r: headerRow1Idx }, e: { c: 10, r: headerRow1Idx } }, // 发货单位（8-10，无多余）
+          { s: { c: 0, r: headerRow2Idx }, e: { c: 2, r: headerRow2Idx } }, // 负责人（0-2）
+          { s: { c: 3, r: headerRow2Idx }, e: { c: 5, r: headerRow2Idx } }, // 电话（3-5）
+          { s: { c: 6, r: headerRow2Idx }, e: { c: 7, r: headerRow2Idx } }, // 合同号（6-8）
+          { s: { c: 9, r: headerRow2Idx }, e: { c: 10, r: headerRow2Idx } }, // 车牌（9-10，无多余）
+          { s: { c: 0, r: remarkRowIdx }, e: { c: 10, r: remarkRowIdx } }, // 备注合并0-10列
+          { s: { c: 0, r: pickupRowIdx }, e: { c: 10, r: pickupRowIdx } }, // 取货地点合并0-10列
+          { s: { c: 0, r: footerRowIdx }, e: { c: 3, r: footerRowIdx } }, // 发货（0-3）
+          { s: { c: 4, r: footerRowIdx }, e: { c: 6, r: footerRowIdx } }, // 司机（4-7）
+          { s: { c: 8, r: footerRowIdx }, e: { c: 10, r: footerRowIdx } }, // 磅房（8-10，无多余）
+        ];
+
+        // ===== 3. 配置列宽（仅11列，对应0-10索引）=====
+        ws['!cols'] = [
+          { wpx: 70 },  // 品名（0）
+          { wpx: 40 },  // 切边（1）
+          { wpx: 50 },  // 包装（2）
+          { wpx: 90 },  // 仓库位置（3）
+          { wpx: 60 },  // 结算（4）
+          { wpx: 70 },  // 原料厂家（5）
+          { wpx: 150 }, // 卷号（6）
+          { wpx: 90 },  // 规格（7）
+          { wpx: 80 },  // 材质（8）
+          { wpx: 70 },  // 重量(t)（9）
+          { wpx: 130 }, // 备注（10）→ 最后一列，无多余
+        ];
+
+        // ===== 4. 单元格样式配置（无修改）=====
+        const createCellStyle = (options = {}) => {
+          const defaultStyle = {
+            font: {
+              name: "SimSun",
+              sz: options.sz || 16,
+              bold: options.bold ?? true,
+            },
+            alignment: {
+              horizontal: options.horizontal || "center",
+              vertical: options.vertical || "center",
+              wrapText: options.wrapText || false,
+            },
+            border: options.border || {
+              top: { style: "thin", color: { rgb: "000000" } },
+              bottom: { style: "thin", color: { rgb: "000000" } },
+              left: { style: "thin", color: { rgb: "000000" } },
+              right: { style: "thin", color: { rgb: "000000" } },
+            },
+          };
+          return defaultStyle;
+        };
+
+        // 标题单元格
+        const titleCell = XLSX.utils.encode_cell({ r: titleRowIdx, c: 0 });
+        ws[titleCell].s = {
+          ...createCellStyle({
+            sz: 24,
+            border: null,
+          }),
+        };
+
+        // 头部信息行
+        const headerCells = [
+          XLSX.utils.encode_cell({ r: headerRow1Idx, c: 0 }),
+          XLSX.utils.encode_cell({ r: headerRow1Idx, c: 4 }),
+          XLSX.utils.encode_cell({ r: headerRow1Idx, c: 8 }),
+          XLSX.utils.encode_cell({ r: headerRow2Idx, c: 0 }),
+          XLSX.utils.encode_cell({ r: headerRow2Idx, c: 3 }),
+          XLSX.utils.encode_cell({ r: headerRow2Idx, c: 6 }),
+          XLSX.utils.encode_cell({ r: headerRow2Idx, c: 9 }),
+        ];
+        headerCells.forEach(cellAddr => {
+          if (ws[cellAddr]) {
+            ws[cellAddr].s = {
+              ...createCellStyle({
+                sz: 18,
+                border: null,
+              }),
+            };
+          }
+        });
+
+        // 表格表头
+        for (let c = 0; c < 11; c++) { // 仅循环0-10列
+          const cellAddr = XLSX.utils.encode_cell({ r: tableHeaderIdx, c });
+          if (ws[cellAddr]) {
+            ws[cellAddr].s = createCellStyle({ sz: 16 });
+          }
+        }
+
+        // 表格明细行
+        for (let r = tableHeaderIdx + 1; r < remarkRowIdx; r++) {
+          for (let c = 0; c < 11; c++) { // 仅循环0-10列
+            const cellAddr = XLSX.utils.encode_cell({ r, c });
+            if (ws[cellAddr]) {
+              ws[cellAddr].s = createCellStyle({ sz: 16 });
+            }
+          }
+        }
+
+        // 备注行
+        const remarkCell = XLSX.utils.encode_cell({ r: remarkRowIdx, c: 0 });
+        if (ws[remarkCell]) {
+          ws[remarkCell].s = {
+            ...createCellStyle({
+              sz: 18,
+              wrapText: true,
+              border: null,
+            }),
+          };
+        }
+
+        // 取货地点行
+        const pickupCell = XLSX.utils.encode_cell({ r: pickupRowIdx, c: 0 });
+        if (ws[pickupCell]) {
+          ws[pickupCell].s = {
+            ...createCellStyle({
+              sz: 18,
+              border: null,
+            }),
+          };
+        }
+
+        // 签名栏行
+        const footerCells = [
+          XLSX.utils.encode_cell({ r: footerRowIdx, c: 0 }),
+          XLSX.utils.encode_cell({ r: footerRowIdx, c: 4 }),
+          XLSX.utils.encode_cell({ r: footerRowIdx, c: 8 }),
+        ];
+        footerCells.forEach(cellAddr => {
+          if (ws[cellAddr]) {
+            ws[cellAddr].s = {
+              ...createCellStyle({
+                sz: 18,
+                border: null,
+              }),
+            };
+          }
+        });
+
+        // ===== 5. 生成Excel并下载（无修改）=====
+        const wb = XLSX.utils.book_new();
+        XLSX.utils.book_append_sheet(wb, ws, "科伦普发货单");
+
+        const excelBuffer = XLSX.write(wb, {
+          bookType: "xlsx",
+          type: "array",
+          cellStyles: true,
+          sheetStubs: true
+        });
+        const blob = new Blob([excelBuffer], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8",
+        });
+
+        const url = URL.createObjectURL(blob);
+        const link = document.createElement("a");
+        link.href = url;
+        link.download = `科伦普发货单_${this.waybill.waybillNo || Date.now()}.xlsx`;
+        document.body.appendChild(link);
+        link.click();
+
+        setTimeout(() => {
+          document.body.removeChild(link);
+          URL.revokeObjectURL(url);
+        }, 100);
+
+      } catch (error) {
+        console.error("Excel导出失败：", error);
+        this.$message.error("导出失败，请重试");
+      }
+    },
+    async exportExcel() {
+      try {
+        // 1. 创建工作簿和工作表
+        const workbook = new ExcelJS.Workbook();
+        const worksheet = workbook.addWorksheet('科伦普发货单');
+        worksheet.properties.defaultRowHeight = 25; // 设置默认行高（匹配Web端行高）
+
+        // 2. 构建数据（复用原有业务数据）
+        const title = `科伦普发货单`; // 标题
+        const header1 = { // 收货单位+日期+发货单位
+          consignee: `收货单位：${this.localWaybill.consigneeUnit || ''}`,
+          date: `${this.localWaybill.deliveryYear || ''}年${this.localWaybill.deliveryMonth || ''}月${this.localWaybill.deliveryDay || ''}日`,
+          sender: `发货单位：${this.localWaybill.senderUnit || ''}`
+        };
+        const header2 = { // 负责人+电话+合同号+车牌
+          principal: `负责人：${this.localWaybill.principal || ''}`,
+          phone: `电话：${this.localWaybill.principalPhone || ''}`,
+          contract: `合同号：${this.localWaybill.contractCode || ''}`,
+          license: `车牌：${this.localWaybill.licensePlate || ''}`
+        };
+        const tableHeader = ["品名", '切边', '包装', '仓库位置', '结算', '原料厂家', '卷号', '规格', '材质', '重量(t)', '备注']; // 表格表头
+        const tableData = this.displayWaybillDetails.map(item => [ // 表格明细
+          item.productName || '',
+          item.edgeType || '',
+          item.packageType || '',
+          item.actualWarehouseName || '',
+          item.settlementType || '',
+          item.rawMaterialFactory || '',
+          item.coilNumber || '',
+          item.specification || '',
+          item.material || '',
+          item.weight || '',
+          // item.unitPrice || '',
+          item.remark || ''
+        ]);
+        const remark = '1、品名：冷硬钢卷（酸连轧）、冷轧钢卷（脱脂退火火拉矫）、镀锌卷板，镀锌管料（镀锌分剪料）；2、切边：净边/毛边；3、包装：裸包：周三径四；简包1：周三径四内外护角；简包2：周三径四+防锈纸；普包：周三径四+内外护角+防锈纸+端护板；精包1：周三径四+内外护角+防锈纸+薄膜+端护板+内外护板；精包2：周三径四+内外护角+防锈纸+薄膜+端护板+内外护板+木托。';
+        const pickupLocation = `取货地点：${this.localWaybill.pickupLocation || ''}`;
+        const footer = { // 签名栏
+          deliveryman: `发货：${this.localWaybill.deliveryman || ''}`,
+          driver: `司机：${this.localWaybill.driver || ''}`,
+          weightRoom: `磅房：${this.localWaybill.weightRoom || ''}`
+        };
+
+        // 3. 写入数据到工作表（按行写入）
+        let rowIdx = 1; // exceljs行号从1开始
+        // 3.1 标题行（第1行）
+        const titleCell = worksheet.getCell(`A${rowIdx}`);
+        titleCell.value = title;
+        worksheet.mergeCells(`A${rowIdx}:K${rowIdx}`); // 合并A1-K1
+        // 3.2 收货单位行（第2行）
+        rowIdx++;
+        worksheet.getCell(`A${rowIdx}`).value = header1.consignee;
+        worksheet.getCell(`E${rowIdx}`).value = header1.date;
+        worksheet.getCell(`I${rowIdx}`).value = header1.sender;
+        worksheet.mergeCells(`A${rowIdx}:D${rowIdx}`); // 收货单位：A2-D2
+        worksheet.mergeCells(`E${rowIdx}:H${rowIdx}`); // 日期：E2-H2
+        worksheet.mergeCells(`I${rowIdx}:K${rowIdx}`); // 发货单位：I2-L2
+        // 3.3 负责人行（第3行）
+        rowIdx++;
+        worksheet.getCell(`A${rowIdx}`).value = header2.principal;
+        worksheet.getCell(`D${rowIdx}`).value = header2.phone;
+        worksheet.getCell(`G${rowIdx}`).value = header2.contract;
+        worksheet.getCell(`J${rowIdx}`).value = header2.license;
+        worksheet.mergeCells(`A${rowIdx}:C${rowIdx}`); // 负责人：A3-C3
+        worksheet.mergeCells(`D${rowIdx}:F${rowIdx}`); // 电话：D3-F3
+        worksheet.mergeCells(`G${rowIdx}:I${rowIdx}`); // 合同号：G3-I3
+        worksheet.mergeCells(`J${rowIdx}:K${rowIdx}`); // 车牌：J3-L3
+        // 3.4 表格表头（第4行）
+        rowIdx++;
+        tableHeader.forEach((text, colIdx) => {
+          const colLetter = String.fromCharCode(65 + colIdx); // A=65, B=66...
+          worksheet.getCell(`${colLetter}${rowIdx}`).value = text;
+        });
+        // 3.5 表格明细行
+        tableData.forEach(item => {
+          rowIdx++;
+          item.forEach((text, colIdx) => {
+            const colLetter = String.fromCharCode(65 + colIdx);
+            worksheet.getCell(`${colLetter}${rowIdx}`).value = text;
+          });
+        });
+        // 3.6 备注行
+        rowIdx++;
+        const remarkCell = worksheet.getCell(`A${rowIdx}`);
+        remarkCell.value = remark;
+        worksheet.mergeCells(`A${rowIdx}:K${rowIdx}`); // 合并A*_L*
+        // 3.7 取货地点行
+        rowIdx++;
+        const pickupCell = worksheet.getCell(`A${rowIdx}`);
+        pickupCell.value = pickupLocation;
+        worksheet.mergeCells(`A${rowIdx}:K${rowIdx}`); // 合并A*_L*
+        // 3.8 签名栏行
+        rowIdx++;
+        worksheet.getCell(`A${rowIdx}`).value = footer.deliveryman;
+        worksheet.getCell(`E${rowIdx}`).value = footer.driver;
+        worksheet.getCell(`I${rowIdx}`).value = footer.weightRoom;
+        worksheet.mergeCells(`A${rowIdx}:D${rowIdx}`); // 发货：A*_D*
+        worksheet.mergeCells(`E${rowIdx}:H${rowIdx}`); // 司机：E*_H*
+        worksheet.mergeCells(`I${rowIdx}:K${rowIdx}`); // 磅房：I*_L*
+
+        // 4. 配置列宽（完全匹配Web端）
+        const columnWidths = [70, 60, 50, 90, 70, 70, 150, 90, 80, 70, 60];
+        worksheet.columns = columnWidths.map((width, idx) => ({
+          key: `col${idx + 1}`,
+          width: width / 5 // exceljs的width单位是字符宽度，转换为px（约1px=0.072字符）
+        }));
+
+        // 5. 配置样式（核心：匹配Web端）
+        // 工具函数：设置单元格样式
+        const setCellStyle = (cell, options = {}) => {
+          // 默认样式：宋体、加粗、居中
+          cell.font = {
+            name: 'SimSun', // 宋体（匹配Web端）
+            size: options.size || 16, // 默认16px（表格单元格）
+            bold: options.bold ?? true // 默认加粗
+          };
+          cell.alignment = {
+            horizontal: options.horizontal || 'left', // 水平居中
+            vertical: options.vertical || 'middle', // 垂直居中
+            wrapText: options.wrapText || false // 自动换行
+          };
+          // 边框：表格单元格带边框，其他区域无边框
+          if (options.border) {
+            cell.border = {
+              top: { style: 'thin', color: { argb: 'FF000000' } },
+              bottom: { style: 'thin', color: { argb: 'FF000000' } },
+              left: { style: 'thin', color: { argb: 'FF000000' } },
+              right: { style: 'thin', color: { argb: 'FF000000' } }
+            };
+          } else {
+            cell.border = null; // 无边框
+          }
+        };
+
+        // 5.1 标题样式（24px、宋体、加粗、居中、无边框）
+        setCellStyle(worksheet.getCell('A1'), { size: 24, border: false, horizontal: 'center' });
+        // 5.2 头部信息样式（18px、宋体、加粗、居中、无边框）
+        setCellStyle(worksheet.getCell(`A2`), { size: 18, border: false });
+        setCellStyle(worksheet.getCell(`E2`), { size: 18, border: false });
+        setCellStyle(worksheet.getCell(`I2`), { size: 18, border: false });
+        setCellStyle(worksheet.getCell(`A3`), { size: 18, border: false });
+        setCellStyle(worksheet.getCell(`D3`), { size: 18, border: false });
+        setCellStyle(worksheet.getCell(`G3`), { size: 18, border: false });
+        setCellStyle(worksheet.getCell(`J3`), { size: 18, border: false });
+        // 5.3 表格表头样式（16px、宋体、加粗、居中、带边框）
+        for (let col = 0; col < 11; col++) {
+          const colLetter = String.fromCharCode(65 + col);
+          setCellStyle(worksheet.getCell(`${colLetter}4`), { size: 16, border: true, horizontal: 'center' });
+        }
+        // 5.4 表格明细样式（16px、宋体、加粗、居中、带边框）
+        for (let r = 5; r < rowIdx - 2; r++) { // 明细行范围：第5行到备注行前一行
+          for (let col = 0; col < 11; col++) {
+            const colLetter = String.fromCharCode(65 + col);
+            setCellStyle(worksheet.getCell(`${colLetter}${r}`), { size: 16, border: true, horizontal: 'center' });
+          }
+        }
+        // 5.5 备注样式（18px、宋体、加粗、居中、自动换行、无边框）
+        setCellStyle(remarkCell, { size: 18, border: false, wrapText: true });
+        // 5.6 取货地点样式（18px、宋体、加粗、居中、无边框）
+        setCellStyle(pickupCell, { size: 18, border: false });
+        // 5.7 签名栏样式（18px、宋体、加粗、居中、无边框）
+        setCellStyle(worksheet.getCell(`A${rowIdx}`), { size: 18, border: false });
+        setCellStyle(worksheet.getCell(`E${rowIdx}`), { size: 18, border: false });
+        setCellStyle(worksheet.getCell(`I${rowIdx}`), { size: 18, border: false });
+
+        // 第一行的行高
+        const row1 = worksheet.getRow(1);
+        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], {
+          type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+        });
+        const url = URL.createObjectURL(blob);
+        const link = document.createElement('a');
+        link.href = url;
+        link.download = `科伦普发货单_${this.waybill.waybillNo || Date.now()}.xlsx`;
+        document.body.appendChild(link);
+        link.click();
+        // 清理资源
+        setTimeout(() => {
+          document.body.removeChild(link);
+          URL.revokeObjectURL(url);
+        }, 100);
+
+      } catch (error) {
+        console.error('Excel导出失败：', error);
+        this.$message.error('导出失败，请重试');
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.waybill-container {
+  width: 241mm;
+  height: 140mm;
+  margin: 0 auto;
+  padding: 0;
+  background: #fff;
+  box-shadow: none;
+  font-family: SimSun, "Courier New", monospace;
+  overflow: hidden;
+  color: #000 !important;
+  font-weight: 900 !important;
+  box-sizing: border-box;
+}
+
+.title {
+  text-align: center;
+  font-size: 24px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+
+.waybill-content {
+  --paper-width-mm: 241;
+  --content-width-mm: 241;
+  --offset-x-mm: 0;
+  --offset-y-mm: 0;
+  --scale: calc(var(--content-width-mm) / var(--paper-width-mm));
+
+  width: calc(var(--paper-width-mm) * 1mm);
+  transform-origin: top left;
+  transform: translate(calc(var(--offset-x-mm) * 1mm), calc(var(--offset-y-mm) * 1mm)) scale(var(--scale));
+}
+
+.waybill-content * {
+  box-sizing: border-box;
+}
+
+/* 头部样式 */
+.waybill-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 3mm;
+  font-size: 11px;
+}
+
+.header-left,
+.header-right {
+  display: flex;
+  align-items: center;
+}
+
+.header-center {
+  display: flex;
+  align-items: center;
+  gap: 5px;
+}
+
+.label {
+  font-weight: bold;
+  display: inline-block;
+  width: 100px;
+  font-size: 18px;
+  text-align: right;
+  white-space: nowrap;
+}
+
+.date-label {
+  width: 1em;
+}
+
+/* 可编辑输入框样式 */
+.editable-input {
+  padding: 4px 8px;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  font-size: 18px;
+  font-weight: bold;
+  font-family: SimSun, serif;
+  outline: none;
+  transition: all 0.2s;
+  line-height: 18px;
+  border-bottom: 1px dashed #dcdfe6;
+}
+
+.editable-input:focus {
+  border-color: #409eff;
+}
+
+.date-input {
+  width: 40px;
+  text-align: center;
+  margin-right: 5px;
+}
+
+/* 透明输入框样式 */
+.transparent-input {
+  border: none;
+  border-radius: 0;
+  background-color: transparent;
+}
+
+.transparent-input:focus {
+  border-bottom-color: #409eff;
+  background-color: rgba(64, 158, 255, 0.05);
+}
+
+/* 表格样式 */
+.waybill-table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-bottom: 2mm;
+  font-size: 10px;
+  table-layout: fixed;
+}
+
+.waybill-table th,
+.waybill-table td {
+  border: 0.4px solid #000;
+  box-sizing: border-box;
+  line-height: 6mm;
+  text-align: center;
+  vertical-align: middle;
+  font-size: 16px;
+  font-weight: 900;
+  padding: 0;
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+/* 表格列宽设置 */
+.waybill-table th:nth-child(1),
+.waybill-table td:nth-child(1) {
+  width: 70px;
+  /* 品名 */
+}
+
+.waybill-table th:nth-child(2),
+.waybill-table td:nth-child(2) {
+  width: 60px;
+  /* 切边 */
+}
+
+.waybill-table th:nth-child(3),
+.waybill-table td:nth-child(3) {
+  width: 50px;
+  /* 包装 */
+}
+
+.waybill-table th:nth-child(4),
+.waybill-table td:nth-child(4) {
+  width: 90px;
+  /* 仓库位置 */
+}
+
+.waybill-table th:nth-child(5),
+.waybill-table td:nth-child(5) {
+  width: 80px;
+  /* 结算 */
+}
+
+.waybill-table th:nth-child(6),
+.waybill-table td:nth-child(6) {
+  width: 70px;
+  /* 原料厂家 */
+}
+
+.waybill-table th:nth-child(7),
+.waybill-table td:nth-child(7) {
+  width: 150px;
+  /* 卷号 */
+}
+
+.waybill-table th:nth-child(8),
+.waybill-table td:nth-child(8) {
+  width: 90px;
+  /* 规格 */
+}
+
+.waybill-table th:nth-child(9),
+.waybill-table td:nth-child(9) {
+  width: 80px;
+  /* 材质 */
+}
+
+/* 数量（件） */
+/* .waybill-table th:nth-child(10),
+.waybill-table td:nth-child(10) {
+  width: 60px;
+
+} */
+
+/* 重量（kg） */
+.waybill-table th:nth-child(10),
+.waybill-table td:nth-child(10) {
+  width: 70px;
+
+}
+
+/* 单价 */
+/* .waybill-table th:nth-child(11),
+.waybill-table td:nth-child(11) {
+  width: 50px;
+} */
+
+/* 备注 */
+.waybill-table th:nth-child(11),
+.waybill-table td:nth-child(11) {
+  /* width: 40px; */
+}
+
+
+.waybill-table th {
+  background-color: #f5f7fa;
+  font-weight: bold;
+}
+
+.waybill-table tr:nth-child(even) {
+  background-color: #fafafa;
+}
+
+/* 表格输入框样式 */
+.table-input {
+  box-sizing: border-box;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  border: none;
+  outline: none;
+  background: transparent;
+  /* font-family: inherit; */
+  font-size: 16px;
+  line-height: 6mm;
+  text-align: center;
+  vertical-align: middle;
+}
+
+.transparent-input {
+  border: none !important;
+  background: transparent !important;
+  padding: 0 !important;
+  margin: 0 !important;
+  height: 100% !important;
+  line-height: 6mm !important;
+  vertical-align: middle !important;
+}
+
+.waybill-table th,
+.waybill-table td {
+  padding: 0 !important;
+  margin: 0 !important;
+  line-height: 6mm !important;
+  height: 6mm;
+  vertical-align: middle !important;
+}
+
+.waybill-table input {
+  vertical-align: middle !important;
+  height: 6mm !important;
+  line-height: 6mm !important;
+  padding: 0 2px !important;
+  margin: 0 !important;
+  border: none !important;
+  background: transparent !important;
+  box-shadow: none !important;
+  width: 100% !important;
+  max-width: 100% !important;
+  overflow: hidden !important;
+  text-overflow: ellipsis !important;
+  white-space: nowrap !important;
+}
+
+.waybill-table input:focus {
+  outline: none !important;
+  box-shadow: none !important;
+  border: 1px dashed #999 !important;
+}
+
+/* 无数据样式 */
+.no-data {
+  height: 200px;
+  vertical-align: middle;
+}
+
+.no-data-content {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+}
+
+/* 表格单元格操作区 */
+.table-cell-with-action {
+  display: flex;
+  align-items: center;
+  gap: 5px;
+}
+
+/* 备注样式 */
+.waybill-remarks {
+  margin-bottom: 30px;
+  font-size: 18px;
+  line-height: 1.5;
+  /* font-weight: 600; */
+  font-weight: bold;
+  text-align: justify;
+}
+
+.waybill-remarks p {
+  margin: 5px 0;
+}
+
+/* 底部签名样式 */
+.waybill-footer {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20px;
+  font-size: 18px;
+}
+
+.waybill-pickup-location {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 10px;
+  font-size: 18px;
+}
+
+
+
+.waybill-pickup-location label {
+  font-size: 18px;
+  /* margin-right: 10px; */
+  text-align: left !important;
+  width: 40px;
+}
+
+.footer-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 10px;
+  width: 200px;
+}
+
+.footer-item.inline {
+  flex-direction: row;
+  align-items: center;
+  width: auto;
+}
+
+.footer-item .label {
+  font-size: 18px;
+  margin-right: 10px;
+  width: 40px;
+}
+
+.signature-input {
+  min-width: 150px;
+}
+
+.full-input {
+  /* 占满本行的剩余空间，父容器不是flex */
+  flex: 1;
+}
+
+/* 操作按钮样式 */
+.waybill-actions {
+  display: flex;
+  justify-content: center;
+  gap: 20px;
+  margin-top: 30px;
+}
+
+/* 添加明细按钮 */
+.add-detail-btn {
+  display: flex;
+  justify-content: center;
+  margin-bottom: 20px;
+}
+
+/* 打印样式 */
+@page {
+  size: 241mm 140mm;
+  margin: 0;
+}
+
+@media print {
+
+  html,
+  body {
+    margin: 0;
+    padding: 0;
+  }
+
+  /* 打印机通常存在不可打印区：这里右侧预留30mm安全边距，避免右侧被裁 */
+  .waybill-container {
+    width: 241mm;
+    height: 140mm;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
+  }
+
+  .waybill-content {
+    --paper-width-mm: 241;
+    /* 右侧预留约30mm不可打印区：241 - 30 = 211 */
+    --content-width-mm: 211;
+    --offset-x-mm: 0;
+    --offset-y-mm: 0;
+    --scale: calc(var(--content-width-mm) / var(--paper-width-mm));
+
+    width: calc(var(--paper-width-mm) * 1mm);
+    transform-origin: top left;
+    transform: translate(calc(var(--offset-x-mm) * 1mm), calc(var(--offset-y-mm) * 1mm)) scale(var(--scale));
+  }
+
+  /* 打印时不要省略：允许换行并让行高/高度自适应 */
+  .waybill-table th,
+  .waybill-table td {
+    white-space: normal !important;
+    overflow: visible !important;
+    text-overflow: clip !important;
+    height: auto !important;
+    line-height: 1.2 !important;
+  }
+
+  .waybill-table input {
+    white-space: normal !important;
+    overflow: visible !important;
+    text-overflow: clip !important;
+  }
+
+  .waybill-footer {
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 15px;
+  }
+
+  .footer-item.inline {
+    width: 100%;
+  }
+
+  .label {
+    width: auto;
+    text-align: left;
+  }
+}
+</style>
diff --git a/klp-ui/src/views/wms/delivery/waybill/index.vue b/klp-ui/src/views/wms/delivery/waybill/index.vue
index 0999fb0d..30360a28 100644
--- a/klp-ui/src/views/wms/delivery/waybill/index.vue
+++ b/klp-ui/src/views/wms/delivery/waybill/index.vue
@@ -72,6 +72,8 @@
               <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-view"
+                  @click.stop="handlePrintSimple(scope.row)">简单打印</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"
@@ -134,7 +136,8 @@
 
     <!-- 打印发货单对话框 -->
     <el-dialog title="打印发货单" :visible.sync="printDialogVisible" width="1000px" append-to-body center>
-      <WayBill :waybill="currentWaybill" :waybillDetails="currentWaybillDetails" />
+      <WayBill v-if="printType === 0" :waybill="currentWaybill" :waybillDetails="currentWaybillDetails" />
+      <WayBill2 v-else :waybill="currentWaybill" :waybillDetails="currentWaybillDetails" />
     </el-dialog>
   </div>
 </template>
@@ -148,6 +151,8 @@ import MemoInput from "@/components/MemoInput";
 import DeliveryWaybillDetail from "../components/detailTable.vue";
 import WayBill from "../components/wayBill.vue";
 import PlanList from "../components/planList.vue";
+import WayBill2 from "../components/wayBill2.vue";
+
 
 export default {
   name: "DeliveryWaybill",
@@ -155,7 +160,8 @@ export default {
     MemoInput,
     DeliveryWaybillDetail,
     WayBill,
-    PlanList
+    PlanList,
+    WayBill2
   },
   data() {
     return {
@@ -182,6 +188,8 @@ export default {
       currentWaybillDetails: [],
       // 弹出层标题
       title: "",
+      // 打印类型
+      printType: 0,
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -422,6 +430,65 @@ export default {
     /** 打印发货单 */
     handlePrint(row) {
       this.loading = true;
+      this.printType = 0;
+      // 获取发货单明细
+      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;
+      });
+    },
+        /** 打印发货单 */
+    handlePrintSimple(row) {
+      this.loading = true;
+      this.printType = 1;
       // 获取发货单明细
       listDeliveryWaybillDetail({
         waybillId: row.waybillId,