From ee8d6484c35b9446a460431f2b0809c792989dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Tue, 2 Sep 2025 17:10:07 +0800 Subject: [PATCH] =?UTF-8?q?task=20=E9=93=B6=E5=86=9C=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E5=B7=B2=E5=8A=9E=E5=88=97=E8=A1=A8=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yinnong/doneCompleted/completedNew.vue | 50 ++++++++----------- src/views/yinnong/doneCompleted/doneNew.vue | 48 ++++++++---------- 2 files changed, 43 insertions(+), 55 deletions(-) diff --git a/src/views/yinnong/doneCompleted/completedNew.vue b/src/views/yinnong/doneCompleted/completedNew.vue index ef678d18..aeb106a8 100644 --- a/src/views/yinnong/doneCompleted/completedNew.vue +++ b/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); }); }); }, diff --git a/src/views/yinnong/doneCompleted/doneNew.vue b/src/views/yinnong/doneCompleted/doneNew.vue index c58161a2..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: { @@ -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); }); }); },