增加收获扦样任务单页-品种信息校验数据逻辑;

lib/page/sample_task/reap_sample_detail/reap_sample_basic_detail_page.dart

@@ -79,7 +79,6 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
 
   /// 获取土壤信息列表
   Future<void> getTrxxList() async {
-    MyNavigator.showLoading();
     try {
       var rsp = await MyApi.get().trxxList();
       List<CardMenuData> list = [];
@@ -391,22 +390,22 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
   /// 校验数据
   bool verifyData() {
     // 扦样/陪同人员
-    if ((data?.dgryName ?? '').isNotEmpty) {
+    if ((data?.dgryName ?? '').isEmpty) {
       MyNavigator.showToast('扦样/陪同人员不能为空');
       return false;
     }
     // 乡镇
-    if ((data?.xiangXzqhName ?? '').isNotEmpty) {
+    if ((data?.xiangXzqhName ?? '').isEmpty) {
       MyNavigator.showToast('乡镇不能为空');
       return false;
     }
     // 村
-    if ((data?.cunXzqhName ?? '').isNotEmpty) {
+    if ((data?.cunXzqhName ?? '').isEmpty) {
       MyNavigator.showToast('村不能为空');
       return false;
     }
     // 扦样地点经纬度
-    if ((data?.qyddjwd ?? '').isNotEmpty) {
+    if ((data?.qyddjwd ?? '').isEmpty) {
       MyNavigator.showToast('扦样地点经纬度不能为空');
       return false;
     }
@@ -431,10 +430,7 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     data = widget.data;
     isDetail = widget.detail;
     widget.ctrl.verifyData = verifyData;
-  }
 
-  @override
-  void onFirstShow(Duration timeStamp) {
     // 土壤信息
     getTrxxList();
 
@@ -456,6 +452,11 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
   }
 
   @override
+  void onFirstShow(Duration timeStamp) {
+    MyNavigator.showLoading();
+  }
+
+  @override
   void onDestroy() {
     LocationUtils.stopLocation();
     LocationUtils.destroy();

lib/page/sample_task/reap_sample_detail/reap_sample_task_page.dart

@@ -96,7 +96,7 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
         return;
       }
     }
-    SampleTaskItem req = (pageStatus.value.data ?? SampleTaskItem());
+    SampleTaskItem req = pageStatus.value.data!;
     // 去签名
     var args = SignaturePageArgs(count: req.dgryName?.split(',').length ?? 0);
     List<Uint8List?>? list = await MyRouter.startSignature(args: args);
@@ -323,9 +323,8 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
       child: GestureDetector(
         behavior: HitTestBehavior.opaque,
         onTap: () {
-          tabIndex.value = index;
           if ((pageCtrl.page?.toInt() ?? 0) == index) return;
-          pageCtrl.jumpToPage(index);
+          pageCtrl.animateToPage(index, duration: const Duration(milliseconds: 200), curve: Curves.linear);
         },
         child: Container(
           alignment: Alignment.center,

lib/page/sample_task/reap_sample_detail/reap_sample_variety_detail_page.dart

@@ -60,7 +60,6 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
 
   /// 获取粮食信息列表
   Future<void> getLsxxList() async {
-    MyNavigator.showLoading();
     try {
       var rsp = await MyApi.get().lsxxList(data?.cypzName ?? '');
       List<CardMenuData> list = [];
@@ -127,14 +126,20 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
             '删除',
             alignment: null,
             backgroundColor: const Color(0xFFCE615A),
-            onTap: () => MyNavigator.dismiss(tag: 'delete', result: true),
+            onTap: () {
+              if (data!.codeSamplingNonghuList!.length > 1) {
+                MyNavigator.dismiss(tag: 'delete', result: true);
+              } else {
+                MyNavigator.showToast('必须有一条扦样农户信息');
+                MyNavigator.dismiss(tag: 'delete');
+              }
+            },
           ),
           MyButton('取消', alignment: null, onTap: () => MyNavigator.dismiss(tag: 'delete')),
         ],
       ),
     );
     if (!(delete ?? false)) return;
-
     setState(() {
       data?.codeSamplingNonghuList?.remove(item);
     });
@@ -142,6 +147,56 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
 
   /// 校验数据
   bool verifyData() {
+    // 粮食品类
+    if ((data?.lspz ?? '').isEmpty) {
+      MyNavigator.showToast('粮食品类不能为空');
+      return false;
+    }
+    // 是否优质品种
+    if (data?.sfyzpz == null) {
+      MyNavigator.showToast('是否优质品种不能为空');
+      return false;
+    }
+    // 品种优质类型
+    if (data?.sfyzpz == 0 && data?.yzpzlx == null) {
+      MyNavigator.showToast('品种优质类型不能为空');
+      return false;
+    }
+    debugPrint('天气情况: ${data?.tqqk}');
+    // 天气情况
+    if ((data?.tqqk ?? 0) == 0) {
+      MyNavigator.showToast('天气情况不能为空');
+      return false;
+    }
+    // 收获时间
+    if ((data?.shsj ?? '').isEmpty) {
+      MyNavigator.showToast('收获时间不能为空');
+      return false;
+    }
+    // 扦样时间
+    if ((data?.qysj ?? '').isEmpty) {
+      MyNavigator.showToast('扦样时间不能为空');
+      return false;
+    }
+    // 农户信息
+    for (var item in data?.codeSamplingNonghuList ?? <NonghuItem>[]) {
+      if (item.qysl == null) {
+        MyNavigator.showToast('扦样数量不能为空');
+        return false;
+      }
+      if (item.qydbsl == null) {
+        MyNavigator.showToast('扦样代表数量不能为空');
+        return false;
+      }
+      if ((item.lxfs ?? '').isEmpty) {
+        MyNavigator.showToast('联系方式不能为空');
+        return false;
+      }
+      if ((item.bdcnhhhzs ?? '').isEmpty) {
+        MyNavigator.showToast('被调查农户或合作社不能为空');
+        return false;
+      }
+    }
     return true;
   }
 
@@ -154,10 +209,7 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
     isDetail = widget.detail;
     widget.ctrl.verifyData = verifyData;
     arrowDown = Image.asset(imgItemArrowDown, width: 20, color: const Color(0xFF01B2C8));
-  }
 
-  @override
-  void onFirstShow(Duration timeStamp) {
     // 粮食品类菜单数据
     getLsxxList();
     // 是否优选品种
@@ -182,11 +234,18 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
       return menu;
     }).toList();
     if (!isDetail && (data?.codeSamplingNonghuList ?? []).isEmpty) {
-      data?.codeSamplingNonghuList = [NonghuItem()];
+      setState(() {
+        data?.codeSamplingNonghuList = [NonghuItem()];
+      });
     }
   }
 
   @override
+  void onFirstShow(Duration timeStamp) {
+    MyNavigator.showLoading();
+  }
+
+  @override
   Widget build(BuildContext context) {
     super.build(context);
     return SingleChildScrollView(child: buildList());

pubspec.yaml

@@ -39,7 +39,7 @@ dependencies:
   cupertino_icons: ^1.0.2
 
   # 弹框
-  flutter_smart_dialog: ^4.9.7+4
+  flutter_smart_dialog: 4.9.6
   # 轮播图
   card_swiper: ^3.0.1
   # 缓存网络图片