diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue index 749d4a44..d04f7670 100644 --- a/src/views/wpm_bx/handover_form.vue +++ b/src/views/wpm_bx/handover_form.vue @@ -224,11 +224,18 @@ - + 请手动录入新批次号,不要用已有批次! + + + + 源批次缺陷不一致,勾选后合并批次将清除缺陷标记 + + + @@ -308,7 +315,8 @@ export default { recive_user: null, recive_mgroup: null, handoverb:[], - new_batch:'' + new_batch:'', + clear_defect: false }, rules: { new_batch:[ @@ -457,6 +465,25 @@ export default { } that.getMgroupOptions(); }, + computed: { + // 合批时源批次 state 均为 OK(10) 且 defect 不一致,才显示"清除缺陷"勾选 + defectMismatch() { + if (this.mtype !== 30) return false; + if (this.new_wm) return false; + const items = this.form.handoverb || []; + if (items.length < 2) return false; + if (!items.every(i => Number(i.state) === 10)) return false; + const defectIds = new Set(items.map(i => i.defect == null ? null : i.defect)); + return defectIds.size > 1; + } + }, + watch: { + defectMismatch(val) { + if (!val) { + this.form.clear_defect = false; + } + } + }, methods: { deletebw(index){ let that = this; @@ -656,6 +683,7 @@ export default { if(mtype!==undefined&&mtype!==null){ that.mtype = mtype; } + that.form.clear_defect = false; that.checkedStatus=[]; that.selectItems=[]; if(mtype==30){ diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue index 79dfe34f..b0f331af 100644 --- a/src/views/wpm_gx/handover_form.vue +++ b/src/views/wpm_gx/handover_form.vue @@ -189,10 +189,17 @@ - + + + + + 源批次缺陷不一致,勾选后合并批次将清除缺陷标记 + + + @@ -342,6 +349,7 @@ export default { ticket:null, ticket_:null, oinfo_json:{}, + clear_defect: false, }, initForm:{}, selectObjIds:[], @@ -470,12 +478,28 @@ export default { } that.getTid(); }, + computed: { + // 合批时源批次 state 均为 OK(10) 且 defect 不一致,才显示"清除缺陷"勾选 + defectMismatch() { + if (this.mtype !== 30) return false; + const items = this.form.handoverb || []; + if (items.length < 2) return false; + if (!items.every(i => Number(i.state) === 10)) return false; + const defectIds = new Set(items.map(i => i.defect == null ? null : i.defect)); + return defectIds.size > 1; + } + }, watch: { batchList:{ deep:true, handler (v) { console.log('batchList',v) } + }, + defectMismatch(val) { + if (!val) { + this.form.clear_defect = false; + } } }, methods: { @@ -636,6 +660,7 @@ export default { console.log(data) this.mode = mode; this.mtype = mtype; + this.form.clear_defect = false; if(data!==''&&data!==null&&data!==undefined){ console.log(typeof(data)=='string') if(typeof(data)=='string'){