Ver código fonte

英国lab-req 列表下状态按钮调整大小间距

glglove 5 dias atrás
pai
commit
bb58b48b12

+ 2 - 2
packages/cpt_uk/lib/modules/job/labour_request_add/labour_request_add_page.dart

@@ -467,7 +467,7 @@ class _LabourRequestAddState extends BaseState<UKLabourRequestAddPage, LabourReq
                     //                   textColor: Colors.white,
                     //                   isFontRegular: true,
                     //                   fontSize: 14,
-                    //                   hint: "Choose Pre Selected".tr,
+                    //                   hint: "Choose Favourite".tr,
                     //                   textHintColor: ColorConstants.textGrayAECAE5,
                     //                   paddingTop: 5,
                     //                   paddingBottom: 5,
@@ -481,7 +481,7 @@ class _LabourRequestAddState extends BaseState<UKLabourRequestAddPage, LabourReq
                     //                   textColor: Colors.white,
                     //                   isFontRegular: true,
                     //                   fontSize: 14,
-                    //                   hint: "Choose Pre Selected".tr,
+                    //                   hint: "Choose Favourite".tr,
                     //                   backgroundColor: ColorConstants.string2Color('#0AC074'),
                     //                   paddingTop: 5,
                     //                   paddingBottom: 5,

+ 3 - 3
packages/cpt_uk/lib/modules/job/labour_request_add/widget/lab_request_and_request_review_form.dart

@@ -205,7 +205,7 @@ class CommonLabourRequestFormFields extends StatelessWidget {
         Visibility(
           visible: isAddAction,
           child: FormRequireText(
-            text: "Pre Selected".tr,
+            text: "Favourite".tr,
             isRequired: false,
           ).marginOnly(top: 15),
         ),
@@ -237,7 +237,7 @@ class CommonLabourRequestFormFields extends StatelessWidget {
                         textColor: Colors.white,
                         isFontRegular: true,
                         fontSize: 14,
-                        hint: "Choose Pre Selected".tr,
+                        hint: "Choose Favourite".tr,
                         textHintColor: ColorConstants.textGrayAECAE5,
                         paddingTop: 5,
                         paddingBottom: 5,
@@ -251,7 +251,7 @@ class CommonLabourRequestFormFields extends StatelessWidget {
                         textColor: Colors.white,
                         isFontRegular: true,
                         fontSize: 14,
-                        hint: "Choose Pre Selected".tr,
+                        hint: "Choose Favourite".tr,
                         backgroundColor: ColorConstants.string2Color('#0AC074'),
                         paddingTop: 5,
                         paddingBottom: 5,

+ 25 - 19
packages/cpt_uk/lib/modules/job/labour_request_list/labour_request_item.dart

@@ -222,7 +222,7 @@ class LabourRequestItem extends StatelessWidget {
                   Row(
                     children: [
                       MyTextView(
-                        "Pre Selected:".tr,
+                        "Favourite:".tr,
                         isFontRegular: true,
                         textColor: ColorConstants.textGrayAECAE5,
                         fontSize: 14,
@@ -415,14 +415,15 @@ class LabourRequestItem extends StatelessWidget {
                     },
                     text: "Quick Copy".tr,
                     textColor: ColorConstants.white,
+                    fontSize: 12,
                     backgroundColor: hexToColor(
                       "#C009FC",
                     ),
                     radius: 17.25,
-                    padding: const EdgeInsets.symmetric(horizontal: 8),
+                    padding: const EdgeInsets.symmetric(horizontal: 5),
                     minWidth: 60,
-                    minHeight: 35,
-                  ).marginOnly(left: 12),
+                    minHeight: 30,
+                  ).marginOnly(left: 6),
                 ),
 
                 //详情按钮
@@ -436,14 +437,15 @@ class LabourRequestItem extends StatelessWidget {
                       },
                       text: "Detail".tr,
                       textColor: ColorConstants.white,
+                      fontSize: 12,
                       backgroundColor: hexToColor(
                         "#56AAFF",
                       ),
                       radius: 17.25,
-                      padding: const EdgeInsets.symmetric(horizontal: 8),
+                      padding: const EdgeInsets.symmetric(horizontal: 5),
                       minWidth: 60,
-                      minHeight: 35,
-                    ).marginOnly(left: 12),
+                      minHeight: 30,
+                    ).marginOnly(left: 6),
                   ),
                 ),
 
@@ -458,12 +460,13 @@ class LabourRequestItem extends StatelessWidget {
                       },
                       text: "Recall".tr,
                       textColor: ColorConstants.white,
+                      fontSize: 12,
                       backgroundColor: hexToColor("#FFBB1B"),
                       radius: 17.25,
-                      padding: const EdgeInsets.symmetric(horizontal: 8),
+                      padding: const EdgeInsets.symmetric(horizontal: 5),
                       minWidth: 60,
-                      minHeight: 35,
-                    ).marginOnly(left: 12),
+                      minHeight: 30,
+                    ).marginOnly(left: 6),
                   ),
                 ),
 
@@ -478,12 +481,13 @@ class LabourRequestItem extends StatelessWidget {
                       },
                       text: "Edit".tr,
                       textColor: ColorConstants.white,
+                      fontSize: 12,
                       backgroundColor: hexToColor("#FFBB1B"),
                       radius: 17.25,
-                      padding: const EdgeInsets.symmetric(horizontal: 8),
+                      padding: const EdgeInsets.symmetric(horizontal: 5),
                       minWidth: 60,
-                      minHeight: 35,
-                    ).marginOnly(left: 12),
+                      minHeight: 30,
+                    ).marginOnly(left: 6),
                   ),
                 ),
 
@@ -498,12 +502,13 @@ class LabourRequestItem extends StatelessWidget {
                       },
                       text: "Status".tr,
                       textColor: ColorConstants.white,
+                      fontSize: 12,
                       backgroundColor: hexToColor("#0AC074"),
                       radius: 17.25,
-                      padding: const EdgeInsets.symmetric(horizontal: 8),
+                      padding: const EdgeInsets.symmetric(horizontal: 5),
                       minWidth: 60,
-                      minHeight: 35,
-                    ).marginOnly(left: 12),
+                      minHeight: 30,
+                    ).marginOnly(left: 6),
                   ),
                 ),
 
@@ -518,12 +523,13 @@ class LabourRequestItem extends StatelessWidget {
                       },
                       text: "Delete".tr,
                       textColor: ColorConstants.white,
+                      fontSize: 12,
                       backgroundColor: Colors.redAccent,
                       radius: 17.25,
-                      padding: const EdgeInsets.symmetric(horizontal: 8),
+                      padding: const EdgeInsets.symmetric(horizontal: 5),
                       minWidth: 60,
-                      minHeight: 35,
-                    ).marginOnly(left: 12),
+                      minHeight: 30,
+                    ).marginOnly(left: 6),
                   ),
                 ),
               ],

+ 1 - 1
packages/cpt_uk/lib/modules/job/labour_request_preselected_list/labour_request_preselected_list_page.dart

@@ -77,7 +77,7 @@ class _LabourRequestPreselectedListState extends BaseState<UKLabourRequestPresel
             children: [
               MyAppBar.titleBar(
                 context,
-                'Pre Selected'.tr,
+                'Favourite'.tr,
                 actions: [],
               ),
               // 添加按钮

+ 2 - 2
packages/cs_resources/lib/local/language/en_US.dart

@@ -74,8 +74,8 @@ const Map<String, String> en_US = {
   'Detail': 'Detail',
   'DateTime:': 'DateTime:',
   'No. of Staff:': 'No. of Staff:',
-  'Pre Selected': 'Pre Selected',
-  'Choose Pre Selected': 'Choose Pre Selected',
+  'Favourite': 'Favourite',
+  'Choose Favourite': 'Choose Favourite',
   'Gender:': 'Gender:',
   'ID Card No.:': 'ID Card No.:',
   'Avatar:': 'Avatar:',

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

@@ -336,8 +336,8 @@ const Map<String, String> zh_CN = {
   'Netherlands': '荷兰',
   'Retake': '重新获取',
   'thailand': '泰国',
-  'Pre Selected': '预选',
-  'Choose Pre Selected': '选择预选',
+  'Favourite': '预选',
+  'Choose Favourite': '选择预选',
   'Gender:': '性别',
   'ID Card No.:': '身份证:',
   'Avatar:': '头像:',