基本薪资

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

@@ -7,8 +7,8 @@
           <a-row :gutter="24">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="组织">
-                <a-select  v-model="queryParam.organization">
-                    <a-select-option value="all">所有</a-select-option>
+                <a-select  v-model="queryParam.orgName">
+                    <a-select-option value="">所有</a-select-option>
                     <a-select-option value="Apparel Group">Apparel Group</a-select-option>
                     <a-select-option value="宁波森语">宁波森语</a-select-option>
                     <a-select-option value="马菲羊">马菲羊</a-select-option>
@@ -17,7 +17,7 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="部门">
-                <j-search-select-tag v-model="queryParam.deptName" placeholder="请选择部门" 
+                <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>
@@ -44,7 +44,7 @@
           ref="table"
           size="middle"
           bordered
-          rowKey="id"
+          rowKey="userId"
           :columns="columns"
           :dataSource="dataSource"
           :pagination="ipagination"
@@ -53,7 +53,7 @@
           :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
           @change="handleTableChange">
            <span slot="basicSalary" slot-scope="text, record">
-                <a>record.basicSalary</a>
+                <a>{{record.beforeAdjustment}}</a>
                 <!-- <a >333333</a> -->
            </span>
         </a-table>
@@ -61,7 +61,7 @@
       <!-- table区域-end -->
   
       <!-- 表单区域 -->
-      <ChangeBasicSalary ref="ChangeBasicSalary"></ChangeBasicSalary>
+      <ChangeBasicSalary ref="ChangeBasicSalary" @ok="getTableList"></ChangeBasicSalary>
     </a-card>
   </template>
   
@@ -100,12 +100,12 @@
             {
               title: '编号',
               align:"center",
-              dataIndex: 'number'
+              dataIndex: 'code'
             },
             {
               title: '部门',
               align:"center",
-              dataIndex: 'deptName'
+              dataIndex: 'sysOrgCode'
             },
             {
               title: '姓名',
@@ -115,28 +115,29 @@
             {
               title: '组织',
               align:"center",
-              dataIndex: 'organization'
+              dataIndex: 'orgName'
             },
             {
               title: '工资卡号',
               align:"center",
-              dataIndex: 'salaryCardNumber'
+              dataIndex: 'cardNo'
             },
             {
               title: '基本薪资',
               align:"center",
-              dataIndex: 'basicSalary',
+              dataIndex: 'beforeAdjustment',
               scopedSlots: { customRender: 'basicSalary' } ,
               customCell: this.handleBasicSalary,
             },
             {
               title: '最后变更时间',
               align:"center",
-              dataIndex: 'lastChangeTime'
+              dataIndex: 'updateTime'
             },
           ],
           queryParam:{},
           dataSource:[{}],
+          ipagination:{},
           // 请求参数
         //   url: {
 
@@ -149,22 +150,36 @@
       },
       methods: {
         getTableList(){
-
+          getAction('/salary/salaryChangeRecord/querySalaryList',this.queryParam).then(res=>{
+            if(res.success){
+                this.dataSource =res.result.records
+                this.ipagination = {
+                  total: res.result.total,
+                  current: res.result.current,
+                  pageSize: res.result.size
+                }
+            }else{
+                this.$message.error(res.message);
+            }
+          })
         },
-        handleBasicSalary(){
+        handleBasicSalary(record){
           return {
             on: {
               dblclick: event => {
                 this.$refs.ChangeBasicSalary.visible = true
+                this.$refs.ChangeBasicSalary.getData(record)
               }
             }
           }
         },
         searchQuery(){
-
+          this.queryParam.pageNo = 1
+          this.getTableList()
         },
         searchReset(){
-
+          this.queryParam={}
+          this.getTableList()
         },
         onSelectChange(selectedRowKeys, selectionRows) {
             this.selectedRowKeys = selectedRowKeys;