From f749fc14f001625ec4ebafb332b1dee6ab7d1b88 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 23 Jun 2025 09:13:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=85=89=E8=8A=AFmlog=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/mlog_form.vue  |  4 ++++
 src/views/wpm_gx/mlogb_form.vue | 24 +++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue
index 511551df..7bd1c45a 100644
--- a/src/views/wpm_gx/mlog_form.vue
+++ b/src/views/wpm_gx/mlog_form.vue
@@ -214,6 +214,8 @@
 								</sc-upload-file>
 							</el-form-item>
 						</el-col>
+					</el-row>
+					<el-row>
 						<el-col :md="8" :sm="12" :xs="24" v-for="item in testitems" :key="item.id">
 							<el-form-item :label="item.name">
 								<el-input-number
@@ -269,6 +271,8 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
+					</el-row>
+					<el-row>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="备注">
 								<el-input
diff --git a/src/views/wpm_gx/mlogb_form.vue b/src/views/wpm_gx/mlogb_form.vue
index 28c891b2..8e5cec68 100644
--- a/src/views/wpm_gx/mlogb_form.vue
+++ b/src/views/wpm_gx/mlogb_form.vue
@@ -25,6 +25,7 @@
 									:labelField="'batch'"
 									style="width: 100%;"
 									:params = "paramsM"
+									@change="materialBatchChange"
 								>
 									<!-- :params = "{type__in: '10,20',is_hidden: false}" -->
 									<el-table-column label="物料" prop="full_name">
@@ -385,15 +386,20 @@ export default {
 		},
 		materialBatchChange(){
 			let that = this;
-			that.materialOptions.forEach(item => {
-				if(item.id==that.form.wm_in){
-					that.form.batch = item.batch;
-					that.form.count_use = item.count;
-					that.batch_count = item.count;
-					that.materialFix = item.material;
-					that.getdefects();
-				}
-			});
+			that.form.batch = that.selectObj.batch;
+			that.form.count_use = that.selectObj.count;
+			that.batch_count = that.selectObj.count;
+			that.materialFix = that.selectObj.material;
+			that.getdefects();
+			// that.materialOptions.forEach(item => {
+			// 	if(item.id==that.form.wm_in){
+			// 		that.form.batch = item.batch;
+			// 		that.form.count_use = item.count;
+			// 		that.batch_count = item.count;
+			// 		that.materialFix = item.material;
+			// 		that.getdefects();
+			// 	}
+			// });
 		},
 		//添加层组
 		cellsAdd(){