From 6e39ac14b79b606f180b264793b02636f8f7e731 Mon Sep 17 00:00:00 2001
From: GuLiMmo <2820890765@qq.com>
Date: Thu, 11 Jan 2024 15:13:53 +0800
Subject: [PATCH] 更新

---
 src/views/evaluate/components/secondRoundResult.vue |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/views/evaluate/components/secondRoundResult.vue b/src/views/evaluate/components/secondRoundResult.vue
index 97c17c9..054915e 100644
--- a/src/views/evaluate/components/secondRoundResult.vue
+++ b/src/views/evaluate/components/secondRoundResult.vue
@@ -40,7 +40,7 @@
 </template>
 
 <script>
-import { getFinallyResult } from '@/api/evaluate/evaluateTask'
+import { getFinallyResult, getFinallyTypeResult } from '@/api/evaluate/evaluateTask'
 
 export default {
     inject: ['type'],
@@ -84,7 +84,7 @@
                 column: [
                     {
                         label: '部门',
-                        prop: 'user_name',
+                        prop: 'dept_name',
                         type: 'input'
                     },
                     {
@@ -164,11 +164,17 @@
                 ...this.query,
                 ...params
             };
-            getFinallyResult(page.currentPage, page.pageSize, id).then(res => {
+            !this.type() && getFinallyResult(page.currentPage, page.pageSize, id).then(res => {
                 const data = res.data.data;
                 this.data = data || [];
                 this.loading = false;
             });
+            this.type() && getFinallyTypeResult(page.currentPage, page.pageSize, { evaluateTaskId: id }).then(res => {
+                const data = res.data.data;
+                this.data = data.records || [];
+                this.page.total = data.total
+                this.loading = false;
+            });
         },
         view(result) {
             const { category, resultList } = result

--
Gitblit v1.9.3