From ae2e7172b63dc95b2f269a2397f6ff2aac7cb7c5 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 18 Dec 2025 09:10:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=B7=B7=E6=89=B9=E5=8A=A0=E6=96=99?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/handover_form.vue | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue
index 98c3d579..b5664a6b 100644
--- a/src/views/wpm_bx/handover_form.vue
+++ b/src/views/wpm_bx/handover_form.vue
@@ -198,12 +198,12 @@
 						</el-select>
 					</el-form-item>
 				</el-col>
-				<el-col :md="12" :sm="24" v-if="mtype==30||type==50">
+				<el-col :md="12" :sm="24" v-if="(mtype==30||type==50)&&new_wm==''">
 					<el-form-item label="更改批次">	
 						<el-switch v-model="change_batch" :disabled="type==50"></el-switch>
 					</el-form-item>
 				</el-col>
-				<el-col :md="12" :sm="24" v-if="type==50">
+				<el-col :md="12" :sm="24" v-if="type==50&&new_wm==''">
 					<el-form-item label="更改物料">	
 						<xtSelect
 							:apiObj="apiObj"
@@ -223,7 +223,7 @@
 						<el-input v-model="form.note" placeholder="处理备注"></el-input>
 					</el-form-item>
 				</el-col>
-				<el-col :md="12" :sm="24" v-if="change_batch">
+				<el-col :md="12" :sm="24" v-if="change_batch&&new_wm==''">
 					<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>
@@ -266,6 +266,10 @@ export default {
 			type: Object,
 			default: () => ({}),
 		},
+		new_wm:{
+			type: String,
+			default: "",
+		},
 	},
 	components: {
 		scanDialog
@@ -385,7 +389,7 @@ export default {
 		let that  = this;
 		that.form.type = that.type;
 		if(that.type==50){
-			that.form.mtype=30;
+			that.mtype=30;
 		    that.change_batch = true;
 		}
 		let arr = that.$route.path.split("/");
@@ -394,6 +398,10 @@ export default {
 		that.materialObj = materialObj;
 		that.form.handle_date =that.form.send_date =this.$TOOL.dateFormat2(new Date());
 		that.form.send_mgroup = that.mgroupId;
+		if(that.new_wm!==''){
+			that.mtype==30;
+			that.form.new_wm = that.new_wm;
+		}
 		if(that.wmItem.wm){
 			that.form.new_batch = that.wmItem.batch;
 			that.form.material_changed = that.wmItem.material;
@@ -615,7 +623,9 @@ export default {
 		open(mode = "add",data,mtype) {
 			let that = this;
 			that.mode = mode;
-			that.mtype = mtype;
+			if(mtype!==undefined&&mtype!==null){
+				that.mtype = mtype;
+			}
 			that.checkedStatus=[];
 			that.selectItems=[];
 			if(mtype==30){
@@ -631,9 +641,7 @@ export default {
 					that.totalCount += Number(item.count);
 					that.getWprList(item.wm,index);
 				})
-				console.log('that.isFeiPinku',that.isFeiPinku);
 				if(that.isFeiPinku){
-					console.log('data[0].material',data[0].material);
 					that.form.new_batch = data[0].batch;
 					that.form.material_changed = data[0].material;
 					that.form.material_changed_fname =  data[0].material_name;