From 2549abe1b3a69f1521d9174c19419e0c4b66308b Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 17 Mar 2025 09:52:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E6=97=A5=E5=BF=97mlogb?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=E7=89=A9=E6=96=99=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=96=B0=E5=A2=9E=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/mlog_detail.vue | 19 +++++++++++++++++--
 src/views/wpm_gx/mlogb_form.vue  | 15 +++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue
index 822f70d7..e7187724 100644
--- a/src/views/wpm_gx/mlog_detail.vue
+++ b/src/views/wpm_gx/mlog_detail.vue
@@ -85,8 +85,15 @@
 						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
-					>
+					>新增</el-button>
+					<el-input 
+						ref="codeInput"
+						v-model="codeText"
+						clearable
+						placeholder="物料批次号"
+						style="width:150px"
+						@keyup.enter="codeTextChange"
+					></el-input>
 				</div>
 				<div style="height: 4px"></div>
 				<scTable
@@ -321,6 +328,7 @@
 				ref="saveDialog"
 				:mlog="mlogId"
 				:mgroup="mgroup"
+				:codeText = "codeText"
 				:materialIn="materialIn"
 				@success="handleSaveSuccess"
 				@closed="dialog.save = false"
@@ -516,6 +524,7 @@ export default {
 			tableDataWm:[],
 			test_file:'',
 			deptId: "",
+			codeText: "",
 			visible: false,
 			isSaveing: false,
 			options: [],
@@ -740,6 +749,12 @@ export default {
 				});
 			});
 		},
+		codeTextChange(){
+			this.dialog.save = true;
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open();
+			});
+		},
 		handleSaveSuccess() {
 			this.$refs.tableIn.refresh();
 			this.$refs.tableOut.refresh();
diff --git a/src/views/wpm_gx/mlogb_form.vue b/src/views/wpm_gx/mlogb_form.vue
index f0cce420..cab5a509 100644
--- a/src/views/wpm_gx/mlogb_form.vue
+++ b/src/views/wpm_gx/mlogb_form.vue
@@ -102,6 +102,10 @@ export default {
 			type: String,
 			default: "",
 		},
+		codeText: {
+			type: String,
+			default: "",
+		},
 	},
 	emits: ["success", "closed"],
 	data() {
@@ -167,9 +171,16 @@ export default {
 					material: that.materialIn,
 					page: 0,
 					state:10
-				})
-				.then((res) => {
+				}).then((res) => {
 					that.materialOptions = res;
+					res.forEach(item => {
+						console.log('item',item);
+						console.log('codeText',that.codeText);
+						if(item.batch==that.codeText){
+							that.form.wm_in = item.id;
+							that.form.count_use = item.count_cando;
+						}
+					});
 				});
 		},
 		//表单提交方法