From ded2507d0267f4939012eb7b0728d4f6ea13a858 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 3 Sep 2024 15:19:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:mlog=E5=8F=AA=E6=9C=89=E9=BB=91=E5=8C=96?=
 =?UTF-8?q?=E5=92=8C=E9=80=80=E7=81=AB=E6=97=B6=E6=B7=BB=E5=8A=A0=E4=BF=9D?=
 =?UTF-8?q?=E6=B8=A9=E6=97=B6=E9=97=B4=E5=92=8C=E9=80=80=E7=81=AB=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/mlog_form.vue | 77 ++++++++++++----------------------
 src/views/wpm_gx/mlogs.vue     |  1 +
 2 files changed, 27 insertions(+), 51 deletions(-)

diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue
index d1e04184..ee3259a3 100644
--- a/src/views/wpm_gx/mlog_form.vue
+++ b/src/views/wpm_gx/mlog_form.vue
@@ -13,7 +13,7 @@
 					:model="form"
 					:rules="rules"
 					label-position="right"
-					label-width="100px"
+					label-width="80px"
 					style="padding: 0 10px"
 				>
 					<el-row>
@@ -132,6 +132,26 @@
 								/>
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24" v-if="mgroupName=='黑化'||mgroupName=='退火'">
+							<el-form-item label="保温时间" required>
+								<el-input-number
+									v-model="form.reminder_interval_list[0]"
+									:min="0"
+									:disabled="mode == 'edit'"
+									controls-position="right"
+								/>(min)
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24" v-if="mgroupName=='黑化'||mgroupName=='退火'">
+							<el-form-item label="退火时间" required>
+								<el-input-number
+									v-model="form.reminder_interval_list[1]"
+									:min="0"
+									:disabled="mode == 'edit'"
+									controls-position="right"
+								/>(min)
+							</el-form-item>
+						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="操作人">
 								<ehsSelect
@@ -140,19 +160,6 @@
 									:apiObj="this.$API.system.user.list"
 									:params="{ depts: dept }"
 								></ehsSelect>
-								<!-- <el-select
-									v-model="form.handle_user"
-									placeholder="操作人"
-									clearable
-									style="width: 100%"
-								>
-									<el-option
-										v-for="item in userOptions"
-										:key="item.id"
-										:label="item.name"
-										:value="item.id"
-									></el-option>
-								</el-select> -->
 							</el-form-item>
 						</el-col>
 						<el-col :md="12" :sm="24">
@@ -163,39 +170,6 @@
 								></el-input>
 							</el-form-item>
 						</el-col>
-						<el-col :span="24">
-							<el-form-item label="间隔提醒">
-								<el-input-number
-									v-model="form.reminder_interval_list[0]"
-									:min="1"
-									:disabled="mode == 'edit'"
-									style="width: 25%"
-									controls-position="right"
-								/>
-								<el-input-number
-									v-model="form.reminder_interval_list[1]"
-									:min="1"
-									:disabled="mode == 'edit'"
-									style="width: 25%"
-									controls-position="right"
-								/>
-								<el-input-number
-									v-model="form.reminder_interval_list[2]"
-									:min="1"
-									:disabled="mode == 'edit'"
-									style="width: 25%"
-									controls-position="right"
-								/>
-								<el-input-number
-									v-model="form.reminder_interval_list[3]"
-									:min="1"
-									:disabled="mode == 'edit'"
-									style="width: 25%"
-									controls-position="right"
-								/>
-								<div class="form_unit">(h)</div>
-							</el-form-item>
-						</el-col>
 					</el-row>
 				</el-form>
 			</el-main>
@@ -219,7 +193,7 @@ const defaultForm = {
 	work_start_time: "",
 	work_end_time:'',
 	note:'',
-	reminder_interval_list: [],
+	reminder_interval_list: [0,0],
 };
 
 export default {
@@ -228,6 +202,10 @@ export default {
 			type: String,
 			default: "",
 		},
+		mgroupName:{
+			type: String,
+			default: "",
+		},
 		mgroup: {
 			type: String,
 			default: "",
@@ -352,9 +330,6 @@ export default {
 			Object.assign(this.form, data);
 			this.getRoute(data.id);
 		},
-		setMgroup(id) {
-			this.form.mgroup = id;
-		},
 
 		//表单提交方法
 		submit() {
diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue
index 8f7236a7..7237c35b 100644
--- a/src/views/wpm_gx/mlogs.vue
+++ b/src/views/wpm_gx/mlogs.vue
@@ -129,6 +129,7 @@
 			:process="processId"
 			:mgroup="mgroupId"
 			:dept="deptId"
+			:mgroupName = "mgroupName"
 			@success="handleSaveSuccess"
 			@closed="dialog.save = false"
 		>