glglove hai 1 mes
pai
achega
40bc8d46b1

+ 59 - 0
packages/cpt_uk/lib/modules/attendance/e_attendance_list/item_e_attendance.dart

@@ -275,6 +275,65 @@ class EAttendanceItem extends StatelessWidget {
             ],
           ).marginOnly(top: 12),
 
+          // 总小时
+          Row(
+            mainAxisSize: MainAxisSize.max,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              MyTextView(
+                '${"Total Hours".tr}:',
+                isFontRegular: true,
+                textColor: ColorConstants.textGrayAECAE5,
+                fontSize: 14,
+              ),
+
+              //时间
+              MyTextView(
+                item.totalHours ?? "-",
+                marginLeft: 5,
+                isFontRegular: true,
+                textColor:  Colors.white,
+                fontSize: 14,
+                marginRight: 5,
+              ),
+
+              // reviseHours
+              Visibility(
+                visible: item.reviseHours != null && item.reviseHours != "",
+                child: MyTextView(
+                  '+${item.reviseHours}',
+                  marginLeft: 5,
+                  isFontRegular: true,
+                  textColor:  Colors.blue,
+                  fontSize: 14,
+                ).expanded(),
+              ),
+            ],
+          ).marginOnly(top: 12),
+
+          // 小费
+          Row(
+            mainAxisSize: MainAxisSize.max,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              MyTextView(
+                '${"Gratuity".tr}:',
+                isFontRegular: true,
+                textColor: ColorConstants.textGrayAECAE5,
+                fontSize: 14,
+              ),
+
+              //时间
+              MyTextView(
+                item.gratuity ?? "0.00",
+                marginLeft: 5,
+                isFontRegular: true,
+                textColor: /*item.securityOut?.changed == 1 ? ColorConstants.textRedFF6262 : */ Colors.white,
+                fontSize: 14,
+              ).expanded(),
+            ],
+          ).marginOnly(top: 12),
+
           // 申请时间
           Row(
             mainAxisSize: MainAxisSize.max,

+ 3 - 2
packages/cpt_uk/lib/modules/report/finance_report/report_finance_item.dart

@@ -50,6 +50,7 @@ class ReportFinanceItem extends StatelessWidget {
           ).marginOnly(left: 15, top: 16, bottom: 14),
 
           Row(
+            crossAxisAlignment: CrossAxisAlignment.center,
             children: [
               Column(
                 children: [
@@ -62,8 +63,8 @@ class ReportFinanceItem extends StatelessWidget {
                   MyTextView(
                     item.request.toString(),
                     textColor: ColorConstants.textYellowF8AE00,
-                    fontSize: 11,
-                    isFontRegular: true,
+                    fontSize: 13,
+                    isFontBold: true,
                   ),
                 ],
               ),

+ 4 - 0
packages/cpt_uk/lib/modules/review/labour_review_list/labour_review_controller.dart

@@ -152,10 +152,12 @@ class LabourReviewController extends GetxController with DioCancelableMixin {
   void onReady() {
     super.onReady();
     fetchLabourRequestReViewList();
+    registerEventBus();
   }
 
   @override
   void onClose() {
+    unregisterEventBus();
     state.datas.clear();
     super.onClose();
   }
@@ -165,6 +167,7 @@ class LabourReviewController extends GetxController with DioCancelableMixin {
 
   void registerEventBus() {
     subscribe = bus.on(AppConstant.eventLabourRequestRefresh, (arg) {
+      ToastEngine.show("77737  ${arg}");
       var requestId = arg as String;
       if (Utils.isNotEmpty(requestId)) {
         // fetchItemByIdAndRefreshItem(requestId);
@@ -332,6 +335,7 @@ class LabourReviewController extends GetxController with DioCancelableMixin {
   /// 去编辑页面
   void gotoEditPage(UkLabourRequestReviewListRows data) {
     UKLabourReviewEditPage.startInstance(1, data.requestId!.toString(), (result) {
+      ToastEngine.show("回调  ${result}");
       if (Utils.isNotEmpty(result)) {
         // fetchItemByIdAndRefreshItem(data.requestId!.toString());
         refreshController.callRefresh();

+ 1 - 0
packages/cs_resources/lib/local/language/en_US.dart

@@ -358,6 +358,7 @@ const Map<String, String> en_US = {
   'Choose Repeat Date': 'Choose Repeat Date',
   'YY Casual Report By Payout Date (Based the Client Rate)': 'YY Casual Report By Payout Date (Based the Client Rate)',
   'Count': 'Count',
+  'Gratuity': 'Gratuity',
 
   //插件的国际化
   'Pull to refresh': 'Pull to refresh',

+ 2 - 1
packages/cs_resources/lib/local/language/zh_CN.dart

@@ -123,7 +123,7 @@ const Map<String, String> zh_CN = {
   'Applied At:': '申请时间:',
   'Total Rooms:': '总房间数:',
   'Total Hours:': '总小时:',
-  'Total Hours': '总小时:',
+  'Total Hours': '总小时',
   '+/- Hours:': '加/减小时:',
   'Security Out:': '门卫签出:',
   'Work Out:': '工作地签出:',
@@ -359,6 +359,7 @@ const Map<String, String> zh_CN = {
   'Choose Repeat Date': '选择重复日期',
   'YY Casual Report By Payout Date (Based the Client Rate)': '按支付日期的报告(基于客户费率)',
   'Count': '总数量',
+  'Gratuity': '小费',
 
   //插件的国际化
   'Pull to refresh': '下拉刷新',