Kaynağa Gözat

feat(api): remove dept prototype are no required

gemercheung 3 yıl önce
ebeveyn
işleme
806b81b08d

+ 6 - 3
src/api/system/system.ts

@@ -17,15 +17,18 @@ import { defHttp } from '/@/utils/http/axios';
 // sys/menu/queryAll
 // sys/menu/update
 enum Api {
-  AccountList = '/basic-api/system/getAccountList',
-  IsAccountExist = '/basic-api/system/accountExist',
-  setRoleStatus = '/basic-api/system/setRoleStatus',
   MenuList = '/zfb-api/zfb/shop/sys/menu/queryAll',
   saveMenu = '/zfb-api/zfb/shop/sys/menu/save',
   updateMenu = '/zfb-api/zfb/shop/sys/menu/update',
   deleteMenu = '/zfb-api/zfb/shop/sys/menu/delete',
+
+  AccountList = '/zfb-api/zfb/shop/sys/user/list',
+  IsAccountExist = '/basic-api/system/accountExist',
+
   RolePageList = '/zfb-api/zfb/shop/sys/role/list',
+  setRoleStatus = '/basic-api/system/setRoleStatus',
   GetAllRoleList = '/basic-api/system/getAllRoleList',
+
   DeptList = '/zfb-api/zfb/shop/sys/company/list',
   // DeptTree = 'sys/dept/list',
 }

+ 9 - 9
src/router/routes/modules/system.ts

@@ -45,15 +45,15 @@ const system: AppRouteModule = {
       component: () => import('/@/views/dashboard/system/role/index.vue'),
     },
 
-    {
-      path: 'dept',
-      name: 'DeptManagement',
-      meta: {
-        title: t('routes.demo.system.dept'),
-        ignoreKeepAlive: true,
-      },
-      component: () => import('/@/views/dashboard/system/dept/index.vue'),
-    },
+    // {
+    //   path: 'dept',
+    //   name: 'DeptManagement',
+    //   meta: {
+    //     title: t('routes.demo.system.dept'),
+    //     ignoreKeepAlive: true,
+    //   },
+    //   component: () => import('/@/views/dashboard/system/dept/index.vue'),
+    // },
     {
       path: 'menu',
       name: 'MenuManagement',

+ 1 - 1
src/views/dashboard/scenes/list.vue

@@ -110,7 +110,7 @@
           title: '操作',
           dataIndex: '',
           slots: { customRender: 'action' },
-          width: 140,
+          width: 200,
           fixed: 'right',
         },
       ];

+ 5 - 5
src/views/dashboard/system/account/index.vue

@@ -1,7 +1,7 @@
 <template>
   <PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
-    <DeptTree class="w-1/4 xl:w-1/5" @select="handleSelect" />
-    <BasicTable @register="registerTable" class="w-3/4 xl:w-4/5" :searchInfo="searchInfo">
+    <!-- <DeptTree class="w-1/4 xl:w-1/5" @select="handleSelect" /> -->
+    <BasicTable @register="registerTable" :searchInfo="searchInfo">
       <template #toolbar>
         <a-button type="primary" @click="handleCreate">新增账号</a-button>
       </template>
@@ -40,17 +40,17 @@
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { getAccountList } from '/@/api/system/system';
   import { PageWrapper } from '/@/components/Page';
-  import DeptTree from './DeptTree.vue';
+  // import DeptTree from './DeptTree.vue';
 
   import { useModal } from '/@/components/Modal';
   import AccountModal from './AccountModal.vue';
 
   import { columns, searchFormSchema } from './account.data';
   import { useGo } from '/@/hooks/web/usePage';
-
+  // DeptTree
   export default defineComponent({
     name: 'AccountManagement',
-    components: { BasicTable, PageWrapper, DeptTree, AccountModal, TableAction },
+    components: { BasicTable, PageWrapper, AccountModal, TableAction },
     setup() {
       const go = useGo();
       const [registerModal, { openModal }] = useModal();

+ 2 - 16
src/views/dashboard/system/role/RoleDrawer.vue

@@ -18,16 +18,6 @@
           title="菜单分配"
         />
       </template>
-      <template #dept="{ model, field }">
-        <BasicTree
-          v-model:value="model[field]"
-          :treeData="deptTreeData"
-          :fieldNames="{ title: 'name', key: 'menuId' }"
-          :checkable="true"
-          toolbar
-          title="权限分配"
-        />
-      </template>
     </BasicForm>
   </BasicDrawer>
 </template>
@@ -36,10 +26,10 @@
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { formSchema } from './role.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  // TreeItem
+  // TreeItem;
   import { BasicTree } from '/@/components/Tree';
   import { makeMenuTree, TreeMenuNode } from '/@/utils/treeUtils';
-  import { getMenuList, deptListApi } from '/@/api/system/system';
+  import { getMenuList } from '/@/api/system/system';
 
   export default defineComponent({
     name: 'RoleDrawer',
@@ -48,7 +38,6 @@
     setup(_, { emit }) {
       const isUpdate = ref(true);
       const treeData = ref<TreeMenuNode[]>([]);
-      const deptTreeData = ref<TreeMenuNode[]>([]);
 
       const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
         labelWidth: 90,
@@ -62,10 +51,8 @@
         // 需要在setFieldsValue之前先填充treeData,否则Tree组件可能会报key not exist警告
         if (unref(treeData).length === 0) {
           const tData = (await getMenuList()) as any as TreeMenuNode[];
-          const dData = (await deptListApi()) as any as TreeMenuNode[];
 
           treeData.value = makeMenuTree(tData);
-          deptTreeData.value = makeMenuTree(dData);
         }
         isUpdate.value = !!data?.isUpdate;
 
@@ -97,7 +84,6 @@
         getTitle,
         handleSubmit,
         treeData,
-        deptTreeData,
       };
     },
   });