From 27da516e3bd834f3afb848cc60e39e97b6d8a703 Mon Sep 17 00:00:00 2001
From: GuLiMmo <2820890765@qq.com>
Date: Fri, 12 Jan 2024 17:23:22 +0800
Subject: [PATCH] 更新
---
src/views/evaluate/evaluateResult.vue | 2 +-
src/views/evaluate/components/evaluateTypeResult.vue | 2 +-
src/views/evaluate/components/viewEvaluateDetail.vue | 4 ++--
src/views/evaluate/components/votingDetails.vue | 2 +-
src/views/evaluate/components/selectionDialog.vue | 7 +++++--
src/views/evaluate/components/secondRoundResult.vue | 2 +-
src/views/evaluate/components/IndividualTaskPublic.vue | 9 ++++-----
src/views/evaluate/components/addIndividualTask.vue | 4 ++--
8 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/views/evaluate/components/IndividualTaskPublic.vue b/src/views/evaluate/components/IndividualTaskPublic.vue
index 3addeb4..ca9bdf3 100644
--- a/src/views/evaluate/components/IndividualTaskPublic.vue
+++ b/src/views/evaluate/components/IndividualTaskPublic.vue
@@ -1,15 +1,15 @@
<template>
- <el-dialog v-model="params.visible" :title="`发布评优任务（${params.data?.taskName || ''}）`" width="50%" @open="openDialog" @close="dialogClose">
+ <el-dialog v-model="params.visible" :title="`发布评优任务（${params.data?.taskName || ''}）`" width="65%" @open="openDialog" @close="dialogClose">
<div class="content">
<el-form :model="form" ref="formRef" :rules="rules" label-position="top">
<el-form-item prop="categoryEntities">
<template #label>
- 评优类别
+ 评优奖项
<el-button type="primary" icon="el-icon-view" text @click="viewCandidateResult">查看第一轮候选结果</el-button>
</template>
<ul class="type-list">
<li class="type-item">
- <div class="title">类别</div>
+ <div class="title">奖项</div>
<div class="introduction">认定标准</div>
<div class="number">名额</div>
<div class="tool">操作</div>
@@ -38,7 +38,6 @@
{{ item.dictValue }}
<el-button type="primary" icon="el-icon-edit" text @click="selectionHandler(item)">设置人员</el-button>
</el-checkbox>
-
</el-checkbox-group>
</el-form-item>
<el-form-item label="第二轮任务结束时间" required>
@@ -191,7 +190,7 @@
$borderColor: var(--el-border-color);
.content {
- max-height: 400px;
+ max-height: 600px;
overflow-y: auto;
.time-span {
diff --git a/src/views/evaluate/components/addIndividualTask.vue b/src/views/evaluate/components/addIndividualTask.vue
index b321006..600ec37 100644
--- a/src/views/evaluate/components/addIndividualTask.vue
+++ b/src/views/evaluate/components/addIndividualTask.vue
@@ -5,10 +5,10 @@
<el-form-item label="任务名称" prop="taskName">
<el-input v-model="form.taskName" placeholder="请输入任务名称"></el-input>
</el-form-item>
- <el-form-item label="评优类别" prop="categoryEntities">
+ <el-form-item label="评优奖项" prop="categoryEntities">
<ul class="type-list">
<li class="type-item">
- <div class="title">类别</div>
+ <div class="title">奖项</div>
<div class="introduction">认定标准</div>
<div class="number">名额</div>
<div class="tool">操作</div>
diff --git a/src/views/evaluate/components/evaluateTypeResult.vue b/src/views/evaluate/components/evaluateTypeResult.vue
index ab511f2..03674b3 100644
--- a/src/views/evaluate/components/evaluateTypeResult.vue
+++ b/src/views/evaluate/components/evaluateTypeResult.vue
@@ -2,7 +2,7 @@
<div class="container">
<ul class="type-list">
<li class="type-item">
- <div class="title">类别</div>
+ <div class="title">奖项</div>
<div class="introduction">认定标准</div>
<div class="number">名额</div>
<div class="tool">操作</div>
diff --git a/src/views/evaluate/components/secondRoundResult.vue b/src/views/evaluate/components/secondRoundResult.vue
index e02c003..04d216f 100644
--- a/src/views/evaluate/components/secondRoundResult.vue
+++ b/src/views/evaluate/components/secondRoundResult.vue
@@ -5,7 +5,7 @@
</div>
<ul class="type-list">
<li class="type-item">
- <div class="title">类别</div>
+ <div class="title">奖项</div>
<div class="introduction">认定标准</div>
<div class="number">名额</div>
<div class="tool">操作</div>
diff --git a/src/views/evaluate/components/selectionDialog.vue b/src/views/evaluate/components/selectionDialog.vue
index 1710fc0..31a9a76 100644
--- a/src/views/evaluate/components/selectionDialog.vue
+++ b/src/views/evaluate/components/selectionDialog.vue
@@ -1,12 +1,12 @@
<template>
- <el-dialog v-model="params.visible" :title="params.data.dictValue || '人员选择'" @close="dialogClose">
+ <el-dialog v-model="params.visible" :title="params.data?.dictValue || '人员选择'" @close="dialogClose">
<div class="container">
<el-transfer v-model="value" :data="data" filterable filter-placeholder="请输入人员姓名"
:titles="['参与投票人员', '不参与投票人员']" />
</div>
<template #footer>
<el-button @click="params.visible = false">取消</el-button>
- <el-button type="primary">确认选择</el-button>
+ <el-button type="primary" @click="submit">确认选择</el-button>
</template>
</el-dialog>
</template>
@@ -54,6 +54,9 @@
methods: {
dialogClose() {
this.value = []
+ },
+ submit() {
+ console.log(this.value, this.data);
}
},
diff --git a/src/views/evaluate/components/viewEvaluateDetail.vue b/src/views/evaluate/components/viewEvaluateDetail.vue
index 468075a..fa20021 100644
--- a/src/views/evaluate/components/viewEvaluateDetail.vue
+++ b/src/views/evaluate/components/viewEvaluateDetail.vue
@@ -4,10 +4,10 @@
<div class="drawer-title">{{ props.params.data?.taskName || '评优任务详情' }}</div>
</template>
<el-collapse v-model="collapseParams.activeNames">
- <el-collapse-item v-if="!type()" title="当前任务评优类别" name="1">
+ <el-collapse-item v-if="!type()" title="当前任务评优奖项" name="1">
<ul class="type-list">
<li class="type-item">
- <div class="title">类别</div>
+ <div class="title">奖项</div>
<div class="introduction">认定标准</div>
<div class="number">名额</div>
</li>
diff --git a/src/views/evaluate/components/votingDetails.vue b/src/views/evaluate/components/votingDetails.vue
index 34586e8..b9ebb96 100644
--- a/src/views/evaluate/components/votingDetails.vue
+++ b/src/views/evaluate/components/votingDetails.vue
@@ -79,7 +79,7 @@
type: 'input',
},
{
- label: '被投人',
+ label: '推荐人',
prop: 'userName',
type: 'input',
search: true
diff --git a/src/views/evaluate/evaluateResult.vue b/src/views/evaluate/evaluateResult.vue
index 5cb2fee..e1b88a5 100755
--- a/src/views/evaluate/evaluateResult.vue
+++ b/src/views/evaluate/evaluateResult.vue
@@ -33,7 +33,7 @@
<el-main>
<template v-if="this.taskList.length > 0">
<el-collapse v-model="activeNames">
- <el-collapse-item title="当前任务评优类别详情" name="1" v-if="!defaultTaskType">
+ <el-collapse-item title="当前任务评优奖项详情" name="1" v-if="!defaultTaskType">
<evaluateTypeResult :params="{ data: taskList[taskActive] }" />
</el-collapse-item>
<el-collapse-item name="2" v-if="!defaultTaskType">
--
Gitblit v1.9.3