Merge branch 'master' into online

dist/static/css/chunk-5d19bd26.998af2ac.css

@@ -0,0 +1 @@
+[data-v-2698df34] .el-button--primary,[data-v-2698df34] .el-button--primary:active,[data-v-2698df34] .el-button--primary:focus,[data-v-2698df34] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-2698df34] .el-dialog__body{padding:0 20px}[data-v-2698df34] .el-date-editor.el-input,[data-v-2698df34] .el-select{width:100%!important}

src/views/HumanResources/index.vue

@@ -85,6 +85,21 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item prop="dates" :label-width="formLabelWidth">
+          <el-date-picker
+            v-model="searchForm.dates"
+            type="daterange"
+            style="width: 405px;"
+            range-separator="至"
+            start-placeholder="更新开始日期"
+            end-placeholder="更新结束日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-input placeholder="归属管理HR"
+                    v-model.trim="searchForm.operator"
+                    clearable></el-input>
+        </el-form-item>
         <el-form-item>
           <el-button @click="search"
                      type="danger">搜索</el-button>
@@ -333,12 +348,23 @@ import {
 import { getEmployeeOrgan, getSubject } from '@/api/buildTeam'
 import { subjectListTree } from '@/api/specialSetting'
 
+export const getTimes = (times, keys = []) => {
+  if (times && times.length) {
+    return {
+      [keys[0] || 'start']: dayjs(times[0]).format('YYYY-MM-DD'),
+      [keys[1] || 'start']: dayjs(times[1]).format('YYYY-MM-DD'),
+    }
+  }
+  return {}
+}
 const initSearch = {
   organId: '',
   jobNature: '',
   position: '',
   subjectId: '',
   userNameOrIdOrMobile: '',
+  operator: '',
+  dates: []
 }
 export default {
   components: { pagination, hrform },
@@ -386,7 +412,7 @@ export default {
   activated () {
     this.getList();
     this.getSubjectList()
-    // 
+    //
   },
   mounted () {
     this.getList();
@@ -518,8 +544,11 @@ export default {
       }
     },
     getList () {
+      const {dates, ...rest} = this.searchForm
+      console.log(dates)
       let params = {
-        ...this.searchForm,
+        ...rest,
+        ...getTimes(dates, ["startDate", "endDate"]),
         page: this.pageInfo.page,
         rows: this.pageInfo.limit
       }

src/views/categroyManager/insideSetting/staffManager.vue

@@ -432,12 +432,11 @@ export default {
       })
     },
     getRoleList () { // 获取角色
-      this.roleList = []
-      this.branchList = []
       getUserRole({ delFlag: 0, rows: 9999 }).then(res => {
         let result = res.data
         if (res.code == 200 && result && result.rows.length > 0) {
           result.rows.forEach(item => {
+            this.roleList = []
             this.roleList.push({
               label: item.roleName,
               value: item.id
@@ -450,6 +449,7 @@ export default {
         rows: 9999
       }).then(res => {
         if (res.code == 200 && res.data && res.data.rows) {
+          this.branchList = []
           res.data.rows.forEach(item => {
             this.branchList.push({
               label: item.name,