Переглянути джерело

新加坡的新版酒店系统的反馈修改

liukai 1 тиждень тому
батько
коміт
032ff494cb

+ 2 - 2
packages/cpt_labour_sg/lib/modules/labour_request_add/labour_request_add_controller.dart

@@ -104,7 +104,7 @@ class LabourRequestAddController extends GetxController with DioCancelableMixin
 
     DatePickerUtil.showCupertinoDatePicker(
       selectedDateTime: state.selectedRepeatStartTime,
-      mode: CupertinoDatePickerMode.dateAndTime,
+      mode: CupertinoDatePickerMode.date,
       onDateTimeChanged: (date) {
         state.selectedRepeatStartTime = date;
         update();
@@ -120,7 +120,7 @@ class LabourRequestAddController extends GetxController with DioCancelableMixin
 
     DatePickerUtil.showCupertinoDatePicker(
       selectedDateTime: state.selectedRepeatEndTime ?? state.selectedRepeatStartTime,
-      mode: CupertinoDatePickerMode.dateAndTime,
+      mode: CupertinoDatePickerMode.date,
       onDateTimeChanged: (date) {
         state.selectedRepeatEndTime = date;
         update();

+ 1 - 0
packages/cpt_labour_sg/lib/modules/labour_request_list/labour_request_filter.dart

@@ -8,6 +8,7 @@ import 'package:flutter/widgets.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:shared/utils/date_time_utils.dart';
+import 'package:shared/utils/log_utils.dart';
 import 'package:shared/utils/screen_util.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:cs_resources/constants/color_constants.dart';

+ 2 - 2
packages/cs_domain/lib/entity/response/labour_request_index_entity.dart

@@ -26,7 +26,7 @@ class LabourRequestIndexEntity {
 
 @JsonSerializable()
 class LabourRequestIndexDepartmentList {
-	int? value = 0;
+	String? value = '';
 	String? txt = '';
 	String? selected = '';
 
@@ -44,7 +44,7 @@ class LabourRequestIndexDepartmentList {
 
 @JsonSerializable()
 class LabourRequestIndexStatusList {
-	int? value = 0;
+	String? value = '';
 	String? txt = '';
 	String? selected = '';
 

+ 4 - 4
packages/cs_domain/lib/generated/json/labour_request_index_entity.g.dart

@@ -44,7 +44,7 @@ extension LabourRequestIndexEntityExtension on LabourRequestIndexEntity {
 
 LabourRequestIndexDepartmentList $LabourRequestIndexDepartmentListFromJson(Map<String, dynamic> json) {
   final LabourRequestIndexDepartmentList labourRequestIndexDepartmentList = LabourRequestIndexDepartmentList();
-  final int? value = jsonConvert.convert<int>(json['value']);
+  final String? value = jsonConvert.convert<String>(json['value']);
   if (value != null) {
     labourRequestIndexDepartmentList.value = value;
   }
@@ -69,7 +69,7 @@ Map<String, dynamic> $LabourRequestIndexDepartmentListToJson(LabourRequestIndexD
 
 extension LabourRequestIndexDepartmentListExtension on LabourRequestIndexDepartmentList {
   LabourRequestIndexDepartmentList copyWith({
-    int? value,
+    String? value,
     String? txt,
     String? selected,
   }) {
@@ -82,7 +82,7 @@ extension LabourRequestIndexDepartmentListExtension on LabourRequestIndexDepartm
 
 LabourRequestIndexStatusList $LabourRequestIndexStatusListFromJson(Map<String, dynamic> json) {
   final LabourRequestIndexStatusList labourRequestIndexStatusList = LabourRequestIndexStatusList();
-  final int? value = jsonConvert.convert<int>(json['value']);
+  final String? value = jsonConvert.convert<String>(json['value']);
   if (value != null) {
     labourRequestIndexStatusList.value = value;
   }
@@ -107,7 +107,7 @@ Map<String, dynamic> $LabourRequestIndexStatusListToJson(LabourRequestIndexStatu
 
 extension LabourRequestIndexStatusListExtension on LabourRequestIndexStatusList {
   LabourRequestIndexStatusList copyWith({
-    int? value,
+    String? value,
     String? txt,
     String? selected,
   }) {

+ 2 - 2
packages/cs_domain/lib/repository/labour_sg_repository.dart

@@ -884,10 +884,10 @@ class LabourSGRepository extends GetxService {
       params["job_end"] = endDate!;
     }
     if (!Utils.isEmpty(statusId)) {
-      params["co_status"] = statusId!;
+      params["status"] = statusId!;
     }
     if (!Utils.isEmpty(departmentId)) {
-      params["co_department_id"] = departmentId!;
+      params["outlet_id"] = departmentId!;
     }
 
     final result = await httpProvider.requestNetResult(