From d5bbc37dec1160683d3b55d3cf9f32770344a558 Mon Sep 17 00:00:00 2001
From: AN <1983933789@qq.com>
Date: Wed, 10 Sep 2025 11:48:13 +0800
Subject: [PATCH] =?UTF-8?q?fix(projects):=20=E4=BF=AE=E5=A4=8D=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=83=A8=E9=97=A8=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8A=E7=BA=A7=E9=83=A8=E9=97=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/modules/dept-operate-drawer.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/system/dept/modules/dept-operate-drawer.vue b/src/views/system/dept/modules/dept-operate-drawer.vue
index 2e6c8dae..b5e53bc1 100644
--- a/src/views/system/dept/modules/dept-operate-drawer.vue
+++ b/src/views/system/dept/modules/dept-operate-drawer.vue
@@ -40,6 +40,7 @@ const deptData = ref<Api.System.Dept[]>([]);
 const userOptions = ref<CommonType.Option<CommonType.IdType>[]>([]);
 const placeholder = ref<string>($t('page.system.dept.placeholder.defaultLeaderPlaceHolder'));
 const disabled = ref<boolean>(false);
+const expandedKeys = ref<CommonType.IdType[]>([]);
 
 const title = computed(() => {
   const titles: Record<NaiveUI.TableOperateType, string> = {
@@ -55,7 +56,7 @@ const model: Model = reactive(createDefaultModel());
 
 function createDefaultModel(): Model {
   return {
-    parentId: '',
+    parentId: props.rowData?.deptId || '',
     deptName: '',
     deptCategory: '',
     orderNum: null,
@@ -80,7 +81,6 @@ const rules: Record<RuleKey, App.Global.FormRule> = {
 function handleUpdateModelWhenEdit() {
   if (props.operateType === 'add') {
     Object.assign(model, createDefaultModel());
-    model.parentId = props.rowData?.deptId || 0;
   }
 
   if (props.operateType === 'edit' && props.rowData) {
@@ -144,6 +144,7 @@ async function getDeptData() {
 
   if (data) {
     deptData.value = handleTree(data, { idField: 'deptId' });
+    expandedKeys.value = [deptData.value[0].deptId];
   }
   endDeptLoading();
 }
@@ -186,15 +187,15 @@ watch(visible, () => {
   <NDrawer v-model:show="visible" :title="title" display-directive="show" :width="800" class="max-w-90%">
     <NDrawerContent :title="title" :native-scrollbar="false" closable>
       <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
             v-model:value="model.parentId"
+            v-model:expanded-keys="expandedKeys"
             :loading="deptLoading"
             clearable
             :options="deptData"
             label-field="deptName"
             key-field="deptId"
-            default-expand-all
             :placeholder="$t('page.system.dept.form.parentId.required')"
           />
         </NFormItem>