修改版本号v0.0.4; 增加库存任务单详情页;

assets/json/China.json

@@ -0,0 +1,171 @@
+[{  
+    "ProID": 1,  
+    "name": "北京市",  
+    "ProSort": 1,  
+    "ProRemark": "直辖市"  
+}, {  
+    "ProID": 2,  
+    "name": "天津市",  
+    "ProSort": 2,  
+    "ProRemark": "直辖市"  
+}, {  
+    "ProID": 3,  
+    "name": "河北省",  
+    "ProSort": 5,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 4,  
+    "name": "山西省",  
+    "ProSort": 6,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 5,  
+    "name": "内蒙古自治区",  
+    "ProSort": 32,  
+    "ProRemark": "自治区"  
+}, {  
+    "ProID": 6,  
+    "name": "辽宁省",  
+    "ProSort": 8,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 7,  
+    "name": "吉林省",  
+    "ProSort": 9,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 8,  
+    "name": "黑龙江省",  
+    "ProSort": 10,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 9,  
+    "name": "上海市",  
+    "ProSort": 3,  
+    "ProRemark": "直辖市"  
+}, {  
+    "ProID": 10,  
+    "name": "江苏省",  
+    "ProSort": 11,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 11,  
+    "name": "浙江省",  
+    "ProSort": 12,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 12,  
+    "name": "安徽省",  
+    "ProSort": 13,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 13,  
+    "name": "福建省",  
+    "ProSort": 14,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 14,  
+    "name": "江西省",  
+    "ProSort": 15,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 15,  
+    "name": "山东省",  
+    "ProSort": 16,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 16,  
+    "name": "河南省",  
+    "ProSort": 17,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 17,  
+    "name": "湖北省",  
+    "ProSort": 18,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 18,  
+    "name": "湖南省",  
+    "ProSort": 19,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 19,  
+    "name": "广东省",  
+    "ProSort": 20,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 20,  
+    "name": "海南省",  
+    "ProSort": 24,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 21,  
+    "name": "广西壮族自治区",  
+    "ProSort": 28,  
+    "ProRemark": "自治区"  
+}, {  
+    "ProID": 22,  
+    "name": "甘肃省",  
+    "ProSort": 21,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 23,  
+    "name": "陕西省",  
+    "ProSort": 27,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 24,  
+    "name": "新 疆维吾尔自治区",  
+    "ProSort": 31,  
+    "ProRemark": "自治区"  
+}, {  
+    "ProID": 25,  
+    "name": "青海省",  
+    "ProSort": 26,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 26,  
+    "name": "宁夏回族自治区",  
+    "ProSort": 30,  
+    "ProRemark": "自治区"  
+}, {  
+    "ProID": 27,  
+    "name": "重庆市",  
+    "ProSort": 4,  
+    "ProRemark": "直辖市"  
+}, {  
+    "ProID": 28,  
+    "name": "四川省",  
+    "ProSort": 22,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 29,  
+    "name": "贵州省",  
+    "ProSort": 23,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 30,  
+    "name": "云南省",  
+    "ProSort": 25,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 31,  
+    "name": "西藏自治区",  
+    "ProSort": 29,  
+    "ProRemark": "自治区"  
+}, {  
+    "ProID": 32,  
+    "name": "台湾省",  
+    "ProSort": 7,  
+    "ProRemark": "省份"  
+}, {  
+    "ProID": 33,  
+    "name": "澳门特别行政区",  
+    "ProSort": 33,  
+    "ProRemark": "特别行政区"  
+}, {  
+    "ProID": 34,  
+    "name": "香港特别行政区",  
+    "ProSort": 34,  
+    "ProRemark": "特别行政区"  
+}]  

assets/json/shijie.json

@@ -0,0 +1,233 @@
+{
+  "China": "中国",
+  "Afghanistan": "阿富汗",
+  "Aland Islands": "奥兰群岛",
+  "Albania": "阿尔巴尼亚",
+  "Algeria": "阿尔及利亚",
+  "American Samoa": "美属萨摩亚",
+  "Andorra": "安道尔",
+  "Angola": "安哥拉",
+  "Anguilla": "安圭拉",
+  "Antigua and Barbuda": "安提瓜和巴布达",
+  "Argentina": "阿根廷",
+  "Armenia": "亚美尼亚",
+  "Aruba": "阿鲁巴",
+  "Australia": "澳大利亚",
+  "Austria": "奥地利",
+  "Azerbaijan": "阿塞拜疆",
+  "Bangladesh": "孟加拉",
+  "Bahrain": "巴林",
+  "Bahamas": "巴哈马",
+  "Barbados": "巴巴多斯",
+  "Belarus": "白俄罗斯",
+  "Belgium": "比利时",
+  "Belize": "伯利兹",
+  "Benin": "贝宁",
+  "Bermuda": "百慕大",
+  "Bhutan": "不丹",
+  "Bolivia": "玻利维亚",
+  "Bosnia and Herzegovina": "波斯尼亚和黑塞哥维那",
+  "Botswana": "博茨瓦纳",
+  "Bouvet Island": "布维岛",
+  "Brazil": "巴西",
+  "Brunei": "文莱",
+  "Bulgaria": "保加利亚",
+  "Burkina Faso": "布基纳法索",
+  "Burundi": "布隆迪",
+  "Cambodia": "柬埔寨",
+  "Cameroon": "喀麦隆",
+  "Canada": "加拿大",
+  "Cape Verde": "佛得角",
+  "Central African Republic": "中非",
+  "Chad": "乍得",
+  "Chile": "智利",
+  "Christmas Islands": "圣诞岛",
+  "Cocos (keeling) Islands": "科科斯（基林）群岛",
+  "Colombia": "哥伦比亚",
+  "Comoros": "科摩罗",
+  "Congo (Congo-Kinshasa)": "刚果（金）",
+  "Congo": "刚果",
+  "Cook Islands": "库克群岛",
+  "Costa Rica": "哥斯达黎加",
+  "Cote D’Ivoire": "科特迪瓦",
+
+  "Croatia": "克罗地亚",
+  "Cuba": "古巴",
+  "Czech": "捷克",
+  "Cyprus": "塞浦路斯",
+  "Denmark": "丹麦",
+  "Djibouti": "吉布提",
+  "Dominica": "多米尼加",
+  "East Timor": "东帝汶",
+  "Ecuador": "厄瓜多尔",
+  "Egypt": "埃及",
+  "Equatorial Guinea": "赤道几内亚",
+  "Eritrea": "厄立特里亚",
+  "Estonia": "爱沙尼亚",
+  "Ethiopia": "埃塞俄比亚",
+  "Faroe Islands": "法罗群岛",
+  "Fiji": "斐济",
+  "Finland": "Finland",
+  "France": "法国",
+  "Franch Metropolitan": "法国大都会",
+  "Franch Guiana": "法属圭亚那",
+  "French Polynesia": "法属波利尼西亚",
+  "Gabon": "加蓬",
+  "Gambia": "冈比亚",
+  "Georgia": "格鲁吉亚",
+  "Germany": "德国",
+  "Ghana": "加纳",
+  "Gibraltar": "直布罗陀",
+  "Greece": "希腊",
+  "Grenada": "格林纳达",
+  "Guadeloupe": "瓜德罗普岛",
+  "Guam": "关岛",
+  "Guatemala": "危地马拉",
+  "Guernsey": "根西岛",
+  "Guinea-Bissau": "几内亚比绍",
+  "Guinea": "几内亚",
+  "Guyana": "圭亚那",
+
+  "Haiti": "海地",
+  "Honduras": "洪都拉斯",
+  "Hungary": "匈牙利",
+  "Iceland": "冰岛",
+  "India": "印度",
+  "Indonesia": "印度尼西亚",
+  "Iran": "伊朗",
+  "Iraq": "伊拉克",
+  "Ireland": "爱尔兰",
+  "Isle of Man": "马恩岛",
+  "Israel": "以色列",
+  "Italy": "意大利",
+  "Jamaica": "牙买加",
+  "Japan": "日本",
+  "Jersey": "泽西岛",
+  "Jordan": "约旦",
+  "Kazakhstan": "哈萨克斯坦",
+  "Kenya": "肯尼亚",
+  "Kiribati": "基里巴斯",
+  "Korea (South)": "韩国",
+  "Korea (North)": "朝鲜",
+  "Kuwait": "科威特",
+  "Kyrgyzstan": "吉尔吉斯斯坦",
+  "Laos": "老挝",
+  "Latvia": "拉脱维亚",
+  "Lebanon": "黎巴嫩",
+  "Lesotho": "莱索托",
+  "Liberia": "利比里亚",
+  "Libya": "利比亚",
+  "Liechtenstein": "列支敦士登",
+  "Lithuania": "立陶宛",
+  "Luxembourg": "卢森堡",
+
+  "Macedonia": "马其顿",
+  "Malawi": "马拉维",
+  "Malaysia": "马来西亚",
+  "Madagascar": "马达加斯加",
+  "Maldives": "马尔代夫",
+  "Mali": "马里",
+  "Malta": "马耳他",
+  "Marshall Islands": "马绍尔群岛",
+  "Martinique": "马提尼克岛",
+  "Mauritania": "毛里塔尼亚",
+  "Mauritius": "毛里求斯",
+  "Mayotte": "马约特",
+  "Mexico": "墨西哥",
+  "Micronesia": "密克罗尼西亚",
+  "Moldova": "摩尔多瓦",
+  "Monaco": "摩纳哥",
+  "Mongolia": "蒙古",
+  "Montenegro": "黑山",
+  "Montserrat": "蒙特塞拉特",
+  "Morocco": "摩洛哥",
+  "Mozambique": "莫桑比克",
+  "Myanmar": "缅甸",
+  "Namibia": "纳米比亚",
+  "Nauru": "瑙鲁",
+  "Nepal": "尼泊尔",
+  "Netherlands": "荷兰",
+  "New Caledonia": "新喀里多尼亚",
+  "New Zealand": "新西兰",
+  "Nicaragua": "尼加拉瓜",
+  "Niger": "尼日尔",
+  "Nigeria": "尼日利亚",
+  "Niue": "纽埃",
+  "Norfolk Island": "诺福克岛",
+  "Norway": "挪威",
+  "Oman": "阿曼",
+  "Pakistan": "巴基斯坦",
+  "Palau": "帕劳",
+  "Palestine": "巴勒斯坦",
+  "Panama": "巴拿马",
+  "Papua New Guinea": "巴布亚新几内亚",
+  "Paraguay": "巴拉圭",
+  "Peru": "秘鲁",
+  "Philippines": "菲律宾",
+  "Pitcairn Islands": "皮特凯恩群岛",
+  "Poland": "波兰",
+  "Portugal": "葡萄牙",
+  "Puerto Rico": "波多黎各",
+  "Qatar": "卡塔尔",
+  "Reunion": "留尼汪岛",
+  "Romania": "罗马尼亚",
+  "Rwanda": "卢旺达",
+  "Russian Federation": "俄罗斯联邦",
+  "Saint Helena": "圣赫勒拿",
+  "Saint Kitts-Nevis": "圣基茨和尼维斯",
+  "Saint Lucia": "圣卢西亚",
+  "Saint Vincent and the Grenadines": "圣文森特和格林纳丁斯",
+  "El Salvador": "萨尔瓦多",
+  "Samoa": "萨摩亚",
+  "San Marino": "圣马力诺",
+  "Sao Tome and Principe": "圣多美和普林西比",
+  "Saudi Arabia": "沙特阿拉伯",
+  "Senegal": "塞内加尔",
+  "Seychelles": "塞舌尔",
+  "Sierra Leone": "塞拉利昂",
+  "Singapore": "新加坡",
+  "Serbia": "塞尔维亚",
+  "Slovakia": "斯洛伐克",
+  "Slovenia": "斯洛文尼亚",
+  "Solomon Islands": "所罗门群岛",
+  "Somalia": "索马里",
+  "South Africa": "南非",
+  "Spain": "西班牙",
+  "Sri Lanka": "斯里兰卡",
+  "Sudan": "苏丹",
+  "Suriname": "苏里南",
+  "Swaziland": "斯威士兰",
+  "Sweden": "瑞典",
+  "Switzerland": "瑞士",
+  "Syria": "叙利亚",
+  "Tajikistan": "塔吉克斯坦",
+  "Tanzania": "坦桑尼亚",
+
+  "Thailand": "泰国",
+  "Trinidad and Tobago": "特立尼达和多巴哥",
+  "Timor-Leste": "东帝汶",
+  "Togo": "多哥",
+  "Tokelau": "托克劳",
+  "Tonga": "汤加",
+  "Tunisia": "突尼斯",
+  "Turkey": "土耳其",
+  "Turkmenistan": "土库曼斯坦",
+  "Tuvalu": "图瓦卢",
+  "Uganda": "乌干达",
+  "Ukraine": "乌克兰",
+  "United Arab Emirates": "阿拉伯联合酋长国",
+  "United Kingdom": "英国",
+  "United States": "美国",
+  "Uruguay": "乌拉圭",
+  "Uzbekistan": "乌兹别克斯坦",
+  "Vanuatu": "瓦努阿图",
+  "Vatican City": "梵蒂冈",
+  "Venezuela": "委内瑞拉",
+  "Vietnam": "越南",
+  "Wallis and Futuna": "瓦利斯群岛和富图纳群岛",
+  "Western Sahara": "西撒哈拉",
+  "Yemen": "也门",
+  "Yugoslavia": "南斯拉夫",
+  "Zambia": "赞比亚",
+  "Zimbabwe": "津巴布韦"
+}

lib/model/rsp/sample_task_rsp.dart

@@ -559,7 +559,7 @@ class SampleTaskItemKcjcRsp {
   String? dwmc;
 
   /// 采样品种名称
-  String? cypzmc;
+  num? cypzmc;
 
   /// 采样品种名称
   String? cypzName;

lib/network/api.dart

@@ -12,7 +12,7 @@ import '../model/rsp/district_rsp.dart';
 
 part 'api.g.dart';
 
-@RestApi(baseUrl: 'http://121.36.17.6:49099')
+@RestApi()
 abstract class Api {
   factory Api({Dio? dio, String? baseUrl}) {
     dio ??= BaseDio.get().dio;

lib/page/sample_task/reap_sample_task/reap_sample_task_page.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.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/model/rsp/sample_task_rsp.dart';
 import 'package:lszlgl/page/sample_task/reap_sample_detail/reap_sample_basic_detail_page.dart';
@@ -107,28 +106,13 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
   }
 
   void cratePageList(SampleTaskItem data) {
-    if (args.detail) {
-      pageList = [
-        ReapSampleBasicDetailPage(data),
-        ReapSampleVarietyDetailPage(data),
-        ReapSampleDisasterDetailPage(data),
-        ReapSampleMedicineDetailPage(data),
-        ReapSampleOrgDetailPage(data),
-      ];
-    } else {
-      pageList = [
-        // ReapSampleBasicPage(nextCallback: next),
-        // ReapSampleVarietyPage(nextCallback: next, previousCallback: previous),
-        // ReapSampleDisasterPage(nextCallback: next, previousCallback: previous),
-        // ReapSampleMedicinePage(nextCallback: next, previousCallback: previous),
-        // ReapSampleOrgPage(previousCallback: previous, submitCallback: submit),
-        ReapSampleBasicDetailPage(data, detail: false),
-        ReapSampleVarietyDetailPage(data, detail: false),
-        ReapSampleDisasterDetailPage(data, detail: false),
-        ReapSampleMedicineDetailPage(data, detail: false),
-        ReapSampleOrgDetailPage(data, detail: false),
-      ];
-    }
+    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),
+    ];
   }
 
   @override

lib/page/sample_task/reap_sample_detail/reap_sample_variety_detail_page.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
 import 'package:lszlgl/service/dict_service.dart';
 import 'package:lszlgl/utils/string_utils.dart';
@@ -26,8 +25,7 @@ class ReapSampleVarietyDetailPage extends StatefulWidget {
   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;
@@ -152,21 +150,13 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
           isDetail,
           '收获时间',
           shsj,
-          onResult: (value) {
-            var date = DateTimeUtils.yyyymmdd(date: value);
-            shsj.value = date;
-            data?.shsj = date;
-          },
+          onResult: (value) => data?.shsj = DateTimeUtils.yyyymmdd(date: value),
         ),
         CardWidgets.buildDate(
           isDetail,
           '扦样时间',
           qysj,
-          onResult: (value) {
-            var date = DateTimeUtils.yyyymmdd(date: value);
-            qysj.value = date;
-            data?.qysj = date;
-          },
+          onResult: (value) => data?.qysj = DateTimeUtils.yyyymmdd(date: value),
         ),
         CardWidgets.buildEdit(
           isDetail,

lib/page/sample_task/reap_sample_task/reap_sample_basic_page.dart

@@ -1,220 +0,0 @@
-import 'package:flutter/material.dart';
-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;
-
-  const ReapSampleBasicPage({
-    super.key,
-    required this.nextCallback,
-  });
-
-  @override
-  State<ReapSampleBasicPage> createState() => _ReapSampleBasicPageState();
-}
-
-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);
-  ValueNotifier<String?> cz = ValueNotifier(null);
-  ValueNotifier<String?> dllx = ValueNotifier(null);
-
-  @override
-  void initState() {
-    super.initState();
-    arrowDown = Image.asset(imgItemArrowDown, width: 20);
-  }
-
-  @override
-  bool get wantKeepAlive => true;
-
-  @override
-  Widget build(BuildContext context) {
-    super.build(context);
-    return Column(
-      children: [
-        Expanded(child: SingleChildScrollView(child: buildList())),
-        buildButton(),
-      ],
-    );
-  }
-
-  Widget buildList() {
-    return Column(
-      children: [
-        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,
-        ),
-      ],
-    );
-  }
-
-  Widget buildButton() {
-    return Container(
-      color: const Color(0xFFF1F7F6),
-      padding: const EdgeInsets.all(12),
-      child: MyButton(
-        '下一步',
-        onTap: widget.nextCallback,
-      ),
-    );
-  }
-
-  Widget buildField({String? hint, TextInputType? inputType}) {
-    return TextField(
-      keyboardType: inputType,
-      textAlign: TextAlign.right,
-      decoration: InputDecoration(
-        hintText: hint,
-        border: InputBorder.none,
-        contentPadding: EdgeInsets.zero,
-        isDense: true,
-      ),
-      style: const TextStyle(fontSize: 14),
-      textInputAction: TextInputAction.next,
-      inputFormatters: [],
-    );
-  }
-
-  Widget buildMenu(ValueNotifier<String?> notifier) {
-    return ValueListenableBuilder(
-      valueListenable: notifier,
-      builder: (_, value, __) {
-        return MenuAnchor(
-          style: const MenuStyle(
-            padding: MaterialStatePropertyAll(EdgeInsets.zero),
-            alignment: Alignment.bottomRight,
-          ),
-          builder: (_, ctrl, __) => buildMenuText(ctrl, value ?? ''),
-          menuChildren: ['选项一', '选项二', '选项三', '选项四']
-              .map(
-                (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_disaster_page.dart

@@ -1,157 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:lszlgl/base/base_state.dart';
-import 'package:lszlgl/widget/card_item.dart';
-
-/// 收获扦样-灾害污染
-class ReapSampleDisasterPage extends StatefulWidget {
-  final VoidCallback nextCallback;
-  final VoidCallback previousCallback;
-
-  const ReapSampleDisasterPage({
-    super.key,
-    required this.nextCallback,
-    required this.previousCallback,
-  });
-
-  @override
-  State<ReapSampleDisasterPage> createState() => _ReapSampleDisasterPageState();
-}
-
-class _ReapSampleDisasterPageState extends BaseState<ReapSampleDisasterPage> with AutomaticKeepAliveClientMixin {
-  late Widget arrowDown;
-
-  // 工厂排污
-  ValueNotifier<bool> gcpw = ValueNotifier(false);
-
-  // 水源污染
-  ValueNotifier<bool> sywr = ValueNotifier(false);
-
-  // 病虫害
-  ValueNotifier<bool> bch = ValueNotifier(false);
-
-  // 阴雨天气
-  ValueNotifier<bool> yytq = ValueNotifier(false);
-
-  // 水分偏高
-  ValueNotifier<bool> sfpg = ValueNotifier(false);
-
-  // 真菌污染
-  ValueNotifier<bool> zjwr = ValueNotifier(false);
-
-  // 金属污染
-  ValueNotifier<bool> jswr = ValueNotifier(false);
-
-  ValueNotifier<String?> pwlx = ValueNotifier(null);
-  ValueNotifier<String?> wrlx = ValueNotifier(null);
-  ValueNotifier<String?> bchlx = ValueNotifier(null);
-  ValueNotifier<String?> zjlx = ValueNotifier(null);
-  ValueNotifier<String?> jslx = ValueNotifier(null);
-
-  @override
-  void initState() {
-    super.initState();
-    arrowDown = Image.asset(imgItemArrowDown, width: 20);
-  }
-
-  @override
-  bool get wantKeepAlive => true;
-
-  @override
-  Widget build(BuildContext context) {
-    super.build(context);
-    return SingleChildScrollView(child: buildList());
-  }
-
-  Widget buildList() {
-    return Column(
-      children: [
-        CardItemWidget('种植土地周围是否有工厂排污', rightChild: buildSwitch(gcpw), bottomLine: true),
-        CardItemWidget('工厂排污类型', rightChild: buildMenu(pwlx), bottomLine: true),
-        CardItemWidget('种植土地周围使用水源、土壤是否有污染', rightChild: buildSwitch(sywr), bottomLine: true),
-        CardItemWidget('污染物类型', rightChild: buildMenu(wrlx), bottomLine: true),
-        CardItemWidget('生产过程中是否发生比较严重的病虫害', rightChild: buildSwitch(bch), bottomLine: true),
-        CardItemWidget('病虫害类型', rightChild: buildMenu(bchlx), bottomLine: true),
-        CardItemWidget('收货期间是否发生连阴雨天气', rightChild: buildSwitch(yytq), bottomLine: true),
-        CardItemWidget('收货粮食水分是否偏高', rightChild: buildSwitch(sfpg), bottomLine: true),
-        CardItemWidget('近年来本地是否发生真菌毒素污染', rightChild: buildSwitch(zjwr), bottomLine: true),
-        CardItemWidget('真菌毒素污染类型', rightChild: buildMenu(zjlx), bottomLine: true),
-        CardItemWidget('近年来本地是否发生重金属污染', rightChild: buildSwitch(jswr), bottomLine: true),
-        CardItemWidget('重金属污染类型', rightChild: buildMenu(jslx), bottomLine: true),
-      ],
-    );
-  }
-
-  Widget buildField({String? hint, TextInputType? inputType}) {
-    return TextField(
-      keyboardType: inputType,
-      textAlign: TextAlign.right,
-      decoration: InputDecoration(
-        hintText: hint,
-        border: InputBorder.none,
-        contentPadding: EdgeInsets.zero,
-        isDense: true,
-      ),
-      style: const TextStyle(fontSize: 14),
-      inputFormatters: [],
-    );
-  }
-
-  Widget buildSwitch(ValueNotifier<bool> notifier) {
-    return ValueListenableBuilder<bool>(
-      valueListenable: notifier,
-      builder: (_, value, __) => SizedBox(
-        height: 24,
-        child: Switch(
-          value: value,
-          onChanged: (change) => notifier.value = change,
-        ),
-      ),
-    );
-  }
-
-  Widget buildMenu(ValueNotifier<String?> notifier) {
-    return ValueListenableBuilder(
-      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,
-                ],
-              ),
-            );
-          },
-          menuChildren: ['选项一', '选项二', '选项三', '选项四']
-              .map(
-                (e) => MenuItemButton(
-                  child: Text(e),
-                  onPressed: () => notifier.value = e,
-                ),
-              )
-              .toList(),
-        );
-      },
-    );
-  }
-}

lib/page/sample_task/reap_sample_task/reap_sample_medicine_page.dart

@@ -1,151 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:lszlgl/base/base_state.dart';
-import 'package:lszlgl/widget/button.dart';
-import 'package:lszlgl/widget/card_item.dart';
-
-/// 收获扦样-用药情况
-class ReapSampleMedicinePage extends StatefulWidget {
-  final VoidCallback nextCallback;
-  final VoidCallback previousCallback;
-
-  const ReapSampleMedicinePage({
-    super.key,
-    required this.nextCallback,
-    required this.previousCallback,
-  });
-
-  @override
-  State<ReapSampleMedicinePage> createState() => _ReapSampleMedicinePageState();
-}
-
-class _ReapSampleMedicinePageState extends BaseState<ReapSampleMedicinePage> with AutomaticKeepAliveClientMixin {
-  late Widget arrowDown;
-
-  List<String> list = [];
-
-  void add() {
-    setState(() {
-      list.add('');
-    });
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    arrowDown = Image.asset(imgItemArrowDown, width: 20);
-  }
-
-  @override
-  bool get wantKeepAlive => true;
-
-  @override
-  Widget build(BuildContext context) {
-    super.build(context);
-    return SingleChildScrollView(child: buildList());
-  }
-
-  Widget buildList() {
-    return Column(
-      children: [
-        ...List.generate(
-          list.length,
-          buildItem,
-        ).toList(),
-        buildAdd(),
-      ],
-    );
-  }
-
-  Widget buildItem(int index) {
-    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),
-              ),
-            ),
-            Expanded(
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  CardItemWidget(
-                    '使用农药品种',
-                    rightChild: buildField(hint: '点击填写'),
-                    bottomLine: true,
-                    backgroundColor: null,
-                  ),
-                  CardItemWidget(
-                    '使用农药的数量(公斤或毫升/每亩地)',
-                    rightChild: buildField(hint: '点击填写'),
-                    bottomLine: true,
-                    backgroundColor: null,
-                  ),
-                  CardItemWidget(
-                    '施药时间',
-                    rightChild: buildField(hint: '点击填写'),
-                    bottomLine: true,
-                    backgroundColor: null,
-                  ),
-                  CardItemWidget(
-                    '施药方法',
-                    rightChild: buildField(hint: '点击填写'),
-                    backgroundColor: null,
-                  ),
-                ],
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget buildAdd() {
-    return MyButton(
-      '添加用药记录',
-      onTap: add,
-      margin: const EdgeInsets.symmetric(horizontal: 14, vertical: 22),
-      gradient: const LinearGradient(colors: [Color(0xFF3BD2E5), Color(0xFF247AF8)]),
-    );
-  }
-
-  Widget buildField({String? hint, TextInputType? inputType}) {
-    return TextField(
-      keyboardType: inputType,
-      textAlign: TextAlign.right,
-      decoration: InputDecoration(
-        hintText: hint,
-        border: InputBorder.none,
-        contentPadding: EdgeInsets.zero,
-        isDense: true,
-        counterText: '',
-      ),
-      style: const TextStyle(fontSize: 14),
-      textInputAction: TextInputAction.next,
-      inputFormatters: [],
-    );
-  }
-
-  Widget buildSwitch(ValueNotifier<bool> notifier) {
-    return ValueListenableBuilder<bool>(
-      valueListenable: notifier,
-      builder: (_, value, __) => Switch(
-        value: value,
-        onChanged: (change) => notifier.value = change,
-      ),
-    );
-  }
-}

lib/page/sample_task/reap_sample_task/reap_sample_org_page.dart

@@ -1,40 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:lszlgl/base/base_state.dart';
-import 'package:lszlgl/widget/card_item.dart';
-
-/// 收获扦样-检验机构
-class ReapSampleOrgPage extends StatefulWidget {
-  final VoidCallback previousCallback;
-  final VoidCallback submitCallback;
-
-  const ReapSampleOrgPage({
-    super.key,
-    required this.previousCallback,
-    required this.submitCallback,
-  });
-
-  @override
-  State<ReapSampleOrgPage> createState() => _ReapSampleOrgPageState();
-}
-
-class _ReapSampleOrgPageState extends BaseState<ReapSampleOrgPage> with AutomaticKeepAliveClientMixin {
-  @override
-  bool get wantKeepAlive => true;
-
-  @override
-  Widget build(BuildContext context) {
-    super.build(context);
-    return SingleChildScrollView(child: buildList());
-  }
-
-  Widget buildList() {
-    return Column(
-      children: [
-        CardItemWidget('质量检验机构', rightText: '系统代入', bottomLine: true),
-        CardItemWidget('机构地址', rightText: '系统代入', bottomLine: true),
-        CardItemWidget('食品安全指标检验机构', rightText: '系统代入', bottomLine: true),
-        CardItemWidget('机构地址', rightText: '系统代入'),
-      ],
-    );
-  }
-}

lib/page/sample_task/reap_sample_task/reap_sample_variety_page.dart

@@ -1,154 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:lszlgl/base/base_state.dart';
-import 'package:lszlgl/utils/date_time_utils.dart';
-import 'package:lszlgl/widget/card_item.dart';
-
-/// 收获扦样-品种信息
-class ReapSampleVarietyPage extends StatefulWidget {
-  final VoidCallback nextCallback;
-  final VoidCallback previousCallback;
-
-  const ReapSampleVarietyPage({
-    super.key,
-    required this.nextCallback,
-    required this.previousCallback,
-  });
-
-  @override
-  State<ReapSampleVarietyPage> createState() => _ReapSampleVarietyPageState();
-}
-
-class _ReapSampleVarietyPageState extends BaseState<ReapSampleVarietyPage> with AutomaticKeepAliveClientMixin {
-  late Widget arrowDown;
-
-  ValueNotifier<String?> lspl = ValueNotifier(null);
-  ValueNotifier<String?> yzpz = ValueNotifier(null);
-  ValueNotifier<String?> yzpzlx = ValueNotifier(null);
-
-  ValueNotifier<String?> shsj = ValueNotifier(null);
-  ValueNotifier<String?> qysj = ValueNotifier(null);
-
-  void showDate(ValueNotifier<String?> notifier) async {
-    var date = await showDatePicker(
-      context: context,
-      firstDate: DateTime(2020),
-      lastDate: DateTime.now(),
-    );
-    if (date == null) return;
-    notifier.value = DateTimeUtils.yyyymmdd(date: date);
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    arrowDown = Image.asset(imgItemArrowDown, width: 20);
-  }
-
-  @override
-  bool get wantKeepAlive => true;
-
-  @override
-  Widget build(BuildContext context) {
-    super.build(context);
-    return SingleChildScrollView(child: buildList());
-  }
-
-  Widget buildList() {
-    return Column(
-      children: [
-        CardItemWidget('采样品种', rightText: '自动生成', bottomLine: true),
-        CardItemWidget('粮食品类', rightChild: buildMenu(lspl), bottomLine: true),
-        CardItemWidget('样品编号', rightText: '自动生成', bottomLine: true),
-        CardItemWidget('种植品种', rightChild: buildField(hint: '点击填写'), bottomLine: true),
-        CardItemWidget('是否优质品种', rightChild: buildMenu(yzpz), bottomLine: true),
-        CardItemWidget('优质品种类型', rightChild: buildMenu(yzpzlx), bottomLine: true),
-        ValueListenableBuilder(
-          valueListenable: shsj,
-          builder: (_, value, __) => CardItemWidget(
-            '收获时间',
-            rightText: value ?? '',
-            trailing: arrowDown,
-            bottomLine: true,
-            onTap: () => showDate(shsj),
-          ),
-        ),
-        ValueListenableBuilder(
-          valueListenable: qysj,
-          builder: (_, value, __) => CardItemWidget(
-            '扦样时间',
-            rightText: value ?? '',
-            trailing: arrowDown,
-            bottomLine: true,
-            onTap: () => showDate(qysj),
-          ),
-        ),
-        CardItemWidget('扦样数量（公斤）', rightChild: buildField(hint: '点击填写'), bottomLine: true),
-        CardItemWidget('扦样代表数量（公斤）', rightChild: buildField(hint: '点击填写'), bottomLine: true),
-        CardItemWidget('温度（℃）', rightChild: buildField(hint: '点击填写'), bottomLine: true),
-        CardItemWidget('湿度（%）', rightChild: buildField(hint: '点击填写')),
-      ],
-    );
-  }
-
-  Widget buildField({String? hint, TextInputType? inputType}) {
-    return TextField(
-      keyboardType: inputType,
-      textAlign: TextAlign.right,
-      decoration: InputDecoration(
-        hintText: hint,
-        border: InputBorder.none,
-        contentPadding: EdgeInsets.zero,
-        isDense: true,
-      ),
-      style: const TextStyle(fontSize: 14),
-      textInputAction: TextInputAction.next,
-      inputFormatters: [],
-    );
-  }
-
-  Widget buildMenu(ValueNotifier<String?> notifier) {
-    return ValueListenableBuilder(
-      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,
-                ],
-              ),
-            );
-          },
-          menuChildren: ['选项一', '选项二', '选项三', '选项四']
-              .map(
-                (e) => MenuItemButton(
-                  child: Text(e),
-                  onPressed: () => notifier.value = e,
-                ),
-              )
-              .toList(),
-        );
-      },
-    );
-  }
-}

lib/page/sample_task/sample_task_list_page.dart

@@ -13,7 +13,7 @@ import 'package:lszlgl/utils/inject.dart';
 import 'package:lszlgl/widget/button.dart';
 import 'package:lszlgl/widget/page_widget.dart';
 
-import 'reap_sample_task/reap_sample_task_page.dart';
+import 'reap_sample_detail/reap_sample_task_page.dart';
 
 /// 扦样环节列表
 class SampleTaskListPage extends StatefulWidget {
@@ -34,18 +34,16 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
   late SampleListVM vm;
 
   /// 详情
-  void startTaskDetail(bool detail, SampleTaskItem data) {
+  void startTaskDetail(bool detail, SampleTaskItem data) async {
+    bool? success;
     switch (widget.type) {
       case StepType.reap:
-        startDetail(ReapSampleTaskPageArgs(detail: detail, id: data.id));
+        success = await MyRouter.startReapSampleTask(args: ReapSampleTaskPageArgs(detail: detail, id: data.id));
         break;
       case StepType.stock:
+        // success = await MyRouter.startStockSampleTask(args: StockSampleTaskPageArgs(detail: detail, id: data.id));
         break;
     }
-  }
-
-  void startDetail(ReapSampleTaskPageArgs args) async {
-    bool? success = await MyRouter.startReapSampleTask(args: args);
     if (success ?? false) {
       vm.refreshAll();
     }

lib/page/sample_task/stock_sample_detail/stock_sample_basic_page.dart

@@ -0,0 +1,107 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:lszlgl/utils/input_formatter.dart';
+import '../../../base/base_lifecycle_state.dart';
+import '../../../model/rsp/sample_task_rsp.dart';
+import '../../../service/dict_service.dart';
+import '../../../utils/date_time_utils.dart';
+import '../../../widget/card_item.dart';
+
+/// 库存扦样-基础信息
+class StockSampleBasicPage extends StatefulWidget {
+  final SampleTaskItemKcjcRsp? data;
+  final bool detail;
+
+  const StockSampleBasicPage(
+    this.data, {
+    super.key,
+    this.detail = true,
+  });
+
+  @override
+  State<StockSampleBasicPage> createState() => _StockSampleBasicPageState();
+}
+
+class _StockSampleBasicPageState extends BaseLifecycleState<StockSampleBasicPage> with AutomaticKeepAliveClientMixin {
+  SampleTaskItemKcjcRsp? data;
+  late bool isDetail;
+  final rksj = null.notifier<String?>();
+
+  final rkdjList = <CardMenuData>[].notifier<List<CardMenuData>>();
+  final rkdj = null.notifier<CardMenuData?>();
+
+  final guoChandiList = <CardMenuData>[].notifier<List<CardMenuData>>();
+  final guoChandi = null.notifier<CardMenuData?>();
+
+  @override
+  bool get wantKeepAlive => true;
+
+  @override
+  void onInit() {
+    data = widget.data;
+    isDetail = widget.detail;
+
+    // 入库时间
+    rksj.value = data?.rksj;
+    // 入库等级
+    rkdjList.value = [1, 2, 3, 4, 5, 6].map((e) {
+      var value = CardMenuData(e.toString(), e);
+      if (e == data?.rkdj) rkdj.value = value;
+      return value;
+    }).toList();
+    // 产地国
+    rootBundle.loadString('assets/json/shijie.json').then((jsonValue) {
+      Map<String, dynamic> map = jsonDecode(jsonValue);
+      guoChandiList.value = map.values.map((e) {
+        var value = CardMenuData(e.toString(), e);
+        if (e == data?.guoChandi) guoChandi.value = value;
+        return value;
+      }).toList();
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    super.build(context);
+    return SingleChildScrollView(child: buildList());
+  }
+
+  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: DictService.getLabel(DictType.jclb, value: data?.jclb), bottomLine: true),
+        CardItemWidget('承储企业名称', rightText: data?.ccqymc, bottomLine: true),
+        CardItemWidget('扦样仓房', rightText: data?.qycf, bottomLine: true),
+        CardItemWidget('扦样货位', rightText: data?.qyhw, bottomLine: true),
+        CardWidgets.buildEdit(
+          isDetail,
+          '扦样区域',
+          data?.qyqy,
+          onChanged: (value) => data?.qyqy = value,
+        ),
+        CardItemWidget('仓型', rightText: data?.cangxing, bottomLine: true),
+        CardWidgets.buildDate(
+          isDetail,
+          '入库时间',
+          rksj,
+          onResult: (value) => data?.rksj = DateTimeUtils.yyyymmdd(date: value),
+        ),
+        CardWidgets.buildMenu(isDetail, '入库等级', rkdjList, rkdj, (_, sel) => data?.rkdj = num.parse(sel.value)),
+        CardWidgets.buildMenu(isDetail, '产地（进口国）', guoChandiList, guoChandi, (_, sel) => data?.guoChandi = sel.value),
+        CardWidgets.buildEdit(
+          isDetail,
+          '上层粮温（℃）',
+          data?.sclw?.toString(),
+          inputType: const TextInputType.numberWithOptions(decimal: true),
+          formatters: [XNumberTextInputFormatter()],
+          onChanged: (value) => data?.sclw = value.isEmpty ? null : num.parse(value),
+        ),
+      ],
+    );
+  }
+}

lib/page/sample_task/stock_sample_detail/stock_sample_store_page.dart

@@ -0,0 +1,62 @@
+import 'package:flutter/material.dart';
+import '../../../base/base_lifecycle_state.dart';
+import '../../../model/rsp/sample_task_rsp.dart';
+import '../../../utils/string_utils.dart';
+import '../../../widget/card_item.dart';
+
+/// 库存扦样-储存信息
+class StockSampleStorePage extends StatefulWidget {
+  final SampleTaskItemKcjcRsp? data;
+  final bool detail;
+
+  const StockSampleStorePage(
+    this.data, {
+    super.key,
+    this.detail = true,
+  });
+
+  @override
+  State<StockSampleStorePage> createState() => _StockSampleStorePageState();
+}
+
+class _StockSampleStorePageState extends BaseLifecycleState<StockSampleStorePage> with AutomaticKeepAliveClientMixin {
+  SampleTaskItemKcjcRsp? data;
+  late bool isDetail;
+
+  final sfList = [CardMenuData('是', 0), CardMenuData('否', 1)].notifier<List<CardMenuData>>();
+
+  final sfsy = null.notifier<CardMenuData?>();
+
+  final guoChandi = null.notifier<CardMenuData?>();
+
+  void setNumBoolMenuSelNotifier(ValueNotifier<CardMenuData?> notifier, num? value) {
+    if (value == null) return;
+    notifier.value = CardMenuData(StringUtils.boolStrByNum(value), value);
+  }
+
+  @override
+  bool get wantKeepAlive => true;
+
+  @override
+  void onInit() {
+    data = widget.data;
+    isDetail = widget.detail;
+
+    setNumBoolMenuSelNotifier(sfsy, data?.sfsy);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    super.build(context);
+    return SingleChildScrollView(child: buildList());
+  }
+
+  Widget buildList() {
+    return Column(
+      children: [
+        CardWidgets.buildMenu(isDetail, '是否施药', sfList, sfsy, (_, sel) => data?.sfsy = sel.value),
+        CardItemWidget('扦样任务单号', rightText: data?.qyrwdh, bottomLine: true),
+      ],
+    );
+  }
+}

lib/page/sample_task/stock_sample_detail/stock_sample_task_page.dart

@@ -0,0 +1,290 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
+import 'package:lszlgl/base/base_lifecycle_state.dart';
+import 'package:lszlgl/config/colors.dart';
+import 'package:lszlgl/model/rsp/sample_task_rsp.dart';
+
+import '../../../base/base_vm.dart';
+import '../../../network/my_api.dart';
+import '../../../widget/button.dart';
+import '../../../widget/page_widget.dart';
+import 'stock_sample_basic_page.dart';
+import 'stock_sample_store_page.dart';
+import 'stock_sample_variety_page.dart';
+
+class StockSampleTaskPageArgs {
+  final bool detail;
+  final num? id;
+
+  StockSampleTaskPageArgs({
+    this.detail = false,
+    this.id,
+  });
+
+  @override
+  String toString() {
+    return {'detail': detail, 'id': id}.toString();
+  }
+}
+
+/// 库存扦样任务
+class StockSampleTaskPage extends StatefulWidget {
+  final StockSampleTaskPageArgs args;
+
+  const StockSampleTaskPage({
+    Key? key,
+    required this.args,
+  }) : super(key: key);
+
+  @override
+  State<StockSampleTaskPage> createState() => _StockSampleTaskPageState();
+}
+
+class _StockSampleTaskPageState extends BaseLifecycleState<StockSampleTaskPage> with TickerProviderStateMixin {
+  late StockSampleTaskPageArgs args;
+
+  final pageStatus = DataStatusModel<SampleTaskItemKcjcRsp?>().notifier<DataStatusModel<SampleTaskItemKcjcRsp?>>();
+
+  late PageController pageCtrl;
+
+  late List<String> tabTextList;
+  late List<Widget> pageList;
+
+  ValueNotifier<int> tabIndex = ValueNotifier(0);
+
+  void startEdit() async {
+    bool? success = await MyRouter.startStockSampleTask(args: StockSampleTaskPageArgs(id: args.id));
+    if (success ?? false) {
+      MyNavigator.pop(true);
+    }
+  }
+
+  void next() {
+    if (tabIndex.value < tabTextList.length - 1) {
+      pageCtrl.jumpToPage(tabIndex.value + 1);
+    }
+  }
+
+  void previous() {
+    if (tabIndex.value <= 0) return;
+    pageCtrl.jumpToPage(tabIndex.value - 1);
+  }
+
+  void submit() async {
+    /*
+    MyNavigator.showLoading();
+    // 已分解
+    pageStatus.value.data?.state = 2;
+    try {
+      var rsp = await MyApi.get().updateSampleTaskSgjc((pageStatus.value.data ?? SampleTaskItem()).getReqJson());
+      if (!mounted) return;
+      if (rsp.data ?? false) {
+        MyNavigator.showToast('提交成功');
+        MyNavigator.pop(true);
+      } else {
+        MyNavigator.showToast('提交失败');
+      }
+    } catch (e) {}
+    MyNavigator.dismissLoading();
+
+     */
+  }
+
+  void getDetailData() async {
+    pageStatus.update(pageStatus.value.loading());
+    try {
+      var rsp = await MyApi.get().sampleTaskDetailKcjc(args.id ?? -1);
+      var data = rsp.data;
+      if (data == null) {
+        pageStatus.update(pageStatus.value.empty());
+      } else {
+        cratePageList(data);
+        pageStatus.update(pageStatus.value.success(data: data));
+      }
+    } catch (e) {
+      pageStatus.update(pageStatus.value.error());
+    }
+  }
+
+  void cratePageList(SampleTaskItemKcjcRsp data) {
+    pageList = [
+      StockSampleBasicPage(data, detail: args.detail),
+      StockSampleVarietyPage(data, detail: args.detail),
+      StockSampleStorePage(data, detail: args.detail),
+      StockSampleBasicPage(data, detail: args.detail),
+    ];
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    args = widget.args;
+    tabTextList = ['基础信息', '品种信息', '储存信息', '检验机构'];
+    pageCtrl = PageController();
+  }
+
+  @override
+  void onFirstShow(Duration timeStamp) {
+    getDetailData();
+  }
+
+  @override
+  void onDestroy() {
+    pageStatus.dispose();
+    pageCtrl.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return myScaffold(
+      child: KeyboardDismissOnTap(
+        dismissOnCapturedTaps: true,
+        child: Column(
+          children: [
+            myAppBar(title: args.detail ? '扦样完成详情' : '扦样任务单'),
+            pageStatus.builder((v) {
+              return switch (v.status) {
+                DataStatus.loading => const PageLoadingWidget.loading(),
+                DataStatus.error => PageLoadingWidget.error(onTap: getDetailData),
+                DataStatus.success => buildBody(),
+                _ => const PageLoadingWidget.empty(),
+              };
+            }),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget buildBody() {
+    return Expanded(
+      child: Container(
+        clipBehavior: Clip.hardEdge,
+        decoration: const BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
+        ),
+        child: Column(
+          children: [
+            buildTab(),
+            Expanded(child: buildPage()),
+            buildButton(),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget buildTab() {
+    return ValueListenableBuilder<int>(
+      valueListenable: tabIndex,
+      builder: (_, value, __) {
+        return Container(
+          height: 40,
+          color: Colors.white,
+          padding: const EdgeInsets.symmetric(horizontal: 4),
+          child: Row(
+            children: List.generate(
+              tabTextList.length,
+              buildTabItem,
+            ),
+          ),
+        );
+      },
+    );
+  }
+
+  Widget buildTabItem(int index) {
+    var select = index == tabIndex.value;
+    return Expanded(
+      child: GestureDetector(
+        behavior: HitTestBehavior.opaque,
+        onTap: () {
+          tabIndex.value = index;
+          if ((pageCtrl.page?.toInt() ?? 0) == index) return;
+          pageCtrl.jumpToPage(index);
+        },
+        child: Container(
+          alignment: Alignment.center,
+          child: Stack(
+            children: [
+              buildTabLine(select),
+              Text(
+                tabTextList[index],
+                style: TextStyle(
+                  fontSize: select ? 14 : 12,
+                  color: select ? MyColor.c_333333 : MyColor.c_467F86,
+                  fontWeight: select ? FontWeight.w700 : FontWeight.w400,
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget buildTabLine(bool show) {
+    if (!show) return const SizedBox.shrink();
+    return Positioned(
+      left: 0,
+      right: 0,
+      bottom: 0,
+      child: Container(
+        height: 8,
+        decoration: const BoxDecoration(
+          gradient: LinearGradient(
+            colors: [Color(0xFF3BD2E5), Color(0xFF2379F8)],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget buildPage() {
+    return PageView.builder(
+      controller: pageCtrl,
+      physics: const NeverScrollableScrollPhysics(),
+      onPageChanged: (index) {
+        if (index == tabIndex.value) return;
+        tabIndex.value = index;
+      },
+      itemCount: pageList.length,
+      itemBuilder: (_, index) => pageList[index],
+    );
+  }
+
+  Widget buildButton() {
+    Widget child;
+    if (args.detail) {
+      child = MyButton('重新录入', onTap: startEdit);
+    } else {
+      child = tabIndex.builder((v) {
+        // 第一页
+        if (v == 0) return MyButton('下一步', onTap: next);
+        // 最后一页
+        if (v == tabTextList.length - 1) {
+          return Row(
+            children: [
+              Expanded(flex: 2, child: MyButton('上一步', onTap: previous)),
+              const Spacer(flex: 1),
+              Expanded(flex: 2, child: MyButton('提交', onTap: submit)),
+            ],
+          );
+        }
+        return Row(
+          children: [
+            Expanded(flex: 2, child: MyButton('上一步', onTap: previous)),
+            const Spacer(flex: 1),
+            Expanded(flex: 2, child: MyButton('下一步', onTap: next)),
+          ],
+        );
+      });
+    }
+    return Container(
+      color: const Color(0xFFF1F7F6),
+      padding: const EdgeInsets.all(12),
+      child: child,
+    );
+  }
+}

lib/page/sample_task/stock_sample_detail/stock_sample_variety_page.dart

@@ -0,0 +1,78 @@
+import 'package:flutter/material.dart';
+import 'package:lszlgl/utils/input_formatter.dart';
+import '../../../base/base_lifecycle_state.dart';
+import '../../../model/rsp/sample_task_rsp.dart';
+import '../../../utils/date_time_utils.dart';
+import '../../../widget/card_item.dart';
+
+/// 库存扦样-品种信息
+class StockSampleVarietyPage extends StatefulWidget {
+  final SampleTaskItemKcjcRsp? data;
+  final bool detail;
+
+  const StockSampleVarietyPage(
+    this.data, {
+    super.key,
+    this.detail = true,
+  });
+
+  @override
+  State<StockSampleVarietyPage> createState() => _StockSampleVarietyPageState();
+}
+
+class _StockSampleVarietyPageState extends BaseLifecycleState<StockSampleVarietyPage> with AutomaticKeepAliveClientMixin {
+  SampleTaskItemKcjcRsp? data;
+  late bool isDetail;
+
+  final qysj = null.notifier<String?>();
+
+  @override
+  bool get wantKeepAlive => true;
+
+  @override
+  void onInit() {
+    data = widget.data;
+    isDetail = widget.detail;
+
+    qysj.value = data?.qysj;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    super.build(context);
+    return SingleChildScrollView(child: buildList());
+  }
+
+  Widget buildList() {
+    return Column(
+      children: [
+        CardItemWidget('采样品种', rightText: data?.cypzName, bottomLine: true),
+        CardItemWidget('样品编号', rightText: data?.ypbh, bottomLine: true),
+        CardItemWidget('库存性质', rightText: data?.lsxz, bottomLine: true),
+        CardWidgets.buildEdit(
+          isDetail,
+          '代表数量（吨）',
+          data?.dbsl?.toString(),
+          inputType: const TextInputType.numberWithOptions(decimal: true),
+          formatters: [XNumberTextInputFormatter()],
+          onChanged: (value) => data?.dbsl = value.isEmpty ? null : num.parse(value),
+        ),
+        CardItemWidget('所在货位粮食总数(吨)', rightText: data?.szhwlszs, bottomLine: true),
+        CardWidgets.buildEdit(
+          isDetail,
+          '收获年度',
+          data?.shnd,
+          inputType: const TextInputType.numberWithOptions(decimal: false),
+          formatters: [XNumberTextInputFormatter(isAllowDecimal: false)],
+          onChanged: (value) => data?.shnd = value,
+        ),
+        CardWidgets.buildDate(
+          isDetail,
+          '扦样时间',
+          qysj,
+          onResult: (value) => data?.qysj = DateTimeUtils.yyyymmdd(date: value),
+        ),
+      ],
+    );
+  }
+}

lib/router/my_router.dart

@@ -1,12 +1,14 @@
 import 'package:lszlgl/page/login/login_page.dart';
 import 'package:lszlgl/page/main_tab_page.dart';
-import 'package:lszlgl/page/sample_task/reap_sample_task/reap_sample_task_page.dart';
+import 'package:lszlgl/page/sample_task/reap_sample_detail/reap_sample_task_page.dart';
 import 'package:lszlgl/page/sample_task/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';
 import 'package:lszlgl/router/my_navigator.dart';
 
+import '../page/sample_task/stock_sample_detail/stock_sample_task_page.dart';
+
 // 根页面
 const rLoginPage = '/';
 // 主页
@@ -21,6 +23,8 @@ const rChangePwdPage = '/ChangePwdPage';
 const rSampleTaskListTabPage = '/SampleTaskListTabPage';
 // 收获扦样任务
 const rReapSampleTaskPage = '/ReapSampleTaskPage';
+// 库存扦样任务
+const rStockSampleTaskPage = '/StockSampleTaskPage';
 
 final Map<String, MyNavigatorBuilder> rRouteMap = {
   // 根页面
@@ -31,6 +35,7 @@ final Map<String, MyNavigatorBuilder> rRouteMap = {
   rChangePwdPage: (context, args) => const ChangePwdPage(),
   rSampleTaskListTabPage: (context, args) => SampleTaskListTabPage(args: args as SampleTaskListTabPageArgs?),
   rReapSampleTaskPage: (context, args) => ReapSampleTaskPage(args: args as ReapSampleTaskPageArgs),
+  rStockSampleTaskPage: (context, args) => StockSampleTaskPage(args: args as StockSampleTaskPageArgs),
 };
 
 class MyRouter {
@@ -78,4 +83,9 @@ class MyRouter {
   static Future<dynamic> startReapSampleTask({ReapSampleTaskPageArgs? args}) {
     return MyNavigator.push(rReapSampleTaskPage, args: args ?? ReapSampleTaskPageArgs());
   }
+
+  /// 库存扦样任务
+  static Future<dynamic> startStockSampleTask({StockSampleTaskPageArgs? args}) {
+    return MyNavigator.push(rStockSampleTaskPage, args: args ?? StockSampleTaskPageArgs());
+  }
 }

lib/widget/card_item.dart

@@ -313,7 +313,7 @@ class CardWidgets {
     bool isDetail,
     String title,
     ValueNotifier<String?> notifier, {
-    void Function(DateTime?)? onResult,
+    String? Function(DateTime?)? onResult,
     DateTime? firstDate,
     DateTime? lastDate,
   }) {
@@ -332,7 +332,9 @@ class CardWidgets {
             firstDate: firstDate ?? DateTime(2020),
             lastDate: lastDate ?? DateTime.now(),
           );
-          onResult?.call(date);
+          if (onResult != null) {
+            notifier.value = onResult.call(date);
+          }
         },
       );
     });

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.0.3+3
+version: 0.0.4+4
 
 environment:
   sdk: '>=3.1.5 <4.0.0'
@@ -109,6 +109,7 @@ flutter:
   # To add assets to your application, add an assets section, like this:
   assets:
     - assets/images/
+    - assets/json/
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware