Просмотр исходного кода

工作添加员工 增加location 筛选

glglove 1 день назад
Родитель
Сommit
974cc250a1

+ 19 - 19
packages/cpt_uk/lib/modules/job/job_applied/widget/applied_add_staff.dart

@@ -256,10 +256,11 @@ class _AppliedAddStaffState extends State<AppliedAddStaff> {
                   ),
                   textHintColor: Color(0XFFAFB3B7),
                   textColor: ColorConstants.black33,
+                  textFontSize: 12.0,
                   onSearch: (keyword) {
                     controller.searchInputSearch(keyword);
                   },
-                  hintText: "Staff Name/ID/Phone".tr,
+                  hintText: "Staff Name/Loction".tr,
                   controller: controller.searchController,
               ),
             ),
@@ -488,35 +489,41 @@ class _AppliedAddStaffState extends State<AppliedAddStaff> {
             //     ),
             //   ],
             // ).marginOnly(top: 5),
-
             Row(
               children: [
                 MyTextView(
-                  "Turn-Up Rate".tr + ":",
+                  "CV".tr + ":",
                   marginRight: 3,
                   textColor: ColorConstants.black66,
                   fontSize: 13,
                   isFontRegular: true,
                 ),
                 MyTextView(
-                  item.turnUpRate ?? "-",
+                  (item.resume ==null || item.resume!.isEmpty == true)? "-": item.resume!,
                   textColor: ColorConstants.black66,
                   fontSize: 13,
                   isFontRegular: true,
-                ),
+                  onClick: (){
+                    // 点击查看 打开webview 页面
+                    if(item.resume?.isNotEmpty == true && Utils.isNetworkUrl(item.resume!)){
+                      controller.handlerScanFile(item.resume!);
+                    }
+                  },
+                ).expanded(),
               ],
             ).marginOnly(top: 5),
+
             Row(
               children: [
                 MyTextView(
-                  "Reviews".tr + ":",
+                  "Turn-Up Rate".tr + ":",
                   marginRight: 3,
                   textColor: ColorConstants.black66,
                   fontSize: 13,
                   isFontRegular: true,
                 ),
                 MyTextView(
-                  item.reviewsAvg ?? "-",
+                  item.turnUpRate ?? "-",
                   textColor: ColorConstants.black66,
                   fontSize: 13,
                   isFontRegular: true,
@@ -526,41 +533,34 @@ class _AppliedAddStaffState extends State<AppliedAddStaff> {
             Row(
               children: [
                 MyTextView(
-                  "Skills".tr + ":",
+                  "Reviews".tr + ":",
                   marginRight: 3,
                   textColor: ColorConstants.black66,
                   fontSize: 13,
                   isFontRegular: true,
                 ),
                 MyTextView(
-                  item.skills ?? "-",
+                  item.reviewsAvg ?? "-",
                   textColor: ColorConstants.black66,
                   fontSize: 13,
                   isFontRegular: true,
-                ).expanded(),
+                ),
               ],
             ).marginOnly(top: 5),
-
             Row(
               children: [
                 MyTextView(
-                  "CV".tr + ":",
+                  "Skills".tr + ":",
                   marginRight: 3,
                   textColor: ColorConstants.black66,
                   fontSize: 13,
                   isFontRegular: true,
                 ),
                 MyTextView(
-                  item.resume ?? "-",
+                  item.skills ?? "-",
                   textColor: ColorConstants.black66,
                   fontSize: 13,
                   isFontRegular: true,
-                  onClick: (){
-                    // 点击查看 打开webview 页面
-                    if(item.resume?.isNotEmpty == true && Utils.isNetworkUrl(item.resume!)){
-                      controller.handlerScanFile(item.resume!);
-                    }
-                  },
                 ).expanded(),
               ],
             ).marginOnly(top: 5),

+ 20 - 19
packages/cpt_uk/lib/modules/job/labour_request_preselected_list/widget/preselected_add_staff.dart

@@ -251,11 +251,12 @@ class _PreselectedAddStaffState extends State<PreselectedAddStaff> {
                   width: 0.5, // 设置边框宽度
                 ),
                 textHintColor: Color(0XFFAFB3B7),
+                textFontSize: 12.0,
                 textColor: ColorConstants.black33,
                 onSearch: (keyword) {
                   controller.searchInputSearch(keyword);
                 },
-                hintText: "Staff Name/ID/Phone".tr,
+                hintText: "Staff Name/Loction".tr,
                 controller: controller.searchController,
               ),
             ),
@@ -488,79 +489,79 @@ class _PreselectedAddStaffState extends State<PreselectedAddStaff> {
             //       ),
             //     ]
             // ).marginOnly(top: 5),
-
             Row(
               children: [
                 MyTextView(
-                  "Turn-Up Rate".tr + ":",
+                  "CV".tr + ":",
                   marginRight: 3,
                   textColor: ColorConstants.black66,
                   fontSize: 13,
                   isFontRegular: true,
                 ),
                 MyTextView(
-                  item.turnUpRate ?? "-",
+                  (item.resume ==null || item.resume!.isEmpty == true)? "-": item.resume!,
                   textColor: ColorConstants.black66,
                   fontSize: 13,
                   isFontRegular: true,
-                ),
+                  onClick: (){
+                    // 点击查看 打开webview 页面
+                    if(item.resume?.isNotEmpty == true && Utils.isNetworkUrl(item.resume!)){
+                      controller.handlerScanFile(item.resume!);
+                    }
+                  },
+                ).expanded(),
               ],
             ).marginOnly(top: 5),
+
             Row(
               children: [
                 MyTextView(
-                  "Reviews".tr + ":",
+                  "Turn-Up Rate".tr + ":",
                   marginRight: 3,
                   textColor: ColorConstants.black66,
                   fontSize: 13,
                   isFontRegular: true,
                 ),
                 MyTextView(
-                  item.reviewsAvg ?? "-",
+                  item.turnUpRate ?? "-",
                   textColor: ColorConstants.black66,
                   fontSize: 13,
                   isFontRegular: true,
                 ),
               ],
             ).marginOnly(top: 5),
+
             Row(
               children: [
                 MyTextView(
-                  "Skills".tr + ":",
+                  "Reviews".tr + ":",
                   marginRight: 3,
                   textColor: ColorConstants.black66,
                   fontSize: 13,
                   isFontRegular: true,
                 ),
                 MyTextView(
-                  item.skills ?? "-",
+                  item.reviewsAvg ?? "-",
                   textColor: ColorConstants.black66,
                   fontSize: 13,
                   isFontRegular: true,
-                ).expanded(),
+                ),
               ],
             ).marginOnly(top: 5),
-
             Row(
               children: [
                 MyTextView(
-                  "CV".tr + ":",
+                  "Skills".tr + ":",
                   marginRight: 3,
                   textColor: ColorConstants.black66,
                   fontSize: 13,
                   isFontRegular: true,
                 ),
                 MyTextView(
-                  item.resume ?? "-",
+                  item.skills ?? "-",
                   textColor: ColorConstants.black66,
                   fontSize: 13,
                   isFontRegular: true,
-                  onClick: (){
-                    // 点击查看 打开webview 页面
-                    if(item.resume?.isNotEmpty == true && Utils.isNetworkUrl(item.resume!)){
-                      controller.handlerScanFile(item.resume!);
-                    }
-                  },
                 ).expanded(),
               ],
             ).marginOnly(top: 5),

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

@@ -370,6 +370,9 @@ const Map<String, String> en_US = {
   'Video Image': 'Video Image',
   'Video Document': 'Video Document',
   'Choose File...': 'Please choose...',
+  'Choose Industry': 'Choose Industry',
+  'Choose JobTitle': 'Choose JobTitle',
+  'Staff Name/Loction': 'Staff Name/Loction',
 
   //插件的国际化
   'Pull to refresh': 'Pull to refresh',

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

@@ -371,7 +371,9 @@ const Map<String, String> zh_CN = {
   'Video Image': '视频图片',
   'Video Document': '视频文档',
   'Choose File...': '请选择...',
-
+  'Choose Industry': '选择行业',
+  'Choose JobTitle': '选择职位',
+  'Staff Name/Loction': '员工姓名/工作地点',
 
   //插件的国际化
   'Pull to refresh': '下拉刷新',

+ 4 - 1
packages/cs_widgets/lib/search_app_bar.dart

@@ -25,6 +25,7 @@ class SearchAppBar extends StatefulWidget {
     this.searchBarBorder,
     this.margin,
     this.textColor = Colors.white,
+    this.textFontSize = 15.0,
     this.onChanged,
     this.onSearch,
   }) : super(key: key);
@@ -54,6 +55,8 @@ class SearchAppBar extends StatefulWidget {
 
   Color textColor;
 
+  double? textFontSize;
+
   BoxBorder? searchBarBorder;
 
   String? value;
@@ -150,7 +153,7 @@ class _SearchAppBarState extends State<SearchAppBar> {
                 hintText: widget.hintText,
                 hintStyle: TextStyle(
                   color: widget.textHintColor ?? Color(0xFFAECAE5),
-                  fontSize: 15.0,
+                  fontSize: widget.textFontSize?? 15.0,
                   fontWeight: FontWeight.w400,
                 ),
               ),