diff --git a/src/views/yinnong/doneCompleted/completedNew.vue b/src/views/yinnong/doneCompleted/completedNew.vue index 48bc3e5e..955ea8ce 100644 --- a/src/views/yinnong/doneCompleted/completedNew.vue +++ b/src/views/yinnong/doneCompleted/completedNew.vue @@ -57,6 +57,7 @@ import yinnongIndex from "../../yinnongIndex"; import { getInfo } from "../../../api/login/index"; import {A_myTodoList} from "../../../api/audit/aauditpipeline"; + import Cookies from "js-cookie"; export default { components: { @@ -91,16 +92,19 @@ if(this.$route.query.activeName){ this.activeName = this.$route.query.activeName } - this.getList(); + // this.getList(); }); console.log(this.$route.query.fr) if(this.$route.query.fr){ this.$cookies.set("from",this.$route.query.fr,"0") } - getInfo().then((response) => { - this.electronicSignature = response.user.electronicSignature; - this.nickName = response.user.nickName; - }); + this.electronicSignature = Cookies.get('user').electronicSignature; + this.nickName = Cookies.get('user').nickName; + + // getInfo().then((response) => { + // this.electronicSignature = response.user.electronicSignature; + // this.nickName = response.user.nickName; + // }); }, methods: { goOnlineHomeIndex(){ @@ -115,35 +119,34 @@ this.$set(this.queryParams, "deptId", this.$store.state.user.deptId); let _this = this; if(this.loading){ - setTimeout(() => { A_myTodoList(this.queryParams).then((response) => { console.info(_this.taskList.length) - if(response.rows.length>0&& _this.taskList.length { - // 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 = '来自银农直联审批管理系统' - // } - _this.loading = false; - if(this.activityBusinessTypeOptions){ - _this.activityBusinessTypeOptions.map(t => { - if(t.dictValue === res.businessType){ - res.businessType = t.dictLabel - _this.taskList.push(res) - } - }); - } - }) - _this.queryParams.pageNum += 1 ; + 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) + } + }); + } + }) + if(_this.taskList.length >= response.total){ + this.finished = true; + return; }else{ - _this.finished = true; + this.loading = false; + this.queryParams.pageNum += 1 ; } }) - }, 3000); } },