|
|
@@ -102,7 +102,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column align='center'
|
|
|
- label="所属部门">
|
|
|
+ label="所属分部">
|
|
|
<template slot-scope="scope">
|
|
|
<tooltip :content="scope.row.organNameList | joinArray(',')"></tooltip>
|
|
|
</template>
|
|
|
@@ -157,7 +157,7 @@
|
|
|
<el-dialog :title="formTitle[formActionTitle]"
|
|
|
:visible.sync="roleStatus"
|
|
|
@close="onFormClose('ruleForm')"
|
|
|
- width="500px">
|
|
|
+ width="650px">
|
|
|
<el-form :model="form"
|
|
|
:rules="rules"
|
|
|
ref="ruleForm">
|
|
|
@@ -201,14 +201,13 @@
|
|
|
:value="item.value"></el-option>
|
|
|
</select-all>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="所属部门"
|
|
|
+ <el-form-item label="所属分部"
|
|
|
prop="organIdLists"
|
|
|
:label-width="formLabelWidth">
|
|
|
- <!-- style="width: calc(100% - 75px) !important;" -->
|
|
|
<select-all
|
|
|
filterable
|
|
|
clearable
|
|
|
- placeholder="请选择部门"
|
|
|
+ placeholder="请选择分部"
|
|
|
collapse-tags
|
|
|
v-model.trim="form.organIdLists"
|
|
|
multiple>
|
|
|
@@ -217,8 +216,70 @@
|
|
|
:label="item.name"
|
|
|
:value="item.id"></el-option>
|
|
|
</select-all>
|
|
|
- <!-- <el-button @click="onBranchCheckAll">全选</el-button> -->
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="所属部门"
|
|
|
+ prop="deptIds"
|
|
|
+ :label-width="formLabelWidth">
|
|
|
+ <el-cascader
|
|
|
+ v-model="form.deptIds"
|
|
|
+ placeholder="请选择所属部门"
|
|
|
+ clearable
|
|
|
+ style="width: 100%;"
|
|
|
+ :options="deptList"
|
|
|
+ :show-all-levels="false"
|
|
|
+ :collapse-tags="true"
|
|
|
+ :props="{ multiple: true, checkStrictly: false }"
|
|
|
+ ></el-cascader>
|
|
|
+ </el-form-item>
|
|
|
+ <div v-for="(postDeptIds, index) in form.postDeptIds" :key="index">
|
|
|
+ <el-form-item
|
|
|
+ :label="'岗位管理' + (index + 1)"
|
|
|
+ :label-width="formLabelWidth"
|
|
|
+ class="setWidth"
|
|
|
+ :prop="'postDeptIds.' + index + '.postId'"
|
|
|
+ :rules="[{ required: true, message: '请选择所属岗位', trigger: 'change' }]"
|
|
|
+ >
|
|
|
+ <el-select
|
|
|
+ filterable
|
|
|
+ clearable
|
|
|
+ placeholder="所属岗位（必填）"
|
|
|
+ style="width: 180px !important"
|
|
|
+ v-model.trim="postDeptIds.postId">
|
|
|
+ <el-option v-for="item in postList"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ class="setWidth"
|
|
|
+ style="margin: 0 10px;width: 190px !important;"
|
|
|
+ :prop="'postDeptIds.' + index + '.deptIds'"
|
|
|
+ >
|
|
|
+ <el-cascader
|
|
|
+ v-model="postDeptIds.deptIds"
|
|
|
+ placeholder="管理部门（非必填）"
|
|
|
+ clearable
|
|
|
+ :options="deptList"
|
|
|
+ :show-all-levels="false"
|
|
|
+ :collapse-tags="true"
|
|
|
+ :props="{ multiple: true, checkStrictly: false }"
|
|
|
+ ></el-cascader>
|
|
|
+ </el-form-item>
|
|
|
+ <el-button
|
|
|
+ icon="el-icon-minus"
|
|
|
+ circle
|
|
|
+ v-if="form.postDeptIds.length > 1"
|
|
|
+ @click.prevent="removePostDept(postDeptIds)"
|
|
|
+ style="height: 40px"
|
|
|
+ ></el-button>
|
|
|
+ <el-button
|
|
|
+ icon="el-icon-plus"
|
|
|
+ @click.prevent="addPostDept"
|
|
|
+ circle
|
|
|
+ style="margin-left: 5px; height: 40px"
|
|
|
+ ></el-button>
|
|
|
+ </div>
|
|
|
<el-form-item label="工作类型"
|
|
|
prop="jobNature"
|
|
|
:label-width="formLabelWidth">
|
|
|
@@ -318,9 +379,11 @@
|
|
|
<script>
|
|
|
import pagination from '@/components/Pagination/index'
|
|
|
import { permission } from "@/utils/directivePage";
|
|
|
-import { queryEmployByOrganId, employeeOperate, getUserRole, employeeAdd, employeeUpdate, hasCourseGroupRelation, updateEducationTeacherId, queryEmployeeOrganByUser } from '@/api/systemManage'
|
|
|
+import { queryEmployByOrganId, employeeOperate, getUserRole, employeeAdd, employeeUpdate, hasCourseGroupRelation, updateEducationTeacherId, queryEmployeeOrganByUser, getDepts, getPosts } from '@/api/systemManage'
|
|
|
import { findEducationTeacher } from '@/api/specialSetting'
|
|
|
import { findEducationUsers } from '@/api/buildTeam'
|
|
|
+// import Treeselect from '@riophae/vue-treeselect'
|
|
|
+// import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
|
|
import Tooltip from '@/components/Tooltip/index'
|
|
|
import { isvalidPhone } from '@/utils/validate'
|
|
|
import handover from './modals/handover'
|
|
|
@@ -341,6 +404,8 @@ export default {
|
|
|
organList: [],
|
|
|
tableList: [],
|
|
|
educationList: [],
|
|
|
+ deptList: [],
|
|
|
+ postList: [],
|
|
|
educationForm: {
|
|
|
targetUserId: ''
|
|
|
},
|
|
|
@@ -369,6 +434,12 @@ export default {
|
|
|
phone: null,
|
|
|
roleIds: [],
|
|
|
organIdLists: [],
|
|
|
+ postDeptIds: [{
|
|
|
+ postId: null,
|
|
|
+ deptIds: []
|
|
|
+ }],
|
|
|
+ deptIds: [],
|
|
|
+ // postIds: [],
|
|
|
jobNature: null,
|
|
|
entryDate: null,
|
|
|
contactAddress: null,
|
|
|
@@ -379,7 +450,9 @@ export default {
|
|
|
gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
|
|
|
phone: [{ type: 'number', required: true, validator: validPhone, trigger: 'blur' }, { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' }],
|
|
|
roleIds: [{ type: 'array', required: true, message: '请选择分类', trigger: 'change' }],
|
|
|
- organIdLists: [{ type: 'array', required: true, message: '请选择所属部门', trigger: 'change' }],
|
|
|
+ organIdLists: [{ type: 'array', required: true, message: '请选择所属分部', trigger: 'change' }],
|
|
|
+ deptIds: [{ type: 'array', required: true, message: '请选择所属部门', trigger: 'change' }],
|
|
|
+ // postIds: [{ type: 'array', required: true, message: '请选择所属岗位', trigger: 'change' }],
|
|
|
jobNature: [{ required: true, message: '请选择工作类型', trigger: 'change' }],
|
|
|
entryDate: [{ required: true, message: '请选择入职时间', trigger: 'blur' }],
|
|
|
|
|
|
@@ -412,16 +485,38 @@ export default {
|
|
|
onRoleSubmit (formName) {
|
|
|
this.$refs[formName].validate((valid) => {
|
|
|
if (valid) {
|
|
|
- this.form.organIdList = this.form.organIdLists.join(',')
|
|
|
+ const { organIdLists, postDeptIds, deptIds, ...res } = this.form
|
|
|
+ let tempPost = []
|
|
|
+ postDeptIds.forEach(post => {
|
|
|
+ let tempIds = []
|
|
|
+ post.deptIds.forEach(item => {
|
|
|
+ tempIds.push(item[item.length - 1])
|
|
|
+ })
|
|
|
+ tempPost.push({
|
|
|
+ postId: post.postId,
|
|
|
+ deptIds: tempIds
|
|
|
+ })
|
|
|
+ })
|
|
|
+ const tempDeptIds = []
|
|
|
+ deptIds.forEach(ds => {
|
|
|
+ tempDeptIds.push(ds[ds.length - 1])
|
|
|
+ })
|
|
|
+
|
|
|
+ let tempForm = {
|
|
|
+ postDeptIds: JSON.stringify(tempPost),
|
|
|
+ organIdList: organIdLists.join(','),
|
|
|
+ deptIds: tempDeptIds,
|
|
|
+ ...res
|
|
|
+ }
|
|
|
if (this.formActionTitle == 'create') {
|
|
|
if (this.form.id) { // 判断有没有Id，如果有则删除
|
|
|
delete this.form.id
|
|
|
}
|
|
|
- employeeAdd(this.form).then(res => {
|
|
|
+ employeeAdd(tempForm).then(res => {
|
|
|
this.messageTips('添加', res)
|
|
|
})
|
|
|
} else if (this.formActionTitle == 'update') {
|
|
|
- employeeUpdate(this.form).then(res => {
|
|
|
+ employeeUpdate(tempForm).then(res => {
|
|
|
this.messageTips('修改', res)
|
|
|
})
|
|
|
}
|
|
|
@@ -464,6 +559,24 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ /** 转换菜单数据结构 */
|
|
|
+ normalizer(node) {
|
|
|
+ let temp = []
|
|
|
+ if (node.children && node.children.length > 0) {
|
|
|
+ node.children.forEach(item => {
|
|
|
+ let child = this.normalizer(item)
|
|
|
+ let obj = {
|
|
|
+ value: item.deptId,
|
|
|
+ label: item .deptName
|
|
|
+ }
|
|
|
+ if(child && child.length > 0) {
|
|
|
+ obj.children = child
|
|
|
+ }
|
|
|
+ temp.push(obj)
|
|
|
+ })
|
|
|
+ }
|
|
|
+ return temp
|
|
|
+ },
|
|
|
getRoleList () { // 获取角色
|
|
|
getUserRole({ delFlag: 0, rows: 9999 }).then(res => {
|
|
|
let result = res.data
|
|
|
@@ -477,6 +590,32 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
})
|
|
|
+ getDepts({ rows: 9999 }).then(res => {
|
|
|
+ if(res.code == 200 && res.data && res.data.length > 0) {
|
|
|
+ const depts = res.data || []
|
|
|
+ const formatArr = []
|
|
|
+ depts.forEach(dep => {
|
|
|
+ formatArr.push({
|
|
|
+ value: dep.deptId,
|
|
|
+ label: dep.deptName,
|
|
|
+ children: this.normalizer(dep)
|
|
|
+ })
|
|
|
+ })
|
|
|
+ this.deptList = formatArr
|
|
|
+ }
|
|
|
+ })
|
|
|
+ // 岗位
|
|
|
+ getPosts({ rows: 9999 }).then(res => {
|
|
|
+ if(res.code == 200 && res.data && res.data.length > 0) {
|
|
|
+ this.postList = []
|
|
|
+ res.data.forEach(item => {
|
|
|
+ this.postList.push({
|
|
|
+ label: item.postName,
|
|
|
+ value: item.postId
|
|
|
+ })
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
this.$store.dispatch('setBranchs')
|
|
|
},
|
|
|
async roleOperation (type, data) {
|
|
|
@@ -490,6 +629,36 @@ export default {
|
|
|
this.roleStatus = true
|
|
|
// 修改的时候
|
|
|
if (type == 'update') {
|
|
|
+ // 初始化数据
|
|
|
+ let postDeptArr = []
|
|
|
+ const postDept = data.postDeptIds ? JSON.parse(data.postDeptIds) : []
|
|
|
+
|
|
|
+ if(postDept.length > 0) {
|
|
|
+ postDept.forEach(dept => {
|
|
|
+ let deptIds = dept.deptIds || []
|
|
|
+ let deptArr = []
|
|
|
+ deptIds.forEach(ds => {
|
|
|
+ deptArr.push(this.formatParentId(ds, this.deptList))
|
|
|
+ })
|
|
|
+ postDeptArr.push({
|
|
|
+ postId: dept.postId,
|
|
|
+ deptIds: deptArr
|
|
|
+ })
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ postDeptArr = [{
|
|
|
+ postId: null,
|
|
|
+ deptIds: []
|
|
|
+ }]
|
|
|
+ }
|
|
|
+
|
|
|
+ const deptIds = data.deptIds ? eval(data.deptIds) : []
|
|
|
+ const tempDeptIds = []
|
|
|
+ if(deptIds.length > 0) {
|
|
|
+ deptIds.forEach(ds => {
|
|
|
+ tempDeptIds.push(this.formatParentId(ds, this.deptList))
|
|
|
+ })
|
|
|
+ }
|
|
|
this.form = {
|
|
|
id: data.id,
|
|
|
realName: data.realName,
|
|
|
@@ -500,9 +669,25 @@ export default {
|
|
|
jobNature: data.jobNature,
|
|
|
entryDate: data.entryDate,
|
|
|
contactAddress: data.contactAddress,
|
|
|
- postalCode: data.postalCode
|
|
|
+ postalCode: data.postalCode,
|
|
|
+ postDeptIds: postDeptArr,
|
|
|
+ deptIds: tempDeptIds
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ formatParentId(id, list, ids = []) {
|
|
|
+ for (const item of list) {
|
|
|
+ if (item.children) {
|
|
|
+ const cIds = this.formatParentId(id, item.children, [...ids, item.value])
|
|
|
+ if(cIds.includes(id)) {
|
|
|
+ return cIds
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (item.value === id) {
|
|
|
+ return [...ids, id]
|
|
|
}
|
|
|
}
|
|
|
+ return ids
|
|
|
},
|
|
|
onFormClose (formName) { // 关闭弹窗重置验证
|
|
|
this.form = {
|
|
|
@@ -510,9 +695,17 @@ export default {
|
|
|
gender: null,
|
|
|
phone: null,
|
|
|
roleName: null,
|
|
|
+ roleIds: [],
|
|
|
organIdLists: [],
|
|
|
jobNature: null,
|
|
|
- entryDate: null
|
|
|
+ entryDate: null,
|
|
|
+ contactAddress: null,
|
|
|
+ postalCode: null,
|
|
|
+ deptIds: [],
|
|
|
+ postDeptIds: [{
|
|
|
+ postId: null,
|
|
|
+ deptIds: []
|
|
|
+ }]
|
|
|
}
|
|
|
this.$refs[formName].resetFields()
|
|
|
},
|
|
|
@@ -607,6 +800,18 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ removePostDept(item) {
|
|
|
+ const index = this.form.postDeptIds.indexOf(item);
|
|
|
+ if (index !== -1) {
|
|
|
+ this.form.postDeptIds.splice(index, 1);
|
|
|
+ }
|
|
|
+ },
|
|
|
+ addPostDept() {
|
|
|
+ this.form.postDeptIds.push({
|
|
|
+ postId: null,
|
|
|
+ deptIds: []
|
|
|
+ });
|
|
|
+ },
|
|
|
},
|
|
|
watch: {
|
|
|
educationViseble (val) {
|
|
|
@@ -638,4 +843,7 @@ export default {
|
|
|
/deep/.el-date-editor.el-input {
|
|
|
width: 100% !important;
|
|
|
}
|
|
|
+.setWidth {
|
|
|
+ display: inline-block;
|
|
|
+}
|
|
|
</style>
|
