diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue index 8c49048..a5396c2 100644 --- a/src/views/main-sidebar.vue +++ b/src/views/main-sidebar.vue @@ -8,8 +8,9 @@ :collapseTransition="false" class="site-sidebar__menu"> - + + + diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue index 5b879a1..a43e1a0 100644 --- a/src/views/modules/eam/eamWorkOrderForDefect.vue +++ b/src/views/modules/eam/eamWorkOrderForDefect.vue @@ -399,14 +399,27 @@ - - + + + + + + + + + + - + + + + + + 保存 关闭 @@ -1178,6 +1191,8 @@ orderNo: '', functionType: '', confirmResult: '', + confirmAssessment: '', + confirmRemark: '', confirmBy: '' }, confirmDefectModal: false @@ -1593,6 +1608,8 @@ planID: row.planID, functionType: row.functionType, confirmResult: 'Y', + confirmAssessment: '优秀', + confirmRemark: '', confirmBy: this.$store.state.user.name } this.confirmDefectModal = true @@ -1601,7 +1618,11 @@ // 确认结果 confirmDefectOrder () { if (this.confirmData.confirmResult === '' || this.confirmData.confirmResult == null) { - this.$message.warning('请选择维修结果!') + this.$message.warning('请选择确认结果!') + return + } + if (this.confirmData.confirmAssessment === '' || this.confirmData.confirmAssessment == null) { + this.$message.warning('请选择维修评估!') return } confirmDefectOrder(this.confirmData).then(({data}) => { diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue index 8ac1c05..72e511e 100644 --- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue +++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue @@ -45,7 +45,7 @@ - +