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

src/views/yinnong/doneCompleted/completedNew.vue

@@ -111,7 +111,8 @@
           }
         },
         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){
             setTimeout(() => {

src/views/yinnong/doneCompleted/doneNew.vue

@@ -98,7 +98,8 @@ 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 => {
               // if(res.tableName?res.tableName.indexOf('t_homeapply')>0:""){