Browse Source

fix 登录模块权限问题

glglove 3 days ago
parent
commit
83ecbf2646

+ 5 - 5
packages/cpt_uk/lib/modules/job/job_category/job_category_controller.dart

@@ -29,19 +29,19 @@ class JobCategoryController extends GetxController with DioCancelableMixin {
   /// 跳转到指定的模块中去
   void gotoModulePage(HomeModule module) {
     switch (module.key) {
-      case 'job_template':
+      case 'template':
         UKTemplateListPage.startInstance();
         break;
-      case 'labour_request':
+      case 'labReq':
         UKLabourRequestListPage.startInstance();
         break;
-      case 'lab_review':
+      case 'reqReview':
         UKLabourReviewPage.startInstance();
         break;
-      case 'job_list':
+      case 'jobList':
         UKJobListPage.startInstance();
         break;
-      case 'attendance_review':
+      case 'attReview':
         UKAttendanceReviewPage.startInstance();
         break;
     }

+ 6 - 5
packages/cpt_uk/lib/modules/job/job_category/job_category_state.dart

@@ -5,10 +5,11 @@ import 'package:plugin_basic/basic_export.dart';
 class JobCategoryState {
   //全部的模块
   final List<HomeModule> datas = [
-    HomeModule(key: 'job_template', moduleName: 'Job Template'.tr, moduleIconPath: Assets.cptJobCategoryTemplate, iconWidth: 40, iconHeight: 40),
-    HomeModule(key: 'labour_request', moduleName: 'Labour Request'.tr, moduleIconPath: Assets.cptJobCategoryLabour, iconWidth: 40, iconHeight: 40),
-    HomeModule(key: 'lab_review', moduleName: 'Labour Request Review'.tr, moduleIconPath: Assets.cptJobCategoryLabourReview, iconWidth: 40, iconHeight: 40),
-    HomeModule(key: 'job_list', moduleName: 'Job List'.tr, moduleIconPath: Assets.cptJobCategoryList, iconWidth: 40, iconHeight: 40),
-    HomeModule(key: 'attendance_review', moduleName: 'Attendance Review'.tr, moduleIconPath: Assets.cptJobCategoryAttendanceReview, iconWidth: 40, iconHeight: 40),
+    HomeModule(key: 'template', moduleName: 'Job Template'.tr, moduleIconPath: Assets.cptJobCategoryTemplate, iconWidth: 40, iconHeight: 40),
+    HomeModule(key: 'labReq', moduleName: 'Labour Request'.tr, moduleIconPath: Assets.cptJobCategoryLabour, iconWidth: 40, iconHeight: 40),
+    HomeModule(key: 'reqReview', moduleName: 'Labour Request Review'.tr, moduleIconPath: Assets.cptJobCategoryLabourReview, iconWidth: 40, iconHeight: 40),
+    HomeModule(key: 'jobList', moduleName: 'Job List'.tr, moduleIconPath: Assets.cptJobCategoryList, iconWidth: 40, iconHeight: 40),
+    HomeModule(key: 'attReview', moduleName: 'Attendance Review'.tr, moduleIconPath: Assets.cptJobCategoryAttendanceReview, iconWidth: 40, iconHeight: 40),
   ];
 }
+

+ 2 - 2
packages/cpt_uk/lib/modules/main/main_controller.dart

@@ -70,7 +70,7 @@ class MainController extends GetxController {
         // //展示UK全部的模块
         // state.datas.clear();
         // state.datas.addAll(state.modules);
-        changeLoadingState(LoadState.State_Success);
+        // changeLoadingState(LoadState.State_Success);
       } else {
         ToastEngine.show(result.errorMsg ?? "Network Load Error".tr);
       }
@@ -125,7 +125,7 @@ class MainController extends GetxController {
   /// 跳转到指定的模块中去
   void gotoModulePage(HomeModule module) {
     switch (module.key) {
-      case 'job':
+      case 'jobs':
         JobCategoryPage.startInstance();
         break;
       case 'device':

+ 1 - 1
packages/cpt_uk/lib/modules/main/main_state.dart

@@ -8,7 +8,7 @@ class MainState {
 
   //全部的模块
   final List<HomeModule> modules = [
-    HomeModule(key: 'job', moduleName: 'Jobs'.tr, moduleIconPath: Assets.mainHomeJobList, iconWidth: 45, iconHeight: 45),
+    HomeModule(key: 'jobs', moduleName: 'Jobs'.tr, moduleIconPath: Assets.mainHomeJobList, iconWidth: 45, iconHeight: 45),
     HomeModule(key: 'device', moduleName: 'Devices'.tr, moduleIconPath: Assets.mainHomeDevices, iconWidth: 45.5, iconHeight: 45.5),
     HomeModule(key: 'registration', moduleName: 'Security Registration'.tr, moduleIconPath: Assets.mainHomeSecurity, iconWidth: 58.5, iconHeight: 44.5),
     HomeModule(key: 'attendance', moduleName: 'E-Attendance'.tr, moduleIconPath: Assets.mainHomeAttendance, iconWidth: 44.5, iconHeight: 44.5),

+ 8 - 8
packages/cpt_uk/lib/modules/report/report_list/report_list_controller.dart

@@ -62,27 +62,27 @@ class ReportListController extends GetxController {
   void gotoReportPage(HomeModule module) {
     Log.d("点击的 module  ${module.key}");
     switch (module.key) {
-      case 'labour':
+      case 'labRep':
         UKLabourReportPage.startInstance();
         break;
-      case 'outlet':
+      case 'monReq':
         UKOutletStaffReportPage.startInstance();
         break;
-      case 'finale':
+      case 'finRep':
         UKReportFinancePage.startInstance();
         break;
-      case 'hours':
+      case 'workHours':
         UKWorkingHoursReportPage.startInstance();
         break;
       case 'attendance':
         UKAttendanceReportPage.startInstance();
         break;
-      case 'payout':
-        UKCasualPayoutReportPage.startInstance();
-        break;
-      case 'casual':
+      case 'casRep':
         UKCasualReportPage.startInstance();
         break;
+      case 'casLab':
+        UKCasualPayoutReportPage.startInstance();
+        break;
     }
   }
 }

+ 6 - 6
packages/cpt_uk/lib/modules/report/report_list/report_list_state.dart

@@ -8,13 +8,13 @@ class ReportListState {
 
   //全部的模块
   final List<HomeModule> modules = [
-    HomeModule(key: 'labour', moduleName: 'Labour Request'.tr, moduleIconPath: Assets.cptReportUkReportLabour, iconWidth: 40, iconHeight: 40),
-    HomeModule(key: 'outlet', moduleName: 'Outlet Request'.tr, moduleIconPath: Assets.cptReportUkReportOutlet, iconWidth: 40, iconHeight: 40),
-    HomeModule(key: 'finale', moduleName: 'Finance Report'.tr, moduleIconPath: Assets.cptReportUkReportFinale, iconWidth: 40, iconHeight: 40),
-    HomeModule(key: 'hours', moduleName: 'Working Hours'.tr, moduleIconPath: Assets.cptReportUkReportWorkHours, iconWidth: 40, iconHeight: 40),
+    HomeModule(key: 'labRep', moduleName: 'Labour Request'.tr, moduleIconPath: Assets.cptReportUkReportLabour, iconWidth: 40, iconHeight: 40),
+    HomeModule(key: 'monReq', moduleName: 'Outlet Request'.tr, moduleIconPath: Assets.cptReportUkReportOutlet, iconWidth: 40, iconHeight: 40),
+    HomeModule(key: 'finRep', moduleName: 'Finance Report'.tr, moduleIconPath: Assets.cptReportUkReportFinale, iconWidth: 40, iconHeight: 40),
+    HomeModule(key: 'workHours', moduleName: 'Working Hours'.tr, moduleIconPath: Assets.cptReportUkReportWorkHours, iconWidth: 40, iconHeight: 40),
     HomeModule(key: 'attendance', moduleName: 'E-Attendance'.tr, moduleIconPath: Assets.cptReportUkReportAttendance, iconWidth: 40, iconHeight: 40),
-    HomeModule(key: 'payout', moduleName: 'Casual Payout'.tr, moduleIconPath: Assets.cptReportUkReportCasualPayout, iconWidth: 40, iconHeight: 40),
-    HomeModule(key: 'casual', moduleName: 'Casual Report'.tr, moduleIconPath: Assets.cptReportUkReportCasual, iconWidth: 40, iconHeight: 40),
+    HomeModule(key: 'casRep', moduleName: 'Casual Report'.tr, moduleIconPath: Assets.cptReportUkReportCasual, iconWidth: 40, iconHeight: 40),
+    HomeModule(key: 'casLab', moduleName: 'Casual Payout'.tr, moduleIconPath: Assets.cptReportUkReportCasualPayout, iconWidth: 40, iconHeight: 40),
   ];
 
 }