From f03e224440454f4324516826a85afe6fda06651d Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期二, 09 八月 2022 14:04:34 +0800
Subject: [PATCH] 对接

---
 src/components/equipmentDailog/maintenanceDailog.vue |   62 ++++++++++++-------------------
 1 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/src/components/equipmentDailog/maintenanceDailog.vue b/src/components/equipmentDailog/maintenanceDailog.vue
index e742cd7..a791fc4 100644
--- a/src/components/equipmentDailog/maintenanceDailog.vue
+++ b/src/components/equipmentDailog/maintenanceDailog.vue
@@ -19,7 +19,7 @@
 			<el-row>
 				<el-col :span="11">
 					<el-form-item label="保养日期" size="default" prop="takecareDate">
-						<el-date-picker v-model="form.takecareDate" format="YYYY-MM-DD HH:mm:ss" type="datetime" style="width: 100%" />
+						<el-date-picker v-model="form.takecareDate" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" style="width: 100%" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="11" :offset="2">
@@ -75,32 +75,32 @@
 		};
 		const rules = reactive<FormRules>({
 			takecareMemo: [
-				// {
-				// 	required: true,
-				// 	message: '保养情况不能为空',
-				// 	trigger: 'change',
-				// },
+				{
+					required: true,
+					message: '保养情况不能为空',
+					trigger: 'blur',
+				},
 			],
 			leadingPersonName: [
-				// {
-				// 	required: true,
-				// 	message: '保养负责人不能为空',
-				// 	trigger: 'change',
-				// },
+				{
+					required: true,
+					message: '保养负责人不能为空',
+					trigger: 'blur',
+				},
 			],
 			takecareDate: [
-				// {
-				// 	required: true,
-				// 	message: '保养日期不能为空',
-				// 	trigger: 'change',
-				// },
+				{
+					required: true,
+					message: '保养日期不能为空',
+					trigger: 'blur',
+				},
 			],
 			leadingPersonDepartmentId: [
-				// {
-				// 	required: true,
-				// 	message: '保养负责人单位不能为空',
-				// 	trigger: 'change',
-				// },
+				{
+					required: true,
+					message: '保养负责人单位不能为空',
+					trigger: 'blur',
+				},
 			],
 		});
 		// 开启用户弹窗
@@ -118,34 +118,20 @@
 			await formEl.validate((valid, fields) => {
 				if (valid) {
 					dialogVisible.value = false;
-					emit('onMain', form.value);
+					emit('onMain',form.value);
 				} else {
 					console.log('error submit!', fields);
 				}
 			});
-			form.value = {
-				takecareMemo: '',
-				leadingPersonId: '',
-				leadingPersonName: '',
-				takecareDate: '',
-				leadingPersonDepartmentId: '',
-			};
 			disabled.value = false;
-			// formEl.resetFields();
 		};
 		//   取消
 		const resetForms = (formEl: FormInstance | undefined) => {
 			if (!formEl) return;
-					form.value = {
-				takecareMemo: '',
-				leadingPersonId: '',
-				leadingPersonName: '',
-				takecareDate: '',
-				leadingPersonDepartmentId: '',
-			};
-			// formEl.resetFields();
+			formEl.resetFields();
 			dialogVisible.value = false;
 			disabled.value = false;
+			form.value={}
 		};
 		//全屏
 		const full = ref(false);

--
Gitblit v1.9.2