Merge branch 'main' of http://123.60.103.97:3000/xuziqiang/SaaS-lib

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 {

hx-op/src/view/organizationManage/enterpriseManage/config.ts

@@ -47,6 +47,7 @@ export const formConfig = [
       placeholder: '请输入集团名称',
       maxLength: 20,
     },
+    rules: [{ required: true }],
   },
   {
     field: 'cityName',