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 @@
禁用
+
+
+ 管理人员
+ 非管理人员
+
+
@@ -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: '类型不能为空' }],
};
// 校验表单