联调扦样列表接口;

lib/base/base_vm.dart

@@ -0,0 +1,108 @@
+/// 自动导入ValueNotifier拓展
+export 'package:lszlgl/ext/value_notifier_ext.dart';
+
+///
+/// VM基类
+abstract class BaseVM {
+  /// 是否被销毁
+  bool _dispose = false;
+
+  get isDispose => _dispose;
+
+  /// 销毁时回调方法
+  void dispose() {
+    _dispose = true;
+  }
+}
+
+///
+/// 数据状态装饰类
+///
+/// ```
+/// 简单使用方法:
+/// // 数据
+/// var user = DataStatusModel<UserBean>();
+/// user = user.empty();
+/// user = user.loading();
+/// user = user.success(UserBean());
+/// user = user.error('网络异常');
+/// // 组件
+/// setState({});
+/// switch (user.status) {
+///   ...
+/// }
+/// ```
+///
+/// ```
+/// 配合ValueNotifierExt使用:
+/// // 数据
+/// final user = DataStatusModel<UserBean>().notifier<DataStatusModel<UserBean>>();
+/// user.update(user.value.empty());
+/// user.update(user.value.loading());
+/// user.update(user.value.success(UserBean()));
+/// user.update(user.value.error('网络异常'));
+/// // 组件
+/// user.builder((v) {
+///   switch (v.status) {
+///     ...
+///   }
+/// }
+/// ```
+class DataStatusModel<T> {
+  /// 数据状态
+  DataStatus status;
+
+  /// 数据内容
+  T? data;
+
+  /// 错误信息
+  Object? errorData;
+
+  DataStatusModel({
+    this.status = DataStatus.empty,
+    this.data,
+    this.errorData,
+  });
+
+  /// 加载中
+  DataStatusModel<T> loading({T? data, Object? error}) => DataStatusModel<T>(
+        status: DataStatus.loading,
+        data: data ?? this.data,
+        errorData: error ?? this.errorData,
+      );
+
+  /// 加载成功
+  DataStatusModel<T> success({T? data, Object? error}) => DataStatusModel<T>(
+        status: DataStatus.success,
+        data: data ?? this.data,
+        errorData: error ?? this.errorData,
+      );
+
+  /// 无数据
+  DataStatusModel<T> empty({T? data, Object? error}) => DataStatusModel<T>(
+        data: data ?? this.data,
+        errorData: error ?? this.errorData,
+      );
+
+  /// 加载失败
+  DataStatusModel<T> error({T? data, Object? error}) => DataStatusModel<T>(
+        status: DataStatus.error,
+        data: data ?? this.data,
+        errorData: error ?? this.errorData,
+      );
+}
+
+/// 数据状态
+enum DataStatus {
+  /// 无数据
+  empty,
+
+  /// 加载中
+  loading,
+
+  /// 加载成功
+  success,
+
+  /// 加载失败
+  error,
+}

lib/ext/value_notifier_ext.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 
 /// 万物皆可Notifier
 extension ObjectNotifierExt on Object? {
-  ValueNotifier<T?> notifier<T>() => ValueNotifier(this as T?);
+  ValueNotifier<T> notifier<T>() => ValueNotifier(this as T);
 }
 
 /// 拓展ValueNotifier

lib/main.dart

@@ -1,3 +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';
@@ -9,135 +12,70 @@ import 'package:lszlgl/router/my_navigator.dart';
 import 'package:lszlgl/utils/sp_utils.dart';
 
 late Logger logger;
-const zhCN = {
-  'Sample': '示例',
-  'Style': '样式',
-  'More': '更多',
-  'Theme': '主题',
-  'System': '系统',
-  'Light': '明亮',
-  'Dark': '暗黑',
-  'Classic': '经典',
-  'Classic and default': '经典和默认',
-  'Direction': '方向',
-  'Vertical': '垂直',
-  'Horizontal': '水平',
-  'Clamping': '固定',
-  'Background': '背景',
-  'Alignment': '对齐',
-  'Center': '中心',
-  'Start': '开端',
-  'End': '结尾',
-  'Infinite': '无限',
-  'Message': '信息',
-  'Text': '文本',
-  'Animation': '动画',
-  'Bounce': '回弹',
-  'List Spring': '列表弹簧',
-  'Pull to refresh': '下拉刷新',
-  'Release ready': '释放开始',
-  'Refreshing...': '刷新中...',
-  'Succeeded': '成功了',
-  'No more': '没有更多',
-  'Failed': '失败了',
-  'Last updated at %T': '最后更新于 %T',
-  'Pull to load': '上拉加载',
-  'Loading...': '加载中...',
-  'Bezier curve': '贝塞尔曲线',
-  'Disable': '禁用',
-  'Display balls': '显示小球',
-  'Spin in center': 'Spin居中',
-  'Only show spin': '只显示Spin',
-  'Bezier circle': '弹出圆圈',
-  'Golden campus': '金色校园',
-  'Rush to the sky': '冲上云霄',
-  'Balloon delivery': '气球快递',
-  'Star track': '太空轨道',
-  'Lumberjack Squats': '暴力深蹲',
-  'Skating boy': '滑雪少年',
-  'Halloween horror': '万圣节惊魂',
-  'User profile': '个人中心',
-  'User personal center': '用户个人中心',
-  'QQ group': 'QQ群',
-  'Name': '名字',
-  'Age': '年龄',
-  'Not yet bald': '尚未秃顶',
-  'City': '城市',
-  'China - ChengDu': '中国 - 成都',
-  'Phone': '电话',
-  'Mail': '邮箱',
-  'NestedScrollView example': 'NestedScrollView示例',
-  'Carousel': '轮播',
-  'Carousel example': '轮播示例',
-  'Refresh on start': '启动时刷新',
-  'Refresh when the list is displayed and specify the Header': '列表显示时刷新并指定Header',
-  'Listener': '监听器',
-  'Use listener to respond anywhere': '使用监听器，在任意位置响应',
-  'Secondary': '二楼',
-  'Combine existing Header with secondary': '将已有的Header结合二楼',
-  'Open the second floor': '打开二楼',
-  'Chat': '聊天',
-  'Chat page example': '聊天页面示例',
-  'PageView example': 'PageView 示例',
-  'Join discussion': '加入讨论',
-  'Join the QQ group (554981921)': '加入QQ群(554981921)',
-  'Repository': '项目地址',
-  'Support me': '支持作者',
-  'Buy me a coffee ~': '请作者喝一杯咖啡~',
-  'Alipay': '支付宝',
-  'Alipay donation': '支付宝捐赠',
-  'Wechat': '微信',
-  'Wechat donation': '微信捐赠',
-  'Cryptocurrency': '加密货币',
-  'Cryptocurrency donation': '加密货币捐赠',
-  'Bitcoin donation': '比特币捐赠',
-  'Ethereum series, ETH, BNB, MATIC, USDT and other tokens': '以太坊系列，ETH、BNB、MATIC、USDT及其他代币',
-  'Tron chain, TRX, USDT, USDC and other tokens': '波场链，TRX、USDT、USDC及其他代币',
-  'Dogecoin donation': '狗狗币捐赠',
-  '%s copied!': '%s 已复制!',
-  'Trigger immediately': '立即触发',
-  'TabBarView example': 'NestedScrollView + TabBarView示例',
-  'Paging': '分页',
-  'Paging example': '分页示例',
-  'No Data': '暂无数据',
-  'Theme switch': '主题切换',
-  'Theme switch example': '主题切换示例',
-  'Theme switch describe': '下拉显示切换面板，左右滑动选中主题色，释放进行切换。',
-  'Bubbles launch': '泡泡发射',
-};
 
 void main() async {
-  WidgetsFlutterBinding.ensureInitialized();
-  SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle.light.copyWith(statusBarColor: Colors.transparent));
-  SystemChrome.setPreferredOrientations([
-    DeviceOrientation.portraitUp,
-    DeviceOrientation.portraitDown,
-  ]);
-  BaseDio.get().init();
-  logger = Logger(printer: PrettyPrinter(methodCount: 0));
-  await SPUtils.getInstance().init();
+  initReportException(() async {
+    logger = Logger(printer: PrettyPrinter(methodCount: 0));
+    SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle.light.copyWith(statusBarColor: Colors.transparent));
+    SystemChrome.setPreferredOrientations([
+      DeviceOrientation.portraitUp,
+      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',
+        );
+    runApp(const MyApp());
+  });
+}
+
+/// 初始化异常上报 封装[runZonedGuarded]
+void initReportException(Function() callback) {
+  runZonedGuarded(() {
+    // 初始化Flutter
+    WidgetsFlutterBinding.ensureInitialized();
+    // 隔离线程异常
+    Isolate.current.addErrorListener(RawReceivePort((dynamic pair) {
+      var isolateError = pair as List<dynamic>;
+      onError(isolateError.first, isolateError.last);
+    }).sendPort);
+    // 捕获Flutter异常
+    FlutterError.onError = (FlutterErrorDetails error) {
+      FlutterError.presentError(error);
+      onError(error.exception, error.stack);
+    };
+    // 回调外部方法
+    callback.call();
+  }, (error, stack) {
+    // 捕获程序异常
+    onError(error, stack);
+  });
+}
 
-  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',
-      );
-  runApp(const MyApp());
+/// 上报异常
+Future<void> onError(Object exception, StackTrace? stack) async {
+  if (stack == null) return;
+  logger.e('error:${exception.runtimeType.toString()}\n${exception.toString()}\n${stack.toString()}');
 }
 
 class MyApp extends StatelessWidget {

lib/model/num_converter.dart

@@ -0,0 +1,28 @@
+import 'package:json_annotation/json_annotation.dart';
+
+/// Json解析num类型
+class NumConverter extends JsonConverter<num?, dynamic> {
+  const NumConverter();
+
+  @override
+  num? fromJson(json) {
+    if (json == null) return null;
+    if (json is num) return json;
+    // String
+    if (json is String) {
+      try {
+        return num.parse(json);
+      } catch (e) {
+        return null;
+      }
+    }
+    // boolean false=0 true=1
+    if (json is bool) {
+      return json ? 1 : 0;
+    }
+    return null;
+  }
+
+  @override
+  toJson(num? object) => object?.toString();
+}

lib/model/rsp/dict_rsp.dart

@@ -0,0 +1,19 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'dict_rsp.g.dart';
+
+@JsonSerializable(genericArgumentFactories: true)
+class DictRsp {
+  final String? dictType; //字典类型
+  final String? value; //字典键值
+  final String? label; //字典标签
+  const DictRsp({
+    this.dictType,
+    this.value,
+    this.label,
+  });
+
+  factory DictRsp.fromJson(Map<String, dynamic> json) => _$DictRspFromJson(json);
+
+  Map<String, dynamic> toJson() => _$DictRspToJson(this);
+}

lib/model/rsp/sample_task_rsp.dart

@@ -0,0 +1,390 @@
+import 'package:json_annotation/json_annotation.dart';
+import 'package:lszlgl/model/num_converter.dart';
+import 'package:lszlgl/model/string_converter.dart';
+
+part 'sample_task_rsp.g.dart';
+
+@JsonSerializable(genericArgumentFactories: true)
+class SampleTaskListRsp {
+  final num? total;
+  final List<SampleTaskItem>? list;
+
+  const SampleTaskListRsp({
+    this.total,
+    this.list,
+  });
+
+  factory SampleTaskListRsp.fromJson(Map<String, dynamic> json) => _$SampleTaskListRspFromJson(json);
+
+  Map<String, dynamic> toJson() => _$SampleTaskListRspToJson(this);
+}
+
+@JsonSerializable(converters: [NumConverter(), StringConverter()])
+class SampleTaskItem {
+  final num? id;
+  final String? qyryName; // 人员名称
+  final String? fjrq; // 分解日期
+  final String? ypbh; // 样品编号
+  final String? jtpzmc; // 具体品种名称
+  final num? deliveryStatus; // 任务单任务状态：0是待扦样,1已扦样
+  final num? jhcysl; // 计划采样数量
+  final num? zljysl; // 质量检验数量
+  final num? pzjyjg; // 品质检验机构
+  final num? pzjysl; // 品质检验数量
+  final num? sajyjg; // 食安检验机构
+  final num? sajysl; // 食安检验数量
+  final num? jhcyjg; // 扦样机构
+  final String? lspz; // 粮食品种
+  final num? bchlx; // 病虫害类型
+  final String? bdcnhhhzs; // 被调查农户或合作社
+  final num? gcpwlx; // 工厂排污类型
+  final String? lxfs; // 联系方式
+  final num? qydbsl; // 扦样代表数量（公斤）
+  final String? qyddjwd; // 扦样地点经纬度
+  final String? qysj; // 扦样时间
+  final num? qysl; // 扦样数量（公斤）
+  final bool? scgczsffsbjyzdbch; // 生产过程中是否发生比较严重的病虫害
+  final String? sheng; // 省
+  final String? shi; // 市
+  final String? qu; // 区
+  final String? xian; // 县
+  final String? cun; // 村
+  final num? shidu; // 湿度
+  final String? shsj; // 收获时间
+  final num? trdllx; // 土壤地理类型
+  final num? wendu; // 温度
+  final num? wrwlx; // 污染物类型
+  final num? zzmj; // 种植面积（亩地）
+  final bool? zztdzwsfygcpw; // 种植土地周围是否有工厂排污
+  final bool? zztdzwsysytrsfywr; // 种植土地周围使用水源、土壤是否有污染
+  final num? zjBaseEnterpriseId; // 企业基本信息ID
+  final num? zjBasePersonnelId; // 人员基本信息表ID
+  final num? zjCodeSamplingTaskId;
+  final num? zjCodeSamplingPlanId; // 采样计划详情ID
+  final String? xzqh; // 行政区划
+  final num? zjBaseGrainInformationId; // 品种id
+  final num? cypzmc; // 采样品种名称
+  final String? cypzName; // 采样品种名称
+  final String? qyrwdh; // 扦样任务单号
+  final num? shengXzqh; // 省行政区划id
+  final num? shiXzqh; // 市行政区划id
+  final num? quXzqh; // 区行政区划id
+  final num? xiangXzqh; // 县行政区划id
+  final num? cunXzqh; // 村行政区划id
+  final num? createTime; // 创建时间
+  final num? state; // 0是待扦样,1已扦样,2已完成
+  final String? name; // 扦样人员姓名
+  final String? rwjssj; // 任务接收时间
+  final String? bsjzsj; // 报送截止时间
+  final num? rwlx; // 任务类型/监测环节
+  final num? jclb; // 监测类别
+  final String? dwmc; // 单位名称
+  final List<EnterpriseItem>? enterpriseList; // 机构信息
+  final List<UseMedicineItem>? codeUseMedicineList; // 种植期间农药使用情况
+  final String? zzpz; // 种植品种
+  final String? shengXzqhName; // 省
+  final String? shiXzqhName; // 市
+  final String? quXzqhName; // 区
+  final String? xiangXzqhName; // 县
+  final String? cunXzqhName; // 村
+  final String? cyjhbmCode; // 采样计划编号
+  final String? cyjhmc; // 采样计划名称
+  final String? niandu; // 年度
+  final List<SamplingTaskAllotSgjcItem>? codeSamplingTaskAllotSgjcRespList; // 任务分配
+  // final List<>? codeSamplingTaskDetailsKcjcRespVO; // 库存检测
+  // final List<>? fplist; // 分配多条信息
+  final num? sfyzpz; // 是否优质品种
+  final num? yzpzlx; // 优质品种类型
+  final num? shqjsffslyytq; // 收货期间是否发生连阴雨天气
+  final num? shlssfsfpg; // 收货粮食水分是否偏高
+  final num? jnlbdsffszmwr; // 近年来本地是否发生真菌毒素污染
+  final num? zjdswrlx; // 真菌毒素污染类型
+  final num? jnlbdsfzjswr; // 近年来本地是否发生重金属污染
+  final num? zjswrlx; // 重金属污染类型
+  final List<JyjgxxItem>? jyjgxxRespVOList; // 检验机构信息
+  final num? jypzStatus; // 检验品质按钮0显示1不显示
+
+  const SampleTaskItem({
+    this.id,
+    this.qyryName,
+    this.fjrq,
+    this.ypbh,
+    this.jtpzmc,
+    this.deliveryStatus,
+    this.jhcysl,
+    this.zljysl,
+    this.pzjyjg,
+    this.pzjysl,
+    this.sajyjg,
+    this.sajysl,
+    this.jhcyjg,
+    this.lspz,
+    this.bchlx,
+    this.bdcnhhhzs,
+    this.gcpwlx,
+    this.lxfs,
+    this.qydbsl,
+    this.qyddjwd,
+    this.qysj,
+    this.qysl,
+    this.scgczsffsbjyzdbch,
+    this.sheng,
+    this.shi,
+    this.qu,
+    this.xian,
+    this.cun,
+    this.shidu,
+    this.shsj,
+    this.trdllx,
+    this.wendu,
+    this.wrwlx,
+    this.zzmj,
+    this.zztdzwsfygcpw,
+    this.zztdzwsysytrsfywr,
+    this.zjBaseEnterpriseId,
+    this.zjBasePersonnelId,
+    this.zjCodeSamplingTaskId,
+    this.zjCodeSamplingPlanId,
+    this.xzqh,
+    this.zjBaseGrainInformationId,
+    this.cypzmc,
+    this.cypzName,
+    this.qyrwdh,
+    this.shengXzqh,
+    this.shiXzqh,
+    this.quXzqh,
+    this.xiangXzqh,
+    this.cunXzqh,
+    this.createTime,
+    this.state,
+    this.name,
+    this.rwjssj,
+    this.bsjzsj,
+    this.rwlx,
+    this.jclb,
+    this.dwmc,
+    this.enterpriseList,
+    this.codeUseMedicineList,
+    this.zzpz,
+    this.shengXzqhName,
+    this.shiXzqhName,
+    this.quXzqhName,
+    this.xiangXzqhName,
+    this.cunXzqhName,
+    this.cyjhbmCode,
+    this.cyjhmc,
+    this.niandu,
+    this.codeSamplingTaskAllotSgjcRespList,
+    this.sfyzpz,
+    this.yzpzlx,
+    this.shqjsffslyytq,
+    this.shlssfsfpg,
+    this.jnlbdsffszmwr,
+    this.zjdswrlx,
+    this.jnlbdsfzjswr,
+    this.zjswrlx,
+    this.jyjgxxRespVOList,
+    this.jypzStatus,
+  });
+
+  factory SampleTaskItem.fromJson(Map<String, dynamic> json) => _$SampleTaskItemFromJson(json);
+
+  Map<String, dynamic> toJson() => _$SampleTaskItemToJson(this);
+
+  String getDeliveryStatusText() {
+    return switch (deliveryStatus) { 0 => '待扦样', 1 => '已扦样', _ => '' };
+  }
+}
+
+@JsonSerializable(converters: [NumConverter(), StringConverter()])
+class EnterpriseItem {
+  final num? id; // 单位id
+  final String? address; // 具体地址
+  final String? beizhu; // 备注
+  final num? bgsmj; // 办公室面积（m²）
+  final num? cqlb; // 产权类别
+  final num? dnczbksr; // 当年财政拨款收入
+  final num? dnywwtsr; // 当年业务委托收入
+  final num? dwdzSheng; // 省id
+  final String? dwdzShengName; // 省名称
+  final num? dwdzShi; // 市id
+  final String? dwdzShiName; // 市名称
+  final num? dwdzXian; // 县id
+  final String? dwdzXianName; //县名称
+  final num? dwjb; // 单位级别
+  final String? dwmc; //单位名称
+  final num? dwxz; //单位性质
+  final String? frdb; //法人代表
+  final num? jglb; //机构类别
+  final num? jyyrs; //检验员人数
+  final String? lxfs; //联系方式
+  final num? rybzsl; //人员编制数量
+  final String? shtyxydm; //社会统一信用代码
+  final num? sysmj; //实验室面积（m²）
+  final num? zjzmj; //总建筑面积（m²）
+  final num? zrs; //总人数
+  final String? dwdz; //单位地址
+  final String? createTime; //创建时间
+  final String? creatorDeptId; //创建人所在部门id
+  final num? deptId; //隶属部门Id
+  final String? sjzgdw; //上级主管单位
+  // final List<>? jyllList; //检验能力集合
+  // final List<>? jyzsList; //检验证书集合
+  final String? flowCode; //审核编号
+  final num? flowStatus; //审核状态：0待发起，1审核中，2通过，3驳回
+  final String? flowCause; //审核意见
+  final num? flowCheckUserId; //审核人id
+  final String? flowTime; //审核时间
+  // final List<>? kycxtdList; //科研创新团队
+  // final List<>? xdbzList; //牵头或参与制修订标准
+  // final List<>? kyxmList; //牵头或参与负责科研项目
+  // final List<>? hdryList; //获得荣誉
+  // final List<>? personnelList; //人员信息
+  // final List<>? instrumentEquipmentList; //设备信息
+  final num? personnelCount; //人员数量
+  final num? instrumentEquipmentCount; //设备数量
+  // final List<>? filePictureList; //附件（图片）地址
+  // final List<>? filePictureTwoList; //附件（图片）地址
+  // final List<>? guaPaiDeptRespVoList; //挂牌部门集合
+
+  const EnterpriseItem({
+    this.id,
+    this.address,
+    this.beizhu,
+    this.bgsmj,
+    this.cqlb,
+    this.dnczbksr,
+    this.dnywwtsr,
+    this.dwdzSheng,
+    this.dwdzShengName,
+    this.dwdzShi,
+    this.dwdzShiName,
+    this.dwdzXian,
+    this.dwdzXianName,
+    this.dwjb,
+    this.dwmc,
+    this.dwxz,
+    this.frdb,
+    this.jglb,
+    this.jyyrs,
+    this.lxfs,
+    this.rybzsl,
+    this.shtyxydm,
+    this.sysmj,
+    this.zjzmj,
+    this.zrs,
+    this.dwdz,
+    this.createTime,
+    this.creatorDeptId,
+    this.deptId,
+    this.sjzgdw,
+    this.flowCode,
+    this.flowStatus,
+    this.flowCause,
+    this.flowCheckUserId,
+    this.flowTime,
+    this.personnelCount,
+    this.instrumentEquipmentCount,
+  });
+
+  factory EnterpriseItem.fromJson(Map<String, dynamic> json) => _$EnterpriseItemFromJson(json);
+
+  Map<String, dynamic> toJson() => _$EnterpriseItemToJson(this);
+}
+
+@JsonSerializable(converters: [NumConverter(), StringConverter()])
+class UseMedicineItem {
+  final num? id; //ID
+  final String? cjsj; //创建时间
+  final String? syff; //施药方式
+  final String? synypz; //使用农药品种
+  final num? synysl; //扦样使用农药的数量（公斤或毫升/每亩地）
+  final String? sysj; //施药时间
+  final num? zjCodeSamplingTaskDetailsKcjcId;
+  final num? zjCodeSamplingTaskDetailsSgjcId;
+  final String? createTime; //创建时间
+  final String? jcz; //检测值
+  final String? zczfw; //正常值范围
+
+  const UseMedicineItem({
+    this.id,
+    this.cjsj,
+    this.syff,
+    this.synypz,
+    this.synysl,
+    this.sysj,
+    this.zjCodeSamplingTaskDetailsKcjcId,
+    this.zjCodeSamplingTaskDetailsSgjcId,
+    this.createTime,
+    this.jcz,
+    this.zczfw,
+  });
+
+  factory UseMedicineItem.fromJson(Map<String, dynamic> json) => _$UseMedicineItemFromJson(json);
+
+  Map<String, dynamic> toJson() => _$UseMedicineItemToJson(this);
+}
+
+@JsonSerializable(converters: [NumConverter(), StringConverter()])
+class SamplingTaskAllotSgjcItem {
+  final num? id; //id
+  final num? zjBaseGrainInformationId; //品种id
+  final String? cypzmc; //采样品种名称
+  final num? samplingCount; //计划采样数量
+  final String? bsjzsj; //报送截至时间
+  final num? personnelId; // 人员id
+  final num? zjCodeSamplingPlanId; //计划id
+  final num? zjCodeSamplingTaskId; //任务id
+  final String? creater; //创建人
+  final String? createDate; //创建时间
+  final String? updateDate; //修改时间
+  final String? cyjhbmCode; //采样计划编号
+  final String? cyjhmc; //采样计划名称
+  final String? niandu; //年度
+  final String? zzpz; //种植品种
+  final num? jhcysl; //计划采样数量
+
+  const SamplingTaskAllotSgjcItem({
+    this.id,
+    this.zjBaseGrainInformationId,
+    this.cypzmc,
+    this.samplingCount,
+    this.bsjzsj,
+    this.personnelId,
+    this.zjCodeSamplingPlanId,
+    this.zjCodeSamplingTaskId,
+    this.creater,
+    this.createDate,
+    this.updateDate,
+    this.cyjhbmCode,
+    this.cyjhmc,
+    this.niandu,
+    this.zzpz,
+    this.jhcysl,
+  });
+
+  factory SamplingTaskAllotSgjcItem.fromJson(Map<String, dynamic> json) => _$SamplingTaskAllotSgjcItemFromJson(json);
+
+  Map<String, dynamic> toJson() => _$SamplingTaskAllotSgjcItemToJson(this);
+}
+
+@JsonSerializable(converters: [NumConverter(), StringConverter()])
+class JyjgxxItem {
+  final num? zjBaseEnterpriseId; //企业id
+  final String? dwmc; //单位名称
+  final String? address; //具体地址
+  final String? jydh; //检验单号
+  final String? ypjssj; //样品接收时间
+
+  JyjgxxItem({
+    this.zjBaseEnterpriseId,
+    this.dwmc,
+    this.address,
+    this.jydh,
+    this.ypjssj,
+  });
+
+  factory JyjgxxItem.fromJson(Map<String, dynamic> json) => _$JyjgxxItemFromJson(json);
+
+  Map<String, dynamic> toJson() => _$JyjgxxItemToJson(this);
+}

lib/model/string_converter.dart

@@ -0,0 +1,25 @@
+import 'dart:convert';
+
+import 'package:json_annotation/json_annotation.dart';
+
+/// Json解析num类型
+class StringConverter extends JsonConverter<String?, dynamic> {
+  const StringConverter();
+
+  @override
+  String? fromJson(json) {
+    if (json == null) return null;
+    // String
+    if (json is String) return json;
+    // num boolean
+    if (json is num || json is bool) return json.toString();
+    // List Map Object 转换Json字符串
+    if (json is List || json is Map || json is Object)
+      return JsonEncoder().convert(json);
+    // 其他类型
+    return json.toString();
+  }
+
+  @override
+  toJson(String? object) => object;
+}

lib/network/api.dart

@@ -1,9 +1,11 @@
 import 'package:dio/dio.dart';
+import 'package:lszlgl/model/api_rsp.dart';
+import 'package:lszlgl/model/req/login_req.dart';
+import 'package:lszlgl/model/rsp/dict_rsp.dart';
+import 'package:lszlgl/model/rsp/login_rsp.dart';
+import 'package:lszlgl/model/rsp/sample_task_rsp.dart';
+import 'package:lszlgl/model/rsp/user_rsp.dart';
 import 'package:lszlgl/network/base_dio.dart';
-import 'package:lszlgl/network/req/login_req.dart';
-import 'package:lszlgl/network/api_rsp.dart';
-import 'package:lszlgl/network/rsp/login_rsp.dart';
-import 'package:lszlgl/network/rsp/user_rsp.dart';
 import 'package:retrofit/retrofit.dart';
 
 part 'api.g.dart';
@@ -23,10 +25,16 @@ abstract class Api {
   @GET('/admin-api/system/user/profile/get')
   Future<ApiRsp<UserRsp>> userProfile();
 
+  /// 获取所有字典
+  @GET('/admin-api/system/dict-data/simple-list')
+  Future<ApiRsp<List<DictRsp>>> getAllDict();
+
   /// 扦样任务单列表
   @GET('/admin-api/zj/code-sampling-task-details-sgjc/sampling_task_detail_page')
-  Future<ApiRsp<UserRsp>> sampleTaskList(
+  Future<ApiRsp<SampleTaskListRsp>> sampleTaskList(
     @Query('pageNo') int pageNo,
-    @Query('pageSize') int pageSize,
-  );
+    @Query('pageSize') int pageSize, {
+    @Query('deliveryStatus') int? deliveryStatus,
+    @Query('rwlx') int? rwlx,
+  });
 }

lib/network/base_dio.dart

@@ -47,6 +47,7 @@ class BaseDio {
     List<Interceptor>? interceptors,
   }) {
     dio.options.copyWith(
+      baseUrl: baseUrl,
       connectTimeout: connectTimeout,
       receiveTimeout: receiveTimeout,
       sendTimeout: sendTimeout,
@@ -124,7 +125,6 @@ class MyInterceptor extends Interceptor {
         err.copyWith(message: '当前网络不可用，请检查您的网络');
       }
     }
-    logger.e('ApiError: message:${err.message}');
     // error统一处理
     AppException appException = AppException.create(err);
     err.copyWith(error: appException);
@@ -132,8 +132,7 @@ class MyInterceptor extends Interceptor {
     Map<String, Object?> map = {};
     map['url'] = err.requestOptions.uri;
     map['statusCode'] = err.response?.statusCode;
-    map['message'] = err.message;
-    map['exceptionCode'] = appException.code;
+    map['data'] = err.response?.data;
     map['msg'] = appException.message;
     if (err.response?.extra.isNotEmpty ?? false) map['extra'] = err.response?.extra;
     logger.e('ApiError: $map');
@@ -168,12 +167,9 @@ class AppException implements Exception {
       case DioExceptionType.badCertificate:
         return AppException(-1, '证书错误');
       case DioExceptionType.badResponse:
-        try {
-          int? errCode = error.response!.statusCode;
-          return AppException(errCode!, error.response?.data ?? '');
-        } catch (_) {
-          return AppException(-1, "未知错误");
-        }
+        var code = error.response?.data['code'];
+        if (code == 401) UserService.get().logout();
+        return AppException(code, error.response?.data['msg'] ?? '');
       case DioExceptionType.cancel:
         return AppException(-1, "请求取消");
       case DioExceptionType.connectionError:

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/reap_step_tab_page.dart';
+import 'package:lszlgl/page/reap_step/sample_task_list_tab_page.dart';
 
 /// 首页
 class HomePage extends StatefulWidget {
@@ -22,11 +22,11 @@ class _HomePageState extends BaseState<HomePage> with AutomaticKeepAliveClientMi
   late List<ServiceModel> serviceList;
 
   void startReap() {
-    MyRouter.startReapStepList(const ReapStepTabPageArgs(type: StepType.reap));
+    MyRouter.startSampleTaskList(const SampleTaskListTabPageArgs(type: StepType.reap));
   }
 
   void startStore() {
-    MyRouter.startReapStepList(const ReapStepTabPageArgs(type: StepType.stock));
+    MyRouter.startSampleTaskList(const SampleTaskListTabPageArgs(type: StepType.stock));
   }
 
   @override

lib/page/login/login_page.dart

@@ -1,9 +1,11 @@
+import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
+import 'package:lszlgl/model/req/login_req.dart';
 import 'package:lszlgl/network/api.dart';
-import 'package:lszlgl/network/req/login_req.dart';
+import 'package:lszlgl/service/dict_service.dart';
 import 'package:lszlgl/service/user_service.dart';
 import 'package:lszlgl/widget/button.dart';
 
@@ -28,19 +30,33 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
       SmartDialog.showToast('请输入账号和密码');
       return;
     }
-    SmartDialog.showLoading();
+    SmartDialog.showLoading(clickMaskDismiss: false, backDismiss: false);
     try {
       // 登录
       var login = await Api().login(LoginReq(username: account, password: pwd));
       await UserService.get().saveLogin(login.data);
-      // 用户信息
+      getSystemData();
+    } on DioException catch (_) {
+      SmartDialog.dismiss(status: SmartStatus.loading);
+    }
+  }
+
+  /// 获取基础数据
+  void getSystemData() async {
+    SmartDialog.showLoading(clickMaskDismiss: false, backDismiss: false);
+    try {
+      // 获取用户数据
       var user = await Api().userProfile();
       await UserService.get().saveUser(user.data);
-      SmartDialog.dismiss();
+      // 获取字典
+      var dictData = await Api().getAllDict();
+      DictService.get().saveDictList(dictData.data);
       // 进入主页
+      SmartDialog.dismiss(status: SmartStatus.loading);
       startHome();
-    } catch (_) {
-      SmartDialog.dismiss();
+    } on DioException catch (_) {
+      // 获取数据失败
+      SmartDialog.dismiss(status: SmartStatus.loading);
     }
   }
 
@@ -56,10 +72,10 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
   }
 
   @override
-  void onFirstShow(Duration timeStamp) {
-    // 已登录进入主页
+  void onFirstShow(Duration timeStamp) async {
+    // 已登录
     if (UserService.get().getLogin() != null) {
-      startHome();
+      getSystemData();
     }
   }
 

lib/page/main_tab_page.dart

@@ -3,7 +3,6 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:lszlgl/base/base_state.dart';
-import 'package:lszlgl/network/api.dart';
 import 'package:lszlgl/page/home/home_page.dart';
 import 'package:lszlgl/page/user_center/user_center_page.dart';
 
@@ -47,8 +46,6 @@ class _MainTabPageState extends State<MainTabPage> {
     tabIconSelectList = [imgNavHomeSelect, imgNavUserCenterSelect];
     pageList = [const HomePage(), const UserCenterPage()];
     ctrl = PageController(initialPage: selectedIndex);
-    // 获取用户数据
-    Api().userProfile();
   }
 
   @override

lib/page/reap_step/reap_step_list_page.dart

@@ -1,232 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:lszlgl/base/base_lifecycle_state.dart';
-import 'package:lszlgl/base/base_state.dart';
-import 'package:lszlgl/config/colors.dart';
-import 'package:lszlgl/page/reap_step/reap_step_tab_page.dart';
-import 'package:lszlgl/widget/button.dart';
-
-/// 扦样环节列表
-class ReapStepListPage extends StatefulWidget {
-  final StepType type;
-  final bool complete;
-
-  const ReapStepListPage({
-    super.key,
-    required this.type,
-    this.complete = false,
-  });
-
-  @override
-  State<ReapStepListPage> createState() => _ReapStepListPageState();
-}
-
-class _ReapStepListPageState extends BaseLifecycleState<ReapStepListPage> {
-  late List<Map<String, String>> infoList;
-
-  /// 详情
-  void startDetail() {
-    if (!widget.complete) return;
-    switch (widget.type) {
-      case StepType.reap:
-        MyRouter.startReapSampleTask(detail: true);
-        break;
-      case StepType.stock:
-        break;
-    }
-  }
-
-  /// 扦样
-  void startSample() {
-    switch (widget.type) {
-      case StepType.reap:
-        MyRouter.startReapSampleTask();
-        break;
-      case StepType.stock:
-        break;
-    }
-  }
-
-  @override
-  void onInit() {
-    String taskType = switch (widget.type) {
-      StepType.reap => '收购监测',
-      StepType.stock => '库存监测',
-      _ => '',
-    };
-    if (widget.complete) {
-      infoList = [
-        {'采样品种': '玉米'},
-        {'粮食品类': '粮食品类'},
-        {'监测类别': taskType},
-        {'扦样数量(kg)': '10'},
-        {'扦样人员': '李飞'},
-        {'扦样时间': '2024-01-01'},
-      ];
-    } else {
-      infoList = [
-        {'采样品种': '玉米'},
-        {'报送截止时间': '2024-01-01'},
-        {'监测类别': taskType},
-        {'扦样人员': '李飞'},
-      ];
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      clipBehavior: Clip.hardEdge,
-      decoration: const BoxDecoration(
-        color: Colors.white,
-        borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
-      ),
-      alignment: Alignment.center,
-      child: buildList(),
-    );
-  }
-
-  Widget buildList() {
-    return ListView.builder(
-      physics: const BouncingScrollPhysics(),
-      padding: EdgeInsets.zero,
-      itemCount: 10,
-      itemBuilder: (_, index) => buildItem(index),
-    );
-  }
-
-  Widget buildItem(int index) {
-    return GestureDetector(
-      behavior: HitTestBehavior.opaque,
-      onTap: () => startDetail(),
-      child: Container(
-        margin: const EdgeInsets.only(left: 12, right: 12, top: 12),
-        decoration: const BoxDecoration(
-          color: Color(0xFFF5FFFD),
-          borderRadius: BorderRadius.all(Radius.circular(8)),
-        ),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            const SizedBox(height: 15),
-            buildTop(),
-            buildNumber(),
-            buildGrid(),
-            buildBottom(),
-            const SizedBox(height: 15),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget buildTop() {
-    return Row(
-      children: [
-        buildVLine(),
-        const Expanded(
-          child: Text(
-            '扦样任务单号',
-            style: TextStyle(color: MyColor.c_333333, fontSize: 18, fontWeight: FontWeight.w500),
-          ),
-        ),
-        buildState(),
-      ],
-    );
-  }
-
-  Widget buildVLine() {
-    return Container(
-      width: 4,
-      height: 20,
-      margin: const EdgeInsets.only(right: 8),
-      decoration: const BoxDecoration(
-        color: MyColor.c_25A6EE,
-        borderRadius: BorderRadius.all(Radius.circular(2)),
-      ),
-    );
-  }
-
-  Widget buildState() {
-    String state = widget.complete ? '已扦样' : '待扦样';
-    return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 4),
-      decoration: BoxDecoration(
-        color: MyColor.c_25A6EE.withOpacity(0.1),
-        borderRadius: const BorderRadius.horizontal(left: Radius.circular(100)),
-      ),
-      child: Text(
-        '状态：$state',
-        style: const TextStyle(color: MyColor.c_1383C2, fontSize: 16),
-      ),
-    );
-  }
-
-  Widget buildNumber() {
-    return const Padding(
-      padding: EdgeInsets.only(left: 12, top: 4, bottom: 6),
-      child: Text(
-        '***********',
-        style: TextStyle(color: MyColor.c_333333, fontSize: 18, fontWeight: FontWeight.w500),
-      ),
-    );
-  }
-
-  Widget buildGrid() {
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 12),
-      child: LayoutBuilder(builder: (context, constraints) {
-        return Wrap(
-          spacing: 4,
-          runSpacing: 4,
-          children: infoList.map((item) {
-            return SizedBox(
-              width: constraints.maxWidth / 2 - 2,
-              child: Text(
-                '${item.keys.first}：${item.values.first}',
-                style: const TextStyle(fontSize: 16, color: MyColor.c_666666),
-              ),
-            );
-          }).toList(),
-        );
-      }),
-    );
-  }
-
-  Widget buildBottom() {
-    if (widget.complete) return const SizedBox.shrink();
-    return Column(
-      children: [
-        buildDivider(),
-        Row(
-          children: [
-            const SizedBox(width: 12),
-            const Expanded(
-              child: Text(
-                '[张三]创建于2024-01-01 00:00:00',
-                style: TextStyle(fontSize: 16, color: MyColor.c_666666),
-              ),
-            ),
-            const SizedBox(width: 4),
-            MyButton(
-              '开始扦样',
-              onTap: () => startSample(),
-              fountSize: 16,
-              alignment: null,
-              padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 12),
-            ),
-            const SizedBox(width: 12),
-          ],
-        ),
-      ],
-    );
-  }
-
-  Widget buildDivider() {
-    return Container(
-      width: double.infinity,
-      height: 1,
-      color: MyColor.c_3BD2E5.withOpacity(0.15),
-      margin: const EdgeInsets.symmetric(vertical: 10),
-    );
-  }
-}

lib/page/reap_step/sample_list_vm.dart

@@ -0,0 +1,21 @@
+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/reap_step/sample_task_list_page.dart

@@ -0,0 +1,319 @@
+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/service/dict_service.dart';
+import 'package:lszlgl/widget/button.dart';
+import 'package:lszlgl/widget/page_widget.dart';
+
+/// 扦样环节列表
+class SampleTaskListPage extends StatefulWidget {
+  final StepType type;
+  final bool complete;
+
+  const SampleTaskListPage({
+    super.key,
+    required this.type,
+    this.complete = false,
+  });
+
+  @override
+  State<SampleTaskListPage> createState() => _SampleTaskListPageState();
+}
+
+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>>>();
+
+  /// 详情
+  void startDetail() {
+    if (!widget.complete) return;
+    switch (widget.type) {
+      case StepType.reap:
+        MyRouter.startReapSampleTask(detail: true);
+        break;
+      case StepType.stock:
+        break;
+    }
+  }
+
+  /// 扦样
+  void startSample() {
+    switch (widget.type) {
+      case StepType.reap:
+        MyRouter.startReapSampleTask();
+        break;
+      case StepType.stock:
+        break;
+    }
+  }
+
+  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,
+    );
+  }
+
+  @override
+  void onFirstShow(Duration timeStamp) {
+    refreshCtrl.callRefresh(overOffset: 200);
+  }
+
+  @override
+  void onDestroy() {
+    refreshCtrl.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    super.build(context);
+    return Container(
+      clipBehavior: Clip.hardEdge,
+      decoration: const BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
+      ),
+      alignment: Alignment.center,
+      child: buildBody(),
+    );
+  }
+
+  Widget buildBody() {
+    return EasyRefresh.builder(
+      controller: refreshCtrl,
+      onRefresh: () => getData(refresh: true),
+      onLoad: () => getData(refresh: false),
+      childBuilder: (_, physics) => buildList(physics),
+    );
+  }
+
+  Widget buildList(ScrollPhysics physics) {
+    var sliver = pageState.builder((v) {
+      var list = v.data;
+      if (v.status == DataStatus.error) {
+        // 加载失败
+        return SliverToBoxAdapter(child: PageLoadingWidget.error(onTap: () => refreshCtrl.callRefresh()));
+      } else if (list == null || list.isEmpty) {
+        // 无数据
+        return const SliverToBoxAdapter(child: PageLoadingWidget.empty());
+      } else {
+        return SliverList.builder(
+          itemCount: list.length,
+          itemBuilder: (_, index) => buildItem(index, list[index]),
+        );
+      }
+    });
+    return CustomScrollView(
+      physics: physics,
+      slivers: [sliver],
+    );
+  }
+
+  Widget buildItem(int index, SampleTaskItem item) {
+    return GestureDetector(
+      behavior: HitTestBehavior.opaque,
+      onTap: () => startDetail(),
+      child: Container(
+        margin: const EdgeInsets.only(left: 12, right: 12, top: 12),
+        decoration: const BoxDecoration(
+          color: Color(0xFFF5FFFD),
+          borderRadius: BorderRadius.all(Radius.circular(8)),
+        ),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            const SizedBox(height: 15),
+            buildTop(item.getDeliveryStatusText()),
+            buildNumber(item.qyrwdh ?? ''),
+            buildGrid(item),
+            buildBottom(item),
+            const SizedBox(height: 15),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget buildTop(String state) {
+    return Row(
+      children: [
+        buildVLine(),
+        const Expanded(
+          child: Text(
+            '扦样任务单号',
+            style: TextStyle(color: MyColor.c_333333, fontSize: 18, fontWeight: FontWeight.w500),
+          ),
+        ),
+        buildState(state),
+      ],
+    );
+  }
+
+  Widget buildVLine() {
+    return Container(
+      width: 4,
+      height: 20,
+      margin: const EdgeInsets.only(right: 8),
+      decoration: const BoxDecoration(
+        color: MyColor.c_25A6EE,
+        borderRadius: BorderRadius.all(Radius.circular(2)),
+      ),
+    );
+  }
+
+  Widget buildState(String state) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 4),
+      decoration: BoxDecoration(
+        color: MyColor.c_25A6EE.withOpacity(0.1),
+        borderRadius: const BorderRadius.horizontal(left: Radius.circular(100)),
+      ),
+      child: Text(
+        '状态：$state',
+        style: const TextStyle(color: MyColor.c_1383C2, fontSize: 16),
+      ),
+    );
+  }
+
+  Widget buildNumber(String number) {
+    return Padding(
+      padding: const EdgeInsets.only(left: 12, top: 4, bottom: 6),
+      child: Text(
+        number,
+        style: const TextStyle(color: MyColor.c_333333, fontSize: 18, fontWeight: FontWeight.w500),
+      ),
+    );
+  }
+
+  Widget buildGrid(SampleTaskItem item) {
+    List<Map<String, String>> infoList;
+    var jclb = DictService.get().getLabel(DictType.jclb, value: item.jclb)?.label;
+    if (widget.complete) {
+      infoList = [
+        {'采样品种': item.cypzName ?? ''},
+        {'粮食品类': item.lspz ?? ''},
+        {'监测类别': jclb ?? ''},
+        {'扦样数量(kg)': '${item.qysl ?? ''}'},
+        {'扦样人员': item.name ?? ''},
+        {'扦样时间': item.qysj ?? ''},
+      ];
+    } else {
+      infoList = [
+        {'采样品种': item.cypzName ?? ''},
+        {'报送截止时间': item.bsjzsj ?? ''},
+        {'监测类别': jclb ?? ''},
+        {'扦样人员': item.name ?? ''},
+      ];
+    }
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 12),
+      child: LayoutBuilder(builder: (context, constraints) {
+        return Wrap(
+          spacing: 4,
+          runSpacing: 4,
+          children: infoList.map((item) {
+            return SizedBox(
+              width: constraints.maxWidth / 2 - 2,
+              child: Text(
+                '${item.keys.first}：${item.values.first}',
+                style: const TextStyle(fontSize: 16, color: MyColor.c_666666),
+              ),
+            );
+          }).toList(),
+        );
+      }),
+    );
+  }
+
+  Widget buildBottom(SampleTaskItem item) {
+    if (widget.complete) return const SizedBox.shrink();
+    return Column(
+      children: [
+        buildDivider(),
+        Row(
+          children: [
+            const SizedBox(width: 12),
+            Expanded(
+              child: Text(
+                '[${item.qyryName ?? ''}]创建于${item.createTime ?? ''}',
+                style: const TextStyle(fontSize: 16, color: MyColor.c_666666),
+              ),
+            ),
+            const SizedBox(width: 4),
+            MyButton(
+              '开始扦样',
+              onTap: () => startSample(),
+              fountSize: 16,
+              alignment: null,
+              padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 12),
+            ),
+            const SizedBox(width: 12),
+          ],
+        ),
+      ],
+    );
+  }
+
+  Widget buildDivider() {
+    return Container(
+      width: double.infinity,
+      height: 1,
+      color: MyColor.c_3BD2E5.withOpacity(0.15),
+      margin: const EdgeInsets.symmetric(vertical: 10),
+    );
+  }
+
+  @override
+  bool get wantKeepAlive => true;
+}

lib/page/reap_step/reap_step_tab_page.dart

@@ -1,22 +1,22 @@
 import 'package:flutter/material.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
 import 'package:lszlgl/config/colors.dart';
-import 'package:lszlgl/main.dart';
-import 'package:lszlgl/page/reap_step/reap_step_list_page.dart';
+import 'package:lszlgl/page/reap_step/sample_task_list_page.dart';
 
 enum StepType {
-  reap(title: '收获环节'),
-  stock(title: '库存环节');
+  reap('收获环节', 1),
+  stock('库存环节', 2);
 
-  const StepType({required this.title});
+  const StepType(this.title, this.value);
 
   final String title;
+  final int value;
 }
 
-class ReapStepTabPageArgs {
+class SampleTaskListTabPageArgs {
   final StepType type;
 
-  const ReapStepTabPageArgs({required this.type});
+  const SampleTaskListTabPageArgs({required this.type});
 
   @override
   String toString() {
@@ -25,20 +25,20 @@ class ReapStepTabPageArgs {
 }
 
 /// 收获环节
-class ReapStepTabPage extends StatefulWidget {
-  final ReapStepTabPageArgs args;
+class SampleTaskListTabPage extends StatefulWidget {
+  final SampleTaskListTabPageArgs args;
 
-  const ReapStepTabPage({
+  const SampleTaskListTabPage({
     Key? key,
-    ReapStepTabPageArgs? args,
-  })  : args = args ?? const ReapStepTabPageArgs(type: StepType.reap),
+    SampleTaskListTabPageArgs? args,
+  })  : args = args ?? const SampleTaskListTabPageArgs(type: StepType.reap),
         super(key: key);
 
   @override
-  State<ReapStepTabPage> createState() => _ReapStepTabPageState();
+  State<SampleTaskListTabPage> createState() => _SampleTaskListTabPageState();
 }
 
-class _ReapStepTabPageState extends BaseLifecycleState<ReapStepTabPage> with TickerProviderStateMixin {
+class _SampleTaskListTabPageState extends BaseLifecycleState<SampleTaskListTabPage> with TickerProviderStateMixin {
   late TabController tabCtrl;
   late PageController pageCtrl;
 
@@ -47,14 +47,13 @@ class _ReapStepTabPageState extends BaseLifecycleState<ReapStepTabPage> with Tic
 
   @override
   void onInit() {
-    logger.d('type:${widget.args.type}');
     tabCtrl = TabController(length: 2, vsync: this);
     pageCtrl = PageController();
 
     tabTextList = ['待扦样', '扦样完成'];
     pageList = [
-      ReapStepListPage(type: widget.args.type),
-      ReapStepListPage(type: widget.args.type, complete: true),
+      SampleTaskListPage(type: widget.args.type),
+      SampleTaskListPage(type: widget.args.type, complete: true),
     ];
   }
 
@@ -113,7 +112,6 @@ class _ReapStepTabPageState extends BaseLifecycleState<ReapStepTabPage> with Tic
   Widget buildPage() {
     return PageView.builder(
       controller: pageCtrl,
-      // physics: const BouncingScrollPhysics(),
       onPageChanged: (index) {
         if (index == tabCtrl.index) return;
         tabCtrl.animateTo(index);

lib/page/user_center/account_manage_page.dart

@@ -2,7 +2,7 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
 import 'package:lszlgl/base/base_state.dart';
-import 'package:lszlgl/network/rsp/user_rsp.dart';
+import 'package:lszlgl/model/rsp/user_rsp.dart';
 import 'package:lszlgl/service/user_service.dart';
 import 'package:lszlgl/widget/button.dart';
 import 'package:lszlgl/widget/card_item.dart';

lib/page/user_center/user_center_page.dart

@@ -3,8 +3,8 @@ 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/model/rsp/user_rsp.dart';
 import 'package:lszlgl/network/api.dart';
-import 'package:lszlgl/network/rsp/user_rsp.dart';
 import 'package:lszlgl/service/user_service.dart';
 import 'package:lszlgl/widget/card_item.dart';
 

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/reap_step_tab_page.dart';
+import 'package:lszlgl/page/reap_step/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';
@@ -18,7 +18,7 @@ const rSettingPage = '/SettingPage';
 // 修改密码
 const rChangePwdPage = '/ChangePwdPage';
 // 收获流程列表
-const rReapStepTabPage = '/ReapStepTabPage';
+const rSampleTaskListTabPage = '/SampleTaskListTabPage';
 // 收获扦样任务
 const rReapSampleTaskPage = '/ReapSampleTaskPage';
 
@@ -29,7 +29,7 @@ final Map<String, MyNavigatorBuilder> rRouteMap = {
   rAccountManagePage: (context, args) => const AccountManagePage(),
   rSettingPage: (context, args) => const SettingPage(),
   rChangePwdPage: (context, args) => const ChangePwdPage(),
-  rReapStepTabPage: (context, args) => ReapStepTabPage(args: args as ReapStepTabPageArgs?),
+  rSampleTaskListTabPage: (context, args) => SampleTaskListTabPage(args: args as SampleTaskListTabPageArgs?),
   rReapSampleTaskPage: (context, args) => ReapSampleTaskPage(detail: args as bool?),
 };
 
@@ -70,8 +70,8 @@ class MyRouter {
   }
 
   /// 收获环节列表
-  static void startReapStepList(ReapStepTabPageArgs args) {
-    MyNavigator.push(rReapStepTabPage, args: args);
+  static void startSampleTaskList(SampleTaskListTabPageArgs args) {
+    MyNavigator.push(rSampleTaskListTabPage, args: args);
   }
 
   /// 收获扦样任务

lib/service/dict_service.dart

@@ -0,0 +1,47 @@
+import 'package:lszlgl/model/rsp/dict_rsp.dart';
+
+enum DictType {
+  /// 监测类别
+  jclb('jclb');
+
+  const DictType(this.type);
+
+  final String type;
+}
+
+class DictService {
+  DictService._();
+
+  static DictService? _instance;
+
+  static DictService get() => _instance ??= DictService._();
+
+  List<DictRsp>? _dictList;
+
+  List<DictRsp> get dictList => _dictList ??= [];
+
+  final Map<String, Map<String, DictRsp>> _dictMap = {};
+
+  void saveDictList(List<DictRsp>? list) {
+    if (list == null) return;
+    _dictList = list;
+    // 按类型存储字典
+    _dictMap.clear();
+    for (DictRsp dict in list) {
+      if (dict.dictType == null || dict.value == null) continue;
+      Map<String, DictRsp> map = _dictMap[dict.dictType!] ??= {};
+      map[dict.value!] = dict;
+    }
+  }
+
+  DictRsp? getLabel(DictType type, {num? value, String? valueStr}) {
+    String? v;
+    if (valueStr == null) {
+      if (value == null) return null;
+      v = value.toString();
+    } else {
+      v = valueStr;
+    }
+    return _dictMap[type.type]?[v];
+  }
+}

lib/service/user_service.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 
-import 'package:lszlgl/network/rsp/login_rsp.dart';
-import 'package:lszlgl/network/rsp/user_rsp.dart';
+import 'package:lszlgl/model/rsp/login_rsp.dart';
+import 'package:lszlgl/model/rsp/user_rsp.dart';
 import 'package:lszlgl/router/my_router.dart';
 import 'package:lszlgl/utils/sp_utils.dart';
 

lib/utils/inject.dart

@@ -0,0 +1,112 @@
+import 'dart:async';
+
+import 'package:get_it/get_it.dart';
+import 'package:lszlgl/main.dart';
+
+/// 依赖注入管理
+///
+/// ```
+/// 简单使用
+/// 添加注入:
+/// var user = Inject.put<UserBean>(UserBean(), dispose: (v) => v.dispose());
+/// 添加注入(懒加载):
+/// Inject.putLazy(UserBean(), dispose: (v) => v.dispose());
+///
+/// 获取实例:
+/// var user = Inject.get<UserBean>();
+///
+/// 移除注入:
+/// Inject.remove<UserBean>();
+/// ```
+class Inject {
+  Inject._();
+
+  /// 添加依赖注入
+  /// 注入后得到实例化对象, 也可以通过[get]方法得到对象.
+  /// * [instance] 实例化对象
+  /// * [name] 注入多个同类型对象时,可以使用name来区分
+  /// * [dispose] 移除时回调方法
+  /// * [allowReassignment] 是否可以重复注册, 默认不可重复注册, 返回之前已有实例
+  ///
+  static T put<T extends Object>(
+    T instance, {
+    String? name,
+    FutureOr Function(T)? dispose,
+    bool allowReassignment = false,
+  }) {
+    GetIt.I.allowReassignment = true;
+    // 不可重复注册, 已注册,则返回之前实例
+    if (!allowReassignment && GetIt.I.isRegistered<T>(instanceName: name)) {
+      logger.d('Inject put:$T 已被注册');
+      return get<T>()!;
+    }
+    logger.d('Inject put:$T');
+    GetIt.I.registerSingleton<T>(
+      instance,
+      instanceName: name,
+      dispose: dispose,
+    );
+    return instance;
+  }
+
+  /// 添加依赖注入 懒加载
+  /// 注入后不会立即实例化对象, 当调用[get]时才会实例化.
+  /// * [factoryFunc] 实例化对象回调方法
+  /// * [name] 注入多个同类型对象时,可以使用name来区分
+  /// * [dispose] 移除时回调方法
+  static void putLazy<T extends Object>(
+    T Function() factoryFunc, {
+    String? name,
+    FutureOr Function(T)? dispose,
+    bool allowReassignment = false,
+  }) {
+    GetIt.I.allowReassignment = true;
+    if (!allowReassignment && GetIt.I.isRegistered<T>(instanceName: name)) {
+      logger.d('Inject putLazy:$T 已被注册');
+      return;
+    }
+    logger.d('Inject putLazy:$T');
+    GetIt.I.registerLazySingleton<T>(
+      factoryFunc,
+      instanceName: name,
+      dispose: dispose,
+    );
+  }
+
+  /// 移除依赖注入
+  /// * [instance] 通过实例移除
+  /// * [name] 通过名称移除
+  /// * [dispose] 移除时回调方法
+  static FutureOr remove<T extends Object>({
+    Object? instance,
+    String? name,
+    FutureOr Function(T)? dispose,
+  }) {
+    logger.d('Inject remove:$T');
+    return GetIt.I.unregister(
+      instance: instance,
+      instanceName: name,
+      disposingFunction: dispose,
+    );
+  }
+
+  /// 获取唯一实例
+  /// Model model = GdInject.get<Model>();
+  static T? get<T extends Object>({String? name}) {
+    logger.d('Inject get:$T');
+    return GetIt.I.get<T>(instanceName: name);
+  }
+
+  /// 获取唯一实例,如果未注入依赖,将自动注入依赖
+  static T getAndPut<T extends Object>(
+    T instance, {
+    String? name,
+    FutureOr Function(T)? dispose,
+  }) {
+    // 已注册
+    if (GetIt.I.isRegistered<T>(instanceName: name)) {
+      return get<T>(name: name)!;
+    }
+    return put<T>(instance, name: name, dispose: dispose);
+  }
+}

lib/widget/button.dart

@@ -32,7 +32,7 @@ class MyButton extends StatelessWidget {
     this.fountColor = Colors.white,
     this.fontWeight,
     this.margin,
-    this.padding = const EdgeInsets.all(8),
+    this.padding = const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
     this.alignment = Alignment.center,
   }) : super(key: key);
 

lib/widget/page_widget.dart

@@ -41,7 +41,7 @@ class PageLoadingWidget extends StatelessWidget {
   const PageLoadingWidget.empty({
     super.key,
     this.alignment,
-    this.message,
+    this.message = '暂无数据',
     this.padding = const EdgeInsets.only(top: 150),
   })  : isLoading = false,
         title = null,
@@ -51,7 +51,7 @@ class PageLoadingWidget extends StatelessWidget {
   const PageLoadingWidget.error({
     super.key,
     this.alignment,
-    this.title,
+    this.title = '加载失败, 请重试',
     this.onTap,
     this.btnText = '点击重试',
     this.padding = const EdgeInsets.only(top: 150),
@@ -99,7 +99,7 @@ class PageLoadingWidget extends StatelessWidget {
       padding: const EdgeInsets.only(bottom: 12),
       child: Text(
         message!,
-        style: const TextStyle(fontSize: 12, color: MyColor.c_666666),
+        style: const TextStyle(fontSize: 16, color: MyColor.c_666666),
       ),
     );
   }
@@ -109,6 +109,7 @@ class PageLoadingWidget extends StatelessWidget {
     return MyButton(
       btnText!,
       onTap: onTap,
+      alignment: null,
     );
   }
 }

pubspec.lock

@@ -405,6 +405,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.2.0"
+  get_it:
+    dependency: "direct main"
+    description:
+      name: get_it
+      sha256: e6017ce7fdeaf218dc51a100344d8cb70134b80e28b760f8bb23c242437bafd7
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.6.7"
   glob:
     dependency: transitive
     description:

pubspec.yaml

@@ -68,6 +68,8 @@ dependencies:
   shared_preferences: ^2.2.2
   # 下拉刷新上拉加载
   easy_refresh: ^3.3.4
+  # 依赖注入
+  get_it: ^7.1.3
 
 dev_dependencies:
   flutter_test: