From fe4e537ef81c55b52d195c26f51dc4f8a280c1ba Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 13 Jan 2025 09:12:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BA=A4=E6=8E=A5=E6=97=B6=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E9=80=89=E9=A1=B9=E5=B7=A5=E5=BA=8F=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=9B=E5=BA=93=E5=AD=98=E6=B7=BB=E5=8A=A0=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/handover_form.vue | 2 ++
 src/views/wpm_bx/inm.vue           | 6 +++---
 src/views/wpm_bx/mlogb_form.vue    | 5 ++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue
index 3abb797a..48f5c227 100644
--- a/src/views/wpm_bx/handover_form.vue
+++ b/src/views/wpm_bx/handover_form.vue
@@ -144,6 +144,8 @@
 								:value="item.id"
 							>
 								<span>{{ item.batch }}</span>
+								<span v-if="item.material_">({{ item.material_.process_name }})</span>
+								
 								<div style="float: right">
 									<span>{{ item.count }}</span>
 									<span v-if="item.notok_sign_name !== null" style="color: #aaaaaa">
diff --git a/src/views/wpm_bx/inm.vue b/src/views/wpm_bx/inm.vue
index eccf78f7..95a3684b 100644
--- a/src/views/wpm_bx/inm.vue
+++ b/src/views/wpm_bx/inm.vue
@@ -86,7 +86,8 @@
 					min-width="80"
 				>
 				<template #default="scope">
-					<el-link :underline="false" type="primary" @click="showWpr(scope.row)">{{scope.row.count}}</el-link>
+					<span v-if="scope.row.material_&&scope.row.material_.tracking==10">{{scope.row.count}}</span>
+					<el-link v-else :underline="false" type="primary" @click="showWpr(scope.row)">{{scope.row.count}}</el-link>
 				</template>
 				</el-table-column>
 				<el-table-column
@@ -111,9 +112,8 @@
 				>
 					<template #default="scope">
 						<el-link :underline="false"  @click="printMaterial(scope.row)" type="primary">物料标签</el-link>
-						<!-- <el-link 
-							v-if="scope.row.material_&&scope.row.material_.tracking==10" -->
 						<el-link 
+							v-if="scope.row.material_&&scope.row.material_.tracking==10"
 							:underline="false"  
 							@click="inmCheck(scope.row)" 
 							type="primary" 
diff --git a/src/views/wpm_bx/mlogb_form.vue b/src/views/wpm_bx/mlogb_form.vue
index efbc67df..99619d09 100644
--- a/src/views/wpm_bx/mlogb_form.vue
+++ b/src/views/wpm_bx/mlogb_form.vue
@@ -156,6 +156,8 @@ export default {
 						return item.parent==null;
 					})
 					that.form.parent = that.mlogbInOptions[0].id;
+				}else{
+					that.form.parent = '';
 				}
 			})
 		},
@@ -209,7 +211,8 @@ export default {
 				that.form.batch = '';
 				that.form.parent = '';
 				that.form.count_use = 0;
-				that.getParentList();
+				that.$emit("closed");
+				that.visible = false;
 			}).catch((err) => {});
 		},
 		//设置过滤项