feat: 新增首页只有管理员和总监可以查看&审核内部订单搜索修改

sanmu
1 parent e48147f8
Showing 8 changed files with 18 additions and 16 deletions
src/enums/roleEnum.ts
src/router/guard/permissionGuard.ts
src/router/routes/modules/project/dashboard.ts
src/store/modules/permission.ts
src/store/modules/user.ts
src/views/project/approve/ReportPanel.vue
src/views/project/approve/data.ts
src/views/sys/login/LoginForm.vue
@@ -4,4 +4,5 @@ export enum RoleEnum {
   ADMIN = 'admin',
   // tester
   TEST = 'test',
+  DATA_REPORT_USER = 'data_report_user',
 }
@@ -25,7 +25,7 @@ export function createPermissionGuard(router: Router) {
       userStore.getUserInfo.homePath &&
       userStore.getUserInfo.homePath !== PageEnum.BASE_HOME
     ) {
-      next('/home');
+      next('/order');
       return;
     }
  
@@ -38,7 +38,7 @@ export function createPermissionGuard(router: Router) {
         try {
           await userStore.afterLoginAction();
           if (!isSessionTimeout) {
-            next((to.query?.redirect as string) || '/');
+            next((to.query?.redirect as string) || '/order');
             return;
           }
         } catch {
@@ -2,6 +2,7 @@ import type { AppRouteModule } from &#39;/@/router/types&#39;;
  
 import { LAYOUT } from '/@/router/constant';
 import { t } from '/@/hooks/web/useI18n';
+import { RoleEnum } from '/@/enums/roleEnum';
  
 const dashboard: AppRouteModule = {
   path: '/home',
@@ -9,10 +10,12 @@ const dashboard: AppRouteModule = {
   component: LAYOUT,
   redirect: '/home',
   meta: {
+    roles: [RoleEnum.ADMIN, RoleEnum.DATA_REPORT_USER],
+
     hideChildrenInMenu: true,
     orderNo: 1,
     icon: 'ion:grid-outline',
-    title: t('routes.dashboard.home'),
+    title: '报表分析',
   },
   children: [
     {
@@ -133,7 +133,7 @@ export const usePermissionStore = defineStore({
         if (!roles) return true;
         // 进行角色权限判断
         const user = userStore.getUserInfo;
-        return user?.roleSmallVO.code === 'admin';
+        return roles.includes(user?.roleSmallVO.code);
         // return roleList.some((role) => roles.includes(role));
       };
  
@@ -92,7 +92,6 @@ export const useUserStore = defineStore({
         const { mode, ...loginParams } = params;
         const data = await loginApi(loginParams, mode);
         const { token, user } = data;
-        console.log('%c [ user ]-95', 'font-size:13px; background:pink; color:#bf2c9f;', user);
  
         this.setToken(token);
         this.setUserInfo(user);
@@ -124,7 +123,7 @@ export const useUserStore = defineStore({
           router.addRoute(PAGE_NOT_FOUND_ROUTE as unknown as RouteRecordRaw);
           permissionStore.setDynamicAddedRoute(true);
         }
-        await router.replace('home');
+        await router.replace('order');
       }
       return userInfo;
     },
@@ -3,8 +3,8 @@
     <template #bodyCell="{ column, record }">
       <template v-if="column.key === 'picUrl'">
         <img
-          :width="100"
-          :height="100"
+          :width="50"
+          :height="50"
           :src="record?.orderBaseInfo?.smallPicUrl"
           @click="handlePreview(record?.orderBaseInfo?.picUrl)"
         />
-import { useOrderInfo } from '/@/hooks/component/order';
-import { useOrderStoreWithOut } from '/@/store/modules/order';
+import { ref } from 'vue';
+import { queryNoOptions } from '../../../api/project/order';
  
 export function getFormConfig() {
-  const orderStore = useOrderStoreWithOut();
-
-  const { innerNo } = useOrderInfo(orderStore);
-
+  const innerNoOptions = ref([]);
   return {
     labelWidth: 100,
     schemas: [
@@ -18,9 +15,12 @@ export function getFormConfig() {
         },
         labelWidth: 70,
         componentProps: {
-          options: innerNo,
+          options: innerNoOptions,
           showSearch: true,
           mode: 'multiple',
+          onSearch: async (value: any) => {
+            innerNoOptions.value = await queryNoOptions('innerNo', value);
+          },
         },
       },
     ],
@@ -148,7 +148,6 @@
  
   const getImgCaptcha = async () => {
     const data = await userStore.getImageCaptcha();
-    console.log('%c [ data ]-151', 'font-size:13px; background:pink; color:#bf2c9f;', data);
     imgCaptcha.value = data?.img;
     imgCaptchaUuid.value = data?.uuid;
   };