From 402897bdc5676b7fa102f214a60afae382eda52a Mon Sep 17 00:00:00 2001
From: jiayu <zheng_jiayu1@163.com>
Date: Fri, 11 Jul 2025 18:17:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/header-user-space/header-organize.vue      | 4 ++++
 .../employee/components/employee-form-modal/index.vue     | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/src/layout/components/header-user-space/header-organize.vue b/src/layout/components/header-user-space/header-organize.vue
index 18b4cd8..4a151d5 100644
--- a/src/layout/components/header-user-space/header-organize.vue
+++ b/src/layout/components/header-user-space/header-organize.vue
@@ -79,6 +79,10 @@
 
   async function onSelect(selectedKeys, info) {
     console.log(selectedKeys, info);
+    if (selectedKeys[0] == useUserStore().getCurrentVillageId) {
+      closeOrganize();
+      return;
+    }
     useUserStore().setCurrentVillageId(selectedKeys[0]);
     currentVillageName.value = info.node.name;
     await setLoginInfo();
diff --git a/src/views/system/employee/components/employee-form-modal/index.vue b/src/views/system/employee/components/employee-form-modal/index.vue
index e1c1f63..7c18638 100644
--- a/src/views/system/employee/components/employee-form-modal/index.vue
+++ b/src/views/system/employee/components/employee-form-modal/index.vue
@@ -44,6 +44,12 @@
           <a-select-option :value="1">禁用</a-select-option>
         </a-select>
       </a-form-item>
+      <a-form-item label="类型" name="type">
+        <a-select v-model:value="form.type" placeholder="请选择类型">
+          <a-select-option :value="2">管理人员</a-select-option>
+          <a-select-option :value="3">非管理人员</a-select-option>
+        </a-select>
+      </a-form-item>
       <a-form-item label="岗位" name="positionId">
         <PositionSelect v-model:value="form.positionId" placeholder="请选择岗位" />
       </a-form-item>
@@ -119,6 +125,7 @@
     phone: undefined,
     roleIdList: undefined,
     positionId: undefined,
+    type: undefined,
   };
 
   let form = reactive(_.cloneDeep(formDefault));
@@ -147,6 +154,7 @@
     disabledFlag: [{ required: true, message: '状态不能为空' }],
     leaveFlag: [{ required: true, message: '在职状态不能为空' }],
     email: [{ required: true, message: '请输入邮箱' }],
+    type: [{ required: true, message: '类型不能为空' }],
   };
 
   // 校验表单