diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue index 97a0f42..42675bf 100644 --- a/src/views/system/dept/editDept.vue +++ b/src/views/system/dept/editDept.vue @@ -4,12 +4,12 @@ - + - + @@ -17,20 +17,28 @@ - + + + + + + + + + - + - + - + + + + + + + + @@ -76,7 +91,8 @@ version: '', num: '', tips: '', - deptType: '' + deptType: '', + ipSegment: '' }, // 表单 defaultProps: { parent: 'pid', @@ -106,7 +122,8 @@ pid: [{ required: true, message: '父组织机构必选', trigger: ['blur', 'change'] }], num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }], deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }] - } // 前端校验规则 + }, // 前端校验规则 + isTop: false } }, computed: { @@ -140,7 +157,13 @@ num: row.num, tips: row.tips, version: row.version, - deptType: row.deptType + deptType: row.deptType, + ipSegment: row.ipSegment + } + if (row.simplename === '顶级') { + this.isTop = true + } else { + this.isTop = false } } }, @@ -173,7 +196,8 @@ num: '', tips: '', version: '', - deptType: '' + deptType: '', + ipSegment: '' } }, // 保存数据 diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue index 97a0f42..42675bf 100644 --- a/src/views/system/dept/editDept.vue +++ b/src/views/system/dept/editDept.vue @@ -4,12 +4,12 @@ - + - + @@ -17,20 +17,28 @@ - + + + + + + + + + - + - + - + + + + + + + + @@ -76,7 +91,8 @@ version: '', num: '', tips: '', - deptType: '' + deptType: '', + ipSegment: '' }, // 表单 defaultProps: { parent: 'pid', @@ -106,7 +122,8 @@ pid: [{ required: true, message: '父组织机构必选', trigger: ['blur', 'change'] }], num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }], deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }] - } // 前端校验规则 + }, // 前端校验规则 + isTop: false } }, computed: { @@ -140,7 +157,13 @@ num: row.num, tips: row.tips, version: row.version, - deptType: row.deptType + deptType: row.deptType, + ipSegment: row.ipSegment + } + if (row.simplename === '顶级') { + this.isTop = true + } else { + this.isTop = false } } }, @@ -173,7 +196,8 @@ num: '', tips: '', version: '', - deptType: '' + deptType: '', + ipSegment: '' } }, // 保存数据 diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue index 5f05c78..c9a1f10 100644 --- a/src/views/system/dept/listDept.vue +++ b/src/views/system/dept/listDept.vue @@ -53,6 +53,10 @@ value: 'fullname' }, { + text: '登录IP段', + value: 'ipSegment' + }, + { text: '备注', value: 'tips' },