From d79066168cfa8998bef6c5874de2e2b0c0e68215 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 28 Aug 2025 11:12:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E4=B8=8D=E5=90=AF=E7=94=A8=E5=90=8E?=
 =?UTF-8?q?=E5=B0=B1=E4=BC=9A=E9=9A=90=E8=97=8F=EF=BC=8C=E5=A1=AB=E5=86=99?=
 =?UTF-8?q?=E7=9A=84=E7=8F=AD=E7=BB=84=E9=9C=80=E8=A6=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=87=BA=E6=9D=A5=EF=BC=8Cfmlog=E5=8F=AF=E4=BB=A5=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E6=89=B9=E6=AC=A1=E5=8F=B7=E6=90=9C=E7=B4=A2=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/fmlogs.vue      | 22 ++++++++++++++++++----
 src/views/wpm_gx/mlog_detail.vue |  3 +++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/views/wpm_gx/fmlogs.vue b/src/views/wpm_gx/fmlogs.vue
index f35baed5..160730e2 100644
--- a/src/views/wpm_gx/fmlogs.vue
+++ b/src/views/wpm_gx/fmlogs.vue
@@ -28,9 +28,9 @@
 			</div>
 			<div class="right-panel">
 				<el-input
-					style="margin-right: 5px"
+					style="margin-right: 5px;width:200px"
 					v-model="query.search"
-					placeholder="名称"
+					placeholder="批次号"
 					clearable
 				></el-input>
 				<el-button
@@ -38,6 +38,11 @@
 					icon="el-icon-search"
 					@click="handleQuery"
 				></el-button>
+				<el-checkbox
+					v-model="showHidden"
+					label="未启用"
+					@change="hiddenChange"
+				/>
 			</div>
 		</el-header>
 		<el-main>
@@ -197,13 +202,13 @@ export default {
 		return {
 			apiObj: null,
 			params: { mgroup: "" },
-			query: {},
+			query: {enabled: true},
 			dialog: {
 				save: false,
 				detail: false,
 				mtask:false,
 			},
-
+			showHidden: false,
 			tableData: [],
 			selection: [],
 			mtaskoptions:[],
@@ -332,6 +337,15 @@ export default {
 		handleQuery() {
 			this.$refs.table.queryData(this.query);
 		},
+		hiddenChange(val) {
+			console.log('val',val);
+			if (val) {
+				this.query.enabled = false;
+			} else {
+				this.query.enabled = true;
+			}
+			this.$refs.table.queryData(this.query);
+		},
 		//本地更新数据
 		//新增岗位后更新数据
 		handleSaveSuccess(data, mode) {
diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue
index bb432d11..787779cb 100644
--- a/src/views/wpm_gx/mlog_detail.vue
+++ b/src/views/wpm_gx/mlog_detail.vue
@@ -33,6 +33,9 @@
 					<el-descriptions-item label="部门/车间">{{
 						mlogItem.belong_dept_name
 					}}</el-descriptions-item>
+					<el-descriptions-item label="所在班组">{{
+						mlogItem.team_name
+					}}</el-descriptions-item>
 					<el-descriptions-item label="处理人">
 						<div v-if="mlogItem.handle_users_&&mlogItem.handle_users_.length>0">
 							<span v-for="item in mlogItem.handle_users_" :key="item.id">{{ item.name }}</span>