mirror of
https://github.com/m-xlsea/ruoyi-plus-soybean.git
synced 2025-09-24 07:49:47 +08:00
fix(projects): 修复新增部门时不显示上级部门问题
This commit is contained in:
@ -40,6 +40,7 @@ const deptData = ref<Api.System.Dept[]>([]);
|
|||||||
const userOptions = ref<CommonType.Option<CommonType.IdType>[]>([]);
|
const userOptions = ref<CommonType.Option<CommonType.IdType>[]>([]);
|
||||||
const placeholder = ref<string>($t('page.system.dept.placeholder.defaultLeaderPlaceHolder'));
|
const placeholder = ref<string>($t('page.system.dept.placeholder.defaultLeaderPlaceHolder'));
|
||||||
const disabled = ref<boolean>(false);
|
const disabled = ref<boolean>(false);
|
||||||
|
const expandedKeys = ref<CommonType.IdType[]>([]);
|
||||||
|
|
||||||
const title = computed(() => {
|
const title = computed(() => {
|
||||||
const titles: Record<NaiveUI.TableOperateType, string> = {
|
const titles: Record<NaiveUI.TableOperateType, string> = {
|
||||||
@ -55,7 +56,7 @@ const model: Model = reactive(createDefaultModel());
|
|||||||
|
|
||||||
function createDefaultModel(): Model {
|
function createDefaultModel(): Model {
|
||||||
return {
|
return {
|
||||||
parentId: '',
|
parentId: props.rowData?.deptId || '',
|
||||||
deptName: '',
|
deptName: '',
|
||||||
deptCategory: '',
|
deptCategory: '',
|
||||||
orderNum: null,
|
orderNum: null,
|
||||||
@ -80,7 +81,6 @@ const rules: Record<RuleKey, App.Global.FormRule> = {
|
|||||||
function handleUpdateModelWhenEdit() {
|
function handleUpdateModelWhenEdit() {
|
||||||
if (props.operateType === 'add') {
|
if (props.operateType === 'add') {
|
||||||
Object.assign(model, createDefaultModel());
|
Object.assign(model, createDefaultModel());
|
||||||
model.parentId = props.rowData?.deptId || 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (props.operateType === 'edit' && props.rowData) {
|
if (props.operateType === 'edit' && props.rowData) {
|
||||||
@ -144,6 +144,7 @@ async function getDeptData() {
|
|||||||
|
|
||||||
if (data) {
|
if (data) {
|
||||||
deptData.value = handleTree(data, { idField: 'deptId' });
|
deptData.value = handleTree(data, { idField: 'deptId' });
|
||||||
|
expandedKeys.value = [deptData.value[0].deptId];
|
||||||
}
|
}
|
||||||
endDeptLoading();
|
endDeptLoading();
|
||||||
}
|
}
|
||||||
@ -186,15 +187,15 @@ watch(visible, () => {
|
|||||||
<NDrawer v-model:show="visible" :title="title" display-directive="show" :width="800" class="max-w-90%">
|
<NDrawer v-model:show="visible" :title="title" display-directive="show" :width="800" class="max-w-90%">
|
||||||
<NDrawerContent :title="title" :native-scrollbar="false" closable>
|
<NDrawerContent :title="title" :native-scrollbar="false" closable>
|
||||||
<NForm ref="formRef" :model="model" :rules="rules">
|
<NForm ref="formRef" :model="model" :rules="rules">
|
||||||
<NFormItem v-if="model.parentId != 0" :label="$t('page.system.dept.parentId')" path="parentId">
|
<NFormItem v-if="model.parentId !== 0" :label="$t('page.system.dept.parentId')" path="parentId">
|
||||||
<NTreeSelect
|
<NTreeSelect
|
||||||
v-model:value="model.parentId"
|
v-model:value="model.parentId"
|
||||||
|
v-model:expanded-keys="expandedKeys"
|
||||||
:loading="deptLoading"
|
:loading="deptLoading"
|
||||||
clearable
|
clearable
|
||||||
:options="deptData"
|
:options="deptData"
|
||||||
label-field="deptName"
|
label-field="deptName"
|
||||||
key-field="deptId"
|
key-field="deptId"
|
||||||
default-expand-all
|
|
||||||
:placeholder="$t('page.system.dept.form.parentId.required')"
|
:placeholder="$t('page.system.dept.form.parentId.required')"
|
||||||
/>
|
/>
|
||||||
</NFormItem>
|
</NFormItem>
|
||||||
|
Reference in New Issue
Block a user