diff --git a/src/views/basicData/jobTransferManagement.vue b/src/views/basicData/jobTransferManagement.vue
index 9d82ccdd..e775ff63 100644
--- a/src/views/basicData/jobTransferManagement.vue
+++ b/src/views/basicData/jobTransferManagement.vue
@@ -17,36 +17,71 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
+ @sort-change="sortChange"
>
- 新增
- 批量删除新增
+
- 转 正
+
- 下岗计划
+
+ 下岗计划
+
转岗计划
+ 转岗计划
+
- 导 入
+
+ 导 入
+
- 修改
- 转岗
+ 修改
+
+
+ 转岗
+
- 离职
- 个人信息
+
+ 离职
+
+
+ 个人信息
+
{{ scope.row.dataBirth ? scope.row.dataBirth.substring(0, 10) : '' }}
@@ -198,6 +233,7 @@ import { getUserList } from '@/api/workLicense/workLicense';
import basicImport from '@/components/basic-import/main.vue';
import jobTransferAdd from './components/jobTransferAdd.vue';
import jhSelect from '@/components/jh-select/index.vue';
+import { mapGetters } from 'vuex';
export default {
components: {
basicImport,
@@ -288,6 +324,7 @@ export default {
search: false,
width: 120,
addDisabled: true,
+ sortable: 'custom',
},
{
label: '员工工号',
@@ -297,6 +334,7 @@ export default {
search: false,
width: 120,
searchLabelWidth: 50,
+ sortable: 'custom',
},
{
label: '姓名',
@@ -304,6 +342,7 @@ export default {
span: 8,
search: false,
width: 120,
+ sortable: 'custom',
},
{
label: '姓名',
@@ -312,16 +351,17 @@ export default {
search: true,
hide: true,
width: 120,
+ sortable: 'custom',
},
- {
+ {
label: '岗位',
prop: 'stationName',
span: 8,
search: false,
width: 120,
addDisabled: true,
+ sortable: 'custom',
},
-
{
label: '所属岗位',
prop: 'station',
@@ -338,6 +378,7 @@ export default {
value: 'id',
res: 'data.records',
},
+ sortable: 'custom',
},
{
label: '入职时间',
@@ -350,6 +391,7 @@ export default {
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
+ sortable: 'custom',
},
{
label: '性别',
@@ -358,6 +400,7 @@ export default {
labelWidth: 150,
search: false,
width: 120,
+ // sortable: 'custom',
},
{
label: '技能等级',
@@ -366,6 +409,7 @@ export default {
labelWidth: 150,
search: false,
width: 120,
+ // sortable: 'custom',
},
{
label: '用工类型',
@@ -374,6 +418,7 @@ export default {
labelWidth: 150,
search: false,
width: 120,
+ // sortable: 'custom',
},
{
label: '民族',
@@ -382,6 +427,7 @@ export default {
labelWidth: 150,
search: false,
width: 120,
+ sortable: 'custom',
},
{
label: '年龄',
@@ -390,6 +436,7 @@ export default {
labelWidth: 150,
search: false,
width: 120,
+ sortable: 'custom',
},
{
label: '身份证号码',
@@ -398,6 +445,7 @@ export default {
labelWidth: 150,
search: false,
width: 170,
+ sortable: 'custom',
},
{
label: '籍贯(市县区乡组)',
@@ -407,6 +455,7 @@ export default {
labelWidth: 150,
search: false,
width: 170,
+ sortable: 'custom',
},
{
label: '出生年月',
@@ -418,6 +467,7 @@ export default {
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
+ sortable: 'custom',
},
{
label: '政治面貌',
@@ -426,6 +476,7 @@ export default {
labelWidth: 150,
search: false,
width: 120,
+ sortable: 'custom',
},
{
label: '婚姻状态',
@@ -434,6 +485,7 @@ export default {
labelWidth: 150,
search: false,
width: 120,
+ // sortable: 'custom',
},
{
label: '毕业院校',
@@ -442,6 +494,7 @@ export default {
labelWidth: 150,
search: false,
width: 170,
+ sortable: 'custom',
},
{
label: '专业',
@@ -450,6 +503,7 @@ export default {
labelWidth: 150,
search: false,
width: 170,
+ sortable: 'custom',
},
{
label: '最高学历',
@@ -458,6 +512,7 @@ export default {
labelWidth: 150,
search: false,
width: 120,
+ sortable: 'custom',
},
{
label: '毕业时间',
@@ -469,6 +524,7 @@ export default {
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
+ sortable: 'custom',
},
{
@@ -478,6 +534,7 @@ export default {
labelWidth: 150,
search: false,
width: 120,
+ sortable: 'custom',
},
{
label: '家庭住址',
@@ -486,6 +543,7 @@ export default {
labelWidth: 150,
search: false,
width: 170,
+ sortable: 'custom',
},
{
label: '任现值时间',
@@ -499,6 +557,7 @@ export default {
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
+ sortable: 'custom',
},
{
label: '任职时间(年)',
@@ -509,8 +568,9 @@ export default {
width: 120,
addDisplay: false,
editDisplay: false,
+ // sortable: 'custom',
},
- {
+ {
label: '参加工作时间',
prop: 'joinJobDate',
span: 8,
@@ -520,6 +580,7 @@ export default {
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
+ sortable: 'custom',
},
{
label: '社会工龄(年)',
@@ -530,6 +591,7 @@ export default {
addDisplay: false,
editDisplay: false,
width: 120,
+ // sortable: 'custom',
},
{
label: '合同到期日期',
@@ -543,9 +605,8 @@ export default {
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
+ // sortable: 'custom',
},
-
-
{
label: '状态',
prop: 'phStatus',
@@ -564,6 +625,7 @@ export default {
label: 'dictValue',
value: 'dictKey',
},
+ sortable: 'custom',
},
],
},
@@ -603,7 +665,7 @@ export default {
labelWidth: 120,
prop: 'station',
disabled: true,
- type: 'select',
+ type: 'select',
dicUrl: '/blade-system/post/list',
props: {
label: 'postName',
@@ -654,6 +716,32 @@ export default {
},
};
},
+ computed: {
+ ...mapGetters(['permission']),
+ permissionList() {
+ return {
+ addBtn: this.validData(this.permission.jobTransferManagement_add, false),
+ delBtn: this.validData(this.permission.jobTransferManagement_del, false),
+ regularizationBtn: this.validData(
+ this.permission.jobTransferManagement_regularization,
+ false
+ ),
+ unemploymentPlanBtn: this.validData(
+ this.permission.jobTransferManagement_unemploymentPlan,
+ false
+ ),
+ transferPlanBtn: this.validData(this.permission.jobTransferManagement_transferPlan, false),
+ importBtn: this.validData(this.permission.jobTransferManagement_import, false),
+ transferToBtn: this.validData(this.permission.jobTransferManagement_transferTo, false),
+ editBtn: this.validData(this.permission.jobTransferManagement_edit, false),
+ resignationBtn: this.validData(this.permission.jobTransferManagement_resignation, false),
+ personalInformationBtn: this.validData(
+ this.permission.jobTransferManagement_personalInformation,
+ false
+ ),
+ };
+ },
+ },
mounted() {
// this.getUserList();
this.getPlanList();
@@ -959,7 +1047,15 @@ export default {
refreshChange() {
this.onLoad(this.page, this.query);
},
-
+ // 排序
+ sortChange({ prop, order }) {
+ this.query.descs = undefined;
+ this.query.ascs = undefined;
+ let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs';
+ this.query[orderByFieldKey] = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
+ // 重新加载数据
+ this.onLoad(this.page, this.query);
+ },
onLoad(page, params = {}) {
this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {