task 银农待办已办列表问题修改

src/views/yinnong/doneCompleted/completedNew.vue

@@ -90,6 +90,7 @@
             pageSize:20,
             systemType: null,
             deptId: null,
+            translate_dict:'1'
           },
           activityBusinessTypeOptions:[],
           images:['../../../../static/images/yinnong/banner_03.jpg'],
@@ -99,6 +100,12 @@
         this.getDicts("transfer_type").then(response => {
           this.transferTypeOptions = response.data;
         });
+        this.getDicts("activity_business_type").then((response) => {
+          this.activityBusinessTypeOptions = response.data;
+          if(this.$route.query.activeName){
+            this.activeName = this.$route.query.activeName
+          }
+        });
         console.log(this.$route.query.fr)
         if(this.$route.query.fr){
           this.$cookies.set("from",this.$route.query.fr,"0")
@@ -121,37 +128,22 @@
         },
         getListReq(pageInfo) {
           //console.log(pageInfo, this.queryParams.pageNum, this.queryParams.pageSize);
-            this.$set(this.queryParams, "deptId", this.$store.state.user.deptId);
-
-
+          this.$set(this.queryParams, "deptId", this.$store.state.user.deptId);
           return new Promise((resolve, reject) => {
-            this.getDicts("activity_business_type").then((response) => {
-              this.activityBusinessTypeOptions = response.data;
-              if(this.$route.query.activeName){
-                this.activeName = this.$route.query.activeName
-              }
-              A_myTodoList(this.queryParams).then((response) => {
-                //console.info(_this.taskList.length)
-                response.rows.forEach(res => {
-                  // if(res.tableName?res.tableName.indexOf('t_homeapply')>0:""){
-                  //   res.tableName = '来自农村宅基地管理系统'
-                  // }else if(res.tableName?res.tableName.indexOf('sys_seal')>0:""){
-                  //   res.tableName = '来自银农直联审批管理系统'
-                  // }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)
-                      }
-                    });
-                  }
-                });
-                resolve(response);
+            A_myTodoList(this.queryParams).then((response) => {
+              //console.info(_this.taskList.length)
+              response.rows.forEach(res => {
+                // if(res.tableName?res.tableName.indexOf('t_homeapply')>0:""){
+                //   res.tableName = '来自农村宅基地管理系统'
+                // }else if(res.tableName?res.tableName.indexOf('sys_seal')>0:""){
+                //   res.tableName = '来自银农直联审批管理系统'
+                // }else if(res.tableName?res.tableName.indexOf('yinnong')>0:""){
+                //   res.tableName = '来自银农直联审批管理系统'
+                // }
+                res.businessType = this.selectDictLabel(this.activityBusinessTypeOptions, res.businessType);
+                this.taskList.push(res)
               });
+              resolve(response);
             });
           });
         },

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: {
@@ -85,6 +86,7 @@
             pageSize: 20,
             systemType: null,
             deptId: null,
+            translate_dict:'1'
           },
           activityBusinessTypeOptions:[],
           images:['../../../../static/images/yinnong/banner_02.jpg'],
@@ -94,7 +96,12 @@
         this.getDicts("transfer_type").then(response => {
           this.transferTypeOptions = response.data;
         });
-
+        this.getDicts("activity_business_type").then((response) => {
+          this.activityBusinessTypeOptions = response.data;
+          if(this.$route.query.activeName){
+            this.activeName = this.$route.query.activeName
+          }
+        });
         //console.log(this.$route.query.fr)
         if(this.$route.query.fr){
           this.$cookies.set("from",this.$route.query.fr,"0")
@@ -113,32 +120,21 @@
           //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.getDicts("activity_business_type").then((response) => {
-              this.activityBusinessTypeOptions = response.data;
-              if(this.$route.query.activeName){
-                this.activeName = this.$route.query.activeName
-              }
-              A_myDoneList(this.queryParams).then((response) => {
-                //console.info(_this.taskList.length)
-                response.rows.forEach(res => {
-                  // if(res.tableName?res.tableName.indexOf('t_homeapply')>0:""){
-                  //   res.tableName = '来自农村宅基地管理系统'
-                  // }else if(res.tableName?res.tableName.indexOf('sys_seal')>0:""){
-                  //   res.tableName = '来自银农直联审批管理系统'
-                  // }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)
-                      }
-                    });
-                  }
-                });
-                resolve(response);
+
+            A_myDoneList(this.queryParams).then((response) => {
+              //console.info(_this.taskList.length)
+              response.rows.forEach(res => {
+                // if(res.tableName?res.tableName.indexOf('t_homeapply')>0:""){
+                //   res.tableName = '来自农村宅基地管理系统'
+                // }else if(res.tableName?res.tableName.indexOf('sys_seal')>0:""){
+                //   res.tableName = '来自银农直联审批管理系统'
+                // }else if(res.tableName?res.tableName.indexOf('yinnong')>0:""){
+                //   res.tableName = '来自银农直联审批管理系统'
+                // }
+                res.businessType = this.selectDictLabel(this.activityBusinessTypeOptions, res.businessType);
+                this.taskList.push(res)
               });
+              resolve(response);
             });
           });
         },