labour request 模块的处理

app/lib/main.dart

@@ -3,6 +3,7 @@ import 'package:cpt_auth/router/page_router.dart';
 import 'package:cpt_job/router/job_service_impl.dart';
 import 'package:cpt_job/router/page_router.dart';
 import 'package:cpt_labour/router/labour_service_impl.dart';
+import 'package:cpt_labour/router/page_router.dart';
 import 'package:cpt_report/router/report_service_impl.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -116,7 +117,7 @@ class MyApp extends StatelessWidget {
           enableLog: true,
           //默认路由与路由表的加载
           initialRoute: RouterPath.SPLASH,
-          getPages: PageRouter.routes + BasicPageRouter.routes + AuthPageRouter.routes + JobPageRouter.routes,
+          getPages: PageRouter.routes + BasicPageRouter.routes + AuthPageRouter.routes + JobPageRouter.routes + LabourPageRouter.routes,
           //对原生导航的兼容；SmartDialog路由配置生命周期处理
           navigatorObservers: [GetXRouterObserver(), FlutterSmartDialog.observer, routeObserver],
           //默认页面动画

packages/cpt_auth/lib/modules/main/main_controller.dart

@@ -110,7 +110,7 @@ class MainController extends GetxController {
   void gotoModulePage(HomeModule module) {
     switch (module.key) {
       case 'labReq':
-        ComponentRouterServices.jobService.startLabourRequestPage();
+        ComponentRouterServices.labourService.startLabourRequestPage();
         break;
       case 'jobList':
         ToastEngine.show("进入 Job List 模块");

packages/cpt_job/lib/router/job_service_impl.dart

@@ -1,4 +1,3 @@
-import 'package:cpt_job/modules/labour_request_list/labour_request_list_page.dart';
 import 'package:plugin_basic/basic_export.dart';
 import 'package:router/componentRouter/job_service.dart';
 import 'package:shared/utils/log_utils.dart';
@@ -26,8 +25,4 @@ class JobServiceImpl extends GetxService implements JobService {
     SignInSignOutPage.startInstance();
   }
 
-  @override
-  void startLabourRequestPage() {
-    LabourRequestListPage.startInstance();
-  }
 }

packages/cpt_job/lib/router/page_router.dart

@@ -1,7 +1,4 @@
 
-import 'package:cpt_job/modules/labour_request_add/labour_request_add_page.dart';
-import 'package:cpt_job/modules/labour_request_list/labour_request_list_page.dart';
-import 'package:cpt_job/modules/labour_request_workflow/labour_request_workflow_page.dart';
 import 'package:get/get.dart';
 import 'package:router/path/router_path.dart';
 
@@ -17,23 +14,6 @@ class JobPageRouter {
       page: () => SignInSignOutPage(),
     ),
 
-    //用工请求列表
-    GetPage(
-      name: RouterPath.JOB_LABOUR_REQUEST_LIST,
-      page: () => LabourRequestListPage(),
-    ),
-
-    //用工请求添加
-    GetPage(
-      name: RouterPath.JOB_LABOUR_REQUEST_ADD,
-      page: () => LabourRequestAddPage(),
-    ),
-
-    //用工请求状态修改工作流
-    GetPage(
-      name: RouterPath.JOB_LABOUR_REQUEST_WORKFLOW,
-      page: () => LabourRequestWorkflowPage(),
-    ),
 
   ];
 }

packages/cpt_job/lib/modules/labour_request_list/labour_request_list_controller.dart

@@ -1,4 +1,4 @@
-import 'package:cpt_job/modules/labour_request_add/labour_request_add_page.dart';
+import '../labour_request_add/labour_request_add_page.dart';
 import 'package:domain/entity/response/labour_request_index_entity.dart';
 import 'package:domain/entity/response/labour_request_list_entity.dart';
 import 'package:domain/repository/labour_repository.dart';
@@ -16,8 +16,8 @@ import 'package:widgets/dialog/app_default_dialog.dart';
 import 'package:widgets/load_state_layout.dart';
 import 'package:widgets/widget_export.dart';
 
-import '../../widget/labour_request_filter.dart';
 import '../labour_request_workflow/labour_request_workflow_page.dart';
+import 'labour_request_filter.dart';
 import 'labour_request_list_state.dart';
 
 class LabourRequestListController extends GetxController with DioCancelableMixin {

packages/cpt_job/lib/modules/labour_request_workflow/labour_request_workflow_controller.dart

@@ -7,6 +7,7 @@ import 'package:widgets/widget_export.dart';
 
 import 'labour_request_workflow_state.dart';
 
+
 class LabourRequestWorkflowController extends GetxController with DioCancelableMixin{
   final LabourRepository _labourRepository = Get.find();
   final LabourRequestWorkflowState state = LabourRequestWorkflowState();

packages/cpt_job/lib/modules/labour_request_workflow/labour_request_workflow_page.dart

@@ -10,6 +10,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/load_state_layout.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:widgets/widget_export.dart';
+
 import 'labour_request_workflow_controller.dart';
 import 'labour_request_workflow_state.dart';
 import 'labour_workflow_item.dart';

packages/cpt_labour/lib/router/labour_service_impl.dart

@@ -2,11 +2,13 @@ import 'package:plugin_basic/basic_export.dart';
 import 'package:router/componentRouter/labour_service.dart';
 import 'package:shared/utils/log_utils.dart';
 
+import '../modules/labour_request_list/labour_request_list_page.dart';
+
 class LabourServiceImpl extends GetxService implements LabourService {
 
   @override
-  Future<bool> isUserLogin() async{
-    return Future(() => true);
+  void startLabourRequestPage() {
+    LabourRequestListPage.startInstance();
   }
 
   @override

packages/cpt_labour/lib/router/page_router.dart

@@ -3,10 +3,31 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:router/path/router_path.dart';
 
+import '../modules/labour_request_add/labour_request_add_page.dart';
+import '../modules/labour_request_list/labour_request_list_page.dart';
+import '../modules/labour_request_workflow/labour_request_workflow_page.dart';
+
 class LabourPageRouter {
 
   static final routes = [
 
+    //用工请求列表
+    GetPage(
+      name: RouterPath.JOB_LABOUR_REQUEST_LIST,
+      page: () => LabourRequestListPage(),
+    ),
+
+    //用工请求添加
+    GetPage(
+      name: RouterPath.JOB_LABOUR_REQUEST_ADD,
+      page: () => LabourRequestAddPage(),
+    ),
+
+    //用工请求状态修改工作流
+    GetPage(
+      name: RouterPath.JOB_LABOUR_REQUEST_WORKFLOW,
+      page: () => LabourRequestWorkflowPage(),
+    ),
 
   ];
 }

packages/cpt_report/lib/router/page_router.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:router/path/router_path.dart';
 
-class LabourPageRouter {
+class ReportPageRouter {
 
   static final routes = [
 

packages/cs_router/lib/componentRouter/job_service.dart

@@ -6,6 +6,4 @@ abstract class JobService {
 
   void startSignInSignOutPage();
 
-  void startLabourRequestPage();
-
 }

packages/cs_router/lib/componentRouter/labour_service.dart

@@ -3,5 +3,7 @@
  * Labour组件对应的路由抽象接口
  */
 abstract class LabourService {
-  Future<bool> isUserLogin();
+
+  void startLabourRequestPage();
+
 }