From e04c8dab8e435cabf1360bbcd6936e5ac9e77906 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期一, 08 八月 2022 16:46:47 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue | 131 ++++++++++++++++++++++++-------------------
1 files changed, 72 insertions(+), 59 deletions(-)
diff --git a/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue b/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
index 1c862ac..9786b4e 100644
--- a/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
+++ b/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
@@ -1,23 +1,23 @@
<template>
- <el-dialog v-model="dialogVisible" :fullscreen="full" title="新建目标指标分解" width="50%" draggable>
+ <el-dialog v-model="dialogVisible" :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" ref="ruleFormRef" :rules="rules">
<el-row>
<el-col :span="11">
<el-form-item label="责任部门" prop="dutyDepartmentId" size="default">
- <el-tree-select v-model="form.dutyDepartmentId" :data="data" class="w100" :props="propse" placeholder="请选择" />
+ <el-tree-select v-model="form.dutyDepartmentId" check-strictly="true" :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" class="w100" :props="propse" placeholder="请选择" />
+ <el-tree-select v-model="form.makerDepartmentId" :data="data" check-strictly="true" class="w100" :props="propse" placeholder="请选择" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
@@ -28,8 +28,8 @@
</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,7 +39,7 @@
</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>
</span>
@@ -57,14 +57,57 @@
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 department = () => {
+ goalManagementApi()
+ .getTreedepartment()
+ .then((res) => {
+ if (res.data.code == 200) {
+ data.value = res.data.data;
+ } else {
+ ElMessage.error(res.data.msg);
+ }
+ });
+ };
+ const propse = {
+ label: 'depName',
+ children: 'children',
+ value: 'depId',
+ };
+ onMounted(() => {
+ department();
+ });
+ 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;
+ } else if (title == '修改') {
+ disabled.value = false;
+ form.value = data;
+ } else {
+ disabled.value = false;
+ }
+ dialogVisible.value = true;
+ };
+ // 开启用户弹窗
+ const Show = ref();
+ const openUser = () => {
+ Show.value.openDailog();
+ };
const rules = reactive<FormRules>({
dutyDepartmentId: [
{
@@ -84,83 +127,52 @@
{
required: true,
message: '上报人不能为空',
- trigger: 'change',
+ trigger: 'blur',
},
],
value: [
{
required: true,
message: '考核指标值不能为空',
- trigger: 'change',
+ trigger: 'blur',
+ },
+ {
+ type: 'number',
+ message: '考核指标值只能为数字类型',
+ trigger: 'blur',
},
],
makeDate: [
{
required: true,
message: '制定日期不能为空',
- trigger: 'change',
+ trigger: 'blur',
},
],
+ commitPersonName: [],
});
const submitForm = async (formEl: FormInstance | undefined) => {
if (!formEl) return;
await formEl.validate((valid, fields) => {
if (valid) {
- dialogVisible.value = false;
emit('onAdd', form.value);
+ dialogVisible.value = false;
+ // handleClose(formEl)
} else {
console.log('error submit!', fields);
}
});
- formEl.resetFields();
};
const resetForm = (formEl: FormInstance | undefined) => {
- if (!formEl) return;
+ // console.log(formEl);
+ if (!formEl) return
formEl.resetFields();
- dialogVisible.value = false;
+ // dialogVisible.value = false;
};
- //部门
- const department = () => {
- goalManagementApi()
- .getTreedepartment()
- .then((res) => {
- if (res.data.code == 200) {
- data.value = res.data.data;
- } else {
- ElMessage.error(res.data.msg);
- }
- });
- };
- const propse = {
- label: 'depName',
- children: 'children',
- value:"depId"
- };
- onMounted(() => {
-
- });
- const disabled=ref(false)
- // 开启弹窗
- const dialogVisible = ref(false);
- const openDailog = (title:string,data:any) => {
- department();
- if(title=='查看'){
- disabled.value=true
- form.value=data
- }else if(title=='修改'){
- disabled.value=true
- disabled.value=false
- }else{
- disabled.value=false
- }
- dialogVisible.value = true;
- };
- // 开启用户弹窗
- const Show = ref();
- const openUser = () => {
- Show.value.openDailog();
- };
+ // const handleClose = (formEl: any) => {
+ // formEl.resetFields();
+ // };
//全屏
const full = ref(false);
const toggleFullscreen = () => {
@@ -171,14 +183,15 @@
}
};
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;
};
return {
disabled,
- nameC,
+ titles,
+ // handleClose,
form,
propse,
department,
--
Gitblit v1.9.2