|
|
|
@ -42,9 +42,8 @@ |
|
|
|
<el-button v-show="scope.row.phStatus == 6" type="text" @click="transferToFun(scope.row)" |
|
|
|
<el-button v-show="scope.row.phStatus == 6" type="text" @click="transferToFun(scope.row)" |
|
|
|
>转岗</el-button |
|
|
|
>转岗</el-button |
|
|
|
> |
|
|
|
> |
|
|
|
<el-button v-show="scope.row.phStatus == 3" type="text" @click="departFun(scope.row)" |
|
|
|
<!-- v-show="scope.row.phStatus == 3" --> |
|
|
|
>离职</el-button |
|
|
|
<el-button type="text" @click="departFun(scope.row)">离职</el-button> |
|
|
|
> |
|
|
|
|
|
|
|
<el-button type="text" @click="individualTakeFun(scope.row)">个人信息</el-button> |
|
|
|
<el-button type="text" @click="individualTakeFun(scope.row)">个人信息</el-button> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
</avue-crud> |
|
|
|
</avue-crud> |
|
|
|
@ -104,47 +103,11 @@ |
|
|
|
</el-dialog> |
|
|
|
</el-dialog> |
|
|
|
<!-- 转岗 --> |
|
|
|
<!-- 转岗 --> |
|
|
|
<el-dialog title="转岗" append-to-body v-model="showDialog" width="60%"> |
|
|
|
<el-dialog title="转岗" append-to-body v-model="showDialog" width="60%"> |
|
|
|
<div> |
|
|
|
<avue-form :option="jobOption" v-model="jobTransferform" ref="jobform"></avue-form> |
|
|
|
<el-button type="primary" @click="insertEvent()">插入一行</el-button> |
|
|
|
|
|
|
|
<el-button plain type="danger" @click="removeRow">删除选择行</el-button> |
|
|
|
|
|
|
|
<!-- <el-button type="primary" @click="handleSave">保存</el-button> --> |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
<div style="margin-top: 20px"> |
|
|
|
|
|
|
|
<el-table :data="tidList" @selection-change="selectionChangeProject" @select="selectChange"> |
|
|
|
|
|
|
|
<el-table-column type="selection" width="55px"></el-table-column> |
|
|
|
|
|
|
|
<el-table-column label="姓名" prop=""> |
|
|
|
|
|
|
|
<!-- <template #default="scope"> |
|
|
|
|
|
|
|
<el-select v-model="scope.row.jtPostHandle.jtphId"> |
|
|
|
|
|
|
|
<el-option v-for="item in personArr" :key="item.id"></el-option> |
|
|
|
|
|
|
|
</el-select> |
|
|
|
|
|
|
|
</template> --> |
|
|
|
|
|
|
|
</el-table-column> |
|
|
|
|
|
|
|
<el-table-column label="工号" prop="userCode"></el-table-column> |
|
|
|
|
|
|
|
<el-table-column label="原所属班组" prop="department.deptName"></el-table-column> |
|
|
|
|
|
|
|
<el-table-column label="原所属岗位" prop="jobName"></el-table-column> |
|
|
|
|
|
|
|
<el-table-column label="新所属班组" prop="newDept.deptId"> |
|
|
|
|
|
|
|
<template #default="scope"> |
|
|
|
|
|
|
|
<el-select v-model="scope.row.newDept.deptId"> |
|
|
|
|
|
|
|
<el-option |
|
|
|
|
|
|
|
v-for="item in deptArr" |
|
|
|
|
|
|
|
:key="item.deptId" |
|
|
|
|
|
|
|
:label="item.deptName" |
|
|
|
|
|
|
|
:value="item.deptId" |
|
|
|
|
|
|
|
></el-option> |
|
|
|
|
|
|
|
</el-select> |
|
|
|
|
|
|
|
</template> |
|
|
|
|
|
|
|
</el-table-column> |
|
|
|
|
|
|
|
<el-table-column label="新所属岗位" prop="newJob"> |
|
|
|
|
|
|
|
<template #default="scope"> |
|
|
|
|
|
|
|
<el-input v-model="scope.row.newJob"></el-input> |
|
|
|
|
|
|
|
</template> |
|
|
|
|
|
|
|
</el-table-column> |
|
|
|
|
|
|
|
</el-table> |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
<template #footer> |
|
|
|
<template #footer> |
|
|
|
<span class="dialog-footer"> |
|
|
|
<span class="dialog-footer"> |
|
|
|
<el-button @click="closeDialog">取 消</el-button> |
|
|
|
<el-button @click="closeDialog">取 消</el-button> |
|
|
|
<el-button type="primary" @click="handleSave()">确 定</el-button> |
|
|
|
<el-button type="primary" @click="handleJobSave()">确 定</el-button> |
|
|
|
</span> |
|
|
|
</span> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
</el-dialog> |
|
|
|
</el-dialog> |
|
|
|
@ -235,7 +198,7 @@ export default { |
|
|
|
editBtnText: '修改', |
|
|
|
editBtnText: '修改', |
|
|
|
viewBtnText: '详情', |
|
|
|
viewBtnText: '详情', |
|
|
|
labelWidth: 120, |
|
|
|
labelWidth: 120, |
|
|
|
menuWidth: 190, |
|
|
|
menuWidth: 240, |
|
|
|
dialogWidth: 1200, |
|
|
|
dialogWidth: 1200, |
|
|
|
dialogClickModal: false, |
|
|
|
dialogClickModal: false, |
|
|
|
searchEnter: true, |
|
|
|
searchEnter: true, |
|
|
|
@ -265,7 +228,6 @@ export default { |
|
|
|
width: 200, |
|
|
|
width: 200, |
|
|
|
hide: true, |
|
|
|
hide: true, |
|
|
|
addDisabled: true, |
|
|
|
addDisabled: true, |
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: '工号', |
|
|
|
label: '工号', |
|
|
|
@ -275,8 +237,7 @@ export default { |
|
|
|
span: 8, |
|
|
|
span: 8, |
|
|
|
search: false, |
|
|
|
search: false, |
|
|
|
width: 200, |
|
|
|
width: 200, |
|
|
|
searchLabelWidth:50, |
|
|
|
searchLabelWidth: 50, |
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
label: '姓名', |
|
|
|
label: '姓名', |
|
|
|
@ -287,7 +248,7 @@ export default { |
|
|
|
type: 'select', |
|
|
|
type: 'select', |
|
|
|
dicUrl: '/blade-system/user/page?size=999999¤t=1', |
|
|
|
dicUrl: '/blade-system/user/page?size=999999¤t=1', |
|
|
|
filterable: true, |
|
|
|
filterable: true, |
|
|
|
searchLabelWidth:50, |
|
|
|
searchLabelWidth: 50, |
|
|
|
props: { |
|
|
|
props: { |
|
|
|
label: 'realName', |
|
|
|
label: 'realName', |
|
|
|
value: 'id', |
|
|
|
value: 'id', |
|
|
|
@ -643,7 +604,7 @@ export default { |
|
|
|
editDisplay: false, |
|
|
|
editDisplay: false, |
|
|
|
search: true, |
|
|
|
search: true, |
|
|
|
width: 130, |
|
|
|
width: 130, |
|
|
|
searchLabelWidth:50, |
|
|
|
searchLabelWidth: 50, |
|
|
|
dicUrl: '/blade-system/dict/dictionary?code=personnel_position_status', |
|
|
|
dicUrl: '/blade-system/dict/dictionary?code=personnel_position_status', |
|
|
|
props: { |
|
|
|
props: { |
|
|
|
label: 'dictValue', |
|
|
|
label: 'dictValue', |
|
|
|
@ -654,7 +615,66 @@ export default { |
|
|
|
}, |
|
|
|
}, |
|
|
|
selectionList: [], |
|
|
|
selectionList: [], |
|
|
|
rowData: {}, //获取行数据 |
|
|
|
rowData: {}, //获取行数据 |
|
|
|
|
|
|
|
jobTransferform: {}, |
|
|
|
|
|
|
|
jobOption: { |
|
|
|
|
|
|
|
submitBtn: false, |
|
|
|
|
|
|
|
emptyBtn: false, |
|
|
|
|
|
|
|
column: [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '姓名', |
|
|
|
|
|
|
|
prop: 'name', |
|
|
|
|
|
|
|
disabled: true, |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '工号', |
|
|
|
|
|
|
|
prop: 'code', |
|
|
|
|
|
|
|
disabled: true, |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '原所属班组', |
|
|
|
|
|
|
|
labelWidth: 120, |
|
|
|
|
|
|
|
prop: 'name', |
|
|
|
|
|
|
|
disabled: true, |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '原所属岗位', |
|
|
|
|
|
|
|
labelWidth: 120, |
|
|
|
|
|
|
|
prop: 'name', |
|
|
|
|
|
|
|
disabled: true, |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '新所属班组', |
|
|
|
|
|
|
|
prop: 'name55555', |
|
|
|
|
|
|
|
labelWidth: 120, |
|
|
|
|
|
|
|
type: 'select', |
|
|
|
|
|
|
|
dicUrl: '/blade-scheduling/teamSet/findList', |
|
|
|
|
|
|
|
props: { |
|
|
|
|
|
|
|
label: 'tsName', |
|
|
|
|
|
|
|
value: 'id', |
|
|
|
|
|
|
|
res: 'data', |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
rules: [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
required: true, |
|
|
|
|
|
|
|
message: '请选择', |
|
|
|
|
|
|
|
trigger: 'blur', |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
], |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
label: '新所属岗位', |
|
|
|
|
|
|
|
prop: 'name', |
|
|
|
|
|
|
|
labelWidth: 120, |
|
|
|
|
|
|
|
rules: [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
required: true, |
|
|
|
|
|
|
|
message: '请输入', |
|
|
|
|
|
|
|
trigger: 'blur', |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
], |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
], |
|
|
|
|
|
|
|
}, |
|
|
|
}; |
|
|
|
}; |
|
|
|
}, |
|
|
|
}, |
|
|
|
mounted() { |
|
|
|
mounted() { |
|
|
|
@ -662,6 +682,17 @@ export default { |
|
|
|
this.getPlanList(); |
|
|
|
this.getPlanList(); |
|
|
|
}, |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
methods: { |
|
|
|
|
|
|
|
// 转岗 |
|
|
|
|
|
|
|
handleJobSave() { |
|
|
|
|
|
|
|
this.$refs.jobform.validate((valid, done, msg) => { |
|
|
|
|
|
|
|
if (valid) { |
|
|
|
|
|
|
|
done(); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
console.log('error submit!!'); |
|
|
|
|
|
|
|
return false; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
}, |
|
|
|
onChangeData(val, type) { |
|
|
|
onChangeData(val, type) { |
|
|
|
if (val && type == 'userId') { |
|
|
|
if (val && type == 'userId') { |
|
|
|
this.form.userCode = val.code; //工号 |
|
|
|
this.form.userCode = val.code; //工号 |
|
|
|
@ -687,7 +718,7 @@ export default { |
|
|
|
closeDialog(isRefresh) { |
|
|
|
closeDialog(isRefresh) { |
|
|
|
this.isAddOpen = false; |
|
|
|
this.isAddOpen = false; |
|
|
|
this.isShowImport = false; |
|
|
|
this.isShowImport = false; |
|
|
|
this.showDialog = false |
|
|
|
this.showDialog = false; |
|
|
|
|
|
|
|
|
|
|
|
// if (isRefresh) { |
|
|
|
// if (isRefresh) { |
|
|
|
this.onLoad(this.page, this.query); |
|
|
|
this.onLoad(this.page, this.query); |
|
|
|
@ -885,7 +916,8 @@ export default { |
|
|
|
// 转岗 |
|
|
|
// 转岗 |
|
|
|
transferToFun(row) { |
|
|
|
transferToFun(row) { |
|
|
|
this.showDialog = true; |
|
|
|
this.showDialog = true; |
|
|
|
this.rowData = row |
|
|
|
this.rowData = row; |
|
|
|
|
|
|
|
this.jobTransferform = row |
|
|
|
}, |
|
|
|
}, |
|
|
|
// 个人信息 |
|
|
|
// 个人信息 |
|
|
|
individualTakeFun(row) { |
|
|
|
individualTakeFun(row) { |
|
|
|
@ -896,7 +928,7 @@ export default { |
|
|
|
}, |
|
|
|
}, |
|
|
|
//插入一行 |
|
|
|
//插入一行 |
|
|
|
insertEvent() { |
|
|
|
insertEvent() { |
|
|
|
console.log(this.rowData,'ceshi'); |
|
|
|
console.log(this.rowData, 'ceshi'); |
|
|
|
const record = { |
|
|
|
const record = { |
|
|
|
jtPostHandle: { |
|
|
|
jtPostHandle: { |
|
|
|
personnel: {}, |
|
|
|
personnel: {}, |
|
|
|
|