基本薪资-增加雇佣状态查询条件

src/views/oa/salary_management/personnelSalary/BasicSalary.vue

@@ -5,7 +5,7 @@
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row :gutter="24">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="组织">
                 <a-select  v-model="queryParam.orgName">
                     <a-select-option value="">所有</a-select-option>
@@ -15,19 +15,29 @@
                   </a-select>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xl="5" :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-col :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="雇佣状态">
+                <a-select  v-model="queryParam.syHireType" mode="multiple">
+                    <a-select-option value="">所有</a-select-option>
+                    <a-select-option value="在职">在职</a-select-option>
+                    <a-select-option value="离职">离职</a-select-option>
+                    <a-select-option value="退休返聘">退休返聘</a-select-option>
+                  </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="5" :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>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xl="4" :lg="7" :md="8" :sm="24">
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                 <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
                 <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
@@ -89,6 +99,7 @@
         return {
           description: '基本薪资',
           DateTime:[],
+          loading:false,
           selectedRowKeys:[],
           selectedRows:[],
           isorter: {
@@ -148,7 +159,9 @@
               sorter:true
             },
           ],
-          queryParam:{},
+          queryParam:{
+            syHireType:['在职','退休反聘']
+          },
           dataSource:[{}],
           ipagination:{},
           // 请求参数
@@ -164,7 +177,10 @@
       methods: {
         getTableList(){
           var param = Object.assign({}, this.queryParam, this.isorter)
+          param.syHireType = (param.syHireType).toString()
+          this.loading = true
           getAction('/salary/salaryChangeRecord/querySalaryList',param).then(res=>{
+            this.loading = false
             if(res.success){
                 this.dataSource =res.result.records
                 this.ipagination = {