|
@@ -251,6 +251,7 @@
|
|
|
},
|
|
},
|
|
|
created() {
|
|
created() {
|
|
|
this.requestDict('岗位');
|
|
this.requestDict('岗位');
|
|
|
|
|
+ this.requestDict('员工状态');
|
|
|
getFactoryarea({
|
|
getFactoryarea({
|
|
|
pageNum: 1,
|
|
pageNum: 1,
|
|
|
size: 999,
|
|
size: 999,
|
|
@@ -355,10 +356,10 @@
|
|
|
sortable: 'custom',
|
|
sortable: 'custom',
|
|
|
width: 80,
|
|
width: 80,
|
|
|
formatter: (_row, _column, cellValue) => {
|
|
formatter: (_row, _column, cellValue) => {
|
|
|
- const dom = this.statusOptions.find((item) => {
|
|
|
|
|
|
|
+ const dom = this.statusList.find((item) => {
|
|
|
return item.value == cellValue;
|
|
return item.value == cellValue;
|
|
|
});
|
|
});
|
|
|
- return dom ? dom.label : '';
|
|
|
|
|
|
|
+ return dom ? dom.label : _row.statusName || '';
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
@@ -405,6 +406,11 @@
|
|
|
showOverflowTooltip: true
|
|
showOverflowTooltip: true
|
|
|
}
|
|
}
|
|
|
];
|
|
];
|
|
|
|
|
+ },
|
|
|
|
|
+ // 员工状态字典(hr_user_status)
|
|
|
|
|
+ statusList() {
|
|
|
|
|
+ const list = this.getDictListByName('员工状态');
|
|
|
|
|
+ return Array.isArray(list) ? list : [];
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
data() {
|
|
data() {
|
|
@@ -485,14 +491,6 @@
|
|
|
current: null,
|
|
current: null,
|
|
|
// 是否显示编辑弹窗
|
|
// 是否显示编辑弹窗
|
|
|
showEdit: false,
|
|
showEdit: false,
|
|
|
- statusOptions: [
|
|
|
|
|
- { value: 1, label: '全职' },
|
|
|
|
|
- { value: 2, label: '兼职' },
|
|
|
|
|
- { value: 3, label: '实习' },
|
|
|
|
|
- { value: 4, label: '正式' },
|
|
|
|
|
- { value: 5, label: '试用' },
|
|
|
|
|
- { value: 6, label: '离职' }
|
|
|
|
|
- ],
|
|
|
|
|
pageSize: this.$store.state.tablePageSize,
|
|
pageSize: this.$store.state.tablePageSize,
|
|
|
cacheKeyUrl: 'ef00833a-system-organization',
|
|
cacheKeyUrl: 'ef00833a-system-organization',
|
|
|
selection: []
|
|
selection: []
|