From 37b4fc56625f318e568a66fa3bacd4b6922bdd04 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 10 Dec 2025 14:16:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BA=A4=E6=8E=A5=E5=AE=8C=E5=96=841?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/handover.vue      |  7 ++++++-
 src/views/wpm_bx/handover_form.vue | 28 ++++++++++++++++++++++++----
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/views/wpm_bx/handover.vue b/src/views/wpm_bx/handover.vue
index 049cb7f8..356991b1 100644
--- a/src/views/wpm_bx/handover.vue
+++ b/src/views/wpm_bx/handover.vue
@@ -1,7 +1,7 @@
 <template>
 	<el-container>
 		<el-header>
-			<div class="left-panel">
+			<div class="left-panel" v-if="!isFeiPinku">
 				<el-button
 					type="primary"
 					icon="el-icon-plus"
@@ -22,6 +22,7 @@
 					v-auth="'handover.create'"
 				>改版</el-button>
 			</div>
+			<div class="left-panel" v-else></div>
 			<div class="right-panel">
 				<el-select
 					v-model="searchType"
@@ -250,6 +251,10 @@ export default {
 			type: String,
 			default: "",
 		},
+		isFeiPinku: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	name: "handover",
 	components: {
diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue
index efc6e4fa..66ab7ca4 100644
--- a/src/views/wpm_bx/handover_form.vue
+++ b/src/views/wpm_bx/handover_form.vue
@@ -224,7 +224,7 @@
 				</el-col>
 				<el-col :md="12" :sm="24" v-if="change_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"></el-input>
+						<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>
@@ -253,6 +253,10 @@ export default {
 			type: String,
 			default: "",
 		},
+		isFeiPinku: {
+			type: Boolean,
+			default: false,
+		},
 		tag: {
 			type: String,
 			default: "done",
@@ -474,11 +478,14 @@ export default {
 			let that = this;
 			var req = {
 				page: 0,
-				tag:that.tag,
 				mgroupx:that.mgroupId
 			};
-			if(that.type!==50){
+			if(that.type==50){
+				req.state = 50;
+				req.state_all= 1;
+			}else{
 				req.state = 10;
+				req.tag = that.tag;
 			}
 			that.materialOptions = [];
 			this.$API.wpm.wmaterial.list.req(req).then((res) => {
@@ -616,9 +623,17 @@ export default {
 			if(data&&data!==''&&data.length>0){
 				that.totalCount = 0;
 				data.forEach((item,index)=>{
+					item.wm = item.id;
 					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;
+				}
 			}
 			that.visible = true;
 			return this;
@@ -636,9 +651,14 @@ export default {
 				data = that.materialOptions.filter((item) => {
 					return that.selectItems.indexOf(item.id)>-1;
 				});
-				if(that.type==50){
+				if(that.type==50&&!that.isFeiPinku){
 					that.form.new_batch = data[0].batch+'-G';
 				}
+				if(that.type==50&&that.isFeiPinku){
+					that.form.new_batch = data[0].batch;
+					that.form.material_changed = data[0].material;
+					that.form.material_changed_fname = data[0].material_name;
+				}
 				let materialId = data[0].material;
 				if(that.type==50){}else{
 					let params = {