|
@@ -1,7 +1,7 @@
|
|
|
<template>
|
|
|
<div v-loading="loading">
|
|
|
<m-card>
|
|
|
- <el-descriptions :column="3" border>
|
|
|
+ <el-descriptions :column="2" border>
|
|
|
<el-descriptions-item
|
|
|
v-for="list in lists"
|
|
|
:key="list.prop"
|
|
@@ -29,7 +29,7 @@
|
|
|
|
|
|
<script>
|
|
|
import {
|
|
|
- getRosterList,
|
|
|
+ getRosterDetails,
|
|
|
getOrganizationDetails
|
|
|
} from '@/api/system'
|
|
|
import qs from 'qs'
|
|
@@ -62,7 +62,7 @@ export default {
|
|
|
{ label: '岗位类别', prop: 'positionCategory' },
|
|
|
{ label: '职务层级', prop: 'jobLevel' },
|
|
|
{ label: '通行证号', prop: 'passes' },
|
|
|
- { label: '工行时间', prop: 'tradeUnionsTimeText' },
|
|
|
+ { label: '工行时间', prop: 'tradeUnionsTime' },
|
|
|
{ label: '薪酬档次', prop: 'salaryCategory' },
|
|
|
{ label: '薪酬级别', prop: 'salaryLevel' }
|
|
|
]
|
|
@@ -70,10 +70,8 @@ export default {
|
|
|
return [
|
|
|
{ prop: 'organizationName', label: '机构名称' },
|
|
|
{ prop: 'organizationCategory', label: '机构类型' },
|
|
|
- { prop: 'organizationNo', label: '机构编码' },
|
|
|
{ prop: 'parentOrganizationName', label: '上级机构' },
|
|
|
{ prop: 'parentOrganizationCategory', label: '上级机构类型' },
|
|
|
- { prop: 'parentOrganizationNo', label: '上级机构编码' },
|
|
|
{ prop: 'employeeTotal', label: '员工数' }
|
|
|
]
|
|
|
}
|
|
@@ -94,22 +92,10 @@ export default {
|
|
|
async getEmployeeInfo (personnelCode) {
|
|
|
this.loading = true
|
|
|
try {
|
|
|
- const { data } = await getRosterList({
|
|
|
- entity: {
|
|
|
- personnelCode
|
|
|
- }
|
|
|
+ const { data } = await getRosterDetails({
|
|
|
+ personnelCode
|
|
|
})
|
|
|
- this.itemData = data.records.map(e => {
|
|
|
- const date = new Date(e.tradeUnionsTime)
|
|
|
- // 获取年、月、日
|
|
|
- const year = date.getFullYear()
|
|
|
- const month = String(date.getMonth() + 1).padStart(2, '0') // 月份从0开始,所以要加1
|
|
|
- const day = String(date.getDate()).padStart(2, '0')
|
|
|
- return {
|
|
|
- ...e,
|
|
|
- tradeUnionsTimeText: `${year}年${month}月${day}日`
|
|
|
- }
|
|
|
- }).pop() || {}
|
|
|
+ this.itemData = data
|
|
|
} catch (error) {
|
|
|
this.$message.error(error)
|
|
|
} finally {
|