增加收获扦样任务单页-基本信息数据验证逻辑;

lib/page/sample_task/reap_sample_detail/reap_sample_basic_detail_page.dart

@@ -18,16 +18,19 @@ import '../../../network/my_api.dart';
 import '../../../service/user_service.dart';
 import '../../../utils/file_utils.dart';
 import '../../../widget/card_item.dart';
+import 'reap_sample_task_page.dart';
 
 /// 收获扦样-基础信息
 class ReapSampleBasicDetailPage extends StatefulWidget {
   final SampleTaskItem? data;
   final bool detail;
+  final ReapSampleTaskController ctrl;
 
   const ReapSampleBasicDetailPage(
     this.data, {
     super.key,
     this.detail = true,
+    required this.ctrl,
   });
 
   @override
@@ -388,6 +391,41 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     }
   }
 
+  /// 校验数据
+  bool verifyData() {
+    // 扦样/陪同人员
+    if ((data?.dgryName ?? '').isNotEmpty) {
+      MyNavigator.showToast('扦样/陪同人员不能为空');
+      return false;
+    }
+    // 乡镇
+    if ((data?.xiangXzqhName ?? '').isNotEmpty) {
+      MyNavigator.showToast('乡镇不能为空');
+      return false;
+    }
+    // 村
+    if ((data?.cunXzqhName ?? '').isNotEmpty) {
+      MyNavigator.showToast('村不能为空');
+      return false;
+    }
+    // 扦样地点经纬度
+    if ((data?.qyddjwd ?? '').isNotEmpty) {
+      MyNavigator.showToast('扦样地点经纬度不能为空');
+      return false;
+    }
+    // 种植面积（亩地）
+    if (data?.zzmj == null) {
+      MyNavigator.showToast('种植面积不能为空');
+      return false;
+    }
+    // 土壤地理类型
+    if (data?.trdllx == null) {
+      MyNavigator.showToast('土壤地理类型不能为空');
+      return false;
+    }
+    return true;
+  }
+
   @override
   bool get wantKeepAlive => true;
 
@@ -395,6 +433,7 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
   void onInit() {
     data = widget.data;
     isDetail = widget.detail;
+    widget.ctrl.verifyData = verifyData;
     // 土壤信息
     getTrxxList();
 

lib/page/sample_task/reap_sample_detail/reap_sample_disaster_detail_page.dart

@@ -6,24 +6,26 @@ import 'package:lszlgl/widget/card_item.dart';
 import '../../../model/rsp/dict_rsp.dart';
 import '../../../model/rsp/sample_task_rsp.dart';
 import '../../../service/dict_service.dart';
+import 'reap_sample_task_page.dart';
 
 /// 收获扦样-灾害污染
 class ReapSampleDisasterDetailPage extends StatefulWidget {
   final SampleTaskItem? data;
   final bool detail;
+  final ReapSampleTaskController ctrl;
 
   const ReapSampleDisasterDetailPage(
     this.data, {
     super.key,
     this.detail = true,
+    required this.ctrl,
   });
 
   @override
   State<ReapSampleDisasterDetailPage> createState() => _ReapSampleDisasterDetailPageState();
 }
 
-class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDisasterDetailPage>
-    with AutomaticKeepAliveClientMixin {
+class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDisasterDetailPage> with AutomaticKeepAliveClientMixin {
   SampleTaskItem? data;
   late bool isDetail;
 
@@ -76,17 +78,25 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
     num? selValue,
   ) {
     // 菜单数据
-    notifier.value =
-        (DictService.getDictList(type) ?? []).map((e) => CardMenuData(e.label, num.parse(e.value ?? '0'))).toList();
+    notifier.value = (DictService.getDictList(type) ?? []).map((e) => CardMenuData(e.label, num.parse(e.value ?? '0'))).toList();
     // 选中项
     DictRsp? dict = DictService.getDict(type, value: selValue);
     if (dict != null) selNotifier.value = CardMenuData(dict.label, dict.value);
   }
 
+  /// 校验数据
+  bool verifyData() {
+    return true;
+  }
+
+  @override
+  bool get wantKeepAlive => true;
+
   @override
   void onInit() {
     data = widget.data;
     isDetail = widget.detail;
+    widget.ctrl.verifyData = verifyData;
 
     // 工厂排污
     setBoolMenuSelNotifier(zztdzwsfygcpw, data?.zztdzwsfygcpw);
@@ -115,9 +125,6 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
   }
 
   @override
-  bool get wantKeepAlive => true;
-
-  @override
   Widget build(BuildContext context) {
     super.build(context);
     return SingleChildScrollView(child: buildList());

lib/page/sample_task/reap_sample_detail/reap_sample_medicine_detail_page.dart

@@ -6,24 +6,26 @@ import '../../../model/rsp/sample_task_rsp.dart';
 import '../../../utils/date_time_utils.dart';
 import '../../../utils/input_formatter.dart';
 import '../../../widget/button.dart';
+import 'reap_sample_task_page.dart';
 
 /// 收获扦样-用药情况
 class ReapSampleMedicineDetailPage extends StatefulWidget {
   final SampleTaskItem? data;
   final bool detail;
+  final ReapSampleTaskController ctrl;
 
   const ReapSampleMedicineDetailPage(
     this.data, {
     super.key,
     this.detail = true,
+    required this.ctrl,
   });
 
   @override
   State<ReapSampleMedicineDetailPage> createState() => _ReapSampleMedicineDetailPageState();
 }
 
-class _ReapSampleMedicineDetailPageState extends BaseLifecycleState<ReapSampleMedicineDetailPage>
-    with AutomaticKeepAliveClientMixin {
+class _ReapSampleMedicineDetailPageState extends BaseLifecycleState<ReapSampleMedicineDetailPage> with AutomaticKeepAliveClientMixin {
   SampleTaskItem? data;
   late bool isDetail;
 
@@ -74,16 +76,22 @@ class _ReapSampleMedicineDetailPageState extends BaseLifecycleState<ReapSampleMe
     }
   }
 
+  /// 校验数据
+  bool verifyData() {
+    return true;
+  }
+
+  @override
+  bool get wantKeepAlive => true;
+
   @override
   void onInit() {
     data = widget.data;
     isDetail = widget.detail;
+    widget.ctrl.verifyData = verifyData;
   }
 
   @override
-  bool get wantKeepAlive => true;
-
-  @override
   Widget build(BuildContext context) {
     super.build(context);
     return SingleChildScrollView(child: buildList());

lib/page/sample_task/reap_sample_detail/reap_sample_org_detail_page.dart

@@ -3,17 +3,20 @@ import 'package:lszlgl/base/base_lifecycle_state.dart';
 import 'package:lszlgl/widget/card_item.dart';
 
 import '../../../model/rsp/sample_task_rsp.dart';
+import 'reap_sample_task_page.dart';
 
 /// 收获扦样-检验机构
 class ReapSampleOrgDetailPage extends StatefulWidget {
   final SampleTaskItem? data;
   final bool detail;
+  final ReapSampleTaskController ctrl;
 
   const ReapSampleOrgDetailPage(
-      this.data, {
-        super.key,
-        this.detail = true,
-      });
+    this.data, {
+    super.key,
+    this.detail = true,
+    required this.ctrl,
+  });
 
   @override
   State<ReapSampleOrgDetailPage> createState() => _ReapSampleOrgDetailPageState();
@@ -27,9 +30,18 @@ class _ReapSampleOrgDetailPageState extends BaseLifecycleState<ReapSampleOrgDeta
   String? aqjg;
   String? aqdz;
 
+  /// 校验数据
+  bool verifyData() {
+    return true;
+  }
+
+  @override
+  bool get wantKeepAlive => true;
+
   @override
   void onInit() {
     data = widget.data;
+    widget.ctrl.verifyData = verifyData;
     var list = data?.jyjgxxRespVOList;
     if (list != null && list.isNotEmpty) {
       for (JyjgxxItem item in list) {
@@ -45,9 +57,6 @@ class _ReapSampleOrgDetailPageState extends BaseLifecycleState<ReapSampleOrgDeta
   }
 
   @override
-  bool get wantKeepAlive => true;
-
-  @override
   Widget build(BuildContext context) {
     super.build(context);
     return SingleChildScrollView(child: buildList());

lib/page/sample_task/reap_sample_detail/reap_sample_task_page.dart

@@ -37,6 +37,10 @@ class ReapSampleTaskPageArgs {
   }
 }
 
+class ReapSampleTaskController {
+  bool Function()? verifyData;
+}
+
 /// 收获扦样任务
 class ReapSampleTaskPage extends StatefulWidget {
   final ReapSampleTaskPageArgs args;
@@ -60,6 +64,7 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
   late PageController pageCtrl;
 
   late List<String> tabTextList;
+  late List<ReapSampleTaskController> ctrlList;
   late List<Widget> pageList;
 
   ValueNotifier<int> tabIndex = ValueNotifier(0);
@@ -83,6 +88,13 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
   }
 
   void submit() async {
+    // 空值判断
+    for (int i = 0; i < ctrlList.length; i++) {
+      if (!(ctrlList[i].verifyData?.call() ?? true)) {
+        pageCtrl.jumpToPage(i);
+        return;
+      }
+    }
     SampleTaskItem req = (pageStatus.value.data ?? SampleTaskItem());
     // 去签名
     var args = SignaturePageArgs(count: req.dgryName?.split(',').length ?? 0);
@@ -135,11 +147,11 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
 
   void cratePageList(SampleTaskItem data) {
     pageList = [
-      ReapSampleBasicDetailPage(data, detail: args.detail),
-      ReapSampleVarietyDetailPage(data, detail: args.detail),
-      ReapSampleDisasterDetailPage(data, detail: args.detail),
-      ReapSampleMedicineDetailPage(data, detail: args.detail),
-      ReapSampleOrgDetailPage(data, detail: args.detail),
+      ReapSampleBasicDetailPage(data, detail: args.detail, ctrl: ctrlList[0]),
+      ReapSampleVarietyDetailPage(data, detail: args.detail, ctrl: ctrlList[1]),
+      ReapSampleDisasterDetailPage(data, detail: args.detail, ctrl: ctrlList[2]),
+      ReapSampleMedicineDetailPage(data, detail: args.detail, ctrl: ctrlList[3]),
+      ReapSampleOrgDetailPage(data, detail: args.detail, ctrl: ctrlList[4]),
     ];
   }
 
@@ -222,6 +234,7 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
     super.initState();
     args = widget.args;
     tabTextList = ['基础信息', '品种信息', '灾害污染', '用药情况', '检验机构'];
+    ctrlList = tabTextList.map((e) => ReapSampleTaskController()).toList();
     pageCtrl = PageController();
   }
 

lib/page/sample_task/reap_sample_detail/reap_sample_variety_detail_page.dart

@@ -10,24 +10,26 @@ import '../../../network/my_api.dart';
 import '../../../utils/date_time_utils.dart';
 import '../../../utils/input_formatter.dart';
 import '../../../widget/button.dart';
+import 'reap_sample_task_page.dart';
 
 /// 收获扦样-品种信息
 class ReapSampleVarietyDetailPage extends StatefulWidget {
   final SampleTaskItem? data;
   final bool detail;
+  final ReapSampleTaskController ctrl;
 
   const ReapSampleVarietyDetailPage(
     this.data, {
     super.key,
     this.detail = true,
+    required this.ctrl,
   });
 
   @override
   State<ReapSampleVarietyDetailPage> createState() => _ReapSampleVarietyDetailPageState();
 }
 
-class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVarietyDetailPage>
-    with AutomaticKeepAliveClientMixin {
+class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVarietyDetailPage> with AutomaticKeepAliveClientMixin {
   SampleTaskItem? data;
   late bool isDetail;
   late Widget arrowDown;
@@ -134,10 +136,19 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
     }
   }
 
+  /// 校验数据
+  bool verifyData() {
+    return true;
+  }
+
+  @override
+  bool get wantKeepAlive => true;
+
   @override
   void onInit() {
     data = widget.data;
     isDetail = widget.detail;
+    widget.ctrl.verifyData = verifyData;
     arrowDown = Image.asset(imgItemArrowDown, width: 20, color: const Color(0xFF01B2C8));
 
     // 粮食品类菜单数据
@@ -169,9 +180,6 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
   }
 
   @override
-  bool get wantKeepAlive => true;
-
-  @override
   Widget build(BuildContext context) {
     super.build(context);
     return SingleChildScrollView(child: buildList());