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

src/views/business/spd/bo/gather/index.vue

@@ -281,7 +281,7 @@
           tenantId: null,
           revision: null,
           dateRange: null,
-          staff: null,
+          staff: this.$store.state.user.id,
         },
         // 表单参数
         form: {},
@@ -352,7 +352,6 @@
             this.queryParams.dateRange[1] = this.dateToStrEnd(this.queryParams.dateRange[1]);
           }
         }
-        this.getStaff();
         this.queryParams.pageNum = 1;
         this.getList();
       },
@@ -360,7 +359,6 @@
       resetQuery() {
         this.resetForm("queryForm");
         this.queryParams.dateRange = null;
-        this.queryParams.staff = null;
         this.handleQuery();
       },
       // 多选框选中数据
@@ -492,9 +490,6 @@
           ((month + 1) > 9 ? (month + 1) : "0" + (month + 1)) + "-" +
           (day > 9 ? day : ("0" + day)) + " " + "23:59:59"
       },
-      getStaff() {
-        this.queryParams.staff = this.$store.state.user.id;
-      }
     }
   };