From 29508b191a8369af77360d6045cc3f5cb756152e Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 19 Mar 2025 15:08:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BA=A4=E6=8E=A5=E5=B7=A5=E5=BA=8F?=
 =?UTF-8?q?=E5=B8=A6=E5=85=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue
index dfc15325..f54f73cd 100644
--- a/src/views/wpm_bx/handover_form.vue
+++ b/src/views/wpm_bx/handover_form.vue
@@ -49,6 +49,7 @@
 							>
 								<span>{{ item.batch }}</span>
 								<span v-if="item.material_&&item.material_.process_name">({{ item.material_.process_name }})</span>
+								<span v-else>(原料棒)</span>
 								
 								<div style="float: right">
 									<span>{{ item.count }}</span>
@@ -65,7 +66,8 @@
 				<el-col :span="10">
 					<el-form-item label="交接物料">
 						<!-- <sapn>{{ listItem.batch }}({{ listItem.process }})</sapn> -->
-						<el-input  :placeholder="listItem.batch+'('+listItem.process+')'" disabled></el-input>
+						<el-input v-if="listItem.process" :placeholder="listItem.batch+'('+listItem.process+')'" disabled></el-input>
+						<el-input v-else :placeholder="listItem.batch+'(原料棒)'" disabled></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="5">
@@ -573,7 +575,9 @@ export default {
 					item.count = item.count_cando;
 					totalCount += Number(item.count_cando);
 					item.tracking = item.material_.tracking;
-					item.process = item.material_.process_name;
+					if(item.material_.process_name){
+						item.process = item.material_.process_name;
+					}
 					item.handoverbw = [];
 					that.getWprList(item.id,index);
 				})
@@ -728,7 +732,9 @@ export default {
 								let obj = {};
 								obj.wm = item.id;
 								obj.batch = item.batch;
-								obj.batch = item.batch.material_.process_name;
+								if(item.batch.material_.process_name){
+									obj.process = item.batch.material_.process_name;
+								}
 								obj.count_cando = item.count;
 								obj.count = item.count;
 								obj.handoverbw = [];
@@ -780,7 +786,9 @@ export default {
 						let obj2 = {};
 						obj2.wm = arr[0].id;
 						obj2.batch = arr[0].batch;
-						obj2.process = arr[0].material_.process_name;
+						if(arr[0].material_.process_name){
+							obj2.process = arr[0].material_.process_name;
+						}
 						obj2.count_cando = arr[0].count;
 						obj2.count = arr[0].count;
 						if(that.form.handoverb&&that.form.handoverb.length>0){
@@ -839,7 +847,9 @@ export default {
 										let obj2 = {};
 										obj2.wm = item.id;
 										obj2.batch = item.batch;
-										obj2.process = item.material_.process_name;
+										if(item.material_.process_name){
+											obj2.process = item.material_.process_name;
+										}
 										obj2.count_cando = item.count;
 										obj2.handoverbw = [];
 										obj2.count = 1;