Browse Source

薪资统计-筛选条件调整

jingbb 8 months ago
parent
commit
80e0cd1835

+ 9 - 9
src/views/oa/salary_management/personnelSalary/SalarysStatistics.vue

@@ -32,18 +32,18 @@
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="部门">
-                <j-search-select-tag v-model="queryParam.sysOrgCode" placeholder="请选择部门" 
-                     dict="sys_depart,depart_name,depart_name,org_type='3' or org_code='TBD' order by org_code"/>
-              </a-form-item>
-            </a-col>
-            <template v-if="toggleSearchStatus">
-              <a-col :xl="6" :lg="7" :md="8" :sm="24">
                   <a-form-item label="姓名">
                       <j-search-select-tag v-model="queryParam.name" placeholder="请选择名称" 
                          dict="sys_user,realname,realname" allowClear/>
                   </a-form-item>
               </a-col>
+            <template v-if="toggleSearchStatus">
+              <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="部门">
+                <j-search-select-tag v-model="queryParam.sysOrgCode" placeholder="请选择部门" 
+                     dict="sys_depart,depart_name,depart_name,org_type='3' or org_code='TBD' order by org_code"/>
+              </a-form-item>
+            </a-col>
               <a-col :xl="6" :lg="7" :md="8" :sm="24">
                   <a-form-item label="雇佣状态">
                       <a-select  v-model="queryParam.syHireType" mode="multiple">
@@ -251,7 +251,7 @@
           queryParam:{
             beginDate:moment().subtract(1, 'months').format('YYYY-MM'),
             endDate:moment().subtract(1, 'months').format('YYYY-MM'),
-            syHireType:['在职','退休返聘']
+            syHireType:[]
           },
           dataSource:[{}],
           totalDataSource:[]
@@ -343,7 +343,7 @@
           this.queryParam={
             beginDate:moment().subtract(1, 'months').format('YYYY-MM'),
             endDate:moment().subtract(1, 'months').format('YYYY-MM'),
-            syHireType:['在职','退休返聘']
+            syHireType:[]
           }
           // this.spinning = true
           this.getTableList()