|
|
|
|
@ -83,7 +83,7 @@ |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="培训师" prop="teacherId"> |
|
|
|
|
<!-- multiple --> |
|
|
|
|
<el-select |
|
|
|
|
<!-- <el-select |
|
|
|
|
v-model="formModel.teacherId" |
|
|
|
|
placeholder="请输入培训师" |
|
|
|
|
@change="changeTeacher" |
|
|
|
|
@ -94,7 +94,24 @@ |
|
|
|
|
:label="item.realName" |
|
|
|
|
:value="item.id" |
|
|
|
|
></el-option> |
|
|
|
|
</el-select> |
|
|
|
|
</el-select> --> |
|
|
|
|
<jhSelect |
|
|
|
|
:value="formModel.teacherId" |
|
|
|
|
@input="val => (formModel.teacherId = val)" |
|
|
|
|
placeholder="请搜索选择" |
|
|
|
|
api-url="/blade-system/user/page" |
|
|
|
|
echo-api="/blade-system/user/page" |
|
|
|
|
echoParamsKey="ids" |
|
|
|
|
echo-method="get" |
|
|
|
|
api-method="get" |
|
|
|
|
list-key="records" |
|
|
|
|
total-key="total" |
|
|
|
|
label-key="realName" |
|
|
|
|
value-key="id" |
|
|
|
|
search-key="id" |
|
|
|
|
:debounce-time="500" |
|
|
|
|
@change="changeTeacher" |
|
|
|
|
/> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-form> |
|
|
|
|
<template #footer> |
|
|
|
|
@ -110,16 +127,24 @@ |
|
|
|
|
append-to-body |
|
|
|
|
v-if="personalOpen" |
|
|
|
|
v-model="personalOpen" |
|
|
|
|
width="60%" |
|
|
|
|
width="70%" |
|
|
|
|
border |
|
|
|
|
> |
|
|
|
|
<el-table :data="personData"> |
|
|
|
|
<el-table-column label="姓名" prop="userName" min-width="120" /> |
|
|
|
|
<el-table-column label="工号" prop="userCode" min-width="120" /> |
|
|
|
|
<el-table-column label="所属班组" prop="deptName" min-width="100" /> |
|
|
|
|
<el-table-column label="所属岗位" prop="station" min-width="100" /> |
|
|
|
|
<el-table-column label="入职时间" prop="inJobDate" min-width="100"> </el-table-column> |
|
|
|
|
<el-table-column label="转岗时间" prop="toNewJob" min-width="100"> </el-table-column> |
|
|
|
|
<el-table-column label="姓名" prop="userName" min-width="120" align="center" /> |
|
|
|
|
<el-table-column label="工号" prop="userCode" min-width="120" align="center" /> |
|
|
|
|
<el-table-column label="所属班组" prop="deptName" min-width="100" align="center" /> |
|
|
|
|
<el-table-column label="所属岗位" prop="stationName" min-width="100" align="center" /> |
|
|
|
|
<el-table-column label="入职时间" prop="inJobDate" min-width="100" align="center"> |
|
|
|
|
<template #default="scope"> |
|
|
|
|
{{ scope.row.inJobDate ? scope.row.inJobDate.substring(0, 10) : '' }} |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column label="转岗时间" prop="toNewJob" min-width="100" align="center"> |
|
|
|
|
<template #default="scope"> |
|
|
|
|
{{ scope.row.toNewJob ? scope.row.toNewJob.substring(0, 10) : '' }} |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
</el-table> |
|
|
|
|
</el-dialog> |
|
|
|
|
<!-- 转岗 --> |
|
|
|
|
@ -172,10 +197,12 @@ import { |
|
|
|
|
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'; |
|
|
|
|
export default { |
|
|
|
|
components: { |
|
|
|
|
basicImport, |
|
|
|
|
jobTransferAdd, |
|
|
|
|
jhSelect, |
|
|
|
|
}, |
|
|
|
|
data() { |
|
|
|
|
return { |
|
|
|
|
@ -278,15 +305,7 @@ export default { |
|
|
|
|
span: 8, |
|
|
|
|
search: true, |
|
|
|
|
width: 200, |
|
|
|
|
// type: 'select', |
|
|
|
|
// dicUrl: '/blade-system/user/page?size=999999¤t=1', |
|
|
|
|
// filterable: true, |
|
|
|
|
// searchLabelWidth: 50, |
|
|
|
|
// props: { |
|
|
|
|
// label: 'realName', |
|
|
|
|
// value: 'id', |
|
|
|
|
// res: 'data.records', |
|
|
|
|
// }, |
|
|
|
|
|
|
|
|
|
rules: [ |
|
|
|
|
{ |
|
|
|
|
required: true, |
|
|
|
|
@ -294,9 +313,6 @@ export default { |
|
|
|
|
trigger: 'click', |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
change: val => { |
|
|
|
|
this.onChangeData(val.item, 'userId'); |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
// { |
|
|
|
|
// label: '员工编号', |
|
|
|
|
@ -316,7 +332,14 @@ export default { |
|
|
|
|
search: true, |
|
|
|
|
width: 200, |
|
|
|
|
hide: true, |
|
|
|
|
|
|
|
|
|
filterable: true, |
|
|
|
|
type: 'select', |
|
|
|
|
dicUrl: '/blade-system/post/list', |
|
|
|
|
props: { |
|
|
|
|
label: 'postName', |
|
|
|
|
value: 'id', |
|
|
|
|
res: 'data.records', |
|
|
|
|
}, |
|
|
|
|
rules: [ |
|
|
|
|
{ |
|
|
|
|
required: true, |
|
|
|
|
@ -346,60 +369,27 @@ export default { |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '性别', |
|
|
|
|
prop: 'gender', |
|
|
|
|
prop: 'genderName', |
|
|
|
|
span: 8, |
|
|
|
|
type: 'select', |
|
|
|
|
labelWidth: 150, |
|
|
|
|
search: false, |
|
|
|
|
width: 200, |
|
|
|
|
rules: [ |
|
|
|
|
{ |
|
|
|
|
required: true, |
|
|
|
|
message: '请输入性别', |
|
|
|
|
trigger: 'click', |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
dicUrl: '/blade-system/dict/dictionary?code=sex', |
|
|
|
|
props: { |
|
|
|
|
label: 'dictValue', |
|
|
|
|
value: 'dictKey', |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '技能等级', |
|
|
|
|
prop: 'skill', |
|
|
|
|
type: 'select', |
|
|
|
|
prop: 'skillName', |
|
|
|
|
span: 8, |
|
|
|
|
labelWidth: 150, |
|
|
|
|
search: true, |
|
|
|
|
width: 200, |
|
|
|
|
dicUrl: '/blade-system/dict/dictionary?code=skill_level', |
|
|
|
|
props: { |
|
|
|
|
label: 'dictValue', |
|
|
|
|
value: 'dictKey', |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '用工类型', |
|
|
|
|
prop: 'staffType', |
|
|
|
|
type: 'select', |
|
|
|
|
prop: 'staffTypeName', |
|
|
|
|
span: 8, |
|
|
|
|
labelWidth: 150, |
|
|
|
|
search: false, |
|
|
|
|
width: 200, |
|
|
|
|
editDisplay: false, |
|
|
|
|
rules: [ |
|
|
|
|
{ |
|
|
|
|
required: true, |
|
|
|
|
message: '请输入用工类型', |
|
|
|
|
trigger: 'click', |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
dicUrl: '/blade-system/dict/dictionary?code=staffType', |
|
|
|
|
props: { |
|
|
|
|
label: 'dictValue', |
|
|
|
|
value: 'dictKey', |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '民族', |
|
|
|
|
@ -501,17 +491,11 @@ export default { |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '婚姻状态', |
|
|
|
|
prop: 'marriage', |
|
|
|
|
prop: 'marriageName', |
|
|
|
|
span: 8, |
|
|
|
|
type: 'select', |
|
|
|
|
labelWidth: 150, |
|
|
|
|
search: false, |
|
|
|
|
width: 200, |
|
|
|
|
|
|
|
|
|
dicData: [ |
|
|
|
|
{ value: '0', label: '未婚' }, |
|
|
|
|
{ value: '1', label: '已婚' }, |
|
|
|
|
], |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '毕业院校', |
|
|
|
|
@ -639,6 +623,7 @@ export default { |
|
|
|
|
addDisplay: false, |
|
|
|
|
editDisplay: false, |
|
|
|
|
search: true, |
|
|
|
|
filterable: true, |
|
|
|
|
width: 130, |
|
|
|
|
searchLabelWidth: 50, |
|
|
|
|
dicUrl: '/blade-system/dict/dictionary?code=personnel_position_status', |
|
|
|
|
@ -714,7 +699,7 @@ export default { |
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
mounted() { |
|
|
|
|
this.getUserList(); |
|
|
|
|
// this.getUserList(); |
|
|
|
|
this.getPlanList(); |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
@ -727,10 +712,10 @@ export default { |
|
|
|
|
updateFun(row) { |
|
|
|
|
this.showAddDialog = true; |
|
|
|
|
this.title = '修改'; |
|
|
|
|
row.skill = row.skill+'' |
|
|
|
|
row.staffType=row.staffType+'' |
|
|
|
|
row.userId=row.userId+'' |
|
|
|
|
this.rowData = row |
|
|
|
|
row.skill = row.skill + ''; |
|
|
|
|
row.staffType = row.staffType + ''; |
|
|
|
|
row.userId = row.userId + ''; |
|
|
|
|
this.rowData = row; |
|
|
|
|
}, |
|
|
|
|
// 转岗 |
|
|
|
|
handleJobSave() { |
|
|
|
|
@ -939,9 +924,9 @@ export default { |
|
|
|
|
this.planOpen = true; |
|
|
|
|
}, |
|
|
|
|
// 切换培训师 |
|
|
|
|
changeTeacher(val) { |
|
|
|
|
let select = this.teacherArr.find(e => e.id == val); |
|
|
|
|
this.formModel.teacherName = select.realName; |
|
|
|
|
changeTeacher(val, item) { |
|
|
|
|
// let select = this.teacherArr.find(e => e.id == val); |
|
|
|
|
this.formModel.teacherName = item.realName; |
|
|
|
|
}, |
|
|
|
|
// 转岗/下岗提交 |
|
|
|
|
submit() { |
|
|
|
|
|