Merge branch 'fix/DEFECT-1980' into 'main_dev'

fix: 账号管理创建账号时添加新增组织按钮

See merge request yunteng/thingskit-front!1286

@@ -9,6 +9,9 @@
     <div style="height: 50vh">
     <div style="height: 50vh">
       <BasicForm @register="registerForm">
       <BasicForm @register="registerForm">
         <template #organizationId="{ model, field }">
         <template #organizationId="{ model, field }">
+          <Button type="link" @click="handleOpenCreate" style="padding: 0; z-index: 9999"
+            >新增组织
+          </Button>
           <BasicTree
           <BasicTree
             v-if="organizationTreeData.length"
             v-if="organizationTreeData.length"
             v-model:value="model[field]"
             v-model:value="model[field]"
@@ -44,6 +47,8 @@
           </a-select>
           </a-select>
         </template>
         </template>
       </BasicForm>
       </BasicForm>
+
+      <OrganizationDrawer @register="registerDrawer" @success="handleReload" />
     </div>
     </div>
   </BasicModal>
   </BasicModal>
   <RoleDrawer @register="registerRoleDrawer" @success="handleSuccess" />
   <RoleDrawer @register="registerRoleDrawer" @success="handleSuccess" />
@@ -53,6 +58,7 @@
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { accountFormSchema } from './account.data';
   import { accountFormSchema } from './account.data';
+  import { Button } from 'ant-design-vue';
   import {
   import {
     findCurrentUserRelation,
     findCurrentUserRelation,
     SaveOrUpdateUserInfo,
     SaveOrUpdateUserInfo,
@@ -67,13 +73,16 @@
   import { PlusOutlined } from '@ant-design/icons-vue';
   import { PlusOutlined } from '@ant-design/icons-vue';
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
   import RoleDrawer from '../role/RoleDrawer.vue';
   import RoleDrawer from '../role/RoleDrawer.vue';
+  import OrganizationDrawer from '/@/views/system/organization/OrganizationDrawer.vue';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'AccountModal',
     name: 'AccountModal',
     components: {
     components: {
       BasicModal,
       BasicModal,
       BasicForm,
       BasicForm,
+      Button,
       BasicTree,
       BasicTree,
+      OrganizationDrawer,
       PlusOutlined,
       PlusOutlined,
       RoleDrawer,
       RoleDrawer,
       VNodes: (_, { attrs }) => {
       VNodes: (_, { attrs }) => {
@@ -273,6 +282,17 @@
         ];
         ];
       };
       };
 
 
+      const [registerDrawer, { openDrawer: addOpenDrawer }] = useDrawer();
+
+      const handleOpenCreate = () => {
+        addOpenDrawer(true, { isUpdate: false });
+      };
+      const handleReload = async () => {
+        const groupListModel = await findCurrentUserGroups();
+        copyTransTreeFun(groupListModel);
+        organizationTreeData.value = groupListModel;
+      };
+
       return {
       return {
         registerModal,
         registerModal,
         registerForm,
         registerForm,
@@ -291,6 +311,9 @@
         handleCheckClick,
         handleCheckClick,
         handleUnSelectAll,
         handleUnSelectAll,
         handleStrictlyStatus,
         handleStrictlyStatus,
+        handleOpenCreate,
+        registerDrawer,
+        handleReload,
       };
       };
     },
     },
   });
   });
@@ -298,6 +321,8 @@
 <style scoped lang="less">
 <style scoped lang="less">
   :deep(.vben-basic-tree) {
   :deep(.vben-basic-tree) {
     width: 100% !important;
     width: 100% !important;
+    margin-top: -28px !important;
+    padding: 0;
   }
   }
 
 
   :deep(.is-unflod) {
   :deep(.is-unflod) {