From 734ae73e0d16570d5f4d98e9bcc7c6b8ef4144d4 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 9 Jul 2025 14:00:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=BF=94=E5=B7=A5=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/mlogs.vue | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/views/wpm_bx/mlogs.vue b/src/views/wpm_bx/mlogs.vue
index 67080462..edaf02e1 100644
--- a/src/views/wpm_bx/mlogs.vue
+++ b/src/views/wpm_bx/mlogs.vue
@@ -59,8 +59,8 @@
 					fixed
 				>
 				<template #default="scope">
-					<span v-if="scope.row.material_out_name!==null">{{scope.row.material_out_name}}</span>
-					<span v-else>返工</span>
+					<el-tag v-if="scope.row.is_fix" type="warning">返工</el-tag>
+					<span v-else>{{scope.row.material_out_name}}</span>
 				</template>
 				</el-table-column>
 				<el-table-column
@@ -185,7 +185,7 @@
 		<save-dialog
 			v-if="dialog.save"
 			ref="saveDialog"
-			:process="processId"
+			:process="process"
 			:mgroup="mgroupId"
 			:dept="deptId"
 			:mgroupName = "mgroupName"
@@ -198,7 +198,7 @@
 			v-if="dialog.detail"
 			ref="detailDialog"
 			:mlogId="mlogId"
-			:process="processId"
+			:process="process"
 			:mtask="mtask"
 			:dept = "deptId"
 			@closed="detailClose"
@@ -227,6 +227,22 @@ export default {
 		mgroupId:{
 			type: String,
 			default: "",
+		},
+		deptId: {
+			type: String,
+			default: "",
+		},
+		process: {
+			type: String,
+			default: "",
+		},
+		mgroup_code: {
+			type: String,
+			default: "",
+		},
+		mgroupMtype: {
+		    type: String,
+			default: "",
 		}
 	},
 	name: "mlog",
@@ -239,7 +255,7 @@ export default {
 		return {
 			apiObj: null,
 			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: " { id,is_fix,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: {
@@ -251,12 +267,8 @@ export default {
 			selection: [],
 			mtask: "",
 			mlogId: "",
-			deptId: null,
-			processId: "",
 			route_code: "",
 			equipmentId: "",
-			processCate: "",
-			mgroupMtype: "",
 			showHidden:false,
 		};
 	},
@@ -275,7 +287,7 @@ export default {
 		that.route_code = this.$route.path.split("/")[2];
 		that.params.mgroup =that.mgroupId;
 		that.apiObj = that.$API.wpm.mlog.list;
-		this.getMgroupInfo();
+		// this.getMgroupInfo();
 	},
 	methods: {
 		getMgroupInfo(){
@@ -288,7 +300,6 @@ export default {
 				that.deptId = res.belong_dept;
 				that.processId = res.process;
 				that.mgroupMtype = res.mtype;
-				that.processCate = res.process_cate;
 				that.params.mgroup = res.id;
 				that.apiObj = that.$API.wpm.mlog.list;
 			});