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/components/firstRoundResult.vue |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/views/evaluate/components/firstRoundResult.vue b/src/views/evaluate/components/firstRoundResult.vue
index f39a56e..7e6600f 100644
--- a/src/views/evaluate/components/firstRoundResult.vue
+++ b/src/views/evaluate/components/firstRoundResult.vue
@@ -10,27 +10,27 @@
                 <div class="tool">操作</div>
             </li>
             <li class="type-item" v-for="(item, index) in data" :key="index">
-                <div class="title">{{ item.category?.categoryName || '' }}</div>
+                <div class="title">{{ item.categoryName || '' }}</div>
                 <el-tooltip effect="dark" placement="top">
                     <template #content>
-                        <p style="max-width: 500px;">{{ item.category?.standard || '' }}</p>
+                        <p style="max-width: 500px;">{{ item.standard || '' }}</p>
                     </template>
                     <div class="introduction">
-                        {{ item.category?.standard || '' }}
+                        {{ item.standard || '' }}
                     </div>
                 </el-tooltip>
 
-                <div class="number">{{ item.category?.peopleNum || 0 }}人</div>
+                <div class="number">{{ item.peopleNum || 0 }}人</div>
                 <div class="tool">
                     <el-button type="primary" text icon="el-icon-view" @click="view(item)">查看第一轮候选结果</el-button>
                 </div>
             </li>
         </ul>
-        <el-dialog v-model="visible" :title="`第一轮候选结果(${currentCategory.categoryName})`" width="60%" @open="dialogOpen">
+        <el-dialog v-model="visible" :title="`第一轮候选结果(${currentCategory.categoryName})`" width="60%" @open="dialogOpen" destroy-on-close>
             <avue-crud v-model:page="page" :option="option" :table-loading="loading" :data="dialogData" 
                 @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
                 <template #menu="{ row }">
-                    <referrerPopover :params="{ userId: row.userId, evaluateTaskId: params.data.id }">
+                    <referrerPopover :params="{ userId: row.userId, evaluateTaskCategoryId: row.evaluateTaskCategoryId, evaluateTaskId: params.data.id }">
                         <el-button type="success" icon="el-icon-view" text>推荐人预览</el-button>
                     </referrerPopover>
                 </template>
@@ -41,7 +41,7 @@
 
 <script>
 import referrerPopover from './referrerPopover.vue'
-import { getFinallyResult, getCandidateResult } from '@/api/evaluate/evaluateTask'
+import { getEcList, getCandidateResult } from '@/api/evaluate/evaluateTask'
 import { exportBlob } from "@/api/common";
 import { downloadXls } from "@/utils/util";
 import { dateNow } from "@/utils/date";
@@ -159,17 +159,24 @@
                 ...this.query,
                 ...params
             };
-            getFinallyResult(page.currentPage, page.pageSize, id).then(res => {
-                const data = res.data.data;
-                this.data = data || [];
+            getEcList(1, 50, id).then(ecResult => {
+                const { code, data: { records } } = ecResult.data
+                if (code !== 200) return this.$message.error('评优类别加载失败')
+                this.data = records || []
                 this.loading = false;
-            });
+            })
+            // getFinallyResult(page.currentPage, page.pageSize, id).then(res => {
+            //     const data = res.data.data;
+            //     this.data = data || [];
+            //     this.loading = false;
+            // });
         },
         view(item) {
-            this.currentCategory = item.category
+            this.currentCategory = item
             this.visible = true
         },
         dialogOpen() {
+            this.page.currentPage = 1
             this.getDialogDetails()
         },
         getDialogDetails() {

--
Gitblit v1.9.3