From d13cebe7fbadd396e91a989af331df8a8e7b40f8 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 21 Jan 2025 11:40:42 +0800
Subject: [PATCH] 考核结果查看详情

---
 src/views/evaluate/evaluateResult.vue |   47 ++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/views/evaluate/evaluateResult.vue b/src/views/evaluate/evaluateResult.vue
index 5a5616d..477f414 100755
--- a/src/views/evaluate/evaluateResult.vue
+++ b/src/views/evaluate/evaluateResult.vue
@@ -2,7 +2,7 @@
   <basic-container>
     <avue-tabs :option="taskTypeList" @change="tabChange"></avue-tabs>
     <el-container class="container">
-      <el-aside width="250px">
+      <el-aside width="300px">
         <el-input v-model="taskWord" class="search-box" clearable placeholder="请输入任务名称" @change="searchChange">
           <template #append>
             <el-button icon="el-icon-search"></el-button>
@@ -25,20 +25,37 @@
           </template>
         </ul>
         <div class="pagination">
-          <el-pagination v-model:current-page="page.current" v-model:page-size="page.size" background pager-count="3"
-            layout="prev, pager, next" :total="page.total" @current-change="handleCurrentChange" small hide-on-single-page />
+          <el-pagination v-model:current-page="page.current" v-model:page-size="page.size" background :pager-count="5"
+            layout="prev, pager, next" :total="page.total" @current-change="handleCurrentChange" small
+            hide-on-single-page/>
         </div>
       </el-aside>
       <el-main>
         <template v-if="this.taskList.length > 0">
           <el-collapse v-model="activeNames">
-            <el-collapse-item title="当前任务评优类别详情" name="1" v-if="!defaultTaskType">
-              <evaluateTypeResult :params="{ data: taskList[taskActive] }" />
+            <el-collapse-item title="当前任务评优奖项候选人详情" name="1" v-if="!defaultTaskType">
+              <evaluateTypeResult :params="{ data: taskList[taskActive] }" @initAsideData="initData" />
             </el-collapse-item>
-            <el-collapse-item title="第一轮候选结果" name="2" v-if="!defaultTaskType">
+            <el-collapse-item name="2" v-if="!defaultTaskType">
+              <template #title>
+                第一轮候选结果
+                <el-tag 
+                    style="margin-left: 10px;" 
+                    :type="status[taskList[taskActive].candidateState].type">
+                    当前状态:{{ status[taskList[taskActive].candidateState].text }}
+                </el-tag>
+              </template>
               <firstRoundResult :params="{ data: taskList[taskActive] }" />
             </el-collapse-item>
-            <el-collapse-item title="最终评优结果" name="3">
+            <el-collapse-item name="3">
+              <template #title>
+                最终评优结果
+                <el-tag
+                    style="margin-left: 10px;" 
+                    :type="status[taskList[taskActive].evaluateState].type">
+                    当前状态:{{ status[taskList[taskActive].evaluateState].text }}
+                </el-tag>
+              </template>
               <secondRoundResult :params="{ data: taskList[taskActive] }" />
             </el-collapse-item>
           </el-collapse>
@@ -87,6 +104,20 @@
           },
         ],
       },
+      status: {
+        0: {
+          text: '未开始',
+          type: 'warning'
+        },
+        1: {
+          text: '进行中',
+          type: 'success'
+        },
+        2: {
+          text: '已完成',
+          type: ''
+        },
+      }
       // firstRounParams: {},
       // secondRounParams: {}
     };
@@ -96,6 +127,7 @@
       this.getTaskList()
     },
     getTaskList(params) {
+      this.page.current = 1
       const { current, size } = this.page
       const values = {
         type: this.defaultTaskType,
@@ -116,6 +148,7 @@
       this.getTaskList({ taskName: this.taskWord })
     },
     tabChange(value) {
+      this.taskActive = 0
       this.defaultTaskType = value.prop;
       this.getTaskList()
       this.defaultTaskType ? this.activeNames = ['3'] : this.activeNames = ['1']

--
Gitblit v1.9.3