From 7cbeb9c7dc150e45d88f39ec8147ef5fa819621f Mon Sep 17 00:00:00 2001
From: GuLiMmo <2820890765@qq.com>
Date: Thu, 21 Dec 2023 17:54:41 +0800
Subject: [PATCH] 评优任务，评优结果页面修改
---
src/views/evaluate/components/addDialog.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/views/evaluate/components/addDialog.vue b/src/views/evaluate/components/addDialog.vue
index f08b3f2..e0b72db 100644
--- a/src/views/evaluate/components/addDialog.vue
+++ b/src/views/evaluate/components/addDialog.vue
@@ -17,7 +17,7 @@
<el-option label="部门评优" value="1" />
</el-select>
</el-form-item> -->
- <el-form-item :label="params.type ? '评定部门：' : '候选部门:'" prop="candidateNum">
+ <el-form-item :label="params.type ? '评定人：' : '候选部门:'" prop="candidateNum">
<el-select v-model="selectGroup" value-key="deptId" multiple style="width: 100%;" placeholder="请选择候选部门">
<el-option v-for="dept in depts" :key="dept.deptId"
:label="dept.employees.length === 0 ? (dept.deptName + '（当前部门下员工人数为0）') : dept.deptName"
@@ -47,10 +47,10 @@
controls-position="right" :placeholder="`请输入评优数量（最多不可超过${maxEvaluateNum}）`"
class="evaluateNum-input"></el-input-number>
</el-form-item>
- <el-form-item label="评优截止日期:" prop="evaluateCutoffTime">
+ <!-- <el-form-item label="评优截止日期:" prop="evaluateCutoffTime">
<el-date-picker v-model="addForm.evaluateCutoffTime" type="datetime" placeholder="请选择截止时间"
format="YYYY-MM-DD HH:mm:ss" valueFormat="YYYY-MM-DD HH:mm:ss" style="width: 100%;" />
- </el-form-item>
+ </el-form-item> -->
</el-form>
</div>
<template #footer>
@@ -152,7 +152,6 @@
deep: true,
immediate: true,
},
- // 拦截candidateNum
selectGroup: {
handler(val) {
this.addForm.candidateNum = [];
@@ -184,7 +183,7 @@
methods: {
submitOrEdit() {
const { candidateNum } = this.addForm
- const isExist = candidateNum.find(item => item.val === void 0 || item.val === 0 || item.users.length === 0)
+ const isExist = candidateNum.find(item => item.val === void 0 || item.val === 0)
if (isExist) {
this.$message.warning(`${isExist.deptName}候选人人数不可为空或者0`)
} else {
@@ -275,11 +274,12 @@
},
setDefaultValue(depts) {
const params = _.cloneDeep(this.params.addForm.candidateNum) || []
- params.forEach(item => {
+ const newParams = params.map(item => {
const value = depts.find(dept => item.deptId === dept.deptId);
item.employees = value?.employees || [];
- });
- this.selectGroup = params;
+ return item
+ })
+ this.selectGroup = newParams
},
},
};
--
Gitblit v1.9.3