From 290b5d256cc5765a21030fc365a234662feef8a5 Mon Sep 17 00:00:00 2001
From: GuLiMmo <2820890765@qq.com>
Date: Fri, 22 Dec 2023 11:28:11 +0800
Subject: [PATCH] 考核任务查看弹窗框修改
---
src/views/evaluate/evaluateTask.vue | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/views/evaluate/evaluateTask.vue b/src/views/evaluate/evaluateTask.vue
index f38087e..04b0bd6 100644
--- a/src/views/evaluate/evaluateTask.vue
+++ b/src/views/evaluate/evaluateTask.vue
@@ -14,7 +14,8 @@
</template>
<template #menu="{ size, row, index }">
<el-button type="primary" text plain icon="el-icon-edit" @click="editDialog(row)">编辑</el-button>
- <el-button type="primary" text plain icon="el-icon-position" @click="publicTimeBtn(row)" v-if="row.status === 2">发布</el-button>
+ <el-button type="primary" text plain icon="el-icon-position" @click="publicTimeBtn(row)"
+ v-if="row.status === 2">发布</el-button>
<!-- <el-button type="primary" v-if="row.type === 0" text plain icon="el-icon-plus" @click="addCandidateHandle(row)">新增候选人</el-button> -->
<el-button type="primary" text plain icon="el-icon-download">导出</el-button>
</template>
@@ -37,7 +38,7 @@
<!-- 新增编辑弹窗 -->
<addDialog :params="addParams" @refreshTable="this.onLoad" />
<!-- 新增候选人 -->
- <addCandidate :params="addCandidateParams" @refreshTable="this.onLoad" />
+ <addCandidate :params="addCandidateParams" @refreshTable="this.onLoad" />
</basic-container>
</template>
@@ -111,7 +112,7 @@
type: n,
};
// 更改option
- !n ? (this.option = option) : (this.option = sectionOption)
+ !n ? (this.option = option) : (this.option = sectionOption)
this.page.currentPage = 1;
this.onLoad(this.page, params);
},
@@ -251,14 +252,13 @@
if (['edit', 'view'].includes(type)) {
getDetail(this.form.id).then(res => {
if (type === 'view') {
- this.deptData().then(deptRes => {
- const candidates = [];
- res.data.data.candidateNum.forEach(item => {
- const value = deptRes.find(dept => dept.id === item.deptId);
- candidates.push(`${value.title}: ${item.val || 0}人`);
- });
- this.form.candidateNum = candidates.join('、');
- });
+ const candidates = [];
+ res.data.data.candidateNum.forEach(item => {
+ const users = []
+ item.users.forEach(item => users.push(item.name))
+ candidates.push(`${item.deptName}(${item.val || 0}人): ${users.join('、')}`);
+ })
+ this.form.candidateNum = candidates.join('\n');
}
this.form = res.data.data;
});
--
Gitblit v1.9.3