联调提交扦样信息

lib/model/rsp/district_rsp.dart

@@ -0,0 +1,40 @@
+import 'package:json_annotation/json_annotation.dart';
+
+import '../num_converter.dart';
+import '../string_converter.dart';
+
+part 'district_rsp.g.dart';
+
+@JsonSerializable(converters: [NumConverter(), StringConverter()])
+class DistrictRsp {
+  /*
+  "id": 6,
+  "parentCode": "0",
+  "createTime": null,
+  "ucode": "210000000000",
+  "ulevel": 1,
+  "uname": "辽宁省"
+   */
+
+  /// 编号
+  final num? id;
+
+  /// 等级 1-省，2-市，3-县，4-乡，5-村
+  final num? ulevel;
+
+  final String? parentCode;
+  final String? uname;
+  final String? ucode;
+
+  const DistrictRsp({
+    this.id,
+    this.ulevel,
+    this.parentCode,
+    this.uname,
+    this.ucode,
+  });
+
+  factory DistrictRsp.fromJson(Map<String, dynamic> json) => _$DistrictRspFromJson(json);
+
+  Map<String, dynamic> toJson() => _$DistrictRspToJson(this);
+}

lib/network/api.dart

@@ -8,9 +8,11 @@ import 'package:lszlgl/model/rsp/user_rsp.dart';
 import 'package:lszlgl/network/base_dio.dart';
 import 'package:retrofit/retrofit.dart';
 
+import '../model/rsp/district_rsp.dart';
+
 part 'api.g.dart';
 
-@RestApi(baseUrl: 'http://121.36.17.6:9099')
+@RestApi(baseUrl: 'http://121.36.17.6:49099')
 abstract class Api {
   factory Api({Dio? dio, String? baseUrl}) {
     dio ??= BaseDio.get().dio;
@@ -36,4 +38,15 @@ abstract class Api {
   /// 获取app下载地址
   @GET('/admin-api/zj/base-file/getAppDownLoadUrl')
   Future<ApiRsp<String?>> getAppDownloadUrl();
+
+  /// 扦样任务更新
+  @PUT('/admin-api/zj/code-sampling-task-details-sgjc/update')
+  Future<ApiRsp<bool?>> updateSampleTask(@Body() Map<String, dynamic> map);
+
+  /// 省市县
+  @GET('/admin-api/zj/base-administrative-division/list')
+  Future<ApiRsp<List<DistrictRsp>?>> districtList(
+    @Query('uLevel') num uLevel, {
+    @Query('id') num? id,
+  });
 }

lib/network/base_dio.dart

@@ -118,6 +118,12 @@ class MyInterceptor extends Interceptor {
 
   @override
   void onError(DioException err, ErrorInterceptorHandler handler) async {
+    if (err.type == DioExceptionType.badResponse) {
+      logger.e('ApiErrorSource: $err');
+      logger.e('ApiErrorResponse: ${err.response}');
+    } else {
+      logger.e('ApiErrorSource: $err');
+    }
     // 增加网络检测
     if (err.type == DioExceptionType.unknown) {
       bool isConnectNetWork = await isConnected();
@@ -133,7 +139,6 @@ class MyInterceptor extends Interceptor {
     map['url'] = err.requestOptions.uri;
     map['errorType'] = err.type;
     map['statusCode'] = err.response?.statusCode;
-    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,9 +173,12 @@ class AppException implements Exception {
       case DioExceptionType.badCertificate:
         return AppException(-1, '证书错误');
       case DioExceptionType.badResponse:
-        var code = error.response?.data['code'] ?? -1;
-        if (code == 401) UserService.get().logout();
-        return AppException(code, error.response?.data['msg'] ?? '');
+        if (error.response?.data is Map) {
+          var code = error.response?.data['code'] ?? -1;
+          if (code == 401) UserService.get().logout();
+          return AppException(code, error.response?.data['msg'] ?? '');
+        }
+        return AppException(-1, '请求失败');
       case DioExceptionType.cancel:
         return AppException(-1, "请求取消");
       case DioExceptionType.connectionError:

lib/page/home/home_page.dart

@@ -32,7 +32,7 @@ class _HomePageState extends BaseState<HomePage> with AutomaticKeepAliveClientMi
   void initState() {
     super.initState();
     serviceList = [
-      ServiceModel(name: '收货环节', icon: imgHomeListPzjc, onTap: startReap),
+      ServiceModel(name: '收获环节', icon: imgHomeListPzjc, onTap: startReap),
       ServiceModel(name: '库存环节', icon: imgHomeListZcjy, onTap: startStore),
     ];
   }

lib/page/login/login_page.dart

@@ -28,7 +28,7 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
       MyNavigator.showToast('请输入账号和密码');
       return;
     }
-    MyNavigator.showLoading(clickDismiss: false);
+    MyNavigator.showLoading();
     try {
       // 登录
       var login = await Api().login(LoginReq(username: account, password: pwd));
@@ -108,14 +108,15 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
   Widget buildBody() {
     return Column(
       children: [
-        const SizedBox(height: 56),
+        const Spacer(flex: 3),
         Container(
           width: double.infinity,
           padding: const EdgeInsets.symmetric(horizontal: 48),
           child: Image.asset(imgLoginTitle, fit: BoxFit.fill),
         ),
-        const SizedBox(height: 20),
+        const Spacer(),
         loginContainer(),
+        const Spacer(flex: 7),
       ],
     );
   }

lib/page/sample_task/reap_sample_detail/reap_sample_basic_detail_page.dart

@@ -1,5 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:lszlgl/network/api.dart';
 import '../../../base/base_lifecycle_state.dart';
+import '../../../config/colors.dart';
+import '../../../model/rsp/district_rsp.dart';
 import '../../../model/rsp/sample_task_rsp.dart';
 import '../../../service/dict_service.dart';
 import '../../../widget/button.dart';
@@ -8,8 +11,15 @@ import '../../../widget/card_item.dart';
 /// 收获扦样-基础信息
 class ReapSampleBasicDetailPage extends StatefulWidget {
   final SampleTaskItem? data;
+  final bool detail;
+  final VoidCallback? nextCallback;
 
-  const ReapSampleBasicDetailPage(this.data, {super.key});
+  const ReapSampleBasicDetailPage(
+    this.data, {
+    super.key,
+    this.detail = true,
+    this.nextCallback,
+  });
 
   @override
   State<ReapSampleBasicDetailPage> createState() => _ReapSampleBasicDetailPageState();
@@ -19,9 +29,120 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     with AutomaticKeepAliveClientMixin {
   SampleTaskItem? data;
 
+  late Widget arrowDown;
+  final sfList = <DistrictRsp>[].notifier<List<DistrictRsp>>();
+  final sqList = <DistrictRsp>[].notifier<List<DistrictRsp>>();
+  final qxList = <DistrictRsp>[].notifier<List<DistrictRsp>>();
+  final xzList = <DistrictRsp>[].notifier<List<DistrictRsp>>();
+  final czList = <DistrictRsp>[].notifier<List<DistrictRsp>>();
+  final sf = null.notifier<int?>();
+  final sq = null.notifier<int?>();
+  final qx = null.notifier<int?>();
+  final xz = null.notifier<int?>();
+  final cz = null.notifier<int?>();
+
+  final dllx = null.notifier<int?>();
+
   @override
   void onInit() {
     data = widget.data;
+    arrowDown = Image.asset(imgItemArrowDown, width: 20);
+    // 省
+    districtList(1);
+    // 市
+    if (data?.shengXzqh != null) {
+      districtList(2, id: data?.shengXzqh);
+    }
+    // 区
+    if (data?.shiXzqh != null) {
+      districtList(3, id: data?.shiXzqh);
+    }
+    // 县
+    if (data?.quXzqh != null) {
+      districtList(4, id: data?.quXzqh);
+    }
+    // 村
+    if (data?.xiangXzqh != null) {
+      districtList(5, id: data?.xiangXzqh);
+    }
+  }
+
+  Future<void> districtList(num level, {num? id}) async {
+    MyNavigator.showLoading();
+    try {
+      var rsp = await Api().districtList(level, id: id);
+      if (level == 1) {
+        sfList.value = rsp.data ?? [];
+      } else if (level == 2) {
+        sqList.value = rsp.data ?? [];
+      } else if (level == 3) {
+        qxList.value = rsp.data ?? [];
+      } else if (level == 4) {
+        xzList.value = rsp.data ?? [];
+      } else if (level == 5) {
+        czList.value = rsp.data ?? [];
+      }
+    } catch (e) {}
+    MyNavigator.dismissLoading();
+  }
+
+  void onSelect(ValueNotifier<int?> selNotifier, int index) {
+    late DistrictRsp item;
+    if (selNotifier == sf) {
+      item = sfList.value[index];
+      data?.sheng = item.uname;
+      data?.shengXzqh = item.id;
+      sq.value = null;
+      qx.value = null;
+      xz.value = null;
+      cz.value = null;
+      sqList.value = [];
+      qxList.value = [];
+      xzList.value = [];
+      czList.value = [];
+    } else if (selNotifier == sq) {
+      item = sqList.value[index];
+      data?.shi = item.uname;
+      data?.shiXzqh = item.id;
+      qx.value = null;
+      xz.value = null;
+      cz.value = null;
+      qxList.value = [];
+      xzList.value = [];
+      czList.value = [];
+    } else if (selNotifier == qx) {
+      item = qxList.value[index];
+      data?.qu = item.uname;
+      data?.quXzqh = item.id;
+      xz.value = null;
+      cz.value = null;
+      xzList.value = [];
+      czList.value = [];
+    } else if (selNotifier == xz) {
+      item = xzList.value[index];
+      data?.xian = item.uname;
+      data?.xiangXzqh = item.id;
+      cz.value = null;
+      czList.value = [];
+    } else if (selNotifier == cz) {
+      item = sfList.value[index];
+      widget.data?.cun = item.uname;
+      data?.cun = item.uname;
+      data?.cunXzqh = item.id;
+    }
+    if ((item.ulevel ?? 100) < 5) {
+      districtList((item.ulevel ?? 100) + 1, id: item.id ?? 0);
+    }
+  }
+
+  Future<void> updateTask() async {
+    // widget.nextCallback?.call();
+    MyNavigator.showLoading();
+    try {
+      var rsp = await Api().updateSampleTask(data?.toJson() ?? {});
+      MyNavigator.showToast((rsp.data ?? false) ? '提交成功' : '提交失败');
+    } catch (e) {}
+    MyNavigator.dismissLoading();
   }
 
   @override
@@ -41,28 +162,81 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
   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: 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: widget.detail ? data?.sheng : null,
+          rightChild: widget.detail ? null : buildMenu(sfList, sf, onSelect),
+          bottomLine: true,
+        ),
+        CardItemWidget(
+          '市区',
+          rightText: widget.detail ? data?.shi : null,
+          rightChild: widget.detail ? null : buildMenu(sqList, sq, onSelect),
+          bottomLine: true,
+        ),
+        CardItemWidget(
+          '区县',
+          rightText: widget.detail ? data?.qu : null,
+          rightChild: widget.detail ? null : buildMenu(qxList, qx, onSelect),
+          bottomLine: true,
+        ),
+        CardItemWidget(
+          '乡镇',
+          rightText: widget.detail ? data?.xian : null,
+          rightChild: widget.detail ? null : buildMenu(xzList, xz, onSelect),
+          bottomLine: true,
+        ),
+        CardItemWidget(
+          '村',
+          rightText: widget.detail ? data?.cun : null,
+          rightChild: widget.detail ? null : buildMenu(czList, cz, onSelect),
+          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),
+        CardItemWidget(
+          '被调查农户或合作社',
+          rightText: data?.bdcnhhhzs,
+          bottomLine: true,
+        ),
+        CardItemWidget(
+          '联系方式',
+          rightText: data?.lxfs,
+          bottomLine: true,
+        ),
       ],
     );
   }
@@ -72,8 +246,88 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
       color: const Color(0xFFF1F7F6),
       padding: const EdgeInsets.all(12),
       child: MyButton(
-        '重新录入',
-        onTap: () => MyRouter.startReapSampleTask(),
+        widget.detail ? '重新录入' : '下一步',
+        onTap: () => widget.detail ? MyRouter.startReapSampleTask() : updateTask(),
+      ),
+    );
+  }
+
+  Widget buildMenu(
+    ValueNotifier<List<DistrictRsp>> listNotifier,
+    ValueNotifier<int?> selNotifier,
+    Function(ValueNotifier<int?>, int) onItemTap,
+  ) {
+    return listNotifier.builder(
+      (list) => selNotifier.builder(
+        (sel) {
+          return MenuAnchor(
+            style: const MenuStyle(
+              padding: MaterialStatePropertyAll(EdgeInsets.zero),
+              alignment: Alignment.bottomRight,
+            ),
+            builder: (_, ctrl, __) => buildMenuText(ctrl, list, sel),
+            menuChildren: List.generate(list.length, (index) {
+              return buildMenuItem(
+                list[index],
+                index == sel,
+                () {
+                  if (selNotifier.value == index) return;
+                  selNotifier.value = index;
+                  onItemTap.call(selNotifier, index);
+                },
+              );
+            }).toList(),
+          );
+        },
+      ),
+    );
+  }
+
+  Widget buildMenuText(MenuController ctrl, List<DistrictRsp> list, int? index) {
+    return GestureDetector(
+      behavior: HitTestBehavior.opaque,
+      onTap: () {
+        if (list.isEmpty) {
+          MyNavigator.showToast('请先选择上级选项');
+          return;
+        }
+        if (ctrl.isOpen) {
+          ctrl.close();
+        } else {
+          ctrl.open();
+        }
+      },
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Expanded(
+            child: Text(
+              index == null ? '' : list[index].uname ?? '',
+              textAlign: TextAlign.right,
+              style: const TextStyle(
+                color: Color(0xFF01B2C8),
+                fontSize: 14,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          const SizedBox(width: 8),
+          arrowDown,
+        ],
+      ),
+    );
+  }
+
+  Widget buildMenuItem(DistrictRsp value, bool isSelect, VoidCallback? onPressed) {
+    return MenuItemButton(
+      onPressed: onPressed,
+      child: Container(
+        constraints: const BoxConstraints(minWidth: 120),
+        alignment: Alignment.center,
+        child: Text(
+          value.uname ?? '',
+          style: TextStyle(color: isSelect ? const Color(0xFF01B2C8) : MyColor.c_666666),
+        ),
       ),
     );
   }

lib/page/sample_task/reap_sample_task/reap_sample_basic_page.dart

@@ -3,6 +3,8 @@ import 'package:lszlgl/base/base_state.dart';
 import 'package:lszlgl/widget/button.dart';
 import 'package:lszlgl/widget/card_item.dart';
 
+import '../../../config/colors.dart';
+
 /// 收获扦样-基础信息
 class ReapSampleBasicPage extends StatefulWidget {
   final VoidCallback nextCallback;
@@ -19,6 +21,7 @@ class ReapSampleBasicPage extends StatefulWidget {
 class _ReapSampleBasicPageState extends BaseState<ReapSampleBasicPage> with AutomaticKeepAliveClientMixin {
   late Widget arrowDown;
 
+  ValueNotifier<String?> sf = ValueNotifier(null);
   ValueNotifier<String?> sq = ValueNotifier(null);
   ValueNotifier<String?> qx = ValueNotifier(null);
   ValueNotifier<String?> xz = ValueNotifier(null);
@@ -48,20 +51,77 @@ class _ReapSampleBasicPageState extends BaseState<ReapSampleBasicPage> with Auto
   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('市区选择', rightChild: buildMenu(sq), bottomLine: true),
-        CardItemWidget('区县选择', rightChild: buildMenu(qx), bottomLine: true),
-        CardItemWidget('乡镇选择', rightChild: buildMenu(xz), bottomLine: true),
-        CardItemWidget('村选择', rightChild: buildMenu(cz), bottomLine: true),
-        CardItemWidget('扦样地点经纬度', rightText: '', hint: '点击获取', bottomLine: true),
-        CardItemWidget('种植面积（亩地）', rightChild: buildField(hint: '点击填写'), bottomLine: true),
-        CardItemWidget('土壤地理类型', rightChild: buildMenu(dllx), bottomLine: true),
-        CardItemWidget('被调查农户或合作社', rightChild: buildField(hint: '点击填写'), bottomLine: true),
-        CardItemWidget('联系方式', rightChild: buildField(hint: '点击填写'), bottomLine: true),
+        CardItemWidget(
+          '扦样任务单号',
+          rightText: '自动生成',
+          bottomLine: true,
+        ),
+        CardItemWidget(
+          '扦样单位',
+          rightText: '自动生成',
+          bottomLine: true,
+        ),
+        CardItemWidget(
+          '扦样人员',
+          rightText: '自动生成',
+          bottomLine: true,
+        ),
+        CardItemWidget(
+          '任务类型',
+          rightText: '自动生成',
+          bottomLine: true,
+        ),
+        CardItemWidget(
+          '省份选择',
+          rightChild: buildMenu(sf),
+          bottomLine: true,
+        ),
+        CardItemWidget(
+          '市区选择',
+          rightChild: buildMenu(sq),
+          bottomLine: true,
+        ),
+        CardItemWidget(
+          '区县选择',
+          rightChild: buildMenu(qx),
+          bottomLine: true,
+        ),
+        CardItemWidget(
+          '乡镇选择',
+          rightChild: buildMenu(xz),
+          bottomLine: true,
+        ),
+        CardItemWidget(
+          '村选择',
+          rightChild: buildMenu(cz),
+          bottomLine: true,
+        ),
+        CardItemWidget(
+          '扦样地点经纬度',
+          rightText: '',
+          hint: '点击获取',
+          bottomLine: true,
+        ),
+        CardItemWidget(
+          '种植面积（亩地）',
+          rightChild: buildField(hint: '点击填写'),
+          bottomLine: true,
+        ),
+        CardItemWidget(
+          '土壤地理类型',
+          rightChild: buildMenu(dllx),
+          bottomLine: true,
+        ),
+        CardItemWidget(
+          '被调查农户或合作社',
+          rightChild: buildField(hint: '点击填写'),
+          bottomLine: true,
+        ),
+        CardItemWidget(
+          '联系方式',
+          rightChild: buildField(hint: '点击填写'),
+          bottomLine: true,
+        ),
       ],
     );
   }
@@ -98,44 +158,63 @@ class _ReapSampleBasicPageState extends BaseState<ReapSampleBasicPage> with Auto
       valueListenable: notifier,
       builder: (_, value, __) {
         return MenuAnchor(
-          builder: (_, ctrl, __) {
-            return GestureDetector(
-              behavior: HitTestBehavior.opaque,
-              onTap: () {
-                if (ctrl.isOpen) {
-                  ctrl.close();
-                } else {
-                  ctrl.open();
-                }
-              },
-              child: Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Text(
-                    value ?? '',
-                    textAlign: TextAlign.right,
-                    style: const TextStyle(
-                      color: Color(0xFF01B2C8),
-                      fontSize: 16,
-                      fontWeight: FontWeight.w500,
-                    ),
-                  ),
-                  const SizedBox(width: 8),
-                  arrowDown,
-                ],
-              ),
-            );
-          },
+          style: const MenuStyle(
+            padding: MaterialStatePropertyAll(EdgeInsets.zero),
+            alignment: Alignment.bottomRight,
+          ),
+          builder: (_, ctrl, __) => buildMenuText(ctrl, value ?? ''),
           menuChildren: ['选项一', '选项二', '选项三', '选项四']
               .map(
-                (e) => MenuItemButton(
-                  child: Text(e),
-                  onPressed: () => notifier.value = e,
-                ),
+                (e) => buildMenuItem(e, notifier),
               )
               .toList(),
         );
       },
     );
   }
+
+  Widget buildMenuText(MenuController ctrl, String value) {
+    return GestureDetector(
+      behavior: HitTestBehavior.opaque,
+      onTap: () {
+        if (ctrl.isOpen) {
+          ctrl.close();
+        } else {
+          ctrl.open();
+        }
+      },
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Expanded(
+            child: Text(
+              value,
+              textAlign: TextAlign.right,
+              style: const TextStyle(
+                color: Color(0xFF01B2C8),
+                fontSize: 14,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          const SizedBox(width: 8),
+          arrowDown,
+        ],
+      ),
+    );
+  }
+
+  Widget buildMenuItem(String item, ValueNotifier<String?> notifier) {
+    return MenuItemButton(
+      child: Container(
+        constraints: const BoxConstraints(minWidth: 120),
+        alignment: Alignment.center,
+        child: Text(
+          item,
+          style: TextStyle(color: item == notifier.value ? const Color(0xFF01B2C8) : MyColor.c_666666),
+        ),
+      ),
+      onPressed: () => notifier.value = item,
+    );
+  }
 }

lib/page/sample_task/reap_sample_task/reap_sample_task_page.dart

@@ -8,7 +8,6 @@ import 'package:lszlgl/page/sample_task/reap_sample_detail/reap_sample_disaster_
 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';
@@ -85,7 +84,8 @@ class _ReapSampleTaskPageState extends BaseState<ReapSampleTaskPage> with Ticker
       ];
     } else {
       pageList = [
-        ReapSampleBasicPage(nextCallback: next),
+        ReapSampleBasicDetailPage(args.data, detail: false, nextCallback: next),
+        // ReapSampleBasicPage(nextCallback: next),
         ReapSampleVarietyPage(nextCallback: next, previousCallback: previous),
         ReapSampleDisasterPage(nextCallback: next, previousCallback: previous),
         ReapSampleMedicinePage(nextCallback: next, previousCallback: previous),

lib/page/sample_task/sample_task_list_page.dart

@@ -38,7 +38,7 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
     if (!widget.complete) return;
     switch (widget.type) {
       case StepType.reap:
-        MyRouter.startReapSampleTask(args: ReapSampleTaskPageArgs(detail: true,data: data));
+        MyRouter.startReapSampleTask(args: ReapSampleTaskPageArgs(detail: true, data: data));
         break;
       case StepType.stock:
         break;
@@ -46,10 +46,10 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
   }
 
   /// 扦样
-  void startSample() {
+  void startSample(SampleTaskItem data) {
     switch (widget.type) {
       case StepType.reap:
-        MyRouter.startReapSampleTask();
+        MyRouter.startReapSampleTask(args: ReapSampleTaskPageArgs(detail: false, data: data));
         break;
       case StepType.stock:
         break;
@@ -244,7 +244,7 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
             const SizedBox(width: 4),
             MyButton(
               '开始扦样',
-              onTap: () => startSample(),
+              onTap: () => startSample(item),
               fountSize: 13,
               alignment: null,
               padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 12),