gitee
/
snowy
mirror of https://gitee.com/xiaonuobase/snowy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【升级】用户、角色、字典、机构、岗位这些左树右表得到增强，新增时选择树后对应新增的表单跟着选中

pull/90/head
小诺 2023-03-12 02:39:59 +08:00 committed by 俞宝山
parent 41d8a234a3
commit cb4f0a4680
17 changed files with 98 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
snowy-admin-web/src/views/biz/org/form.vue
View File

@ -84,12 +84,15 @@
const submitLoading = ref(false) const submitLoading = ref(false)
// 打开抽屉 // 打开抽屉
const onOpen = (record) => { const onOpen = (record, parentId) => {
visible = true visible = true
extJson.value = ref([]) extJson.value = ref([])
formData.value = { formData.value = {
sortCode: 99 sortCode: 99
} }
if (parentId) {
formData.value.parentId = parentId
}
if (record) { if (record) {
const param = { const param = {
id: record.id id: record.id

4
snowy-admin-web/src/views/biz/org/index.vue
View File

@ -19,7 +19,7 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="8"> <a-col :span="8">
<a-form-item name="searchKey" label="名称关键词"> <a-form-item name="searchKey" label="名称关键词">
<a-input v-model:value="searchFormState.searchKey" placeholder="请输入机构名称关键词"></a-input> <a-input v-model:value="searchFormState.searchKey" placeholder="请输入机构名称关键词" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -48,7 +48,7 @@
> >
<template #operator class="table-operator"> <template #operator class="table-operator">
<a-space> <a-space>
<a-button type="primary" @click="form.onOpen()" v-if="hasPerm('bizOrgAdd')"> <a-button type="primary" @click="form.onOpen(undefined, searchFormState.parentId)" v-if="hasPerm('bizOrgAdd')">
<template #icon><plus-outlined /></template> <template #icon><plus-outlined /></template>
新增 新增
</a-button> </a-button>

5
snowy-admin-web/src/views/biz/position/form.vue
View File

@ -68,11 +68,14 @@
const submitLoading = ref(false) const submitLoading = ref(false)
// 打开抽屉 // 打开抽屉
const onOpen = (record) => { const onOpen = (record, orgId) => {
visible = true visible = true
formData.value = { formData.value = {
sortCode: 99 sortCode: 99
} }
if (orgId) {
formData.value.orgId = orgId
}
if (record) { if (record) {
formData.value = Object.assign({}, record) formData.value = Object.assign({}, record)
} }

4
snowy-admin-web/src/views/biz/position/index.vue
View File

@ -19,7 +19,7 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="8"> <a-col :span="8">
<a-form-item name="searchKey" label="名称关键词"> <a-form-item name="searchKey" label="名称关键词">
<a-input v-model:value="searchFormState.searchKey" placeholder="请输入岗位名称关键词"></a-input> <a-input v-model:value="searchFormState.searchKey" placeholder="请输入岗位名称关键词" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -48,7 +48,7 @@
> >
<template #operator class="table-operator"> <template #operator class="table-operator">
<a-space> <a-space>
<a-button type="primary" @click="form.onOpen()" v-if="hasPerm('bizPositionAdd')"> <a-button type="primary" @click="form.onOpen(undefined, searchFormState.orgId)" v-if="hasPerm('bizPositionAdd')">
<template #icon><plus-outlined /></template> <template #icon><plus-outlined /></template>
新增 新增
</a-button> </a-button>

45
snowy-admin-web/src/views/biz/user/form.vue
View File

@ -351,33 +351,42 @@
let formData = ref({}) let formData = ref({})
// 打开抽屉 // 打开抽屉
const onOpen = (record) => { const onOpen = (record, orgId) => {
visible = true visible = true
formData.value = { formData.value = {
gender: '男', gender: '男',
positionJson: [] positionJson: []
} }
if (orgId) {
formData.value.orgId = orgId
// 通过机构再查询职位、主管
nextTick(() => {
selePositionData(orgId)
})
}
if (record) { if (record) {
convertFormData(record) convertFormData(record)
} }
// 机构选择器数据 nextTick(() => {
bizUserApi.userOrgTreeSelector().then((res) => { // 机构选择器数据
if (res !== null) { bizUserApi.userOrgTreeSelector().then((res) => {
treeData.value = res if (res !== null) {
// 默认展开2级 treeData.value = res
treeData.value.forEach((item) => { // 默认展开2级
// 因为0的顶级 treeData.value.forEach((item) => {
if (item.parentId === '0') { // 因为0的顶级
treeDefaultExpandedKeys.value.push(item.id) if (item.parentId === '0') {
// 取到下级ID treeDefaultExpandedKeys.value.push(item.id)
if (item.children) { // 取到下级ID
item.children.forEach((items) => { if (item.children) {
treeDefaultExpandedKeys.value.push(items.id) item.children.forEach((items) => {
}) treeDefaultExpandedKeys.value.push(items.id)
})
}
} }
} })
}) }
} })
}) })
} }
// 关闭抽屉 // 关闭抽屉

2
snowy-admin-web/src/views/biz/user/index.vue
View File

@ -60,7 +60,7 @@
> >
<template #operator class="table-operator"> <template #operator class="table-operator">
<a-space> <a-space>
<a-button type="primary" @click="form.onOpen()" v-if="hasPerm('bizUserAdd')"> <a-button type="primary" @click="form.onOpen(undefined, searchFormState.orgId)" v-if="hasPerm('bizUserAdd')">
<template #icon><plus-outlined /></template> <template #icon><plus-outlined /></template>
<span>{{ $t('common.addButton') }}{{ $t('model.user') }}</span> <span>{{ $t('common.addButton') }}{{ $t('model.user') }}</span>
</a-button> </a-button>

2
snowy-admin-web/src/views/dev/dict/category/bizIndex.vue
View File

@ -39,7 +39,7 @@
</a-button> </a-button>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-button type="primary" @click="form.onOpen(undefined, 'BIZ')"> <a-button type="primary" @click="form.onOpen(undefined, 'BIZ', searchFormState.parentId)">
<template #icon><plus-outlined /></template> <template #icon><plus-outlined /></template>
新增 新增
</a-button> </a-button>

7
snowy-admin-web/src/views/dev/dict/category/form.vue
View File

@ -39,7 +39,7 @@
/> />
</a-form-item> </a-form-item>
<a-form-item label="排序：" name="sortCode"> <a-form-item label="排序：" name="sortCode">
<a-input-number style="width: 100%" v-model:value="formData.sortCode" :max="100" /> <a-input-number style="width: 100%" v-model:value="formData.sortCode" :max="1000" />
</a-form-item> </a-form-item>
</a-form> </a-form>
<template #footer> <template #footer>
@ -66,12 +66,15 @@
const defaultExpandedKeys = ref([0]) const defaultExpandedKeys = ref([0])
// 打开抽屉 // 打开抽屉
const onOpen = (record, type) => { const onOpen = (record, type, parentId) => {
visible = true visible = true
formData.value = { formData.value = {
sortCode: 99, sortCode: 99,
category: type category: type
} }
if (parentId) {
formData.value.parentId = parentId
}
if (record) { if (record) {
formData.value = Object.assign({}, record) formData.value = Object.assign({}, record)
formData.value.category = type formData.value.category = type

2
snowy-admin-web/src/views/dev/dict/category/frmIndex.vue
View File

@ -39,7 +39,7 @@
</a-button> </a-button>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-button type="primary" @click="form.onOpen(undefined, 'FRM')"> <a-button type="primary" @click="form.onOpen(undefined, 'FRM', searchFormState.parentId)">
<template #icon><plus-outlined /></template> <template #icon><plus-outlined /></template>
新增 新增
</a-button> </a-button>

7
snowy-admin-web/src/views/sys/org/form.vue
View File

@ -25,7 +25,7 @@
}" }"
selectable="false" selectable="false"
tree-line tree-line
></a-tree-select> />
</a-form-item> </a-form-item>
<a-form-item label="组织名称：" name="name"> <a-form-item label="组织名称：" name="name">
<a-input v-model:value="formData.name" placeholder="请输入组织名称" allow-clear /> <a-input v-model:value="formData.name" placeholder="请输入组织名称" allow-clear />
@ -84,12 +84,15 @@
const submitLoading = ref(false) const submitLoading = ref(false)
// 打开抽屉 // 打开抽屉
const onOpen = (record) => { const onOpen = (record, parentId) => {
visible = true visible = true
extJson.value = ref([]) extJson.value = ref([])
formData.value = { formData.value = {
sortCode: 99 sortCode: 99
} }
if (parentId) {
formData.value.parentId = parentId
}
if (record) { if (record) {
const param = { const param = {
id: record.id id: record.id

5
snowy-admin-web/src/views/sys/org/index.vue
View File

@ -8,8 +8,7 @@
:tree-data="treeData" :tree-data="treeData"
:field-names="treeFieldNames" :field-names="treeFieldNames"
@select="treeSelect" @select="treeSelect"
> />
</a-tree>
<a-empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" /> <a-empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" />
</a-card> </a-card>
</a-col> </a-col>
@ -48,7 +47,7 @@
> >
<template #operator class="table-operator"> <template #operator class="table-operator">
<a-space> <a-space>
<a-button type="primary" @click="form.onOpen()"> <a-button type="primary" @click="form.onOpen(undefined, searchFormState.parentId)">
<template #icon><plus-outlined /></template> <template #icon><plus-outlined /></template>
新增 新增
</a-button> </a-button>

5
snowy-admin-web/src/views/sys/position/form.vue
View File

@ -67,11 +67,14 @@
const submitLoading = ref(false) const submitLoading = ref(false)
// 打开抽屉 // 打开抽屉
const onOpen = (record) => { const onOpen = (record, orgId) => {
visible = true visible = true
formData.value = { formData.value = {
sortCode: 99 sortCode: 99
} }
if (orgId) {
formData.value.orgId = orgId
}
if (record) { if (record) {
formData.value = Object.assign({}, record) formData.value = Object.assign({}, record)
} }

4
snowy-admin-web/src/views/sys/position/index.vue
View File

@ -19,7 +19,7 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="8"> <a-col :span="8">
<a-form-item name="searchKey" label="名称关键词"> <a-form-item name="searchKey" label="名称关键词">
<a-input v-model:value="searchFormState.searchKey" placeholder="请输入职位名称关键词"></a-input> <a-input v-model:value="searchFormState.searchKey" placeholder="请输入职位名称关键词" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -48,7 +48,7 @@
> >
<template #operator class="table-operator"> <template #operator class="table-operator">
<a-space> <a-space>
<a-button type="primary" @click="form.onOpen()"> <a-button type="primary" @click="form.onOpen(undefined, searchFormState.orgId)">
<template #icon><plus-outlined /></template> <template #icon><plus-outlined /></template>
新增 新增
</a-button> </a-button>

10
snowy-admin-web/src/views/sys/role/form.vue
View File

@ -67,11 +67,19 @@
const submitLoading = ref(false) const submitLoading = ref(false)
// 打开抽屉 // 打开抽屉
const onOpen = (record) => { const onOpen = (record, category, orgId) => {
visible = true visible = true
formData.value = { formData.value = {
sortCode: 99 sortCode: 99
} }
// 判断角色的类型
if (category) {
formData.value.category = category
}
if (orgId) {
formData.value.category = 'ORG'
formData.value.orgId = orgId
}
if (record) { if (record) {
formData.value = Object.assign({}, record) formData.value = Object.assign({}, record)
} }

2
snowy-admin-web/src/views/sys/role/index.vue
View File

@ -49,7 +49,7 @@
> >
<template #operator class="table-operator"> <template #operator class="table-operator">
<a-space> <a-space>
<a-button type="primary" @click="form.onOpen()"> <a-button type="primary" @click="form.onOpen(undefined, searchFormState.category, searchFormState.orgId)">
<template #icon><plus-outlined /></template> <template #icon><plus-outlined /></template>
新增角色 新增角色
</a-button> </a-button>

45
snowy-admin-web/src/views/sys/user/form.vue
View File

@ -349,33 +349,42 @@
let formData = ref({}) let formData = ref({})
// 打开抽屉 // 打开抽屉
const onOpen = (record) => { const onOpen = (record, orgId) => {
visible = true visible = true
formData.value = { formData.value = {
gender: '男', gender: '男',
positionJson: [] positionJson: []
} }
if (orgId) {
formData.value.orgId = orgId
// 通过机构再查询职位、主管
nextTick(() => {
selePositionData(orgId)
})
}
if (record) { if (record) {
convertFormData(record) convertFormData(record)
} }
// 机构选择器数据 nextTick(() => {
userApi.userOrgTreeSelector().then((res) => { // 机构选择器数据
if (res !== null) { userApi.userOrgTreeSelector().then((res) => {
treeData.value = res if (res !== null) {
// 默认展开2级 treeData.value = res
treeData.value.forEach((item) => { // 默认展开2级
// 因为0的顶级 treeData.value.forEach((item) => {
if (item.parentId === '0') { // 因为0的顶级
treeDefaultExpandedKeys.value.push(item.id) if (item.parentId === '0') {
// 取到下级ID treeDefaultExpandedKeys.value.push(item.id)
if (item.children) { // 取到下级ID
item.children.forEach((items) => { if (item.children) {
treeDefaultExpandedKeys.value.push(items.id) item.children.forEach((items) => {
}) treeDefaultExpandedKeys.value.push(items.id)
})
}
} }
} })
}) }
} })
}) })
} }
// 关闭抽屉 // 关闭抽屉

2
snowy-admin-web/src/views/sys/user/index.vue
View File

@ -60,7 +60,7 @@
> >
<template #operator class="table-operator"> <template #operator class="table-operator">
<a-space> <a-space>
<a-button type="primary" @click="form.onOpen()"> <a-button type="primary" @click="form.onOpen(undefined, searchFormState.orgId)">
<template #icon><plus-outlined /></template> <template #icon><plus-outlined /></template>
<span>{{ $t('common.addButton') }}{{ $t('model.user') }}</span> <span>{{ $t('common.addButton') }}{{ $t('model.user') }}</span>
</a-button> </a-button>