From 23dc249d1dbdf368e2ce1d805f63916f2e1a1885 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 12 May 2026 18:02:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=90=88=E6=89=B9=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8=E6=98=BE=E7=A4=BA"=E6=B8=85=E9=99=A4?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7"=E5=8B=BE=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

源批次 state 均为合格(10)、defect 不一致时，合批弹框显示"清除缺陷"
勾选框，提交带 clear_defect=true；条件失效或重新打开时自动复位。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 src/views/wpm_bx/handover_form.vue | 32 ++++++++++++++++++++++++++++--
 src/views/wpm_gx/handover_form.vue | 27 ++++++++++++++++++++++++-
 2 files changed, 56 insertions(+), 3 deletions(-)

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 @@
 					</el-form-item>
 				</el-col>
 				<el-col :md="12" :sm="24" v-if="change_batch&&new_wm==''">
-					<el-form-item label="新批次号" prop="new_batch">	
+					<el-form-item label="新批次号" prop="new_batch">
 						<el-input v-model="form.new_batch" placeholder="新批次号" @change="new_batch(form.new_batch)" :disabled="type==50&&isFeiPinku"></el-input>
 						<span style="color: red;">请手动录入新批次号，不要用已有批次！</span>
 					</el-form-item>
 				</el-col>
+				<el-col :md="24" :sm="24" v-if="defectMismatch">
+					<el-form-item label="清除缺陷">
+						<el-checkbox v-model="form.clear_defect">
+							源批次缺陷不一致，勾选后合并批次将清除缺陷标记
+						</el-checkbox>
+					</el-form-item>
+				</el-col>
 			</el-row>
 		</el-form>
 		<el-footer v-if="mode!=='show'">
@@ -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 @@
 						</el-form-item>
 					</el-col>
 					<el-col :md="12" :sm="24"  v-if="change_batch">
-						<el-form-item label="新批次号" required>	
+						<el-form-item label="新批次号" required>
 							<el-input v-model="form.new_batch" placeholder="新批次号"></el-input>
 						</el-form-item>
 					</el-col>
+					<el-col :md="24" :sm="24" v-if="defectMismatch">
+						<el-form-item label="清除缺陷">
+							<el-checkbox v-model="form.clear_defect">
+								源批次缺陷不一致，勾选后合并批次将清除缺陷标记
+							</el-checkbox>
+						</el-form-item>
+					</el-col>
 				</el-row>
 				<el-row v-if="addShow&&route_code=='tuihuo'">
 					<el-col>
@@ -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'){