From f6ffda0a8ffeebe4516430e34d7c43d2943c03c6 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 31 Mar 2025 13:58:36 +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/f_mlogs_form.vue | 3 +--
 src/views/wpm_gx/fmlogs.vue       | 9 +++++----
 src/views/wpm_gx/mlog_detail.vue  | 8 +++++---
 src/views/wpm_gx/mlogb_form.vue   | 2 +-
 src/views/wpm_gx/mlogs.vue        | 4 +++-
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/views/wpm_gx/f_mlogs_form.vue b/src/views/wpm_gx/f_mlogs_form.vue
index 933d4051..db84b377 100644
--- a/src/views/wpm_gx/f_mlogs_form.vue
+++ b/src/views/wpm_gx/f_mlogs_form.vue
@@ -408,7 +408,6 @@ export default {
 			that.$API.mtm.mgroup.item.req(that.mgroup).then((res) => {
 				that.deptId = res.belong_dept;
 				that.mgroupName = res.name;
-				that.process = res.process;
 				that.getEquipment();
 				that.getUserList();
 			});
@@ -481,7 +480,7 @@ export default {
 			that.$API.wpm.wmaterial.list.req({mtaskx:that.mtask,mgroupx: that.mgroup,material: that.material_in,page: 0,}).then((res) => {
 				that.materialOptions = res;
 				if(that.codeText!==''){
-					that.materialOptions.forEach(item=>{
+					res.forEach(item=>{
 						if(item.batch == that.codeText){
 							that.form.wm_in = item.id;
 							that.form.batch = item.batch;
diff --git a/src/views/wpm_gx/fmlogs.vue b/src/views/wpm_gx/fmlogs.vue
index 33359808..379bdc89 100644
--- a/src/views/wpm_gx/fmlogs.vue
+++ b/src/views/wpm_gx/fmlogs.vue
@@ -16,13 +16,14 @@
 					v-auth="'mlog.create'"
 					>返工</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>
 			<div class="right-panel">
@@ -267,9 +268,9 @@ export default {
 			});
 		},
 		//日志页面扫描物料二维码信息mlog
-		codeTextChange(){
+		codeTextChange(codeText){
 			let that = this;
-			that.codeText;
+			that.codeText = codeText;
 			//根据扫描内容获取物料
 			let obj = {};
 			obj.page=0;
diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue
index e6e8c987..f2030895 100644
--- a/src/views/wpm_gx/mlog_detail.vue
+++ b/src/views/wpm_gx/mlog_detail.vue
@@ -79,20 +79,21 @@
 				header="输入物料"
 				shadow="never"
 			>
-				<div>
+				<div style="display: flex;">
 					<el-button
 						type="primary"
 						v-if="mlogItem.submit_time == null&&(mlogItem.ticket==null||(mlogItem.ticket_&&mlogItem.ticket_.state_.type==1))"
 						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="物料批次号"
 						style="width:150px"
-						@keyup.enter="codeTextChange"
+						@keyup.enter="codeTextChange(codeText)"
 					></el-input>
 				</div>
 				<div style="height: 4px"></div>
@@ -756,7 +757,8 @@ export default {
 				});
 			});
 		},
-		codeTextChange(){
+		codeTextChange(codeText){
+			this.codeText = codeText;
 			this.dialog.save = true;
 			this.$nextTick(() => {
 				this.$refs.saveDialog.open();
diff --git a/src/views/wpm_gx/mlogb_form.vue b/src/views/wpm_gx/mlogb_form.vue
index 1a73589a..f1fb429a 100644
--- a/src/views/wpm_gx/mlogb_form.vue
+++ b/src/views/wpm_gx/mlogb_form.vue
@@ -242,7 +242,7 @@ export default {
 	mounted() {
 		let that = this;
 		if(that.codeText!==''){
-			let id = data.split('#')[1];
+			let id = that.codeText.split('#')[1];
 			this.$API.cm.labelmat.item.req(id).then((res) => {
 				that.codeBatch = res.batch;
 				this.getMaterial();
diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue
index b7478aca..ef4291b2 100644
--- a/src/views/wpm_gx/mlogs.vue
+++ b/src/views/wpm_gx/mlogs.vue
@@ -9,13 +9,14 @@
 					v-auth="'mlog.create'"
 					>新增</el-button
 				>
+				<scScanner @scanResult="codeTextChange"></scScanner>
 				<el-input 
 					ref="codeInput"
 					v-model="codeText"
 					clearable
 					placeholder="设备编号"
 					style="width:150px"
-					@keyup.enter="codeTextChange"
+					@keyup.enter="codeTextChange(codeText)"
 				></el-input>
 			</div>
 			<div class="right-panel">
@@ -363,6 +364,7 @@ export default {
 			}
 		},
 		codeTextChange(text){
+			this.codeText = text;
 			this.dialog.save = true;
 			this.$nextTick(() => {
 				this.$refs.saveDialog.open("add",text);