Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-09 2409b3d86a217ebbfb01f80ac3d43ff5da7c37dd

 src/views/user/search.vue

@@ -1947,7 +1947,8 @@
        archivesStatus: [],
        insuranceType: [],
        empStatus: [],
        empType: []
        empType: [],
        baseKey: ''
      }, // 查询参数
      sort: {}, // 排序
      pagination: { // 分页参数
@@ -2455,9 +2456,7 @@
    },
    vagueSearch() {
      this.fetch({
        empNumb: this.queryParams.vague,
        empName: this.queryParams.vague,
        deptName: this.queryParams.vague,
        baseKey: this.queryParams.vague,
        delFlag: 0
      })
    },