From c64c8f43ec1a3d88feb1f915fd488040b6358e7d Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期二, 09 八月 2022 19:04:12 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/views/goalManagement/performanceAppraisal/component/DailogAq.vue | 249 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 160 insertions(+), 89 deletions(-)
diff --git a/src/views/goalManagement/performanceAppraisal/component/DailogAq.vue b/src/views/goalManagement/performanceAppraisal/component/DailogAq.vue
index b4edf49..cc51dcd 100644
--- a/src/views/goalManagement/performanceAppraisal/component/DailogAq.vue
+++ b/src/views/goalManagement/performanceAppraisal/component/DailogAq.vue
@@ -1,61 +1,71 @@
<template>
- <el-dialog v-model="dialogVisible" :fullscreen="full" :title="titles" width="50%" draggable>
+ <el-dialog v-model="dialogVisible" :fullscreen="full" @close="handleClose(ruleFormRef)" :title="titles" width="50%" draggable>
<el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
- <el-form :model="form" label-width="120px">
+ <el-form :model="form" label-width="120px" ref="ruleFormRef" :rules="rules">
<el-row>
<el-col :span="11">
- <el-form-item label="考核标题" size="default">
- <el-input v-model="form.title"></el-input>
+ <el-form-item label="考核标题" size="default" prop="title">
+ <el-input v-model="form.title" placeholder="请填写考核标题"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="考核日期" size="default">
- <el-input v-model="form.examineDate" />
+ <el-form-item label="考核日期" size="default" prop="examineDate">
+ <el-date-picker v-model="form.examineDate" 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-input v-model="form.name" />
+ <el-form-item label="合格分数" size="default" prop="acceptanceNumber">
+ <el-input v-model="form.acceptanceNumber" disabled />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="总分" size="default">
- <el-input v-model="form.examineTotalNumber" />
+ <el-form-item label="总分" size="default" prop="examineTotalNumber">
+ <el-input v-model="form.examineTotalNumber" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="考核部门" size="default">
- <el-select v-model="form.examineDepartmentId" style="width: 100%" placeholder="请选择">
- <el-option label="Zone one" value="shanghai" />
- <el-option label="Zone two" value="beijing" />
- </el-select>
+ <el-form-item label="考核部门" size="default" prop="examineDepartmentId">
+ <el-tree-select
+ v-model="form.examineDepartmentId"
+ :data="data"
+ class="w100"
+ @node-click="nameData1"
+ :props="propse"
+ check-strictly
+ placeholder="请选择"
+ />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="考核人" size="default">
- <el-input v-model="form.examinePersonId">
- <template #append> <el-button :icon="Search" @click="daiInpt" /></template>
+ <el-form-item label="考核人" size="default" prop="examinePersonName">
+ <el-input v-model="form.examinePersonName">
+ <template #append> <el-button :icon="Search" @click="daiInpt(1)" /></template>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="被考核部门" size="default">
- <el-select v-model="form.beExaminedDepartmentId" style="width: 100%" placeholder="请选择">
- <el-option label="Zone one" value="shanghai" />
- <el-option label="Zone two" value="beijing" />
- </el-select>
+ <el-form-item label="被考核部门" size="default" prop="beExaminedDepartmentId">
+ <el-tree-select
+ v-model="form.beExaminedDepartmentId"
+ :data="data"
+ @node-click="nameData2"
+ class="w100"
+ :props="propse"
+ check-strictly
+ placeholder="请选择"
+ />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="被考核人" size="default">
- <el-input v-model="form.beExaminedPersonId">
- <template #append> <el-button :icon="Search" @click="daiInpt" /></template>
+ <el-form-item label="被考核人" size="default" prop="beExaminedPersonName">
+ <el-input v-model="form.beExaminedPersonName">
+ <template #append> <el-button :icon="Search" @click="daiInpt(0)" /></template>
</el-input>
</el-form-item>
</el-col>
@@ -84,14 +94,14 @@
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="考核模板" size="default">
- <el-input v-model="form.examineTemplateId">
+ <el-form-item label="考核模板" size="default" prop="examineTemplateName">
+ <el-input disabled v-model="form.examineTemplateName">
<template #append> <el-button :icon="Search" @click="daiAdd" /></template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="备注信息">
+ <el-form-item label="备注信息" prop="memo">
<el-input v-model="form.memo" type="textarea"> </el-input>
</el-form-item>
</el-col>
@@ -105,7 +115,11 @@
<el-table :data="tableData" style="width: 100%">
<el-table-column align="center" prop="date" label="考核项目" />
<el-table-column align="center" prop="name" label="考核内容" />
- <el-table-column align="center" prop="address" label="考核分数" />
+ <el-table-column align="center" label="考核分数">
+ <template #default="scope">
+ <el-input v-model="scope.row.address" type="textarea"> </el-input>
+ </template>
+ </el-table-column>
<!-- <el-table-column align="center" prop="address" label="制定日期" />
<el-table-column align="center" prop="address" label="上报人" />
<el-table-column align="center" label="操作">
@@ -116,13 +130,13 @@
</el-table>
<template #footer>
<span class="dialog-footer">
- <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>
<DailogSearch ref="Show"></DailogSearch>
- <DailogSearchUser ref="Shows"></DailogSearchUser>
+ <DailogSearchUser ref="Shows" @SearchUser="userId"></DailogSearchUser>
</template>
<script lang="ts">
import { defineComponent, ref, reactive } from 'vue';
@@ -132,28 +146,36 @@
import { ElMessage, ElMessageBox } from 'element-plus';
import { goalManagementApi } from '/@/api/goalManagement';
import type { UploadProps, UploadUserFile } from 'element-plus';
+import type { FormInstance, FormRules } from 'element-plus';
export default defineComponent({
components: { DailogSearchUser, DailogSearch },
setup(props, { emit }) {
const dialogVisible = ref<boolean>(false);
+ const ruleFormRef = ref<FormInstance>();
const form = ref({
- beExaminedDepartmentId: 8, ////被考核部门ID/外键
- beExaminedPersonId: '6', ////被考核人ID/外键（可能有多个，用逗号隔开）
- examineDate: 1658387422569, ////考核日期
- examineDepartmentId: 7, ////考核部门ID/外键
- examinePersonId: '5', ////考核人ID/外键
- examineTemplateId: 0, ////绩效考核模板ID/外键
- examineTotalNumber: '3', ////总分
+ beExaminedDepartmentId: '', ////被考核部门ID/外键
+ beExaminedDepartmentName: '',
+ beExaminedPersonId: '', ////被考核人ID/外键（可能有多个，用逗号隔开）
+ beExaminedPersonName: '',
+ examineDate: '', ////考核日期
+ examineDepartmentId: '', ////考核部门ID/外键
+ examineDepartmentName: '',
+ examinePersonId: '', ////考核人ID/外键
+ examinePersonName: '',
+ examineTemplateId: 1, ////绩效考核模板ID/外键
+ examineTemplateName: '',
+ examineTotalNumber: '', ////总分
extraFile: '9', //责任书附件
- itemDetail: '2', ////考核项目
- memo: '4', ////备注信息
+ itemDetail: '', ////考核项目
+ memo: '', ////备注信息
numberDetailJson: '[{"id":"123","number":"123"}]', ////各个考核项目的具体得分，json格式。形式为：[{“id”:"123","number":"123"}]
- title: '1', ////考核标题
+ title: '', ////考核标题
});
const titles = ref();
const disabled = ref(false);
// 打开弹窗
const openDailog = (title: string, value: any, id: number) => {
+ department();
dialogVisible.value = true;
titles.value = `${title}安全考核管理`;
disabled.value = title == '查看' ? true : false;
@@ -168,56 +190,55 @@
}
});
};
+ // 验证
+ const rules = reactive<FormRules>({
+ title: [{ required: true, message: '考核标题不能为空', trigger: 'blur' }],
+ examineDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+ examineDepartmentId: [{ required: true, message: '考核部门不能为空', trigger: 'blur' }],
+ examinePersonName: [],
+ examinePersonId: [],
+ beExaminedDepartmentId: [{ required: true, message: '被考核部门不能为空', trigger: 'blur' }],
+ beExaminedPersonName: [],
+ beExaminedPersonId: [],
+ examineTemplateId: [],
+ examineTemplateName: [{ required: true, message: '考核模板不能为空', trigger: 'blur' }],
+ memo: [],
+ });
// 提交
- const submitForm = () => {
- dialogVisible.value = false;
- goalManagementApi()
- .getexamineMngAddOrUpdate(form.value)
- .then((res) => {
- if (res.data.code == 200) {
- ElMessage({
- message: res.data.msg,
- type: 'success',
+ const submitForm = async (formEl: FormInstance | undefined) => {
+ if (!formEl) return;
+ await formEl.validate((valid, fields) => {
+ if (valid) {
+ dialogVisible.value = false;
+ goalManagementApi()
+ .getexamineMngAddOrUpdate(form.value)
+ .then((res) => {
+ if (res.data.code == 200) {
+ ElMessage({
+ message: res.data.msg,
+ type: 'success',
+ });
+ emit('navAddorUpdata');
+ } else {
+ ElMessage.error(res.data.msg);
+ }
});
- emit('navAddorUpdata');
- } else {
- ElMessage.error(res.data.msg);
- }
- });
- form.value = {
- beExaminedDepartmentId: 8, ////被考核部门ID/外键
- beExaminedPersonId: '6', ////被考核人ID/外键（可能有多个，用逗号隔开）
- examineDate: 1658387422569, ////考核日期
- examineDepartmentId: 7, ////考核部门ID/外键
- examinePersonId: '5', ////考核人ID/外键
- examineTemplateId: 0, ////绩效考核模板ID/外键
- examineTotalNumber: '3', ////总分
- extraFile: '9', //责任书附件
- itemDetail: '2', ////考核项目
- memo: '4', ////备注信息
- numberDetailJson: '[{"id":"123","number":"123"}]', ////各个考核项目的具体得分，json格式。形式为：[{“id”:"123","number":"123"}]
- title: '1', ////考核标题
- };
+ } else {
+ console.log('error submit!', fields);
+ }
+ });
};
// 取消
- const resetForm = () => {
+ const resetForm = (formEl: FormInstance | undefined) => {
+ if (!formEl) return;
dialogVisible.value = false;
- form.value = {
- beExaminedDepartmentId: 8, ////被考核部门ID/外键
- beExaminedPersonId: '6', ////被考核人ID/外键（可能有多个，用逗号隔开）
- examineDate: 1658387422569, ////考核日期
- examineDepartmentId: 7, ////考核部门ID/外键
- examinePersonId: '5', ////考核人ID/外键
- examineTemplateId: 0, ////绩效考核模板ID/外键
- examineTotalNumber: '3', ////总分
- extraFile: '9', //责任书附件
- itemDetail: '2', ////考核项目
- memo: '4', ////备注信息
- numberDetailJson: '[{"id":"123","number":"123"}]', ////各个考核项目的具体得分，json格式。形式为：[{“id”:"123","number":"123"}]
- title: '1', ////考核标题）
- };
+ formEl.resetFields();
};
- const activeName=ref("1")
+ const handleClose=(formEl: FormInstance | undefined)=>{
+ if (!formEl) return;
+ formEl.resetFields();
+ }
+ const activeName = ref('1');
// 新增弹窗
const Show = ref();
const daiAdd = () => {
@@ -225,8 +246,8 @@
};
// 安全目标指标弹窗
const Shows = ref();
- const daiInpt = () => {
- Shows.value.openDailog();
+ const daiInpt = (type: any) => {
+ Shows.value.openDailog(type);
};
// 点击上传
const fileList = ref<UploadUserFile[]>([
@@ -258,6 +279,22 @@
() => false
);
};
+ const userId = (val: any, type: any) => {
+ if (type == 1) {
+ form.value.examinePersonId = val.uid;
+ form.value.examinePersonName = val.realName;
+ } else if (type == 0) {
+ let uid=[]
+ let realName=[]
+ for(let i=0;i<val.length;i++){
+ uid.push(val[i].uid)
+ realName.push(val[i].realName)
+ }
+ form.value.beExaminedPersonId = uid.toString();
+ form.value.beExaminedPersonName =realName.toString();
+ console.log(form.value.beExaminedPersonId,form.value.beExaminedPersonName)
+ }
+ };
//全屏
const full = ref(false);
const toggleFullscreen = () => {
@@ -267,7 +304,41 @@
full.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',
+ };
+ const data = ref();
+ const nameData1 = (val: any) => {
+ form.value.examineDepartmentName = val.depName;
+ };
+ const nameData2 = (val: any) => {
+ form.value.beExaminedDepartmentName = val.depName;
+ console.log(form.value);
+ };
return {
+ rules,
+ handleClose,
+ nameData1,
+ nameData2,
+ ruleFormRef,
+ department,
+ propse,
+ data,
+ userId,
activeName,
dialogVisible,
form,
--
Gitblit v1.9.2