|
|
@@ -78,15 +78,12 @@
|
|
|
filterable
|
|
|
placeholder='请选择声部'
|
|
|
>
|
|
|
- <el-option-group v-for="group in subjectList"
|
|
|
- :key="group.label"
|
|
|
- :label="group.label">
|
|
|
- <el-option v-for="item in group.options"
|
|
|
- :key="item.value"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value">
|
|
|
- </el-option>
|
|
|
- </el-option-group>
|
|
|
+ <el-option v-for='(item,index) in subjectList'
|
|
|
+ :key="index"
|
|
|
+ :value="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
@@ -98,7 +95,13 @@
|
|
|
<el-table :data="tableList"
|
|
|
:header-cell-style="{background:'#EDEEF0',color:'#444'}">
|
|
|
<el-table-column width="120px" align="center" prop="id" label="编号"></el-table-column>
|
|
|
- <el-table-column align="center" prop="realName" label="姓名"></el-table-column>
|
|
|
+ <el-table-column align="center" prop="realName" label="姓名">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-tooltip class="item" effect="dark" :content="scope.row.realName" placement="top">
|
|
|
+ <span>{{ scope.row.realName}}</span>
|
|
|
+ </el-tooltip>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column align="center" prop="mobileNo" label="手机号"></el-table-column>
|
|
|
<el-table-column align="center" prop="wechatNo" label="微信"></el-table-column>
|
|
|
<el-table-column align="center" label="学历信息">
|
|
|
@@ -106,13 +109,37 @@
|
|
|
<el-button @click="openEducation(scope.row)" type="text">查看学历</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" prop="subjectName" label="声部"></el-table-column>
|
|
|
+ <el-table-column align="center" prop="subjectName" label="声部" width="200px">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-tooltip class="item" effect="dark" :content="scope.row.subjectName" placement="top">
|
|
|
+ <span>{{ scope.row.subjectName}}</span>
|
|
|
+ </el-tooltip>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column align="center" prop="liveCity" label="所在城市"></el-table-column>
|
|
|
- <el-table-column align="center" prop="intentionCity" label="工作意向"></el-table-column>
|
|
|
- <el-table-column align="center" prop="assessmentResult" label="评估结果"></el-table-column>
|
|
|
- <el-table-column align="center" prop="otherComment" label="其它综合情况"></el-table-column>
|
|
|
+ <el-table-column align="center" prop="intentionCity" label="工作意向" width="100px">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-tooltip class="item" effect="dark" :content="scope.row.intentionCity" placement="top">
|
|
|
+ <span>{{ scope.row.intentionCity}}</span>
|
|
|
+ </el-tooltip>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column align="center" prop="assessmentResult" label="评估结果" width="200px">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-tooltip class="item" effect="dark" :content="scope.row.assessmentResult" placement="top">
|
|
|
+ <span>{{ scope.row.assessmentResult}}</span>
|
|
|
+ </el-tooltip>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column align="center" prop="otherComment" label="其它综合情况" width="200px">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-tooltip class="item" effect="dark" :content="scope.row.otherComment" placement="top">
|
|
|
+ <span>{{ scope.row.otherComment}}</span>
|
|
|
+ </el-tooltip>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column align="center" prop="sourceFrom" label="信息来源"></el-table-column>
|
|
|
- <el-table-column align="center" prop="entryDate" label="入职时间">
|
|
|
+ <el-table-column align="center" prop="entryDate" label="入职时间" width="150px">
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.entryDate | dayjsFormat}}
|
|
|
</template>
|
|
|
@@ -133,7 +160,7 @@
|
|
|
{{ scope.row.status | hrStatus }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" prop="idCard" label="证件号码"></el-table-column>
|
|
|
+ <el-table-column align="center" prop="idCard" label="证件号码" width="200px"></el-table-column>
|
|
|
<el-table-column align="center" prop="age" label="年龄">
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.age > 0 ? scope.row.age : '' }}
|
|
|
@@ -144,14 +171,14 @@
|
|
|
{{ typeof scope.row.gender === 'boolean' ? scope.row.gender ? '男' : '女' : '' }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" prop="bankCardNo" label="银行卡号"></el-table-column>
|
|
|
- <el-table-column align="center" prop="bankAddress" label="开户行"></el-table-column>
|
|
|
+ <el-table-column align="center" prop="bankCardNo" label="银行卡号" width="200px"></el-table-column>
|
|
|
+ <el-table-column align="center" prop="bankAddress" label="开户行" width="200px"></el-table-column>
|
|
|
<el-table-column align="center" prop="emergencyContactName" label="紧急联系人"></el-table-column>
|
|
|
<el-table-column align="center" prop="emergencyContactRelation" label="紧急联系人关系"></el-table-column>
|
|
|
<el-table-column align="center" prop="emergencyContactPhone" label="紧急联系人电话"></el-table-column>
|
|
|
- <el-table-column align="center" prop="updateTime" label="最后一次操作时间时间"></el-table-column>
|
|
|
+ <el-table-column align="center" prop="updateTime" label="最后一次操作时间时间" width="160px"></el-table-column>
|
|
|
<el-table-column align="center" prop="operatorName" label="归属管理HR"></el-table-column>
|
|
|
- <el-table-column align="center" prop="resignationDate" label="离职时间">
|
|
|
+ <el-table-column align="center" prop="resignationDate" label="离职时间" width="150px">
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.resignationDate | dayjsFormat}}
|
|
|
</template>
|
|
|
@@ -213,7 +240,7 @@ import {
|
|
|
helpCenterContentModify,
|
|
|
helpCenterContentDelete
|
|
|
} from "@/api/appTenant";
|
|
|
-import { getEmployeeOrgan } from '@/api/buildTeam'
|
|
|
+import { getEmployeeOrgan, getSubject } from '@/api/buildTeam'
|
|
|
import { subjectListTree } from '@/api/specialSetting'
|
|
|
|
|
|
const initSearch = {
|
|
|
@@ -275,10 +302,7 @@ export default {
|
|
|
const data = {}
|
|
|
for (let i = 0; i < this.subjectList.length; i++) {
|
|
|
const item = this.subjectList[i];
|
|
|
- for (let j = 0; j < item.options.length; j++) {
|
|
|
- const option = item.options[j];
|
|
|
- data[option.value] = option.label
|
|
|
- }
|
|
|
+ data[item.id] = item.name
|
|
|
}
|
|
|
return data
|
|
|
},
|
|
|
@@ -293,34 +317,34 @@ export default {
|
|
|
},
|
|
|
mounted() {
|
|
|
this.getList();
|
|
|
- this.getTreeList()
|
|
|
+ // this.getTreeList()
|
|
|
getEmployeeOrgan().then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.organList = res.data;
|
|
|
}
|
|
|
})
|
|
|
- subjectListTree({
|
|
|
+ getSubject({
|
|
|
delFlag: 0,
|
|
|
- rows: 9999
|
|
|
+ tenantId: 1,
|
|
|
}).then(res => {
|
|
|
let result = res.data
|
|
|
if (res.code == 200) {
|
|
|
- let tempArray = []
|
|
|
- result.rows.forEach((item, index) => {
|
|
|
- let subject = []
|
|
|
- item.subjects.forEach(s => {
|
|
|
- subject.push({
|
|
|
- value: s.id,
|
|
|
- label: s.name
|
|
|
- })
|
|
|
- })
|
|
|
+ // let tempArray = []
|
|
|
+ // result.rows.forEach((item, index) => {
|
|
|
+ // let subject = []
|
|
|
+ // item.subjects.forEach(s => {
|
|
|
+ // subject.push({
|
|
|
+ // value: s.id,
|
|
|
+ // label: s.name
|
|
|
+ // })
|
|
|
+ // })
|
|
|
|
|
|
- tempArray[index] = {
|
|
|
- label: item.name,
|
|
|
- options: subject
|
|
|
- }
|
|
|
- })
|
|
|
- this.subjectList = tempArray
|
|
|
+ // tempArray[index] = {
|
|
|
+ // label: item.name,
|
|
|
+ // options: subject
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ this.subjectList = result
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
@@ -511,7 +535,7 @@ export default {
|
|
|
/deep/.el-table .cell {
|
|
|
display: -webkit-box;
|
|
|
overflow: hidden;
|
|
|
- max-height: 80px;
|
|
|
+ max-height: 45px;
|
|
|
text-overflow: ellipsis;
|
|
|
-webkit-line-clamp: 3;
|
|
|
-webkit-box-orient: vertical;
|
