From 9cf0d289c39d7f68bee6eea5132121b41b2f62b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 30 Mar 2026 11:02:36 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E8=A1=A8?=
 =?UTF-8?q?=E9=9D=A2=E5=A4=84=E7=90=86=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=92=8C=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在发货单明细表和钢卷选择器中添加表面处理字段的显示和查询功能
同时优化钢卷选择时的品质状态校验逻辑
---
 klp-ui/src/components/CoilSelector/index.vue        | 13 +++++++++++--
 .../views/wms/delivery/components/detailTable.vue   |  4 +++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/klp-ui/src/components/CoilSelector/index.vue b/klp-ui/src/components/CoilSelector/index.vue
index de8560ed..b12ff919 100644
--- a/klp-ui/src/components/CoilSelector/index.vue
+++ b/klp-ui/src/components/CoilSelector/index.vue
@@ -47,6 +47,9 @@
           <muti-select v-model="queryParams.itemManufacturer" :options="dict.type.coil_manufacturer" placeholder="请选择厂家"
             clearable />
         </el-form-item>
+        <el-form-item label="表面处理">
+          <el-input v-model="queryParams.itemSurfaceTreatmentDesc" placeholder="请输入表面处理" clearable size="small" />
+        </el-form-item>
         <el-form-item label="切边" prop="trimmingRequirement" v-if="orderBy">
           <el-select v-model="queryParams.trimmingRequirement" placeholder="请选择切边" clearable style="width: 100%">
             <el-option label="净边" value="净边" />
@@ -78,6 +81,7 @@
         <!-- 自定义列 -->
         <el-table-column v-for="column in renderColumns" :label="column.label" :align="column.align" :prop="column.prop"
           :width="column.width" :show-overflow-tooltip="column.showOverflowTooltip" />
+        <el-table-column v-if="orderBy" label="表面处理" prop="surfaceTreatmentDesc"></el-table-column>
         <el-table-column v-if="orderBy" label="品质" prop="qualityStatus"></el-table-column>
         <el-table-column v-if="orderBy" label="切边" prop="trimmingRequirement"></el-table-column>
         <el-table-column v-if="orderBy" label="包装" prop="packagingRequirement"></el-table-column>
@@ -95,6 +99,7 @@
           <!-- 自定义列 -->
           <el-table-column v-for="column in renderColumns" :label="column.label" :align="column.align"
             :prop="column.prop" :width="column.width" :show-overflow-tooltip="column.showOverflowTooltip" />
+          <el-table-column v-if="orderBy" label="表面处理" prop="surfaceTreatmentDesc"></el-table-column>
           <el-table-column v-if="orderBy" label="品质" prop="qualityStatus"></el-table-column>
           <el-table-column v-if="orderBy" label="切边" prop="trimmingRequirement"></el-table-column>
           <el-table-column v-if="orderBy" label="包装" prop="packagingRequirement"></el-table-column>
@@ -121,7 +126,10 @@
       <el-table v-if="multiple && selectedCoils.length > 0" :data="selectedCoils">
         <el-table-column v-for="column in renderColumns" :label="column.label" :align="column.align" :prop="column.prop"
           :width="column.width" :show-overflow-tooltip="column.showOverflowTooltip" />
+        <el-table-column v-if="orderBy" label="表面处理" prop="surfaceTreatmentDesc"></el-table-column>
         <el-table-column v-if="orderBy" label="品质" prop="qualityStatus"></el-table-column>
+        <el-table-column v-if="orderBy" label="切边" prop="trimmingRequirement"></el-table-column>
+        <el-table-column v-if="orderBy" label="包装" prop="packagingRequirement"></el-table-column>
 
         <el-table-column label="操作" width="50">
           <template slot-scope="scope">
@@ -518,8 +526,9 @@ export default {
         this.$message.warning('您没有权限选择此钢卷');
         return; // 终止后续逻辑
       }
-      if (this.disableO && row.qualityStatus == 'O') {
-        this.$message.warning('O卷不能选择');
+      const disabledOList = ['O', 'C+', 'C', 'C-', 'D+', 'D', 'D-']
+      if (this.disableO && disabledOList.includes(row.qualityStatus)) {
+        this.$message.warning(`${row.qualityStatus}卷不能选择`);
         return;
       }
       this.handleSelect(row);
diff --git a/klp-ui/src/views/wms/delivery/components/detailTable.vue b/klp-ui/src/views/wms/delivery/components/detailTable.vue
index 42cbc9cc..3e7b703a 100644
--- a/klp-ui/src/views/wms/delivery/components/detailTable.vue
+++ b/klp-ui/src/views/wms/delivery/components/detailTable.vue
@@ -2,7 +2,7 @@
   <div v-loading="loading" style="position: relative; top: 0; background-color: #f5f7fa;">
     <div v-if="waybillId">
       <!-- 这一部分始终定在最上方 -->
-      <el-row :gutter="10" class="mb8" style="position: sticky; top: 0; z-index: 10000; padding: 10px; background-color: #fff;">
+      <el-row :gutter="10" class="mb8" style="position: sticky; top: 0; z-index: 10; padding: 10px; background-color: #fff;">
         <el-col :span="2" style="font-weight: 900;">发货单明细</el-col>
         <el-col :span="1.5">
           <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
@@ -47,6 +47,7 @@
         </el-table-column>
         <el-table-column label="规格" align="center" prop="specification" />
         <el-table-column label="材质" align="center" prop="material" />
+        <el-table-column label="表面处理" align="center" prop="surfaceTreatmentDesc" />
         <!-- <el-table-column label="数量" align="center" prop="quantity" /> -->
         <el-table-column label="重量" align="center" prop="weight" />
         <!-- <el-table-column label="单价" align="center" prop="unitPrice" /> -->
@@ -239,6 +240,7 @@ export default {
           const coil = coilResponse.rows.find(c => c.coilId === item.coilId);
           if (coil) {
             item.actualWarehouseName = coil.actualWarehouseName;
+            item.surfaceTreatmentDesc = coil.surfaceTreatmentDesc;
           }
         });
       }