增加筛选：采样品种、扦样地区

lib/base/base_state.dart

@@ -21,12 +21,14 @@ abstract class BaseState<T extends StatefulWidget> extends State<T> {
     bool autoLeading = true,
     PreferredSizeWidget? bottom,
     double? toolbarHeight,
+    List<Widget>? actions,
   }) {
     return AppBar(
       title: Text(title),
       bottom: bottom,
       automaticallyImplyLeading: autoLeading,
       toolbarHeight: toolbarHeight,
+      actions: actions,
     );
   }
 

lib/model/req/sample_task_list_req.dart

@@ -16,11 +16,19 @@ class SampleTaskListReq {
   /// 环节类型：1收获环节,2库存环节
   int? rwlx;
 
+  /// 采样品种ID集合
+  List<int>? pzIdList;
+
+  /// 行政区划
+  String? xzqh;
+
   SampleTaskListReq({
     this.pageNo = 1,
     this.pageSize = 10,
     this.deliveryStatus,
     this.rwlx,
+    this.pzIdList,
+    this.xzqh,
   });
 
   factory SampleTaskListReq.fromJson(Map<String, dynamic> json) => _$SampleTaskListReqFromJson(json);

lib/model/req/sample_task_list_req.g.dart

@@ -12,6 +12,9 @@ SampleTaskListReq _$SampleTaskListReqFromJson(Map<String, dynamic> json) =>
       pageSize: json['pageSize'] as int? ?? 10,
       deliveryStatus: json['deliveryStatus'] as int?,
       rwlx: json['rwlx'] as int?,
+      pzIdList:
+          (json['pzIdList'] as List<dynamic>?)?.map((e) => e as int).toList(),
+      xzqh: json['xzqh'] as String?,
     );
 
 Map<String, dynamic> _$SampleTaskListReqToJson(SampleTaskListReq instance) =>
@@ -20,4 +23,6 @@ Map<String, dynamic> _$SampleTaskListReqToJson(SampleTaskListReq instance) =>
       'pageSize': instance.pageSize,
       'deliveryStatus': instance.deliveryStatus,
       'rwlx': instance.rwlx,
+      'pzIdList': instance.pzIdList,
+      'xzqh': instance.xzqh,
     };

lib/network/api.dart

@@ -82,5 +82,5 @@ abstract class Api {
 
   /// 上传图片
   @POST('/admin-api/infra/file/upload')
-  Future<void> upload(@Part(name: 'path', contentType: 'image/png') File path);
+  Future<void> upload(@Part(name: 'path') File path);
 }

lib/page/filter/filter_page.dart

@@ -0,0 +1,163 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter/widgets.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/service/dict_service.dart';
+import 'package:lszlgl/widget/button.dart';
+import 'package:lszlgl/widget/card_item.dart';
+
+import '../../config/colors.dart';
+import '../../utils/inject.dart';
+import '../sample_task/sample_list_vm.dart';
+
+class FilterPage extends StatefulWidget {
+  const FilterPage({super.key});
+
+  @override
+  State<FilterPage> createState() => _FilterPageState();
+}
+
+class _FilterPageState extends BaseState<FilterPage> {
+  late SampleListVM vm;
+
+  /// 采样品种
+  List<CardMenuData> cypzList = [];
+  final cypzNames = null.notifier<String?>();
+  List<CardMenuData> selectCypzList = [];
+
+  /// 扦样地区
+  String? xzqh;
+
+  void getCypzList() {
+    cypzList = (DictService.getDictList(DictType.cypz) ?? []).map((e) => CardMenuData(e.label, e.value)).toList();
+    if ((vm.reqList.first.pzIdList ?? []).isNotEmpty) {
+      for (var id in vm.reqList.first.pzIdList!) {
+        for (var menu in cypzList) {
+          if (int.parse(menu.value) == id) {
+            menu.select = true;
+            selectCypzList.add(menu);
+            break;
+          }
+        }
+      }
+    }
+    cypzSelCallback(selectCypzList);
+  }
+
+  void cypzSelCallback(List<CardMenuData> selectList) async {
+    selectCypzList = selectList;
+    if (selectList.isEmpty) {
+      cypzNames.value = null;
+      return;
+    }
+    var names = StringBuffer();
+    var ids = StringBuffer();
+    for (int i = 0; i < selectList.length; i++) {
+      var item = selectList[i];
+      names.write(item.name);
+      ids.write(item.value);
+      if (i < selectList.length - 1) {
+        names.write(',');
+        ids.write(',');
+      }
+    }
+    cypzNames.value = names.toString();
+  }
+
+  void onReset() {
+    for (var req in vm.reqList) {
+      req.pzIdList = null;
+      req.xzqh = null;
+    }
+    vm.refreshAll();
+    MyNavigator.pop();
+  }
+
+  void onConfirm() {
+    for (var req in vm.reqList) {
+      req.pzIdList = selectCypzList.map((e) => int.parse(e.value)).toList();
+      req.xzqh = xzqh;
+    }
+    vm.refreshAll();
+    MyNavigator.pop();
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    vm = Inject.get<SampleListVM>()!;
+
+    // 采样品种
+    getCypzList();
+    xzqh = vm.reqList.first.xzqh;
+  }
+
+  @override
+  void dispose() {
+    cypzNames.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: MediaQuery.of(context).viewInsets,
+      child: KeyboardDismissOnTap(
+        dismissOnCapturedTaps: true,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            buildTitle(),
+            cypzNames.builder(
+              (v) => CardWidgets.buildMenuDialog(
+                false,
+                '采样品种',
+                v,
+                cypzList,
+                cypzSelCallback,
+                multiple: true,
+                showTopLine: true,
+                hint: '请选择',
+              ),
+            ),
+            CardWidgets.buildEdit(
+              false,
+              '扦样地区',
+              xzqh,
+              onChanged: (value) => xzqh = value,
+              hint: '请输入（模糊查询）',
+            ),
+            Padding(
+              padding: const EdgeInsets.only(top: 64, bottom: 48, left: 16, right: 16),
+              child: Row(
+                children: [
+                  Expanded(child: MyButton('重置', onTap: onReset)),
+                  const SizedBox(width: 16),
+                  Expanded(child: MyButton('确定', onTap: onConfirm)),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget buildTitle() {
+    return Container(
+      alignment: Alignment.topLeft,
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 16),
+      child: const Text(
+        '数据筛选',
+        style: TextStyle(
+          color: MyColor.c_333333,
+          fontSize: 16,
+          fontWeight: FontWeight.w500,
+        ),
+      ),
+    );
+  }
+}

lib/page/sample_task/reap_sample_detail/reap_sample_basic_detail_page.dart

@@ -324,7 +324,16 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
       children: [
         CardItemWidget('样品单号', rightText: data?.qyrwdh, bottomLine: true),
         name.builder(
-            (v) => CardWidgets.buildMenuDialog(isDetail, '扦样/陪同人员', v, personList, personSelCallback, multiple: true)),
+          (v) => CardWidgets.buildMenuDialog(
+            isDetail,
+            '扦样/陪同人员',
+            v,
+            personList,
+            personSelCallback,
+            multiple: true,
+            selectCountMax: 3,
+          ),
+        ),
         sheng.builder((v) => CardItemWidget('省份', rightText: v?.name, bottomLine: true)),
         shi.builder((v) => CardItemWidget('市/州', rightText: v?.name, bottomLine: true)),
         qu.builder((v) => CardItemWidget('区县', rightText: v?.name, bottomLine: true)),

lib/page/sample_task/sample_task_list_page.dart

@@ -154,7 +154,7 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
         buildVLine(),
         const Expanded(
           child: Text(
-            '扦样任务单号',
+            '样品单号',
             style: TextStyle(color: MyColor.c_333333, fontSize: 14, fontWeight: FontWeight.w500),
           ),
         ),

lib/page/sample_task/sample_task_list_tab_page.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
 import 'package:lszlgl/config/colors.dart';
@@ -5,6 +6,8 @@ import 'package:lszlgl/page/sample_task/sample_list_vm.dart';
 import 'package:lszlgl/page/sample_task/sample_task_list_page.dart';
 import 'package:lszlgl/utils/inject.dart';
 
+import '../filter/filter_page.dart';
+
 enum StepType {
   reap('收获环节', 1),
   stock('库存环节', 2);
@@ -49,6 +52,15 @@ class _SampleTaskListTabPageState extends BaseLifecycleState<SampleTaskListTabPa
 
   late SampleListVM vm;
 
+  void showFilter() {
+    showModalBottomSheet(
+      context: context,
+      isScrollControlled: true,
+      showDragHandle: true,
+      builder: (_) => const FilterPage(),
+    );
+  }
+
   @override
   void onInit() {
     vm = Inject.put<SampleListVM>(SampleListVM(), dispose: (v) => v.dispose());
@@ -90,7 +102,10 @@ class _SampleTaskListTabPageState extends BaseLifecycleState<SampleTaskListTabPa
   Widget buildBody() {
     return Column(
       children: [
-        myAppBar(title: widget.args.type.title),
+        myAppBar(
+          title: widget.args.type.title,
+          actions: [buildFilter()],
+        ),
         buildTab(),
         const SizedBox(height: 12),
         Expanded(child: buildPage()),
@@ -98,6 +113,18 @@ class _SampleTaskListTabPageState extends BaseLifecycleState<SampleTaskListTabPa
     );
   }
 
+  Widget buildFilter() {
+    return GestureDetector(
+      onTap: showFilter,
+      behavior: HitTestBehavior.opaque,
+      child: Container(
+        padding: const EdgeInsets.symmetric(horizontal: 16),
+        alignment: Alignment.center,
+        child: const Text('筛选', style: TextStyle(fontSize: 12, color: Colors.white)),
+      ),
+    );
+  }
+
   Widget buildTab() {
     return Container(
       clipBehavior: Clip.hardEdge,

lib/service/dict_service.dart

@@ -24,7 +24,9 @@ enum DictType {
   // 真菌毒素污染类型
   zjdswrlx('zjdswrlx'),
   // 重金属污染类型
-  zjswrlx('zjswrlx');
+  zjswrlx('zjswrlx'),
+  // 采样品种
+  cypz('cypz');
 
   const DictType(this.type);
 

lib/widget/card_item.dart

@@ -129,6 +129,7 @@ class CardItemWidget extends StatelessWidget {
   }
 }
 
+//ignore: must_be_immutable
 class CardItemMenuWidget extends StatelessWidget {
   /// 标题文本
   final String title;
@@ -293,6 +294,7 @@ class CardWidgets {
     List<TextInputFormatter>? formatters,
     Color? backgroundColor = Colors.white,
     bool bottomLine = true,
+    TextEditingController? ctrl,
   }) {
     if (isDetail) {
       return CardItemWidget(
@@ -304,8 +306,9 @@ class CardWidgets {
     }
     return CardItemWidget(
       title,
-      rightChild: TextField(
-        controller: TextEditingController(text: value),
+      rightChild: TextFormField(
+        controller: ctrl,
+        initialValue: value,
         keyboardType: inputType,
         textAlign: TextAlign.right,
         decoration: InputDecoration(
@@ -371,11 +374,15 @@ class CardWidgets {
     bool multiple = false,
     String? hint,
     Widget? trailing,
+    int? selectCountMax,
+    bool bottomLine = true,
+    bool showTopLine = false,
   }) {
     return CardItemWidget(
       title,
       rightText: value,
-      bottomLine: true,
+      bottomLine: bottomLine,
+      showTopLine: showTopLine,
       hint: hint,
       trailing: isDetail || value != null
           ? null
@@ -392,7 +399,7 @@ class CardWidgets {
                 list,
                 title: title,
                 multiple: multiple,
-                selectCountMax: 3,
+                selectCountMax: selectCountMax,
               );
               if (selectList == null) return;
               onSelectTap?.call(selectList);