修改扦样单列表、扦样单详情内容；

README.md

@@ -28,15 +28,15 @@ samples, guidance on mobile development, and a full API reference.
 ### 2024.04.18 app改动点：
 1. 收获环节<扦样任务单列表>的筛选页面及功能.
 2. 扦样单列表：
-   1. <扦样人员>字段未显示的问题.
-   2. <检验指标>和<扦样地区>位置互换.
-   3. <检验指标>和<样品等级>为空时不展示.
+   1. <扦样人员>字段未显示的问题.√
+   2. <检验指标>和<扦样地区>位置互换.√
+   3. <检验指标>和<样品等级>为空时不展示.√
 3. 扦样单详情：
-   1. 扦样单位、监测类别、样品编号都去掉.
-   2. 高德定位结果填入乡镇和村.
-   3. 用药情况删除改为长按弹框确认删除.
-   4. 用药情况的施药时间字段有数据时下拉箭头不显示.
-   5. 下拉箭头颜色都改为高亮文本颜色.
+   1. 扦样单位、监测类别、样品编号都去掉.√
+   2. 高德定位结果填入乡镇和村.√
+   3. 用药情况删除改为长按弹框确认删除.√
+   4. 用药情况的施药时间字段有数据时下拉箭头不显示.√
+   5. 下拉箭头颜色都改为高亮文本颜色.√
 4. 新增内容：
    1. 电子签名：点击扦样单提交时跳出签名弹窗，根据扦样人数签名，按钮:重写、上一位、下一位、提交。
    2. 电子签名图片上传接口：/infra/file/upload

android/app/build.gradle

@@ -36,7 +36,7 @@ android {
         applicationId "com.szls.lszlgl"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion flutter.minSdkVersion
+        minSdkVersion 21
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.8.22'
     repositories {
         google()
         mavenCentral()

lib/model/rsp/sample_task_rsp.dart

@@ -2,6 +2,8 @@ import 'package:json_annotation/json_annotation.dart';
 import 'package:lszlgl/model/num_converter.dart';
 import 'package:lszlgl/model/string_converter.dart';
 
+import '../../service/dict_service.dart';
+
 part 'sample_task_rsp.g.dart';
 
 @JsonSerializable(genericArgumentFactories: true)
@@ -108,6 +110,8 @@ class SampleTaskItem {
   List<JyjgxxItem>? jyjgxxRespVOList; // 检验机构信息
   num? jypzStatus; // 检验品质按钮0显示1不显示
   num? tqqk; // 天气情况
+  List<NonghuItem>? codeSamplingNonghuList; // 扦样农户信息
+
 
   SampleTaskItem({
     this.id,
@@ -197,7 +201,35 @@ class SampleTaskItem {
     this.tqqk,
   });
 
-  factory SampleTaskItem.fromJson(Map<String, dynamic> json) => _$SampleTaskItemFromJson(json);
+  SampleTaskItem createUI() {
+    // 工厂排污
+    zztdzwsfygcpw ??= false;
+    // 工厂排污类型
+    gcpwlx ??= DictService.getDictFirstNum(DictType.gcpwlx);
+    // 水源、土壤污染
+    zztdzwsysytrsfywr ??= false;
+    // 污染物类型
+    wrwlx ??= DictService.getDictFirstNum(DictType.wrwlx);
+    // 病虫害
+    scgczsffsbjyzdbch ??= false;
+    // 病虫害类型
+    bchlx ??= DictService.getDictFirstNum(DictType.bchlx);
+    // 收获期间是否发生连阴雨天气
+    shqjsffslyytq ??= 1;
+    // 收获粮食水分是否偏高
+    shlssfsfpg ??= 1;
+    // 近年来本地是否发生真菌毒素污染
+    jnlbdsffszmwr ??= 1;
+    // 真菌毒素污染类型
+    zjdswrlx ??= DictService.getDictFirstNum(DictType.zjdswrlx);
+    // 近年来本地是否发生重金属污染
+    jnlbdsfzjswr ??= 1;
+    // 重金属污染类型
+    zjswrlx ??= DictService.getDictFirstNum(DictType.zjswrlx);
+    return this;
+  }
+
+  factory SampleTaskItem.fromJson(Map<String, dynamic> json) => _$SampleTaskItemFromJson(json)..createUI();
 
   Map<String, dynamic> toJson() => _$SampleTaskItemToJson(this);
 
@@ -211,11 +243,11 @@ class SampleTaskItem {
     map['state'] = state;
     map['id'] = id;
 
-    map['shengXzqh'] = shengXzqh;
-    map['shiXzqh'] = shiXzqh;
-    map['quXzqh'] = quXzqh;
-    map['xiangXzqh'] = xiangXzqh;
-    map['cunXzqh'] = cunXzqh;
+    map['shengXzqhName'] = shengXzqhName;
+    map['shiXzqhName'] = shiXzqhName;
+    map['quXzqhName'] = quXzqhName;
+    map['xiangXzqhName'] = xiangXzqhName;
+    map['cunXzqhName'] = cunXzqhName;
 
     map['qyddjwd'] = qyddjwd;
     map['zzmj'] = zzmj;
@@ -244,9 +276,16 @@ class SampleTaskItem {
     map['zjdswrlx'] = zjdswrlx;
     map['jnlbdsfzjswr'] = jnlbdsfzjswr;
     map['zjswrlx'] = zjswrlx;
-    map['codeUseMedicineList'] = codeUseMedicineList?.map((e) => e.toReqJson()).toList();
+    List<UseMedicineItem>? medicineList = codeUseMedicineList?.where((e) => e.id == null).toList();
+    if (medicineList != null && medicineList.isNotEmpty) {
+      map['codeUseMedicineList'] = medicineList.map((e) => e.toReqJson()).toList();
+    }
     map['dgryName'] = dgryName;
     map['tqqk'] = tqqk;
+    List<NonghuItem>? nonghuList = codeSamplingNonghuList?.where((e) => e.id == null).toList();
+    if (nonghuList != null && nonghuList.isNotEmpty) {
+      map['codeSamplingNonghuList'] = nonghuList.map((e) => e.toReqJson()).toList();
+    }
 
     return map;
   }
@@ -390,6 +429,48 @@ class UseMedicineItem {
     return map;
   }
 }
+@JsonSerializable(converters: [NumConverter(), StringConverter()])
+class NonghuItem {
+  /// ID
+  num? id;
+  /// 被调查农户或合作社
+  String? bdcnhhhzs;
+  /// 扦样数量（公斤）
+  num? qysl;
+  /// 联系方式
+  String? lxfs;
+  /// 扦样代表数量（公斤）
+  num? qydbsl;
+  /// 收购扦样任务单ID
+  num? zjCodeSamplingTaskDetailsSgjcId;
+  /// 库存扦样任务单ID
+  num? zjCodeSamplingTaskDetailsKcjcId;
+
+  NonghuItem({
+    this.id,
+    this.bdcnhhhzs,
+    this.qysl,
+    this.lxfs,
+    this.qydbsl,
+    this.zjCodeSamplingTaskDetailsKcjcId,
+    this.zjCodeSamplingTaskDetailsSgjcId,
+  });
+
+  factory NonghuItem.fromJson(Map<String, dynamic> json) => _$NonghuItemFromJson(json);
+
+  Map<String, dynamic> toJson() => _$NonghuItemToJson(this);
+
+  Map<String, dynamic> toReqJson() {
+    Map<String, dynamic> map = {};
+    map['id'] = id;
+    map['bdcnhhhzs'] = bdcnhhhzs;
+    map['qysl'] = qysl;
+    map['lxfs'] = lxfs;
+    map['qydbsl'] = qydbsl;
+    return map;
+  }
+}
+
 
 @JsonSerializable(converters: [NumConverter(), StringConverter()])
 class SamplingTaskAllotSgjcItem {

lib/model/rsp/sample_task_rsp.g.dart

@@ -122,7 +122,10 @@ SampleTaskItem _$SampleTaskItemFromJson(Map<String, dynamic> json) =>
           .toList(),
       jypzStatus: const NumConverter().fromJson(json['jypzStatus']),
       tqqk: const NumConverter().fromJson(json['tqqk']),
-    );
+    )..codeSamplingNonghuList =
+        (json['codeSamplingNonghuList'] as List<dynamic>?)
+            ?.map((e) => NonghuItem.fromJson(e as Map<String, dynamic>))
+            .toList();
 
 Map<String, dynamic> _$SampleTaskItemToJson(SampleTaskItem instance) =>
     <String, dynamic>{
@@ -217,6 +220,7 @@ Map<String, dynamic> _$SampleTaskItemToJson(SampleTaskItem instance) =>
       'jyjgxxRespVOList': instance.jyjgxxRespVOList,
       'jypzStatus': const NumConverter().toJson(instance.jypzStatus),
       'tqqk': const NumConverter().toJson(instance.tqqk),
+      'codeSamplingNonghuList': instance.codeSamplingNonghuList,
     };
 
 EnterpriseItem _$EnterpriseItemFromJson(Map<String, dynamic> json) =>
@@ -337,6 +341,31 @@ Map<String, dynamic> _$UseMedicineItemToJson(UseMedicineItem instance) =>
       'zczfw': const StringConverter().toJson(instance.zczfw),
     };
 
+NonghuItem _$NonghuItemFromJson(Map<String, dynamic> json) => NonghuItem(
+      id: const NumConverter().fromJson(json['id']),
+      bdcnhhhzs: const StringConverter().fromJson(json['bdcnhhhzs']),
+      qysl: const NumConverter().fromJson(json['qysl']),
+      lxfs: const StringConverter().fromJson(json['lxfs']),
+      qydbsl: const NumConverter().fromJson(json['qydbsl']),
+      zjCodeSamplingTaskDetailsKcjcId: const NumConverter()
+          .fromJson(json['zjCodeSamplingTaskDetailsKcjcId']),
+      zjCodeSamplingTaskDetailsSgjcId: const NumConverter()
+          .fromJson(json['zjCodeSamplingTaskDetailsSgjcId']),
+    );
+
+Map<String, dynamic> _$NonghuItemToJson(NonghuItem instance) =>
+    <String, dynamic>{
+      'id': const NumConverter().toJson(instance.id),
+      'bdcnhhhzs': const StringConverter().toJson(instance.bdcnhhhzs),
+      'qysl': const NumConverter().toJson(instance.qysl),
+      'lxfs': const StringConverter().toJson(instance.lxfs),
+      'qydbsl': const NumConverter().toJson(instance.qydbsl),
+      'zjCodeSamplingTaskDetailsSgjcId':
+          const NumConverter().toJson(instance.zjCodeSamplingTaskDetailsSgjcId),
+      'zjCodeSamplingTaskDetailsKcjcId':
+          const NumConverter().toJson(instance.zjCodeSamplingTaskDetailsKcjcId),
+    };
+
 SamplingTaskAllotSgjcItem _$SamplingTaskAllotSgjcItemFromJson(
         Map<String, dynamic> json) =>
     SamplingTaskAllotSgjcItem(

lib/page/sample_task/reap_sample_detail/reap_sample_basic_detail_page.dart

@@ -10,7 +10,6 @@ import '../../../base/base_lifecycle_state.dart';
 import '../../../model/rsp/dict_rsp.dart';
 import '../../../model/rsp/sample_task_rsp.dart';
 import '../../../network/my_api.dart';
-import '../../../service/dict_service.dart';
 import '../../../widget/card_item.dart';
 
 /// 收获扦样-基础信息
@@ -28,7 +27,8 @@ class ReapSampleBasicDetailPage extends StatefulWidget {
   State<ReapSampleBasicDetailPage> createState() => _ReapSampleBasicDetailPageState();
 }
 
-class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasicDetailPage> with AutomaticKeepAliveClientMixin {
+class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasicDetailPage>
+    with AutomaticKeepAliveClientMixin {
   SampleTaskItem? data;
   late bool isDetail;
 
@@ -133,7 +133,7 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
         ..clear()
         ..addAll((rsp.data ?? []).map((e) => CardMenuData(e.name, e.id)).toList());
       // 选中扦样人员
-      var nameList = data?.name?.split(',');
+      var nameList = data?.dgryName?.split(',');
       if (nameList != null) {
         for (var person in personList) {
           for (var name in nameList) {
@@ -164,9 +164,15 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
       logger.d('LocationChanged:${jsonEncode(value)}');
       var lon = (value['longitude'] as double).toStringAsFixed(2);
       var lat = (value['latitude'] as double).toStringAsFixed(2);
-      var province = value['province'];
-      var city = value['city'] == province ? '市辖区' : value['city'];
-      var district = value['district'];
+      String province = value['province'] as String;
+      String city = value['city'] as String;
+      String district = value['district'] as String;
+      String street = value['street'] as String;
+      String streetNumber = value['streetNumber'] as String;
+      if (province == city) {
+        city = district;
+        district = '';
+      }
       // if (value['province'] != data?.sheng) {
       //   MyNavigator.showToast('扦样地点有误，请检查扦样人员所在地点。');
       //   return;
@@ -178,13 +184,11 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
       data?.quXzqh = null;
       qu.value = null;
 
-      data?.xiangXzqh = null;
+      data?.xiangXzqhName = null;
       xian.value = null;
-      xianList.value = [];
 
-      data?.cunXzqh = null;
+      data?.cunXzqhName = null;
       cun.value = null;
-      cunList.value = [];
 
       MyNavigator.showLoading();
       bool stepSuccess = false;
@@ -212,18 +216,34 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
               break;
             }
           }
+
           if (stepSuccess) {
             stepSuccess = false;
             // 区
-            var districtList = await getDistrictList(3, id: data?.shiXzqh, showLoading: false);
-            if (districtList == null) return;
-            for (CardMenuData item in districtList) {
-              if (item.name == district) {
-                data?.quXzqh = item.value;
-                qu.value = item;
-                getDistrictList(4, id: item.value, showLoading: false);
-                break;
+            if (district.isNotEmpty) {
+              var districtList = await getDistrictList(3, id: data?.shiXzqh, showLoading: false);
+              if (districtList == null) return;
+              for (CardMenuData item in districtList) {
+                if (item.name == district) {
+                  data?.quXzqh = item.value;
+                  qu.value = item;
+                  getDistrictList(4, id: item.value, showLoading: false);
+                  stepSuccess = true;
+                  break;
+                }
               }
+            } else {
+              data?.quXzqh = null;
+              qu.value = CardMenuData('', null);
+              stepSuccess = true;
+            }
+
+            if (stepSuccess) {
+              // 乡、村
+              data?.xiangXzqhName = street;
+              data?.cunXzqhName = streetNumber;
+              xian.value = CardMenuData(street, null);
+              cun.value = CardMenuData(streetNumber, null);
             }
           }
         }
@@ -276,10 +296,9 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     if (data?.xian != null) xian.value = CardMenuData(data?.xian, data?.xiangXzqh);
     if (data?.cun != null) cun.value = CardMenuData(data?.cun, data?.cunXzqh);
     qyddjwd.value = data?.qyddjwd;
-    name.value = data?.name;
+    name.value = data?.dgryName;
     // 编辑数据
     if (!isDetail) {
-      getEditData();
       initLocation();
       getPersonData();
     }
@@ -301,15 +320,14 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
   Widget buildList() {
     return Column(
       children: [
-        CardItemWidget('扦样任务单号', rightText: data?.qyrwdh, bottomLine: true),
-        CardItemWidget('扦样单位', rightText: data?.dwmc, bottomLine: true),
-        name.builder((v) => CardWidgets.buildMenuDialog(isDetail, '扦样人员', v, personList, personSelCallback, multiple: true)),
-        CardItemWidget('监测类别', rightText: DictService.getLabel(DictType.jclb, value: data?.jclb), bottomLine: true),
+        CardItemWidget('样品单号', rightText: data?.qyrwdh, bottomLine: true),
+        name.builder(
+            (v) => CardWidgets.buildMenuDialog(isDetail, '扦样/陪同人员', v, personList, personSelCallback, multiple: true)),
         sheng.builder((v) => CardItemWidget('省份', rightText: v?.name, bottomLine: true)),
-        shi.builder((v) => CardItemWidget('市区', rightText: v?.name, bottomLine: true)),
+        shi.builder((v) => CardItemWidget('市/州', rightText: v?.name, bottomLine: true)),
         qu.builder((v) => CardItemWidget('区县', rightText: v?.name, bottomLine: true)),
-        CardWidgets.buildMenu(isDetail, '乡镇', xianList, xian, onSelectXzqh),
-        CardWidgets.buildMenu(isDetail, '村', cunList, cun, onSelectXzqh),
+        xian.builder((v) => CardItemWidget('乡镇', rightText: v?.name, bottomLine: true)),
+        cun.builder((v) => CardItemWidget('村', rightText: v?.name, bottomLine: true)),
         qyddjwd.builder(
           (v) => CardItemWidget(
             '扦样地点经纬度',
@@ -334,18 +352,18 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
           trxx,
           (_, sel) => data?.trdllx = sel.value,
         ),
-        CardWidgets.buildEdit(
-          isDetail,
-          '被调查农户或合作社',
-          data?.bdcnhhhzs,
-          onChanged: (value) => data?.bdcnhhhzs = value,
-        ),
-        CardWidgets.buildEdit(
-          isDetail,
-          '联系方式',
-          data?.lxfs,
-          onChanged: (value) => data?.lxfs = value,
-        ),
+        // CardWidgets.buildEdit(
+        //   isDetail,
+        //   '被调查农户或合作社',
+        //   data?.bdcnhhhzs,
+        //   onChanged: (value) => data?.bdcnhhhzs = value,
+        // ),
+        // CardWidgets.buildEdit(
+        //   isDetail,
+        //   '联系方式',
+        //   data?.lxfs,
+        //   onChanged: (value) => data?.lxfs = value,
+        // ),
       ],
     );
   }

lib/page/sample_task/reap_sample_detail/reap_sample_disaster_detail_page.dart

@@ -89,60 +89,29 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
     isDetail = widget.detail;
 
     // 工厂排污
-    setBoolMenuSelNotifier(zztdzwsfygcpw, data?.zztdzwsfygcpw ?? false);
-
+    setBoolMenuSelNotifier(zztdzwsfygcpw, data?.zztdzwsfygcpw);
     // 工厂排污类型
     setDictMenuNotifier(gcpwlxList, gcpwlx, DictType.gcpwlx, data?.gcpwlx);
-    if (data?.gcpwlx == null) {
-      gcpwlx.value = gcpwlxList.value.first;
-      data?.gcpwlx = gcpwlxList.value.first.value;
-    }
-
     // 水源、土壤污染
-    setBoolMenuSelNotifier(zztdzwsysytrsfywr, data?.zztdzwsysytrsfywr ?? false);
-
+    setBoolMenuSelNotifier(zztdzwsysytrsfywr, data?.zztdzwsysytrsfywr);
     // 污染物类型
     setDictMenuNotifier(wrwlxList, wrwlx, DictType.wrwlx, data?.wrwlx);
-    if (data?.wrwlx == null) {
-      wrwlx.value = wrwlxList.value.first;
-      data?.wrwlx = wrwlxList.value.first.value;
-    }
-
     // 病虫害
-    setBoolMenuSelNotifier(scgczsffsbjyzdbch, data?.scgczsffsbjyzdbch ?? false);
-
+    setBoolMenuSelNotifier(scgczsffsbjyzdbch, data?.scgczsffsbjyzdbch);
     // 病虫害类型
     setDictMenuNotifier(bchlxList, bchlx, DictType.bchlx, data?.bchlx);
-    if (data?.bchlx == null) {
-      bchlx.value = bchlxList.value.first;
-      data?.bchlx = bchlxList.value.first.value;
-    }
-
     // 收获期间是否发生连阴雨天气
-    setNumBoolMenuSelNotifier(shqjsffslyytq, data?.shqjsffslyytq ?? 1);
-
+    setNumBoolMenuSelNotifier(shqjsffslyytq, data?.shqjsffslyytq);
     // 收获粮食水分是否偏高
-    setNumBoolMenuSelNotifier(shlssfsfpg, data?.shlssfsfpg ?? 1);
-
+    setNumBoolMenuSelNotifier(shlssfsfpg, data?.shlssfsfpg);
     // 近年来本地是否发生真菌毒素污染
-    setNumBoolMenuSelNotifier(jnlbdsffszmwr, data?.jnlbdsffszmwr ?? 1);
-
+    setNumBoolMenuSelNotifier(jnlbdsffszmwr, data?.jnlbdsffszmwr);
     // 真菌毒素污染类型
     setDictMenuNotifier(zjdswrlxList, zjdswrlx, DictType.zjdswrlx, data?.zjdswrlx);
-    if (data?.zjdswrlx == null) {
-      zjdswrlx.value = zjdswrlxList.value.first;
-      data?.zjdswrlx = zjdswrlxList.value.first.value;
-    }
-
     // 近年来本地是否发生重金属污染
-    setNumBoolMenuSelNotifier(jnlbdsfzjswr, data?.jnlbdsfzjswr ?? 1);
-
+    setNumBoolMenuSelNotifier(jnlbdsfzjswr, data?.jnlbdsfzjswr);
     // 重金属污染类型
     setDictMenuNotifier(zjswrlxList, zjswrlx, DictType.zjswrlx, data?.zjswrlx);
-    if (data?.zjswrlx == null) {
-      zjswrlx.value = zjswrlxList.value.first;
-      data?.zjswrlx = zjswrlxList.value.first.value;
-    }
   }
 
   @override

lib/page/sample_task/reap_sample_detail/reap_sample_medicine_detail_page.dart

@@ -22,7 +22,8 @@ class ReapSampleMedicineDetailPage extends StatefulWidget {
   State<ReapSampleMedicineDetailPage> createState() => _ReapSampleMedicineDetailPageState();
 }
 
-class _ReapSampleMedicineDetailPageState extends BaseLifecycleState<ReapSampleMedicineDetailPage> with AutomaticKeepAliveClientMixin {
+class _ReapSampleMedicineDetailPageState extends BaseLifecycleState<ReapSampleMedicineDetailPage>
+    with AutomaticKeepAliveClientMixin {
   SampleTaskItem? data;
   late bool isDetail;
 
@@ -102,73 +103,75 @@ class _ReapSampleMedicineDetailPageState extends BaseLifecycleState<ReapSampleMe
 
   Widget buildItem(int index, UseMedicineItem item) {
     bool detail = item.id != null;
-    return Container(
-      clipBehavior: Clip.hardEdge,
-      decoration: const BoxDecoration(
-        color: Color(0xFFF5FFFD),
-        borderRadius: BorderRadius.all(Radius.circular(8)),
-      ),
-      margin: const EdgeInsets.only(left: 12, right: 12, top: 8),
-      child: IntrinsicHeight(
-        child: Row(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Container(
-              color: const Color(0xFF3ACEE6),
-              alignment: Alignment.center,
-              padding: const EdgeInsets.symmetric(horizontal: 2),
-              child: Text(
-                '${index + 1}',
-                style: const TextStyle(color: Colors.white, fontSize: 12, fontWeight: FontWeight.w700),
+    return GestureDetector(
+      onLongPress: detail ? null : () => onRemove(item),
+      child: Container(
+        clipBehavior: Clip.hardEdge,
+        decoration: const BoxDecoration(
+          color: Color(0xFFF5FFFD),
+          borderRadius: BorderRadius.all(Radius.circular(8)),
+        ),
+        margin: const EdgeInsets.only(left: 12, right: 12, top: 8),
+        child: IntrinsicHeight(
+          child: Row(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Container(
+                color: const Color(0xFF3ACEE6),
+                alignment: Alignment.center,
+                padding: const EdgeInsets.symmetric(horizontal: 2),
+                child: Text(
+                  '${index + 1}',
+                  style: const TextStyle(color: Colors.white, fontSize: 12, fontWeight: FontWeight.w700),
+                ),
               ),
-            ),
-            Expanded(
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  CardWidgets.buildEdit(
-                    detail,
-                    '使用农药品种',
-                    item.synypz,
-                    backgroundColor: null,
-                    onChanged: (value) => item.synypz = value,
-                  ),
-                  CardWidgets.buildEdit(
-                    detail,
-                    '使用农药的数量(公斤或毫升/每亩地)',
-                    item.synysl?.toString(),
-                    backgroundColor: null,
-                    inputType: const TextInputType.numberWithOptions(decimal: true),
-                    formatters: [XNumberTextInputFormatter()],
-                    onChanged: (value) => item.synysl = value.isEmpty ? null : num.parse(value),
-                  ),
-                  CardItemWidget(
-                    '施药时间',
-                    rightText: item.sysj,
-                    trailing: detail ? null : Image.asset(imgItemArrowDown, width: 20),
-                    bottomLine: true,
-                    backgroundColor: null,
-                    onTap: detail ? null : () => showDate(item),
-                  ),
-                  CardWidgets.buildEdit(
-                    detail,
-                    '施药方法',
-                    item.syff,
-                    backgroundColor: null,
-                    onChanged: (value) => item.syff = value,
-                  ),
-                  detail
-                      ? const SizedBox.shrink()
-                      : MyButton(
-                          '删除',
-                          backgroundColor: const Color(0xFFCE615A),
-                          margin: const EdgeInsets.symmetric(horizontal: 24, vertical: 16),
-                          onTap: () => onRemove(item),
-                        ),
-                ],
+              Expanded(
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    CardWidgets.buildEdit(
+                      detail,
+                      '使用农药品种',
+                      item.synypz,
+                      backgroundColor: null,
+                      onChanged: (value) => item.synypz = value,
+                    ),
+                    CardWidgets.buildEdit(
+                      detail,
+                      '使用农药的数量(公斤或毫升/每亩地)',
+                      item.synysl?.toString(),
+                      backgroundColor: null,
+                      inputType: const TextInputType.numberWithOptions(decimal: true),
+                      formatters: [XNumberTextInputFormatter()],
+                      onChanged: (value) => item.synysl = value.isEmpty ? null : num.parse(value),
+                    ),
+                    CardItemWidget(
+                      '施药时间',
+                      rightText: item.sysj,
+                      trailing: detail || item.sysj != null
+                          ? null
+                          : Image.asset(
+                              imgItemArrowDown,
+                              width: 20,
+                              color: const Color(0xFF01B2C8),
+                            ),
+                      bottomLine: true,
+                      backgroundColor: null,
+                      onTap: detail ? null : () => showDate(item),
+                    ),
+                    CardWidgets.buildEdit(
+                      detail,
+                      '施药方法',
+                      item.syff,
+                      backgroundColor: null,
+                      onChanged: (value) => item.syff = value,
+                      bottomLine: false,
+                    ),
+                  ],
+                ),
               ),
-            ),
-          ],
+            ],
+          ),
         ),
       ),
     );

lib/page/sample_task/reap_sample_detail/reap_sample_variety_detail_page.dart

@@ -9,6 +9,7 @@ import '../../../model/rsp/sample_task_rsp.dart';
 import '../../../network/my_api.dart';
 import '../../../utils/date_time_utils.dart';
 import '../../../utils/input_formatter.dart';
+import '../../../widget/button.dart';
 
 /// 收获扦样-品种信息
 class ReapSampleVarietyDetailPage extends StatefulWidget {
@@ -99,11 +100,45 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
     if (dict != null) yzpzlx.value = CardMenuData(dict.label, dict.value);
   }
 
+  void onAdd() {
+    if (data == null) return;
+    setState(() {
+      if (data!.codeSamplingNonghuList == null) {
+        data!.codeSamplingNonghuList = [NonghuItem()];
+      } else {
+        data!.codeSamplingNonghuList!.add(NonghuItem());
+      }
+    });
+  }
+
+  void onRemove(NonghuItem item) async {
+    var delete = await showDialog(
+      context: context,
+      builder: (_) => AlertDialog(
+        title: const Text('是否删除扦样农户信息?'),
+        actions: [
+          MyButton(
+            '删除',
+            alignment: null,
+            backgroundColor: const Color(0xFFCE615A),
+            onTap: () => MyNavigator.pop(true),
+          ),
+          MyButton('取消', alignment: null, onTap: () => MyNavigator.pop()),
+        ],
+      ),
+    );
+    if (delete ?? false) {
+      setState(() {
+        data?.codeSamplingNonghuList?.remove(item);
+      });
+    }
+  }
+
   @override
   void onInit() {
     data = widget.data;
     isDetail = widget.detail;
-    arrowDown = Image.asset(imgItemArrowDown, width: 20);
+    arrowDown = Image.asset(imgItemArrowDown, width: 20, color: const Color(0xFF01B2C8));
 
     // 粮食品类菜单数据
     getLsxxList();
@@ -151,7 +186,6 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
           lspz,
           (_, sel) => data?.lspz = sel.value?.toString(),
         ),
-        CardItemWidget('样品编号', rightText: data?.ypbh, bottomLine: true),
         CardWidgets.buildEdit(
           isDetail,
           '种植品种',
@@ -169,11 +203,18 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
         ),
         CardWidgets.buildMenu(
           isDetail,
-          '优质品种类型',
+          '品种优质类型',
           yzpzlxList,
           yzpzlx,
           (_, sel) => data?.yzpzlx = num.parse(sel.value),
         ),
+        CardWidgets.buildMenu(
+          isDetail,
+          '天气情况',
+          tqqkList,
+          tqqk,
+          (_, sel) => data?.tqqk = sel.value,
+        ),
         CardWidgets.buildDate(
           isDetail,
           '收获时间',
@@ -186,32 +227,84 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
           qysj,
           onResult: (value) => data?.qysj = DateTimeUtils.yyyymmdd(date: value),
         ),
-        CardWidgets.buildEdit(
-          isDetail,
-          '扦样数量（公斤）',
-          data?.qysl?.toString(),
-          inputType: const TextInputType.numberWithOptions(decimal: true),
-          formatters: [XNumberTextInputFormatter()],
-          onChanged: (value) => data?.qysl = value.isEmpty ? null : num.parse(value),
-        ),
-        CardWidgets.buildEdit(
-          isDetail,
-          '扦样代表数量（公斤）',
-          data?.qydbsl?.toString(),
-          inputType: const TextInputType.numberWithOptions(decimal: true),
-          formatters: [XNumberTextInputFormatter()],
-          onChanged: (value) => data?.qydbsl = value.isEmpty ? null : num.parse(value),
+        ...List.generate(
+          data?.codeSamplingNonghuList?.length ?? 0,
+          (index) => buildNonghu(index, data!.codeSamplingNonghuList![index]),
+        ).toList(),
+        isDetail ? const SizedBox.shrink() : MyButton('添加扦样农户信息', onTap: onAdd, margin: const EdgeInsets.all(10))
+      ],
+    );
+  }
+
+  Widget buildNonghu(int index, NonghuItem item) {
+    bool detail = item.id != null;
+    return GestureDetector(
+      onLongPress: detail ? null : () => onRemove(item),
+      child: Container(
+        clipBehavior: Clip.hardEdge,
+        decoration: const BoxDecoration(
+          color: Color(0xFFF5FFFD),
+          borderRadius: BorderRadius.all(Radius.circular(8)),
         ),
-        CardWidgets.buildMenu(
-          isDetail,
-          '天气情况',
-          tqqkList,
-          tqqk,
-          (_, sel) {
-            // data?.tqqk = sel.value?.toString();
-          },
+        margin: const EdgeInsets.only(left: 12, right: 12, top: 8),
+        child: IntrinsicHeight(
+          child: Row(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Container(
+                color: const Color(0xFF3ACEE6),
+                alignment: Alignment.center,
+                padding: const EdgeInsets.symmetric(horizontal: 2),
+                child: Text(
+                  '${index + 1}',
+                  style: const TextStyle(color: Colors.white, fontSize: 12, fontWeight: FontWeight.w700),
+                ),
+              ),
+              Expanded(
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    CardWidgets.buildEdit(
+                      detail,
+                      '扦样数量（公斤）',
+                      item.qysl?.toString(),
+                      inputType: const TextInputType.numberWithOptions(decimal: true),
+                      formatters: [XNumberTextInputFormatter()],
+                      onChanged: (value) => item.qysl = value.isEmpty ? null : num.parse(value),
+                      backgroundColor: null,
+                    ),
+                    CardWidgets.buildEdit(
+                      detail,
+                      '扦样代表数量（公斤）',
+                      item.qydbsl?.toString(),
+                      inputType: const TextInputType.numberWithOptions(decimal: true),
+                      formatters: [XNumberTextInputFormatter()],
+                      onChanged: (value) => item.qydbsl = value.isEmpty ? null : num.parse(value),
+                      backgroundColor: null,
+                    ),
+                    CardWidgets.buildEdit(
+                      detail,
+                      '被调查农户或合作社',
+                      item.bdcnhhhzs,
+                      onChanged: (value) => item.bdcnhhhzs = value,
+                      backgroundColor: null,
+                    ),
+                    CardWidgets.buildEdit(
+                      detail,
+                      '联系方式',
+                      inputType: TextInputType.number,
+                      item.lxfs,
+                      onChanged: (value) => item.lxfs = value,
+                      backgroundColor: null,
+                      bottomLine: false,
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
         ),
-      ],
+      ),
     );
   }
 }

lib/page/sample_task/sample_list_vm.dart

@@ -56,6 +56,7 @@ class SampleListVM extends BaseVM {
     }
     try {
       var value = await MyApi.get().sampleTaskList(req.toJson());
+      if (isDispose) return;
       List<SampleTaskItem> data = value.data?.list ?? [];
       var list = pageState.value.data ?? [];
       if (refresh) {

lib/page/sample_task/sample_task_list_page.dart

@@ -200,25 +200,31 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
   }
 
   Widget buildGrid(SampleTaskItem item) {
-    List<Map<String, String?>> infoList;
+    List<Map<String, String?>> infoList = [];
     if (item.deliveryStatus != 2) {
       // 未扦样
-      infoList = [
+      infoList.addAll([
         {'采样品种': item.cypzName},
         {'检验指标': item.jyzb},
         {'样品等级': DictService.getDict(DictType.ypdj, value: item.ypdj)?.label},
         {'扦样地区': item.qydq},
-      ];
+      ]);
     } else {
       // 已扦样
-      infoList = [
+      infoList.addAll([
         {'采样品种': item.cypzName},
-        {'检验指标': item.jyzb},
-        {'样品等级': DictService.getDict(DictType.ypdj, value: item.ypdj)?.label},
         {'扦样地区': item.qydq},
-        {'扦样人员': item.qyryName},
+      ]);
+      if (item.ypdj != null) {
+        infoList.add({'样品等级': DictService.getDict(DictType.ypdj, value: item.ypdj)?.label});
+      }
+      if (item.jyzb != null) {
+        infoList.add({'检验指标': item.jyzb});
+      }
+      infoList.addAll([
+        {'扦样人员': item.dgryName},
         {'扦样时间': item.qysj},
-      ];
+      ]);
     }
     return Padding(
       padding: const EdgeInsets.symmetric(horizontal: 8),

lib/page/sample_task/sample_task_list_tab_page.dart

@@ -78,6 +78,8 @@ class _SampleTaskListTabPageState extends BaseLifecycleState<SampleTaskListTabPa
   @override
   void onDestroy() {
     Inject.remove<SampleListVM>();
+    tabCtrl.dispose();
+    pageCtrl.dispose();
   }
 
   @override

lib/page/signature/signature_page.dart

@@ -0,0 +1,51 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:lszlgl/base/base_lifecycle_state.dart';
+
+class SignaturePageArgs {
+  /// 签名数量
+  int count;
+
+  SignaturePageArgs({this.count = 1});
+
+  @override
+  String toString() {
+    return {'count': count}.toString();
+  }
+}
+
+/// 电子签名
+class SignaturePage extends StatefulWidget {
+  final SignaturePageArgs args;
+
+  const SignaturePage({
+    super.key,
+    required this.args,
+  });
+
+  @override
+  State<SignaturePage> createState() => _SignaturePageState();
+}
+
+class _SignaturePageState extends BaseLifecycleState<SignaturePage> {
+  @override
+  void onInit() {
+    SystemChrome.setPreferredOrientations([
+      DeviceOrientation.landscapeLeft,
+      DeviceOrientation.landscapeRight,
+    ]);
+  }
+
+  @override
+  void onDestroy() {
+    SystemChrome.setPreferredOrientations([
+      DeviceOrientation.portraitUp,
+      DeviceOrientation.portraitDown,
+    ]);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return const Placeholder();
+  }
+}

lib/router/my_router.dart

@@ -8,6 +8,7 @@ import 'package:lszlgl/page/user_center/setting_page.dart';
 import 'package:lszlgl/router/my_navigator.dart';
 
 import '../page/sample_task/stock_sample_detail/stock_sample_task_page.dart';
+import '../page/signature/signature_page.dart';
 
 // 根页面
 const rLoginPage = '/';
@@ -25,6 +26,8 @@ const rSampleTaskListTabPage = '/SampleTaskListTabPage';
 const rReapSampleTaskPage = '/ReapSampleTaskPage';
 // 库存扦样任务
 const rStockSampleTaskPage = '/StockSampleTaskPage';
+// 电子签名
+const rSignaturePage = '/SignaturePage';
 
 final Map<String, MyNavigatorBuilder> rRouteMap = {
   // 根页面
@@ -36,6 +39,7 @@ final Map<String, MyNavigatorBuilder> rRouteMap = {
   rSampleTaskListTabPage: (context, args) => SampleTaskListTabPage(args: args as SampleTaskListTabPageArgs?),
   rReapSampleTaskPage: (context, args) => ReapSampleTaskPage(args: args as ReapSampleTaskPageArgs),
   rStockSampleTaskPage: (context, args) => StockSampleTaskPage(args: args as StockSampleTaskPageArgs),
+  rSignaturePage: (context, args) => SignaturePage(args: args as SignaturePageArgs),
 };
 
 class MyRouter {
@@ -88,4 +92,9 @@ class MyRouter {
   static Future<dynamic> startStockSampleTask({StockSampleTaskPageArgs? args}) {
     return MyNavigator.push(rStockSampleTaskPage, args: args ?? StockSampleTaskPageArgs());
   }
+
+  /// 电子签名
+  static Future<dynamic> startSignature({SignaturePageArgs? args}) {
+    return MyNavigator.push(rSignaturePage, args: args ?? SignaturePageArgs());
+  }
 }

lib/service/dict_service.dart

@@ -72,4 +72,9 @@ class DictService {
     if (type == null) return null;
     return _dictMap[type.type]?.values.toList();
   }
+
+  static num? getDictFirstNum(DictType type) {
+    var list = getDictList(type);
+    return list?.first.value != null ? num.parse(list!.first.value!) : null;
+  }
 }

lib/widget/card_item.dart

@@ -239,7 +239,7 @@ class CardItemMenuWidget extends StatelessWidget {
           selData == null
               ? Padding(
                   padding: const EdgeInsets.only(left: 8),
-                  child: Image.asset(imgItemArrowDown, width: 20),
+                  child: Image.asset(imgItemArrowDown, width: 20, color: const Color(0xFF01B2C8)),
                 )
               : const SizedBox.shrink(),
         ],
@@ -292,12 +292,13 @@ class CardWidgets {
     ValueChanged<String>? onChanged,
     List<TextInputFormatter>? formatters,
     Color? backgroundColor = Colors.white,
+    bool bottomLine = true,
   }) {
     if (isDetail) {
       return CardItemWidget(
         title,
         rightText: value,
-        bottomLine: true,
+        bottomLine: bottomLine,
         backgroundColor: backgroundColor,
       );
     }
@@ -320,7 +321,7 @@ class CardWidgets {
         onChanged: onChanged,
       ),
       backgroundColor: backgroundColor,
-      bottomLine: true,
+      bottomLine: bottomLine,
     );
   }
 
@@ -339,7 +340,13 @@ class CardWidgets {
       return CardItemWidget(
         title,
         rightText: v,
-        trailing: v == null ? Image.asset(imgItemArrowDown, width: 20) : const SizedBox.shrink(),
+        trailing: v == null
+            ? Image.asset(
+                imgItemArrowDown,
+                width: 20,
+                color: const Color(0xFF01B2C8),
+              )
+            : const SizedBox.shrink(),
         bottomLine: true,
         onTap: () async {
           var date = await showDatePicker(
@@ -370,7 +377,14 @@ class CardWidgets {
       rightText: value,
       bottomLine: true,
       hint: hint,
-      trailing: isDetail || value != null ? null : trailing ?? Image.asset(imgItemArrowDown, width: 20),
+      trailing: isDetail || value != null
+          ? null
+          : trailing ??
+              Image.asset(
+                imgItemArrowDown,
+                width: 20,
+                color: const Color(0xFF01B2C8),
+              ),
       onTap: isDetail
           ? null
           : () async {

pubspec.yaml

@@ -80,6 +80,11 @@ dependencies:
   permission_handler: ^11.3.0
   # 高德定位
   amap_flutter_location: ^3.0.0
+  # 二维码扫描
+#  mobile_scanner: ^5.0.0-beta.3
+  qr_code_scanner: ^1.0.1
+  # 手写签名
+  hand_signature: ^3.0.2
 
 dev_dependencies:
   flutter_test: