From bfa4fd51277b5b5bb94151385495e20d717da9cf Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 2 Jul 2025 16:52:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:coding#803#848=E3=80=8131=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8A=A0=E5=88=97=EF=BC=9A=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=8F=B7=E3=80=81=E6=8F=90=E4=BA=A4=E4=BA=BA?=
 =?UTF-8?q?=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/mlogs.vue | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/views/wpm_bx/mlogs.vue b/src/views/wpm_bx/mlogs.vue
index 43202eda..67080462 100644
--- a/src/views/wpm_bx/mlogs.vue
+++ b/src/views/wpm_bx/mlogs.vue
@@ -68,10 +68,19 @@
 					prop="hour_work"
 					width="80"
 				></el-table-column>
+				<el-table-column label="批次号" min-width="100">
+					<template #default="scope">
+						<div v-if="scope.row.mlogb_full!==null">
+							<span v-for="item in scope.row.mlogb_full" :key="item.id">
+								<span v-if="item.material_in!==null">{{ item.batch }}、</span>
+							</span>
+						</div>
+					</template>
+				</el-table-column>
 				<el-table-column
 					label="生产设备"
 					prop="equipment_name"
-					min-width="150"
+					min-width="130"
 				></el-table-column>
 				<el-table-column label="进度" prop="belong_dept_name"  v-if="mgroup_name=='黑化'||mgroup_name=='退火'">
 					<template #default="scope">
@@ -111,7 +120,6 @@
 						<span v-if="scope.row.oinfo_json_">{{scope.row.oinfo_json_.压板用时}}</span>
 					</template>
 				</el-table-column>
-
 				<el-table-column
 					label="处理人"
 					prop="handle_user_name"
@@ -130,12 +138,11 @@
 					label="结束时间"
 					prop="work_end_time"
 				></el-table-column>
-				<!-- <el-table-column label="是否提交">
+				<el-table-column label="提交人">
 					<template #default="scope">
-						<el-tag  v-if="scope.row.submit_time == null" type="warning">未提交</el-tag>
-						<el-tag  v-else type="success">已提交</el-tag>
+						<span v-if="scope.row.submit_user_name">{{ scope.row.submit_user_name }}</span>
 					</template>
-				</el-table-column> -->
+				</el-table-column>
 				<el-table-column
 					label="提交时间"
 					prop="submit_time"
@@ -231,8 +238,8 @@ export default {
 	data() {
 		return {
 			apiObj: null,
-			params: { mgroup: "" ,submit_time__isnull:true,
-				query: " { id,equipment, material_out_name, equipment_name, reminder_interval_list ,mstate_json,belong_dept_name, mgroup_name,handle_user_name,work_start_time,work_end_time,submit_time,oinfo_json}"
+			params: { mgroup: "" ,submit_time__isnull:true,with_mlogb:'yes',
+				query: " { id,equipment, material_out_name, equipment_name, reminder_interval_list ,mstate_json,belong_dept_name, mgroup_name,handle_user_name,work_start_time,work_end_time,submit_time,oinfo_json,mlogb_full,submit_user_name}"
 			},
 			query: {submit_time__isnull:true},
 			dialog: {