From 7ecd788427250a344f6c00a2cb4d62d2f8f1549c Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 24 Apr 2025 13:29:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E4=B8=AD=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E5=B1=95=E7=A4=BA=E7=89=A9=E6=96=99=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/f_mlogs_form.vue |  4 +--
 src/views/wpm_gx/mlogb_form.vue   | 45 ++++++++++++++++---------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/views/wpm_gx/f_mlogs_form.vue b/src/views/wpm_gx/f_mlogs_form.vue
index 3ee3553f..8389b718 100644
--- a/src/views/wpm_gx/f_mlogs_form.vue
+++ b/src/views/wpm_gx/f_mlogs_form.vue
@@ -17,7 +17,7 @@
 					style="padding: 0"
 				>
 					<el-row>
-						<el-col :md="12" :sm="24">
+						<el-col>
 							<el-form-item label="批次号" prop="wm_in">
 								<el-select
 									v-model="form.wm_in"
@@ -32,7 +32,7 @@
 										:value="item.id"
 									>
 										<div style="position:relative;width:100%">
-											<span style="margin-right:15px!important;">{{ item.batch }}</span>
+											<span style="margin-right:15px!important;">{{ item.batch }}({{ item.material_name }})</span>
 											<span style="position:absolute;right:0">{{ item.count }}</span>
 										</div>
 									</el-option>
diff --git a/src/views/wpm_gx/mlogb_form.vue b/src/views/wpm_gx/mlogb_form.vue
index f6626b9c..bcc97de7 100644
--- a/src/views/wpm_gx/mlogb_form.vue
+++ b/src/views/wpm_gx/mlogb_form.vue
@@ -16,26 +16,7 @@
 					label-width="100px"
 				>
 					<el-row>
-						<el-col :md="12" :sm="24">
-							<el-form-item label="关联任务">
-								<el-select
-									v-model="form.mtask"
-									placeholder="关联任务"
-									clearable
-									style="width: 100%"
-									@change="getMaterial"
-								>
-									<el-option
-										v-for="item in options"
-										:key="item.id"
-										:label="item.number"
-										:value="item.id"
-									>
-									</el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24">
+						<el-col>
 							<el-form-item label="批次号" prop="wm_in">
 								<el-select
 									v-model="form.wm_in"
@@ -57,13 +38,33 @@
 												justify-content: space-between;
 											"
 										>
-											<span>{{ item.batch }}</span
-											><span>{{ item.count }}</span>
+											<span>{{ item.batch }}({{ item.material_name }})</span>
+											<span>{{ item.count }}</span>
 										</div>
 									</el-option>
 								</el-select>
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="关联任务">
+								<el-select
+									v-model="form.mtask"
+									placeholder="关联任务"
+									clearable
+									style="width: 100%"
+									@change="getMaterial"
+								>
+									<el-option
+										v-for="item in options"
+										:key="item.id"
+										:label="item.number"
+										:value="item.id"
+									>
+									</el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						
 						<el-col :md="12" :sm="24" v-if="mgroupName=='黑化'||mgroupName=='退火'">
 							<el-form-item label="进炉数">
 								<el-input-number