Browse Source

Report的字体超长的问题,路由的Path加上国家标识

liukai 2 days ago
parent
commit
ea64622652

+ 3 - 0
app/devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

+ 3 - 0
packages/cpt_auth/devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

+ 1 - 1
packages/cpt_sg/lib/modules/main/main_controller.dart

@@ -159,7 +159,7 @@ class MainController extends GetxController {
         JobTitleListPage.startInstance();
         break;
       case 'report':
-        ReportListPage.startInstance();
+        SGReportListPage.startInstance();
         break;
     }
   }

+ 1 - 1
packages/cpt_sg/lib/modules/report/report_list/report_list_controller.dart

@@ -11,7 +11,7 @@ import '../report_labour/report_labour_page.dart';
 import '../report_staff_request/report_staff_request_page.dart';
 import 'report_list_state.dart';
 
-class ReportListController extends GetxController {
+class SGReportListController extends GetxController {
   final ReportListState state = ReportListState();
 
   /// 获取报表的数据

+ 6 - 6
packages/cpt_sg/lib/modules/report/report_list/report_list_page.dart

@@ -18,8 +18,8 @@ import 'report_list_state.dart';
 /*
  *  报表的列表
  */
-class ReportListPage extends BaseStatefulPage<ReportListController> {
-  ReportListPage({super.key});
+class SGReportListPage extends BaseStatefulPage<SGReportListController> {
+  SGReportListPage({super.key});
 
   //启动当前页面
   static void startInstance() {
@@ -27,15 +27,15 @@ class ReportListPage extends BaseStatefulPage<ReportListController> {
   }
 
   @override
-  State<ReportListPage> createState() => _MainPageState();
+  State<SGReportListPage> createState() => _MainPageState();
 
   @override
-  ReportListController createRawController() {
-    return ReportListController();
+  SGReportListController createRawController() {
+    return SGReportListController();
   }
 }
 
-class _MainPageState extends BaseState<ReportListPage, ReportListController> {
+class _MainPageState extends BaseState<SGReportListPage, SGReportListController> {
   late ReportListState state;
 
   @override

+ 4 - 1
packages/cpt_sg/lib/modules/report/report_staff_request/report_staff_request_item.dart

@@ -1,3 +1,4 @@
+import 'package:cpt_sg/modules/agency/agency_add/agency_add_page.dart';
 import 'package:cs_resources/constants/color_constants.dart';
 import 'package:domain/entity/response/staff_request_report_entity.dart';
 import 'package:flutter/cupertino.dart';
@@ -5,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:plugin_basic/basic_export.dart';
 import 'package:shared/utils/util.dart';
+import 'package:widgets/ext/ex_widget.dart';
 
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/shatter/custom_progress_bar.dart';
@@ -22,13 +24,14 @@ class ReportStaffRequestItem extends StatelessWidget {
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Row(
+          mainAxisSize: MainAxisSize.max,
           children: [
             MyTextView(
               item.name ?? "",
               fontSize: 14,
               textColor: Colors.white,
               isFontRegular: true,
-            ),
+            ).expanded(),
             MyTextView(
               "(${item.num})",
               marginLeft: 3,

+ 1 - 1
packages/cpt_sg/lib/modules/report/report_staff_request/report_staff_request_page.dart

@@ -45,7 +45,7 @@ class ReportStaffRequestPage extends BaseStatelessPage<ReportStaffRequestControl
     return autoCtlGetBuilder(builder: (controller) {
       return Scaffold(
         extendBodyBehindAppBar: true,
-        appBar: MyAppBar.appBar(context, "Monthly Staff Request Report".tr),
+        appBar: MyAppBar.appBar(context, "Monthly Staff Request Report22".tr),
         body: SafeArea(
           bottom: true,
           top: false,

+ 1 - 1
packages/cpt_sg/lib/router/sg_router.dart

@@ -153,7 +153,7 @@ class SGPageRouter {
     //报表列表
     GetPage(
       name: RouterPath.reportListSG,
-      page: () => ReportListPage(),
+      page: () => SGReportListPage(),
     ),
 
     //财务报表

+ 0 - 1
packages/cpt_vn/lib/modules/report/report_list/report_list_controller.dart

@@ -3,7 +3,6 @@ import 'package:domain/entity/response/hotel_info_entity.dart';
 import 'package:get/get.dart';
 import 'package:plugin_basic/service/app_config_service.dart';
 import 'package:plugin_basic/service/user_service.dart';
-import 'package:plugin_platform/engine/toast/toast_engine.dart';
 import 'package:shared/utils/log_utils.dart';
 
 import '../report_finance/report_finance_page.dart';

+ 4 - 1
packages/cpt_vn/lib/modules/report/report_staff_request/report_staff_request_item.dart

@@ -1,3 +1,4 @@
+import 'package:cpt_vn/modules/job/applied_staff_detail/applied_staff_detail_page.dart';
 import 'package:cs_resources/constants/color_constants.dart';
 import 'package:domain/entity/response/staff_request_report_entity.dart';
 import 'package:flutter/cupertino.dart';
@@ -5,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:plugin_basic/basic_export.dart';
 import 'package:shared/utils/util.dart';
+import 'package:widgets/ext/ex_widget.dart';
 
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/shatter/custom_progress_bar.dart';
@@ -22,13 +24,14 @@ class ReportStaffRequestItem extends StatelessWidget {
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Row(
+          mainAxisSize: MainAxisSize.max,
           children: [
             MyTextView(
               item.name ?? "",
               fontSize: 14,
               textColor: Colors.white,
               isFontRegular: true,
-            ),
+            ).expanded(),
             MyTextView(
               "(${item.num})",
               marginLeft: 3,

+ 14 - 14
packages/cs_router/lib/path/router_path.dart

@@ -97,23 +97,23 @@ class RouterPath {
 
   //新加坡的工作列表
   static const jobListSG = '/job/list/sg'; //工作列表(新加坡)
-  static const jobListEditSG = '/job/list/edit'; //工作列表编辑与详情(新加坡)
+  static const jobListEditSG = '/job/list/edit/sg'; //工作列表编辑与详情(新加坡)
   static const jobListAppliedSG = '/job/list/applied'; //工作列表已申请列表(新加坡)
-  static const jobListAppliedStaffListSG = '/job/list/applied/staff/list'; //工作列表已申请列表添加员工列表(新加坡)
-  static const jobListAppliedStaffDetailSG = '/job/list/applied/staff/detail'; //工作列表已申请列表员工详情(新加坡)
-  static const jobListAppliedStaffReviewSG = '/job/list/applied/staff/reviews'; //工作列表已申请列表员工的评论列表(新加坡)
-  static const reviseListSG = '/revise/list'; //Revise列表(新加坡)
-  static const reviseAppliedSG = '/revise/applied'; //Applied的Revise(新加坡)
-  static const reviseLogSG = '/revise/log'; //Revise 的日志(新加坡)
-  static const reviseEditSG = '/revise/edit'; //Revise 的添加,编辑,详情(新加坡)
-  static const dashboardSG = '/dashboard/list'; //Dashboard的
+  static const jobListAppliedStaffListSG = '/job/list/applied/staff/list/sg'; //工作列表已申请列表添加员工列表(新加坡)
+  static const jobListAppliedStaffDetailSG = '/job/list/applied/staff/detail/sg'; //工作列表已申请列表员工详情(新加坡)
+  static const jobListAppliedStaffReviewSG = '/job/list/applied/staff/reviews/sg'; //工作列表已申请列表员工的评论列表(新加坡)
+  static const reviseListSG = '/revise/list/sg'; //Revise列表(新加坡)
+  static const reviseAppliedSG = '/revise/applied/sg'; //Applied的Revise(新加坡)
+  static const reviseLogSG = '/revise/log/sg'; //Revise 的日志(新加坡)
+  static const reviseEditSG = '/revise/edit/sg'; //Revise 的添加,编辑,详情(新加坡)
+  static const dashboardSG = '/dashboard/list/sg'; //Dashboard的
 
   //新加坡报表
-  static const deviceListSG = '/device/list'; //雇主绑定的设备列表
-  static const reportListSG = '/report/list'; //报表的选项
-  static const reportFinanceSG = '/report/finance'; //金额报表
-  static const reportCasualLabourSG = '/report/labour'; //用工请求报表
-  static const reportStaffRequestSG = '/report/staff/request'; //员工申请报表
+  static const deviceListSG = '/device/list/sg'; //雇主绑定的设备列表
+  static const reportListSG = '/report/list/sg'; //报表的选项
+  static const reportFinanceSG = '/report/finance/sg'; //金额报表
+  static const reportCasualLabourSG = '/report/labour/sg'; //用工请求报表
+  static const reportStaffRequestSG = '/report/staff/request/sg'; //员工申请报表
 
   //新加坡的审合相关
   static const SGLabourReviewList= '/sg/labour/review/list';   //SG的用工请求审核列表