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/standardDailog.vue | 72 +++++----
src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue | 5
src/components/equipmentDailog/maintenanceDailog.vue | 62 +++-----
src/components/equipmentDailog/repairDailog.vue | 114 +++++++++------
src/components/equipmentDailog/detectDailog.vue | 94 +++++++-----
src/components/equipmentDailog/Dailog.vue | 14 +
6 files changed, 198 insertions(+), 163 deletions(-)
diff --git a/src/components/equipmentDailog/Dailog.vue b/src/components/equipmentDailog/Dailog.vue
index f56333f..e2a5998 100644
--- a/src/components/equipmentDailog/Dailog.vue
+++ b/src/components/equipmentDailog/Dailog.vue
@@ -356,6 +356,7 @@
import type { UploadProps, UploadUserFile } from 'element-plus';
import { facilityManagementApi } from '/@/api/facilityManagement';
import { goalManagementApi } from '/@/api/goalManagement';
+import {deepClone} from '/@/utils/other'
export default defineComponent({
components: { categoryDailog, regionDailog, DailogSearchUser, maintenanceDailog, detectDailog, repairDailog, standardDailog },
setup(props, { emit }) {
@@ -688,28 +689,32 @@
deleteDId.value.push(tag.id);
};
// 回传
- const main = (val: any) => {
+ const main = (data: any) => {
+ let val=deepClone(data)
if (index.value == -1) {
form.value.takecareDetailList.push(val);
} else {
form.value.takecareDetailList[index.value] = val;
}
};
- const delect = (val: any) => {
+ const delect = (data: any) => {
+ let val=deepClone(data)
if (index.value == -1) {
form.value.testDetailList.push(val);
} else {
form.value.testDetailList[index.value] = val;
}
};
- const Repair = (val: any) => {
+ const Repair = (data: any) => {
+ let val=deepClone(data)
if (index.value == -1) {
form.value.repaireDetailList.push(val);
} else {
form.value.repaireDetailList[index.value] = val;
}
};
- const Stand = (val: any) => {
+ const Stand = (data: any) => {
+ let val=deepClone(data)
if (index.value == -1) {
form.value.checkStandardeDetailList.push(val);
} else {
@@ -754,6 +759,7 @@
};
const data = ref();
return {
+ deepClone,
rules,
userId,
department,
diff --git a/src/components/equipmentDailog/detectDailog.vue b/src/components/equipmentDailog/detectDailog.vue
index 71279e3..278f164 100644
--- a/src/components/equipmentDailog/detectDailog.vue
+++ b/src/components/equipmentDailog/detectDailog.vue
@@ -1,36 +1,43 @@
<template>
- <el-dialog v-model="dialogVisible" @close="resetForm" :fullscreen="full" :title="titles" width="50%" draggable>
+ <el-dialog v-model="dialogVisible" @close="resetForm(ruleFormRef)" :fullscreen="full" :title="titles" width="50%" draggable>
<el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
- <el-form :model="form" :disabled="disabled" label-width="120px">
+ <el-form :model="form" ref="ruleFormRef" :rules="rules" :disabled="disabled" label-width="120px">
<el-row>
<el-col :span="11">
- <el-form-item label="检测人" size="default">
- <el-input v-model="form.testPersonName">
+ <el-form-item label="检测人" size="default" prop="testPersonName">
+ <el-input v-model="form.testPersonName">
<template #append> <el-button :icon="Search" @click="openUser" /> </template
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="检测日期" size="default">
- <el-date-picker v-model="form.testDate" format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
+ <el-form-item label="检测日期" size="default" prop="testDate">
+ <el-date-picker v-model="form.testDate" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="检测人单位" size="default">
- <el-tree-select v-model="form.testPersonDepartmentId" :data="data" check-strictly="true" class="w100" :props="propse" placeholder="请选择" />
+ <el-form-item label="检测人单位" size="default" prop="testPersonDepartmentId">
+ <el-tree-select
+ v-model="form.testPersonDepartmentId"
+ :data="data"
+ check-strictly="true"
+ class="w100"
+ :props="propse"
+ placeholder="请选择"
+ />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="检测内容" size="default">
+ <el-form-item label="检测内容" size="default" prop="testMemo">
<el-input v-model="form.testMemo" placeholder="请填写检测内容" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="检测结果" size="default">
+ <el-form-item label="检测结果" size="default" prop="testResult">
<el-select v-model="form.testResult" placeholder="请选择" style="width: 100%">
<el-option label="成功" value="1" />
<el-option label="失败" value="2" />
@@ -38,7 +45,7 @@
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="检测状态" size="default">
+ <el-form-item label="检测状态" size="default" prop="testStatus">
<el-input v-model="form.testStatus" placeholder="请填写检测状态" />
</el-form-item>
</el-col>
@@ -47,8 +54,8 @@
<template #footer>
<span class="dialog-footer">
<!-- <el-button type="primary" @click="dialogVisible = false" size="default">继续添加</el-button> -->
- <el-button @click="resetForm" size="default">关闭</el-button>
- <el-button type="primary" @click="submitForm" size="default">确定</el-button>
+ <el-button @click="resetForm(ruleFormRef)" size="default">关闭</el-button>
+ <el-button type="primary" @click="submitForm(ruleFormRef)" size="default">确定</el-button>
</span>
</template>
</el-dialog>
@@ -56,16 +63,18 @@
</template>
<script lang="ts">
import { defineComponent, ref, reactive } from 'vue';
-import { ElMessage, ElMessageBox} from 'element-plus';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import type { FormInstance, FormRules } from 'element-plus';
import { Search, FullScreen } from '@element-plus/icons-vue';
import DailogSearchUser from '/@/components/DailogSearchUser/index.vue';
import { goalManagementApi } from '/@/api/goalManagement';
export default defineComponent({
components: { DailogSearchUser },
setup(props, { emit }) {
+ const ruleFormRef = ref<FormInstance>();
const form = ref({
testPersonId: '',
- testPersonName:'',
+ testPersonName: '',
testDate: '',
testPersonDepartmentId: '',
testMemo: '',
@@ -77,13 +86,13 @@
const disabled = ref(false);
const dialogVisible = ref(false);
const openDailog = (title: string, data: any) => {
- department()
+ department();
dialogVisible.value = true;
titles.value = `${title}设备检测`;
if (title == '查看') {
disabled.value = true;
form.value = data;
- } else if(title == '修改'){
+ } else if (title == '修改') {
disabled.value = false;
form.value = data;
}
@@ -95,36 +104,37 @@
};
const User = (val: any) => {
form.value.testPersonId = val.uid;
- form.value.testPersonName=val.realName;
+ form.value.testPersonName = val.realName;
};
+ const rules = reactive<FormRules>({
+ testPersonName: [{ required: true, message: '检测人不能为空', trigger: 'blur' }],
+ testDate:[{ required: true, message: '检测日期不能为空', trigger: 'blur' }],
+ testPersonDepartmentId:[],
+ testMemo:[{ required: true, message: '检测内容不能为空', trigger: 'blur' }],
+ testResult:[{ required: true, message: '检测结果不能为空', trigger: 'blur' }],
+ testStatus:[{ required: true, message: '检测状态不能为空', trigger: 'blur' }],
+ });
// 提交
- const submitForm = () => {
- dialogVisible.value = false;
- emit('onDelect', form.value);
- form.value = {
- testPersonId: '',
- testPersonName:'',
- testDate: '',
- testPersonDepartmentId: '',
- testMemo: '',
- testResult: '',
- testStatus: '',
- };
+ const submitForm = async (formEl: FormInstance | undefined) => {
+ if (!formEl) return;
+ await formEl.validate((valid, fields) => {
+ if (valid) {
+ emit('onDelect', form.value);
+ dialogVisible.value = false;
+ } else {
+ console.log('error submit!', fields);
+ }
+ });
+
disabled.value = false;
};
// 取消
- const resetForm = () => {
+ const resetForm = (formEl: FormInstance | undefined) => {
+ if (!formEl) return;
+ formEl.resetFields();
dialogVisible.value = false;
- form.value = {
- testPersonId: '',
- testPersonName:'',
- testDate: '',
- testPersonDepartmentId: '',
- testMemo: '',
- testResult: '',
- testStatus: '',
- };
disabled.value = false;
+ form.value={}
};
//全屏
const full = ref(false);
@@ -135,7 +145,7 @@
full.value = false;
}
};
- //部门树
+ //部门树
const department = () => {
goalManagementApi()
.getTreedepartment()
@@ -154,6 +164,8 @@
};
const data = ref();
return {
+ ruleFormRef,
+ rules,
department,
propse,
data,
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);
diff --git a/src/components/equipmentDailog/repairDailog.vue b/src/components/equipmentDailog/repairDailog.vue
index 0c3baff..f3aa40a 100644
--- a/src/components/equipmentDailog/repairDailog.vue
+++ b/src/components/equipmentDailog/repairDailog.vue
@@ -1,15 +1,15 @@
<template>
- <el-dialog v-model="dialogVisible" :fullscreen="full" :before-close="resetForm" :title="titles" width="50%" draggable>
+ <el-dialog v-model="dialogVisible" :fullscreen="full" @close="resetForm(ruleFormRef)" :title="titles" width="50%" draggable>
<el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
- <el-form :model="form" :disabled="disabled" label-width="120px">
+ <el-form :model="form" ref="ruleFormRef" :rules="rules" :disabled="disabled" label-width="120px">
<el-row>
<el-col :span="11">
- <el-form-item label="设施异常项" size="default">
+ <el-form-item label="设施异常项" size="default" prop="exceptionInfo">
<el-input v-model="form.exceptionInfo" placeholder="请填写设施异常项" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="维修状态" size="default">
+ <el-form-item label="维修状态" size="default" prop="repairStatus">
<el-select v-model="form.repairStatus" placeholder="请选择" style="width: 100%">
<el-option label="维修中" value="1" />
<el-option label="已修好" value="2" />
@@ -19,12 +19,12 @@
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="维修情况" size="default">
+ <el-form-item label="维修情况" size="default" prop="repairMemo">
<el-input v-model="form.repairMemo" placeholder="请填写维修情况" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="维修负责人" size="default">
+ <el-form-item label="维修负责人" size="default" prop="repairPersonName">
<el-input v-model="form.repairPersonName" placeholder="请选择">
<template #append> <el-button :icon="Search" @click="openUser" /> </template
></el-input>
@@ -33,20 +33,41 @@
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="维修负责人单位" size="default">
- <el-tree-select v-model="form.repairPersonDepartmentId" :data="data" check-strictly="true" class="w100" :props="propse" placeholder="请选择" />
+ <el-form-item label="维修负责人单位" size="default" prop="repairPersonDepartmentId">
+ <el-tree-select
+ v-model="form.repairPersonDepartmentId"
+ :data="data"
+ check-strictly="true"
+ class="w100"
+ :props="propse"
+ placeholder="请选择"
+ />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="维修开始日期" size="default">
- <el-date-picker v-model="form.repairStartDate" format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
+ <el-form-item label="维修开始日期" size="default" prop="repairStartDate">
+ <el-date-picker
+ v-model="form.repairStartDate"
+ format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ type="datetime"
+ placeholder="选择日期时间"
+ style="width: 100%"
+ />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="维修结束日期" size="default">
- <el-date-picker v-model="form.repairEndDate" format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
+ <el-form-item label="维修结束日期" size="default" prop="repairEndDate">
+ <el-date-picker
+ v-model="form.repairEndDate"
+ format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ type="datetime"
+ placeholder="选择日期时间"
+ style="width: 100%"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -54,8 +75,8 @@
<template #footer>
<span class="dialog-footer">
<!-- <el-button type="primary" @click="dialogVisible = false" size="default">继续添加</el-button> -->
- <el-button @click="resetForm" size="default">关闭</el-button>
- <el-button type="primary" @click="submitForm" size="default">确定</el-button>
+ <el-button @click="resetForm(ruleFormRef)" size="default">关闭</el-button>
+ <el-button type="primary" @click="submitForm(ruleFormRef)" size="default">确定</el-button>
</span>
</template>
</el-dialog>
@@ -63,20 +84,22 @@
</template>
<script lang="ts">
import { defineComponent, ref, reactive } from 'vue';
-import { ElMessage, ElMessageBox} from 'element-plus';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import type { FormInstance, FormRules } from 'element-plus';
import { Search, FullScreen } from '@element-plus/icons-vue';
import DailogSearchUser from '/@/components/DailogSearchUser/index.vue';
import { goalManagementApi } from '/@/api/goalManagement';
export default defineComponent({
components: { DailogSearchUser },
setup(props, { emit }) {
+ const ruleFormRef = ref<FormInstance>();
const form = ref({
exceptionInfo: '',
repairStatus: '',
repairMemo: '',
repairPersonId: '',
- repairPersonName:'',
- repairPersonDepartmentId: "",
+ repairPersonName: '',
+ repairPersonDepartmentId: '',
repairStartDate: '',
repairEndDate: '',
});
@@ -85,13 +108,13 @@
const disabled = ref(false);
const dialogVisible = ref(false);
const openDailog = (title: string, data: any) => {
- department()
+ department();
dialogVisible.value = true;
titles.value = `${title}设备维修`;
if (title == '查看') {
disabled.value = true;
form.value = data;
- } else if(title == '修改') {
+ } else if (title == '修改') {
disabled.value = false;
form.value = data;
}
@@ -105,36 +128,35 @@
form.value.repairPersonId = val.uid;
form.value.repairPersonName = val.realName;
};
+ const rules = reactive<FormRules>({
+ exceptionInfo: [{ required: true, message: '设施异常项不能为空', trigger: 'blur' }],
+ repairStatus: [{ required: true, message: '维修状态不能为空', trigger: 'blur' }],
+ repairMemo: [{ required: true, message: '维修情况不能为空', trigger: 'blur' }],
+ repairPersonName: [{ required: true, message: '维修负责人不能为空', trigger: 'blur' }],
+ repairPersonDepartmentId: [{ required: true, message: '维修负责人单位不能为空', trigger: 'blur' }],
+ repairStartDate: [{ required: true, message: '维修开始日期不能为空', trigger: 'blur' }],
+ repairEndDate: [{ required: true, message: '维修结束日期不能为空', trigger: 'blur' }],
+ });
// 提交
- const submitForm = () => {
- dialogVisible.value = false;
- emit('onRepair', form.value);
- form.value = {
- exceptionInfo: '',
- repairStatus: '',
- repairMemo: '',
- repairPersonId: '',
- repairPersonName:'',
- repairPersonDepartmentId: "",
- repairStartDate: '',
- repairEndDate: '',
- };
+ const submitForm = async (formEl: FormInstance | undefined) => {
+ if (!formEl) return;
+ await formEl.validate((valid, fields) => {
+ if (valid) {
+ emit('onRepair', form.value);
+ dialogVisible.value = false;
+ } else {
+ console.log('error submit!', fields);
+ }
+ });
disabled.value = false;
};
// 取消
- const resetForm = () => {
- dialogVisible.value = false;
- form.value = {
- exceptionInfo: '',
- repairStatus: '',
- repairMemo: '',
- repairPersonId: '',
- repairPersonName:"",
- repairPersonDepartmentId: "",
- repairStartDate: '',
- repairEndDate: '',
- };
+ const resetForm = (formEl: FormInstance | undefined) => {
+ if (!formEl) return;
+ formEl.resetFields();
disabled.value = false;
+ dialogVisible.value = false;
+ form.value = {};
};
//全屏
const full = ref(false);
@@ -145,7 +167,7 @@
full.value = false;
}
};
- //部门树
+ //部门树
const department = () => {
goalManagementApi()
.getTreedepartment()
@@ -164,6 +186,8 @@
};
const data = ref();
return {
+ rules,
+ ruleFormRef,
department,
propse,
data,
diff --git a/src/components/equipmentDailog/standardDailog.vue b/src/components/equipmentDailog/standardDailog.vue
index a1f901e..07c4eac 100644
--- a/src/components/equipmentDailog/standardDailog.vue
+++ b/src/components/equipmentDailog/standardDailog.vue
@@ -1,14 +1,14 @@
<template>
- <el-dialog v-model="dialogVisible" :fullscreen="full" :before-close="resetForm" :title="titles" width="50%" draggable>
- <el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
- <el-form :model="form" label-width="120px" :disabled="disabled">
+ <el-dialog v-model="dialogVisible" :fullscreen="full" @close="resetForm(ruleFormRef)" :title="titles" width="50%" draggable>
+ <el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
+ <el-form :model="form" ref="ruleFormRef" :rules="rules" label-width="120px" :disabled="disabled">
<el-row>
<el-col :span="11">
- <el-form-item label="序号" size="default">
+ <el-form-item label="序号" size="default" prop="indexNum">
<el-input v-model="form.indexNum" placeholder="请填写序号" />
</el-form-item>
</el-col>
- <el-col :span="11" :offset="2" size="default">
+ <el-col :span="11" :offset="2" size="default" prop="checkContent">
<el-form-item label="检查内容">
<el-input v-model="form.checkContent" placeholder="请填写检查内容" />
</el-form-item>
@@ -16,24 +16,24 @@
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="检查指标" size="default">
+ <el-form-item label="检查指标" size="default" prop="checkTarget">
<el-input v-model="form.checkTarget" placeholder="请填写检查指标" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="单位" size="default">
+ <el-form-item label="单位" size="default" prop="unit">
<el-input v-model="form.unit" placeholder="请填写单位" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="巡检部位" size="default">
+ <el-form-item label="巡检部位" size="default" prop="checkPart">
<el-input v-model="form.checkPart" placeholder="请填写巡检部位" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="频次" size="default">
+ <el-form-item label="频次" size="default" prop="rate">
<el-input v-model="form.rate" placeholder="请填写频次" />
</el-form-item>
</el-col>
@@ -42,8 +42,8 @@
<template #footer>
<span class="dialog-footer">
<!-- <el-button type="primary" @click="dialogVisible = false" size="default">继续添加</el-button> -->
- <el-button @click="resetForm" size="default">关闭</el-button>
- <el-button type="primary" @click="submitForm" size="default">确定</el-button>
+ <el-button @click="resetForm(ruleFormRef)" size="default">关闭</el-button>
+ <el-button type="primary" @click="submitForm(ruleFormRef)" size="default">确定</el-button>
</span>
</template>
</el-dialog>
@@ -51,17 +51,19 @@
</template>
<script lang="ts">
import { defineComponent, ref, reactive } from 'vue';
+import type { FormInstance, FormRules } from 'element-plus';
import { Search, FullScreen } from '@element-plus/icons-vue';
import DailogSearchUser from '/@/components/DailogSearchUser/index.vue';
export default defineComponent({
components: { DailogSearchUser },
setup(props, { emit }) {
+ const ruleFormRef = ref<FormInstance>();
const form = ref({
indexNum: '',
checkContent: '',
checkTarget: '',
unit: '',
- checkPart: "",
+ checkPart: '',
rate: '',
});
// 开启弹窗
@@ -74,7 +76,7 @@
if (title == '查看') {
disabled.value = true;
form.value = data;
- } else if(title=='修改'){
+ } else if (title == '修改') {
disabled.value = false;
form.value = data;
}
@@ -84,32 +86,34 @@
const openUser = () => {
Show.value.openDailog();
};
+ const rules = reactive<FormRules>({
+ indexNum: [{ required: true, message: '序号不能为空', trigger: 'blur' }],
+ checkContent: [{ required: true, message: '检查内容不能为空', trigger: 'blur' }],
+ checkTarget: [{ required: true, message: '检查指标不能为空', trigger: 'blur' }],
+ unit: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
+ checkPart: [{ required: true, message: '巡检部位不能为空', trigger: 'blur' }],
+ rate: [{ required: true, message: '频次不能为空', trigger: 'blur' }],
+ });
// 提交
- const submitForm = () => {
- dialogVisible.value = false;
- emit('onStand', form.value);
- form.value = {
- indexNum: '',
- checkContent: '',
- checkTarget: '',
- unit: '',
- checkPart: "",
- rate: '',
- };
+ const submitForm = async (formEl: FormInstance | undefined) => {
+ if (!formEl) return;
+ await formEl.validate((valid, fields) => {
+ if (valid) {
+ emit('onStand', form.value);
+ dialogVisible.value = false;
+ } else {
+ console.log('error submit!', fields);
+ }
+ });
disabled.value = false;
};
// 取消
- const resetForm = () => {
+ const resetForm = (formEl: FormInstance | undefined) => {
+ if (!formEl) return;
+ formEl.resetFields();
dialogVisible.value = false;
- form.value = {
- indexNum: '',
- checkContent: '',
- checkTarget: '',
- unit: '',
- checkPart: "",
- rate: '',
- };
disabled.value = false;
+ form.value = {};
};
//全屏
const full = ref(false);
@@ -121,6 +125,8 @@
}
};
return {
+ rules,
+ ruleFormRef,
form,
titles,
disabled,
diff --git a/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue b/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
index bebc315..cf55c01 100644
--- a/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
+++ b/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
@@ -113,14 +113,14 @@
{
required: true,
message: '责任部门不能为空',
- trigger: 'change',
+ trigger: 'blur',
},
],
makerDepartmentId: [
{
required: true,
message: '制定人部门不能为空',
- trigger: 'change',
+ trigger: 'blur',
},
],
commitPersonId: [
@@ -169,6 +169,7 @@
if (!formEl) return
formEl.resetFields();
dialogVisible.value = false;
+ form.value={}
};
// const handleClose = (formEl: any) => {
// formEl.resetFields();
--
Gitblit v1.9.2