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

src/views/yinnong/doneCompleted/completedNew.vue

@@ -87,7 +87,7 @@
           electronicSignature:"",
           queryParams: {
             pageNum: 1,
-            pageSize:10,
+            pageSize:20,
             systemType: null,
             deptId: null,
           },
@@ -99,13 +99,6 @@
         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
-          }
-          // this.getList();
-        });
         console.log(this.$route.query.fr)
         if(this.$route.query.fr){
           this.$cookies.set("from",this.$route.query.fr,"0")
@@ -128,29 +121,37 @@
         },
         getListReq(pageInfo) {
           //console.log(pageInfo, this.queryParams.pageNum, this.queryParams.pageSize);
-          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 => {
-                // 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)
-                    }
-                  });
-                }
+
+
+          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);
               });
-              resolve(response);
             });
           });
         },

src/views/yinnong/doneCompleted/doneNew.vue

@@ -82,7 +82,7 @@
           total:0,
           queryParams: {
             pageNum: 1,
-            pageSize: 10,
+            pageSize: 20,
             systemType: null,
             deptId: null,
           },
@@ -94,13 +94,7 @@
         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
-          }
-          // this.getList();
-        });
+
         //console.log(this.$route.query.fr)
         if(this.$route.query.fr){
           this.$cookies.set("from",this.$route.query.fr,"0")
@@ -119,26 +113,32 @@
           //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 => {
-                // 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)
-                    }
-                  });
-                }
+            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);
               });
-              resolve(response);
             });
           });
         },