From 6681b5baba91babdc2a7bdeafb6bf72461f66422 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 31 Mar 2025 13:58:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E6=97=A5=E5=BF=97pad?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=AB=E7=A0=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/fmlog_detail.vue | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/wpm_gx/fmlog_detail.vue b/src/views/wpm_gx/fmlog_detail.vue
index 0171490a..7b0058bd 100644
--- a/src/views/wpm_gx/fmlog_detail.vue
+++ b/src/views/wpm_gx/fmlog_detail.vue
@@ -23,21 +23,24 @@
 				</el-descriptions>
 			</el-card>
 			<el-card style="width: 100%; margin: 1vh 0" shadow="never" header="日志列表">
-				<el-button
+				<div style="display: flex;">
+					<el-button
 						type="primary"
 						v-if="fmlogItem.submit_time == null"
 						icon="el-icon-plus"
 						@click="table_add"
 						>新增</el-button
 					>
+					<scScanner @scanResult="codeTextChange" style="margin:0 10px;"></scScanner>
 					<el-input 
 						ref="codeInput"
 						v-model="codeText"
 						clearable
-						placeholder="正常交接"
+						placeholder="物料编号"
 						style="width:150px"
-						@keyup.enter="codeTextChange"
+						@keyup.enter="codeTextChange(codeText)"
 					></el-input>
+				</div>
 				<scTable
 					stripe
 					ref="table"
@@ -299,7 +302,7 @@ export default {
 						that.paramsWm.search = that.batchContains;
 						that.apiObjWm = that.$API.wpm.wmaterial.list;
 						if(that.codeText!=""){
-							this.codeTextChange();
+							this.codeTextChange(that.codeText);
 						}
 					}else{}
 				});
@@ -316,11 +319,12 @@ export default {
 				this.$refs.saveDialog.open('add');
 			});
 		},
-		codeTextChange(){
+		codeTextChange(codeText){
 			let that = this;
+			that.codeText = codeText;
 			that.dialog.save = true;
 			that.$nextTick(() => {
-				that.$refs.saveDialog.open('add',that.codeText);
+				that.$refs.saveDialog.open('add',codeText);
 			});
 		},
 		table_edit(row){