diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder2.vue b/src/views/modules/reportWorkOrder/reportDefectOrder2.vue index 54d1ebc..44754bb 100644 --- a/src/views/modules/reportWorkOrder/reportDefectOrder2.vue +++ b/src/views/modules/reportWorkOrder/reportDefectOrder2.vue @@ -644,10 +644,24 @@ - 保存 + 保存 关闭 + + + + + + + + + + + 确定 + 取消 + +
@@ -794,6 +808,7 @@ export default { loading: false, updateCoreComponentsFlag: false, coreComponentFlag: false, + coreComponentConfirmFlag: false, uploadDialog: false, planPeople:'', uploadData: { @@ -813,6 +828,10 @@ export default { oldSerialNo: '', newSerialNo: '', }, + coreComponentConfirmData: { + oldSerialNo: '', + newSerialNo: '' + }, fileData: { file: [], orderRef1: '', @@ -2631,6 +2650,10 @@ export default { oldSerialNo: '', newSerialNo: '', } + this.coreComponentConfirmData = { + oldSerialNo: '', + newSerialNo: '' + } this.updateCoreComponentsFlag = true this.coreComponentFlag = true }, @@ -2646,6 +2669,10 @@ export default { oldSerialNo: row.oldSerialNo, newSerialNo: row.newSerialNo, } + this.coreComponentConfirmData = { + oldSerialNo: '', + newSerialNo: '' + } this.updateCoreComponentsFlag = false this.coreComponentFlag = true }, @@ -3086,9 +3113,20 @@ export default { oldSerialNo: '', newSerialNo: '', } + this.coreComponentConfirmData = { + oldSerialNo: '', + newSerialNo: '' + } this.updateCoreComponentsFlag = true this.coreComponentFlag = true }, + openCoreComponentConfirmModal () { + this.coreComponentConfirmData = { + oldSerialNo: '', + newSerialNo: '' + } + this.coreComponentConfirmFlag = true + }, async checkCoreSerialControlFlag () { let tempData = { @@ -3165,6 +3203,8 @@ export default { } this.coreComponentData.oldSerialNo = (this.coreComponentData.oldSerialNo || '').trim() this.coreComponentData.newSerialNo = (this.coreComponentData.newSerialNo || '').trim() + this.coreComponentConfirmData.oldSerialNo = (this.coreComponentConfirmData.oldSerialNo || '').trim() + this.coreComponentConfirmData.newSerialNo = (this.coreComponentConfirmData.newSerialNo || '').trim() if (this.coreComponentData.oldSerialNo === '' || this.coreComponentData.oldSerialNo == null) { this.$message.warning('请填写老序列号!') return @@ -3173,6 +3213,22 @@ export default { this.$message.warning('请填写新序列号!') return } + if (this.coreComponentConfirmData.oldSerialNo === '' || this.coreComponentConfirmData.oldSerialNo == null) { + this.$message.warning('请再次填写老序列号!') + return + } + if (this.coreComponentConfirmData.newSerialNo === '' || this.coreComponentConfirmData.newSerialNo == null) { + this.$message.warning('请再次填写新序列号!') + return + } + if (this.coreComponentData.oldSerialNo !== this.coreComponentConfirmData.oldSerialNo) { + this.$message.warning('老序列号与确认老序列号不一致!') + return + } + if (this.coreComponentData.newSerialNo !== this.coreComponentConfirmData.newSerialNo) { + this.$message.warning('新序列号与确认新序列号不一致!') + return + } const controlFlag = await this.checkCoreSerialControlFlag() if (controlFlag) { const serialCheckFlag = await this.checkCoreSerialCanOnMachine() @@ -3184,6 +3240,7 @@ export default { if (data && data.code === 0) { this.getCorePartSpareList() this.coreComponentFlag = false + this.coreComponentConfirmFlag = false this.$message({ message: '操作成功', type: 'success',