From b311b3cfee0a4635c236eea6c5870d805a29a160 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 22 九月 2025 13:09:31 +0800
Subject: [PATCH] 优化导出工控网

---
 src/views/flowmgr/taskassign.vue |   86 ++++++++++++++++++++++++++++---------------
 1 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/src/views/flowmgr/taskassign.vue b/src/views/flowmgr/taskassign.vue
index 66c4599..2c27e8c 100644
--- a/src/views/flowmgr/taskassign.vue
+++ b/src/views/flowmgr/taskassign.vue
@@ -17,12 +17,16 @@
       </template>
       <template #drawingNo="{}">
         <el-autocomplete   v-model="attachForm.drawingNo"
-        :fetch-suggestions="querySearchAsync"
-        :trigger-on-focus="false" @select="handleSelect"
+        :trigger-on-focus="false" :fetch-suggestions="querySearchAsync"
+         @select="handleSelect"
           >
+          <!--
+          <template solt="input" slot-scope="{$attrs}">
+            <input type="hidden" :disabled="true" :value="$refs.input.value"/>
+          </template>-->
         </el-autocomplete>
       </template>
-
+      <!--
       <template #programmer="{}">
         <el-autocomplete ref="autoProgrammer" :disabled="drawingNoMatch"  v-model="attachForm.programmer"
         :fetch-suggestions="queryProgrammerAsync"
@@ -30,16 +34,12 @@
           >
         </el-autocomplete>
       </template>
-
+-->
     </avue-form>
   </basic-container>
 </template>
 
 <script>
-import {
-  getQueryString,
-} from '@/utils/util';
-
 export default {
   watch: {
     'attachForm.drawingNo': function (val) {
@@ -75,7 +75,7 @@
         isLeaf: (data) => !data.hasChildren
       },
       timeout:0, //闆朵欢鍙峰姞杞界殑timeout
-      drawingNoMatch:true,//闆朵欢鍙锋槸鍚﹀尮閰嶅垎宸ヨ〃
+      //drawingNoMatch:true,//闆朵欢鍙锋槸鍚﹀尮閰嶅垎宸ヨ〃
       attachOption: {
         labelWidth: 160,
         submitBtn: true,
@@ -118,11 +118,9 @@
             prop: 'productModel',
             type: 'input',
             span: 12,
+            disabled:true,
+            placeholder:'閫夋嫨闆剁粍浠跺彿鑷姩濉厖',
             dataType: 'string',
-            rules: [{ required: true, message: '蹇呭~', trigger: 'blur' }],
-            blur: (col) => {
-              this.handleTrim(col)
-            },
           },
           {
             label: '宸ュ簭鍙�',
@@ -136,6 +134,15 @@
             blur: (col) => {
               this.handleTrim(col)
             },
+          },
+          {
+            label: '闆剁粍浠跺悕绉�',
+            prop: 'drawingName',
+            type: 'input',
+            placeholder:'閫夋嫨闆剁粍浠跺彿鑷姩濉厖',
+            span: 12,
+            disabled:true,
+            dataType: 'string',
           },
           {
             label: '宸ュ簭鍚嶇О',
@@ -202,13 +209,13 @@
             rules: [{ required: true, message: '蹇呭~', trigger: 'blur' }],
           },
           {
-            label: '鍋忕鍗曞彿',
+            label: '涓存椂鏇存敼鍗曞彿',
             prop: 'deviation',
             type: 'input',
             span: 12,
             dataType: 'string',
             class:'input_holder_warn',
-            placeholder:'鏃犲亸绂诲崟浠诲姟璇风暀绌�',
+            placeholder:'闈炰复鏃舵洿鏀瑰崟浠诲姟璇风暀绌�',
             blur: (col) => {
               this.handleTrim(col)
             },
@@ -216,12 +223,31 @@
           },
           {
             label: '涓荤宸ヨ壓',
-            prop: 'programmer',
-            type: 'input',//column 12
-            disabled:true,
+            prop: 'producePlanId',
+            type: 'select',//column 12
+            clearable:true,
+            remote: true,
+            placeholder:'鏃犳硶鍖归厤浜哄憳鑱岃矗琛ㄦ椂璇烽�夋嫨涓荤宸ヨ壓',
+            dicUrl: `/blade-mdm/producedivision/select-programmer?programmer={{key}}`,
+            dicFormatter:(res)=>{
+              return res.data.map(obj => {
+                let item = new Object();
+                item.value = obj.id;
+                item.label = obj.programmerName;
+                item.desc = `涓撲笟缁勯暱锛�${obj.teamLeaderName},鏍″锛�${obj.checkerName},瀹℃牳锛�${obj.seniorName}`
+                return item;
+              }); ;
+            },
             span: 12,
             dataType: 'string',
           },
+          /*{
+            label: '涓荤宸ヨ壓',
+            prop: 'programmer',
+            type: 'input',//column 12
+            span: 12,
+            dataType: 'string',
+          },*/
         ],
       },
       attachForm: {planLockDays:7,planStartTime: this.$dayjs().format('YYYY-MM-DD')},//榛樿7澶�
@@ -283,6 +309,7 @@
         params: {drawingNo: query},
       }).then(
         res => {
+          this.attachForm.productModel = '';//
           if(res.data.code == 200){
             let list = res.data.data;
             for(let i of list){
@@ -304,8 +331,9 @@
     },
     handleSelect(item) {
       this.attachForm.productModel = item.cph;
+      this.attachForm.drawingName = item.ljmc;
     },
-
+    /*
     queryProgrammerAsync(query, cb) {//涓荤宸ヨ壓鎼滅储寤鸿
       axios({
         url: '/blade-mdm/producedivision/select-programmer',
@@ -332,12 +360,14 @@
       );
       
     },
+    */
+    /*
     handleProgrammerSelect(item){
       this.attachForm.producePlanId = item.id;
       this.attachForm.planDrawingNo = this.attachForm.drawingNo;//璁板綍姝ゆ椂鐨勯浂缁勪欢鍙�
       console.log('productid',this.attachForm )
 
-    },
+    },*/
     handleTrim(col){
       //console.log(col)
       let value = this.attachForm[col.column.prop];
@@ -352,8 +382,8 @@
     },
     formSubmit(form, done) {
       var form = { ...form };
-      console.log('submit',form);
-      if(this.attachForm.planDrawingNo == this.attachForm.drawingNo && this.attachForm.producePlanId){
+     
+      if(this.attachForm.producePlanId){
         //鎵嬪姩鎸囧畾浜嗕汉鍛樿亴璐h〃id锛屼笉鐢ㄧ户缁粠鏈嶅姟绔獙璇�
          this.startDispatch(form,done);
       }else{
@@ -365,19 +395,15 @@
           res => {
             
             if(res.data.code == 200){
-              this.$message({
-                type: 'success',
-                message: '鎿嶄綔鎴愬姛!',
-              });
             
               this.attachForm.producePlanId = res.data.data.id;
-              this.drawingNoMatch = true;
+              //this.drawingNoMatch = true;
               console.log('planid',this.attachForm.productPlanId)
               this.startDispatch(form,done);
             }else{
-              this.drawingNoMatch = false;
+              //this.drawingNoMatch = false;
              
-              this.$alert(res.data.msg+".鎴栬�呮墜鍔ㄩ�夋嫨涓荤宸ヨ壓銆�", '鍙戣捣浠诲姟澶辫触',{type:'error',confirmButtonText:'鍏抽棴'});
+              this.$alert(res.data.msg+".閲嶆柊杈撳叆鎴栬�呮墜鍔ㄩ�夋嫨涓荤宸ヨ壓銆�", '鍙戣捣浠诲姟澶辫触',{type:'error',confirmButtonText:'鍏抽棴'});
             }
             done();
           },
@@ -405,7 +431,7 @@
             });
             this.$refs.form.resetForm();
             this.attachForm = this.defaultForm;
-            this.drawingNoMatch = true;
+            //this.drawingNoMatch = true;
           }else{
             this.$alert(res.data.msg, '鍙戣捣浠诲姟澶辫触',{type:'error',confirmButtonText:'鍏抽棴'});
           }

--
Gitblit v1.9.3