From 6b24c28ba8a418c1efb46ed0576c9d6c3f5ab82c Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 12 十二月 2023 17:28:56 +0800
Subject: [PATCH] Merge branch 'develop' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue | 63 ++++++++++++++++++-------------
1 files changed, 37 insertions(+), 26 deletions(-)
diff --git a/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue b/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue
index d9b8b61..07aec8f 100644
--- a/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue
+++ b/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue
@@ -19,7 +19,7 @@
allow-clear
placeholder='璇疯緭鍏ユ晠闅滅幇璞�'
v-decorator="['repairOrderFaultAnalysisUda1', validatorRules.repairOrderFaultAnalysisUda1]"
- :disabled="isEdit"
+ :disabled="disabledEdit"
></a-textarea>
</a-form-item>
</a-col>
@@ -32,7 +32,7 @@
<a-textarea
placeholder='璇疯緭鍏ユ晠闅滄鏌�'
v-decorator="['faultCause', validatorRules.faultCause]"
- :disabled="isEdit"
+ :disabled="disabledEdit"
></a-textarea>
</a-form-item>
</a-col>
@@ -47,7 +47,7 @@
<a-textarea
placeholder='璇疯緭鍏ユ晠闅滅淮淇�'
v-decorator="['maintenanceMeasures', validatorRules.maintenanceMeasures]"
- :disabled="isEdit"
+ :disabled="disabledEdit"
></a-textarea>
</a-form-item>
</a-col>
@@ -60,7 +60,7 @@
<a-textarea
v-decorator="['suggestion', validatorRules.suggestion]"
placeholder='璇疯緭鍏ユ晠闅滈闃�'
- :disabled="isEdit"
+ :disabled="disabledEdit"
></a-textarea>
</a-form-item>
</a-col>
@@ -68,7 +68,7 @@
<a-button
:style="{marginRight: '8px'}"
@click='handleEdit2()'
- :disabled="buttonStatus"
+ :disabled="disabledButton||!disabledEdit"
:loading='confirmLoading'
>
缂栬緫
@@ -78,7 +78,7 @@
@click='handleOk()'
type='primary'
:loading='confirmLoading'
- :disabled="buttonStatus"
+ :disabled="disabledButton||disabledEdit"
>淇濆瓨
</a-button>
</a-form>
@@ -103,15 +103,26 @@
'repairOrder.id':{
immediate: true,
handler(val) {
- this.form.resetFields();
- if(this.repairOrder.id!==undefined&&this.repairOrder.status==='3'){
- 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;
}
- if(this.repairOrder.status!=='3'){
- this.buttonStatus = true;
- }
+ }
+ },
+ 'repairOrder.status':{
+ immediate: true,
+ handler(val) {
+ if(val!=='3'){
+ this.disabledButton = true;
+ }else{
+ this.disabledButton = false;
+ }
}
}
},
@@ -127,7 +138,7 @@
getInfo:'/eam/repairOrderFaultAnalysis/list',
},
dictOptions: {},
- isEdit:false,
+ disabledEdit:false,
validatorRules: {
faultCause: {
rules: [
@@ -161,7 +172,7 @@
xs: { span: 24 },
sm: { span: 16 }
},
- buttonStatus:false
+ disabledButton:false
}
},
methods: {
@@ -182,7 +193,6 @@
obj.then((res) => {
if (res.success) {
that.$message.success(res.message);
- that.isEdit = true;
} else {
that.$message.warning(res.message);
}
@@ -194,23 +204,24 @@
})
},
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;
+ 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]);
- }else if(this.repairOrder.status==='3'){
- that.isEdit=false;
- }else{
- that.isEdit=true;
- }
+ }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