展示扦样完成详情

lib/base/base_lifecycle_state.dart

@@ -1,6 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:lszlgl/base/base_state.dart';
+
+export 'package:lszlgl/config/pics.dart';
+export 'package:lszlgl/router/my_navigator.dart';
+export 'package:lszlgl/router/my_router.dart';
 export 'package:lszlgl/ext/value_notifier_ext.dart';
 
 /// 页面生命周期基类

lib/config/reresh_config.dart

@@ -0,0 +1,39 @@
+import 'package:easy_refresh/easy_refresh.dart';
+
+class RefreshConfig {
+  RefreshConfig._();
+
+  static RefreshConfig? _instance;
+
+  static RefreshConfig get() => _instance ?? RefreshConfig._();
+
+  void initDefault({
+    ClassicHeader? header,
+    ClassicFooter? footer,
+  }) {
+    EasyRefresh.defaultHeaderBuilder = () =>
+        header ??
+        const ClassicHeader(
+          dragText: '下拉刷新',
+          armedText: '释放开始',
+          readyText: '刷新中...',
+          processingText: '刷新中...',
+          processedText: '成功了',
+          noMoreText: '已加载全部',
+          failedText: '刷新失败',
+          messageText: '最后更新于 %T',
+        );
+    EasyRefresh.defaultFooterBuilder = () =>
+        footer ??
+        const ClassicFooter(
+          dragText: '上拉加载',
+          armedText: '释放开始',
+          readyText: '加载中...',
+          processingText: '加载中...',
+          processedText: '成功了',
+          noMoreText: '已加载全部',
+          failedText: '加载失败',
+          messageText: '最后更新于 %T',
+        );
+  }
+}

lib/main.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:isolate';
 
-import 'package:easy_refresh/easy_refresh.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
@@ -11,6 +10,8 @@ import 'package:lszlgl/network/base_dio.dart';
 import 'package:lszlgl/router/my_navigator.dart';
 import 'package:lszlgl/utils/sp_utils.dart';
 
+import 'config/reresh_config.dart';
+
 late Logger logger;
 
 void main() async {
@@ -22,29 +23,8 @@ void main() async {
       DeviceOrientation.portraitDown,
     ]);
     BaseDio.get().init();
-
     await SPUtils.getInstance().init();
-
-    EasyRefresh.defaultHeaderBuilder = () => const ClassicHeader(
-          dragText: '下拉刷新',
-          armedText: '释放开始',
-          readyText: '刷新中...',
-          processingText: '刷新中...',
-          processedText: '成功了',
-          noMoreText: '已加载全部',
-          failedText: '刷新失败',
-          messageText: '最后更新于 %T',
-        );
-    EasyRefresh.defaultFooterBuilder = () => const ClassicFooter(
-          dragText: '上拉加载',
-          armedText: '释放开始',
-          readyText: '加载中...',
-          processingText: '加载中...',
-          processedText: '成功了',
-          noMoreText: '已加载全部',
-          failedText: '加载失败',
-          messageText: '最后更新于 %T',
-        );
+    RefreshConfig.get().initDefault();
     runApp(const MyApp());
   });
 }

lib/model/req/sample_task_list_req.dart

@@ -0,0 +1,29 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'sample_task_list_req.g.dart';
+
+@JsonSerializable()
+class SampleTaskListReq {
+  /// 页码
+  int pageNo;
+
+  /// 条目
+  int pageSize;
+
+  /// 任务单任务状态：0是待扦样,1已扦样
+  int? deliveryStatus;
+
+  /// 环节类型：1收获环节,2库存环节
+  int? rwlx;
+
+  SampleTaskListReq({
+    this.pageNo = 1,
+    this.pageSize = 10,
+    this.deliveryStatus,
+    this.rwlx,
+  });
+
+  factory SampleTaskListReq.fromJson(Map<String, dynamic> json) => _$SampleTaskListReqFromJson(json);
+
+  Map<String, dynamic> toJson() => _$SampleTaskListReqToJson(this);
+}

lib/network/api.dart

@@ -31,10 +31,5 @@ abstract class Api {
 
   /// 扦样任务单列表
   @GET('/admin-api/zj/code-sampling-task-details-sgjc/sampling_task_detail_page')
-  Future<ApiRsp<SampleTaskListRsp>> sampleTaskList(
-    @Query('pageNo') int pageNo,
-    @Query('pageSize') int pageSize, {
-    @Query('deliveryStatus') int? deliveryStatus,
-    @Query('rwlx') int? rwlx,
-  });
+  Future<ApiRsp<SampleTaskListRsp>> sampleTaskList(@Queries() Map<String, dynamic> map);
 }

lib/page/home/home_page.dart

@@ -3,7 +3,7 @@ import 'package:card_swiper/card_swiper.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:lszlgl/base/base_state.dart';
-import 'package:lszlgl/page/reap_step/sample_task_list_tab_page.dart';
+import 'package:lszlgl/page/sample_task/sample_task_list_tab_page.dart';
 
 /// 首页
 class HomePage extends StatefulWidget {

lib/page/login/login_page.dart

@@ -50,7 +50,7 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
       await UserService.get().saveUser(user.data);
       // 获取字典
       var dictData = await Api().getAllDict();
-      DictService.get().saveDictList(dictData.data);
+      DictService.saveDictList(dictData.data);
       // 进入主页
       SmartDialog.dismiss(status: SmartStatus.loading);
       startHome();

lib/page/reap_step/reap_sample_detail/reap_sample_basic_detail_page.dart

@@ -1,63 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:lszlgl/base/base_state.dart';
-import 'package:lszlgl/widget/button.dart';
-import 'package:lszlgl/widget/card_item.dart';
-
-/// 收获扦样-基础信息
-class ReapSampleBasicDetailPage extends StatefulWidget {
-
-  const ReapSampleBasicDetailPage({
-    super.key,
-  });
-
-  @override
-  State<ReapSampleBasicDetailPage> createState() => _ReapSampleBasicDetailPageState();
-}
-
-class _ReapSampleBasicDetailPageState extends BaseState<ReapSampleBasicDetailPage> with AutomaticKeepAliveClientMixin {
-  @override
-  bool get wantKeepAlive => true;
-
-  @override
-  Widget build(BuildContext context) {
-    super.build(context);
-    return Column(
-      children: [
-        Expanded(child: SingleChildScrollView(child: buildList())),
-        buildButton(),
-      ],
-    );
-  }
-
-  Widget buildList() {
-    return Column(
-      children: [
-        CardItemWidget('扦样任务单号', rightText: '*****************', bottomLine: true),
-        CardItemWidget('扦样单位', rightText: '自动生成', bottomLine: true),
-        CardItemWidget('扦样人员', rightText: '李飞', bottomLine: true),
-        CardItemWidget('任务类型', rightText: '收购监测', bottomLine: true),
-        CardItemWidget('省份选择', rightText: '北京市', bottomLine: true),
-        CardItemWidget('市区选择', rightText: '市辖区', bottomLine: true),
-        CardItemWidget('区县选择', rightText: '平谷区', bottomLine: true),
-        CardItemWidget('乡镇选择', rightText: '黄松峪乡', bottomLine: true),
-        CardItemWidget('村选择', rightText: '黑豆峪村', bottomLine: true),
-        CardItemWidget('扦样地点经纬度', rightText: '经度118.17，纬度26.18', bottomLine: true),
-        CardItemWidget('种植面积（亩地）', rightText: '500', bottomLine: true),
-        CardItemWidget('土壤地理类型', rightText: '***********', bottomLine: true),
-        CardItemWidget('被调查农户或合作社', rightText: '***********', bottomLine: true),
-        CardItemWidget('联系方式', rightText: '***********', bottomLine: true),
-      ],
-    );
-  }
-
-  Widget buildButton() {
-    return Container(
-      color: const Color(0xFFF1F7F6),
-      padding: const EdgeInsets.all(12),
-      child: MyButton(
-        '重新录入',
-        onTap: () => MyRouter.startReapSampleTask(),
-      ),
-    );
-  }
-}

lib/page/reap_step/reap_sample_detail/reap_sample_variety_detail_page.dart

@@ -1,61 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:lszlgl/base/base_state.dart';
-import 'package:lszlgl/widget/button.dart';
-import 'package:lszlgl/widget/card_item.dart';
-
-/// 收获扦样-品种信息
-class ReapSampleVarietyDetailPage extends StatefulWidget {
-  const ReapSampleVarietyDetailPage({
-    super.key,
-  });
-
-  @override
-  State<ReapSampleVarietyDetailPage> createState() => _ReapSampleVarietyDetailPageState();
-}
-
-class _ReapSampleVarietyDetailPageState extends BaseState<ReapSampleVarietyDetailPage>
-    with AutomaticKeepAliveClientMixin {
-  @override
-  bool get wantKeepAlive => true;
-
-  @override
-  Widget build(BuildContext context) {
-    super.build(context);
-    return Column(
-      children: [
-        Expanded(child: SingleChildScrollView(child: buildList())),
-        buildButton(),
-      ],
-    );
-  }
-
-  Widget buildList() {
-    return Column(
-      children: [
-        CardItemWidget('采样品种', rightText: '****', bottomLine: true),
-        CardItemWidget('粮食品类', rightText: '****', bottomLine: true),
-        CardItemWidget('样品编号', rightText: '****', bottomLine: true),
-        CardItemWidget('种植品种', rightText: '****', bottomLine: true),
-        CardItemWidget('是否优质品种', rightText: '****', bottomLine: true),
-        CardItemWidget('优质品种类型', rightText: '****', bottomLine: true),
-        CardItemWidget('收获时间', rightText: '****', bottomLine: true),
-        CardItemWidget('扦样时间', rightText: '****', bottomLine: true),
-        CardItemWidget('扦样数量（公斤）', rightText: '****', bottomLine: true),
-        CardItemWidget('扦样代表数量（公斤）', rightText: '****', bottomLine: true),
-        CardItemWidget('温度（℃）', rightText: '****', bottomLine: true),
-        CardItemWidget('湿度（%）', rightText: '****'),
-      ],
-    );
-  }
-
-  Widget buildButton() {
-    return Container(
-      color: const Color(0xFFF1F7F6),
-      padding: const EdgeInsets.all(12),
-      child: MyButton(
-        '重新录入',
-        onTap: () => MyRouter.startReapSampleTask(),
-      ),
-    );
-  }
-}

lib/page/reap_step/sample_list_vm.dart

@@ -1,21 +0,0 @@
-import 'package:easy_refresh/easy_refresh.dart';
-import 'package:lszlgl/base/base_vm.dart';
-
-class SampleListVM extends BaseVM {
-  late final EasyRefreshController aCtrl;
-  late final EasyRefreshController bCtrl;
-
-  SampleListVM() {
-    aCtrl = EasyRefreshController(controlFinishRefresh: true, controlFinishLoad: true);
-    bCtrl = EasyRefreshController(controlFinishRefresh: true, controlFinishLoad: true);
-  }
-
-
-
-  @override
-  void dispose() {
-    aCtrl.dispose();
-    bCtrl.dispose();
-    super.dispose();
-  }
-}

lib/page/sample_task/reap_sample_detail/reap_sample_basic_detail_page.dart

@@ -0,0 +1,80 @@
+import 'package:flutter/material.dart';
+import '../../../base/base_lifecycle_state.dart';
+import '../../../model/rsp/sample_task_rsp.dart';
+import '../../../service/dict_service.dart';
+import '../../../widget/button.dart';
+import '../../../widget/card_item.dart';
+
+/// 收获扦样-基础信息
+class ReapSampleBasicDetailPage extends StatefulWidget {
+  final SampleTaskItem? data;
+
+  const ReapSampleBasicDetailPage(this.data, {super.key});
+
+  @override
+  State<ReapSampleBasicDetailPage> createState() => _ReapSampleBasicDetailPageState();
+}
+
+class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasicDetailPage>
+    with AutomaticKeepAliveClientMixin {
+  SampleTaskItem? data;
+
+  @override
+  void onInit() {
+    data = widget.data;
+  }
+
+  @override
+  bool get wantKeepAlive => true;
+
+  @override
+  Widget build(BuildContext context) {
+    super.build(context);
+    return Column(
+      children: [
+        Expanded(child: SingleChildScrollView(child: buildList())),
+        buildButton(),
+      ],
+    );
+  }
+
+  Widget buildList() {
+    return Column(
+      children: [
+        CardItemWidget('扦样任务单号', rightText: data?.qyrwdh, bottomLine: true),
+        CardItemWidget('扦样单位', rightText: data?.dwmc, bottomLine: true),
+        CardItemWidget('扦样人员', rightText: data?.name, bottomLine: true),
+        CardItemWidget(
+          '监测类别',
+          rightText: DictService.getLabel(DictType.jclb, value: data?.jclb),
+          bottomLine: true,
+        ),
+        CardItemWidget('省份', rightText: data?.sheng, bottomLine: true),
+        CardItemWidget('市区', rightText: data?.shi, bottomLine: true),
+        CardItemWidget('区县', rightText: data?.qu, bottomLine: true),
+        CardItemWidget('乡镇', rightText: data?.xian, bottomLine: true),
+        CardItemWidget('村', rightText: data?.cun, bottomLine: true),
+        CardItemWidget('扦样地点经纬度', rightText: data?.qyddjwd, bottomLine: true),
+        CardItemWidget('种植面积（亩地）', rightText: data?.zzmj?.toString(), bottomLine: true),
+        CardItemWidget(
+          '土壤地理类型',
+          rightText: DictService.getLabel(DictType.jclb, value: data?.trdllx),
+          bottomLine: true,
+        ),
+        CardItemWidget('被调查农户或合作社', rightText: data?.bdcnhhhzs, bottomLine: true),
+        CardItemWidget('联系方式', rightText: data?.lxfs, bottomLine: true),
+      ],
+    );
+  }
+
+  Widget buildButton() {
+    return Container(
+      color: const Color(0xFFF1F7F6),
+      padding: const EdgeInsets.all(12),
+      child: MyButton(
+        '重新录入',
+        onTap: () => MyRouter.startReapSampleTask(),
+      ),
+    );
+  }
+}

lib/page/reap_step/reap_sample_detail/reap_sample_disaster_detail_page.dart

@@ -3,11 +3,13 @@ import 'package:lszlgl/base/base_state.dart';
 import 'package:lszlgl/widget/button.dart';
 import 'package:lszlgl/widget/card_item.dart';
 
+import '../../../model/rsp/sample_task_rsp.dart';
+
 /// 收获扦样-灾害污染
 class ReapSampleDisasterDetailPage extends StatefulWidget {
-  const ReapSampleDisasterDetailPage({
-    super.key,
-  });
+  final SampleTaskItem? data;
+
+  const ReapSampleDisasterDetailPage(this.data, {super.key});
 
   @override
   State<ReapSampleDisasterDetailPage> createState() => _ReapSampleDisasterDetailPageState();

lib/page/reap_step/reap_sample_detail/reap_sample_medicine_detail_page.dart

@@ -3,11 +3,13 @@ import 'package:lszlgl/base/base_state.dart';
 import 'package:lszlgl/widget/button.dart';
 import 'package:lszlgl/widget/card_item.dart';
 
+import '../../../model/rsp/sample_task_rsp.dart';
+
 /// 收获扦样-用药情况
 class ReapSampleMedicineDetailPage extends StatefulWidget {
-  const ReapSampleMedicineDetailPage({
-    super.key,
-  });
+  final SampleTaskItem? data;
+
+  const ReapSampleMedicineDetailPage(this.data, {super.key});
 
   @override
   State<ReapSampleMedicineDetailPage> createState() => _ReapSampleMedicineDetailPageState();

lib/page/reap_step/reap_sample_detail/reap_sample_org_detail_page.dart

@@ -3,11 +3,13 @@ import 'package:lszlgl/base/base_state.dart';
 import 'package:lszlgl/widget/button.dart';
 import 'package:lszlgl/widget/card_item.dart';
 
+import '../../../model/rsp/sample_task_rsp.dart';
+
 /// 收获扦样-检验机构
 class ReapSampleOrgDetailPage extends StatefulWidget {
-  const ReapSampleOrgDetailPage({
-    super.key,
-  });
+  final SampleTaskItem? data;
+
+  const ReapSampleOrgDetailPage(this.data, {super.key});
 
   @override
   State<ReapSampleOrgDetailPage> createState() => _ReapSampleOrgDetailPageState();

lib/page/sample_task/reap_sample_detail/reap_sample_variety_detail_page.dart

@@ -0,0 +1,71 @@
+import 'package:flutter/material.dart';
+import 'package:lszlgl/base/base_lifecycle_state.dart';
+import 'package:lszlgl/base/base_state.dart';
+import 'package:lszlgl/widget/button.dart';
+import 'package:lszlgl/widget/card_item.dart';
+
+import '../../../model/rsp/sample_task_rsp.dart';
+
+/// 收获扦样-品种信息
+class ReapSampleVarietyDetailPage extends StatefulWidget {
+  final SampleTaskItem? data;
+
+  const ReapSampleVarietyDetailPage(this.data, {super.key});
+
+  @override
+  State<ReapSampleVarietyDetailPage> createState() => _ReapSampleVarietyDetailPageState();
+}
+
+class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVarietyDetailPage>
+    with AutomaticKeepAliveClientMixin {
+  SampleTaskItem? data;
+
+  @override
+  void onInit() {
+    data = widget.data;
+  }
+
+  @override
+  bool get wantKeepAlive => true;
+
+  @override
+  Widget build(BuildContext context) {
+    super.build(context);
+    return Column(
+      children: [
+        Expanded(child: SingleChildScrollView(child: buildList())),
+        buildButton(),
+      ],
+    );
+  }
+
+  Widget buildList() {
+    return Column(
+      children: [
+        CardItemWidget('采样品种', rightText: data?.cypzName, bottomLine: true),
+        CardItemWidget('粮食品类', rightText: data?.lspz, bottomLine: true),
+        CardItemWidget('样品编号', rightText: data?.ypbh, bottomLine: true),
+        CardItemWidget('种植品种', rightText: data?.zzpz, bottomLine: true),
+        CardItemWidget('是否优质品种', rightText: data?.sfyzpz?.toString(), bottomLine: true),
+        CardItemWidget('优质品种类型', rightText: data?.yzpzlx?.toString(), bottomLine: true),
+        CardItemWidget('收获时间', rightText: data?.shsj, bottomLine: true),
+        CardItemWidget('扦样时间', rightText: data?.qysj, bottomLine: true),
+        CardItemWidget('扦样数量（公斤）', rightText: data?.qysl?.toString(), bottomLine: true),
+        CardItemWidget('扦样代表数量（公斤）', rightText: data?.qydbsl?.toString(), bottomLine: true),
+        CardItemWidget('温度（℃）', rightText: data?.wendu?.toString(), bottomLine: true),
+        CardItemWidget('湿度（%）', rightText: data?.shidu?.toString()),
+      ],
+    );
+  }
+
+  Widget buildButton() {
+    return Container(
+      color: const Color(0xFFF1F7F6),
+      padding: const EdgeInsets.all(12),
+      child: MyButton(
+        '重新录入',
+        onTap: () => MyRouter.startReapSampleTask(),
+      ),
+    );
+  }
+}

lib/page/reap_step/reap_sample_task/reap_sample_task_page.dart

@@ -3,24 +3,43 @@ import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:lszlgl/base/base_state.dart';
 import 'package:lszlgl/config/colors.dart';
-import 'package:lszlgl/page/reap_step/reap_sample_detail/reap_sample_basic_detail_page.dart';
-import 'package:lszlgl/page/reap_step/reap_sample_detail/reap_sample_disaster_detail_page.dart';
-import 'package:lszlgl/page/reap_step/reap_sample_detail/reap_sample_medicine_detail_page.dart';
-import 'package:lszlgl/page/reap_step/reap_sample_detail/reap_sample_org_detail_page.dart';
-import 'package:lszlgl/page/reap_step/reap_sample_detail/reap_sample_variety_detail_page.dart';
-import 'package:lszlgl/page/reap_step/reap_sample_task/reap_sample_basic_page.dart';
-import 'package:lszlgl/page/reap_step/reap_sample_task/reap_sample_disaster_page.dart';
-import 'package:lszlgl/page/reap_step/reap_sample_task/reap_sample_medicine_page.dart';
-import 'package:lszlgl/page/reap_step/reap_sample_task/reap_sample_org_page.dart';
-import 'package:lszlgl/page/reap_step/reap_sample_task/reap_sample_variety_page.dart';
+import 'package:lszlgl/model/rsp/sample_task_rsp.dart';
+import 'package:lszlgl/page/sample_task/reap_sample_detail/reap_sample_basic_detail_page.dart';
+import 'package:lszlgl/page/sample_task/reap_sample_detail/reap_sample_disaster_detail_page.dart';
+import 'package:lszlgl/page/sample_task/reap_sample_detail/reap_sample_medicine_detail_page.dart';
+import 'package:lszlgl/page/sample_task/reap_sample_detail/reap_sample_org_detail_page.dart';
+import 'package:lszlgl/page/sample_task/reap_sample_detail/reap_sample_variety_detail_page.dart';
+import 'package:lszlgl/page/sample_task/reap_sample_task/reap_sample_basic_page.dart';
+import 'package:lszlgl/page/sample_task/reap_sample_task/reap_sample_disaster_page.dart';
+import 'package:lszlgl/page/sample_task/reap_sample_task/reap_sample_medicine_page.dart';
+import 'package:lszlgl/page/sample_task/reap_sample_task/reap_sample_org_page.dart';
+import 'package:lszlgl/page/sample_task/reap_sample_task/reap_sample_variety_page.dart';
+
+class ReapSampleTaskPageArgs {
+  final bool detail;
+  final SampleTaskItem? data;
+
+  ReapSampleTaskPageArgs({
+    this.detail = false,
+    this.data,
+  });
+
+  @override
+  String toString() {
+    return {
+      'detail': detail,
+      'data': data != null ? '...' : null,
+    }.toString();
+  }
+}
 
 /// 收货扦样任务
 class ReapSampleTaskPage extends StatefulWidget {
-  final bool? detail;
+  final ReapSampleTaskPageArgs args;
 
   const ReapSampleTaskPage({
     Key? key,
-    this.detail,
+    required this.args,
   }) : super(key: key);
 
   @override
@@ -28,6 +47,7 @@ class ReapSampleTaskPage extends StatefulWidget {
 }
 
 class _ReapSampleTaskPageState extends BaseState<ReapSampleTaskPage> with TickerProviderStateMixin {
+  late ReapSampleTaskPageArgs args;
   late PageController pageCtrl;
 
   late List<String> tabTextList;
@@ -54,14 +74,15 @@ class _ReapSampleTaskPageState extends BaseState<ReapSampleTaskPage> with Ticker
   @override
   void initState() {
     super.initState();
+    args = widget.args;
     tabTextList = ['基础信息', '品种信息', '灾害污染', '用药情况', '检验机构'];
-    if (widget.detail ?? false) {
+    if (args.detail) {
       pageList = [
-        ReapSampleBasicDetailPage(),
-        ReapSampleVarietyDetailPage(),
-        ReapSampleDisasterDetailPage(),
-        ReapSampleMedicineDetailPage(),
-        ReapSampleOrgDetailPage(),
+        ReapSampleBasicDetailPage(args.data),
+        ReapSampleVarietyDetailPage(args.data),
+        ReapSampleDisasterDetailPage(args.data),
+        ReapSampleMedicineDetailPage(args.data),
+        ReapSampleOrgDetailPage(args.data),
       ];
     } else {
       pageList = [
@@ -86,7 +107,7 @@ class _ReapSampleTaskPageState extends BaseState<ReapSampleTaskPage> with Ticker
       dismissOnCapturedTaps: true,
       child: Column(
         children: [
-          myAppBar(title:(widget.detail ?? false)?'扦样完成详情':'扦样任务单'),
+          myAppBar(title: args.detail ? '扦样完成详情' : '扦样任务单'),
           Expanded(
             child: Container(
               clipBehavior: Clip.hardEdge,

lib/page/reap_step/reap_sample_task/reap_sample_variety_page.dart

@@ -1,6 +1,7 @@
 import 'package:date_format/date_format.dart';
 import 'package:flutter/material.dart';
 import 'package:lszlgl/base/base_state.dart';
+import 'package:lszlgl/utils/date_time_utils.dart';
 import 'package:lszlgl/widget/button.dart';
 import 'package:lszlgl/widget/card_item.dart';
 
@@ -36,7 +37,7 @@ class _ReapSampleVarietyPageState extends BaseState<ReapSampleVarietyPage> with
       lastDate: DateTime.now(),
     );
     if (date == null) return;
-    notifier.value = formatDate(date, [yyyy, '-', mm, '-', dd]);
+    notifier.value = DateTimeUtils.yyyymmdd(date: date);
   }
 
   @override

lib/page/sample_task/sample_list_vm.dart

@@ -0,0 +1,101 @@
+import 'package:dio/dio.dart';
+import 'package:easy_refresh/easy_refresh.dart';
+import 'package:flutter/material.dart';
+import 'package:lszlgl/base/base_vm.dart';
+import 'package:lszlgl/main.dart';
+import 'package:lszlgl/model/req/sample_task_list_req.dart';
+import 'package:lszlgl/model/rsp/sample_task_rsp.dart';
+import 'package:lszlgl/network/api.dart';
+
+class SampleListVM extends BaseVM {
+  SampleListVM() {
+    _uncompletedCtrl = EasyRefreshController(controlFinishRefresh: true, controlFinishLoad: true);
+    _completeCtrl = EasyRefreshController(controlFinishRefresh: true, controlFinishLoad: true);
+    uncompletedReq = SampleTaskListReq(deliveryStatus: 0);
+    completeReq = SampleTaskListReq(deliveryStatus: 1);
+  }
+
+  /// 刷新控制
+  late final EasyRefreshController _uncompletedCtrl;
+  late final EasyRefreshController _completeCtrl;
+
+  /// 请求参数
+  late final SampleTaskListReq uncompletedReq;
+  late final SampleTaskListReq completeReq;
+
+  /// 页面数据
+  final uncompletedPageState =
+      DataStatusModel<List<SampleTaskItem>>().notifier<DataStatusModel<List<SampleTaskItem>>>();
+  final completePageState = DataStatusModel<List<SampleTaskItem>>().notifier<DataStatusModel<List<SampleTaskItem>>>();
+
+  /// 当前页面
+  final bool currentComplete = false;
+
+  EasyRefreshController getCtrl(bool complete) => complete ? _completeCtrl : _uncompletedCtrl;
+
+  SampleTaskListReq getReq(bool complete) => complete ? completeReq : uncompletedReq;
+
+  ValueNotifier<DataStatusModel<List<SampleTaskItem>>> getPageState(bool complete) =>
+      complete ? completePageState : uncompletedPageState;
+
+  void refresh(bool complete) {
+    if (complete) {
+      _completeCtrl.callRefresh(overOffset: 100);
+    } else {
+      _uncompletedCtrl.callRefresh(overOffset: 100);
+    }
+  }
+
+  void refreshAll() {
+    refresh(false);
+    refresh(true);
+  }
+
+  /// 获取数据
+  /// * [complete] 刷新页面
+  /// * [refresh] 是否刷新 true=刷新, false=加载更多
+  void getData(bool complete, {bool refresh = true}) async {
+    var req = getReq(complete);
+    var pageState = getPageState(complete);
+    var ctrl = getCtrl(complete);
+    if (refresh) {
+      req.pageNo = 1;
+    }
+    try {
+      var value = await Api().sampleTaskList(req.toJson());
+      List<SampleTaskItem> data = value.data?.list ?? [];
+      var list = pageState.value.data ?? [];
+      if (refresh) {
+        list = data;
+        ctrl.finishRefresh(IndicatorResult.success, true);
+        ctrl.resetFooter();
+      } else {
+        list.addAll(data);
+      }
+      pageState.update(pageState.value.success(data: list));
+      if (data.isEmpty) {
+        ctrl.finishLoad(IndicatorResult.noMore, true);
+      } else {
+        ctrl.finishLoad(IndicatorResult.success, true);
+      }
+      req.pageNo++;
+    } on DioException catch (err) {
+      logger.e('${err.message}');
+      if (req.pageNo == 1) pageState.update(pageState.value.error());
+      if (refresh) {
+        ctrl.finishRefresh(IndicatorResult.fail, true);
+      } else {
+        ctrl.finishLoad(IndicatorResult.fail, true);
+      }
+    }
+  }
+
+  @override
+  void dispose() {
+    _uncompletedCtrl.dispose();
+    _completeCtrl.dispose();
+    uncompletedPageState.dispose();
+    completePageState.dispose();
+    super.dispose();
+  }
+}

lib/page/reap_step/sample_task_list_page.dart

@@ -1,18 +1,20 @@
-import 'package:dio/dio.dart';
 import 'package:easy_refresh/easy_refresh.dart';
 import 'package:flutter/material.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
 import 'package:lszlgl/base/base_state.dart';
 import 'package:lszlgl/base/base_vm.dart';
 import 'package:lszlgl/config/colors.dart';
-import 'package:lszlgl/main.dart';
 import 'package:lszlgl/model/rsp/sample_task_rsp.dart';
-import 'package:lszlgl/network/api.dart';
-import 'package:lszlgl/page/reap_step/sample_task_list_tab_page.dart';
+import 'package:lszlgl/page/sample_task/sample_list_vm.dart';
+import 'package:lszlgl/page/sample_task/sample_task_list_tab_page.dart';
 import 'package:lszlgl/service/dict_service.dart';
+import 'package:lszlgl/utils/date_time_utils.dart';
+import 'package:lszlgl/utils/inject.dart';
 import 'package:lszlgl/widget/button.dart';
 import 'package:lszlgl/widget/page_widget.dart';
 
+import 'reap_sample_task/reap_sample_task_page.dart';
+
 /// 扦样环节列表
 class SampleTaskListPage extends StatefulWidget {
   final StepType type;
@@ -29,19 +31,14 @@ class SampleTaskListPage extends StatefulWidget {
 }
 
 class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> with AutomaticKeepAliveClientMixin {
-  late EasyRefreshController refreshCtrl;
-
-  int pageNo = 1;
-  int pageSize = 10;
-
-  final pageState = DataStatusModel<List<SampleTaskItem>>().notifier<DataStatusModel<List<SampleTaskItem>>>();
+  late SampleListVM vm;
 
   /// 详情
-  void startDetail() {
+  void startDetail(SampleTaskItem data) {
     if (!widget.complete) return;
     switch (widget.type) {
       case StepType.reap:
-        MyRouter.startReapSampleTask(detail: true);
+        MyRouter.startReapSampleTask(args: ReapSampleTaskPageArgs(detail: true,data: data));
         break;
       case StepType.stock:
         break;
@@ -59,60 +56,14 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
     }
   }
 
-  void getData({bool first = false, bool refresh = true}) async {
-    if (refresh) {
-      pageNo = 1;
-    }
-    try {
-      var value = await Api().sampleTaskList(
-        pageNo,
-        pageSize,
-        deliveryStatus: widget.complete ? 1 : 0,
-        rwlx: widget.type.value,
-      );
-      List<SampleTaskItem> data = value.data?.list ?? [];
-      var list = pageState.value.data ?? [];
-      if (refresh) {
-        list = data;
-        refreshCtrl.finishRefresh(IndicatorResult.success, true);
-        refreshCtrl.resetFooter();
-      } else {
-        list.addAll(data);
-      }
-      pageState.update(pageState.value.success(data: list));
-      if (data.isEmpty) {
-        refreshCtrl.finishLoad(IndicatorResult.noMore, true);
-      } else {
-        refreshCtrl.finishLoad(IndicatorResult.success, true);
-      }
-      pageNo++;
-    } on DioException catch (err) {
-      logger.e('${err.message}');
-      if (pageNo == 1) pageState.update(pageState.value.error());
-      if (refresh) {
-        refreshCtrl.finishRefresh(IndicatorResult.fail, true);
-      } else {
-        refreshCtrl.finishLoad(IndicatorResult.fail, true);
-      }
-    }
-  }
-
   @override
   void onInit() {
-    refreshCtrl = EasyRefreshController(
-      controlFinishRefresh: true,
-      controlFinishLoad: true,
-    );
+    vm = Inject.get<SampleListVM>()!;
   }
 
   @override
   void onFirstShow(Duration timeStamp) {
-    refreshCtrl.callRefresh(overOffset: 200);
-  }
-
-  @override
-  void onDestroy() {
-    refreshCtrl.dispose();
+    vm.refresh(widget.complete);
   }
 
   @override
@@ -131,19 +82,19 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
 
   Widget buildBody() {
     return EasyRefresh.builder(
-      controller: refreshCtrl,
-      onRefresh: () => getData(refresh: true),
-      onLoad: () => getData(refresh: false),
+      controller: vm.getCtrl(widget.complete),
+      onRefresh: () => vm.getData(widget.complete, refresh: true),
+      onLoad: () => vm.getData(widget.complete, refresh: false),
       childBuilder: (_, physics) => buildList(physics),
     );
   }
 
   Widget buildList(ScrollPhysics physics) {
-    var sliver = pageState.builder((v) {
+    var sliver = vm.getPageState(widget.complete).builder((v) {
       var list = v.data;
       if (v.status == DataStatus.error) {
         // 加载失败
-        return SliverToBoxAdapter(child: PageLoadingWidget.error(onTap: () => refreshCtrl.callRefresh()));
+        return SliverToBoxAdapter(child: PageLoadingWidget.error(onTap: () => vm.refresh(widget.complete)));
       } else if (list == null || list.isEmpty) {
         // 无数据
         return const SliverToBoxAdapter(child: PageLoadingWidget.empty());
@@ -163,7 +114,7 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
   Widget buildItem(int index, SampleTaskItem item) {
     return GestureDetector(
       behavior: HitTestBehavior.opaque,
-      onTap: () => startDetail(),
+      onTap: () => startDetail(item),
       child: Container(
         margin: const EdgeInsets.only(left: 12, right: 12, top: 12),
         decoration: const BoxDecoration(
@@ -238,7 +189,7 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
 
   Widget buildGrid(SampleTaskItem item) {
     List<Map<String, String>> infoList;
-    var jclb = DictService.get().getLabel(DictType.jclb, value: item.jclb)?.label;
+    var jclb = DictService.getDict(DictType.jclb, value: item.jclb)?.label;
     if (widget.complete) {
       infoList = [
         {'采样品种': item.cypzName ?? ''},
@@ -286,7 +237,7 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
             const SizedBox(width: 12),
             Expanded(
               child: Text(
-                '[${item.qyryName ?? ''}]创建于${item.createTime ?? ''}',
+                '[${item.qyryName ?? ''}]创建于${DateTimeUtils.yyyymmdd(timestamp: item.createTime) ?? ''}',
                 style: const TextStyle(fontSize: 16, color: MyColor.c_666666),
               ),
             ),

lib/page/reap_step/sample_task_list_tab_page.dart

@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
 import 'package:lszlgl/config/colors.dart';
-import 'package:lszlgl/page/reap_step/sample_task_list_page.dart';
+import 'package:lszlgl/page/sample_task/sample_list_vm.dart';
+import 'package:lszlgl/page/sample_task/sample_task_list_page.dart';
+import 'package:lszlgl/utils/inject.dart';
 
 enum StepType {
   reap('收获环节', 1),
@@ -45,8 +47,14 @@ class _SampleTaskListTabPageState extends BaseLifecycleState<SampleTaskListTabPa
   late List<String> tabTextList;
   late List<Widget> pageList;
 
+  late SampleListVM vm;
+
   @override
   void onInit() {
+    vm = Inject.put<SampleListVM>(SampleListVM(), dispose: (v) => v.dispose());
+    vm.uncompletedReq.rwlx = widget.args.type.value;
+    vm.completeReq.rwlx = widget.args.type.value;
+
     tabCtrl = TabController(length: 2, vsync: this);
     pageCtrl = PageController();
 
@@ -58,6 +66,11 @@ class _SampleTaskListTabPageState extends BaseLifecycleState<SampleTaskListTabPa
   }
 
   @override
+  void onDestroy() {
+    Inject.remove<SampleListVM>();
+  }
+
+  @override
   Widget build(BuildContext context) {
     return myScaffold(child: buildBody());
   }

lib/router/my_router.dart

@@ -1,7 +1,7 @@
 import 'package:lszlgl/page/login/login_page.dart';
 import 'package:lszlgl/page/main_tab_page.dart';
-import 'package:lszlgl/page/reap_step/reap_sample_task/reap_sample_task_page.dart';
-import 'package:lszlgl/page/reap_step/sample_task_list_tab_page.dart';
+import 'package:lszlgl/page/sample_task/reap_sample_task/reap_sample_task_page.dart';
+import 'package:lszlgl/page/sample_task/sample_task_list_tab_page.dart';
 import 'package:lszlgl/page/user_center/account_manage_page.dart';
 import 'package:lszlgl/page/user_center/change_pwd_page.dart';
 import 'package:lszlgl/page/user_center/setting_page.dart';
@@ -30,7 +30,7 @@ final Map<String, MyNavigatorBuilder> rRouteMap = {
   rSettingPage: (context, args) => const SettingPage(),
   rChangePwdPage: (context, args) => const ChangePwdPage(),
   rSampleTaskListTabPage: (context, args) => SampleTaskListTabPage(args: args as SampleTaskListTabPageArgs?),
-  rReapSampleTaskPage: (context, args) => ReapSampleTaskPage(detail: args as bool?),
+  rReapSampleTaskPage: (context, args) => ReapSampleTaskPage(args: args as ReapSampleTaskPageArgs),
 };
 
 class MyRouter {
@@ -75,9 +75,7 @@ class MyRouter {
   }
 
   /// 收获扦样任务
-  static void startReapSampleTask({bool detail = false}) {
-    MyNavigator.push(rReapSampleTaskPage, args: detail);
+  static void startReapSampleTask({ReapSampleTaskPageArgs? args}) {
+    MyNavigator.push(rReapSampleTaskPage, args: args ?? ReapSampleTaskPageArgs());
   }
 }
-
-

lib/service/dict_service.dart

@@ -12,17 +12,13 @@ enum DictType {
 class DictService {
   DictService._();
 
-  static DictService? _instance;
+  static List<DictRsp>? _dictList;
 
-  static DictService get() => _instance ??= DictService._();
+  static List<DictRsp> get dictList => _dictList ??= [];
 
-  List<DictRsp>? _dictList;
+  static final Map<String, Map<String, DictRsp>> _dictMap = {};
 
-  List<DictRsp> get dictList => _dictList ??= [];
-
-  final Map<String, Map<String, DictRsp>> _dictMap = {};
-
-  void saveDictList(List<DictRsp>? list) {
+  static void saveDictList(List<DictRsp>? list) {
     if (list == null) return;
     _dictList = list;
     // 按类型存储字典
@@ -34,7 +30,7 @@ class DictService {
     }
   }
 
-  DictRsp? getLabel(DictType type, {num? value, String? valueStr}) {
+  static DictRsp? getDict(DictType type, {num? value, String? valueStr}) {
     String? v;
     if (valueStr == null) {
       if (value == null) return null;
@@ -44,4 +40,8 @@ class DictService {
     }
     return _dictMap[type.type]?[v];
   }
+
+  static String? getLabel(DictType type, {num? value, String? valueStr}) {
+    return getDict(type, value: value, valueStr: valueStr)?.label;
+  }
 }

lib/utils/date_time_utils.dart

@@ -0,0 +1,54 @@
+import 'package:date_format/date_format.dart';
+
+class DateTimeUtils {
+  DateTimeUtils._();
+
+  /// 年-月-日
+  static String? yyyymmdd({
+    DateTime? date,
+    num? timestamp,
+  }) {
+    var dateTime = getDateTime(date: date, timestamp: timestamp);
+    if (dateTime == null) return null;
+    return formatDate(dateTime, [yyyy, '-', mm, '-', dd]);
+  }
+
+  /// 年-月-日 时:分:秒
+  static String? yyyymmddHHnnss({
+    DateTime? date,
+    num? timestamp,
+  }) {
+    var dateTime = getDateTime(date: date, timestamp: timestamp);
+    if (dateTime == null) return null;
+    return formatDate(dateTime, [yyyy, '-', mm, '-', dd, ' ', HH, ':', nn, ':', ss]);
+  }
+
+  /// 年-月-日 时:分
+  static String? yyyymmddHHnn({
+    DateTime? date,
+    num? timestamp,
+  }) {
+    var dateTime = getDateTime(date: date, timestamp: timestamp);
+    if (dateTime == null) return null;
+    return formatDate(dateTime, [yyyy, '-', mm, '-', dd, ' ', HH, ':', nn]);
+  }
+
+  /// 时:分:秒
+  static String? HHnnss({
+    DateTime? date,
+    num? timestamp,
+  }) {
+    var dateTime = getDateTime(date: date, timestamp: timestamp);
+    if (dateTime == null) return null;
+    return formatDate(dateTime, [HH, ':', nn, ':', ss]);
+  }
+
+  static DateTime? getDateTime({
+    DateTime? date,
+    num? timestamp,
+  }) {
+    if (date != null) return date;
+    if (timestamp != null) return DateTime.fromMillisecondsSinceEpoch(timestamp.toInt());
+    return null;
+  }
+}