diff --git a/src/views/basicData/jobTransferManagement.vue b/src/views/basicData/jobTransferManagement.vue
index 907c433..60f2d29 100644
--- a/src/views/basicData/jobTransferManagement.vue
+++ b/src/views/basicData/jobTransferManagement.vue
@@ -83,7 +83,7 @@
-
-
+ -->
+
@@ -110,16 +127,24 @@
append-to-body
v-if="personalOpen"
v-model="personalOpen"
- width="60%"
+ width="70%"
border
>
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ scope.row.inJobDate ? scope.row.inJobDate.substring(0, 10) : '' }}
+
+
+
+
+ {{ scope.row.toNewJob ? scope.row.toNewJob.substring(0, 10) : '' }}
+
+
@@ -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() {