diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue index 89758ad..616d969 100644 --- a/src/views/modules/eam/eamWorkOrderForDefect.vue +++ b/src/views/modules/eam/eamWorkOrderForDefect.vue @@ -2178,6 +2178,14 @@ export default { this.$message.warning('到达时间不能大于实际执行时间!') return } + if (this.detailData.checkAssessment === '' || this.detailData.checkAssessment == null) { + this.$message.warning('请选择维修评估结论!') + return + } + if (this.detailData.checkNotes === '' || this.detailData.checkNotes == null) { + this.$message.warning('请填写维修评估的备注说明!') + return + } updateReportResult(this.detailData).then(({data}) => { if (data && data.code === 0) { this.getDataList() @@ -2223,6 +2231,10 @@ export default { this.$message.warning('请选择维修评估!') return } + if (this.confirmData.confirmRemark === '' || this.confirmData.confirmRemark == null) { + this.$message.warning('请填写生产维修评估说明!') + return + } confirmDefectOrder(this.confirmData).then(({data}) => { if (data && data.code === 0) { this.getDataList() diff --git a/src/views/modules/eam/eamWorkOrderForDefect2.vue b/src/views/modules/eam/eamWorkOrderForDefect2.vue index 55541f8..b8c4481 100644 --- a/src/views/modules/eam/eamWorkOrderForDefect2.vue +++ b/src/views/modules/eam/eamWorkOrderForDefect2.vue @@ -2179,6 +2179,14 @@ export default { this.$message.warning('到达时间不能大于实际执行时间!') return } + if (this.detailData.checkAssessment === '' || this.detailData.checkAssessment == null) { + this.$message.warning('请选择维修评估结论!') + return + } + if (this.detailData.checkNotes === '' || this.detailData.checkNotes == null) { + this.$message.warning('请填写维修评估的备注说明!') + return + } updateReportResult(this.detailData).then(({data}) => { if (data && data.code === 0) { this.getDataList() @@ -2224,6 +2232,10 @@ export default { this.$message.warning('请选择维修评估!') return } + if (this.confirmData.confirmRemark === '' || this.confirmData.confirmRemark == null) { + this.$message.warning('请填写生产维修评估说明!') + return + } confirmDefectOrder(this.confirmData).then(({data}) => { if (data && data.code === 0) { this.getDataList() @@ -2232,8 +2244,7 @@ export default { message: '操作成功', type: 'success', duration: 1500, - onClose: () => { - } + onClose: () => {} }) } else { this.$alert(data.msg, '错误', {