确认新老序列号

src/views/modules/reportWorkOrder/reportDefectOrder2.vue

@@ -644,10 +644,24 @@
         </el-form-item>
       </el-form>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
-        <el-button type="primary" @click="saveCoreComponent()">保存</el-button>
+        <el-button type="primary" @click="openCoreComponentConfirmModal()">保存</el-button>
         <el-button type="primary" @click="coreComponentFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
+    <el-dialog title="确认核心备件序列号" :close-on-click-modal="false" v-drag append-to-body :visible.sync="coreComponentConfirmFlag" width="450px">
+      <el-form :inline="true" label-position="top">
+        <el-form-item label="确认老序列号">
+          <el-input v-model="coreComponentConfirmData.oldSerialNo" style="width: 200px"></el-input>
+        </el-form-item>
+        <el-form-item label="确认新序列号">
+          <el-input v-model="coreComponentConfirmData.newSerialNo" style="width: 200px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveCoreComponent()">确定</el-button>
+        <el-button type="primary" @click="coreComponentConfirmFlag = false">取消</el-button>
+      </el-footer>
+    </el-dialog>
 
     <el-dialog title="图片查看" :close-on-click-modal="false" v-drag :visible.sync="imageModalFlag" width="390px" style="height: 550px;">
       <div v-viewer>
@@ -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',