From a253d1ccea839c7b499019965914c4caf0fedbbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Tue, 31 Mar 2026 11:32:16 +0800
Subject: [PATCH] =?UTF-8?q?feat(crm):=20=E4=BC=A0=E9=80=92=E5=90=88?=
 =?UTF-8?q?=E5=90=8CID=E8=87=B3=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B9=B6=E5=AE=8C=E5=96=84=E6=A0=87=E7=AD=BE=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在合同页面将合同ID传递给订单页面，确保订单与合同关联
优化标签渲染逻辑，根据仓库类型显示不同标签
移除无用注释和代码
---
 klp-ui/src/views/crm/contract/index.vue        |  2 +-
 klp-ui/src/views/crm/order/index.vue           | 18 +++++++++++++++---
 .../wms/coil/panels/LabelRender/index.vue      | 11 +++++------
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/klp-ui/src/views/crm/contract/index.vue b/klp-ui/src/views/crm/contract/index.vue
index 4e97c230..daaba324 100644
--- a/klp-ui/src/views/crm/contract/index.vue
+++ b/klp-ui/src/views/crm/contract/index.vue
@@ -197,7 +197,7 @@
           合同信息
         </el-tab-pane>
         <el-tab-pane label="下发订单" name="second">
-          <OrderPage v-if="activeTab === 'second'" />
+          <OrderPage v-if="activeTab === 'second'" :contractId="form.contractId" />
         </el-tab-pane>
         <el-tab-pane label="收款记录" name="third">
           <KLPTable v-loading="loading" :data="financeList">
diff --git a/klp-ui/src/views/crm/order/index.vue b/klp-ui/src/views/crm/order/index.vue
index 7e865c08..b0d80877 100644
--- a/klp-ui/src/views/crm/order/index.vue
+++ b/klp-ui/src/views/crm/order/index.vue
@@ -123,9 +123,6 @@
               :value="item.contractId" />
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="合同号" prop="contractCode">
-          <el-input v-model="form.contractCode" placeholder="请输入合同号" disabled />
-        </el-form-item> -->
         <el-form-item label="交货日期" prop="deliveryDate">
           <el-date-picker clearable v-model="form.deliveryDate" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择交货日期">
@@ -172,6 +169,12 @@ export default {
     FileList
   },
   dicts: ['customer_level', 'customer_industry', 'wip_pack_saleman'],
+  props: {
+    contractId: {
+      type: String,
+      default: ''
+    }
+  },
   data() {
     return {
       ORDER_STATUS,
@@ -182,6 +185,7 @@ export default {
         customerId: '',
         salesman: '',
         orderStatus: '',
+        contractId: this.contractId,
         orderType: ORDER_TYPE['正式订单'],
         financeStatus: '',
         pageNum: 1,
@@ -258,6 +262,12 @@ export default {
 
     // 表单重置
     reset() {
+      // 如果有合同号，重置合同号
+      let contractCode = ''
+      if (this.contractId) {
+        contractCode = this.contractList.find(item => item.contractId === this.contractId).contractNo
+      }
+      // 重置表单数据
       this.form = {
         orderId: undefined,
         orderCode: undefined,
@@ -266,6 +276,8 @@ export default {
         orderAmount: undefined,
         salesman: undefined,
         deliveryDate: undefined,
+        contractId: this.contractId,
+        contractCode: contractCode,
         preOrderStatus: undefined,
         auditUser: undefined,
         auditTime: undefined,
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
index cf3713ba..ea78c48f 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
@@ -84,9 +84,6 @@ export default {
     DuGeTag,
     TuoZhiTag,
     SplitTag,
-    // SampleTagPreview,
-    // ForgeTagPreview,
-    // SaltSprayTagPreview,
   },
   data() {
     return {
@@ -153,14 +150,16 @@ export default {
     content: {
       handler(newVal) {
         const { itemName, itemType, warehouseId } = newVal;
-        // 在镀锌颜料库的卷使用镀锌原料标签
+        // 在镀锌原料库或者在镀锌分条原料库的卷使用镀锌原料标签
         if (itemType == 'raw_material' && (warehouseId == '1988150263284953089' || warehouseId == '1988150487185289217')) {
           this.labelType = '5';
         } 
-        // 脱脂原料库
+        // 在脱脂原料库的卷使用脱脂原料标签
         else if (itemType == 'raw_material' && (warehouseId == '1988150545175736322')) {
           this.labelType = '6';
-        } else if (itemType == 'raw_material') {
+        } 
+        // 否则使用普通的原料标签
+        else if (itemType == 'raw_material') {
           this.labelType = '2';
         } 
         // 分条成品