chore: release client-v1.0.67

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01YZ4DskSRKsSiheQonFtQvx

CHANGELOG-client.md

@@ -5,6 +5,22 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.67] - 2026-06-21
+
+### 改进
+- 选择器改为服务端全量搜索：选供应商/客户时按关键词查全部往来单位（不再只在已加载的首页里找）；出库「选择商品」弹窗的搜索也改为实时查全部库存，输入即按编码/名称/系列匹配，不再漏掉未加载的商品
+
+## [1.0.66] - 2026-06-21
+
+### 改进
+- 入库/出库列表「日期」列改名为「入库时间/出库时间」，移除恒为空的旧「审核时间」列
+- 日期选择改为可直接键入的输入框 + 日历图标：能直接打年份（选老年份方便），支持只填到年或年月（自动补为月初）
+
+## [1.0.65] - 2026-06-21
+
+### 改进
+- 入库录入改为「每行一个独立产品」：每条明细对应一个独立编号，同名同规格录多次也各自独立（配合后端 server-v1.0.69）
+
 ## [1.0.64] - 2026-06-20
 
 ### 新功能

CHANGELOG-server.md

@@ -5,6 +5,11 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.70] - 2026-06-21
+
+### 改进
+- 商品名称/系列/规格选择接口支持关键词搜索（按名称或编码），为客户端选择器的服务端全量搜索提供支撑
+
 ## [1.0.69] - 2026-06-21
 
 ### 改进

backend/internal/handler/product_option.go

@@ -2,6 +2,7 @@ package handler
 
 import (
 	"net/http"
+	"strings"
 
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
@@ -24,7 +25,12 @@ func NewProductOptionHandler(db *gorm.DB) *ProductOptionHandler {
 func (h *ProductOptionHandler) ListNames(c *gin.Context) {
 	shopID := middleware.GetShopID(c)
 	items := make([]model.ProductNameOption, 0)
-	h.db.Where("shop_id = ?", shopID).Order("id ASC").Find(&items)
+	q := h.db.Where("shop_id = ?", shopID)
+	if kw := strings.TrimSpace(c.Query("keyword")); kw != "" {
+		like := "%" + kw + "%"
+		q = q.Where("name LIKE ? OR code LIKE ?", like, like)
+	}
+	q.Order("id ASC").Find(&items)
 	util.RespondSuccess(c, items)
 }
 
@@ -85,7 +91,12 @@ func (h *ProductOptionHandler) DeleteName(c *gin.Context) {
 func (h *ProductOptionHandler) ListSeries(c *gin.Context) {
 	shopID := middleware.GetShopID(c)
 	items := make([]model.ProductSeriesOption, 0)
-	h.db.Where("shop_id = ?", shopID).Order("id ASC").Find(&items)
+	q := h.db.Where("shop_id = ?", shopID)
+	if kw := strings.TrimSpace(c.Query("keyword")); kw != "" {
+		like := "%" + kw + "%"
+		q = q.Where("name LIKE ? OR code LIKE ?", like, like)
+	}
+	q.Order("id ASC").Find(&items)
 	util.RespondSuccess(c, items)
 }
 
@@ -146,7 +157,12 @@ func (h *ProductOptionHandler) DeleteSeries(c *gin.Context) {
 func (h *ProductOptionHandler) ListSpecs(c *gin.Context) {
 	shopID := middleware.GetShopID(c)
 	items := make([]model.ProductSpecOption, 0)
-	h.db.Where("shop_id = ?", shopID).Order("id ASC").Find(&items)
+	q := h.db.Where("shop_id = ?", shopID)
+	if kw := strings.TrimSpace(c.Query("keyword")); kw != "" {
+		like := "%" + kw + "%"
+		q = q.Where("name LIKE ? OR code LIKE ?", like, like)
+	}
+	q.Order("id ASC").Find(&items)
 	util.RespondSuccess(c, items)
 }
 

backend/internal/handler/product_option_test.go

@@ -0,0 +1,86 @@
+package handler
+
+import (
+	"net/http"
+	"testing"
+
+	"github.com/gin-gonic/gin"
+	"github.com/stretchr/testify/assert"
+	"gorm.io/gorm"
+
+	"github.com/wangjia/jiu/backend/internal/middleware"
+	"github.com/wangjia/jiu/backend/internal/model"
+	"github.com/wangjia/jiu/backend/testutil"
+)
+
+// setupOptionRouter 注册 product-options 名称路由（含 JWT）。
+func setupOptionRouter(db *gorm.DB) *gin.Engine {
+	h := NewProductOptionHandler(db)
+	r := gin.New()
+	r.Use(gin.Recovery())
+	api := r.Group("/api/v1")
+	api.Use(middleware.JWT(db))
+	names := api.Group("/product-options/names")
+	names.GET("", h.ListNames)
+	return r
+}
+
+func TestProductOptionHandler_ListNamesKeyword(t *testing.T) {
+	db := testutil.SetupTestDB()
+	shop := testutil.CreateTestShop(db, "OPT001")
+	user := testutil.CreateTestUser(db, shop.ID, "admin", "pass", "admin")
+	token := getAuthToken(user.ID, shop.ID, "admin")
+	r := setupOptionRouter(db)
+
+	db.Create(&model.ProductNameOption{
+		TenantBase: model.TenantBase{ShopID: shop.ID}, Code: "P001", Name: "茅台",
+	})
+	db.Create(&model.ProductNameOption{
+		TenantBase: model.TenantBase{ShopID: shop.ID}, Code: "P002", Name: "五粮液",
+	})
+
+	// 1. 无 keyword → 返回全部
+	w := makeRequest(r, "GET", "/api/v1/product-options/names", token, nil)
+	assert.Equal(t, http.StatusOK, w.Code)
+	data := parseResponse(w)["data"].([]interface{})
+	assert.Len(t, data, 2)
+
+	// 2. keyword 命中名称
+	w = makeRequest(r, "GET", "/api/v1/product-options/names?keyword=五粮", token, nil)
+	assert.Equal(t, http.StatusOK, w.Code)
+	data = parseResponse(w)["data"].([]interface{})
+	assert.Len(t, data, 1)
+	assert.Equal(t, "五粮液", data[0].(map[string]interface{})["name"])
+
+	// 3. keyword 命中编码
+	w = makeRequest(r, "GET", "/api/v1/product-options/names?keyword=P001", token, nil)
+	assert.Equal(t, http.StatusOK, w.Code)
+	data = parseResponse(w)["data"].([]interface{})
+	assert.Len(t, data, 1)
+	assert.Equal(t, "茅台", data[0].(map[string]interface{})["name"])
+
+	// 4. keyword 无命中 → 空
+	w = makeRequest(r, "GET", "/api/v1/product-options/names?keyword=不存在", token, nil)
+	assert.Equal(t, http.StatusOK, w.Code)
+	data = parseResponse(w)["data"].([]interface{})
+	assert.Len(t, data, 0)
+}
+
+func TestProductOptionHandler_ListNamesIsolation(t *testing.T) {
+	db := testutil.SetupTestDB()
+	shopA := testutil.CreateTestShop(db, "OPT_A")
+	userA := testutil.CreateTestUser(db, shopA.ID, "adminA", "pass", "admin")
+	tokenA := getAuthToken(userA.ID, shopA.ID, "admin")
+	shopB := testutil.CreateTestShop(db, "OPT_B")
+	r := setupOptionRouter(db)
+
+	db.Create(&model.ProductNameOption{
+		TenantBase: model.TenantBase{ShopID: shopB.ID}, Name: "他店商品",
+	})
+
+	// A 店即使 keyword 命中 B 店数据也查不到（shop_id 隔离）
+	w := makeRequest(r, "GET", "/api/v1/product-options/names?keyword=他店", tokenA, nil)
+	assert.Equal(t, http.StatusOK, w.Code)
+	data := parseResponse(w)["data"].([]interface{})
+	assert.Len(t, data, 0)
+}

backend/testutil/setup.go

@@ -241,6 +241,37 @@ func SetupTestDB() *gorm.DB {
 			content TEXT,
 			remark TEXT
 		)`,
+		`CREATE TABLE IF NOT EXISTS product_name_options (
+			id INTEGER PRIMARY KEY AUTOINCREMENT,
+			created_at DATETIME,
+			updated_at DATETIME,
+			deleted_at DATETIME,
+			shop_id INTEGER NOT NULL,
+			code TEXT,
+			name TEXT NOT NULL,
+			remark TEXT
+		)`,
+		`CREATE TABLE IF NOT EXISTS product_series_options (
+			id INTEGER PRIMARY KEY AUTOINCREMENT,
+			created_at DATETIME,
+			updated_at DATETIME,
+			deleted_at DATETIME,
+			shop_id INTEGER NOT NULL,
+			code TEXT,
+			name TEXT NOT NULL,
+			remark TEXT
+		)`,
+		`CREATE TABLE IF NOT EXISTS product_spec_options (
+			id INTEGER PRIMARY KEY AUTOINCREMENT,
+			created_at DATETIME,
+			updated_at DATETIME,
+			deleted_at DATETIME,
+			shop_id INTEGER NOT NULL,
+			code TEXT,
+			name TEXT NOT NULL,
+			quantity INTEGER DEFAULT 0,
+			remark TEXT
+		)`,
 		`CREATE TABLE IF NOT EXISTS warehouses (
 			id INTEGER PRIMARY KEY AUTOINCREMENT,
 			created_at DATETIME,

client/lib/screens/stock_in/stock_in_form_screen.dart

@@ -11,7 +11,6 @@ import '../../models/stock_in.dart';
 import '../../core/config/app_constants.dart';
 import '../../providers/partner_provider.dart';
 import '../../providers/product_option_provider.dart';
-import '../../providers/product_provider.dart';
 import '../../providers/inventory_provider.dart';
 import '../../providers/stock_in_provider.dart';
 import '../../providers/warehouse_provider.dart';
@@ -306,58 +305,22 @@ class _StockInFormScreenState extends ConsumerState<StockInFormScreen> {
 
     setState(() => _submitting = true);
 
-    // Resolve product IDs for items where productId is null
+    // 入库每行 = 一个特有产品：明细只带 名称/系列/规格(字典文本) + 批次/生产日期，
+    // 由后端为每行新建独立产品(序列号)，前端不再 findOrCreate 复用。
     final nameOpts = ref.read(productNameListProvider).valueOrNull ?? [];
     final seriesOpts = ref.read(productSeriesListProvider).valueOrNull ?? [];
     final specOpts = ref.read(productSpecListProvider).valueOrNull ?? [];
+    String optName(List<dynamic> opts, int? id) =>
+        opts.where((o) => o.id == id).firstOrNull?.name as String? ?? '';
 
     for (final item in _items) {
-      if (item.productId == null) {
-        final name = nameOpts
-                .where((o) => o.id == item.selectedNameId)
-                .firstOrNull
-                ?.name ??
-            '';
-        final series = seriesOpts
-                .where((o) => o.id == item.selectedSeriesId)
-                .firstOrNull
-                ?.name ??
-            '';
-        final spec = specOpts
-                .where((o) => o.id == item.selectedSpecId)
-                .firstOrNull
-                ?.name ??
-            '';
-        if (name.isEmpty) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            const SnackBar(
-                content: Text('请选择商品名称'), backgroundColor: AppTheme.danger),
-          );
-          setState(() => _submitting = false);
-          return;
-        }
-        try {
-          final product =
-              await ref.read(productRepositoryProvider).findOrCreate(
-                    name: name,
-                    series: series,
-                    spec: spec,
-                    originId: item.selectedOriginId,
-                    shelfLifeId: item.selectedShelfLifeId,
-                    storageId: item.selectedStorageId,
-                    descriptionDocId: item.selectedDescriptionDocId,
-                  );
-          item.productId = product.id;
-        } catch (e) {
-          if (mounted) {
-            ScaffoldMessenger.of(context).showSnackBar(
-              SnackBar(
-                  content: Text('商品查找失败：$e'), backgroundColor: AppTheme.danger),
-            );
-            setState(() => _submitting = false);
-          }
-          return;
-        }
+      if (optName(nameOpts, item.selectedNameId).isEmpty) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(
+              content: Text('请选择商品名称'), backgroundColor: AppTheme.danger),
+        );
+        setState(() => _submitting = false);
+        return;
       }
     }
 
@@ -367,7 +330,9 @@ class _StockInFormScreenState extends ConsumerState<StockInFormScreen> {
       final batchNo = item.batchNoCtrl.text.trim();
       final productionDate = item.productionDateCtrl.text.trim();
       return {
-        'product_id': item.productId ?? 0,
+        'product_name': optName(nameOpts, item.selectedNameId),
+        'series': optName(seriesOpts, item.selectedSeriesId),
+        'spec': optName(specOpts, item.selectedSpecId),
         'quantity': qty,
         'unit_price': price,
         'total_price': qty * price,
@@ -639,6 +604,20 @@ class _StockInFormScreenState extends ConsumerState<StockInFormScreen> {
                                           hint: '请选择供应商',
                                           dialogTitle: '选择供应商',
                                           isRequired: true,
+                                          onSearch: (kw) async {
+                                            final res = await ref
+                                                .read(partnerRepositoryProvider)
+                                                .list(
+                                                    type: 'supplier',
+                                                    keyword: kw,
+                                                    pageSize: 50);
+                                            return res.data
+                                                .map((p) => OptionItem(
+                                                    id: p.id,
+                                                    name: p.name,
+                                                    code: p.code))
+                                                .toList();
+                                          },
                                           onChanged: (v) =>
                                               setState(() => _partnerId = v),
                                         ),

client/lib/screens/stock_in/stock_in_list_screen.dart

@@ -49,8 +49,7 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
     ColDef('warehouse', '仓库'),
     ColDef('amount', '金额', minWidth: 800),
     ColDef('status', '状态'),
-    ColDef('date', '日期', minWidth: 900),
-    ColDef('reviewed_at', '入库时间', minWidth: 900),
+    ColDef('date', '入库时间', minWidth: 900),
     ColDef('operator', '入库员', minWidth: 1100),
     ColDef('reviewer', '审核员', minWidth: 1100),
     ColDef('actions', '操作', required: true),
@@ -270,12 +269,6 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
           return DataCell(StatusBadge(_apiStatusToEnum(o.status)));
         case 'date':
           return DataCell(Text(o.orderDate?.substring(0, 10) ?? '-'));
-        case 'reviewed_at':
-          return DataCell(Text(o.reviewedAt != null
-              ? o.reviewedAt!.length >= 16
-                  ? o.reviewedAt!.substring(0, 16)
-                  : o.reviewedAt!.substring(0, 10)
-              : '-'));
         case 'operator':
           return DataCell(Text(o.operatorName ?? '-',
               style: const TextStyle(fontSize: 13)));
@@ -550,7 +543,7 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
             o.totalAmount != null
                 ? '¥${o.totalAmount!.toStringAsFixed(2)}'
                 : '-'),
-        MobileCardField('日期', o.orderDate?.substring(0, 10) ?? '-'),
+        MobileCardField('入库时间', o.orderDate?.substring(0, 10) ?? '-'),
       ],
       actions: _orderActions(context, o),
     );

client/lib/screens/stock_out/stock_out_form_screen.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -7,6 +9,7 @@ import '../../core/theme/app_theme.dart';
 import '../../core/auth/auth_state.dart';
 import '../../core/utils/print_util.dart';
 import '../../core/utils/date_util.dart';
+import '../../models/inventory.dart';
 import '../../models/stock_out.dart';
 import '../../widgets/date_picker_field.dart';
 import '../../widgets/searchable_option_field.dart';
@@ -39,6 +42,39 @@ class _PickerItem {
   });
 }
 
+/// 把库存行按 product 聚合为选择器条目（同一 product 的多行数量相加）。
+List<_PickerItem> _aggregatePickerItems(List<Inventory> rows) {
+  final Map<int, _PickerItem> map = {};
+  for (final inv in rows.where((inv) => inv.productId != null)) {
+    final pid = inv.productId!;
+    final existing = map[pid];
+    if (existing != null) {
+      map[pid] = _PickerItem(
+        productId: pid,
+        productCode: existing.productCode,
+        productName: existing.productName,
+        series: existing.series,
+        spec: existing.spec,
+        unit: existing.unit,
+        unitPrice: existing.unitPrice ?? inv.unitPrice,
+        availableQty: existing.availableQty + inv.quantity,
+      );
+    } else {
+      map[pid] = _PickerItem(
+        productId: pid,
+        productCode: inv.productCode,
+        productName: inv.productName,
+        series: inv.series,
+        spec: inv.spec,
+        unit: inv.unit,
+        unitPrice: inv.unitPrice,
+        availableQty: inv.quantity,
+      );
+    }
+  }
+  return map.values.toList();
+}
+
 class _ItemRow {
   int? productId;
   final String productCode;
@@ -158,36 +194,8 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
           .listInventory(
               warehouseId: warehouseId,
               pageSize: AppConstants.stockOutPickerPageSize);
-      final Map<int, _PickerItem> productMap = {};
-      for (final inv in result.data.where((inv) => inv.productId != null)) {
-        final pid = inv.productId!;
-        if (productMap.containsKey(pid)) {
-          final existing = productMap[pid]!;
-          productMap[pid] = _PickerItem(
-            productId: pid,
-            productCode: existing.productCode,
-            productName: existing.productName,
-            series: existing.series,
-            spec: existing.spec,
-            unit: existing.unit,
-            unitPrice: existing.unitPrice ?? inv.unitPrice,
-            availableQty: existing.availableQty + inv.quantity,
-          );
-        } else {
-          productMap[pid] = _PickerItem(
-            productId: pid,
-            productCode: inv.productCode,
-            productName: inv.productName,
-            series: inv.series,
-            spec: inv.spec,
-            unit: inv.unit,
-            unitPrice: inv.unitPrice,
-            availableQty: inv.quantity,
-          );
-        }
-      }
       setState(() {
-        _inventoryPickerItems = productMap.values.toList();
+        _inventoryPickerItems = _aggregatePickerItems(result.data);
         _inventoryMap = {
           for (final item in _inventoryPickerItems)
             item.productId: item.availableQty
@@ -206,7 +214,10 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
     }
     final selected = await showDialog<List<_PickerItem>>(
       context: context,
-      builder: (_) => _InventoryPickerDialog(items: _inventoryPickerItems),
+      builder: (_) => _InventoryPickerDialog(
+        items: _inventoryPickerItems,
+        warehouseId: _warehouseId,
+      ),
     );
     if (selected == null || selected.isEmpty) return;
     setState(() {
@@ -532,6 +543,20 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
                                           selectedId: _partnerId,
                                           hint: '请选择客户',
                                           dialogTitle: '选择客户',
+                                          onSearch: (kw) async {
+                                            final res = await ref
+                                                .read(partnerRepositoryProvider)
+                                                .list(
+                                                    type: 'customer',
+                                                    keyword: kw,
+                                                    pageSize: 50);
+                                            return res.data
+                                                .map((p) => OptionItem(
+                                                    id: p.id,
+                                                    name: p.name,
+                                                    code: p.code))
+                                                .toList();
+                                          },
                                           onChanged: (v) =>
                                               setState(() => _partnerId = v),
                                         ),
@@ -873,39 +898,67 @@ class _FormField extends StatelessWidget {
   }
 }
 
-class _InventoryPickerDialog extends StatefulWidget {
+class _InventoryPickerDialog extends ConsumerStatefulWidget {
   final List<_PickerItem> items;
-  const _InventoryPickerDialog({required this.items});
+  final int? warehouseId;
+  const _InventoryPickerDialog({required this.items, this.warehouseId});
 
   @override
-  State<_InventoryPickerDialog> createState() => _InventoryPickerDialogState();
+  ConsumerState<_InventoryPickerDialog> createState() =>
+      _InventoryPickerDialogState();
 }
 
-class _InventoryPickerDialogState extends State<_InventoryPickerDialog> {
+class _InventoryPickerDialogState
+    extends ConsumerState<_InventoryPickerDialog> {
   final _searchCtrl = TextEditingController();
   String _search = '';
   final Set<int> _selected = {};
+  // 服务端搜索结果（替代一次性拉全部本地过滤）；初始用调用方已加载的首屏
+  late List<_PickerItem> _results = widget.items;
+  // 已见过的条目（跨多次搜索），用于确认时按 productId 还原所选
+  late final Map<int, _PickerItem> _known = {
+    for (final it in widget.items) it.productId: it
+  };
+  bool _loading = false;
+  Timer? _debounce;
 
   @override
   void dispose() {
+    _debounce?.cancel();
     _searchCtrl.dispose();
     super.dispose();
   }
 
-  List<_PickerItem> get _filtered {
-    if (_search.isEmpty) return widget.items;
-    final q = _search.toLowerCase();
-    return widget.items
-        .where((item) =>
-            item.productName.toLowerCase().contains(q) ||
-            item.productCode.toLowerCase().contains(q) ||
-            item.series.toLowerCase().contains(q))
-        .toList();
+  void _onSearchChanged(String v) {
+    setState(() => _search = v);
+    _debounce?.cancel();
+    _debounce = Timer(const Duration(milliseconds: 300), _fetch);
+  }
+
+  Future<void> _fetch() async {
+    setState(() => _loading = true);
+    try {
+      final kw = _search.trim();
+      final result = await ref.read(inventoryRepositoryProvider).listInventory(
+            warehouseId: widget.warehouseId,
+            keyword: kw.isEmpty ? null : kw,
+            pageSize: AppConstants.stockOutPickerPageSize,
+          );
+      final items = _aggregatePickerItems(result.data);
+      for (final it in items) {
+        _known[it.productId] = it;
+      }
+      if (mounted) setState(() => _results = items);
+    } catch (_) {
+      // 忽略：保留上次结果
+    } finally {
+      if (mounted) setState(() => _loading = false);
+    }
   }
 
   @override
   Widget build(BuildContext context) {
-    final filtered = _filtered;
+    final filtered = _results;
     final allSelected = filtered.isNotEmpty &&
         filtered.every((e) => _selected.contains(e.productId));
 
@@ -945,14 +998,24 @@ class _InventoryPickerDialogState extends State<_InventoryPickerDialog> {
               padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
               child: TextField(
                 controller: _searchCtrl,
-                decoration: const InputDecoration(
+                decoration: InputDecoration(
                   hintText: '搜索商品编码、名称或系列',
-                  prefixIcon: Icon(Icons.search, size: 18),
+                  prefixIcon: const Icon(Icons.search, size: 18),
+                  suffixIcon: _loading
+                      ? const Padding(
+                          padding: EdgeInsets.all(12),
+                          child: SizedBox(
+                            width: 16,
+                            height: 16,
+                            child: CircularProgressIndicator(strokeWidth: 2),
+                          ),
+                        )
+                      : null,
                   isDense: true,
                   contentPadding:
-                      EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+                      const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
                 ),
-                onChanged: (v) => setState(() => _search = v),
+                onChanged: _onSearchChanged,
               ),
             ),
             // Table header
@@ -1068,9 +1131,9 @@ class _InventoryPickerDialogState extends State<_InventoryPickerDialog> {
                     onPressed: _selected.isEmpty
                         ? null
                         : () {
-                            final result = widget.items
-                                .where((item) =>
-                                    _selected.contains(item.productId))
+                            final result = _selected
+                                .map((id) => _known[id])
+                                .whereType<_PickerItem>()
                                 .toList();
                             Navigator.pop(context, result);
                           },

client/lib/screens/stock_out/stock_out_list_screen.dart

@@ -64,8 +64,7 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
     ColDef('warehouse', '仓库'),
     ColDef('amount', '金额', minWidth: 800),
     ColDef('status', '状态'),
-    ColDef('date', '日期', minWidth: 900),
-    ColDef('reviewed_at', '出库时间', minWidth: 900),
+    ColDef('date', '出库时间', minWidth: 900),
     ColDef('created_at', '创建时间', minWidth: 900),
     ColDef('operator', '出库员', minWidth: 1100),
     ColDef('reviewer', '审核员', minWidth: 1100),
@@ -271,12 +270,6 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
           return DataCell(StatusBadge(_apiStatusToEnum(o.status)));
         case 'date':
           return DataCell(Text(o.orderDate?.substring(0, 10) ?? '-'));
-        case 'reviewed_at':
-          return DataCell(Text(o.reviewedAt != null
-              ? o.reviewedAt!.length >= 16
-                  ? o.reviewedAt!.substring(0, 16)
-                  : o.reviewedAt!.substring(0, 10)
-              : '-'));
         case 'created_at':
           return DataCell(Text(o.createdAt != null
               ? o.createdAt!.length >= 16
@@ -524,7 +517,7 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
             o.totalAmount != null
                 ? '¥${o.totalAmount!.toStringAsFixed(2)}'
                 : '-'),
-        MobileCardField('日期', o.orderDate?.substring(0, 10) ?? '-'),
+        MobileCardField('出库时间', o.orderDate?.substring(0, 10) ?? '-'),
       ],
       actions: _orderActions(context, o),
     );

client/lib/widgets/date_picker_field.dart

@@ -2,12 +2,12 @@ import 'package:flutter/material.dart';
 import '../core/theme/app_theme.dart';
 import '../core/utils/date_util.dart';
 
-/// 年/月/日 三个可编辑下拉框的日期选择组件，替代原生 showDatePicker。
+/// 可键入日期框 + 日历图标（替代旧的「年/月/日」三下拉）。
 ///
-/// - 每个下拉是 Material 3 `DropdownMenu`：点开可选，键入数字即过滤定位
-///   （年/月/日均为有界域，条目覆盖全范围，等价于「手动输入数字」）。
-/// - 改月/年时把超出当月的「日」自动 clamp 回当月最大值。
-/// - 值以 `yyyy-MM-dd` 字符串进出（[value] / [onChanged]）；三者未填齐时回调 null。
+/// - **直接键入**：支持「2024」「2024-5」「2024-5-12」「20240512」等，归一为 `yyyy-MM-dd`，
+///   缺的月/日补 `01`（老酒只知道年份，填 2024 即 2024-01-01）。失焦时把显示归一化。
+/// - **日历图标**：弹 Material `showDatePicker`（input 模式可直接键入年份，选老年份方便）。
+/// - 值以 `yyyy-MM-dd` 字符串进出（[value] / [onChanged]）；无有效年时回调 null。
 class DatePickerField extends StatefulWidget {
   final String? value; // yyyy-MM-dd
   final ValueChanged<String?> onChanged;
@@ -27,151 +27,130 @@ class DatePickerField extends StatefulWidget {
 }
 
 class _DatePickerFieldState extends State<DatePickerField> {
-  int? _year;
-  int? _month;
-  int? _day;
+  late final TextEditingController _ctrl;
+  final FocusNode _focus = FocusNode();
 
   @override
   void initState() {
     super.initState();
-    _parse(widget.value);
+    _ctrl = TextEditingController(text: widget.value ?? '');
+    _focus.addListener(() {
+      // 失焦时把输入归一化显示（如 2024 → 2024-01-01）
+      if (!_focus.hasFocus) {
+        final n = _normalize(_ctrl.text);
+        if (n != null && n != _ctrl.text) {
+          _ctrl.text = n;
+        }
+      }
+    });
   }
 
   @override
   void didUpdateWidget(DatePickerField old) {
     super.didUpdateWidget(old);
-    if (old.value != widget.value) {
-      _parse(widget.value);
+    // 仅在无焦点（非用户正在输入）时同步外部值，避免回流打断输入
+    if (!_focus.hasFocus &&
+        old.value != widget.value &&
+        (widget.value ?? '') != _ctrl.text) {
+      _ctrl.text = widget.value ?? '';
     }
   }
 
-  void _parse(String? v) {
-    final d = parseYmd(v);
-    _year = d?.year;
-    _month = d?.month;
-    _day = d?.day;
+  @override
+  void dispose() {
+    _ctrl.dispose();
+    _focus.dispose();
+    super.dispose();
   }
 
-  int get _daysInMonth {
-    final y = _year ?? DateTime.now().year;
-    final m = _month ?? 1;
-    return DateTime(y, m + 1, 0).day; // 下月第 0 天 = 当月最后一天
-  }
-
-  String? get _composed => composeYmd(_year, _month, _day);
-
-  void _emit(FormFieldState<String> field) {
-    // 改月/年后把超界的日 clamp 回当月最大值（与 composeYmd 一致，State 同步显示）
-    if (_day != null && _day! > _daysInMonth) {
-      _day = _daysInMonth;
+  /// 归一用户输入为 `yyyy-MM-dd`（缺月/日补 01）；无有效年返回 null。
+  static String? _normalize(String raw) {
+    final s = raw.trim();
+    if (s.isEmpty) return null;
+    int? y, mo, d;
+    if (RegExp(r'^[0-9]+$').hasMatch(s)) {
+      // 纯数字串：yyyymmdd / yyyymm / yyyy
+      if (s.length >= 8) {
+        y = int.tryParse(s.substring(0, 4));
+        mo = int.tryParse(s.substring(4, 6));
+        d = int.tryParse(s.substring(6, 8));
+      } else if (s.length == 6) {
+        y = int.tryParse(s.substring(0, 4));
+        mo = int.tryParse(s.substring(4, 6));
+      } else {
+        y = int.tryParse(s);
+      }
+    } else {
+      final parts =
+          s.split(RegExp(r'[^0-9]+')).where((e) => e.isNotEmpty).toList();
+      if (parts.isNotEmpty) y = int.tryParse(parts[0]);
+      if (parts.length >= 2) mo = int.tryParse(parts[1]);
+      if (parts.length >= 3) d = int.tryParse(parts[2]);
+    }
+    if (y == null || y < 1900 || y > 2200) return null;
+    mo ??= 1;
+    d ??= 1;
+    if (mo < 1 || mo > 12) return null;
+    final maxDay = DateTime(y, mo + 1, 0).day;
+    if (d < 1) d = 1;
+    if (d > maxDay) d = maxDay;
+    return '${y.toString().padLeft(4, '0')}-'
+        '${mo.toString().padLeft(2, '0')}-'
+        '${d.toString().padLeft(2, '0')}';
+  }
+
+  Future<void> _pickFromCalendar(FormFieldState<String> field) async {
+    final init =
+        parseYmd(_normalize(_ctrl.text) ?? widget.value) ?? DateTime.now();
+    final picked = await showDatePicker(
+      context: context,
+      initialDate: init,
+      firstDate: DateTime(1900),
+      lastDate: DateTime(2200),
+      initialEntryMode: DatePickerEntryMode.input,
+    );
+    if (picked != null) {
+      final v = formatYmd(picked);
+      _ctrl.text = v;
+      field.didChange(v);
+      widget.onChanged(v);
     }
-    final v = _composed;
-    field.didChange(v);
-    widget.onChanged(v);
-    setState(() {});
   }
 
   @override
   Widget build(BuildContext context) {
-    final now = DateTime.now();
-    final years = [for (var y = now.year - 20; y <= now.year + 5; y++) y];
-    final months = [for (var m = 1; m <= 12; m++) m];
-    final days = [for (var d = 1; d <= _daysInMonth; d++) d];
-
-    // 每个下拉用 Expanded 撑满分得的宽度（expandedInsets:zero 让 DropdownMenu 填满父级），
-    // trailingIcon 用紧凑小箭头，避免默认大图标按钮挤掉数字（曾导致「2026」被裁成「007」）。
-    Widget menu({
-      required String label,
-      required int? value,
-      required List<int> items,
-      required ValueChanged<int?> onSel,
-      required FormFieldState<String> field,
-    }) {
-      return DropdownMenu<int>(
-        initialSelection: value,
-        label: Text(label, style: const TextStyle(fontSize: 11)),
-        enableFilter: true,
-        requestFocusOnTap: true,
-        textStyle: const TextStyle(fontSize: 13),
-        menuHeight: 280,
-        expandedInsets: EdgeInsets.zero,
-        trailingIcon: const Icon(Icons.arrow_drop_down, size: 18),
-        selectedTrailingIcon: const Icon(Icons.arrow_drop_up, size: 18),
-        inputDecorationTheme: const InputDecorationTheme(
-          isDense: true,
-          contentPadding: EdgeInsets.symmetric(horizontal: 6, vertical: 8),
-        ),
-        dropdownMenuEntries: [
-          for (final i in items) DropdownMenuEntry<int>(value: i, label: '$i'),
-        ],
-        onSelected: onSel,
-      );
-    }
-
     return FormField<String>(
       initialValue: widget.value,
       validator: widget.isRequired
-          ? (v) => (_composed == null ? '请选择日期' : null)
+          ? (_) => _normalize(_ctrl.text) == null ? '请输入日期' : null
           : null,
       builder: (field) {
-        return Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Row(
-              children: [
-                Expanded(
-                  flex: 5,
-                  child: menu(
-                    label: '年',
-                    value: _year,
-                    items: years,
-                    field: field,
-                    onSel: (v) {
-                      _year = v;
-                      _emit(field);
-                    },
-                  ),
-                ),
-                const SizedBox(width: 6),
-                Expanded(
-                  flex: 4,
-                  child: menu(
-                    label: '月',
-                    value: _month,
-                    items: months,
-                    field: field,
-                    onSel: (v) {
-                      _month = v;
-                      _emit(field);
-                    },
-                  ),
-                ),
-                const SizedBox(width: 6),
-                Expanded(
-                  flex: 4,
-                  child: menu(
-                    label: '日',
-                    value: _day,
-                    items: days,
-                    field: field,
-                    onSel: (v) {
-                      _day = v;
-                      _emit(field);
-                    },
-                  ),
-                ),
-              ],
+        return TextField(
+          controller: _ctrl,
+          focusNode: _focus,
+          keyboardType: TextInputType.datetime,
+          style: const TextStyle(fontSize: 13),
+          decoration: InputDecoration(
+            isDense: true,
+            hintText: '年-月-日',
+            hintStyle: const TextStyle(fontSize: 12),
+            contentPadding:
+                const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
+            errorText: field.errorText,
+            suffixIcon: IconButton(
+              icon: const Icon(Icons.calendar_today,
+                  size: 16, color: AppTheme.textSecondary),
+              padding: EdgeInsets.zero,
+              constraints: const BoxConstraints(minWidth: 34, minHeight: 34),
+              tooltip: '选择日期',
+              onPressed: () => _pickFromCalendar(field),
             ),
-            if (field.errorText != null)
-              Padding(
-                padding: const EdgeInsets.only(left: 12, top: 4),
-                child: Text(
-                  field.errorText!,
-                  style: const TextStyle(fontSize: 11, color: AppTheme.danger),
-                ),
-              ),
-          ],
+          ),
+          onChanged: (v) {
+            final n = _normalize(v);
+            field.didChange(n);
+            widget.onChanged(n);
+          },
         );
       },
     );

client/lib/widgets/searchable_option_field.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import '../core/utils/dialog_util.dart';
 import 'package:flutter/material.dart';
 import '../core/responsive/responsive.dart';
@@ -41,6 +43,9 @@ class SearchableOptionField extends StatelessWidget {
   /// 创建成功返回新选项 id（自动选中），失败/取消返回 null。为空则不显示新增入口。
   final Future<int?> Function(String keyword)? onCreate;
 
+  /// 可选：服务端搜索。提供时搜索框输入会 debounce 调它取结果（替代本地过滤）。
+  final Future<List<OptionItem>> Function(String keyword)? onSearch;
+
   const SearchableOptionField({
     super.key,
     required this.options,
@@ -51,6 +56,7 @@ class SearchableOptionField extends StatelessWidget {
     this.isRequired = false,
     this.isDense = true,
     this.onCreate,
+    this.onSearch,
   });
 
   String get _displayText {
@@ -66,6 +72,7 @@ class SearchableOptionField extends StatelessWidget {
         options: options,
         selectedId: selectedId,
         onCreate: onCreate,
+        onSearch: onSearch,
       ),
     );
     // result == -1 means "clear selection"
@@ -120,11 +127,13 @@ class _SearchDialog extends StatefulWidget {
   final List<OptionItem> options;
   final int? selectedId;
   final Future<int?> Function(String keyword)? onCreate;
+  final Future<List<OptionItem>> Function(String keyword)? onSearch;
   const _SearchDialog({
     required this.title,
     required this.options,
     this.selectedId,
     this.onCreate,
+    this.onSearch,
   });
 
   @override
@@ -135,9 +144,28 @@ class _SearchDialogState extends State<_SearchDialog> {
   final _ctrl = TextEditingController();
   String _keyword = '';
   bool _creating = false;
+  List<OptionItem>? _serverItems; // 服务端搜索结果（null=尚未搜索，用 widget.options）
+  bool _searching = false;
+  Timer? _debounce;
+
+  void _onSearchChanged(String v) {
+    setState(() => _keyword = v);
+    if (widget.onSearch == null) return;
+    _debounce?.cancel();
+    _debounce = Timer(const Duration(milliseconds: 300), () async {
+      setState(() => _searching = true);
+      try {
+        final res = await widget.onSearch!(v.trim());
+        if (mounted) setState(() => _serverItems = res);
+      } finally {
+        if (mounted) setState(() => _searching = false);
+      }
+    });
+  }
 
   @override
   void dispose() {
+    _debounce?.cancel();
     _ctrl.dispose();
     super.dispose();
   }
@@ -197,12 +225,14 @@ class _SearchDialogState extends State<_SearchDialog> {
 
   @override
   Widget build(BuildContext context) {
-    final filtered = _keyword.isEmpty
-        ? widget.options
-        : widget.options.where((o) => o.matches(_keyword)).toList();
+    final filtered = widget.onSearch != null
+        ? (_serverItems ?? widget.options)
+        : (_keyword.isEmpty
+            ? widget.options
+            : widget.options.where((o) => o.matches(_keyword)).toList());
     final kw = _keyword.trim();
     final hasExact =
-        widget.options.any((o) => o.name.toLowerCase() == kw.toLowerCase());
+        filtered.any((o) => o.name.toLowerCase() == kw.toLowerCase());
     final canCreate = widget.onCreate != null && kw.isNotEmpty && !hasExact;
 
     return AlertDialog(
@@ -216,12 +246,22 @@ class _SearchDialogState extends State<_SearchDialog> {
             TextField(
               controller: _ctrl,
               autofocus: true,
-              decoration: const InputDecoration(
+              decoration: InputDecoration(
                 hintText: '搜索...',
-                prefixIcon: Icon(Icons.search, size: 18),
+                prefixIcon: const Icon(Icons.search, size: 18),
+                suffixIcon: _searching
+                    ? const Padding(
+                        padding: EdgeInsets.all(10),
+                        child: SizedBox(
+                          width: 16,
+                          height: 16,
+                          child: CircularProgressIndicator(strokeWidth: 2),
+                        ),
+                      )
+                    : null,
                 isDense: true,
               ),
-              onChanged: (v) => setState(() => _keyword = v),
+              onChanged: _onSearchChanged,
             ),
             const SizedBox(height: 8),
             Expanded(

client/test/date_picker_field_test.dart

@@ -31,26 +31,47 @@ void main() {
   });
 
   group('DatePickerField', () {
-    testWidgets('渲染三个年/月/日下拉框', (tester) async {
+    testWidgets('渲染可键入框 + 日历图标', (tester) async {
       await tester.pumpWidget(MaterialApp(
         home: Scaffold(
           body: DatePickerField(value: '2026-06-19', onChanged: (_) {}),
         ),
       ));
       await tester.pumpAndSettle();
-      expect(find.byType(DropdownMenu<int>), findsNWidgets(3));
+      expect(find.byType(TextField), findsOneWidget);
+      expect(find.byIcon(Icons.calendar_today), findsOneWidget);
     });
 
-    testWidgets('初始值回显到三个下拉框', (tester) async {
+    testWidgets('初始值回显到输入框', (tester) async {
       await tester.pumpWidget(MaterialApp(
         home: Scaffold(
           body: DatePickerField(value: '2026-06-19', onChanged: (_) {}),
         ),
       ));
       await tester.pumpAndSettle();
-      expect(find.widgetWithText(DropdownMenu<int>, '2026'), findsOneWidget);
-      expect(find.widgetWithText(DropdownMenu<int>, '6'), findsOneWidget);
-      expect(find.widgetWithText(DropdownMenu<int>, '19'), findsOneWidget);
+      expect(find.text('2026-06-19'), findsOneWidget);
+    });
+
+    testWidgets('只输年份归一为 yyyy-01-01', (tester) async {
+      String? out;
+      await tester.pumpWidget(MaterialApp(
+        home: Scaffold(
+          body: DatePickerField(onChanged: (v) => out = v),
+        ),
+      ));
+      await tester.enterText(find.byType(TextField), '2024');
+      expect(out, '2024-01-01');
+    });
+
+    testWidgets('年月归一为 yyyy-MM-01', (tester) async {
+      String? out;
+      await tester.pumpWidget(MaterialApp(
+        home: Scaffold(
+          body: DatePickerField(onChanged: (v) => out = v),
+        ),
+      ));
+      await tester.enterText(find.byType(TextField), '2024-5');
+      expect(out, '2024-05-01');
     });
   });
 }