Merge branch 'rongxin_dev' of http://218.59.175.43:3000/zhangzl/nsgk_mobile into rongxin_dev

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)

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'],
@@ -115,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 = '来自农村宅基地管理系统'
@@ -152,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}})

src/views/yinnong/doneCompleted/doneNew.vue

@@ -82,7 +82,7 @@ done.vue<template>
           }
           this.getList();
         });
-        console.log(this.$route.query.fr)
+        //console.log(this.$route.query.fr)
         if(this.$route.query.fr){
           this.$cookies.set("from",this.$route.query.fr,"0")
         }
@@ -98,7 +98,7 @@ done.vue<template>
         },
         getList() {
           this.taskList = []
-          this.$set(this.queryParams, "systemType", '4');
+          //this.$set(this.queryParams, "systemType", '4');
           this.$set(this.queryParams, "deptId", this.$store.state.user.deptId);
           A_myDoneList(this.queryParams).then((response) => {
             response.rows.map(res => {
@@ -121,7 +121,7 @@ done.vue<template>
           })
         },
         goDetail(item){
-          console.log(item)
+          //console.log(item)
           let type = item.tableName;
           switch (type) {
             case 't_homeuse_zyyctc':