Merge branch 'master-ukk'

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,

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,

packages/cpt_uk/lib/modules/job/labour_request_list/labour_request_item.dart

@@ -22,6 +22,7 @@ class LabourRequestItem extends StatelessWidget {
   final VoidCallback? onCopyAction;
   final VoidCallback? onQuickCopyAction;
   final VoidCallback? onPreSelectedClickAction;
+  final VoidCallback? onDeleteAction;
 
   LabourRequestItem({
     required this.index,
@@ -33,6 +34,7 @@ class LabourRequestItem extends StatelessWidget {
     this.onCopyAction,
     this.onQuickCopyAction,
     this.onPreSelectedClickAction,
+    this.onDeleteAction
   });
 
   @override
@@ -220,7 +222,7 @@ class LabourRequestItem extends StatelessWidget {
                   Row(
                     children: [
                       MyTextView(
-                        "Pre Selected:".tr,
+                        "Favourite:".tr,
                         isFontRegular: true,
                         textColor: ColorConstants.textGrayAECAE5,
                         fontSize: 14,
@@ -413,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),
                 ),
 
                 //详情按钮
@@ -434,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),
                   ),
                 ),
 
@@ -456,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),
                   ),
                 ),
 
@@ -476,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),
                   ),
                 ),
 
@@ -496,12 +502,34 @@ 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),
+                  ),
+                ),
+
+                //删除工作流按钮  只有 publish_status 为false 的才可以删除
+                Visibility(
+                  visible: item.publishStatus == false ? true : false,
+                  child: Flexible(
+                    child: MyButton(
+                      onPressed: () {
+                        FocusScope.of(context).unfocus();
+                        onDeleteAction?.call();
+                      },
+                      text: "Delete".tr,
+                      textColor: ColorConstants.white,
+                      fontSize: 12,
+                      backgroundColor: Colors.redAccent,
+                      radius: 17.25,
+                      padding: const EdgeInsets.symmetric(horizontal: 5),
+                      minWidth: 60,
+                      minHeight: 30,
+                    ).marginOnly(left: 6),
                   ),
                 ),
               ],

packages/cpt_uk/lib/modules/job/labour_request_list/labour_request_list_controller.dart

@@ -352,6 +352,31 @@ class LabourRequestListController extends GetxController with DioCancelableMixin
     UKLabourRequestPreselectedListPage.startInstance(data.requestId.toString(), publishStatus);
   }
 
+  // 删除
+  void doDelete(UkLabourRequestTableRows data, BuildContext? context ) {
+    DialogEngine.show(
+      widget: AppDefaultDialog(
+        title: "Message".tr,
+        message: "Are you sure you want to delete it?".tr,
+        confirmAction: () {
+          doDeleteLabRequest(data.requestId!.toString());
+        },
+      ));
+  }
+
+  doDeleteLabRequest(String requestId) async {
+    var result = await _UKlabourRepository.deleteLabourRequest(
+      requestId,
+      cancelToken: cancelToken,
+    );
+    if (result.isSuccess) {
+      NotifyEngine.showSuccess("Successful".tr);
+      refreshController.callRefresh();
+    } else {
+      ToastEngine.show(result.errorMsg ?? "Network Load Error".tr);
+    }
+  }
+
   //去新增页面Copy
   void gotoCopyPage(UkLabourRequestTableRows data) {
     UKLabourRequestAddPage.startInstance(0, data.requestId.toString());

packages/cpt_uk/lib/modules/job/labour_request_list/labour_request_list_page.dart

@@ -158,7 +158,10 @@ class _LabourRequestListState extends BaseState<UKLabourRequestListPage, LabourR
                           },
                           onPreSelectedClickAction:(){
                             controller.gotoPreSelectedPage(state.datas[index], context,  state.datas[index].publishStatus!);
-                          }
+                          },
+                          onDeleteAction: (){
+                            controller.doDelete(state.datas[index], context);
+                          },
                         );
                       },
                       childCount: state.datas.length,

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: [],
               ),
               // 添加按钮

packages/cs_domain/lib/constants/api_constants.dart

@@ -304,6 +304,8 @@ class ApiConstants {
   static const apiJobTemplateDetailBySelectTitleUK = "/index.php/api/v1/hotel/temp/show-template-record";
   // labourrequest 快速复制工作
   static const apiLabourRequestQuickCopyUK = "/index.php/api/v1/hotel/lab-req/quick-copy";
+  // labourrequest 删除工作
+  static const apiLabourRequestDeleteUK = "/index.php/api/v1/hotel/lab-req/delete";
   // 预选人列表
   static const apiLabourRequestPreSelectListUK = "/index.php/api/v1/hotel/prestaff/table";
   // 筛选的条件

packages/cs_domain/lib/repository/uk_labour_repository.dart

@@ -693,6 +693,33 @@ class UkLabourRepository extends GetxService {
     return result.convert();
   }
 
+  /// 用工请求 删除
+  Future<HttpResult> deleteLabourRequest(
+      String? requestId,
+      {
+        CancelToken? cancelToken,
+      }) async {
+    //参数
+    Map<String, String> params = {};
+    params['request_id'] = requestId ?? "";
+
+    final result = await httpProvider.requestNetResult(
+      ApiConstants.apiLabourRequestDeleteUK,
+      method: HttpMethod.POST,
+      params: params,
+      networkDebounce: true,
+      isShowLoadingDialog: true,
+      cancelToken: cancelToken,
+    );
+
+    //根据返回的结果，封装原始数据为Bean/Entity对象
+    if (result.isSuccess) {
+      //重新赋值data或list
+      return result.convert();
+    }
+    return result.convert();
+  }
+
   /// 获取 labourequest preselected 列表
   Future<HttpResult<UkLabourRequestPreselectedListEntity>> fetchLabourRequestPreselectedList(
     String reQuestId,

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:',

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:': '头像:',