根据机具项目的要求回滚"增加顶级部门",因为新增了多公司管理
This commit is contained in:
parent
85477dbeb9
commit
7d78be85eb
|
|
@ -89,7 +89,7 @@
|
||||||
>新增
|
>新增
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
v-if="config.isAddRootCompany? true : scope.row.parentId != 0"
|
v-if="scope.row.parentId != 0"
|
||||||
size="mini"
|
size="mini"
|
||||||
type="text"
|
type="text"
|
||||||
icon="el-icon-delete"
|
icon="el-icon-delete"
|
||||||
|
|
@ -107,12 +107,7 @@
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="24" v-if="form.parentId !== 0">
|
<el-col :span="24" v-if="form.parentId !== 0">
|
||||||
<el-form-item label="上级部门" prop="parentId">
|
<el-form-item label="上级部门" prop="parentId">
|
||||||
<treeselect
|
<treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
|
||||||
v-model="form.parentId"
|
|
||||||
:options="deptOptions"
|
|
||||||
:normalizer="normalizer"
|
|
||||||
:placeholder="config.isAddRootCompany ? '选择上级部门,如果不选择则创建顶级部门' : '选择上级部门'"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
@ -235,11 +230,9 @@ export default {
|
||||||
form: {},
|
form: {},
|
||||||
// 表单校验
|
// 表单校验
|
||||||
rules: {
|
rules: {
|
||||||
parentId: JSON.parse(localStorage.getItem('systemConfig')).isAddRootCompany ? [] : [{
|
parentId: [
|
||||||
required: true,
|
{ required: true, message: "上级部门不能为空", trigger: "blur" }
|
||||||
message: '上级部门不能为空',
|
],
|
||||||
trigger: 'blur'
|
|
||||||
}],
|
|
||||||
deptName: [
|
deptName: [
|
||||||
{ required: true, message: '部门名称不能为空', trigger: 'blur' }
|
{ required: true, message: '部门名称不能为空', trigger: 'blur' }
|
||||||
],
|
],
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue