Merge remote-tracking branch 'origin/rongxin_dev' into rongxin_dev

src/views/yinnong/doneCompleted/completedNew.vue

@@ -129,6 +129,7 @@
         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 => {

src/views/yinnong/doneCompleted/doneNew.vue

@@ -116,7 +116,8 @@
           }
         },
         getListReq(pageInfo) {
-          //console.log(pageInfo, this.queryParams.pageNum, this.queryParams.pageSize);
+          //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)