From 0c05455ae32fda02fffbfc95ba94e2e761286e05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com>
Date: Sun, 21 Jun 2026 11:45:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E5=91=98=E5=88=97=E5=B9=B6=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=88=97=E5=AE=BD=EF=BC=8C=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=E6=A0=87=E7=AD=BE=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 在CoilSelector相关数据和报表设置列配置中新增业务员字段
2. 调整逻辑库位、实际库区的表格列宽
3. 注释crm合同页的操作记录标签页
---
 klp-ui/src/components/CoilSelector/data.js                 | 1 +
 klp-ui/src/views/crm/contract/components/ContractTabs.vue  | 5 ++---
 klp-ui/src/views/wms/coil/panels/base.vue                  | 7 +++----
 klp-ui/src/views/wms/report/components/setting/columns.vue | 1 +
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/klp-ui/src/components/CoilSelector/data.js b/klp-ui/src/components/CoilSelector/data.js
index 2d8f8700..6ec208e4 100644
--- a/klp-ui/src/components/CoilSelector/data.js
+++ b/klp-ui/src/components/CoilSelector/data.js
@@ -224,4 +224,5 @@ export const optionalColumns = [
   { label: '发货绑定负责人', value: 'bindPrincipal' },
   { label: '发货配卷时间', value: 'bindDeliveryTime' },
   { label: '发货时间', value: 'exportTime' },
+  { label: '业务员', value: 'saleName' },
 ]
diff --git a/klp-ui/src/views/crm/contract/components/ContractTabs.vue b/klp-ui/src/views/crm/contract/components/ContractTabs.vue
index d277b1d2..b3ec8e36 100644
--- a/klp-ui/src/views/crm/contract/components/ContractTabs.vue
+++ b/klp-ui/src/views/crm/contract/components/ContractTabs.vue
@@ -57,12 +57,11 @@
             <FileList :oss-ids="form.annexFiles" />
           </div>
         </el-tab-pane>
-        <el-tab-pane label="操作记录" name="record" v-hasPermi="['crm:order:record']">
+        <!-- <el-tab-pane label="操作记录" name="record" v-hasPermi="['crm:order:record']">
           <div class="order-record" v-if="activeTab === 'record'">
-            <!-- 操作记录内容 -->
             <OrderRecord :orderId="currentOrder.orderId" />
           </div>
-        </el-tab-pane>
+        </el-tab-pane> -->
       </el-tabs>
     </div>
     <div v-else class="no-selection" style="display: flex; align-items: center; justify-content: center; height: 100%;">
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index e3e4d6b3..1310ae0f 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -177,8 +177,8 @@
             </template>
           </el-table-column>
           <el-table-column label="净重" align="center" prop="netWeight" v-if="!hideWarehouseQuery" />
-          <el-table-column label="逻辑库位" align="center" prop="warehouseName" v-if="!hideWarehouseQuery" />
-          <el-table-column label="实际库区" align="center" prop="actualWarehouseName"
+          <el-table-column label="逻辑库位" width="120" align="center" prop="warehouseName" v-if="!hideWarehouseQuery" />
+          <el-table-column label="实际库区" width="100" align="center" prop="actualWarehouseName"
             v-if="!hideWarehouseQuery && !showExportTime" />
           <el-table-column label="产品类型" align="center" width="180" v-if="!moreColumn">
             <template slot-scope="scope">
@@ -186,6 +186,7 @@
               <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row" />
             </template>
           </el-table-column>
+          <el-table-column label="业务员" align="center" prop="saleName" width="60" />
           <el-table-column v-if="showAbnormal" label="异常数量" align="center" prop="abnormalCount"></el-table-column>
           <el-table-column label="长度 (米)" align="center" prop="length" v-if="showLength" />
           <el-table-column label="发货时间" v-if="showExportTime" align="center" prop="exportTime" width="205">
@@ -215,8 +216,6 @@
             </template>
           </el-table-column>
 
-
-
           <el-table-column v-if="hasTransferType" label="实际库区" align="center" prop="actualWarehouseName" />
 
           <el-table-column v-if="moreColumn" label="规格" prop="specification"></el-table-column>
diff --git a/klp-ui/src/views/wms/report/components/setting/columns.vue b/klp-ui/src/views/wms/report/components/setting/columns.vue
index 86b06051..b5053fa1 100644
--- a/klp-ui/src/views/wms/report/components/setting/columns.vue
+++ b/klp-ui/src/views/wms/report/components/setting/columns.vue
@@ -186,6 +186,7 @@ export default {
         { label: '发货绑定负责人', value: 'bindPrincipal' },
         { label: '发货配卷时间', value: 'bindDeliveryTime' },
         { label: '发货时间', value: 'exportTime' },
+        { label: '业务员', value: 'saleName' },
       ],
     }
   },