From 3e70adebe3d2ecdeb45f60beace179b8cd0d1b10 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 18 Jun 2025 09:35:02 +0800
Subject: [PATCH] fix:coding#851#852

---
 src/views/wpm_bx/mlog_detail.vue | 2 +-
 src/views/wpm_bx/mlogs.vue       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue
index 0f78c843..be8bb86f 100644
--- a/src/views/wpm_bx/mlog_detail.vue
+++ b/src/views/wpm_bx/mlog_detail.vue
@@ -118,7 +118,7 @@
 							<el-button
 								type="danger"
 								@click="table_muser_del(scope.row)"
-							></el-button>
+							>删除</el-button>
 						</template>
 					</el-table-column>
 				</scTable>
diff --git a/src/views/wpm_bx/mlogs.vue b/src/views/wpm_bx/mlogs.vue
index d3c8b021..aaef461e 100644
--- a/src/views/wpm_bx/mlogs.vue
+++ b/src/views/wpm_bx/mlogs.vue
@@ -206,7 +206,7 @@ export default {
 		return {
 			apiObj: null,
 			params: { mgroup: "" ,submit_time__isnull:true,
-				query: " { id, 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}"
+				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}"
 			},
 			query: {submit_time__isnull:true},
 			dialog: {