From 880c655e63e9aa5ae4e1d6b7416edebcfa52b16d Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 27 Aug 2024 16:09:04 +0800
Subject: [PATCH] fix:coding#4511

---
 src/views/mtm/route_form.vue   | 21 ++++++++++++---------
 src/views/wpm_gx/mlog_form.vue |  9 +++++----
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/views/mtm/route_form.vue b/src/views/mtm/route_form.vue
index f52b004a..bed5e2ec 100644
--- a/src/views/mtm/route_form.vue
+++ b/src/views/mtm/route_form.vue
@@ -66,10 +66,10 @@
 							</el-form-item>
 						</el-col> -->
 						<el-col :md="12" :sm="24">
-							<el-form-item label="主要输入" prop="material_in">
+							<el-form-item label="输入物料" prop="material_in">
 								<el-select
 									v-model="form.material_in"
-									placeholder="物料"
+									placeholder="输入物料"
 									clearable
 									filterable
 									:value-on-clear="null"
@@ -99,10 +99,10 @@
 							</el-form-item>
 						</el-col>
 						<el-col :md="12" :sm="24">
-							<el-form-item label="主要输出" prop="material_out">
+							<el-form-item label="输出物料" prop="material_out">
 								<el-select
 									v-model="form.material_out"
-									placeholder="物料"
+									placeholder="输出物料"
 									clearable
 									filterable
 									:value-on-clear="null"
@@ -131,10 +131,10 @@
 						</el-col> -->
 
 						<el-col :md="12" :sm="24">
-							<el-form-item label="工时" prop="hour_work">
+							<el-form-item label="计划时长" prop="hour_work">
 								<el-input-number
 									v-model="form.hour_work"
-									:min="1"
+									:min="0"
 									style="width: 100%"
 								/>
 							</el-form-item>
@@ -171,9 +171,12 @@ const defaultForm = {
 	process: null,
 	sort: 1,
 	out_rate: 100,
+	material_in:'',
+	material_out:'',
+	hour_work:0,
 	batch_bind: true,
-	is_autotask: true,
-	is_count_utask: false,
+	// is_autotask: true,
+	// is_count_utask: false,
 };
 export default {
 	props: {
@@ -185,7 +188,7 @@ export default {
 			loading: false,
 			mode: "add",
 			//表单数据
-			form: defaultForm,
+			form: Object.assign({}, defaultForm),
 			//验证规则
 			rules: {
 				process: [
diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue
index 49c0d453..d1e04184 100644
--- a/src/views/wpm_gx/mlog_form.vue
+++ b/src/views/wpm_gx/mlog_form.vue
@@ -211,11 +211,14 @@
 
 <script>
 const defaultForm = {
-	note: "",
+	mtype: "",
+	supplier:'',
 	route: "",
 	equipment: "",
 	handle_user: null,
 	work_start_time: "",
+	work_end_time:'',
+	note:'',
 	reminder_interval_list: [],
 };
 
@@ -251,7 +254,7 @@ export default {
 				show: "查看日志",
 			},
 			//表单数据
-			form: defaultForm,
+			form: Object.assign({}, defaultForm),
 			//验证规则
 			rules: {
 				supplier: [
@@ -341,8 +344,6 @@ export default {
 		open(mode = "add") {
 			this.mode = mode;
 			this.visible = true;
-			this.$refs.dialogForm.resetFields();
-			this.$refs.dialogForm.clearValidate();
 			return this;
 		},
 		//表单注入数据