From 5c139f0b7cd9a5aad6d414c57285541683656c1b Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 17 Dec 2024 10:39:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/handover.vue  |  2 +-
 src/views/wpm_gx/mlog_form.vue |  1 +
 src/views/wpm_gx/mlogs.vue     | 22 +++++-----------------
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index cb05fae0..616d7e8b 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -14,7 +14,7 @@
 					icon="el-icon-plus"
 					@click="table_add(20)"
 					v-auth="'handover.create'"
-					v-if="mgroupName!=='切片'&&mgroupName!=='拉单丝'&&mgroupName!=='一次复丝'&&mgroupName!=='二次复丝'&&mgroupName!=='切丝排版'"
+					v-if="mgroupName!=='切片'"
 					>返工</el-button
 				>
 				<el-button
diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue
index 6282588f..d97c8339 100644
--- a/src/views/wpm_gx/mlog_form.vue
+++ b/src/views/wpm_gx/mlog_form.vue
@@ -216,6 +216,7 @@ const defaultForm = {
 	work_start_time: "",
 	work_end_time:null,
 	note:'',
+	mgroup:'',
 	reminder_interval_list: [0,0],
 };
 
diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue
index ce321a34..44abed4f 100644
--- a/src/views/wpm_gx/mlogs.vue
+++ b/src/views/wpm_gx/mlogs.vue
@@ -54,7 +54,7 @@
 					prop="equipment_name"
 					min-width="150"
 				></el-table-column>
-				<el-table-column label="进度" prop="belong_dept_name"  v-if="mgroup_name=='黑化'||mgroup_name=='退火'">
+				<el-table-column label="进度" prop="belong_dept_name"  v-if="mgroupName=='黑化'||mgroupName=='退火'">
 					<template #default="scope">
 						<el-progress id="progressbwlq" :percentage="customMethod(scope.row,1)" :stroke-width="20" :color="customMethod(scope.row,2)" :text-inside="true"><span>{{customMethod(scope.row,3)}}</span></el-progress>
 					</template>
@@ -72,7 +72,7 @@
 					prop="handle_user_name"
 					width="80"
 				></el-table-column>
-				<el-table-column label="保温剩余时间" v-if="mgroup_name=='黑化'||mgroup_name=='退火'">
+				<el-table-column label="保温剩余时间" v-if="mgroupName=='黑化'||mgroupName=='退火'">
 					<template #default="scope">
 						{{ getRemaTime(scope.row) }}
 					</template>
@@ -146,7 +146,7 @@
 			:process="processId"
 			:mgroup="mgroupId"
 			:dept="deptId"
-			:mgroup_name = "mgroup_name"
+			:mgroupName = "mgroupName"
 			@success="handleSaveSuccess"
 			@closed="dialog.save = false"
 		>
@@ -193,27 +193,15 @@ export default {
 			deptId: null,
 			processId: "",
 			processCate: "",
-			mgroup_name:''
 		};
 	},
-	watch: {
-		mgroupName: {
-			handler: function (newval,odlval) {
-				let that = this;
-				that.params.mgroup = "";
-				that.apiObj = null;
-				that.mgroup_name  = newval;
-				that.getMgroupInfo();
-			},
-		},
-	},
 	mounted() {
-		// this.getMgroupInfo();
+		this.getMgroupInfo();
 	},
 	methods: {
 		getMgroupInfo(){
 			let that = this;
-			that.$API.mtm.mgroup.list.req({ page: 0, name: that.mgroup_name }).then((res) => {
+			that.$API.mtm.mgroup.list.req({ page: 0, name: that.mgroupName }).then((res) => {
 				if (res.length < 1) {
 					that.$message.error("获取工段错误");
 					return;