From 6a95515f35585bad1963b200ab578309734d5c40 Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Mon, 12 Aug 2024 13:03:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?bug=20=20deptId=20=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/user.js | 8 +++++++- src/views/yinnong/doneCompleted/completedNew.vue | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index d099b99f..930adb26 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -41,6 +41,9 @@ const user = { SET_LOGINDEPTID: (state, loginDeptId) => { state.loginDeptId = loginDeptId }, + SET_DEPTID: (state, deptId) => { + state.deptId = deptId + }, SET_LOGINBOOKID: (state, loginBookId) => { state.loginBookId = loginBookId }, @@ -74,7 +77,7 @@ const user = { commit('SET_TOKEN', res.token) getInfo(res.token).then(response => { const user = response.user - console.info(user.nickName); + //console.info(user.nickName); // const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; const avatar = ""; if (response.roles && response.roles.length > 0) { // 验证返回的roles是否是一个非空数组 @@ -86,6 +89,7 @@ const user = { commit('SET_BOOKNAME', user.bookName) commit('SET_NAME', user.userName) commit('SET_USERID', user.userId) + commit('SET_DEPTID', user.deptId) commit('SET_LOGINDEPTID', user.loginDeptId) commit('SET_LOGINBOOKID', user.loginBookId) commit('SET_DEPTNAME', user.deptName) @@ -157,6 +161,7 @@ const user = { commit('SET_BOOKNAME', user.bookName) commit('SET_NAME', user.userName) commit('SET_USERID', user.userId) + commit('SET_DEPTID', user.deptId) commit('SET_LOGINDEPTID', user.loginDeptId) commit('SET_LOGINBOOKID', user.loginBookId) commit('SET_DEPTNAME', user.deptName) @@ -227,6 +232,7 @@ const user = { commit('SET_BOOKNAME', user.bookName) commit('SET_NAME', user.userName) commit('SET_USERID', user.userId) + commit('SET_DEPTID', user.deptId) commit('SET_LOGINDEPTID', user.loginDeptId) commit('SET_LOGINBOOKID', user.loginBookId) commit('SET_DEPTNAME', user.deptName) diff --git a/src/views/yinnong/doneCompleted/completedNew.vue b/src/views/yinnong/doneCompleted/completedNew.vue index 69b948ed..9f547b1f 100644 --- a/src/views/yinnong/doneCompleted/completedNew.vue +++ b/src/views/yinnong/doneCompleted/completedNew.vue @@ -78,6 +78,8 @@ queryParams: { pageNum: 1, pageSize:5, + systemType: null, + deptId: null, }, activityBusinessTypeOptions:[], images:['../../../../static/images/yinnong/banner_03.jpg'], From a5ef7f65e6788cb862ff8f7545ff21875271a12e Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Mon, 12 Aug 2024 13:17:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bug=20=20=E5=BE=85=E5=8A=9E=E4=B8=8D?= =?UTF-8?q?=E5=88=86=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/yinnong/doneCompleted/completedNew.vue | 6 +++--- src/views/yinnong/doneCompleted/doneNew.vue | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/yinnong/doneCompleted/completedNew.vue b/src/views/yinnong/doneCompleted/completedNew.vue index 9f547b1f..46b39153 100644 --- a/src/views/yinnong/doneCompleted/completedNew.vue +++ b/src/views/yinnong/doneCompleted/completedNew.vue @@ -117,12 +117,12 @@ } }, getList() { - this.$set(this.queryParams, "systemType", '4'); + //this.$set(this.queryParams, "systemType", '4'); this.$set(this.queryParams, "deptId", this.$store.state.user.deptId); let _this = this; if(this.loading){ A_myTodoList(this.queryParams).then((response) => { - console.info(_this.taskList.length) + //console.info(_this.taskList.length) response.rows.forEach(res => { // if(res.tableName?res.tableName.indexOf('t_homeapply')>0:""){ // res.tableName = '来自农村宅基地管理系统' @@ -154,7 +154,7 @@ }, goDetail(item){ let type = item.tableName; - console.info(type) + //console.info(type) switch (type) { case 't_homeuse_zyyctc': this.$router.push({name:'sunVillageInfoPaidExitDetailNew',query: {id:item.data.id,taskId:item.id,auditbatchNo:item.auditbatchNo,type:"todo",electronicSignature:this.electronicSignature,nickName:this.nickName}}) diff --git a/src/views/yinnong/doneCompleted/doneNew.vue b/src/views/yinnong/doneCompleted/doneNew.vue index dba0a135..4f078063 100644 --- a/src/views/yinnong/doneCompleted/doneNew.vue +++ b/src/views/yinnong/doneCompleted/doneNew.vue @@ -82,7 +82,7 @@ done.vue