From ec1ae071f86524cc2f744c7f7430901c6c7198aa Mon Sep 17 00:00:00 2001
From: xuziqiang <1344691446@qq.com>
Date: Tue, 18 Jun 2024 18:16:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=9B=86=E5=9B=A2=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=EF=BC=8C=E9=83=A8=E9=97=A8=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=B8=85=E6=A5=9A=E6=9D=83=E9=99=90=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizationManage/departmentManage/index.vue  | 38 +++++++++++++---------
 .../organizationManage/enterpriseManage/config.ts  |  1 +
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue b/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue
index f84f01a..2618e84 100644
--- a/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue
+++ b/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue
@@ -281,7 +281,7 @@
     opMap.type = 'addson';
     formData.value = {};
     let sourceOrgId = '';
-    if (!currentOrgRef.value.own) {
+    if (!currentOrgRef.value?.own) {
       sourceOrgId = orgId;
     }
     opMap.fuc = (params) => {
@@ -304,12 +304,14 @@
     roleFormData.value = {};
     opMap.fuc = (params) => {
       delete params.roleId;
-      return http.post(department.addRole, {
-        ...params,
-        orgId,
-        projectId,
-        deptId: selectRef.value.deptInfo.deptId,
-        deptName: selectRef.value.deptInfo.deptName,
+      return formRoleRef.value.triggerSubmit().then(() => {
+        return http.post(department.addRole, {
+          ...params,
+          orgId,
+          projectId,
+          deptId: selectRef.value.deptInfo.deptId,
+          deptName: selectRef.value.deptInfo.deptName,
+        });
       });
     };
   };
@@ -320,13 +322,15 @@
     roleFormData.value = {};
     opMap.fuc = (params) => {
       delete params.roleId;
-      return http.post(department.addRole, {
-        ...params,
-        orgId,
-        projectId,
-        proleId: selectRoleRef.value.roleId,
-        deptId: selectRef.value.deptInfo.deptId,
-        deptName: selectRef.value.deptInfo.deptName,
+      return formRoleRef.value.triggerSubmit().then(() => {
+        return http.post(department.addRole, {
+          ...params,
+          orgId,
+          projectId,
+          proleId: selectRoleRef.value.roleId,
+          deptId: selectRef.value.deptInfo.deptId,
+          deptName: selectRef.value.deptInfo.deptName,
+        });
       });
     };
   };
@@ -542,10 +546,14 @@
 
   const CancelApartment = () => {
     disabled.value = true;
+    // 清楚校验错误信息
+    formRef.value.formElRef.clearValidate();
   };
 
   const CancelUser = () => {
     roleDisabled.value = true;
+    // 清楚校验错误信息
+    formRoleRef.value.formElRef.clearValidate();
   };
 
   // 部门确定
@@ -571,7 +579,6 @@
 
   // 角色确定
   const UserSure = () => {
-    roleDisabled.value = !roleDisabled.value;
     const typeArr = ['addUserSon', 'addUser', 'editRole'];
     if (roleActiveKey.value === 1) {
       if (typeArr.includes(opMap.type)) {
@@ -579,6 +586,7 @@
           opMap.fuc(roleFormData.value).then(() => {
             getUserTree();
             clearRoleData();
+            roleDisabled.value = !roleDisabled.value;
           });
       }
     } else {
diff --git a/hx-op/src/view/organizationManage/enterpriseManage/config.ts b/hx-op/src/view/organizationManage/enterpriseManage/config.ts
index 728b32a..cbd3de7 100644
--- a/hx-op/src/view/organizationManage/enterpriseManage/config.ts
+++ b/hx-op/src/view/organizationManage/enterpriseManage/config.ts
@@ -47,6 +47,7 @@ export const formConfig = [
       placeholder: '请输入集团名称',
       maxLength: 20,
     },
+    rules: [{ required: true }],
   },
   {
     field: 'cityName',