'解决main分支合并的冲突'

@@ -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';
@@ -28,6 +28,7 @@ enum Api {
   DeleteRole = '/role',
   GetAllRoleList = '/role/find/list',
   BaseUserUrl = '/user',
+  BaseOrganization = '/organization',
 }
 
 export const getAccountInfo = (userId: string) =>
@@ -35,9 +36,35 @@ export const getAccountInfo = (userId: string) =>
 
 export const getAccountList = (params: AccountParams) =>
   defHttp.get<AccountListGetResultModel>({ url: Api.AccountList, params });
+/**
+ * 获取组织列表
+ * @param params 请求参数
+ */
+export const getOrganizationList = (params?: OrganizationListItem) =>
+  defHttp.get<OrganizationListGetResultModel>({
+    url: Api.BaseOrganization + '/me/organizations',
+    params,
+  });
 
-export const getDeptList = (params?: DeptListItem) =>
-  defHttp.get<DeptListGetResultModel>({ url: Api.DeptList, 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,8 @@ 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: '状态',

 <template>
   <div class="bg-white m-4 mr-0 overflow-hidden">
     <BasicTree
-      title="部门列表"
+      title="组织列表"
       toolbar
       search
       :clickRowToExpand="false"
       :treeData="treeData"
-      :replaceFields="{ key: 'id', title: 'deptName' }"
+      :replaceFields="{ key: 'id', title: 'name' }"
       @select="handleSelect"
     />
   </div>
@@ -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) {

@@ -7,15 +7,15 @@
     @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>
@@ -26,10 +26,14 @@
   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',
@@ -38,7 +42,7 @@
     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,
@@ -54,7 +58,7 @@
         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 = {
@@ -65,12 +69,12 @@
             };
             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', '******');
@@ -78,10 +82,10 @@
               ...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',
@@ -115,8 +119,14 @@
           setModalProps({ confirmLoading: false });
         }
       }
-
-      return { registerModal, registerForm, getTitle, handleSubmit, groupTreeData, checkGroup };
+      return {
+        registerModal,
+        registerForm,
+        getTitle,
+        handleSubmit,
+        organizationTreeData,
+        checkGroup,
+      };
     },
   });
 </script>

@@ -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',
   },
 ];

 <template>
   <PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
-    <DeptTree class="w-1/4 xl:w-1/5" @select="handleSelect" />
+    <OrganizationIdTree class="w-1/4 xl:w-1/5" @select="handleSelect" />
     <BasicTable @register="registerTable" class="w-3/4 xl:w-4/5" :searchInfo="searchInfo">
       <template #toolbar>
         <a-button type="primary" @click="handleCreate">新增账号</a-button>
@@ -66,7 +66,8 @@
   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 OrganizationIdTree from '../../common/OrganizationIdTree.vue';
   import { Tag } from 'ant-design-vue';
   import { useModal } from '/@/components/Modal';
   import AccountModal from './AccountModal.vue';
@@ -77,7 +78,8 @@
 
   export default defineComponent({
     name: 'AccountManagement',
-    components: { BasicTable, PageWrapper, DeptTree, AccountModal, TableAction, Tag },
+
+    components: { BasicTable, PageWrapper, OrganizationIdTree, AccountModal, TableAction, Tag },
     setup() {
       const go = useGo();
       const [registerModal, { openModal }] = useModal();

@@ -4,13 +4,14 @@
     @register="registerDrawer"
     showFooter
     :title="getTitle"
-    width="50%"
+    width="30%"
     @ok="handleSubmit"
   >
     <BasicForm @register="registerForm" />
   </BasicDrawer>
 </template>
 <script lang="ts">
+<<<<<<< HEAD:src/views/system/dept/DeptDrawer.vue
   import { defineComponent, ref, computed, unref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { formSchema } from './dept.data';
@@ -63,6 +64,55 @@
           componentProps: { treeData },
         });
       });
+=======
+import {defineComponent, ref, computed, unref} from 'vue';
+import {BasicForm, useForm} from '/@/components/Form';
+import {formSchema} from './organization.data';
+import {BasicDrawer, useDrawerInner} from '/@/components/Drawer';
+import {useI18n} from "/@/hooks/web/useI18n";
+import {getOrganizationList, saveOrUpdateOrganization} from "/@/api/system/system";
+export default defineComponent({
+  name: 'OrganizationDrawer',
+  components: {BasicDrawer, BasicForm},
+  emits: ['success', 'register'],
+  setup(_, {emit}) {
+    const isUpdate = ref(true);
+    let organizationId;
+
+    const [registerForm, {resetFields, setFieldsValue, updateSchema, validate}] = useForm({
+      labelWidth: 100,
+      schemas: formSchema,
+      showActionButtonGroup: false
+    });
+    const {t} = useI18n(); //加载国际化
+
+    //默认传递页面数据
+    const [registerDrawer, {setDrawerProps, closeDrawer}] = useDrawerInner(async (data) => {
+      await resetFields();
+      setDrawerProps({confirmLoading: false});
+      isUpdate.value = !!data?.isUpdate;
+
+      //如果是编辑操作，设置页面数据
+      if (unref(isUpdate)) {
+        //为表单赋值
+        await setFieldsValue({
+          ...data.record,
+        });
+
+      }
+      if (isUpdate.value) {
+        organizationId = Reflect.get(data.record, 'id');
+      }
+      let treeData = await getOrganizationList();
+      await updateSchema({
+        field: 'parentId',
+        componentProps: {treeData},
+      });
+    });
+
+    //得到页面标题
+    const getTitle = computed(() => (!unref(isUpdate) ? t('routes.common.organization.toolCreateOrganization') : t('routes.common.organization.toolEditOrganization')));
+>>>>>>> main:src/views/system/organization/OrganizationDrawer.vue
 
       //得到页面标题
       const getTitle = computed(() =>
@@ -71,6 +121,7 @@
           : t('routes.common.dept.toolEditDept')
       );
 
+<<<<<<< HEAD:src/views/system/dept/DeptDrawer.vue
       //提交按钮
       async function handleSubmit() {
         try {
@@ -95,6 +146,16 @@
         } finally {
           setDrawerProps({ confirmLoading: false });
         }
+=======
+        if (isUpdate.value) {
+          Reflect.set(values, 'id', organizationId);
+        }
+        await saveOrUpdateOrganization(values, isUpdate.value);
+        closeDrawer();//关闭侧框
+        emit('success');
+      } finally {
+        setDrawerProps({confirmLoading: false});
+>>>>>>> main:src/views/system/organization/OrganizationDrawer.vue
       }
 
       return { registerDrawer, registerForm, getTitle, handleSubmit };

@@ -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,9 +34,9 @@
   import { computed, defineComponent, nextTick } from 'vue';
 
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { getDeptList } from '/@/api/system/dept';
 
   // 加载自定义侧边弹出框 组件
+<<<<<<< HEAD:src/views/system/dept/index.vue
   import { useDrawer } from '/@/components/Drawer';
   import DeptDrawer from './DeptDrawer.vue';
 
@@ -43,12 +44,21 @@
   import { delDept } from '/@/api/system/dept';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { notification } from 'ant-design-vue';
+=======
+  import {useDrawer} from '/@/components/Drawer';
+  import DeptDrawer from './OrganizationDrawer.vue';
+  import { columns } from './organization.data';
+  import {useI18n} from "/@/hooks/web/useI18n";
+  import {delOrganization, getOrganizationList} from "/@/api/system/system";
+  import {useMessage} from "/@/hooks/web/useMessage";
+>>>>>>> main:src/views/system/organization/index.vue
 
   export default defineComponent({
     name: 'DeptManagement',
     components: { BasicTable, DeptDrawer, TableAction },
     setup() {
       const [registerModal, { openDrawer }] = useDrawer();
+<<<<<<< HEAD:src/views/system/dept/index.vue
       const { t } = useI18n(); //加载国际化
       // 新增部门
       const getI18nCreateDept = computed(() => t('routes.common.dept.toolCreateDept'));
@@ -56,22 +66,30 @@
       const [registerTable, { reload, expandAll }] = useTable({
         title: t('routes.common.dept.toolDeptList'),
         api: getDeptList,
+=======
+      const {t} = useI18n(); //加载国际化
+      const getI18n = computed(() => t('routes.common.organization.toolCreateOrganization'));
+      const {createMessage} = useMessage();
+      const [registerTable, { reload,expandAll }] = useTable({
+        title: t('routes.common.organization.toolOrganizationList'),
+        api: getOrganizationList,
+>>>>>>> main:src/views/system/organization/index.vue
         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,
+<<<<<<< HEAD:src/views/system/dept/index.vue
           title: t('routes.common.dept.tableTitleDeptOperation'), //操作
+=======
+          title: t('routes.common.common.operation'),//操作
+>>>>>>> main:src/views/system/organization/index.vue
           dataIndex: 'action',
           slots: { customRender: 'action' },
           fixed: undefined,
@@ -101,14 +119,20 @@
       async function handleDelete(record: Recordable) {
         // console.log(record);
         try {
+<<<<<<< HEAD:src/views/system/dept/index.vue
           let ids = [record.id];
           await delDept(ids);
           notification.success({
             message: '成功',
             description: '删除部门成功',
             duration: 3,
+=======
+          let ids = [record.id,];
+          await delOrganization(ids).then(()=>{
+            createMessage.success("删除组织成功");
+            handleSuccess();
+>>>>>>> main:src/views/system/organization/index.vue
           });
-          await reload();
         } catch (e) {
           return Promise.reject(e);
         }
@@ -126,7 +150,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',
   },