From 413cc19b9634db6f6028513c80f1071b5d5d84ed Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 26 Mar 2025 17:23:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0pad=E7=AB=AF=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/handover_form.vue   | 7 ++++---
 src/views/wpm_bx/inm_record_form.vue | 2 ++
 src/views/wpm_bx/mlogb_form.vue      | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue
index aaf72f28..485d769e 100644
--- a/src/views/wpm_bx/handover_form.vue
+++ b/src/views/wpm_bx/handover_form.vue
@@ -22,7 +22,8 @@
 						@change="formWminChange(wm_in)" 
 						style="width: 300px;margin-left: 10px;"
 					></el-input>
-					<!-- <scan-dialog ref="scanDialog" @closed="scanClose"> </scan-dialog> -->
+					<scScanner @scanResult="formWminChange"></scScanner>
+					<scan-dialog ref="scanDialog" @closed="scanClose"> </scan-dialog>
 				</el-form-item>
 				<el-form-item label="总计：">
 					{{ totalCount }}
@@ -731,8 +732,8 @@ export default {
 								let obj = {};
 								obj.wm = item.id;
 								obj.batch = item.batch;
-								if(item.batch.material_.process_name){
-									obj.process = item.batch.material_.process_name;
+								if(item.material_.process_name){
+									obj.process = item.material_.process_name;
 								}
 								obj.count_cando = item.count;
 								obj.count = item.count;
diff --git a/src/views/wpm_bx/inm_record_form.vue b/src/views/wpm_bx/inm_record_form.vue
index 2bf773b3..17f20900 100644
--- a/src/views/wpm_bx/inm_record_form.vue
+++ b/src/views/wpm_bx/inm_record_form.vue
@@ -63,6 +63,7 @@
 						>
 					</el-option>
 				</el-select>
+				<scScanner @scanResult="scanClose"></scScanner>
 				<scan-dialog ref="scanDialog" :closeNow="closeNow" @closed="scanClose"> </scan-dialog>
 			</el-form-item>
 			<el-form-item label="批次" v-if="cate == 'do_out'">
@@ -90,6 +91,7 @@
 						>
 					</el-option>
 				</el-select>
+				<scScanner @scanResult="scanClose"></scScanner>
 				<scan-dialog ref="scanDialog" @closed="scanClose"> </scan-dialog>
 			</el-form-item>
 			<el-form-item label="仓库" prop="warehouse">
diff --git a/src/views/wpm_bx/mlogb_form.vue b/src/views/wpm_bx/mlogb_form.vue
index bc1bc480..18e205e5 100644
--- a/src/views/wpm_bx/mlogb_form.vue
+++ b/src/views/wpm_bx/mlogb_form.vue
@@ -52,6 +52,7 @@
 						</el-select>
 					</el-form-item>
 					<el-form-item label="物料扫码">
+						<scScanner @scanResult="formWminChange"></scScanner>
 						<el-input  ref="codeInput" v-model="wm_in" clearable @change="formWminChange(wm_in)"></el-input>
 					</el-form-item>
 					<el-form-item label="使用数量" prop="count_use">