基本薪资-字段排序

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

@@ -52,7 +52,6 @@
           :pagination="ipagination"
           :scroll="{x: 1000}"
           :loading="loading"
-          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
           @change="handleTableChange">
            <span slot="basicSalary" slot-scope="text, record">
                 <a>{{record.beforeAdjustment}}</a>
@@ -110,7 +109,18 @@
             {
               title: '部门',
               align:"center",
-              dataIndex: 'sysOrgCode'
+              dataIndex: 'sysOrgCode',
+              sorter:(a,b)=> {
+                  let temp1="";
+                  let temp2="";
+                  if(a.sysOrgCode!=null){
+                    temp1=a.sysOrgCode;
+                  }
+                  if(b.sysOrgCode!=null){
+                    temp2=b.sysOrgCode;
+                  }
+                  return temp1.localeCompare(temp2);
+              },
             },
             {
               title: '姓名',
@@ -120,7 +130,18 @@
             {
               title: '组织',
               align:"center",
-              dataIndex: 'orgName'
+              dataIndex: 'orgName',
+              sorter:(a,b)=> {
+                  let temp1="";
+                  let temp2="";
+                  if(a.orgName!=null){
+                    temp1=a.orgName;
+                  }
+                  if(b.orgName!=null){
+                    temp2=b.orgName;
+                  }
+                  return temp1.localeCompare(temp2);
+              },
             },
             {
               title: '工资卡号',
@@ -133,11 +154,33 @@
               dataIndex: 'beforeAdjustment',
               scopedSlots: { customRender: 'basicSalary' } ,
               customCell: this.handleBasicSalary,
+              sorter:(a,b)=> {
+                  let temp1="";
+                  let temp2="";
+                  if(a.beforeAdjustment!=null){
+                    temp1=a.beforeAdjustment;
+                  }
+                  if(b.beforeAdjustment!=null){
+                    temp2=b.beforeAdjustment;
+                  }
+                  return temp1.localeCompare(temp2);
+              },
             },
             {
               title: '最后变更时间',
               align:"center",
-              dataIndex: 'updateTime'
+              dataIndex: 'updateTime',
+              sorter:(a,b)=> {
+                  let temp1="";
+                  let temp2="";
+                  if(a.updateTime!=null){
+                    temp1=a.updateTime;
+                  }
+                  if(b.updateTime!=null){
+                    temp2=b.updateTime;
+                  }
+                  return temp1.localeCompare(temp2);
+              },
             },
           ],
           queryParam:{},