From 445cfc2c5cee3d8fc0f8f1ffae5b66d9c761e681 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 22 十一月 2023 19:15:39 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue | 91 ++++++++++++++++++++++-----------------------
1 files changed, 44 insertions(+), 47 deletions(-)
diff --git a/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue b/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue
index d98a033..d9b8b61 100644
--- a/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue
+++ b/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue
@@ -11,30 +11,28 @@
:span='12'
>
<a-form-item
- label='鏁呴殰绫诲瀷'
- :labelCol='labelCol'
- :wrapperCol='wrapperCol'
- >
- <j-dict-select-tag
- allow-clear
- placeholder='璇烽�夋嫨鏁呴殰绫诲瀷'
- :triggerChange='true'
- :disabled="isEdit||repairOrder.status!=='3'"
- dictCode="mom_eam_fault_type,name,id,del_flag!='1'"
- v-decorator="['faultTypeId', validatorRules.faultTypeId ]"
- />
- </a-form-item>
- </a-col>
- <a-col :span='12'>
- <a-form-item
- label='鏁呴殰鍒嗘瀽'
+ label='鏁呴殰鐜拌薄'
:labelCol='labelCol'
:wrapperCol='wrapperCol'
>
<a-textarea
- placeholder='璇疯緭鍏ユ晠闅滃垎鏋�'
+ allow-clear
+ placeholder='璇疯緭鍏ユ晠闅滅幇璞�'
+ v-decorator="['repairOrderFaultAnalysisUda1', validatorRules.repairOrderFaultAnalysisUda1]"
+ :disabled="isEdit"
+ ></a-textarea>
+ </a-form-item>
+ </a-col>
+ <a-col :span='12'>
+ <a-form-item
+ label='鏁呴殰妫�鏌�'
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ >
+ <a-textarea
+ placeholder='璇疯緭鍏ユ晠闅滄鏌�'
v-decorator="['faultCause', validatorRules.faultCause]"
- :disabled="isEdit||repairOrder.status!=='3'"
+ :disabled="isEdit"
></a-textarea>
</a-form-item>
</a-col>
@@ -42,27 +40,27 @@
<a-row>
<a-col :span='12'>
<a-form-item
- label='缁翠慨鎺柦'
+ label='鏁呴殰缁翠慨'
:labelCol='labelCol'
:wrapperCol='wrapperCol'
>
<a-textarea
- placeholder='璇疯緭鍏ョ淮淇帾鏂�'
+ placeholder='璇疯緭鍏ユ晠闅滅淮淇�'
v-decorator="['maintenanceMeasures', validatorRules.maintenanceMeasures]"
- :disabled="isEdit||repairOrder.status!=='3'"
+ :disabled="isEdit"
></a-textarea>
</a-form-item>
</a-col>
<a-col :span='12'>
<a-form-item
- label='缁翠繚鎰忚'
+ label='鏁呴殰棰勯槻'
:labelCol='labelCol'
:wrapperCol='wrapperCol'
>
<a-textarea
v-decorator="['suggestion', validatorRules.suggestion]"
- placeholder='璇疯緭鍏ョ淮淇濇剰瑙�'
- :disabled="isEdit||repairOrder.status!=='3'"
+ placeholder='璇疯緭鍏ユ晠闅滈闃�'
+ :disabled="isEdit"
></a-textarea>
</a-form-item>
</a-col>
@@ -70,6 +68,8 @@
<a-button
:style="{marginRight: '8px'}"
@click='handleEdit2()'
+ :disabled="buttonStatus"
+ :loading='confirmLoading'
>
缂栬緫
</a-button>
@@ -78,6 +78,7 @@
@click='handleOk()'
type='primary'
:loading='confirmLoading'
+ :disabled="buttonStatus"
>淇濆瓨
</a-button>
</a-form>
@@ -93,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;
}
}
}
@@ -131,29 +131,24 @@
validatorRules: {
faultCause: {
rules: [
- { required: true, message: '璇疯緭鍏ユ晠闅滃垎鏋�!' },
+ { required: true, message: '璇疯緭鍏ユ晠闅滄鏌�!' },
{ min: 2, max: 1000, message: '闀垮害鍦� 2 鍒� 1000 涓瓧绗�', trigger: 'blur' },
]
},
- faultCauseId: {
+ repairOrderFaultAnalysisUda1: {
rules: [
- { required: true, message: '璇烽�夋嫨鏁呴殰鍘熷洜!' },
- ]
- },
- faultTypeId: {
- rules: [
- { required: true, message: '璇烽�夋嫨鏁呴殰绫诲瀷!' },
+ { required: true, message: '璇疯緭鍏ユ晠闅滅幇璞�!' },
]
},
suggestion:{
rules: [
- { required: true, message: '璇疯緭鍏ョ淮淇濇剰瑙�!' },
+ { required: true, message: '璇疯緭鍏ユ晠闅滈闃�!' },
{ min: 2, max: 1000, message: '闀垮害鍦� 2 鍒� 1000 涓瓧绗�', trigger: 'blur' },
]
},
maintenanceMeasures:{
rules: [
- { required: true, message: '璇疯緭鍏ョ淮淇帾鏂�!' },
+ { required: true, message: '璇疯緭鍏ユ晠闅滅淮淇�!' },
{ min: 2, max: 1000, message: '闀垮害鍦� 2 鍒� 1000 涓瓧绗�', trigger: 'blur' },
]
},
@@ -166,6 +161,7 @@
xs: { span: 24 },
sm: { span: 16 }
},
+ buttonStatus:false
}
},
methods: {
@@ -177,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 });
@@ -186,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;
})
}
@@ -203,11 +199,12 @@
if(res.success){
if(res.result.records.length!==0){
that.isEdit=true;
- that.form.setFieldsValue(pick(res.result.records[0], 'faultCause', '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