From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop

---
 src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue |   73 ++++++++++++++++++++++--------------
 1 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue b/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue
index 63bbda5..07aec8f 100644
--- a/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue
+++ b/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue
@@ -18,8 +18,8 @@
               <a-textarea
                 allow-clear
                 placeholder='璇疯緭鍏ユ晠闅滅幇璞�'
-                v-decorator="['faultPhenomenon', validatorRules.faultPhenomenon]"
-                :disabled="isEdit||repairOrder.status!=='3'"
+                v-decorator="['repairOrderFaultAnalysisUda1', validatorRules.repairOrderFaultAnalysisUda1]"
+                :disabled="disabledEdit"
               ></a-textarea>
             </a-form-item>
           </a-col>
@@ -32,7 +32,7 @@
               <a-textarea
                 placeholder='璇疯緭鍏ユ晠闅滄鏌�'
                 v-decorator="['faultCause', validatorRules.faultCause]"
-                :disabled="isEdit||repairOrder.status!=='3'"
+                :disabled="disabledEdit"
               ></a-textarea>
             </a-form-item>
           </a-col>
@@ -47,7 +47,7 @@
               <a-textarea
                 placeholder='璇疯緭鍏ユ晠闅滅淮淇�'
                 v-decorator="['maintenanceMeasures', validatorRules.maintenanceMeasures]"
-                :disabled="isEdit||repairOrder.status!=='3'"
+                :disabled="disabledEdit"
               ></a-textarea>
             </a-form-item>
           </a-col>
@@ -60,7 +60,7 @@
               <a-textarea
                 v-decorator="['suggestion', validatorRules.suggestion]"
                 placeholder='璇疯緭鍏ユ晠闅滈闃�'
-                :disabled="isEdit||repairOrder.status!=='3'"
+                :disabled="disabledEdit"
               ></a-textarea>
             </a-form-item>
           </a-col>
@@ -68,6 +68,8 @@
       <a-button
         :style="{marginRight: '8px'}"
         @click='handleEdit2()'
+        :disabled="disabledButton||!disabledEdit"
+        :loading='confirmLoading'
       >
        缂栬緫
       </a-button>
@@ -76,6 +78,7 @@
         @click='handleOk()'
         type='primary'
         :loading='confirmLoading'
+        :disabled="disabledButton||disabledEdit"
       >淇濆瓨
       </a-button>
       </a-form>
@@ -91,25 +94,35 @@
   name: 'RepairOrderFaultAnalysisList',
   components: { },
   props: {
-   repairOrderId: {
-      type: String,
-      default:'',
-    },
     repairOrder:{
       type: Object,
       default:{},
     }
   },
   watch:{
-      repairOrderId:{
+      'repairOrder.id':{
         immediate: true,
         handler(val) {
-          this.form.resetFields();
-          if(!this.repairOrderId){
-            this.isEdit = false;
+          this.loadData(val);
+          if(this.repairOrder.id!==undefined&&this.repairOrder.id!==null&&this.repairOrder.id!==''){
+            if(this.repairOrder.status!=='3'){
+              this.disabledButton = true;
+            }else{
+              this.disabledButton = false;
+            }
           }else{
-            this.loadData(val);
+            this.disabledButton = true;
           }
+        }
+      },
+      'repairOrder.status':{
+        immediate: true,
+        handler(val) {
+            if(val!=='3'){
+              this.disabledButton = true;
+            }else{
+              this.disabledButton = false;
+            }
         }
       }
   },
@@ -125,7 +138,7 @@
         getInfo:'/eam/repairOrderFaultAnalysis/list',
       },
       dictOptions: {},
-      isEdit:false,
+      disabledEdit:false,
       validatorRules: {
         faultCause: {
           rules: [
@@ -133,7 +146,7 @@
             { min: 2, max: 1000, message: '闀垮害鍦� 2 鍒� 1000 涓瓧绗�', trigger: 'blur' },
           ]
         },
-        faultPhenomenon: {
+        repairOrderFaultAnalysisUda1: {
           rules: [
             { required: true, message: '璇疯緭鍏ユ晠闅滅幇璞�!' },
           ]
@@ -159,6 +172,7 @@
         xs: { span: 24 },
         sm: { span: 16 }
       },
+      disabledButton:false
     }
   },
   methods: {
@@ -170,8 +184,8 @@
           that.confirmLoading = true;
           let formData = Object.assign(this.model, values);
           let obj;
+          formData.repairOrderId = this.repairOrder.id;
           if (!this.model.id) {
-            formData.repairOrderId = this.repairOrderId;
             obj = postAction(this.url.add, formData);
           } else {
             obj = requestPut(this.url.edit, formData, { id: this.model.id });
@@ -179,34 +193,35 @@
           obj.then((res) => {
             if (res.success) {
               that.$message.success(res.message);
-              that.$emit('ok');
             } else {
               that.$message.warning(res.message);
             }
           }).finally(() => {
-             that.loadData(that.repairOrderId);
+             that.loadData(that.repairOrder.id);
              that.confirmLoading = false;
           })
         }
       })
     },
     loadData(repairOrderId){
-      let that = this;
+      let that = this;   
       getAction(that.url.getInfo,{repairOrderId:repairOrderId}).then(res=>{
-                if(res.success){
-                   if(res.result.records.length!==0){
-                      that.isEdit=true;
-                      that.form.setFieldsValue(pick(res.result.records[0], 'faultCause','faultPhenomenon', 'faultTypeId', 'suggestion', 'maintenanceMeasures','id'))
+                if(res.success&&res.result.records.length!==0){
+                      that.disabledEdit=true;
+                      that.form.setFieldsValue(pick(res.result.records[0], 'faultCause','repairOrderFaultAnalysisUda1', 'faultTypeId', 'suggestion', 'maintenanceMeasures','id'))
                       that.model = Object.assign({}, res.result.records[0]);
-                      that.isEdit=true;
-                   }else{
-                    that.isEdit=false;
-                   }
+                }else{
+                  if(that.repairOrder.status==='3'){
+                    that.disabledEdit=false;
+                  }else{
+                    that.disabledEdit=true;
+                  }
+                  that.form.resetFields();
                 }
       })
     },
     handleEdit2(){
-    this.isEdit=false;
+    this.disabledEdit=false;
     }
   },
 

--
Gitblit v1.9.3