wangjia/jiu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 130 Wiki Activity

feat(client): 录单表单优化 + 可搜索下拉支持新建 + 日期选择器组件

Browse Source 
新增 DatePickerField 日期选择器与 date_util；可搜索下拉 SearchableOptionField
支持内联新建选项；入库/出库录单表单、商品页、财务页、app_shell 导航相应调整。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
wangjia
2026-06-20 07:05:22 +08:00
parent e892ab45b2
commit a76724b385
12 changed files with 2868 additions and 1624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/lib/core/router/app_router.dart
+101 -70
View File
@@ -20,8 +20,7 @@ import '../../screens/about/about_screen.dart';
import '../../screens/devices/device_management_screen.dart';
import '../auth/auth_state.dart';
Page<void> _noTransition(Widget child) =>
NoTransitionPage<void>(child: child);
Page<void> _noTransition(Widget child) => NoTransitionPage<void>(child: child);
/// ChangeNotifier that bridges Riverpod auth state → GoRouter refreshListenable.
class _RouterNotifier extends ChangeNotifier {
@@ -94,74 +93,106 @@ final appRouterProvider = Provider<GoRouter>((ref) {
path: '/login',
builder: (context, state) => const LoginScreen(),
),
ShellRoute(
builder: (context, state, child) => AppShell(child: child),
routes: [
GoRoute(
path: '/stock-in',
pageBuilder: (_, __) => _noTransition(const StockInListScreen())),
GoRoute(
path: '/stock-in/new',
pageBuilder: (_, __) => _noTransition(const StockInFormScreen())),
GoRoute(
path: '/stock-in/edit/:id',
pageBuilder: (_, state) => _noTransition(
StockInFormScreen(
editOrderId: int.parse(state.pathParameters['id']!)))),
GoRoute(
path: '/stock-out',
pageBuilder: (_, __) => _noTransition(const StockOutListScreen())),
GoRoute(
path: '/stock-out/new',
pageBuilder: (_, __) => _noTransition(const StockOutFormScreen())),
GoRoute(
path: '/stock-out/edit/:id',
pageBuilder: (_, state) => _noTransition(
StockOutFormScreen(
editOrderId: int.parse(state.pathParameters['id']!)))),
GoRoute(
path: '/inventory',
pageBuilder: (_, __) =>
_noTransition(const InventoryListScreen())),
GoRoute(
path: '/inventory/check',
pageBuilder: (_, __) =>
_noTransition(const InventoryCheckScreen())),
GoRoute(
path: '/partners',
pageBuilder: (_, __) => _noTransition(const PartnersScreen())),
GoRoute(
path: '/finance',
pageBuilder: (_, __) => _noTransition(const FinanceScreen())),
GoRoute(
path: '/products',
pageBuilder: (_, __) => _noTransition(const ProductsScreen())),
GoRoute(
path: '/products/:id',
pageBuilder: (_, state) => _noTransition(ProductDetailScreen(
productId: int.parse(state.pathParameters['id']!)))),
GoRoute(
path: '/settings',
pageBuilder: (_, state) {
const tabIndex = {
'shop': 0,
'users': 1,
'number': 2,
'system': 3,
'license': 4,
'import': 5,
};
final tab =
tabIndex[state.uri.queryParameters['tab']] ?? 0;
return _noTransition(SettingsScreen(initialTab: tab));
}),
GoRoute(
path: '/devices',
pageBuilder: (_, __) =>
_noTransition(const DeviceManagementScreen())),
GoRoute(
path: '/about',
pageBuilder: (_, __) => _noTransition(const AboutScreen())),
// 各栏目拆为独立分支：StatefulShellRoute.indexedStack 让每个分支的 Navigator
// 及其页面 State 常驻，跨栏目切换不再销毁上一页（半填表单/内部 tab/滚动位置保活）。
// 分支顺序必须与 AppShell._navItems 一致（navigationShell.currentIndex 据此高亮）。
StatefulShellRoute.indexedStack(
builder: (context, state, navigationShell) =>
AppShell(navigationShell: navigationShell),
branches: [
// 0 入库管理
StatefulShellBranch(routes: [
GoRoute(
path: '/stock-in',
pageBuilder: (_, __) =>
_noTransition(const StockInListScreen())),
GoRoute(
path: '/stock-in/new',
pageBuilder: (_, __) =>
_noTransition(const StockInFormScreen())),
GoRoute(
path: '/stock-in/edit/:id',
pageBuilder: (_, state) => _noTransition(StockInFormScreen(
editOrderId: int.parse(state.pathParameters['id']!)))),
]),
// 1 出库管理
StatefulShellBranch(routes: [
GoRoute(
path: '/stock-out',
pageBuilder: (_, __) =>
_noTransition(const StockOutListScreen())),
GoRoute(
path: '/stock-out/new',
pageBuilder: (_, __) =>
_noTransition(const StockOutFormScreen())),
GoRoute(
path: '/stock-out/edit/:id',
pageBuilder: (_, state) => _noTransition(StockOutFormScreen(
editOrderId: int.parse(state.pathParameters['id']!)))),
]),
// 2 库存管理
StatefulShellBranch(routes: [
GoRoute(
path: '/inventory',
pageBuilder: (_, __) =>
_noTransition(const InventoryListScreen())),
GoRoute(
path: '/inventory/check',
pageBuilder: (_, __) =>
_noTransition(const InventoryCheckScreen())),
]),
// 3 财务管理
StatefulShellBranch(routes: [
GoRoute(
path: '/finance',
pageBuilder: (_, __) => _noTransition(const FinanceScreen())),
]),
// 4 往来单位
StatefulShellBranch(routes: [
GoRoute(
path: '/partners',
pageBuilder: (_, __) => _noTransition(const PartnersScreen())),
]),
// 5 基础数据
StatefulShellBranch(routes: [
GoRoute(
path: '/products',
pageBuilder: (_, __) => _noTransition(const ProductsScreen())),
GoRoute(
path: '/products/:id',
pageBuilder: (_, state) => _noTransition(ProductDetailScreen(
productId: int.parse(state.pathParameters['id']!)))),
]),
// 6 设备管理
StatefulShellBranch(routes: [
GoRoute(
path: '/devices',
pageBuilder: (_, __) =>
_noTransition(const DeviceManagementScreen())),
]),
// 7 系统设置
StatefulShellBranch(routes: [
GoRoute(
path: '/settings',
pageBuilder: (_, state) {
const tabIndex = {
'shop': 0,
'users': 1,
'number': 2,
'system': 3,
'license': 4,
'import': 5,
};
final tab = tabIndex[state.uri.queryParameters['tab']] ?? 0;
return _noTransition(SettingsScreen(initialTab: tab));
}),
]),
// 8 关于我们
StatefulShellBranch(routes: [
GoRoute(
path: '/about',
pageBuilder: (_, __) => _noTransition(const AboutScreen())),
]),
],
),
],
client/lib/core/utils/date_util.dart
+22
View File
@@ -0,0 +1,22 @@
/// 日期工具：统一 `yyyy-MM-dd` 的格式化与解析，收敛各处重复的 padLeft 逻辑。
library;
/// 格式化为 `yyyy-MM-dd`（提交后端的统一格式）。
String formatYmd(DateTime d) =>
'${d.year}-${d.month.toString().padLeft(2, '0')}-${d.day.toString().padLeft(2, '0')}';
/// 解析 `yyyy-MM-dd`（或更长的带时间字符串，取前 10 位）。无效返回 null。
DateTime? parseYmd(String? s) {
if (s == null || s.isEmpty) return null;
final t = s.length >= 10 ? s.substring(0, 10) : s;
return DateTime.tryParse(t);
}
/// 组合年/月/日为 `yyyy-MM-dd`，自动把超出当月的「日」clamp 回当月最大值
/// （如 2 月选 31 → 28/29）。任一为空返回 null。
String? composeYmd(int? year, int? month, int? day) {
if (year == null || month == null || day == null) return null;
final maxDay = DateTime(year, month + 1, 0).day; // 下月第 0 天 = 当月最后一天
final d = day > maxDay ? maxDay : day;
return formatYmd(DateTime(year, month, d));
}
client/lib/models/shop.dart
+21
View File
@@ -7,6 +7,8 @@ class ShopInfo {
final String managerName;
final String logoUrl;
final String wechatId;
// 店级动态配置（后端 shops.custom_fields JSON），存录入默认值等轻量配置
final Map<String, dynamic> customFields;
const ShopInfo({
required this.id,
@@ -17,8 +19,24 @@ class ShopInfo {
required this.managerName,
this.logoUrl = '',
this.wechatId = '',
this.customFields = const {},
});
/// 入库录入默认商品名称选项 id（未配置返回 null）。
int? get defaultNameId => _asInt(customFields['default_name_id']);
/// 入库录入默认系列选项 id（未配置返回 null）。
int? get defaultSeriesId => _asInt(customFields['default_series_id']);
/// 入库录入默认规格选项 id（未配置返回 null）。
int? get defaultSpecId => _asInt(customFields['default_spec_id']);
static int? _asInt(dynamic v) {
if (v == null) return null;
if (v is num) return v.toInt();
return int.tryParse(v.toString());
}
factory ShopInfo.fromJson(Map<String, dynamic> json) => ShopInfo(
id: (json['id'] as num).toInt(),
code: json['code'] as String? ?? '',
@@ -28,5 +46,8 @@ class ShopInfo {
managerName: json['manager_name'] as String? ?? '',
logoUrl: json['logo_url'] as String? ?? '',
wechatId: json['wechat_id'] as String? ?? '',
customFields:
(json['custom_fields'] as Map?)?.cast<String, dynamic>() ??
const {},
);
}
client/lib/screens/finance/finance_screen.dart
+109 -92
View File
@@ -6,13 +6,16 @@ import '../../models/finance.dart';
import '../../providers/finance_provider.dart';
import '../../widgets/data_table_card.dart';
import '../../widgets/mobile_list_card.dart';
import '../../widgets/multi_select_dropdown.dart' show ColDef, ColumnToggleButton, FilterableColumnHeader;
import '../../widgets/multi_select_dropdown.dart'
show ColDef, ColumnToggleButton, FilterableColumnHeader;
import '../../core/storage/column_prefs.dart';
import '../../widgets/page_scaffold.dart';
import '../../providers/connectivity_provider.dart';
import '../../core/utils/export_util.dart';
import '../../core/utils/date_util.dart';
import '../../repositories/finance_repository.dart';
import '../../widgets/write_guard.dart';
import '../../widgets/date_picker_field.dart';
class FinanceScreen extends ConsumerWidget {
const FinanceScreen({super.key});
@@ -140,11 +143,12 @@ class _FinanceTabState extends ConsumerState<_FinanceTab> {
/// 财务记录：窄屏卡片
Widget _financeCard(FinanceRecord r) {
final canClose = (r.type == 'payable' || r.type == 'receivable') &&
r.status == 'open';
final canClose =
(r.type == 'payable' || r.type == 'receivable') && r.status == 'open';
final showStatus = r.type == 'payable' || r.type == 'receivable';
return MobileListCard(
title: Text(r.partnerName?.isNotEmpty == true ? r.partnerName! : r.typeLabel),
title: Text(
r.partnerName?.isNotEmpty == true ? r.partnerName! : r.typeLabel),
subtitle: Text(r.recordDate?.substring(0, 10) ?? '-'),
trailing: _TypeBadge(r.typeLabel),
fields: [
@@ -154,9 +158,7 @@ class _FinanceTabState extends ConsumerState<_FinanceTab> {
'¥${r.balance.toStringAsFixed(2)}',
style: TextStyle(
fontSize: 13,
color: r.balance > 0
? AppTheme.danger
: AppTheme.textSecondary,
color: r.balance > 0 ? AppTheme.danger : AppTheme.textSecondary,
fontWeight: FontWeight.w600,
),
)),
@@ -204,9 +206,11 @@ class _FinanceTabState extends ConsumerState<_FinanceTab> {
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Icon(Icons.cloud_off, size: 40, color: AppTheme.textSecondary),
const Icon(Icons.cloud_off,
size: 40, color: AppTheme.textSecondary),
const SizedBox(height: 12),
const Text('暂无数据，网络不可用', style: TextStyle(color: AppTheme.textSecondary)),
const Text('暂无数据，网络不可用',
style: TextStyle(color: AppTheme.textSecondary)),
const SizedBox(height: 12),
ElevatedButton(onPressed: _refetch, child: const Text('重试')),
],
@@ -223,13 +227,18 @@ class _FinanceTabState extends ConsumerState<_FinanceTab> {
// Summary: only for payable/receivable tabs
final totalAmount = records.fold(0.0, (s, r) => s + r.amount);
final openAmount = records
.where((r) => (r.type == 'payable' || r.type == 'receivable') && r.status == 'open')
.where((r) =>
(r.type == 'payable' || r.type == 'receivable') &&
r.status == 'open')
.fold(0.0, (s, r) => s + r.amount);
final closedAmount = records
.where((r) => (r.type == 'payable' || r.type == 'receivable') && r.status == 'closed')
.where((r) =>
(r.type == 'payable' || r.type == 'receivable') &&
r.status == 'closed')
.fold(0.0, (s, r) => s + r.amount);
final typeOptions = _allRecords.map((r) => r.typeLabel).toSet().toList()..sort();
final typeOptions = _allRecords.map((r) => r.typeLabel).toSet().toList()
..sort();
final partnerOptions = _allRecords
.map((r) => r.partnerName ?? '')
.where((s) => s.isNotEmpty)
@@ -245,8 +254,7 @@ class _FinanceTabState extends ConsumerState<_FinanceTab> {
.map((c) => c.key)
.toSet();
// 列可见性只看用户选择（minWidth 仅作首次默认，不再运行时强制隐藏）。
final visibleCols =
_colDefs.where((c) => !hidden.contains(c.key)).toList();
final visibleCols = _colDefs.where((c) => !hidden.contains(c.key)).toList();
final columns = visibleCols.map((c) {
final label = switch (c.key) {
@@ -265,8 +273,7 @@ class _FinanceTabState extends ConsumerState<_FinanceTab> {
_ => Text(c.label),
};
return DataColumn(
label: label,
numeric: c.key == 'amount' || c.key == 'balance');
label: label, numeric: c.key == 'amount' || c.key == 'balance');
}).toList();
DataCell buildFinanceCell(String key, FinanceRecord r) {
@@ -314,7 +321,8 @@ class _FinanceTabState extends ConsumerState<_FinanceTab> {
width: 160,
child: Text(r.remark ?? '-',
overflow: TextOverflow.ellipsis,
style: const TextStyle(fontSize: 12, color: AppTheme.textSecondary)),
style: const TextStyle(
fontSize: 12, color: AppTheme.textSecondary)),
));
case 'actions':
if ((r.type == 'payable' || r.type == 'receivable') &&
@@ -348,7 +356,9 @@ class _FinanceTabState extends ConsumerState<_FinanceTab> {
]
: records
.map((r) => DataRow(
cells: visibleCols.map((c) => buildFinanceCell(c.key, r)).toList(),
cells: visibleCols
.map((c) => buildFinanceCell(c.key, r))
.toList(),
))
.toList();
@@ -441,19 +451,30 @@ class _FinanceTabState extends ConsumerState<_FinanceTab> {
: '应收账款';
exportExcel(
filename: tabName,
headers: ['日期', '类型', '往来单位', '关联单据', '金额', '余额', '状态', '备注'],
rows: records.map((r) => [
r.recordDate?.substring(0, 10) ?? '',
r.typeLabel,
r.partnerName ?? '',
r.refType != null && r.refId != null
? '${r.refType!.replaceAll('_', '-')}#${r.refId}'
: '',
r.amount,
r.balance,
r.status == 'open' ? '未结清' : '已结清',
r.remark ?? '',
]).toList(),
headers: [
'日期',
'类型',
'往来单位',
'关联单据',
'金额',
'余额',
'状态',
'备注'
],
rows: records
.map((r) => [
r.recordDate?.substring(0, 10) ?? '',
r.typeLabel,
r.partnerName ?? '',
r.refType != null && r.refId != null
? '${r.refType!.replaceAll('_', '-')}#${r.refId}'
: '',
r.amount,
r.balance,
r.status == 'open' ? '未结清' : '已结清',
r.remark ?? '',
])
.toList(),
);
},
icon: const Icon(Icons.download, size: 16),
@@ -528,7 +549,8 @@ class _AddPaymentDialogState extends State<_AddPaymentDialog> {
final amount = double.tryParse(_amountCtrl.text.trim());
if (amount == null || amount <= 0) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('请输入有效金额'), backgroundColor: AppTheme.danger),
const SnackBar(
content: Text('请输入有效金额'), backgroundColor: AppTheme.danger),
);
return;
}
@@ -537,15 +559,17 @@ class _AddPaymentDialogState extends State<_AddPaymentDialog> {
final body = <String, dynamic>{
'type': _type,
'amount': amount,
'record_date': '${_date.year}-${_date.month.toString().padLeft(2, '0')}-${_date.day.toString().padLeft(2, '0')}',
if (_remarkCtrl.text.trim().isNotEmpty) 'remark': _remarkCtrl.text.trim(),
'record_date': formatYmd(_date),
if (_remarkCtrl.text.trim().isNotEmpty)
'remark': _remarkCtrl.text.trim(),
};
await widget.repo.create(body);
if (mounted) {
Navigator.of(context).pop();
widget.onSaved();
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('添加成功'), backgroundColor: AppTheme.success),
const SnackBar(
content: Text('添加成功'), backgroundColor: AppTheme.success),
);
}
} catch (e) {
@@ -570,27 +594,19 @@ class _AddPaymentDialogState extends State<_AddPaymentDialog> {
children: [
TextField(
controller: _amountCtrl,
keyboardType: const TextInputType.numberWithOptions(decimal: true),
decoration: const InputDecoration(labelText: '金额', prefixText: '¥ '),
keyboardType:
const TextInputType.numberWithOptions(decimal: true),
decoration:
const InputDecoration(labelText: '金额', prefixText: '¥ '),
),
const SizedBox(height: 12),
InkWell(
onTap: () async {
final picked = await showDatePicker(
context: context,
initialDate: _date,
firstDate: DateTime(2020),
lastDate: DateTime.now().add(const Duration(days: 30)),
);
if (picked != null) setState(() => _date = picked);
DatePickerField(
label: '日期',
value: formatYmd(_date),
onChanged: (v) {
final d = parseYmd(v);
if (d != null) setState(() => _date = d);
},
child: InputDecorator(
decoration: const InputDecoration(labelText: '日期'),
child: Text(
'${_date.year}-${_date.month.toString().padLeft(2, '0')}-${_date.day.toString().padLeft(2, '0')}',
style: const TextStyle(fontSize: 14),
),
),
),
const SizedBox(height: 12),
TextField(
@@ -609,8 +625,10 @@ class _AddPaymentDialogState extends State<_AddPaymentDialog> {
onPressed: _saving ? null : _save,
child: _saving
? const SizedBox(
width: 16, height: 16,
child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white))
width: 16,
height: 16,
child: CircularProgressIndicator(
strokeWidth: 2, color: Colors.white))
: const Text('保存'),
),
],
@@ -678,7 +696,8 @@ class _TypeBadge extends StatelessWidget {
decoration:
BoxDecoration(color: bg, borderRadius: BorderRadius.circular(3)),
child: Text(label,
style: TextStyle(color: fg, fontSize: 12, fontWeight: FontWeight.w500)),
style:
TextStyle(color: fg, fontSize: 12, fontWeight: FontWeight.w500)),
);
}
}
@@ -701,43 +720,41 @@ class _SummaryCard extends StatelessWidget {
@override
Widget build(BuildContext context) {
final card = Container(
height: 72,
padding: const EdgeInsets.symmetric(horizontal: 16),
decoration: BoxDecoration(
color: AppTheme.surface,
borderRadius: BorderRadius.circular(4),
border: Border.all(color: AppTheme.border, width: 0.5),
),
child: Row(
children: [
Container(
width: 40,
height: 40,
decoration: BoxDecoration(
color: color.withOpacity(0.1),
borderRadius: BorderRadius.circular(8),
),
child: Icon(icon, color: color, size: 22),
height: 72,
padding: const EdgeInsets.symmetric(horizontal: 16),
decoration: BoxDecoration(
color: AppTheme.surface,
borderRadius: BorderRadius.circular(4),
border: Border.all(color: AppTheme.border, width: 0.5),
),
child: Row(
children: [
Container(
width: 40,
height: 40,
decoration: BoxDecoration(
color: color.withOpacity(0.1),
borderRadius: BorderRadius.circular(8),
),
const SizedBox(width: 12),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(title,
style: const TextStyle(
fontSize: 12, color: AppTheme.textSecondary)),
const SizedBox(height: 4),
Text(value,
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.w700,
color: color)),
],
),
],
),
);
child: Icon(icon, color: color, size: 22),
),
const SizedBox(width: 12),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(title,
style: const TextStyle(
fontSize: 12, color: AppTheme.textSecondary)),
const SizedBox(height: 4),
Text(value,
style: TextStyle(
fontSize: 18, fontWeight: FontWeight.w700, color: color)),
],
),
],
),
);
return width != null
? SizedBox(width: width, child: card)
: Expanded(child: card);
client/lib/screens/products/products_screen.dart
+792 -295
View File
File diff suppressed because it is too large Load Diff
client/lib/screens/shell/app_shell.dart
+447 -437
View File
File diff suppressed because it is too large Load Diff
client/lib/screens/stock_in/stock_in_form_screen.dart
+542 -383
View File
File diff suppressed because it is too large Load Diff
client/lib/screens/stock_out/stock_out_form_screen.dart
+432 -336
View File
@@ -6,7 +6,9 @@ import '../../core/responsive/responsive.dart';
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/stock_out.dart';
import '../../widgets/date_picker_field.dart';
import '../../providers/inventory_provider.dart';
import '../../providers/partner_provider.dart';
import '../../providers/stock_out_provider.dart';
@@ -92,7 +94,8 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
Future<void> _loadEditOrder() async {
setState(() => _loadingEdit = true);
try {
final order = await ref.read(stockOutRepositoryProvider).get(widget.editOrderId!);
final order =
await ref.read(stockOutRepositoryProvider).get(widget.editOrderId!);
setState(() {
_loadedOrder = order;
@@ -182,7 +185,8 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
setState(() {
_inventoryPickerItems = productMap.values.toList();
_inventoryMap = {
for (final item in _inventoryPickerItems) item.productId: item.availableQty
for (final item in _inventoryPickerItems)
item.productId: item.availableQty
};
});
} catch (_) {}
@@ -191,7 +195,8 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
Future<void> _addItem() async {
if (_warehouseId == null) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('请先选择出库仓库'), backgroundColor: AppTheme.danger),
const SnackBar(
content: Text('请先选择出库仓库'), backgroundColor: AppTheme.danger),
);
return;
}
@@ -231,18 +236,20 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
if (!asDraft && !_formKey.currentState!.validate()) return;
if (_warehouseId == null) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('请选择出库仓库'), backgroundColor: AppTheme.danger),
const SnackBar(
content: Text('请选择出库仓库'), backgroundColor: AppTheme.danger),
);
return;
}
if (_items.isEmpty) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('请添加商品明细'), backgroundColor: AppTheme.danger),
const SnackBar(
content: Text('请添加商品明细'), backgroundColor: AppTheme.danger),
);
return;
}
final invalidQtyIndex = _items.indexWhere(
(item) => (double.tryParse(item.qtyCtrl.text) ?? 0) <= 0);
final invalidQtyIndex = _items
.indexWhere((item) => (double.tryParse(item.qtyCtrl.text) ?? 0) <= 0);
if (invalidQtyIndex >= 0) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
@@ -269,8 +276,7 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
final data = {
'warehouse_id': _warehouseId,
if (_partnerId != null) 'partner_id': _partnerId,
'order_date':
'${_orderDate.year}-${_orderDate.month.toString().padLeft(2, '0')}-${_orderDate.day.toString().padLeft(2, '0')}',
'order_date': formatYmd(_orderDate),
if (_remarkCtrl.text.trim().isNotEmpty) 'remark': _remarkCtrl.text.trim(),
'items': itemsData,
'status': asDraft ? 'draft' : 'pending',
@@ -278,7 +284,9 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
try {
if (_isEdit) {
await ref.read(stockOutRepositoryProvider).update(widget.editOrderId!, data);
await ref
.read(stockOutRepositoryProvider)
.update(widget.editOrderId!, data);
ref.read(stockOutListProvider.notifier).reload();
} else {
await ref.read(stockOutListProvider.notifier).createOrder(data);
@@ -303,6 +311,52 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
}
}
/// 是否有值得保留的录入（用于退出前判断是否提示保存草稿）。
bool get _isDirty {
if (_remarkCtrl.text.trim().isNotEmpty) return true;
if (_warehouseId != null) return true;
if (_partnerId != null) return true;
for (final item in _items) {
if (item.productId != null) return true;
}
return false;
}
/// 退出前处理：无录入直接离开；有未保存录入则提示「保存草稿 / 放弃 / 继续编辑」。
Future<void> _handleExit() async {
if (!_isDirty) {
context.go('/stock-out');
return;
}
final choice = await showDialog<String>(
context: context,
builder: (ctx) => AlertDialog(
title: const Text('未保存的内容'),
content:
Text(_isEdit ? '当前修改尚未保存。是否保存为草稿？' : '当前出库单尚未提交。是否保存为草稿，以免内容丢失？'),
actions: [
TextButton(
onPressed: () => Navigator.of(ctx).pop('edit'),
child: const Text('继续编辑'),
),
TextButton(
onPressed: () => Navigator.of(ctx).pop('discard'),
child: const Text('放弃', style: TextStyle(color: AppTheme.danger)),
),
ElevatedButton(
onPressed: () => Navigator.of(ctx).pop('draft'),
child: const Text('保存草稿'),
),
],
),
);
if (choice == 'draft') {
await _submit(true);
} else if (choice == 'discard' && mounted) {
context.go('/stock-out');
}
}
@override
Widget build(BuildContext context) {
final asyncWarehouses = ref.watch(warehouseListProvider);
@@ -310,320 +364,346 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
final currentUser = ref.watch(authStateProvider).user;
final isMobile = context.isMobile;
return Scaffold(
backgroundColor: AppTheme.background,
body: Column(
children: [
Container(
height: 52,
color: AppTheme.surface,
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Row(
children: [
IconButton(
icon: const Icon(Icons.arrow_back, size: 20),
onPressed: () => context.go('/stock-out'),
tooltip: '返回',
),
const SizedBox(width: 8),
Text(_isEdit ? '修改出库单' : '新建出库单',
style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w600)),
const Spacer(),
// 窄屏：仅保留主操作「提交」，其余收进溢出菜单，避免按钮挤爆顶栏
if (isMobile) ...[
ElevatedButton(
onPressed: _submitting ? null : () => _submit(false),
child: _submitting
? const SizedBox(
width: 14,
height: 14,
child: CircularProgressIndicator(
strokeWidth: 2, color: Colors.white))
: const Text('提交'),
return PopScope(
canPop: false,
onPopInvokedWithResult: (didPop, _) {
if (!didPop) _handleExit();
},
child: Scaffold(
backgroundColor: AppTheme.background,
body: Column(
children: [
Container(
height: 52,
color: AppTheme.surface,
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Row(
children: [
IconButton(
icon: const Icon(Icons.arrow_back, size: 20),
onPressed: _handleExit,
tooltip: '返回',
),
PopupMenuButton<String>(
onSelected: (v) {
switch (v) {
case 'draft':
_submit(true);
break;
case 'print':
_printOrder();
break;
case 'cancel':
context.go('/stock-out');
break;
}
},
itemBuilder: (_) => [
const PopupMenuItem(value: 'draft', child: Text('保存草稿')),
if (_isEdit && _loadedOrder != null)
const PopupMenuItem(value: 'print', child: Text('打印')),
const PopupMenuItem(value: 'cancel', child: Text('取消')),
const SizedBox(width: 8),
Text(_isEdit ? '修改出库单' : '新建出库单',
style: const TextStyle(
fontSize: 16, fontWeight: FontWeight.w600)),
const Spacer(),
// 窄屏：仅保留主操作「提交」，其余收进溢出菜单，避免按钮挤爆顶栏
if (isMobile) ...[
ElevatedButton(
onPressed: _submitting ? null : () => _submit(false),
child: _submitting
? const SizedBox(
width: 14,
height: 14,
child: CircularProgressIndicator(
strokeWidth: 2, color: Colors.white))
: const Text('提交'),
),
PopupMenuButton<String>(
onSelected: (v) {
switch (v) {
case 'draft':
_submit(true);
break;
case 'print':
_printOrder();
break;
case 'cancel':
_handleExit();
break;
}
},
itemBuilder: (_) => [
const PopupMenuItem(
value: 'draft', child: Text('保存草稿')),
if (_isEdit && _loadedOrder != null)
const PopupMenuItem(
value: 'print', child: Text('打印')),
const PopupMenuItem(value: 'cancel', child: Text('取消')),
],
),
] else ...[
if (_isEdit && _loadedOrder != null) ...[
OutlinedButton.icon(
onPressed: _printOrder,
icon: const Icon(Icons.print_outlined, size: 16),
label: const Text('打印'),
),
const SizedBox(width: 8),
],
),
] else ...[
if (_isEdit && _loadedOrder != null) ...[
OutlinedButton.icon(
onPressed: _printOrder,
icon: const Icon(Icons.print_outlined, size: 16),
label: const Text('打印'),
OutlinedButton(
onPressed: _submitting ? null : () => _submit(true),
child: const Text('保存草稿'),
),
const SizedBox(width: 8),
ElevatedButton.icon(
onPressed: _submitting ? null : () => _submit(false),
icon: _submitting
? const SizedBox(
width: 14,
height: 14,
child: CircularProgressIndicator(
strokeWidth: 2, color: Colors.white))
: const Icon(Icons.send, size: 16),
label: const Text('提交审核'),
),
const SizedBox(width: 8),
OutlinedButton.icon(
onPressed: _handleExit,
icon: const Icon(Icons.cancel_outlined, size: 16),
label: const Text('取消'),
),
],
OutlinedButton(
onPressed: _submitting ? null : () => _submit(true),
child: const Text('保存草稿'),
),
const SizedBox(width: 8),
ElevatedButton.icon(
onPressed: _submitting ? null : () => _submit(false),
icon: _submitting
? const SizedBox(
width: 14,
height: 14,
child: CircularProgressIndicator(
strokeWidth: 2, color: Colors.white))
: const Icon(Icons.send, size: 16),
label: const Text('提交审核'),
),
const SizedBox(width: 8),
OutlinedButton.icon(
onPressed: () => context.go('/stock-out'),
icon: const Icon(Icons.cancel_outlined, size: 16),
label: const Text('取消'),
),
],
],
),
),
),
const Divider(height: 1),
if (_loadingEdit)
const Expanded(child: Center(child: CircularProgressIndicator())),
if (!_loadingEdit)
Expanded(
child: SingleChildScrollView(
padding: const EdgeInsets.all(16),
child: Form(
key: _formKey,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text('基本信息',
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600,
color: AppTheme.primaryDark)),
const SizedBox(height: 16),
Wrap(
spacing: 16,
runSpacing: 16,
children: [
_FormField(
label: '出库仓库',
required: true,
child: asyncWarehouses.when(
loading: () => const LinearProgressIndicator(),
error: (_, __) => const Text('加载失败'),
data: (warehouses) => DropdownButtonFormField<int>(
value: _warehouseId,
hint: const Text('请选择仓库',
style: TextStyle(fontSize: 13)),
items: warehouses
.map((w) => DropdownMenuItem(
value: w.id,
child: Text(w.name,
style: const TextStyle(fontSize: 13))))
.toList(),
onChanged: (v) {
setState(() => _warehouseId = v);
if (v != null) _loadInventory(v);
},
validator: (v) => v == null ? '不能为空' : null,
decoration: const InputDecoration(),
),
),
),
_FormField(
label: '客户',
child: asyncCustomers.when(
loading: () => const LinearProgressIndicator(),
error: (_, __) => const Text('加载失败'),
data: (result) => DropdownButtonFormField<int>(
value: _partnerId,
hint: const Text('请选择客户',
style: TextStyle(fontSize: 13)),
items: result.data
.map((p) => DropdownMenuItem(
value: p.id,
child: Text(p.name,
style: const TextStyle(fontSize: 13))))
.toList(),
onChanged: (v) => setState(() => _partnerId = v),
decoration: const InputDecoration(),
),
),
),
_FormField(
label: '出库员',
child: InputDecorator(
decoration: const InputDecoration(),
child: Text(
currentUser?.realName ?? '-',
style: const TextStyle(fontSize: 13),
),
),
),
_FormField(
label: '出库日期',
required: true,
child: InkWell(
onTap: _pickDate,
child: InputDecorator(
decoration: const InputDecoration(),
child: Row(
children: [
Expanded(
child: Text(
'${_orderDate.year}-${_orderDate.month.toString().padLeft(2, '0')}-${_orderDate.day.toString().padLeft(2, '0')}',
style: const TextStyle(fontSize: 13),
),
),
const Icon(Icons.calendar_today,
size: 16, color: AppTheme.textSecondary),
],
const Divider(height: 1),
if (_loadingEdit)
const Expanded(child: Center(child: CircularProgressIndicator())),
if (!_loadingEdit)
Expanded(
child: SingleChildScrollView(
padding: const EdgeInsets.all(16),
child: Form(
key: _formKey,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text('基本信息',
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600,
color: AppTheme.primaryDark)),
const SizedBox(height: 16),
Wrap(
spacing: 16,
runSpacing: 16,
children: [
_FormField(
label: '出库仓库',
required: true,
child: asyncWarehouses.when(
loading: () =>
const LinearProgressIndicator(),
error: (_, __) => const Text('加载失败'),
data: (warehouses) =>
DropdownButtonFormField<int>(
value: _warehouseId,
hint: const Text('请选择仓库',
style: TextStyle(fontSize: 13)),
items: warehouses
.map((w) => DropdownMenuItem(
value: w.id,
child: Text(w.name,
style: const TextStyle(
fontSize: 13))))
.toList(),
onChanged: (v) {
setState(() => _warehouseId = v);
if (v != null) _loadInventory(v);
},
validator: (v) =>
v == null ? '不能为空' : null,
decoration: const InputDecoration(),
),
),
),
),
],
),
const SizedBox(height: 16),
_FormField(
label: '备注',
width: double.infinity,
child: TextFormField(
controller: _remarkCtrl,
maxLines: 2,
decoration: const InputDecoration(
hintText: '选填，如有特殊说明请在此注明',
),
),
),
],
),
),
),
const SizedBox(height: 12),
Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
const Text('商品明细',
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600,
color: AppTheme.primaryDark)),
const Spacer(),
ElevatedButton.icon(
onPressed: _addItem,
icon: const Icon(Icons.add, size: 16),
label: const Text('添加商品'),
style: ElevatedButton.styleFrom(
minimumSize: const Size(0, 32)),
),
],
),
const SizedBox(height: 12),
// 窄屏：逐项卡片竖排，避免 9 列表格横向溢出；宽屏保持表格
if (isMobile)
Column(
children: List.generate(
_items.length,
(i) => Padding(
padding:
const EdgeInsets.only(bottom: 10),
child: _buildItemCard(i),
)),
)
else
Table(
columnWidths: const {
0: FixedColumnWidth(36), // 序号
1: FlexColumnWidth(1.2), // 商品编码
2: FlexColumnWidth(2.0), // 商品名称
3: FlexColumnWidth(1.2), // 系列
4: FlexColumnWidth(1.2), // 规格
5: FlexColumnWidth(1.0), // 单价
6: FlexColumnWidth(0.8), // 数量
7: FlexColumnWidth(1.0), // 金额
8: FixedColumnWidth(48), // 操作
},
children: [
TableRow(
decoration: const BoxDecoration(color: Color(0xFFF0F4FF)),
children: [
'序号', '商品编码', '商品名称', '系列', '规格', '单价', '数量', '金额', '操作',
]
.map((h) => Padding(
padding: const EdgeInsets.symmetric(
horizontal: 8, vertical: 10),
child: Text(h,
style: const TextStyle(
fontSize: 13,
fontWeight: FontWeight.w600,
color: AppTheme.primaryDark)),
))
.toList(),
_FormField(
label: '客户',
child: asyncCustomers.when(
loading: () =>
const LinearProgressIndicator(),
error: (_, __) => const Text('加载失败'),
data: (result) =>
DropdownButtonFormField<int>(
value: _partnerId,
hint: const Text('请选择客户',
style: TextStyle(fontSize: 13)),
items: result.data
.map((p) => DropdownMenuItem(
value: p.id,
child: Text(p.name,
style: const TextStyle(
fontSize: 13))))
.toList(),
onChanged: (v) =>
setState(() => _partnerId = v),
decoration: const InputDecoration(),
),
),
),
_FormField(
label: '出库员',
child: InputDecorator(
decoration: const InputDecoration(),
child: Text(
currentUser?.realName ?? '-',
style: const TextStyle(fontSize: 13),
),
),
),
_FormField(
label: '出库日期',
required: true,
width: 320,
child: DatePickerField(
value: formatYmd(_orderDate),
onChanged: (v) {
final d = parseYmd(v);
if (d != null)
setState(() => _orderDate = d);
},
),
),
...List.generate(_items.length, (i) => _buildItemRow(i)),
],
),
if (_items.isEmpty)
const Padding(
padding: EdgeInsets.symmetric(vertical: 24),
child: Center(child: Text('暂无商品，点击"添加商品"从库存中选择',
style: TextStyle(color: AppTheme.textSecondary, fontSize: 13))),
const SizedBox(height: 16),
_FormField(
label: '备注',
width: double.infinity,
child: TextFormField(
controller: _remarkCtrl,
maxLines: 2,
decoration: const InputDecoration(
hintText: '选填，如有特殊说明请在此注明',
),
),
),
const Divider(height: 1),
Padding(
padding: const EdgeInsets.only(top: 12),
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
],
),
),
),
const SizedBox(height: 12),
Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
const Text('合计金额：',
const Text('商品明细',
style: TextStyle(
fontSize: 14, fontWeight: FontWeight.w500)),
Text(
'¥${_totalAmount.toStringAsFixed(2)}',
style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.w700,
color: AppTheme.danger),
fontSize: 14,
fontWeight: FontWeight.w600,
color: AppTheme.primaryDark)),
const Spacer(),
ElevatedButton.icon(
onPressed: _addItem,
icon: const Icon(Icons.add, size: 16),
label: const Text('添加商品'),
style: ElevatedButton.styleFrom(
minimumSize: const Size(0, 32)),
),
],
),
),
],
const SizedBox(height: 12),
// 窄屏：逐项卡片竖排，避免 9 列表格横向溢出；宽屏保持表格
if (isMobile)
Column(
children: List.generate(
_items.length,
(i) => Padding(
padding: const EdgeInsets.only(
bottom: 10),
child: _buildItemCard(i),
)),
)
else
Table(
columnWidths: const {
0: FixedColumnWidth(36), // 序号
1: FlexColumnWidth(1.2), // 商品编码
2: FlexColumnWidth(2.0), // 商品名称
3: FlexColumnWidth(1.2), // 系列
4: FlexColumnWidth(1.2), // 规格
5: FlexColumnWidth(1.0), // 单价
6: FlexColumnWidth(0.8), // 数量
7: FlexColumnWidth(1.0), // 金额
8: FixedColumnWidth(48), // 操作
},
children: [
TableRow(
decoration: const BoxDecoration(
color: Color(0xFFF0F4FF)),
children: [
'序号',
'商品编码',
'商品名称',
'系列',
'规格',
'单价',
'数量',
'金额',
'操作',
]
.map((h) => Padding(
padding: const EdgeInsets
.symmetric(
horizontal: 8,
vertical: 10),
child: Text(h,
style: const TextStyle(
fontSize: 13,
fontWeight:
FontWeight.w600,
color: AppTheme
.primaryDark)),
))
.toList(),
),
...List.generate(_items.length,
(i) => _buildItemRow(i)),
],
),
if (_items.isEmpty)
const Padding(
padding: EdgeInsets.symmetric(vertical: 24),
child: Center(
child: Text('暂无商品，点击"添加商品"从库存中选择',
style: TextStyle(
color: AppTheme.textSecondary,
fontSize: 13))),
),
const Divider(height: 1),
Padding(
padding: const EdgeInsets.only(top: 12),
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
const Text('合计金额：',
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w500)),
Text(
'¥${_totalAmount.toStringAsFixed(2)}',
style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.w700,
color: AppTheme.danger),
),
],
),
),
],
),
),
),
),
],
],
),
),
),
),
),
],
],
),
),
);
}
@@ -640,26 +720,39 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
),
children: [
// 序号
_cell(Text('${index + 1}', style: const TextStyle(fontSize: 13, color: AppTheme.textSecondary))),
_cell(Text('${index + 1}',
style:
const TextStyle(fontSize: 13, color: AppTheme.textSecondary))),
// 商品编码
_cell(Text(item.productCode, style: const TextStyle(fontSize: 12, color: AppTheme.textSecondary))),
_cell(Text(item.productCode,
style:
const TextStyle(fontSize: 12, color: AppTheme.textSecondary))),
// 商品名称
_cell(Text(item.productName, style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w500), overflow: TextOverflow.ellipsis)),
_cell(Text(item.productName,
style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w500),
overflow: TextOverflow.ellipsis)),
// 系列
_cell(Text(item.series, style: const TextStyle(fontSize: 12, color: AppTheme.textSecondary))),
_cell(Text(item.series,
style:
const TextStyle(fontSize: 12, color: AppTheme.textSecondary))),
// 规格
_cell(Text(item.spec, style: const TextStyle(fontSize: 12, color: AppTheme.textSecondary))),
_cell(Text(item.spec,
style:
const TextStyle(fontSize: 12, color: AppTheme.textSecondary))),
// 单价
_cell(Text(price > 0 ? '¥${price.toStringAsFixed(2)}' : '-', style: const TextStyle(fontSize: 13))),
_cell(Text(price > 0 ? '¥${price.toStringAsFixed(2)}' : '-',
style: const TextStyle(fontSize: 13))),
// 数量
Padding(padding: const EdgeInsets.all(4), child: _qtyField(item)),
// 金额
_cell(Text('¥${amount.toStringAsFixed(2)}', style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w500))),
_cell(Text('¥${amount.toStringAsFixed(2)}',
style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w500))),
// 操作
Padding(
padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 4),
child: IconButton(
icon: const Icon(Icons.delete_outline, size: 18, color: AppTheme.danger),
icon: const Icon(Icons.delete_outline,
size: 18, color: AppTheme.danger),
onPressed: () => _removeItem(index),
tooltip: '删除',
padding: EdgeInsets.zero,
@@ -676,7 +769,9 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
decoration: const InputDecoration(hintText: '0', isDense: true),
style: const TextStyle(fontSize: 13),
keyboardType: const TextInputType.numberWithOptions(decimal: true),
inputFormatters: [FilteringTextInputFormatter.allow(RegExp(r'^\d+\.?\d{0,2}'))],
inputFormatters: [
FilteringTextInputFormatter.allow(RegExp(r'^\d+\.?\d{0,2}'))
],
onChanged: (_) => setState(() {}),
validator: (v) {
if (v == null || v.isEmpty) return '不能为空';
@@ -695,9 +790,11 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
return MobileListCard(
title: Text(item.productName),
subtitle: item.productCode.isNotEmpty ? Text('编码 ${item.productCode}') : null,
subtitle:
item.productCode.isNotEmpty ? Text('编码 ${item.productCode}') : null,
trailing: IconButton(
icon: const Icon(Icons.delete_outline, size: 20, color: AppTheme.danger),
icon:
const Icon(Icons.delete_outline, size: 20, color: AppTheme.danger),
onPressed: () => _removeItem(index),
tooltip: '删除',
visualDensity: VisualDensity.compact,
@@ -719,7 +816,8 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
Widget _buildInventoryCell(int? productId, [double? available]) {
if (productId == null) {
return _cell(const Text('-', style: TextStyle(color: AppTheme.textSecondary, fontSize: 13)));
return _cell(const Text('-',
style: TextStyle(color: AppTheme.textSecondary, fontSize: 13)));
}
final qty = available ?? _inventoryMap[productId];
final text = qty != null
@@ -730,18 +828,9 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
: qty <= 0
? AppTheme.danger
: AppTheme.primary;
return _cell(Text(text, style: TextStyle(fontSize: 13, fontWeight: FontWeight.w700, color: color)));
}
Future<void> _pickDate() async {
final date = await showDatePicker(
context: context,
initialDate: _orderDate,
firstDate: DateTime(2020),
lastDate: DateTime(2030),
locale: const Locale('zh', 'CN'),
);
if (date != null) setState(() => _orderDate = date);
return _cell(Text(text,
style: TextStyle(
fontSize: 13, fontWeight: FontWeight.w700, color: color)));
}
}
@@ -763,9 +852,7 @@ class _FormField extends StatelessWidget {
// 窄屏（手机）字段占满整行，便于点选；宽屏沿用固定宽度配合 Wrap 多列。
final effectiveWidth = width == double.infinity
? double.infinity
: (context.isMobile
? MediaQuery.sizeOf(context).width - 64
: width);
: (context.isMobile ? MediaQuery.sizeOf(context).width - 64 : width);
return SizedBox(
width: effectiveWidth,
child: Column(
@@ -774,9 +861,11 @@ class _FormField extends StatelessWidget {
Row(
children: [
if (required)
const Text('*', style: TextStyle(color: AppTheme.danger, fontSize: 13)),
const Text('*',
style: TextStyle(color: AppTheme.danger, fontSize: 13)),
Text(label,
style: const TextStyle(fontSize: 13, color: AppTheme.textSecondary)),
style: const TextStyle(
fontSize: 13, color: AppTheme.textSecondary)),
],
),
const SizedBox(height: 6),
@@ -820,7 +909,8 @@ class _InventoryPickerDialogState extends State<_InventoryPickerDialog> {
@override
Widget build(BuildContext context) {
final filtered = _filtered;
final allSelected = filtered.isNotEmpty && filtered.every((e) => _selected.contains(e.productId));
final allSelected = filtered.isNotEmpty &&
filtered.every((e) => _selected.contains(e.productId));
return Dialog(
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
@@ -835,16 +925,19 @@ class _InventoryPickerDialogState extends State<_InventoryPickerDialog> {
child: Row(
children: [
const Text('选择商品',
style: TextStyle(fontSize: 15, fontWeight: FontWeight.w600)),
style:
TextStyle(fontSize: 15, fontWeight: FontWeight.w600)),
const SizedBox(width: 8),
Text('已选 ${_selected.length} 个',
style: const TextStyle(fontSize: 13, color: AppTheme.textSecondary)),
style: const TextStyle(
fontSize: 13, color: AppTheme.textSecondary)),
const Spacer(),
IconButton(
icon: const Icon(Icons.close, size: 20),
onPressed: () => Navigator.pop(context),
padding: EdgeInsets.zero,
constraints: const BoxConstraints(minWidth: 32, minHeight: 32),
constraints:
const BoxConstraints(minWidth: 32, minHeight: 32),
),
],
),
@@ -859,7 +952,8 @@ class _InventoryPickerDialogState extends State<_InventoryPickerDialog> {
hintText: '搜索商品编码、名称或系列',
prefixIcon: Icon(Icons.search, size: 18),
isDense: true,
contentPadding: EdgeInsets.symmetric(horizontal: 12, vertical: 10),
contentPadding:
EdgeInsets.symmetric(horizontal: 12, vertical: 10),
),
onChanged: (v) => setState(() => _search = v),
),
@@ -978,7 +1072,8 @@ class _InventoryPickerDialogState extends State<_InventoryPickerDialog> {
? null
: () {
final result = widget.items
.where((item) => _selected.contains(item.productId))
.where((item) =>
_selected.contains(item.productId))
.toList();
Navigator.pop(context, result);
},
@@ -1002,7 +1097,8 @@ class _InventoryPickerDialogState extends State<_InventoryPickerDialog> {
color: AppTheme.primaryDark)),
);
Widget _dataCell(String text, double width, {Color? color, bool bold = false}) =>
Widget _dataCell(String text, double width,
{Color? color, bool bold = false}) =>
SizedBox(
width: width,
child: Text(
client/lib/widgets/date_picker_field.dart
+179
View File
@@ -0,0 +1,179 @@
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。
class DatePickerField extends StatefulWidget {
final String? value; // yyyy-MM-dd
final ValueChanged<String?> onChanged;
final bool isRequired;
final String? label;
const DatePickerField({
super.key,
this.value,
required this.onChanged,
this.isRequired = false,
this.label,
});
@override
State<DatePickerField> createState() => _DatePickerFieldState();
}
class _DatePickerFieldState extends State<DatePickerField> {
int? _year;
int? _month;
int? _day;
@override
void initState() {
super.initState();
_parse(widget.value);
}
@override
void didUpdateWidget(DatePickerField old) {
super.didUpdateWidget(old);
if (old.value != widget.value) {
_parse(widget.value);
}
}
void _parse(String? v) {
final d = parseYmd(v);
_year = d?.year;
_month = d?.month;
_day = d?.day;
}
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;
}
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)
: 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);
},
),
),
],
),
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),
),
),
],
);
},
);
}
}
client/lib/widgets/searchable_option_field.dart
+108 -11
View File
@@ -13,8 +13,9 @@ class OptionItem {
late final String _initials;
OptionItem({required this.id, required this.name, this.code}) {
_fullPinyin = PinyinHelper.getPinyinE(name, separator: '', defPinyin: '').toLowerCase();
_initials = PinyinHelper.getShortPinyin(name).toLowerCase();
_fullPinyin = PinyinHelper.getPinyinE(name, separator: '', defPinyin: '')
.toLowerCase();
_initials = PinyinHelper.getShortPinyin(name).toLowerCase();
}
bool matches(String kw) {
@@ -36,6 +37,10 @@ class SearchableOptionField extends StatelessWidget {
final bool isRequired;
final bool isDense;
/// 可选：搜索无匹配时「新增到基础数据」。回调收到当前关键字（用户可在确认框里改），
/// 创建成功返回新选项 id（自动选中），失败/取消返回 null。为空则不显示新增入口。
final Future<int?> Function(String keyword)? onCreate;
const SearchableOptionField({
super.key,
required this.options,
@@ -45,6 +50,7 @@ class SearchableOptionField extends StatelessWidget {
required this.onChanged,
this.isRequired = false,
this.isDense = true,
this.onCreate,
});
String get _displayText {
@@ -59,6 +65,7 @@ class SearchableOptionField extends StatelessWidget {
title: dialogTitle,
options: options,
selectedId: selectedId,
onCreate: onCreate,
),
);
// result == -1 means "clear selection"
@@ -86,9 +93,11 @@ class SearchableOptionField extends StatelessWidget {
suffixIcon: selected
? GestureDetector(
onTap: () => onChanged(null),
child: const Icon(Icons.close, size: 14, color: AppTheme.textSecondary),
child: const Icon(Icons.close,
size: 14, color: AppTheme.textSecondary),
)
: const Icon(Icons.arrow_drop_down, size: 16, color: AppTheme.textSecondary),
: const Icon(Icons.arrow_drop_down,
size: 16, color: AppTheme.textSecondary),
),
isEmpty: !selected,
child: Text(
@@ -110,7 +119,13 @@ class _SearchDialog extends StatefulWidget {
final String title;
final List<OptionItem> options;
final int? selectedId;
const _SearchDialog({required this.title, required this.options, this.selectedId});
final Future<int?> Function(String keyword)? onCreate;
const _SearchDialog({
required this.title,
required this.options,
this.selectedId,
this.onCreate,
});
@override
State<_SearchDialog> createState() => _SearchDialogState();
@@ -119,6 +134,7 @@ class _SearchDialog extends StatefulWidget {
class _SearchDialogState extends State<_SearchDialog> {
final _ctrl = TextEditingController();
String _keyword = '';
bool _creating = false;
@override
void dispose() {
@@ -126,11 +142,68 @@ class _SearchDialogState extends State<_SearchDialog> {
super.dispose();
}
/// 「新增到基础数据」流程：确认（名称可改）→ onCreate → 成功则带新 id 关闭搜索框。
Future<void> _createFlow() async {
final kw = _keyword.trim();
if (widget.onCreate == null || kw.isEmpty) return;
final nameCtrl = TextEditingController(text: kw);
final confirmed = await showAppDialog<bool>(
context: context,
builder: (_) => AlertDialog(
title: const Text('新增到基础数据', style: TextStyle(fontSize: 16)),
content: SizedBox(
width: context.dialogWidth(320),
child: TextField(
controller: nameCtrl,
autofocus: true,
decoration: const InputDecoration(labelText: '名称', isDense: true),
),
),
actions: [
TextButton(
onPressed: () => Navigator.of(context).pop(false),
child: const Text('取消'),
),
TextButton(
onPressed: () => Navigator.of(context).pop(true),
child: const Text('确认新增'),
),
],
),
);
if (confirmed != true) return;
final name = nameCtrl.text.trim();
if (name.isEmpty) return;
setState(() => _creating = true);
try {
final newId = await widget.onCreate!(name);
if (!mounted) return;
if (newId != null) {
Navigator.of(context).pop(newId); // 回填并自动选中
} else {
setState(() => _creating = false);
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('新增失败，请重试')),
);
}
} catch (e) {
if (!mounted) return;
setState(() => _creating = false);
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('新增失败：$e')),
);
}
}
@override
Widget build(BuildContext context) {
final filtered = _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());
final canCreate = widget.onCreate != null && kw.isNotEmpty && !hasExact;
return AlertDialog(
title: Text(widget.title, style: const TextStyle(fontSize: 16)),
@@ -153,8 +226,12 @@ class _SearchDialogState extends State<_SearchDialog> {
const SizedBox(height: 8),
Expanded(
child: filtered.isEmpty
? const Center(
child: Text('无匹配结果', style: TextStyle(color: AppTheme.textSecondary)))
? Center(
child: Text(
canCreate ? '无匹配结果，可新增到基础数据' : '无匹配结果',
style: const TextStyle(color: AppTheme.textSecondary),
),
)
: ListView.builder(
itemCount: filtered.length,
itemBuilder: (_, i) {
@@ -162,17 +239,36 @@ class _SearchDialogState extends State<_SearchDialog> {
final isSelected = opt.id == widget.selectedId;
return ListTile(
dense: true,
title: Text(opt.name, style: const TextStyle(fontSize: 13)),
title: Text(opt.name,
style: const TextStyle(fontSize: 13)),
subtitle: opt.code != null && opt.code!.isNotEmpty
? Text(opt.code!, style: const TextStyle(fontSize: 11))
? Text(opt.code!,
style: const TextStyle(fontSize: 11))
: null,
selected: isSelected,
selectedTileColor: AppTheme.primary.withValues(alpha: 0.08),
selectedTileColor:
AppTheme.primary.withValues(alpha: 0.08),
onTap: () => Navigator.of(context).pop(opt.id),
);
},
),
),
if (canCreate)
Align(
alignment: Alignment.centerLeft,
child: TextButton.icon(
onPressed: _creating ? null : _createFlow,
icon: _creating
? const SizedBox(
width: 14,
height: 14,
child: CircularProgressIndicator(strokeWidth: 2),
)
: const Icon(Icons.add, size: 16),
label: Text('新增「$kw」到基础数据',
style: const TextStyle(fontSize: 12)),
),
),
],
),
),
@@ -180,7 +276,8 @@ class _SearchDialogState extends State<_SearchDialog> {
if (widget.selectedId != null)
TextButton(
onPressed: () => Navigator.of(context).pop(-1),
child: const Text('清除选择', style: TextStyle(color: AppTheme.textSecondary)),
child: const Text('清除选择',
style: TextStyle(color: AppTheme.textSecondary)),
),
TextButton(
onPressed: () => Navigator.of(context).pop(null),
client/test/date_picker_field_test.dart
+56
View File
@@ -0,0 +1,56 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:jiu_client/core/utils/date_util.dart';
import 'package:jiu_client/widgets/date_picker_field.dart';
void main() {
group('date_util', () {
test('formatYmd 补零', () {
expect(formatYmd(DateTime(2026, 6, 9)), '2026-06-09');
expect(formatYmd(DateTime(2026, 12, 31)), '2026-12-31');
});
test('parseYmd 解析/容错', () {
expect(parseYmd('2026-06-19'), DateTime(2026, 6, 19));
expect(parseYmd('2026-06-19T08:00:00'), DateTime(2026, 6, 19));
expect(parseYmd(null), isNull);
expect(parseYmd(''), isNull);
});
test('composeYmd 正常组合', () {
expect(composeYmd(2026, 6, 15), '2026-06-15');
});
test('composeYmd 把超界的日 clamp 回当月最大值', () {
expect(composeYmd(2026, 2, 31), '2026-02-28'); // 平年 2 月
expect(composeYmd(2024, 2, 31), '2024-02-29'); // 闰年 2 月
expect(composeYmd(2026, 4, 31), '2026-04-30'); // 4 月 30 天
});
test('composeYmd 任一为空返回 null', () {
expect(composeYmd(null, 6, 15), isNull);
expect(composeYmd(2026, null, 15), isNull);
expect(composeYmd(2026, 6, null), isNull);
});
});
group('DatePickerField', () {
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));
});
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);
});
});
}
client/test/searchable_option_create_test.dart
+59
View File
@@ -0,0 +1,59 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:jiu_client/widgets/searchable_option_field.dart';
void main() {
Widget host({
required ValueChanged<int?> onChanged,
Future<int?> Function(String)? onCreate,
}) {
return MaterialApp(
home: Scaffold(
body: SearchableOptionField(
options: [OptionItem(id: 1, name: '53度')],
selectedId: null,
hint: '选择系列',
dialogTitle: '选择系列',
onChanged: onChanged,
onCreate: onCreate,
),
),
);
}
testWidgets('搜不到时显示「新增到基础数据」入口', (tester) async {
await tester.pumpWidget(host(onChanged: (_) {}, onCreate: (_) async => 99));
// 打开搜索对话框
await tester.tap(find.byType(SearchableOptionField));
await tester.pumpAndSettle();
// 输入不存在的关键字
await tester.enterText(find.byType(TextField).first, '52度');
await tester.pumpAndSettle();
expect(find.textContaining('新增「52度」到基础数据'), findsOneWidget);
});
testWidgets('确认新增后回填选中新 id', (tester) async {
int? selected;
await tester.pumpWidget(
host(onChanged: (v) => selected = v, onCreate: (_) async => 99));
await tester.tap(find.byType(SearchableOptionField));
await tester.pumpAndSettle();
await tester.enterText(find.byType(TextField).first, '52度');
await tester.pumpAndSettle();
await tester.tap(find.textContaining('新增「52度」到基础数据'));
await tester.pumpAndSettle();
// 确认框
await tester.tap(find.text('确认新增'));
await tester.pumpAndSettle();
expect(selected, 99);
});
testWidgets('未提供 onCreate 时不显示新增入口', (tester) async {
await tester.pumpWidget(host(onChanged: (_) {}));
await tester.tap(find.byType(SearchableOptionField));
await tester.pumpAndSettle();
await tester.enterText(find.byType(TextField).first, '52度');
await tester.pumpAndSettle();
expect(find.textContaining('新增'), findsNothing);
});
}