From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点，若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱

---
 src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue |   40 ++++++++++++++++++++++------------------
 1 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue b/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue
index 63bbda5..d9b8b61 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="isEdit"
               ></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="isEdit"
               ></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="isEdit"
               ></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="isEdit"
               ></a-textarea>
             </a-form-item>
           </a-col>
@@ -68,6 +68,8 @@
       <a-button
         :style="{marginRight: '8px'}"
         @click='handleEdit2()'
+        :disabled="buttonStatus"
+        :loading='confirmLoading'
       >
        缂栬緫
       </a-button>
@@ -76,6 +78,7 @@
         @click='handleOk()'
         type='primary'
         :loading='confirmLoading'
+        :disabled="buttonStatus"
       >淇濆瓨
       </a-button>
       </a-form>
@@ -91,24 +94,23 @@
   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){
+          if(this.repairOrder.id!==undefined&&this.repairOrder.status==='3'){
             this.isEdit = false;
           }else{
             this.loadData(val);
+          }
+          if(this.repairOrder.status!=='3'){
+            this.buttonStatus = true;
           }
         }
       }
@@ -133,7 +135,7 @@
             { min: 2, max: 1000, message: '闀垮害鍦� 2 鍒� 1000 涓瓧绗�', trigger: 'blur' },
           ]
         },
-        faultPhenomenon: {
+        repairOrderFaultAnalysisUda1: {
           rules: [
             { required: true, message: '璇疯緭鍏ユ晠闅滅幇璞�!' },
           ]
@@ -159,6 +161,7 @@
         xs: { span: 24 },
         sm: { span: 16 }
       },
+      buttonStatus:false
     }
   },
   methods: {
@@ -170,8 +173,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,12 +182,12 @@
           obj.then((res) => {
             if (res.success) {
               that.$message.success(res.message);
-              that.$emit('ok');
+              that.isEdit = true;
             } else {
               that.$message.warning(res.message);
             }
           }).finally(() => {
-             that.loadData(that.repairOrderId);
+             that.loadData(that.repairOrder.id);
              that.confirmLoading = false;
           })
         }
@@ -196,11 +199,12 @@
                 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'))
+                      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 if(this.repairOrder.status==='3'){
+                      that.isEdit=false;
                    }else{
-                    that.isEdit=false;
+                      that.isEdit=true;
                    }
                 }
       })

--
Gitblit v1.9.3