From 76e143450ec59158dbf4dc2570264e0fc171c5f9 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 28 Apr 2025 08:58:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E4=B8=AD=E6=97=A0=E8=81=8A=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=97=B6=E5=B1=95=E7=A4=BA=E7=BC=BA=E9=99=B7=E6=A0=87=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/handover_form.vue   | 8 ++------
 src/views/wpm_gx/inm_record_form.vue | 8 ++++++--
 src/views/wpm_gx/mlogb_form.vue      | 5 ++++-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index c05c0536..ee54e0cb 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -52,12 +52,8 @@
 							>
 								<span>{{ item.batch }}</span>
 								<span>({{ item.material_name }})</span>
-								<div style="float: right">
-									<span>{{ item.count }}</span>
-									<span v-if="item.notok_sign_name !== null" style="color: #aaaaaa">
-										({{ item.notok_sign_name }})
-									</span>
-								</div>
+								<span v-if="item.defect_name !== null" style="color: orangered">{{ item.defect_name }}</span>
+								<span style="float: right">{{ item.count }}</span>
 							</el-option>
 						</el-select>
 					</el-form-item>
diff --git a/src/views/wpm_gx/inm_record_form.vue b/src/views/wpm_gx/inm_record_form.vue
index 8a8f549a..dd4bf42d 100644
--- a/src/views/wpm_gx/inm_record_form.vue
+++ b/src/views/wpm_gx/inm_record_form.vue
@@ -2,7 +2,7 @@
 	<el-dialog
 		:title="titleMap[form.type]"
 		v-model="visible"
-		:size="1000"
+		style="width: 80%;"
 		destroy-on-close
 		@closed="$emit('closed')"
 	>
@@ -40,11 +40,12 @@
 					</el-option>
 				</el-select>
 			</el-form-item>
-			<el-form-item label="物料批次" v-else>
+			<el-form-item label="批次选择" v-else>
 				<el-select
 					v-model="selectBatch"
 					filterable
 					value-key="id"
+					style="width: 100%;"
 					@change="selectwmChange"
 				>
 					<el-option
@@ -54,6 +55,7 @@
 						:value="item.id"
 					>
 						<span style="display:inline-block;float: left;">{{item.material_.name}}|{{ item.batch }}</span>
+						<span v-if="item.defect_name!==null" style="display:inline-block;float: left;color: orangered;">{{ item.defect_name }}</span>
 						<span
 							style="
 								float: right;
@@ -64,6 +66,8 @@
 						>
 					</el-option>
 				</el-select>
+			</el-form-item>
+			<el-form-item label="批次扫描" v-if="cate == 'do_in'">
 				<scScanner @scanResult="codeTextChange"></scScanner>
 				<el-input 
 					ref="codeInput"
diff --git a/src/views/wpm_gx/mlogb_form.vue b/src/views/wpm_gx/mlogb_form.vue
index bcc97de7..778d6802 100644
--- a/src/views/wpm_gx/mlogb_form.vue
+++ b/src/views/wpm_gx/mlogb_form.vue
@@ -38,7 +38,10 @@
 												justify-content: space-between;
 											"
 										>
-											<span>{{ item.batch }}({{ item.material_name }})</span>
+											<div>
+												<span>{{ item.batch }}({{ item.material_name }})</span>
+												<span v-if="item.defect_name !== null" style="color: orangered">{{ item.defect_name }}</span>
+											</div>
 											<span>{{ item.count }}</span>
 										</div>
 									</el-option>