feat(front): 添加组织管理的CRUD及添加用户时的所属组织

@@ -9,7 +9,6 @@ import {ErrorMessageMode} from "/#/axios";
 enum Api {
   DeptList = '/dept/all',
   basicUrl = '/dept',
-  // CONFIG_ITEM_URL = '/dictItem'
 }
 
 export const getDeptList = (params?: DeptListItem) =>
@@ -19,11 +18,7 @@ export const getDeptList = (params?: DeptListItem) =>
  * @description: save or edit dept api
  */
 export function saveOrEditDeptApi(params: DeptOperationParams, update: boolean = false, mode: ErrorMessageMode = 'modal') {
-  // console.log(params);
   if (!update) {
-    // console.log("-------------后台的参数-------------------");
-    // console.log(params);
-
     return defHttp.post<DeptOperationApiResult>(
       {
         url: Api.basicUrl,

@@ -2,13 +2,13 @@ import {defHttp} from "/@/utils/http/axios";
 import {GroupListResultModel} from "/@/api/system/model/groupModel";
 
 enum GroupApi {
-  BASE_URL="/group"
+  BASE_URL="/organization"
 }
 
 /**
- * 查询当前用户的所辖分组
+ * 查询当前用户的所属组织
  */
 export const findCurrentUserGroups=()=>
   defHttp.get<GroupListResultModel>({
-    url: GroupApi.BASE_URL+"/me/groups",
+    url: GroupApi.BASE_URL+"/me/organizations",
   });

@@ -36,12 +36,11 @@ export interface AccountListItem {
   accountExpireTime?:string;
 }
 
-export interface DeptListItem {
+export interface OrganizationListItem {
   id: string;
-  orderNo: string;
-  createTime: string;
+  name: string;
+  parentId?: string;
   remark: string;
-  status: number;
 }
 
 export interface MenuListItem {
@@ -75,13 +74,13 @@ export interface ChangeAccountParams {
   resetPassword?:string;
 }
 
-export class RoleOrGroupParam{
+export class RoleOrOrganizationParam {
   userId:string;
   queryRole:boolean;
-  queryGroup:boolean;
-  constructor(userId:string,queryRole:boolean,queryGroup:boolean){
+  queryOrganization:boolean;
+  constructor(userId:string,queryRole:boolean,queryOrganization:boolean){
     this.queryRole = queryRole;
-    this.queryGroup = queryGroup;
+    this.queryOrganization = queryOrganization;
     this.userId = userId;
   }
 }
@@ -91,7 +90,7 @@ export class RoleOrGroupParam{
  */
 export type AccountListGetResultModel = BasicFetchResult<AccountListItem>;
 
-export type DeptListGetResultModel = BasicFetchResult<DeptListItem>;
+export type OrganizationListGetResultModel = BasicFetchResult<OrganizationListItem>;
 
 export type MenuListGetResultModel = BasicFetchResult<MenuListItem>;
 

 import {
   AccountParams,
-  DeptListItem,
+  OrganizationListItem,
   MenuParams,
   RoleParams,
   RolePageParams,
   MenuListGetResultModel,
-  DeptListGetResultModel,
+  OrganizationListGetResultModel,
   AccountListGetResultModel,
   RolePageListGetResultModel,
   RoleListGetResultModel,
   RoleReqDTO,
   AccountListItem,
   AccountListModel,
-  RoleOrGroupParam,
+  RoleOrOrganizationParam,
   ChangeAccountParams,
 } from './model/systemModel';
 import {defHttp} from '/@/utils/http/axios';
@@ -27,7 +27,8 @@ enum Api {
   SaveOrUpdateRoleInfoWithMenu = '/role/saveOrUpdateRoleInfoWithMenu',
   DeleteRole = '/role',
   GetAllRoleList = '/role/find/list',
-  BaseUserUrl = '/user'
+  BaseUserUrl = '/user',
+  BaseOrganization = '/organization'
 }
 
 export const getAccountInfo=(userId:string)=>
@@ -36,8 +37,34 @@ export const getAccountInfo=(userId:string)=>
 export const getAccountList = (params: AccountParams) =>
   defHttp.get<AccountListGetResultModel>({url: Api.AccountList, params});
 
-export const getDeptList = (params?: DeptListItem) =>
-  defHttp.get<DeptListGetResultModel>({url: Api.DeptList, params});
+/**
+ * 获取组织列表
+ * @param params 请求参数
+ */
+export const getOrganizationList = (params?: OrganizationListItem) =>
+  defHttp.get<OrganizationListGetResultModel>({url: Api.BaseOrganization+'/me/organizations', params});
+
+/**
+ * 更新或者保存组织
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdateOrganization = (params?:OrganizationListItem,isUpdate?:boolean) =>
+{
+  if(isUpdate){
+    return defHttp.put<OrganizationListGetResultModel>({url: Api.BaseOrganization, params});
+  }else{
+    return defHttp.post<OrganizationListGetResultModel>({url: Api.BaseOrganization, params});
+  }
+};
+
+/**
+ * 删除组织
+ * @param ids 删除的ID
+ */
+export const delOrganization = (ids: string[]) =>
+  defHttp.delete({url: Api.BaseOrganization, data: ids})
+
 
 export const getMenuList = (params?: MenuParams) =>
   defHttp.get<MenuListGetResultModel>({url: Api.MenuList, params});
@@ -98,7 +125,7 @@ export const deleteUser = (ids: string[]) =>
  * 查询当前用户的关系
  * @param params
  */
-export const findCurrentUserRelation=(params:RoleOrGroupParam)=>
+export const findCurrentUserRelation=(params:RoleOrOrganizationParam)=>
   defHttp.post<Array<string>>({
     url: Api.BaseUserUrl+"/relation",
     params:params

 export default {
+  common:{
+    createTime:"create time",
+    updateTime:"update time",
+    operation:"operation",
+    remark:"remark",
+    enable:"enable",
+    disable:"disable",
+    sort:"sort",
+    status:"status",
+  },
    tenant:{
        tenant:"tenant",
        tenantManagement:"tenant management",
        tenantSetting:"tenant setting"
    },
+  organization:{
+    queryOrganizationName:"organization name",
+    toolOrganizationList:"organization list",
+    toolCreateOrganization:"create organization",
+    toolEditOrganization:"edit organization",
+    parentOrganization:"parent organization",
+  },
   dept:{
     queryDeptName:"dept name",
     queryDeptStatus:"status",

 export default {
+    common:{
+      createTime:"创建时间",
+      updateTime:"更新时间",
+      operation:"操作",
+      remark:"备注",
+      enable:"启用",
+      disable:"禁用",
+      sort:"排序",
+      status:"状态"
+    },
    tenant:{
        tenant:"租户",
        tenantManagement:"租户管理",
        tenantSetting:"租户设置"
    },
+  organization:{
+    queryOrganizationName:"组织名称",
+    toolOrganizationList:"组织列表",
+    toolCreateOrganization:"新增组织",
+    toolEditOrganization:"编辑组织",
+    parentOrganization:"上级组织",
+  },
   dept:{
     queryDeptName:"部门名称",
     queryDeptStatus:"状态",

@@ -2,15 +2,15 @@
   <BasicModal width="650px" v-bind="$attrs" @register="registerModal" :title="getTitle"
               @ok="handleSubmit">
     <BasicForm @register="registerForm">
-      <template #groupId="{ model, field }">
+      <template #organizationId="{ model, field }">
         <BasicTree
           v-model:value="model[field]"
-          :treeData="groupTreeData"
+          :treeData="organizationTreeData"
           :replaceFields="{ title: 'name' }"
           :checked-keys="checkGroup"
           checkable
           toolbar
-          title="所辖分组"
+          title="所属组织"
         />
       </template>
     </BasicForm>
@@ -21,10 +21,10 @@ import {defineComponent, ref, computed, unref} from 'vue';
 import {BasicModal, useModalInner} from '/@/components/Modal';
 import {BasicForm, useForm} from '/@/components/Form/index';
 import {accountFormSchema} from './account.data';
-import {findCurrentUserRelation, getDeptList, SaveOrUpdateUserInfo} from '/@/api/system/system';
+import {findCurrentUserRelation, getOrganizationList, SaveOrUpdateUserInfo} from '/@/api/system/system';
 import {BasicTree, TreeItem} from "/@/components/Tree";
 import {findCurrentUserGroups} from "/@/api/system/group";
-import {RoleOrGroupParam} from "/@/api/system/model/systemModel";
+import {RoleOrOrganizationParam} from "/@/api/system/model/systemModel";
 import {useMessage} from "/@/hooks/web/useMessage";
 export default defineComponent({
   name: 'AccountModal',
@@ -33,7 +33,7 @@ export default defineComponent({
   setup(_, {emit}) {
     const isUpdate = ref(true);
     const rowId = ref('');
-    const groupTreeData = ref<TreeItem[]>([]);
+    const organizationTreeData = ref<TreeItem[]>([]);
     const checkGroup = ref<string[]>([]);
     const [registerForm, {setFieldsValue, updateSchema, resetFields, validate}] = useForm({
       labelWidth: 100,
@@ -49,7 +49,7 @@ export default defineComponent({
       setModalProps({confirmLoading: false});
       isUpdate.value = !!data?.isUpdate;
       const groupListModel = await findCurrentUserGroups();
-      if (unref(groupTreeData).length === 0) {
+      if (unref(organizationTreeData).length === 0) {
         let treeValues = new Array<TreeItem>();
         groupListModel.map((item) => {
           const groupData = {
@@ -60,12 +60,12 @@ export default defineComponent({
           }
           treeValues.push(groupData);
         })
-        groupTreeData.value = treeValues;
+        organizationTreeData.value = treeValues;
       }
 
       if (unref(isUpdate)) {
         rowId.value = data.record.id;
-        const roleParams = new RoleOrGroupParam(rowId.value,true,false);
+        const roleParams = new RoleOrOrganizationParam(rowId.value,true,false);
         findCurrentUserRelation(roleParams).then((result)=>{
           Reflect.set(data.record,"roleIds",result);
           Reflect.set(data.record,"password","******");
@@ -73,10 +73,10 @@ export default defineComponent({
             ...data.record,
           });
         })
-        const groupParams = new RoleOrGroupParam(rowId.value,false,true);
-        checkGroup.value = await findCurrentUserRelation(groupParams);
+        const organizationParams = new RoleOrOrganizationParam(rowId.value,false,true);
+        checkGroup.value = await findCurrentUserRelation(organizationParams);
       }
-      const deptData = await getDeptList();
+      const deptData = await getOrganizationList();
       await updateSchema([
         {
           field: 'username',
@@ -110,7 +110,7 @@ export default defineComponent({
       }
     }
 
-    return {registerModal, registerForm, getTitle, handleSubmit, groupTreeData,checkGroup};
+    return {registerModal, registerForm, getTitle, handleSubmit, organizationTreeData,checkGroup};
   },
 });
 </script>

 <template>
   <div class="bg-white m-4 mr-0 overflow-hidden">
     <BasicTree
-      title="部门列表"
+      title="组织列表"
       toolbar
       search
       :clickRowToExpand="false"
@@ -15,10 +15,10 @@
   import { defineComponent, onMounted, ref } from 'vue';
 
   import { BasicTree, TreeItem } from '/@/components/Tree';
-  import { getDeptList } from '/@/api/system/system';
+  import { getOrganizationList } from '/@/api/system/system';
 
   export default defineComponent({
-    name: 'DeptTree',
+    name: 'OrganizationIdTree',
     components: { BasicTree },
 
     emits: ['select'],
@@ -26,7 +26,7 @@
       const treeData = ref<TreeItem[]>([]);
 
       async function fetch() {
-        treeData.value = (await getDeptList()) as unknown as TreeItem[];
+        treeData.value = (await getOrganizationList()) as unknown as TreeItem[];
       }
 
       function handleSelect(keys) {

@@ -168,22 +168,9 @@ export const accountFormSchema: FormSchema[] = [
     },
   },
   {
-    field: 'deptId',
-    label: '所属部门',
-    component: 'TreeSelect',
-    componentProps: {
-      replaceFields: {
-        title: 'deptName',
-        key: 'id',
-        value: 'id',
-      },
-    },
-    required: true,
-  },
-  {
-    field: 'groupIds',
+    field: 'organizationIds',
     label: ' ',
     component: 'Input',
-    slot:'groupId',
+    slot:'organizationId',
   },
 ];

@@ -56,7 +56,7 @@
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import {deleteUser, getAccountList} from '/@/api/system/system';
   import { PageWrapper } from '/@/components/Page';
-  import DeptTree from './DeptTree.vue';
+  import DeptTree from './OrganizationIdTree.vue';
   import {Tag} from "ant-design-vue";
   import { useModal } from '/@/components/Modal';
   import AccountModal from './AccountModal.vue';

@@ -4,7 +4,7 @@
     @register="registerDrawer"
     showFooter
     :title="getTitle"
-    width="50%"
+    width="30%"
     @ok="handleSubmit"
   >
     <BasicForm @register="registerForm"/>
@@ -12,62 +12,52 @@
 </template>
 <script lang="ts">
 import {defineComponent, ref, computed, unref} from 'vue';
-import {BasicForm, useForm} from '/@/components/Form/index';
-import {formSchema} from './dept.data';
+import {BasicForm, useForm} from '/@/components/Form';
+import {formSchema} from './organization.data';
 import {BasicDrawer, useDrawerInner} from '/@/components/Drawer';
-
-// 加载部门
-import { getDeptList } from '/@/api/system/dept';
 import {useI18n} from "/@/hooks/web/useI18n";
-import {saveOrEditDeptApi} from "/@/api/system/dept";
-
-
+import {getOrganizationList, saveOrUpdateOrganization} from "/@/api/system/system";
 export default defineComponent({
-  name: 'DeptDrawer',
+  name: 'OrganizationDrawer',
   components: {BasicDrawer, BasicForm},
   emits: ['success', 'register'],
   setup(_, {emit}) {
     const isUpdate = ref(true);
-    let deptId,tenantCode,creator,createTime;
+    let organizationId;
 
     const [registerForm, {resetFields, setFieldsValue, updateSchema, validate}] = useForm({
       labelWidth: 100,
       schemas: formSchema,
-      showActionButtonGroup: false,
-      baseColProps: {lg: 12, md: 24},
+      showActionButtonGroup: false
     });
     const {t} = useI18n(); //加载国际化
 
     //默认传递页面数据
     const [registerDrawer, {setDrawerProps, closeDrawer}] = useDrawerInner(async (data) => {
-      resetFields();
+      await resetFields();
       setDrawerProps({confirmLoading: false});
       isUpdate.value = !!data?.isUpdate;
 
       //如果是编辑操作，设置页面数据
       if (unref(isUpdate)) {
         //为表单赋值
-        setFieldsValue({
+        await setFieldsValue({
           ...data.record,
         });
 
       }
       if (isUpdate.value) {
-        tenantCode= Reflect.get(data.record, 'tenantCode');
-        creator= Reflect.get(data.record, 'creator');
-        createTime= Reflect.get(data.record, 'createTime');
-        deptId = Reflect.get(data.record, 'id');
+        organizationId = Reflect.get(data.record, 'id');
       }
-      //加载部门
-      let treeData = await getDeptList();
-      updateSchema({
+      let treeData = await getOrganizationList();
+      await updateSchema({
         field: 'parentId',
         componentProps: {treeData},
       });
     });
 
     //得到页面标题
-    const getTitle = computed(() => (!unref(isUpdate) ? t('routes.common.dept.toolCreateDept') : t('routes.common.dept.toolEditDept')));
+    const getTitle = computed(() => (!unref(isUpdate) ? t('routes.common.organization.toolCreateOrganization') : t('routes.common.organization.toolEditOrganization')));
 
     //提交按钮
     async function handleSubmit() {
@@ -76,19 +66,9 @@ export default defineComponent({
         setDrawerProps({confirmLoading: true});
 
         if (isUpdate.value) {
-          Reflect.set(values, 'id', deptId);
-          Reflect.set(values, 'tenantCode', tenantCode);
-          Reflect.set(values, 'creator', creator);
-          Reflect.set(values, 'createTime', createTime);
+          Reflect.set(values, 'id', organizationId);
         }
-
-        // TODO custom api
-        // console.log("-------------提交后台的参数-------------------");
-        // console.log(values);
-        const data = await saveOrEditDeptApi(values, isUpdate.value);
-        console.log("_______保存返回结果____data:",data);
-
-
+        await saveOrUpdateOrganization(values, isUpdate.value);
         closeDrawer();//关闭侧框
         emit('success');
       } finally {

@@ -3,18 +3,19 @@
     <BasicTable @register="registerTable" @fetch-success="onFetchSuccess">
       <template #toolbar>
         <a-button type="primary" @click="handleCreate">
-          <!--          新增部门-->
-          {{ getI18nCreateDept }}
+          {{ getI18n }}
         </a-button>
       </template>
       <template #action="{ record }">
         <TableAction
           :actions="[
             {
+              label:'编辑',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
             },
             {
+              label:'删除',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               popConfirm: {
@@ -33,16 +34,14 @@
   import {computed, defineComponent, nextTick} from 'vue';
 
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { getDeptList } from '/@/api/system/dept';
 
   // 加载自定义侧边弹出框 组件
   import {useDrawer} from '/@/components/Drawer';
-  import DeptDrawer from './DeptDrawer.vue';
-
-  import { columns, searchFormSchema } from './dept.data';
-  import {delDept} from "/@/api/system/dept";
+  import DeptDrawer from './OrganizationDrawer.vue';
+  import { columns } from './organization.data';
   import {useI18n} from "/@/hooks/web/useI18n";
-  import {notification} from "ant-design-vue";
+  import {delOrganization, getOrganizationList} from "/@/api/system/system";
+  import {useMessage} from "/@/hooks/web/useMessage";
 
   export default defineComponent({
     name: 'DeptManagement',
@@ -50,28 +49,23 @@
     setup() {
       const [registerModal, { openDrawer }] = useDrawer();
       const {t} = useI18n(); //加载国际化
-      // 新增部门
-      const getI18nCreateDept = computed(() => t('routes.common.dept.toolCreateDept'));
-
+      const getI18n = computed(() => t('routes.common.organization.toolCreateOrganization'));
+      const {createMessage} = useMessage();
       const [registerTable, { reload,expandAll }] = useTable({
-        title: t('routes.common.dept.toolDeptList'),
-        api: getDeptList,
+        title: t('routes.common.organization.toolOrganizationList'),
+        api: getOrganizationList,
         columns,
-        formConfig: {
-          labelWidth: 120,
-          schemas: searchFormSchema,
-        },
         isTreeTable: true,
         pagination: false,
         striped: false,
-        useSearchForm: true,
+        useSearchForm: false,
         showTableSetting: true,
         bordered: true,
         showIndexColumn: false,
         canResize: false,
         actionColumn: {
           width: 80,
-          title: t('routes.common.dept.tableTitleDeptOperation'),//操作
+          title: t('routes.common.common.operation'),//操作
           dataIndex: 'action',
           slots: { customRender: 'action' },
           fixed: undefined,
@@ -102,13 +96,10 @@
         // console.log(record);
         try {
           let ids = [record.id,];
-          await delDept(ids);
-          notification.success({
-            message: "成功",
-            description: "删除部门成功",
-            duration: 3,
+          await delOrganization(ids).then(()=>{
+            createMessage.success("删除组织成功");
+            handleSuccess();
           });
-          await reload();
         } catch (e) {
           return Promise.reject(e);
         }
@@ -126,7 +117,7 @@
       return {
         registerTable,
         registerModal,
-        getI18nCreateDept,
+        getI18n,
         getDeleteTitle,
         handleCreate,
         handleEdit,

 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
-import { h } from 'vue';
-import { Tag } from 'ant-design-vue';
 import {useI18n} from "/@/hooks/web/useI18n";
 const { t } = useI18n();
 
 export const columns: BasicColumn[] = [
   {
-    title: t('routes.common.dept.queryDeptName'),//部门名称
-    dataIndex: 'deptName',
+    title: t('routes.common.organization.queryOrganizationName'),
+    dataIndex: 'name',
     width: 160,
     align: 'left',
   },
   {
-    title: t('routes.common.dept.tableTitleDeptSort'),//排序
-    dataIndex: 'orderNo',
+    title: t('routes.common.common.sort'),//排序
+    dataIndex: 'sort',
     width: 50,
   },
   {
-    title: t('routes.common.dept.queryDeptStatus'),//状态
-    dataIndex: 'status',
-    width: 80,
-    customRender: ({ record }) => {
-      const status = record.status;
-      const enable = ~~status === 0;
-      const color = enable ? 'green' : 'red';
-      const text = enable ? t('routes.common.dept.drawerTitleDeptEnable') : t('routes.common.dept.drawerTitleDeptDisable');
-      // const text = enable ? '启用' : '停用';
-      return h(Tag, { color: color }, () => text);
-    },
-  },
-  {
-    title: t('routes.common.dept.tableTitleDeptCreateTime'),//创建时间
+    title: t('routes.common.common.createTime'),//创建时间
     dataIndex: 'createTime',
     width: 180,
   },
   {
-    title: t('routes.common.dept.tableTitleMemo'),//备注
+    title: t('routes.common.common.remark'),//备注
     dataIndex: 'remark',
+    width: 300,
   },
 ];
-
-export const searchFormSchema: FormSchema[] = [
-  {
-    field: 'deptName',
-    label: t('routes.common.dept.queryDeptName'),//部门名称
-    component: 'Input',
-    colProps: { span: 8 },
-  },
-  {
-    field: 'status',
-    label: t('routes.common.dept.queryDeptStatus'),//状态
-    component: 'Select',
-    componentProps: {
-      options: [
-        { label: t('routes.common.dept.drawerTitleDeptEnable'), value: 0 },
-        // { label: '启用', value: 0 },
-        { label: t('routes.common.dept.drawerTitleDeptDisable'), value: 1 },
-        // { label: '停用', value: 1 },
-      ],
-    },
-    colProps: { span: 8 },
-  },
-];
-
 export const formSchema: FormSchema[] = [
   {
-    field: 'deptName',
-    label: t('routes.common.dept.queryDeptName'),//部门名称
-    component: 'Input',
-    required: true,
-  },
-  {
     field: 'parentId',
-    label: t('routes.common.dept.drawerTitleDeptParentDept'),//上级部门
+    label: t('routes.common.organization.parentOrganization'),
     component: 'TreeSelect',
     componentProps: {
       replaceFields: {
-        title: 'deptName',
+        title: 'name',
         key: 'id',
         value: 'id',
       },
@@ -86,28 +42,19 @@ export const formSchema: FormSchema[] = [
     // required: true,
   },
   {
-    field: 'orderNo',
-    label: t('routes.common.dept.tableTitleDeptSort'),//排序
-    component: 'InputNumber',
+    field: 'name',
+    label: t('routes.common.organization.queryOrganizationName'),
+    component: 'Input',
     required: true,
   },
   {
-    field: 'status',
-    label: t('routes.common.dept.queryDeptStatus'),//状态
-    component: 'RadioButtonGroup',
-    defaultValue: 0,
-    componentProps: {
-      options: [
-        { label: t('routes.common.dept.drawerTitleDeptEnable'), value: 0 },
-        // { label: '启用', value: 0 },
-        { label: t('routes.common.dept.drawerTitleDeptDisable'), value: 1 },
-        // { label: '停用', value: 1 },
-      ],
-    },
+    field: 'sort',
+    label: t('routes.common.common.sort'),//排序
+    component: 'InputNumber',
     required: true,
   },
   {
-    label: t('routes.common.dept.tableTitleMemo'),//备注
+    label: t('routes.common.common.remark'),//备注
     field: 'remark',
     component: 'InputTextArea',
   },