From 58f3407ea60b65eee55cb628d9c743c3053b17c8 Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Tue, 2 Sep 2025 17:56:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=20=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E5=B7=B2=E5=8A=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yinnong/doneCompleted/completedNew.vue      | 17 +++++------------
 src/views/yinnong/doneCompleted/doneNew.vue     | 16 ++++++----------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/views/yinnong/doneCompleted/completedNew.vue b/src/views/yinnong/doneCompleted/completedNew.vue
index 1da415d4..aeb106a8 100644
--- a/src/views/yinnong/doneCompleted/completedNew.vue
+++ b/src/views/yinnong/doneCompleted/completedNew.vue
@@ -87,9 +87,10 @@
           electronicSignature:"",
           queryParams: {
             pageNum: 1,
-            pageSize:10,
+            pageSize:20,
             systemType: null,
             deptId: null,
+            translate_dict:'1'
           },
           activityBusinessTypeOptions:[],
           images:['../../../../static/images/yinnong/banner_03.jpg'],
@@ -104,7 +105,6 @@
           if(this.$route.query.activeName){
             this.activeName = this.$route.query.activeName
           }
-          // this.getList();
         });
         console.log(this.$route.query.fr)
         if(this.$route.query.fr){
@@ -128,8 +128,8 @@
         },
         getListReq(pageInfo) {
           //console.log(pageInfo, this.queryParams.pageNum, this.queryParams.pageSize);
+          this.$set(this.queryParams, "deptId", this.$store.state.user.deptId);
           return new Promise((resolve, reject) => {
-            this.$set(this.queryParams, "deptId", this.$store.state.user.deptId);
             A_myTodoList(this.queryParams).then((response) => {
               //console.info(_this.taskList.length)
               response.rows.forEach(res => {
@@ -140,15 +140,8 @@
                 // }else if(res.tableName?res.tableName.indexOf('yinnong')>0:""){
                 //   res.tableName = '来自银农直联审批管理系统'
                 // }
-                if(this.activityBusinessTypeOptions){
-                  this.activityBusinessTypeOptions.map(t => {
-                    if(t.dictValue === res.businessType){
-                      console.log('aaaaa')
-                      res.businessType = t.dictLabel
-                      this.taskList.push(res)
-                    }
-                  });
-                }
+                res.businessType = this.selectDictLabel(this.activityBusinessTypeOptions, res.businessType);
+                this.taskList.push(res)
               });
               resolve(response);
             });
diff --git a/src/views/yinnong/doneCompleted/doneNew.vue b/src/views/yinnong/doneCompleted/doneNew.vue
index 66f47b82..fb3dc810 100644
--- a/src/views/yinnong/doneCompleted/doneNew.vue
+++ b/src/views/yinnong/doneCompleted/doneNew.vue
@@ -64,6 +64,7 @@
     import yinnongIndex from "../../yinnongIndex";
     import {A_myDoneList, A_myTodoList} from "../../../api/audit/aauditpipeline";
     import PagedList from "@/components/common/PagedList.vue";
+    import {selectDictLabel} from "@/utils/utils";
 
     export default {
       components: {
@@ -82,9 +83,10 @@
           total:0,
           queryParams: {
             pageNum: 1,
-            pageSize: 10,
+            pageSize: 20,
             systemType: null,
             deptId: null,
+            translate_dict:'1'
           },
           activityBusinessTypeOptions:[],
           images:['../../../../static/images/yinnong/banner_02.jpg'],
@@ -99,7 +101,6 @@
           if(this.$route.query.activeName){
             this.activeName = this.$route.query.activeName
           }
-          // this.getList();
         });
         //console.log(this.$route.query.fr)
         if(this.$route.query.fr){
@@ -119,6 +120,7 @@
           //console.log(pageInfo, this.queryParams.pageNum, this.queryParams.pageSize)
           this.$set(this.queryParams, "deptId", this.$store.state.user.deptId);
           return new Promise((resolve, reject) => {
+
             A_myDoneList(this.queryParams).then((response) => {
               //console.info(_this.taskList.length)
               response.rows.forEach(res => {
@@ -129,14 +131,8 @@
                 // }else if(res.tableName?res.tableName.indexOf('yinnong')>0:""){
                 //   res.tableName = '来自银农直联审批管理系统'
                 // }
-                if(this.activityBusinessTypeOptions){
-                  this.activityBusinessTypeOptions.map(t => {
-                    if(t.dictValue === res.businessType){
-                      res.businessType = t.dictLabel
-                      this.taskList.push(res)
-                    }
-                  });
-                }
+                res.businessType = this.selectDictLabel(this.activityBusinessTypeOptions, res.businessType);
+                this.taskList.push(res)
               });
               resolve(response);
             });