2022.5.24

fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

@@ -506,14 +506,6 @@
                   </span> 
               </el-select>
             </div>
-            <div>
-              <span>人员筛选</span>
-              <el-select v-model="userSelId" placeholder="请选择请假人" clearable @change="userChg()" style="width: 180px" size="small" v-show="permissions.leaveAll" filterable="true">
-                  <span v-for="(item, index) in users" :key="index">
-                  <el-option :label="item.name" :value="item.id"></el-option>
-                  </span> 
-              </el-select>
-            </div>
             <div>
               <span>部门筛选</span>
               <el-cascader
@@ -521,10 +513,20 @@
               @change="departmentOptionsChg"
               v-model="departmentSel"
               :options="departmentOptions"
+              placeholder="请选择部门"
               :show-all-levels="false"
               :props="{ checkStrictly: true }"
               clearable></el-cascader>
             </div>
+            <div>
+              <span>人员筛选</span>
+              <el-select v-model="userSelId" placeholder="请选择请假人" clearable @change="userChg()" style="width: 180px" size="small" v-show="permissions.leaveAll" filterable="true">
+                  <span v-for="(item, index) in users" :key="index">
+                  <el-option :label="item.name" :value="item.id"></el-option>
+                  </span> 
+              </el-select>
+            </div>
+            
           </div>
             <el-table key="apk2is8" v-loading="loading" :data="vacationList" style="width: 100%" height="90%">
                 <el-table-column prop="name" label="员工姓名" min-width="120" fixed="left"></el-table-column>