From e79f5e09d72ba8f64ddeffa60acc07453ae57d6c Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 12 九月 2025 14:10:08 +0800
Subject: [PATCH] art: 物料拉动，热处理问题修改

---
 src/views/mes/modules/MesMaterialTransferRequestForm.vue |   52 +++++++++++++++++++++++++++++++---------------------
 1 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/views/mes/modules/MesMaterialTransferRequestForm.vue b/src/views/mes/modules/MesMaterialTransferRequestForm.vue
index 8bbbbf1..d7cd62c 100644
--- a/src/views/mes/modules/MesMaterialTransferRequestForm.vue
+++ b/src/views/mes/modules/MesMaterialTransferRequestForm.vue
@@ -12,12 +12,12 @@
             <a-form-model-item label="璧峰搴撳瓨鍦扮偣" :labelCol="labelCol" :wrapperCol="wrapperCol"
                                prop="originalWarehouseId">
               <j-dict-select-tag type="list" v-model="model.originalWarehouseId" dictCode="original_warehouse_list"
-                                 placeholder="璇烽�夋嫨璧峰搴撳瓨鍦扮偣" />
+                                 placeholder="璇烽�夋嫨璧峰搴撳瓨鍦扮偣" :disabled="formDisabled || editable" />
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
             <a-form-model-item label="浠诲姟鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workOrderCode">
-              <work-order-select-modal :workOrder="workOrderObj" :submitDisabled="formDisabled"
+              <work-order-select-modal :workOrder="workOrderObj" :submitDisabled="formDisabled || editable"
                                        orderStatus="PUBLISHED" @ok="selectConfirm"></work-order-select-modal>
             </a-form-model-item>
           </a-col>
@@ -42,11 +42,9 @@
           </a-col>
           <a-col :span="12">
             <a-form-model-item label="鎷夊姩鐗╂枡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialNumber">
-              <a-select v-model="model.materialNumber" placeholder="璇烽�夋嫨鎷夊姩鐗╂枡" @change="handleMaterialNumberChange">
-                <a-select-option v-for="item in materialList" :value="item.materialNumber" :title="item.materialName" :key="item.materialNumber">
-                  {{ item.materialName }}
-                </a-select-option>
-              </a-select>
+              <j-search-select-tag v-model="model.materialNumber" placeholder="璇烽�夋嫨鎷夊姩鐗╂枡"
+                                   :dict-options="materialList" @change="handleMaterialNumberChange">
+              </j-search-select-tag>
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
@@ -91,6 +89,7 @@
         sm: { span: 16 }
       },
       confirmLoading: false,
+      editable: false,
       validatorRules: {
         originalWarehouseId: [
           { required: true, message: '璧峰搴撳瓨鍦扮偣蹇呴��', trigger: 'change' }
@@ -117,7 +116,7 @@
         workOrderQuery: '/mes/mesProductionWorkOrder/queryById'
       },
       materialList: [], //鐗╂枡鍒楄〃
-      workOrderObj: {}, //宸ュ崟瀵硅薄
+      workOrderObj: {} //宸ュ崟瀵硅薄
     }
   },
   computed: {
@@ -139,16 +138,21 @@
       this.model.workOrderCode = this.model.workOrderId_dictText
       this.visible = true
       if (this.model.workOrderId) {
+        this.editable = true
         let workOrderRes = await this.loadProductionWorkOrder(this.model.workOrderId)
-        if(!workOrderRes.success || !workOrderRes.result) {
-          return;
+        if (!workOrderRes.success || !workOrderRes.result) {
+          return
         }
         //鎺掍骇宸ュ崟璧嬪��
-        this.workOrderObj = Object.assign({}, workOrderRes.result);
+        this.workOrderObj = Object.assign({}, workOrderRes.result)
         //鐗╂枡鍒楄〃
         let materialListRes = await this.loadMaterialList(workOrderRes.result.materialNumber)
         if (materialListRes.success && materialListRes.result && materialListRes.result.length > 0) {
-          this.materialList = [...materialListRes.result]
+          this.materialList = materialListRes.result.map(item => ({
+            ...item,
+            value: item.materialNumber,
+            text: item.materialName
+          }))
         } else {
           this.materialList = []
         }
@@ -161,22 +165,28 @@
           this.model.targetWarehouseId = undefined
           this.model.warehouseName = ''
         }
+      } else {
+        this.editable = false
       }
     },
     async selectConfirm(rows) {
       if (rows && rows.length > 0) {
         //娓呯┖鍏宠仈鏁版嵁
-        this.model.materialNumber = undefined;
-        this.model.materialName = '';
-        this.model.specifiedQuantity = 0;
+        this.model.materialNumber = undefined
+        this.model.materialName = ''
+        this.model.specifiedQuantity = 0
         //璧嬪�兼柊鐨勬暟鎹�
         this.model.workOrderId = rows[0].id
         this.model.workOrderCode = rows[0].workOrderCode
         //鎺掍骇宸ュ崟璧嬪��
-        this.workOrderObj = Object.assign({}, rows[0]);
+        this.workOrderObj = Object.assign({}, rows[0])
         let materialListRes = await this.loadMaterialList(rows[0].materialNumber)
         if (materialListRes.success && materialListRes.result && materialListRes.result.length > 0) {
-          this.materialList = [...materialListRes.result]
+          this.materialList = materialListRes.result.map(item => ({
+            ...item,
+            value: item.materialNumber,
+            text: item.materialName
+          }))
         } else {
           this.materialList = []
         }
@@ -190,13 +200,13 @@
         }
       } else {
         //娓呯┖鍏宠仈鏁版嵁
-        this.model.materialNumber = undefined;
-        this.model.materialName = '';
-        this.model.specifiedQuantity = 0;
+        this.model.materialNumber = undefined
+        this.model.materialName = ''
+        this.model.specifiedQuantity = 0
         this.materialList = []
         this.model.targetWarehouseId = undefined
         this.model.warehouseName = ''
-        this.workOrderObj = {};
+        this.workOrderObj = {}
       }
     },
     submitForm() {

--
Gitblit v1.9.3