From cf6e6d39438d0f2e1ec916af00583beaf2fb1a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 2 Feb 2026 15:59:03 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat(wayBill):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E5=92=8C=E5=8F=B8=E6=9C=BA=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=B9=B6=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加"科伦普发货单"标题
- 在页脚添加司机输入字段
- 调整分页每页显示数量为8
- 优化字体粗细和颜色样式
---
 .../views/wms/delivery/components/wayBill.vue | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/klp-ui/src/views/wms/delivery/components/wayBill.vue b/klp-ui/src/views/wms/delivery/components/wayBill.vue
index 1fd725db..e18176d6 100644
--- a/klp-ui/src/views/wms/delivery/components/wayBill.vue
+++ b/klp-ui/src/views/wms/delivery/components/wayBill.vue
@@ -4,6 +4,8 @@
     <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>
@@ -119,6 +121,10 @@
           <span class="label">发货：</span>
           <input type="text" class="editable-input signature-input transparent-input" />
         </div>
+        <div class="footer-item inline">
+          <span class="label">司机：</span>
+          <input type="text" class="editable-input signature-input transparent-input" />
+        </div>
         <div class="footer-item inline">
           <span class="label">磅房：</span>
           <input type="text" class="editable-input signature-input transparent-input" />
@@ -159,7 +165,7 @@ export default {
   data() {
     return {
       currentPage: 1,
-      perPage: 10,
+      perPage: 8,
       totalPages: 1,
       // 本地可编辑的发货单数据
       localWaybill: {
@@ -423,9 +429,18 @@ export default {
   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;
@@ -482,6 +497,7 @@ export default {
   border: 1px solid #dcdfe6;
   border-radius: 4px;
   font-size: 16px;
+  font-weight: bold;
   font-family: SimSun, serif;
   outline: none;
   transition: all 0.2s;
@@ -527,6 +543,7 @@ export default {
   text-align: center;
   vertical-align: middle;
   font-size: 16px;
+  font-weight: 900;
   padding: 0;
   overflow: hidden;
   white-space: nowrap;

From 81ff9b5944cbdca1b1ff8d063ee50ca31afe97f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 2 Feb 2026 15:59:27 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat(wms):=20=E6=96=B0=E5=A2=9E=E9=95=80?=
 =?UTF-8?q?=E9=94=8C=E9=92=A2=E5=8D=B7=E6=8A=A5=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

实现镀锌钢卷报表功能，包括查询条件表单、统计信息展示和钢卷明细表格
支持按时间范围、钢卷号、库位、产品信息等多条件查询
提供数据导出功能
---
 klp-ui/src/views/wms/report/zinc_.vue | 229 ++++++++++++++++++++++++++
 1 file changed, 229 insertions(+)
 create mode 100644 klp-ui/src/views/wms/report/zinc_.vue

diff --git a/klp-ui/src/views/wms/report/zinc_.vue b/klp-ui/src/views/wms/report/zinc_.vue
new file mode 100644
index 00000000..6af79f67
--- /dev/null
+++ b/klp-ui/src/views/wms/report/zinc_.vue
@@ -0,0 +1,229 @@
+<template>
+  <div class="app-container" v-loading="loading">
+    <el-row>
+      <el-form label-width="80px" inline>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeStart" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeEnd" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="入场钢卷号" prop="endTime">
+          <el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
+            placeholder="请输入入场钢卷号" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="当前钢卷号" prop="endTime">
+          <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="逻辑库位" prop="endTime">
+          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
+            style="width: 100%; display: inline-block; width: 200px;" clearable />
+        </el-form-item>
+        <el-form-item label="产品名称" prop="endTime">
+          <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="规格" prop="endTime">
+          <memo-input style="width: 200px;" v-model="queryParams.itemSpecification" storageKey="coilSpec"
+            placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="材质" prop="endTime">
+          <muti-select style="width: 200px;" v-model="queryParams.itemMaterial" :options="dict.type.coil_material"
+            placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="厂家" prop="endTime">
+          <muti-select style="width: 200px;" v-model="queryParams.itemManufacturer"
+            :options="dict.type.coil_manufacturer" placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <!-- <el-form-item label="收货计划" prop="planId">
+          <el-select style="width: 200px;" v-model="queryParams.planId" placeholder="请输入计划名称搜索收货计划" filterable remote
+            :remote-method="remoteMethod">
+            <el-option v-for="item in planList" :key="item.planId" :label="item.planName" :value="item.planId" />
+          </el-select>
+        </el-form-item> -->
+        <el-form-item prop="endTime">
+          <el-button type="primary" @click="getList">查询</el-button>
+          <el-button type="primary" @click="exportData">导出</el-button>
+        </el-form-item>
+      </el-form>
+    </el-row>
+
+    <el-descriptions title="统计信息" :column="3" border>
+      <el-descriptions-item label="总钢卷数量">{{ summary.totalCount }}</el-descriptions-item>
+      <el-descriptions-item label="总重">{{ summary.totalWeight }}t</el-descriptions-item>
+      <el-descriptions-item label="均重">{{ summary.avgWeight }}t</el-descriptions-item>
+    </el-descriptions>
+
+    <el-descriptions title="明细信息" :column="3" border>
+    </el-descriptions>
+    <el-table :data="list" border height="calc(100vh - 320px)">
+      <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
+        <template slot-scope="scope">
+          <coil-no :coil-no="scope.row.enterCoilNo"></coil-no>
+        </template>
+      </el-table-column>
+      <el-table-column label="当前钢卷号" align="center" prop="currentCoilNo">
+        <template slot-scope="scope">
+          <coil-no :coil-no="scope.row.currentCoilNo"></coil-no>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="逻辑库位" align="center" prop="warehouseName" />
+      <!-- <el-table-column label="实际库区" align="center" prop="actualWarehouseName" /> -->
+      <el-table-column label="产品类型" align="center" width="250">
+        <template slot-scope="scope">
+          <ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row.product" />
+          <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial" />
+        </template>
+      </el-table-column>
+      <el-table-column label="重量 (吨)" align="center" prop="netWeight" />
+      <el-table-column label="长度 (米)" align="center" prop="length" />
+      <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
+      <!-- <el-table-column label="出库状态" align="center" prop="status">
+        <template slot-scope="scope">
+          {{ scope.row.status === 0 ? '在库' : '已出库' }}
+        </template>
+      </el-table-column> -->
+      <el-table-column label="更新人" align="center" prop="updateByName" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" />
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { listCoilWithIds } from "@/api/wms/coil";
+import {
+  listPendingAction,
+} from '@/api/wms/pendingAction';
+import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
+import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
+import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
+import MemoInput from "@/components/MemoInput";
+import MutiSelect from "@/components/MutiSelect";
+import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
+import { listDeliveryPlan } from '@/api/wms/deliveryPlan'
+
+export default {
+  components: {
+    ProductInfo,
+    RawMaterialInfo,
+    CoilNo,
+    MemoInput,
+    MutiSelect,
+    WarehouseSelect,
+  },
+  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
+  data() {
+    // 工具函数：个位数补零，保证格式统一（比如 9 → 09，5 → 05）
+    const addZero = (num) => num.toString().padStart(2, '0')
+
+    const now = new Date() // 当前本地北京时间
+    // 核心：获取【昨天】的日期对象（自动处理跨月/跨年，无边界问题）
+    const yesterday = new Date(now)
+    yesterday.setDate(yesterday.getDate() - 1)
+
+    // 昨天的年、月、日（补零格式化）
+    const yesYear = yesterday.getFullYear()
+    const yesMonth = addZero(yesterday.getMonth() + 1)
+    const yesDay = addZero(yesterday.getDate())
+
+    // 今天的年、月、日（补零格式化）
+    const nowYear = now.getFullYear()
+    const nowMonth = addZero(now.getMonth() + 1)
+    const nowDay = addZero(now.getDate())
+
+    // ✅ 目标时间区间：昨天早上6点 至 今天早上6点
+    const startTime = `${yesYear}-${yesMonth}-${yesDay} 07:00:00`
+    const endTime = `${nowYear}-${nowMonth}-${nowDay} 07:00:00`
+    return {
+      list: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 9999,
+        // status: 1,
+        byCreateTimeStart: startTime,
+        byCreateTimeEnd: endTime,
+        selectType: 'raw_material',
+        enterCoilNo: '',
+        currentCoilNo: '',
+        warehouseId: '',
+        productName: '',
+        itemSpecification: '',
+        itemMaterial: '',
+        itemManufacturer: '',
+        planId: '',
+      },
+      planList: [],
+      loading: false,
+    }
+  },
+  computed: {
+    summary() {
+      // 总钢卷数量、总重、均重
+      const totalCount = this.list.length
+      const totalWeight = this.list.reduce((acc, cur) => acc + parseFloat(cur.netWeight), 0)
+      const avgWeight = totalCount > 0 ? (totalWeight / totalCount).toFixed(2) : 0
+      return {
+        totalCount,
+        totalWeight: totalWeight.toFixed(2),
+        avgWeight,
+      }
+    }
+  },
+  methods: {
+    remoteMethod(query) {
+      listDeliveryPlan({ planName: query, pageNum: 1, pageSize: 5, planType: 1 }).then(res => {
+        this.planList = res.rows
+      })
+    },
+    getList() {
+      this.loading = true
+      listPendingAction({
+        // actionStatus: 2,
+        warehouseId: this.queryParams.planId,
+        // actionType: 401,
+        actionType: 501, // 镀锌工序
+        pageSize: 999,
+        pageNum: 1,
+        startTime: this.queryParams.byCreateTimeStart,
+        endTime: this.queryParams.byCreateTimeEnd,
+      }).then(res => {
+        const actions = res.rows
+        const coilIds = actions.map(item => item.coilId).join(',')
+        console.log(coilIds)
+        if (!coilIds) {
+          this.$message({
+            message: '暂无数据',
+            type: 'warning',
+          })
+          this.list = []
+          this.loading = false
+          return
+        }
+        listCoilWithIds({
+          ...this.queryParams,
+          coilIds: coilIds,
+        }).then(res => {
+          this.list = res.rows
+          this.loading = false
+        })
+      })
+    },
+    // 导出
+    exportData() {
+      this.download('wms/materialCoil/export', {
+        coilIds: this.list.map(item => item.coilId).join(',')
+      }, `materialCoil_${new Date().getTime()}.xlsx`)
+    },
+  },
+  mounted() {
+    this.getList()
+    this.remoteMethod('')
+  }
+}
+</script>
+
+<style scoped></style>

From a6002710f2a0faff45376f05b8e6fc1f7c731a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 2 Feb 2026 17:04:38 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix(crm):=20=E4=BF=AE=E6=94=B9=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=88=97=E6=A0=87=E7=AD=BE=E4=BB=8E"=E5=88=B0?=
 =?UTF-8?q?=E6=9C=9F=E6=97=A5"=E5=92=8C"=E5=BA=94=E6=94=B6=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D"=E4=B8=BA"=E6=94=B6=E6=AC=BE=E6=97=A5=E6=9C=9F"?=
 =?UTF-8?q?=E5=92=8C"=E6=94=B6=E6=AC=BE=E9=87=91=E9=A2=9D"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除日期标签显示逻辑，仅保留日期格式化显示
---
 klp-ui/src/views/crm/components/ReceiveTable.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/klp-ui/src/views/crm/components/ReceiveTable.vue b/klp-ui/src/views/crm/components/ReceiveTable.vue
index 77eb27a1..9a60ec38 100644
--- a/klp-ui/src/views/crm/components/ReceiveTable.vue
+++ b/klp-ui/src/views/crm/components/ReceiveTable.vue
@@ -70,14 +70,14 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="应收ID" align="center" prop="receivableId" v-if="false"/>
       <!-- <el-table-column label="客户" align="center" prop="customerName" /> -->
-      <el-table-column label="到期日" align="center" prop="dueDate" width="180">
+      <el-table-column label="收款日期" align="center" prop="dueDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.dueDate, '{y}-{m}-{d}') }}</span>
-          <el-tag v-if="new Date(scope.row.dueDate) < new Date()" type="danger">过期</el-tag>
-          <el-tag v-else-if="new Date(scope.row.dueDate) > new Date()" type="success">还剩{{ parseInt((new Date(scope.row.dueDate) - new Date()) / (1000 * 60 * 60 * 24)) }}天</el-tag>
+          <!-- <el-tag v-if="new Date(scope.row.dueDate) < new Date()" type="danger">过期</el-tag>
+          <el-tag v-else-if="new Date(scope.row.dueDate) > new Date()" type="success">还剩{{ parseInt((new Date(scope.row.dueDate) - new Date()) / (1000 * 60 * 60 * 24)) }}天</el-tag> -->
         </template>
       </el-table-column>
-      <el-table-column label="应收金额" align="center" prop="amount" />
+      <el-table-column label="收款金额" align="center" prop="amount" />
       <!-- <el-table-column label="已收金额" align="center" prop="paidAmount" /> -->
       <!-- <el-table-column label="未收金额" align="center" prop="balanceAmount" /> -->
       <!-- <el-table-column label="状态" align="center" prop="status" /> -->
@@ -122,7 +122,7 @@
             v-model="form.dueDate"
             type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择到期日">
+            placeholder="请选择收款日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="收款金额" prop="amount">

From ab78df57a9b8a9194053a6131b8b50427c462cdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 2 Feb 2026 17:23:21 +0800
Subject: [PATCH 4/5] =?UTF-8?q?refactor(wms):=20=E5=B0=86=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86=E6=9B=BF=E6=8D=A2=E4=B8=BA=E5=8F=AF=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91div=E5=B9=B6=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将所有input元素替换为contenteditable的div元素
- 统一调整字体大小从16px到18px
- 调整表格行边框样式
- 修改每页显示数量从8改为7
---
 .../views/wms/delivery/components/wayBill.vue | 77 +++++++++----------
 1 file changed, 38 insertions(+), 39 deletions(-)

diff --git a/klp-ui/src/views/wms/delivery/components/wayBill.vue b/klp-ui/src/views/wms/delivery/components/wayBill.vue
index e18176d6..a28a82a5 100644
--- a/klp-ui/src/views/wms/delivery/components/wayBill.vue
+++ b/klp-ui/src/views/wms/delivery/components/wayBill.vue
@@ -9,34 +9,34 @@
       <div class="waybill-header">
         <div class="header-left">
           <span class="label">收货单位：</span>
-          <input type="text" class="editable-input transparent-input" v-model="localWaybill.consigneeUnit" />
+          <div class="editable-input transparent-input" contenteditable>{{ localWaybill.consigneeUnit }}</div>
         </div>
         <div class="header-center">
-          <input type="text" class="editable-input date-input transparent-input" v-model="localWaybill.deliveryYear" />
+          <div class="editable-input date-input transparent-input" contenteditable>{{ localWaybill.deliveryYear }}</div>
           <span class="label date-label">年</span>
-          <input type="text" class="editable-input date-input transparent-input" v-model="localWaybill.deliveryMonth" />
+          <div class="editable-input date-input transparent-input" contenteditable>{{ localWaybill.deliveryMonth }}</div>
           <span class="label date-label">月</span>
-          <input type="text" class="editable-input date-input transparent-input" v-model="localWaybill.deliveryDay" />
+          <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>
-          <input type="text" class="editable-input transparent-input" v-model="localWaybill.senderUnit" />
+          <div class="editable-input transparent-input" contenteditable>{{ localWaybill.senderUnit }}</div>
         </div>
       </div>
 
       <div class="waybill-header">
         <div class="header-left">
           <span class="label">负责人：</span>
-          <input type="text" class="editable-input transparent-input" v-model="localWaybill.principal" />
+          <div class="editable-input transparent-input" contenteditable>{{ localWaybill.principal }}</div>
         </div>
         <div class="header-right">
           <span class="label">电话：</span>
-          <input type="text" class="editable-input transparent-input" v-model="localWaybill.principalPhone" />
+          <div class="editable-input transparent-input" contenteditable>{{ localWaybill.principalPhone }}</div>
         </div>
         <div class="header-center">
           <span class="label">车牌：</span>
-          <input type="text" class="editable-input transparent-input" v-model="localWaybill.licensePlate" />
+          <div class="editable-input transparent-input" contenteditable>{{ localWaybill.licensePlate }}</div>
         </div>
       </div>
 
@@ -70,21 +70,15 @@
           </tr>
           <!-- 明细数据 -->
           <tr v-for="(item, index) in displayWaybillDetails" :key="index">
-            <td><input type="text" class="table-input transparent-input" v-model="item.productName" /></td>
-            <td><input type="text" class="table-input transparent-input" v-model="item.edgeType" />
-            </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" />
-            </td>
-            <td><input type="text" class="table-input transparent-input" v-model="item.coilNumber" /></td>
-            <td><input type="text" class="table-input transparent-input" v-model="item.specification" /></td>
-            <td><input type="text" class="table-input transparent-input" v-model="item.material" />
-            </td>
+            <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"
@@ -106,7 +100,7 @@
 
       <div class="waybill-pickup-location">
         <!-- <div class="pickup-location-item inline"> -->
-        <span style="font-size: 16px; font-weight: bold;">取货地点：</span>
+        <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>
@@ -115,19 +109,19 @@
       <div class="waybill-footer">
         <div class="footer-item inline">
           <span class="label">销售：</span>
-          <input type="text" class="editable-input signature-input transparent-input" />
+          <div class="editable-input signature-input transparent-input" contenteditable>{{ localWaybill.salesman }}</div>
         </div>
         <div class="footer-item inline">
           <span class="label">发货：</span>
-          <input type="text" class="editable-input signature-input transparent-input" />
+          <div class="editable-input signature-input transparent-input" contenteditable>{{ localWaybill.deliveryman }}</div>
         </div>
         <div class="footer-item inline">
           <span class="label">司机：</span>
-          <input type="text" class="editable-input signature-input transparent-input" />
+          <div class="editable-input signature-input transparent-input" contenteditable>{{ localWaybill.driver }}</div>
         </div>
         <div class="footer-item inline">
           <span class="label">磅房：</span>
-          <input type="text" class="editable-input signature-input transparent-input" />
+          <div class="editable-input signature-input transparent-input" contenteditable>{{ localWaybill.weightRoom }}</div>
         </div>
       </div>
       </div>
@@ -165,7 +159,7 @@ export default {
   data() {
     return {
       currentPage: 1,
-      perPage: 8,
+      perPage: 7,
       totalPages: 1,
       // 本地可编辑的发货单数据
       localWaybill: {
@@ -482,7 +476,7 @@ export default {
   font-weight: bold;
   display: inline-block;
   width: 100px;
-  font-size: 16px;
+  font-size: 18px;
   text-align: right;
   white-space: nowrap;
 }
@@ -496,11 +490,12 @@ export default {
   padding: 4px 8px;
   border: 1px solid #dcdfe6;
   border-radius: 4px;
-  font-size: 16px;
+  font-size: 18px;
   font-weight: bold;
   font-family: SimSun, serif;
   outline: none;
   transition: all 0.2s;
+  line-height: 18px;
   border-bottom: 1px dashed #dcdfe6;
 }
 
@@ -542,13 +537,17 @@ export default {
   line-height: 6mm;
   text-align: center;
   vertical-align: middle;
-  font-size: 16px;
+  font-size: 18px;
   font-weight: 900;
   padding: 0;
   overflow: hidden;
   white-space: nowrap;
 }
 
+.waybill-table tr {
+  border: 1px solid #000;
+}
+
 /* 表格列宽设置 */
 .waybill-table th:nth-child(1),
 .waybill-table td:nth-child(1) {
@@ -645,7 +644,7 @@ export default {
   outline: none;
   background: transparent;
   /* font-family: inherit; */
-  font-size: 16px;
+  font-size: 18px;
   line-height: 6mm;
   text-align: center;
   vertical-align: middle;
@@ -716,7 +715,7 @@ export default {
 /* 备注样式 */
 .waybill-remarks {
   margin-bottom: 30px;
-  font-size: 15px;
+  font-size: 18px;
   line-height: 1.5;
   /* font-weight: 600; */
   font-weight: bold;
@@ -733,21 +732,21 @@ export default {
   justify-content: space-between;
   align-items: center;
   margin-bottom: 20px;
-  font-size: 16px;
+  font-size: 18px;
 }
 
 .waybill-pickup-location {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  margin-bottom: 20px;
-  font-size: 16px;
+  margin-bottom: 10px;
+  font-size: 18px;
 }
 
 
 
 .waybill-pickup-location label {
-  font-size: 16px;
+  font-size: 18px;
   /* margin-right: 10px; */
   text-align: left !important;
   width: 40px;
@@ -768,7 +767,7 @@ export default {
 }
 
 .footer-item .label {
-  font-size: 16px;
+  font-size: 18px;
   margin-right: 10px;
   width: 40px;
 }

From ca76147ee6c256ba8796f25a477c6b84ccad1be1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 2 Feb 2026 17:33:34 +0800
Subject: [PATCH 5/5] =?UTF-8?q?style(wms):=20=E8=B0=83=E6=95=B4=E8=BF=90?=
 =?UTF-8?q?=E5=8D=95=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F=EF=BC=8C=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E5=A4=9A=E4=BD=99=E8=BE=B9=E6=A1=86=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=A1=8C=E9=AB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除表格行的边框样式，并在表格底部添加空行以加粗最后一行线
优化表格行高设置，移除冗余的 !important 标记
---
 .../views/wms/delivery/components/wayBill.vue | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/klp-ui/src/views/wms/delivery/components/wayBill.vue b/klp-ui/src/views/wms/delivery/components/wayBill.vue
index a28a82a5..6afad7fc 100644
--- a/klp-ui/src/views/wms/delivery/components/wayBill.vue
+++ b/klp-ui/src/views/wms/delivery/components/wayBill.vue
@@ -84,7 +84,21 @@
             <td><input type="number" class="table-input transparent-input" v-model.number="item.weight"
                 placeholder="0.00" /></td>
             <!-- <td><input type="text" class="table-input transparent-input" v-model="item.unitPrice" /></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>
           </tr>
         </tbody>
       </table>
@@ -544,10 +558,6 @@ export default {
   white-space: nowrap;
 }
 
-.waybill-table tr {
-  border: 1px solid #000;
-}
-
 /* 表格列宽设置 */
 .waybill-table th:nth-child(1),
 .waybill-table td:nth-child(1) {
@@ -665,7 +675,7 @@ export default {
   padding: 0 !important;
   margin: 0 !important;
   line-height: 6mm !important;
-  height: 6mm !important;
+  height: 6mm;
   vertical-align: middle !important;
 }