库存模块功能开发。

lib/model/rsp/sample_task_rsp.dart

@@ -697,6 +697,7 @@ class SampleTaskItemKcjcRsp {
 
   /// 扦样人员姓名
   String? name;
+  String? dgryName; // 扦样多个人员名称: 张三,李四
 
   /// 任务类型
   num? rwlx;
@@ -806,6 +807,7 @@ class SampleTaskItemKcjcRsp {
     this.qyrwdh,
     this.ypbh,
     this.name,
+    this.dgryName,
     this.rwlx,
     this.dwmc,
     this.cypzmc,
@@ -862,6 +864,7 @@ class SampleTaskItemKcjcRsp {
     map['qyssclw'] = qyssclw;
     map['cljsss'] = cljsss;
     map['bz'] = bz;
+    map['dgryName'] = dgryName;
 
     return map;
   }

lib/model/rsp/sample_task_rsp.g.dart

@@ -496,6 +496,7 @@ SampleTaskItemKcjcRsp _$SampleTaskItemKcjcRspFromJson(
       qyrwdh: const StringConverter().fromJson(json['qyrwdh']),
       ypbh: const StringConverter().fromJson(json['ypbh']),
       name: const StringConverter().fromJson(json['name']),
+      dgryName: const StringConverter().fromJson(json['dgryName']),
       rwlx: const NumConverter().fromJson(json['rwlx']),
       dwmc: const StringConverter().fromJson(json['dwmc']),
       cypzmc: const NumConverter().fromJson(json['cypzmc']),
@@ -569,6 +570,7 @@ Map<String, dynamic> _$SampleTaskItemKcjcRspToJson(
       'qyrwdh': const StringConverter().toJson(instance.qyrwdh),
       'ypbh': const StringConverter().toJson(instance.ypbh),
       'name': const StringConverter().toJson(instance.name),
+      'dgryName': const StringConverter().toJson(instance.dgryName),
       'rwlx': const NumConverter().toJson(instance.rwlx),
       'dwmc': const StringConverter().toJson(instance.dwmc),
       'cypzmc': const NumConverter().toJson(instance.cypzmc),

lib/page/home/store_house_page.dart

@@ -46,9 +46,9 @@ class _StoreHousePageState extends BaseLifecycleState<StoreHousePage> {
       //       .toList()
       //       : List.empty(),
       // );
-      var res = await MyApi.get(baseUrl: 'http://101.36.160.117:28088')
+      var res = await MyApi.get(baseUrl: 'http://121.36.17.6:28088')
           .getStoreMessage(widget.houseNum, 'zhijian');
-      if (res.data == null) {
+      if (res.data?.first.tycfbm == null) {
         pageState.update(pageState.value.empty());
       } else {
         data = res.data!.first;

lib/page/qrcode_scan/qrcode_scan_page.dart

@@ -9,7 +9,8 @@ import '../../base/base_lifecycle_state.dart';
 import '../../widget/button.dart';
 
 class QrCodeScanPage extends StatefulWidget {
-  const QrCodeScanPage({super.key});
+  final bool isKC;
+  const QrCodeScanPage({super.key, this.isKC = false, });
 
   @override
   State<QrCodeScanPage> createState() => _QrCodeScanPageState();
@@ -45,8 +46,13 @@ class _QrCodeScanPageState extends BaseLifecycleState<QrCodeScanPage> with Singl
         showErrorDialog(code);
         return;
       }else{
-        MyRouter.startStoreHouse(list.last);
-        return;
+        if(widget.isKC){
+          MyNavigator.pop(list.last);
+          return;
+        }else{
+          MyRouter.startStoreHouse(list.last);
+          return;
+        }
       }
     }
 

lib/page/sample_task/reap_sample_detail/reap_sample_basic_detail_page.dart

@@ -640,6 +640,7 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
               CardItemWidget('扦样人员', rightText: data?.name, bottomLine: true),
               otherpeople.builder((v) => CardItemWidget(
                 '陪同人员',
+                rightRatio: 2,
                 rightText: v,
                 onTap: isDetail ? null : showPopView,
                 trailing: isDetail ? null : const Icon(Icons.keyboard_arrow_down, size: 24, color: Color(0xFF01B2C8),),

lib/page/sample_task/reap_sample_detail/reap_sample_task_page.dart

@@ -685,7 +685,6 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
           margin: const EdgeInsets.symmetric(horizontal: 8),
             clipBehavior: Clip.hardEdge,
             decoration: const BoxDecoration(
-             // color: Colors.white,
               borderRadius: BorderRadius.vertical(top: Radius.circular(8)),
             ),
             child: pageList[index]);

lib/page/sample_task/sample_task_list_page.dart

@@ -94,6 +94,31 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage>
     }
   }
 
+  Widget testWidget(){
+    return Align(
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          TextButton(
+            onPressed: (){
+              MyRouter.startStockSampleTask(
+                  args: StockSampleTaskPageArgs(detail: false, id: 3567)); // 3568  3567 3566
+            },
+            child: const Text('库存 - 编辑'),
+          ),
+          const SizedBox(height: 22),
+          TextButton(
+            onPressed: (){
+              MyRouter.startStockSampleTask(
+                  args: StockSampleTaskPageArgs(detail: true, id: 3567)); // 3568  3567 3566
+            },
+            child: const Text('库存 - 展示'),
+          ),
+        ],
+      ),
+    );
+  }
+
   @override
   void onInit() {
     vm = Inject.get<SampleListVM>()!;
@@ -109,7 +134,8 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage>
     super.build(context);
     return Stack(
       children: [
-        buildBody(),
+        widget.type == StepType.reap ? buildBody() : testWidget(),
+       // buildBody(),
         buildPrintBtn(),
       ],
     );

lib/page/sample_task/stock_sample_detail/stock_sample_basic_page.dart

@@ -1,12 +1,12 @@
-import 'dart:convert';
-
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:lszlgl/utils/input_formatter.dart';
+import 'package:lszlgl/main.dart';
+import 'package:lszlgl/model/rsp/dict_rsp.dart';
+import 'package:lszlgl/network/my_api.dart';
+import 'package:lszlgl/service/user_service.dart';
+import 'package:lszlgl/widget/qypop_widget.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';
 
 /// 库存扦样-基础信息
@@ -27,13 +27,88 @@ class StockSampleBasicPage extends StatefulWidget {
 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 otherpeople = null.notifier<String?>();
+  List<OtherPeopleModel> personList = [];
+  String otherStr = '';
+
+  final jyjgList = <CardMenuData>[].notifier<List<CardMenuData>>();
+  final jyjg = null.notifier<CardMenuData?>();
+
+  /// 检验机构数据
+  Future<void> getJyJgList() async {
+    try {
+      var rsp = await MyApi.get().trxxList();
+      List<CardMenuData> list = [];
+      if (rsp.data != null) {
+        for (TrxxRsp item in rsp.data!) {
+          var menuData = CardMenuData(item.tlmc, item.id);
+          list.add(menuData);
+          // 选中
+         // if (item.id == data?.trdllx) trxx.value = menuData;
+        }
+      }
+      jyjgList.value = list;
+    } catch (e) {
+      logger.e(e);
+    }
+    MyNavigator.dismissLoading();
+  }
 
-  final guoChandiList = <CardMenuData>[].notifier<List<CardMenuData>>();
-  final guoChandi = null.notifier<CardMenuData?>();
+  // 选择陪同人员
+  void showPopView() {
+    showModalBottomSheet(
+        isDismissible: false,
+        enableDrag: false,
+        isScrollControlled: true,
+        shape: const RoundedRectangleBorder(
+            borderRadius:
+            BorderRadius.only(topLeft: Radius.circular(14), topRight: Radius.circular(14))),
+        context: context,
+        builder: (context) {
+          return QyPopWidget(
+            pTitleList: personList,
+            otherStr: otherStr,
+            pTitleCallBack: (val, other) {
+              otherStr = other;
+              if (val.isEmpty) {
+                data?.dgryName = null;
+                otherpeople.value = null;
+              } else {
+                data?.dgryName = val;
+                otherpeople.value = val;
+              }
+            },
+          );
+        });
+  }
+
+  void getPersonData() async {
+    try {
+      // 获取扦样人员列表
+      var rsp = await MyApi.get().getPersonMenu(data?.jhcyjg ?? data?.zjBaseEnterpriseId ?? 0);
+      personList
+        ..clear()
+        ..addAll((rsp.data ?? []).map((e) => OtherPeopleModel(name: e.name)).toList());
+      personList.removeWhere((item) => item.name == data?.name || item.name ==null); // 移除可能存在的默认人员和名字为空的
+      // 选中扦样人员
+      var nameList = data?.dgryName?.split(',');
+      if (nameList != null) {
+        for (var person in personList) {
+          for (var name in nameList) {
+            if (person.name == name) {
+              person.isChose = true;
+              nameList.remove(name);
+              break;
+            }
+          }
+        }
+        otherStr = nameList.join(','); // 输入人员名字赋值
+      }
+    } catch (e) {
+      logger.e(e);
+    }
+  }
 
   @override
   bool get wantKeepAlive => true;
@@ -43,23 +118,25 @@ class _StockSampleBasicPageState extends BaseLifecycleState<StockSampleBasicPage
     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();
-    });
+    if ((data?.name ?? '0') == '0') {
+      data?.name = UserService.get().getUser()?.nickname;
+    }
+    var nameList = data?.dgryName?.split(',');
+    if (nameList != null) {
+      nameList.removeWhere((item) => item == data?.name);
+      if (nameList.isNotEmpty) {
+        data?.dgryName = nameList.join(',');
+      } else {
+        data?.dgryName = null;
+      }
+    }
+    otherpeople.value = data?.dgryName;
+
+    if(!isDetail){
+      getPersonData();
+      getJyJgList();
+    }
+
   }
 
   @override
@@ -71,36 +148,71 @@ class _StockSampleBasicPageState extends BaseLifecycleState<StockSampleBasicPage
   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),
+        Container(
+          clipBehavior: Clip.hardEdge,
+          decoration: const BoxDecoration(
+            borderRadius: BorderRadius.all(Radius.circular(8)),
+          ),
+          child: Column(
+            children: [
+              CardItemWidget('样品单号', rightText: data?.qyrwdh, bottomLine: true, rightRatio: 3,
+                  onTap: () async{
+                    await Clipboard.setData(ClipboardData(text: data?.qyrwdh ?? '' ));
+                    MyNavigator.showToast('样品单号已复制');
+                  }
+              ),
+              CardItemWidget('检验样品单号', rightText: '${data?.qyrwdh}-1', bottomLine: true,leftRatio: 2,rightRatio: 3,),
+              CardItemWidget('复核样品单号', rightText: '${data?.qyrwdh}-2', bottomLine: true,leftRatio: 2,rightRatio: 3,),
+              CardItemWidget('备检样品单号', rightText: '${data?.qyrwdh}-3', bottomLine: true,leftRatio: 2,rightRatio: 3,),
+            ],
+          ),
         ),
-        CardWidgets.buildMenu(isDetail, '入库等级', rkdjList, rkdj, (_, sel) => data?.rkdj = 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),
+
+        const SizedBox(height: 12),
+
+        Container(
+          clipBehavior: Clip.hardEdge,
+          decoration: const BoxDecoration(
+            borderRadius: BorderRadius.all(Radius.circular(8)),
+          ),
+          child: Column(
+            children: [
+              CardItemWidget('扦样人员', rightText: data?.name, bottomLine: true),
+              otherpeople.builder((v) => CardItemWidget(
+                '陪同人员',
+                bottomLine: true,
+                rightRatio: 2,
+                rightText: v,
+                onTap: isDetail ? null : showPopView,
+                trailing: isDetail ? null : const Icon(Icons.keyboard_arrow_down, size: 24, color: Color(0xFF01B2C8),),
+              )),
+              CardWidgets.buildMenu(
+                isDetail,
+                '检测机构',
+                jyjgList,
+                jyjg,
+                    (_, sel) {
+                  // data?.trdllx = sel.value;
+                },
+              ),
+              CardItemWidget('承储企业名称', rightText: data?.ccqymc, bottomLine: true,leftRatio: 2,rightRatio: 3,),
+              CardItemWidget('扦样仓房', rightText: data?.qycf, bottomLine: true,rightRatio: 3,),
+              CardItemWidget('扦样货位', rightText: data?.qyhw, bottomLine: true,rightRatio: 3,),
+              CardItemWidget('仓型', rightText: data?.cangxing, bottomLine: true,rightRatio: 3,),
+              CardItemWidget('所在货位粮食总数（吨）', rightText: data?.szhwlszs, bottomLine: true,leftRatio: 2,),
+              CardWidgets.buildEdit(
+                isDetail,
+                '扦样区域',
+                rightRatio: 3,
+                data?.qyqy,
+                onChanged: (value) => data?.qyqy = value,
+              ),
+            ],
+          ),
         ),
+
+        // CardItemWidget('扦样单位', rightText: data?.dwmc, bottomLine: true),
+        //  CardItemWidget('监测类别', rightText: DictService.getLabel(DictType.jclb, value: data?.jclb), bottomLine: true),
       ],
     );
   }

lib/page/sample_task/stock_sample_detail/stock_sample_store_page.dart

@@ -1,4 +1,8 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
+import 'package:lszlgl/main.dart';
+import 'package:lszlgl/widget/photo_card_item.dart';
 import '../../../base/base_lifecycle_state.dart';
 import '../../../model/rsp/sample_task_rsp.dart';
 import '../../../utils/date_time_utils.dart';
@@ -21,7 +25,8 @@ class StockSampleStorePage extends StatefulWidget {
   State<StockSampleStorePage> createState() => _StockSampleStorePageState();
 }
 
-class _StockSampleStorePageState extends BaseLifecycleState<StockSampleStorePage> with AutomaticKeepAliveClientMixin {
+class _StockSampleStorePageState extends BaseLifecycleState<StockSampleStorePage>
+    with AutomaticKeepAliveClientMixin {
   SampleTaskItemKcjcRsp? data;
   late bool isDetail;
 
@@ -33,6 +38,7 @@ class _StockSampleStorePageState extends BaseLifecycleState<StockSampleStorePage
 
   final chfsqkList = <CardMenuData>[].notifier<List<CardMenuData>>();
   final chfsqk = null.notifier<CardMenuData?>();
+  late TextEditingController syyjmcCtrl;
 
   void setNumBoolMenuSelNotifier(ValueNotifier<CardMenuData?> notifier, num? value) {
     if (value == null) return;
@@ -56,6 +62,8 @@ class _StockSampleStorePageState extends BaseLifecycleState<StockSampleStorePage
       if (e == data?.chfsqk) chfsqk.value = value;
       return value;
     }).toList();
+
+    syyjmcCtrl = TextEditingController(text: data?.syyjmc);
   }
 
   @override
@@ -67,39 +75,117 @@ class _StockSampleStorePageState extends BaseLifecycleState<StockSampleStorePage
   Widget buildList() {
     return Column(
       children: [
-        CardWidgets.buildMenu(isDetail, '是否施药', sfList, sfsy, (_, sel) => data?.sfsy = sel.value),
-        CardWidgets.buildDate(
-          isDetail,
-          '最近施药时间',
-          zjsysj,
-          onResult: (value) => data?.zjsysj = DateTimeUtils.yyyymmdd(date: value),
-        ),
-        CardWidgets.buildEdit(
-          isDetail,
-          '使用药剂名称',
-          data?.syyjmc,
-          onChanged: (value) => data?.syyjmc = value,
-        ),
-        CardWidgets.buildMenu(isDetail, '虫害发生情况', chfsqkList, chfsqk, (_, sel) => data?.chfsqk = sel.value),
-        CardWidgets.buildEdit(
-          isDetail,
-          '扦样时上层粮温（℃）',
-          data?.qyssclw?.toString(),
-          inputType: const TextInputType.numberWithOptions(decimal: true),
-          formatters: [XNumberTextInputFormatter()],
-          onChanged: (value) => data?.qyssclw = value.isEmpty ? null : num.parse(value),
-        ),
-        CardWidgets.buildEdit(
-          isDetail,
-          '储粮技术设施',
-          data?.cljsss,
-          onChanged: (value) => data?.cljsss = value,
+        Container(
+          clipBehavior: Clip.hardEdge,
+          decoration: const BoxDecoration(
+            borderRadius: BorderRadius.all(Radius.circular(8)),
+          ),
+          child: Column(
+            children: [
+              CardWidgets.buildMenu(isDetail, '是否施药', sfList, sfsy, (_, sel) {
+                data?.sfsy = sel.value;
+                if (sel.value == 1) {
+                  zjsysj.value = null;
+                  data?.zjsysj = null;
+                  syyjmcCtrl.text = '';
+                  data?.syyjmc = null;
+                }
+              }),
+              sfsy.builder((v) => CardWidgets.buildDate(
+                    isDetail,
+                    '最近施药时间',
+                    zjsysj,
+                    warmString: data?.sfsy == 1 ? '请选择是否施药' : null,
+                    onResult: (value) => data?.zjsysj = DateTimeUtils.yyyymmdd(date: value),
+                  )),
+              CardWidgets.buildEdit(
+                isDetail,
+                '使用药剂名称',
+                data?.syyjmc,
+                ctrl: syyjmcCtrl,
+                leftRatio: 2,
+                rightRatio: 3,
+                onChanged: (value) {
+                  if (data?.sfsy == 1) {
+                    syyjmcCtrl.text = '';
+                    MyNavigator.showToast('请选择是否施药');
+                    return;
+                  }
+                  data?.syyjmc = value;
+                },
+              ),
+              CardWidgets.buildEdit(
+                isDetail,
+                '储粮技术设施',
+                leftRatio: 2,
+                rightRatio: 3,
+                data?.cljsss,
+                onChanged: (value) => data?.cljsss = value,
+              ),
+              CardWidgets.buildMenu(
+                isDetail,
+                '虫害发生情况',
+                leftRatio: 2,
+                rightRatio: 3,
+                chfsqkList,
+                chfsqk,
+                (_, sel) => data?.chfsqk = sel.value,
+              ),
+              CardWidgets.buildEdit(
+                isDetail,
+                '扦样时上层粮温（℃）',
+                leftRatio: 2,
+                data?.qyssclw?.toString(),
+                inputType: const TextInputType.numberWithOptions(decimal: true),
+                formatters: [XNumberTextInputFormatter()],
+                onChanged: (value) => data?.qyssclw = value.isEmpty ? null : num.parse(value),
+              ),
+              CardWidgets.buildEdit(
+                isDetail,
+                '备注',
+                rightRatio: 5,
+                data?.bz,
+                onChanged: (value) => data?.bz = value,
+              ),
+            ],
+          ),
         ),
-        CardWidgets.buildEdit(
-          isDetail,
-          '备注',
-          data?.bz,
-          onChanged: (value) => data?.bz = value,
+        const SizedBox(height: 12),
+        Container(
+          clipBehavior: Clip.hardEdge,
+          decoration: const BoxDecoration(
+            borderRadius: BorderRadius.all(Radius.circular(8)),
+          ),
+          child: Column(
+            children: [
+              PhotoCardItem(
+                title: '仓房照片',
+                isDetail: isDetail,
+                imgUrl: null,
+                filePathCallBack: (path) {
+                  final File imageFile = File(path);
+                  logger.d(imageFile);
+                },
+              ),
+              PhotoCardItem(
+                title: '样品照片',
+                isDetail: isDetail,
+              //  imgUrl: null,
+                filePathCallBack: (path) {
+
+                },
+              ),
+              PhotoCardItem(
+                title: '现场照片',
+                isDetail: isDetail,
+                imgUrl: 'http://121.36.17.6:19000/quality/app/zsys.png',
+                filePathCallBack: (path) {
+
+                },
+              ),
+
+            ],
+          ),
         ),
       ],
     );

lib/page/sample_task/stock_sample_detail/stock_sample_task_page.dart

@@ -3,6 +3,7 @@ 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 'package:lszlgl/model/rsp/storehouse_rsp.dart';
 
 import '../../../base/base_vm.dart';
 import '../../../main.dart';
@@ -116,6 +117,71 @@ class _StockSampleTaskPageState extends BaseLifecycleState<StockSampleTaskPage>
     ];
   }
 
+  void showBackDialog() {
+    showDialog<void>(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          titlePadding: const EdgeInsets.fromLTRB(8, 26, 8, 4),
+          actionsPadding:const EdgeInsets.symmetric(horizontal: 8.0,vertical: 4),
+          title: const Text('退出当前界面？',textAlign: TextAlign.center,),
+          actionsAlignment: MainAxisAlignment.spaceAround,
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(12.0),
+          ),
+          actions: <Widget>[
+            TextButton(
+              child: const Text('取消',style: TextStyle(color: Colors.grey),),
+              onPressed: () {
+                Navigator.pop(context);
+              },
+            ),
+            TextButton(
+              child: const Text('退出',style: TextStyle(color: MyColor.c_28A3ED,fontWeight: FontWeight.bold),),
+              onPressed: () {
+                Navigator.pop(context);
+                Navigator.pop(context);
+              },
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  Widget buildScan() {
+    return GestureDetector(
+      onTap: () async{
+        String? code = await MyRouter.startQrCodeScan(isKC: true);
+        if(code ==null){
+          MyNavigator.showToast('二维码错误');
+          return;
+        }
+        getScanData(code);
+      },
+      behavior: HitTestBehavior.opaque,
+      child: Container(
+        padding: const EdgeInsets.symmetric(horizontal: 16),
+        alignment: Alignment.center,
+        child: Image.asset(imgHomeScan, height: 24,width: 24),
+      ),
+    );
+  }
+
+  void getScanData(String code) async{
+    MyNavigator.showLoading(msg: '加载中');
+    var res = await MyApi.get(baseUrl: 'http://121.36.17.6:28088').getStoreMessage(code, 'zhijian');
+    MyNavigator.dismissLoading();
+    if (res.data?.first.tycfbm == null) {
+      MyNavigator.showToast('仓房信息错误');
+      return;
+    } else {
+      storehouseRsp? codeData = res.data!.first;
+      logger.d(codeData);
+
+    }
+  }
+
   @override
   void initState() {
     super.initState();
@@ -137,21 +203,33 @@ class _StockSampleTaskPageState extends BaseLifecycleState<StockSampleTaskPage>
 
   @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(),
-              };
-            }),
-          ],
+    return PopScope(
+      canPop: args.detail,
+      onPopInvoked: (bool didPop){
+        if(didPop){
+          return;
+        }
+        showBackDialog();
+      },
+      child: myScaffold(
+        child: KeyboardDismissOnTap(
+          dismissOnCapturedTaps: true,
+          child: Column(
+            children: [
+              myAppBar(
+                  title: args.detail ? '扦样完成详情' : '扦样任务单',
+                  actions: args.detail ? [] : [buildScan()]
+              ),
+              pageStatus.builder((v) {
+                return switch (v.status) {
+                  DataStatus.loading => const PageLoadingWidget.loading(),
+                  DataStatus.error => PageLoadingWidget.error(onTap: getDetailData),
+                  DataStatus.success => buildBody(),
+                  _ => const PageLoadingWidget.empty(),
+                };
+              }),
+            ],
+          ),
         ),
       ),
     );
@@ -159,19 +237,13 @@ class _StockSampleTaskPageState extends BaseLifecycleState<StockSampleTaskPage>
 
   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(),
-          ],
-        ),
+      child: Column(
+        children: [
+          buildTab(),
+          const SizedBox(height: 12),
+          Expanded(child: buildPage()),
+          buildButton(),
+        ],
       ),
     );
   }
@@ -181,9 +253,11 @@ class _StockSampleTaskPageState extends BaseLifecycleState<StockSampleTaskPage>
       valueListenable: tabIndex,
       builder: (_, value, __) {
         return Container(
-          height: 40,
-          color: Colors.white,
-          padding: const EdgeInsets.symmetric(horizontal: 4),
+          margin: const EdgeInsets.symmetric(horizontal: 8),
+          decoration: const BoxDecoration(
+            color: Colors.white,
+            borderRadius: BorderRadius.all(Radius.circular(8)),
+          ),
           child: Row(
             children: List.generate(
               tabTextList.length,
@@ -201,25 +275,30 @@ class _StockSampleTaskPageState extends BaseLifecycleState<StockSampleTaskPage>
       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,
-          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,
+        child: Stack(
+          clipBehavior: Clip.none,
+          alignment: AlignmentDirectional.bottomCenter,
+          children: [
+            Container(
+              alignment: Alignment.center,
+              height: 30,
+              child: FittedBox(
+                fit: BoxFit.scaleDown,
+                child: Text(
+                  tabTextList[index],
+                  style: TextStyle(
+                    fontSize: select ? 14 : 12,
+                    color: select ? MyColor.c_333333 : MyColor.c_666666,
+                    fontWeight: select ? FontWeight.w700 : FontWeight.w400,
+                  ),
                 ),
               ),
-            ],
-          ),
+            ),
+            buildTabLine(select),
+          ],
         ),
       ),
     );
@@ -228,17 +307,8 @@ class _StockSampleTaskPageState extends BaseLifecycleState<StockSampleTaskPage>
   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)],
-          ),
-        ),
-      ),
+      top: 27,
+      child: Image.asset(indicatordot, width: 20),
     );
   }
 
@@ -251,7 +321,15 @@ class _StockSampleTaskPageState extends BaseLifecycleState<StockSampleTaskPage>
         tabIndex.value = index;
       },
       itemCount: pageList.length,
-      itemBuilder: (_, index) => pageList[index],
+      itemBuilder: (_, index) {
+        return Container(
+            margin: const EdgeInsets.symmetric(horizontal: 8),
+            clipBehavior: Clip.hardEdge,
+            decoration: const BoxDecoration(
+              borderRadius: BorderRadius.vertical(top: Radius.circular(8)),
+            ),
+            child: pageList[index]);
+      },
     );
   }
 

lib/page/sample_task/stock_sample_detail/stock_sample_variety_page.dart

@@ -1,4 +1,7 @@
+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';
@@ -25,6 +28,13 @@ class _StockSampleVarietyPageState extends BaseLifecycleState<StockSampleVariety
   late bool isDetail;
 
   final qysj = null.notifier<String?>();
+  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;
@@ -35,6 +45,26 @@ class _StockSampleVarietyPageState extends BaseLifecycleState<StockSampleVariety
     isDetail = widget.detail;
 
     qysj.value = data?.qysj;
+    // 入库时间
+    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
@@ -46,9 +76,8 @@ class _StockSampleVarietyPageState extends BaseLifecycleState<StockSampleVariety
   Widget buildList() {
     return Column(
       children: [
-        CardItemWidget('采样品种', rightText: data?.cypzName, bottomLine: true),
-        CardItemWidget('样品编号', rightText: data?.ypbh, bottomLine: true),
-        CardItemWidget('库存性质', rightText: data?.lsxz, bottomLine: true),
+        CardItemWidget('采样品种', rightText: data?.cypzName, bottomLine: true,rightRatio: 2,),
+        CardItemWidget('粮食性质', rightText: data?.lsxz, bottomLine: true,rightRatio: 2,),
         CardWidgets.buildEdit(
           isDetail,
           '代表数量（吨）',
@@ -57,7 +86,6 @@ class _StockSampleVarietyPageState extends BaseLifecycleState<StockSampleVariety
           formatters: [XNumberTextInputFormatter()],
           onChanged: (value) => data?.dbsl = value.isEmpty ? null : num.parse(value),
         ),
-        CardItemWidget('所在货位粮食总数(吨)', rightText: data?.szhwlszs, bottomLine: true),
         CardWidgets.buildEdit(
           isDetail,
           '收获年度',
@@ -70,6 +98,40 @@ class _StockSampleVarietyPageState extends BaseLifecycleState<StockSampleVariety
           qysj,
           onResult: (value) => data?.qysj = DateTimeUtils.yyyymmdd(date: value),
         ),
+        CardWidgets.buildDate(
+          isDetail,
+          '入库时间',
+          rksj,
+          onResult: (value) => data?.rksj = DateTimeUtils.yyyymmdd(date: value),
+        ),
+        CardWidgets.buildMenu(isDetail, '入库等级', rkdjList, rkdj, (_, sel) => data?.rkdj = sel.value),
+        CardWidgets.buildMenu(isDetail, '产地/进口国', leftRatio: 2,rightRatio: 3,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),
+        ),
+
+        CardItemWidget('分区布点图', bottomLine: true,
+          rightChild: const Icon(Icons.keyboard_arrow_right,size: 24, color: Color(0xFF01B2C8)),
+          onTap: (){
+
+          },
+        ),
+
+        CardItemWidget('分层取样示意图', bottomLine: true,
+          rightChild: const Icon(Icons.keyboard_arrow_right,size: 24, color: Color(0xFF01B2C8)),
+          onTap: (){
+
+          },
+        ),
+
+
+        //  CardItemWidget('样品编号', rightText: data?.ypbh, bottomLine: true),
+
       ],
     );
   }

lib/router/my_router.dart

@@ -58,7 +58,7 @@ final Map<String, MyNavigatorBuilder> rRouteMap = {
   rSignaturePage: (context, args) => SignaturePage(args: args as SignaturePageArgs),
   rPrintPage: (context, args) => PrintPage(args: args as PrintPageArgs),
   rConnectPrintPage: (context, args) => ConnectPrintPage(args: args as ConnectPrintPageArgs),
-  rQrCodeScanPage: (context, args) => const QrCodeScanPage(),
+  rQrCodeScanPage: (context, args) => QrCodeScanPage(isKC: args as bool),
   rForgetPasswordPage:(context,args) => const ForgetPasswordPage(),
   rStoreHousePage:(context,args) => StoreHousePage(houseNum: args as String),
 };
@@ -145,7 +145,7 @@ class MyRouter {
   }
 
   /// 扫一扫
-  static Future<dynamic> startQrCodeScan() {
-    return MyNavigator.push(rQrCodeScanPage);
+  static Future<dynamic> startQrCodeScan({bool? isKC = false}) {
+    return MyNavigator.push(rQrCodeScanPage, args: isKC);
   }
 }

lib/widget/card_item.dart

@@ -372,6 +372,7 @@ class CardWidgets {
     String? Function(DateTime?)? onResult,
     DateTime? firstDate,
     DateTime? lastDate,
+        String? warmString, // 警告语，日期不可选择时 禁止点击并提示
   }) {
     return notifier.builder((v) {
       if (isDetail) {
@@ -389,6 +390,11 @@ class CardWidgets {
             : const SizedBox.shrink(),
         bottomLine: true,
         onTap: () async {
+          if(warmString != null){
+            MyNavigator.showToast(warmString);
+            return ;
+          }
+
           var date = await showDatePicker(
             context: MyNavigator.navigator.currentState!.context,
             firstDate: firstDate ?? DateTime(2020),

lib/widget/gallery_photo_view_wrapper.dart

@@ -0,0 +1,101 @@
+import 'dart:io';
+
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:flutter/material.dart';
+import 'package:image_picker/image_picker.dart';
+import 'package:photo_view/photo_view.dart';
+import 'package:photo_view/photo_view_gallery.dart';
+
+class GalleryPhotoViewWrapper extends StatefulWidget {
+  final int initialIndex;
+  final PageController pageController;
+  /// 相册照片
+  final List<XFile>? galleryItems;
+  /// 网络图片
+  final List<String>? netImgList;
+
+  GalleryPhotoViewWrapper({
+    super.key,
+    this.initialIndex = 0,
+    this.galleryItems, this.netImgList,
+  }) : pageController = PageController(initialPage: initialIndex);
+
+  @override
+  State<GalleryPhotoViewWrapper> createState() => _GalleryPhotoViewWrapperState();
+}
+
+class _GalleryPhotoViewWrapperState extends State<GalleryPhotoViewWrapper> {
+  late ValueNotifier<int> indexVal = ValueNotifier(widget.initialIndex);
+
+  PhotoViewGalleryPageOptions _buildItem(BuildContext context, int index) {
+    return (widget.galleryItems ?? [] ).isNotEmpty
+        ? PhotoViewGalleryPageOptions(
+      imageProvider: FileImage(File(widget.galleryItems![index].path)) ,
+      initialScale: PhotoViewComputedScale.contained,
+      minScale: PhotoViewComputedScale.contained * (0.5 + index / 10),
+      maxScale: PhotoViewComputedScale.covered * 4.1,
+    )
+        : PhotoViewGalleryPageOptions(
+      imageProvider: CachedNetworkImageProvider(widget.netImgList![index]) ,
+      initialScale: PhotoViewComputedScale.contained,
+      minScale: PhotoViewComputedScale.contained * (0.5 + index / 10),
+      maxScale: PhotoViewComputedScale.covered * 4.1,
+    );
+
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        decoration: const BoxDecoration(
+          color: Colors.black,
+        ),
+        constraints: BoxConstraints.expand(
+          height: MediaQuery.of(context).size.height,
+        ),
+        child: Stack(
+          alignment: Alignment.bottomCenter,
+          children: [
+            PhotoViewGallery.builder(
+              scrollPhysics: const BouncingScrollPhysics(),
+              builder: _buildItem,
+              itemCount:  widget.galleryItems?.length ?? widget.netImgList?.length,
+              pageController: widget.pageController,
+              onPageChanged: (index) {
+                indexVal.value = index;
+              },
+            ),
+            Padding(
+              padding: const EdgeInsets.only(bottom: 12),
+              child: ValueListenableBuilder(
+                  valueListenable: indexVal,
+                  builder: (context, index, child) {
+                    return Text(
+                      "${index + 1}/${widget.galleryItems?.length ?? widget.netImgList?.length}",
+                      style: const TextStyle(
+                        color: Colors.white,
+                        fontSize: 18.0,
+                      ),
+                    );
+                  }),
+            ),
+            Positioned(
+              top: 28,
+              left: 8,
+              child: IconButton(
+                  onPressed: () {
+                    Navigator.pop(context);
+                  },
+                  icon: const Icon(
+                    Icons.arrow_circle_left,
+                    color: Colors.white,
+                    size: 38,
+                  )),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/widget/photo_card_item.dart

@@ -0,0 +1,167 @@
+import 'dart:io';
+import 'dart:typed_data';
+
+import 'package:flutter/material.dart';
+import 'package:image_gallery_saver/image_gallery_saver.dart';
+import 'package:image_picker/image_picker.dart';
+import 'package:lszlgl/base/base_lifecycle_state.dart';
+import 'package:lszlgl/utils/permission_utils.dart';
+import 'package:lszlgl/widget/card_item.dart';
+import 'package:lszlgl/widget/gallery_photo_view_wrapper.dart';
+import 'package:permission_handler/permission_handler.dart';
+
+class PhotoCardItem extends StatefulWidget {
+  final String title;
+  final String? imgUrl;
+  final bool isDetail;
+  final Function(String filePath) filePathCallBack;
+  const PhotoCardItem({super.key, required this.title, required this.isDetail, this.imgUrl, required this.filePathCallBack});
+
+  @override
+  State<PhotoCardItem> createState() => _PhotoCardItemState();
+}
+
+class _PhotoCardItemState extends State<PhotoCardItem> {
+  final ImagePicker _picker = ImagePicker();
+  XFile? photoPic;
+
+  // 弹窗选择 照片或拍照
+  void showBotSheet() {
+    showModalBottomSheet(
+      context: context,
+      shape: const RoundedRectangleBorder(
+          borderRadius:
+              BorderRadius.only(topLeft: Radius.circular(14), topRight: Radius.circular(14))),
+      builder: (context) {
+        return Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            const SizedBox(height: 8),
+            TextButton(
+                child: const Text('相册'),
+                onPressed: () {
+                  Navigator.pop(context);
+                  pickImage(false);
+                }),
+            TextButton(
+                child: const Text('拍照'),
+                onPressed: () async {
+                  Navigator.pop(context);
+                  bool res = await PermissionHandler.handleWith(Permission.storage);
+                  if (res) {
+                    pickImage(true);
+                  }
+                }),
+            const SizedBox(height: 8),
+            const Divider(color: Color(0xFFF3F3F3), height: 0, thickness: 1),
+            TextButton(
+                child: const Text('取消', style: TextStyle(color: Colors.grey)),
+                onPressed: () {
+                  Navigator.pop(context);
+                }),
+            const SizedBox(height: 4),
+          ],
+        );
+      },
+    );
+  }
+
+  /// 保存照片到本地
+  void savePicture(String? path) async {
+    if (path == null) return;
+    final File imageFile = File(path);
+    final Uint8List imageBytes = await imageFile.readAsBytes();
+    await ImageGallerySaver.saveImage(imageBytes);
+  }
+
+  /// 选择照片或拍照
+  void pickImage(bool isCamera) async {
+    try {
+      XFile? photo = await _picker.pickImage(
+        source: isCamera ? ImageSource.camera : ImageSource.gallery,
+        imageQuality: 25,
+      );
+      if (photo == null) return;
+
+      if (isCamera) {
+        savePicture(photo.path); // 保存到本地
+      }
+
+      setState(() {
+        photoPic = photo;
+      });
+      widget.filePathCallBack.call(photo.path);
+
+    } catch (e) {
+      MyNavigator.showToast('$e');
+    }
+  }
+
+  void showBigImage({XFile? file}) {
+    FocusManager.instance.primaryFocus?.unfocus();
+    Navigator.push(
+      context,
+      MaterialPageRoute(
+        builder: (context) {
+          return file != null
+              ? GalleryPhotoViewWrapper(
+                  galleryItems: [file],
+                )
+              : GalleryPhotoViewWrapper(
+                  netImgList: [widget.imgUrl!],
+                );
+        },
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Stack(
+      alignment: Alignment.centerLeft,
+      children: [
+        CardItemWidget(
+          widget.title,
+          bottomLine: true,
+          // rightText: widget.isDetail ? '点击查看' : '点击上传',
+          rightChild: widget.isDetail || photoPic == null
+              ? const SizedBox.shrink()
+              : GestureDetector(
+                  child: Image.file(
+                    File(photoPic!.path),
+                    width: 44,
+                    height: 44,
+                    fit: BoxFit.cover,
+                  ),
+                  onTap: () => showBigImage(file: photoPic!),
+                ),
+          trailing: GestureDetector(
+            child: Text(
+              widget.isDetail
+                  ? '点击查看'
+                  : photoPic == null
+                      ? '点击选择'
+                      : '重新选择',
+              style: const TextStyle(fontSize: 14, color: Color(0xFF01B2C8)),
+            ),
+            onTap: () {
+              if (widget.isDetail) {
+                // 详情 查看照片
+                if (widget.imgUrl == null) {
+                  MyNavigator.showToast('地址错误');
+                  return;
+                }
+                showBigImage();
+              } else {
+                showBotSheet(); // 编辑-选择照片
+              }
+            },
+          ),
+          onTap: () {},
+        ),
+        Container(width: 4, height: 4, color: const Color(0xFF01B2C8))
+      ],
+    );
+  }
+}

pubspec.yaml

@@ -99,7 +99,12 @@ dependencies:
   jpush_flutter: 3.0.3
   # 虚线边框
   dotted_border: ^2.1.0
+  # 短信框
   pin_code_fields: ^8.0.1
+  # 照片选择
+  image_picker: ^1.1.2
+  # 照片展示
+  photo_view: ^0.15.0
 
 dev_dependencies:
   flutter_test: