From d50aa9534c1bd65dd68d2f96039e06d861a086cf Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期三, 17 八月 2022 17:05:23 +0800
Subject: [PATCH] 对接
---
src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue | 189 ++++++++++++++++++++++++++++++-----------------
1 files changed, 121 insertions(+), 68 deletions(-)
diff --git a/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue b/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
index 1f15d99..6041772 100644
--- a/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
+++ b/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
@@ -1,35 +1,66 @@
<template>
- <el-dialog v-model="dialogVisible" :fullscreen="full" title="新建目标指标分解" 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>
+ <el-col :span="11">
+ <el-form-item label="考核指标" prop="value" size="default"> </el-form-item>
+ </el-col>
+ <el-col :span="11" :offset="2">
+ <el-form-item label="考核指标" prop="value" size="default"> </el-form-item>
+ </el-col>
+ </el-row> -->
<el-row>
<el-col :span="11">
<el-form-item label="责任部门" prop="dutyDepartmentId" size="default">
- <el-tree-select v-model="form.dutyDepartmentId" check-strictly="true" :data="data" class="w100" :props="propse" placeholder="请选择" />
+ <el-tree-select
+ v-model="form.dutyDepartmentId"
+ check-strictly="true"
+ @current-change="dutyName"
+ :data="data"
+ class="w100"
+ :props="propse"
+ placeholder="请选择"
+ />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
<el-form-item label="考核指标" prop="value" size="default">
- <el-input v-model="form.value" />
+ <el-input v-model.number="form.value" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="制定人部门" prop="makerDepartmentId" size="default">
- <el-tree-select v-model="form.makerDepartmentId" :data="data" check-strictly="true" class="w100" :props="propse" placeholder="请选择" />
+ <el-tree-select
+ v-model="form.makerDepartmentId"
+ :data="data"
+ @current-change="makerName"
+ check-strictly="true"
+ class="w100"
+ :props="propse"
+ placeholder="请选择"
+ />
</el-form-item>
</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>
<el-row>
<el-col :span="11">
- <el-form-item label="上报人" prop="commitPersonId" size="default">
- <el-input v-model="nameC">
+ <el-form-item label="上报人" prop="commitPersonName" size="default">
+ <el-input v-model="form.commitPersonName">
<template #append> <el-button :icon="Search" @click="openUser" /> </template
></el-input>
</el-form-item>
@@ -39,9 +70,8 @@
</el-form>
<template #footer>
<span class="dialog-footer">
- <!-- <el-button type="primary" @click="dialogVisible = false" size="default">继续添加</el-button> -->
<el-button @click="resetForm(ruleFormRef)" size="default">关闭</el-button>
- <el-button type="primary" @click="submitForm(ruleFormRef)" size="default">确定</el-button>
+ <el-button type="primary" @click="submitForm(ruleFormRef)" :disabled="disabled" size="default">确定</el-button>
</span>
</template>
</el-dialog>
@@ -57,69 +87,15 @@
export default defineComponent({
components: { DailogSearchUser },
setup(props, { emit }) {
+ const ruleFormRef = ref<FormInstance>();
const form = ref({
dutyDepartmentId: '', ////责任部门/外键
makerDepartmentId: '', ////制定人部门/外键
commitPersonId: '', ////上报人/外键
+ commitPersonName: '',
value: '', ////考核指标值
makeDate: '', ////制定日期
});
- const ruleFormRef = ref<FormInstance>();
- const rules = reactive<FormRules>({
- dutyDepartmentId: [
- {
- required: true,
- message: '责任部门不能为空',
- trigger: 'change',
- },
- ],
- makerDepartmentId: [
- {
- required: true,
- message: '制定人部门不能为空',
- trigger: 'change',
- },
- ],
- commitPersonId: [
- {
- required: true,
- message: '上报人不能为空',
- trigger: 'change',
- },
- ],
- value: [
- {
- required: true,
- message: '考核指标值不能为空',
- trigger: 'change',
- },
- ],
- makeDate: [
- {
- required: true,
- message: '制定日期不能为空',
- trigger: 'change',
- },
- ],
- });
- const submitForm = async (formEl: FormInstance | undefined) => {
- if (!formEl) return;
- await formEl.validate((valid, fields) => {
- if (valid) {
- dialogVisible.value = false;
- emit('onAdd', form.value);
- } else {
- console.log('error submit!', fields);
- }
- });
- formEl.resetFields();
- };
-
- const resetForm = (formEl: FormInstance | undefined) => {
- dialogVisible.value = false;
- if (!formEl) return
- formEl.resetFields();
- };
//部门
const department = () => {
goalManagementApi()
@@ -142,8 +118,10 @@
});
const disabled = ref(false);
// 开启弹窗
+ const titles = ref();
const dialogVisible = ref(false);
const openDailog = (title: string, data: any) => {
+ titles.value = `${title}目标指标分解`;
if (title == '查看') {
disabled.value = true;
form.value = data;
@@ -160,6 +138,72 @@
const openUser = () => {
Show.value.openDailog();
};
+ const rules = reactive<FormRules>({
+ dutyDepartmentId: [
+ {
+ required: true,
+ message: '责任部门不能为空',
+ trigger: 'blur',
+ },
+ ],
+ makerDepartmentId: [
+ {
+ required: true,
+ message: '制定人部门不能为空',
+ trigger: 'blur',
+ },
+ ],
+ commitPersonId: [
+ {
+ required: true,
+ message: '上报人不能为空',
+ trigger: 'blur',
+ },
+ ],
+ value: [
+ {
+ required: true,
+ message: '考核指标值不能为空',
+ trigger: 'blur',
+ },
+ {
+ type: 'number',
+ message: '考核指标值只能为数字类型',
+ trigger: 'blur',
+ },
+ ],
+ makeDate: [
+ {
+ required: true,
+ message: '制定日期不能为空',
+ trigger: 'blur',
+ },
+ ],
+ commitPersonName: [],
+ });
+ const submitForm = async (formEl: FormInstance | undefined) => {
+ if (!formEl) return;
+ await formEl.validate((valid, fields) => {
+ if (valid) {
+ emit('onAdd', form.value);
+ dialogVisible.value = false;
+ // handleClose(formEl)
+ } else {
+ console.log('error submit!', fields);
+ }
+ });
+ };
+
+ const resetForm = (formEl: FormInstance | undefined) => {
+ // console.log(formEl);
+ if (!formEl) return;
+ formEl.clearValidate();
+ dialogVisible.value = false;
+ form.value = {};
+ };
+ // const handleClose = (formEl: any) => {
+ // formEl.resetFields();
+ // };
//全屏
const full = ref(false);
const toggleFullscreen = () => {
@@ -170,14 +214,23 @@
}
};
const data = ref();
- const nameC = ref();
const onUser = (e: any) => {
+ console.log(e);
form.value.commitPersonId = e.uid;
- nameC.value = e.realName;
+ form.value.commitPersonName = e.realName;
+ };
+ const makerName = (data: any) => {
+ form.value.makerDepartmentName = data.depName;
+ };
+ const dutyName = (data: any) => {
+ form.value.dutyDepartmentName = data.depName;
};
return {
disabled,
- nameC,
+ makerName,
+ dutyName,
+ titles,
+ // handleClose,
form,
propse,
department,
--
Gitblit v1.9.2