From 485e89eed73a37c78a4823f9e77bfcdbdaa01fe2 Mon Sep 17 00:00:00 2001
From: zhaojiale <631455805@qq.com>
Date: 星期三, 10 八月 2022 10:56:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue b/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
index b74644b..cf55c01 100644
--- a/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
+++ b/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog v-model="dialogVisible" :fullscreen="full" :title="titles" width="50%" draggable>
+ <el-dialog v-model="dialogVisible" :fullscreen="full" :title="titles" width="50%" draggable @close="resetForm(ruleFormRef)">
<el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
<el-form :model="form" :disabled="disabled" label-width="120px" ref="ruleFormRef" :rules="rules">
<el-row>
@@ -22,7 +22,7 @@
</el-col>
<el-col :span="11" :offset="2">
<el-form-item label="制定日期" prop="makeDate" size="default">
- <el-date-picker v-model="form.makeDate" format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择" style="width: 100%" />
+ <el-date-picker v-model="form.makeDate" 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>
@@ -113,14 +113,14 @@
{
required: true,
message: '责任部门不能为空',
- trigger: 'change',
+ trigger: 'blur',
},
],
makerDepartmentId: [
{
required: true,
message: '制定人部门不能为空',
- trigger: 'change',
+ trigger: 'blur',
},
],
commitPersonId: [
@@ -168,7 +168,8 @@
// console.log(formEl);
if (!formEl) return
formEl.resetFields();
- // dialogVisible.value = false;
+ dialogVisible.value = false;
+ form.value={}
};
// const handleClose = (formEl: any) => {
// formEl.resetFields();
@@ -184,6 +185,7 @@
};
const data = ref();
const onUser = (e: any) => {
+ console.log(e)
form.value.commitPersonId = e.uid;
form.value.commitPersonName = e.realName;
};
--
Gitblit v1.9.2