From eb231718e708442c5e8b580dd93b7fca7ce321c1 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期六, 18 十一月 2023 21:41:51 +0800
Subject: [PATCH] 细节修改
---
src/views/eam/RepairOrderList.vue | 43 ++++++++++-----------
src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue | 40 +++++++++++---------
src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue | 11 +----
3 files changed, 45 insertions(+), 49 deletions(-)
diff --git a/src/views/eam/RepairOrderList.vue b/src/views/eam/RepairOrderList.vue
index 088cc10..e606ddc 100644
--- a/src/views/eam/RepairOrderList.vue
+++ b/src/views/eam/RepairOrderList.vue
@@ -506,9 +506,6 @@
let intervalId = setInterval(() => {
this.loadData();
}, 600*1000); // 1000姣锛屽嵆1绉�
- onUnmounted(() => {
- clearInterval(intervalId);
- });
},
data() {
return {
@@ -631,26 +628,26 @@
customRender: 'jell'
}
},
- {
- title: '鏁呴殰鍘熷洜',
- align: "center",
- dataIndex: 'faultReason'
- },
- {
- title: '鏁呴殰鐜拌薄',
- align: "center",
- dataIndex: 'faultPhenomenon'
- },
- {
- title: '鏁呴殰鎺掗櫎',
- align: "center",
- dataIndex: 'faultRemove'
- },
- {
- title: '棰勯槻鎺柦',
- align: "center",
- dataIndex: 'preventiveMeasure'
- },
+ // {
+ // title: '鏁呴殰鍘熷洜',
+ // align: "center",
+ // dataIndex: 'faultReason'
+ // },
+ // {
+ // title: '鏁呴殰鐜拌薄',
+ // align: "center",
+ // dataIndex: 'faultPhenomenon'
+ // },
+ // {
+ // title: '鏁呴殰鎺掗櫎',
+ // align: "center",
+ // dataIndex: 'faultRemove'
+ // },
+ // {
+ // title: '棰勯槻鎺柦',
+ // align: "center",
+ // dataIndex: 'preventiveMeasure'
+ // },
// {
// title: '鏁呴殰鐓х墖',
// align: "center",
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;
}
}
})
diff --git a/src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue b/src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue
index 443eaf4..75e3de3 100644
--- a/src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue
+++ b/src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue
@@ -473,7 +473,7 @@
key="1"
class="hightColor"
>
- <RepairOrderFaultAnalysisList :repairOrderId="repairOrderId" :repairOrder="repairOrder"/>
+ <RepairOrderFaultAnalysisList :repairOrder="repairOrder"/>
</a-tab-pane>
<a-tab-pane
tab='瀹為檯宸ユ椂'
@@ -512,9 +512,6 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { putAction } from '@/api/manage'
import Tooltip from 'ant-design-vue/es/tooltip'
-import ActualMaterialEditTable from './moudles/ActualMaterialEditTable.vue'
-import ActualWorkHoursEditTable from './moudles/ActualWorkHoursEditTable.vue'
-import FaultAnalysisEditTable from './moudles/FaultAnalysisEditTable'
import RepairOrderActualMaterialList from './moudles/RepairOrderActualMaterialReport'
import RepairOrderActualWorkHoursList from './moudles/RepairOrderActualHoursReport'
import RepairOrderFaultAnalysisList from './moudles/RepairOrderFaultAnalysisReport.vue'
@@ -524,9 +521,6 @@
mixins: [JeecgListMixin],
components: {
Tooltip,
- ActualMaterialEditTable,
- ActualWorkHoursEditTable,
- FaultAnalysisEditTable,
RepairOrderActualMaterialList,
RepairOrderActualWorkHoursList,
RepairOrderFaultAnalysisList
@@ -638,7 +632,7 @@
if(res.success){
if(res.result.records.length===0){
that.$message.warning("鏁呴殰鍒嗘瀽灏氭湭濉啓锛岃濉啓鍚庡啀鎶ュ伐")
- }else if(res.result.records[0].faultPhenomenon===null||res.result.records[0].faultPhenomenon===undefined||res.result.records[0].faultPhenomenon===''){
+ }else if(res.result.records[0].repairOrderFaultAnalysisUda1===null||res.result.records[0].repairOrderFaultAnalysisUda1===undefined||res.result.records[0].repairOrderFaultAnalysisUda1===''){
that.$message.warning("鏁呴殰鐜拌薄灏氭湭濉啓锛岃濉啓鍚庡啀鎶ュ伐")
}else if(res.result.records[0].faultCause===null||res.result.records[0].faultCause===undefined||res.result.records[0].faultCause===''){
that.$message.warning("鏁呴殰妫�鏌ュ皻鏈～鍐欙紝璇峰～鍐欏悗鍐嶆姤宸�")
@@ -665,6 +659,7 @@
if (res.result) {
that.$message.success('鎶ュ伐鎴愬姛');
that.repairOrder.status = '4'
+ that.reload();
that.$emit('loadData');
} else {
that.$message.error('鎶ュ伐鍑虹幇寮傚父')
--
Gitblit v1.9.3