feat: date picker on inout page

lib/screens/inventory_inout/components/custom_app_bar.dart

@@ -59,33 +59,16 @@ class CustomAppBar extends StatelessWidget {
         showCupertinoModalPopup(
           context: Get.overlayContext!,
           builder: (BuildContext context) {
-            return ZtBaseDatePicker();
+            return ZtBaseDatePicker(
+              initialDate: controller.endTime.value,
+              endDate: controller.endTime.value,
+              onDateTimeChanged: (date) {
+                controller.endTime.value = DateTime.parse(date);
+                controller.getData();
+              },
+            );
           },
         );
-        // showCupertinoModalPopup(
-        //   context: Get.overlayContext!,
-        //   builder: (BuildContext context) {
-        //     return Container(
-        //       height: 200,
-        //       color: Colors.white,
-        //       child: CupertinoDatePicker(
-        //         mode: CupertinoDatePickerMode.date,
-        //         initialDateTime: DateTime.now(),
-        //         onDateTimeChanged: (DateTime newDateTime) {
-        //           // 处理用户选择的日期
-        //         },
-        //       ),
-        //     );
-        //   },
-        // );
-        // final picker = await CupertinoDatePicker(
-        //     context: Get.overlayContext!,
-        //     initialDate: DateTime.now(),
-        //     helpText: '选择的日期',
-        //     confirmText: '确定',
-        //     cancelText: '取消',
-        //     firstDate: DateTime(2000, 1, 1),
-        //     lastDate: DateTime.now().add(const Duration(days: 7)));
       },
       child: Container(
         height: ScreenAdaper.height(70),
@@ -93,7 +76,7 @@ class CustomAppBar extends StatelessWidget {
         decoration: BoxDecoration(
             borderRadius: BorderRadius.circular(20),
             color: AppTheme.primaryColorLight,
-            gradient: LinearGradient(colors: [
+            gradient: const LinearGradient(colors: [
               AppTheme.primaryColorLight,
               AppTheme.primaryColor,
             ]),

lib/screens/inventory_inout/components/dates.dart

@@ -14,7 +14,8 @@ class Dates extends StatelessWidget {
       children: [
         Obx(
           () => Text(
-            DateUtil.getMonth(DateTime.now().add(Duration(days: -index))),
+            DateUtil.getMonth(
+                controller.endTime.value.add(Duration(days: -index))),
             style: TextStyle(
                 color: controller.currentIndex.value == index
                     ? Colors.white
@@ -26,7 +27,8 @@ class Dates extends StatelessWidget {
         ),
         Obx(
           () => Text(
-            DateUtil.getDate(DateTime.now().add(Duration(days: -index))),
+            DateUtil.getDate(
+                controller.endTime.value.add(Duration(days: -index))),
             style: TextStyle(
                 color: controller.currentIndex.value == index
                     ? Colors.white
@@ -38,7 +40,8 @@ class Dates extends StatelessWidget {
         ),
         Obx(
           () => Text(
-            DateUtil.getDay(DateTime.now().add(Duration(days: -index))),
+            DateUtil.getDay(
+                controller.endTime.value.add(Duration(days: -index))),
             style: TextStyle(
                 color: controller.currentIndex.value == index
                     ? Colors.white

lib/screens/inventory_inout/components/inventory_inout_info.dart

@@ -181,7 +181,6 @@ class InventoryInouInfoController extends GetxController {
   }
 
   Future<void> getData() async {
-    printInfo(info: '$inventoryInoutId');
     await Future.delayed(const Duration(milliseconds: 500));
     final res = await Api.getInventoryInOutInfo(inventoryInoutId);
     if (res.data != null) {

lib/screens/inventory_inout/components/inventory_inout_page_View.dart

@@ -12,7 +12,7 @@ class InventoryInoutView extends StatelessWidget {
         physics: const BouncingScrollPhysics(),
         reverse: true,
         onPageChanged: (index) {
-          controller.changePage(index);
+          controller.setIndex(index);
         },
         controller: controller.pageController,
         children: List.generate(

lib/screens/inventory_inout/components/task_list.dart

@@ -6,6 +6,7 @@ import 'package:sk_base_mobile/screens/inventory_inout/components/responsive.dar
 import 'package:sk_base_mobile/screens/inventory_inout/components/inventory_inout_card.dart';
 import 'package:sk_base_mobile/screens/inventory_inout/inventory_inout_controller.dart';
 import 'package:sk_base_mobile/util/util.dart';
+import 'package:sk_base_mobile/widgets/loading_indicator.dart';
 
 class TaskList extends StatelessWidget {
   const TaskList({super.key, required this.index});
@@ -43,28 +44,30 @@ class Grid extends StatelessWidget {
       required this.ind});
   @override
   Widget build(BuildContext context) {
-    return Obx(() => controller.list[ind].isEmpty
+    return Obx(() => controller.loading.value
-        ? Center(
+        ? const LoadingIndicator(common: true)
-            child: Text(
+        : controller.list[ind].isEmpty
-              TextEnum.noInventoryInout,
+            ? Center(
-              style: TextStyle(
+                child: Text(
-                  color: AppTheme.black,
+                  TextEnum.noInventoryInout,
-                  fontWeight: FontWeight.w600,
+                  style: TextStyle(
-                  letterSpacing: ScreenAdaper.width(2),
+                      color: AppTheme.black,
-                  fontSize: ScreenAdaper.sp(30)),
+                      fontWeight: FontWeight.w600,
-            ),
+                      letterSpacing: ScreenAdaper.width(2),
-          )
+                      fontSize: ScreenAdaper.sp(30)),
-        : GridView.builder(
+                ),
-            padding: const EdgeInsets.only(top: 40),
+              )
-            itemCount: controller.list[ind].length,
+            : GridView.builder(
-            gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+                padding: const EdgeInsets.only(top: 40),
-                crossAxisCount: crossAsis, childAspectRatio: ratio),
+                itemCount: controller.list[ind].length,
-            itemBuilder: (context, index) {
+                gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-              return InventoryInoutCard(
+                    crossAxisCount: crossAsis, childAspectRatio: ratio),
-                index: index,
+                itemBuilder: (context, index) {
-                ind: ind,
+                  return InventoryInoutCard(
-              );
+                    index: index,
-            },
+                    ind: ind,
-          ));
+                  );
+                },
+              ));
   }
 }

lib/screens/inventory_inout/components/upper_body.dart

@@ -20,6 +20,7 @@ class UperBody extends StatelessWidget {
         SizedBox(
           height: ScreenAdaper.height(150),
           child: ListView.builder(
+            key: PageStorageKey<String>('${controller.endTime.value}'),
             controller: controller.scrollController,
             shrinkWrap: true,
             reverse: true,

lib/screens/inventory_inout/inventory_inout_controller.dart

@@ -17,7 +17,7 @@ class InventoryInoutController extends GetxController {
   RxMap userData = {}.obs;
   RxInt currentIndex = 0.obs;
   final PageController pageController = PageController();
-  final DateTime dateTime = DateTime.now();
+  Rx<DateTime> endTime = Rx<DateTime>(DateTime.now());
   final DbHelper db = DbHelper();
   List<RxList<InventoryInOutModel>> list = [
     <InventoryInOutModel>[].obs,
@@ -32,17 +32,13 @@ class InventoryInoutController extends GetxController {
   RxList model = [].obs;
   final ScrollController scrollController = ScrollController();
   final daysNum = 20;
+  RxBool loading = RxBool(false);
   @override
   onReady() {
     super.onReady();
     getData();
   }
 
-  Future<void> changePage(int index) async {
-    LoggerUtil()
-        .info(DateUtil.format(DateTime.now().add(Duration(days: -index))));
-  }
-
   /// 打开出库还是入库选择框
   Future<void> showInOrOutPickerDialog() async {
     showDialog(
@@ -253,17 +249,25 @@ class InventoryInoutController extends GetxController {
   }
 
   Future<List<InventoryInOutModel>> getInoutHistory() async {
-    final res = await Api.getInventoryInout({});
+    loading.value = true;
-    printInfo(info: res.toString());
+    await Future.delayed(const Duration(milliseconds: 500));
-    if (res.data != null) {
+    final selectedDate =
-      return res.data!.items
+        DateUtil.format(endTime.value.add(Duration(days: -currentIndex.value)));
-          .map((e) => InventoryInOutModel.fromJson(e))
+    try {
-          .toList();
+      final res = await Api.getInventoryInout({
+        'time': [selectedDate, selectedDate]
+      });
+      if (res.data != null) {
+        return res.data!.items
+            .map((e) => InventoryInOutModel.fromJson(e))
+            .toList();
+      }
+      return [];
+    } catch (e) {
+      return [];
+    } finally {
+      loading.value = false;
     }
-    return [];
-    // final List<Map<String, Object?>> queryResult =
-    //     await dbClient!.query('Tasks');
-    // return queryResult.map((e) => TaskModel.fromMap(e)).toList();
   }
 
   getData() async {
@@ -277,10 +281,12 @@ class InventoryInoutController extends GetxController {
     pageController.animateToPage(value,
         duration: const Duration(milliseconds: 300), curve: Curves.easeIn);
     currentIndex.value = value;
+    getData();
   }
 
   getDateAccordingTabs(int value) {
-    return DateUtil.format(dateTime.add(Duration(days: -(daysNum - value))));
+    return DateUtil.format(
+        endTime.value.add(Duration(days: -(daysNum - value))));
   }
 
   getSepretLists() {

lib/screens/landing/landing.dart

@@ -13,7 +13,6 @@ class LandingPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    printInfo(info: 'landing');
     return Material(
       child: Stack(children: [
         const BackColors(),

lib/screens/new_inventory_inout/new_inventory_inout.dart

@@ -327,11 +327,6 @@ class NewInventoryInout extends StatelessWidget {
             floatingLabelBehavior: FloatingLabelBehavior.always),
         readOnly: true,
         onTap: () {
-          printInfo(
-              info: firstLevelData
-                  .map((e) => Center(child: (Text(e.label))))
-                  .toList()
-                  .toString());
           ModalUtil.showBottomSheetPicker(
               title: '库存位置',
               firstLevel: firstLevelData

lib/widgets/core/zt_base_date_picker.dart

@@ -5,17 +5,23 @@ import 'package:sk_base_mobile/util/logger_util.dart';
 import 'package:sk_base_mobile/util/screen_adaper_util.dart';
 
 class ZtBaseDatePicker extends StatelessWidget {
-  final Function? onDateTimeChanged;
+  final Function(String)? onDateTimeChanged;
-  final yearController =
+  late final FixedExtentScrollController yearController;
-      FixedExtentScrollController(initialItem: DateTime.now().year - 2000);
+  late final FixedExtentScrollController monthController;
-  final monthController =
+  late final FixedExtentScrollController dayController;
-      FixedExtentScrollController(initialItem: DateTime.now().month - 1);
+  DateTime? initialDate = DateTime.now();
-  final dayController =
+  DateTime? endDate = DateTime.now();
-      FixedExtentScrollController(initialItem: DateTime.now().day - 1);
+  ZtBaseDatePicker(
-  ZtBaseDatePicker({super.key, this.onDateTimeChanged});
+      {super.key, this.onDateTimeChanged, this.initialDate, this.endDate});
 
   @override
   Widget build(BuildContext context) {
+    yearController = FixedExtentScrollController(
+        initialItem: (initialDate ?? DateTime.now()).year - 2000);
+    monthController = FixedExtentScrollController(
+        initialItem: (initialDate ?? DateTime.now()).month - 1);
+    dayController = FixedExtentScrollController(
+        initialItem: (initialDate ?? DateTime.now()).day - 1);
     return Container(
       height: ScreenAdaper.height(250),
       color: Colors.white,

lib/widgets/loading_indicator.dart

@@ -13,11 +13,11 @@ class LoadingIndicator extends StatelessWidget {
   Widget build(BuildContext context) {
     return common
         ? LoadingAnimationWidget.fourRotatingDots(
-            color: AppTheme.primaryColorLight, size: ScreenAdaper.sp(40))
+            color: AppTheme.primaryColorLight, size: ScreenAdaper.sp(50))
         : CupertinoActivityIndicator(
             animating: animating,
             color: AppTheme.primaryColor,
-            radius: ScreenAdaper.sp(20),
+            radius: ScreenAdaper.sp(25),
           );
   }
 }