Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 wangjia
|
bcc02a2f09 | ||
|
wangjia
|
50b5c9fccb | ||
|
wangjia
|
648d9bc0d5 |
@@ -5,6 +5,20 @@ 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.63] - 2026-06-20
|
||||
|
||||
### 修复
|
||||
- 修复入库单 / 出库单「全部状态」筛选遗漏未审核单据的问题，状态下拉新增「待审核」选项，且筛选真正生效
|
||||
- 修复「入库审核 / 出库审核」标签页只显示部分待审核单、漏掉早期单号的问题：筛选改为服务端驱动，跨分页结果完整可靠
|
||||
|
||||
## [1.0.62] - 2026-06-20
|
||||
|
||||
### 改进
|
||||
- 入库单、出库单的仓库、供应商、客户下拉框改为可搜索：点击后弹出搜索框，支持按名称、拼音首字母或编码快速筛选，选项多时无需再逐条翻找
|
||||
|
||||
### 修复
|
||||
- 修复账号在别处登录或被管理员强制下线后、退回登录页却没有任何提示的问题，现在会弹窗明确告知「登录已失效」
|
||||
|
||||
## [1.0.61] - 2026-06-20
|
||||
|
||||
### 改进
|
||||
|
||||
@@ -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.65] - 2026-06-20
|
||||
|
||||
### 修复
|
||||
- 单据列表状态筛选支持一次查询多种状态，配合客户端修复让「入库审核 / 出库审核」标签页完整列出全部待审核单据，不再因分页只显示部分
|
||||
|
||||
## [1.0.64] - 2026-06-20
|
||||
|
||||
### 改进
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
@@ -40,7 +41,7 @@ func (h *StockInHandler) List(c *gin.Context) {
|
||||
Where("shop_id = ? AND deleted_at IS NULL", shopID)
|
||||
|
||||
if status := c.Query("status"); status != "" {
|
||||
query = query.Where("status = ?", status)
|
||||
query = query.Where("status IN ?", strings.Split(status, ","))
|
||||
}
|
||||
if startDate := c.Query("start_date"); startDate != "" {
|
||||
query = query.Where("order_date >= ?", startDate)
|
||||
|
||||
@@ -343,4 +343,9 @@ func TestStockInHandler_List_FilterByStatus(t *testing.T) {
|
||||
w = makeRequest(r, "GET", "/api/v1/stock-in/orders?status=draft", token, nil)
|
||||
resp = parseResponse(w)
|
||||
assert.Equal(t, float64(1), resp["total"].(float64))
|
||||
|
||||
// 逗号分隔的多状态：pending + draft 应返回两条（审核标签页用法）
|
||||
w = makeRequest(r, "GET", "/api/v1/stock-in/orders?status=pending,draft", token, nil)
|
||||
resp = parseResponse(w)
|
||||
assert.Equal(t, float64(2), resp["total"].(float64))
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ package handler
|
||||
import (
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"gorm.io/gorm"
|
||||
@@ -33,7 +34,7 @@ func (h *StockOutHandler) List(c *gin.Context) {
|
||||
Where("shop_id = ? AND deleted_at IS NULL", shopID)
|
||||
|
||||
if status := c.Query("status"); status != "" {
|
||||
query = query.Where("status = ?", status)
|
||||
query = query.Where("status IN ?", strings.Split(status, ","))
|
||||
}
|
||||
if startDate := c.Query("start_date"); startDate != "" {
|
||||
query = query.Where("order_date >= ?", startDate)
|
||||
|
||||
@@ -60,6 +60,9 @@ class StockInListNotifier extends AsyncNotifier<PageResult<StockInOrder>> {
|
||||
reload();
|
||||
}
|
||||
|
||||
/// 当前服务端状态过滤值（供页面进入时对齐标签/下拉，避免重复拉取）
|
||||
String get currentStatus => _status;
|
||||
|
||||
void setStatus(String status) {
|
||||
_status = status;
|
||||
_page = 1;
|
||||
|
||||
@@ -60,6 +60,9 @@ class StockOutListNotifier extends AsyncNotifier<PageResult<StockOutOrder>> {
|
||||
reload();
|
||||
}
|
||||
|
||||
/// 当前服务端状态过滤值（供页面进入时对齐标签/下拉，避免重复拉取）
|
||||
String get currentStatus => _status;
|
||||
|
||||
void setStatus(String status) {
|
||||
_status = status;
|
||||
_page = 1;
|
||||
|
||||
@@ -94,6 +94,34 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
|
||||
Timer(AppConstants.dropdownCloseDelay, _closeUsername);
|
||||
}
|
||||
});
|
||||
// 处理「进入登录页之前」就已置入的会话失效提示：登出在 login_screen 挂载前就
|
||||
// 设好了 sessionEndedMessageProvider，而 build 里的 ref.listen 只捕获注册之后的
|
||||
// 变化，会漏掉这个既有值 → 之前「被顶下线无提示」的根因。这里在首帧主动读一次。
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (!mounted) return;
|
||||
final msg = ref.read(sessionEndedMessageProvider);
|
||||
if (msg != null && msg.isNotEmpty) _showSessionEndedDialog(msg);
|
||||
});
|
||||
}
|
||||
|
||||
/// 弹出「登录已失效 / 被强制下线」提示弹窗，并清空 provider 避免重复弹。
|
||||
void _showSessionEndedDialog(String msg) {
|
||||
if (!mounted) return;
|
||||
ref.read(sessionEndedMessageProvider.notifier).state = null;
|
||||
showDialog<void>(
|
||||
context: context,
|
||||
builder: (ctx) => AlertDialog(
|
||||
icon: const Icon(Icons.lock_outline, color: AppTheme.danger),
|
||||
title: const Text('登录已失效'),
|
||||
content: Text(msg),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.of(ctx).pop(),
|
||||
child: const Text('我知道了'),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _loadHistory() async {
|
||||
@@ -346,14 +374,12 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
// 被踢下线 / 会话失效：登出后跳回登录页，弹一次提示并清空
|
||||
// 已在登录页时会话再失效（例如停留在登录页期间后台请求被吊销）：弹窗提示。
|
||||
// 进入登录页之前就置入的既有值由 initState 的首帧读取处理。
|
||||
ref.listen<String?>(sessionEndedMessageProvider, (prev, next) {
|
||||
if (next != null && next.isNotEmpty) {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (!mounted) return;
|
||||
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
|
||||
content: Text(next), backgroundColor: AppTheme.danger));
|
||||
ref.read(sessionEndedMessageProvider.notifier).state = null;
|
||||
_showSessionEndedDialog(next);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
@@ -604,24 +604,19 @@ class _StockInFormScreenState extends ConsumerState<StockInFormScreen> {
|
||||
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))))
|
||||
SearchableOptionField(
|
||||
options: warehouses
|
||||
.map((w) => OptionItem(
|
||||
id: w.id, name: w.name))
|
||||
.toList(),
|
||||
selectedId: _warehouseId,
|
||||
hint: '请选择仓库',
|
||||
dialogTitle: '选择入库仓库',
|
||||
isRequired: true,
|
||||
onChanged: (v) {
|
||||
setState(() => _warehouseId = v);
|
||||
if (v != null) _loadInventory(v);
|
||||
},
|
||||
validator: (v) =>
|
||||
v == null ? '不能为空' : null,
|
||||
decoration: const InputDecoration(),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -633,22 +628,19 @@ class _StockInFormScreenState extends ConsumerState<StockInFormScreen> {
|
||||
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))))
|
||||
SearchableOptionField(
|
||||
options: result.data
|
||||
.map((p) => OptionItem(
|
||||
id: p.id,
|
||||
name: p.name,
|
||||
code: p.code))
|
||||
.toList(),
|
||||
selectedId: _partnerId,
|
||||
hint: '请选择供应商',
|
||||
dialogTitle: '选择供应商',
|
||||
isRequired: true,
|
||||
onChanged: (v) =>
|
||||
setState(() => _partnerId = v),
|
||||
validator: (v) =>
|
||||
v == null ? '不能为空' : null,
|
||||
decoration: const InputDecoration(),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -61,6 +61,14 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
|
||||
ColumnPrefs.load(_screenId).then((saved) {
|
||||
if (saved != null && mounted) setState(() => _hiddenCols = saved);
|
||||
});
|
||||
// 进入页面时把服务端状态过滤对齐到当前标签/下拉（provider 持久化，State 会重建）
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (!mounted) return;
|
||||
final tab = ref.read(stockInTabProvider);
|
||||
final want = tab == 1 ? 'pending,draft' : _statusFilter;
|
||||
final notifier = ref.read(stockInListProvider.notifier);
|
||||
if (notifier.currentStatus != want) notifier.setStatus(want);
|
||||
});
|
||||
}
|
||||
|
||||
String? get _startDate => _dateRange != null
|
||||
@@ -89,7 +97,13 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
|
||||
return PageScaffold(
|
||||
title: '入库管理',
|
||||
initialTab: ref.read(stockInTabProvider),
|
||||
onTabChanged: (i) => ref.read(stockInTabProvider.notifier).state = i,
|
||||
onTabChanged: (i) {
|
||||
ref.read(stockInTabProvider.notifier).state = i;
|
||||
// 审核标签页按 pending+draft 服务端拉取；入库单页沿用下拉状态（'' 为全部）
|
||||
ref
|
||||
.read(stockInListProvider.notifier)
|
||||
.setStatus(i == 1 ? 'pending,draft' : _statusFilter);
|
||||
},
|
||||
tabs: const [
|
||||
Tab(text: '入库单'),
|
||||
Tab(text: '入库审核'),
|
||||
@@ -124,15 +138,19 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
|
||||
),
|
||||
data: (result) {
|
||||
final allOrders = result.data;
|
||||
// 状态过滤已改为服务端驱动（setStatus）。这里仅按标签做轻量显示守卫，
|
||||
// 避免共用 provider 在标签切换、refetch 在途时短暂闪现他状态数据。
|
||||
final List<StockInOrder> statusFiltered;
|
||||
if (filterStatus == 'pending') {
|
||||
// 入库审核：服务端按 pending,draft 拉取
|
||||
statusFiltered = allOrders
|
||||
.where((o) => o.status == 'draft' || o.status == 'pending')
|
||||
.toList();
|
||||
} else if (filterStatus == 'exclude_pending') {
|
||||
statusFiltered = allOrders
|
||||
.where((o) => o.status != 'draft' && o.status != 'pending')
|
||||
.toList();
|
||||
// 入库单：服务端按下拉状态拉取；'全部状态' 显示全部（含未审核）
|
||||
statusFiltered = _statusFilter.isEmpty
|
||||
? allOrders
|
||||
: allOrders.where((o) => o.status == _statusFilter).toList();
|
||||
} else {
|
||||
statusFiltered = allOrders;
|
||||
}
|
||||
@@ -1041,6 +1059,7 @@ class _StatusFilterDropdown extends StatelessWidget {
|
||||
items: [
|
||||
const DropdownMenuItem(value: '', child: Text('全部状态', style: TextStyle(fontSize: 13))),
|
||||
const DropdownMenuItem(value: 'draft', child: Text('草稿', style: TextStyle(fontSize: 13))),
|
||||
const DropdownMenuItem(value: 'pending', child: Text('待审核', style: TextStyle(fontSize: 13))),
|
||||
const DropdownMenuItem(value: 'approved', child: Text('已审核', style: TextStyle(fontSize: 13))),
|
||||
const DropdownMenuItem(value: 'rejected', child: Text('已拒绝', style: TextStyle(fontSize: 13))),
|
||||
],
|
||||
|
||||
@@ -9,6 +9,7 @@ import '../../core/utils/print_util.dart';
|
||||
import '../../core/utils/date_util.dart';
|
||||
import '../../models/stock_out.dart';
|
||||
import '../../widgets/date_picker_field.dart';
|
||||
import '../../widgets/searchable_option_field.dart';
|
||||
import '../../core/config/app_constants.dart';
|
||||
import '../../providers/inventory_provider.dart';
|
||||
import '../../providers/partner_provider.dart';
|
||||
@@ -498,24 +499,19 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
|
||||
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))))
|
||||
SearchableOptionField(
|
||||
options: warehouses
|
||||
.map((w) => OptionItem(
|
||||
id: w.id, name: w.name))
|
||||
.toList(),
|
||||
selectedId: _warehouseId,
|
||||
hint: '请选择仓库',
|
||||
dialogTitle: '选择出库仓库',
|
||||
isRequired: true,
|
||||
onChanged: (v) {
|
||||
setState(() => _warehouseId = v);
|
||||
if (v != null) _loadInventory(v);
|
||||
},
|
||||
validator: (v) =>
|
||||
v == null ? '不能为空' : null,
|
||||
decoration: const InputDecoration(),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -526,20 +522,18 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
|
||||
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))))
|
||||
SearchableOptionField(
|
||||
options: result.data
|
||||
.map((p) => OptionItem(
|
||||
id: p.id,
|
||||
name: p.name,
|
||||
code: p.code))
|
||||
.toList(),
|
||||
selectedId: _partnerId,
|
||||
hint: '请选择客户',
|
||||
dialogTitle: '选择客户',
|
||||
onChanged: (v) =>
|
||||
setState(() => _partnerId = v),
|
||||
decoration: const InputDecoration(),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -47,6 +47,14 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
|
||||
ColumnPrefs.load(_screenId).then((saved) {
|
||||
if (saved != null && mounted) setState(() => _hiddenCols = saved);
|
||||
});
|
||||
// 进入页面时把服务端状态过滤对齐到当前标签/下拉（provider 持久化，State 会重建）
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (!mounted) return;
|
||||
final tab = ref.read(stockOutTabProvider);
|
||||
final want = tab == 1 ? 'pending,draft' : _statusFilter;
|
||||
final notifier = ref.read(stockOutListProvider.notifier);
|
||||
if (notifier.currentStatus != want) notifier.setStatus(want);
|
||||
});
|
||||
}
|
||||
|
||||
static const _colDefs = [
|
||||
@@ -89,7 +97,13 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
|
||||
return PageScaffold(
|
||||
title: '出库管理',
|
||||
initialTab: ref.read(stockOutTabProvider),
|
||||
onTabChanged: (i) => ref.read(stockOutTabProvider.notifier).state = i,
|
||||
onTabChanged: (i) {
|
||||
ref.read(stockOutTabProvider.notifier).state = i;
|
||||
// 审核标签页按 pending+draft 服务端拉取；出库单页沿用下拉状态（'' 为全部）
|
||||
ref
|
||||
.read(stockOutListProvider.notifier)
|
||||
.setStatus(i == 1 ? 'pending,draft' : _statusFilter);
|
||||
},
|
||||
tabs: const [
|
||||
Tab(text: '出库单'),
|
||||
Tab(text: '出库审核'),
|
||||
@@ -124,15 +138,19 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
|
||||
),
|
||||
data: (result) {
|
||||
final allOrders = result.data;
|
||||
// 状态过滤已改为服务端驱动（setStatus）。这里仅按标签做轻量显示守卫，
|
||||
// 避免共用 provider 在标签切换、refetch 在途时短暂闪现他状态数据。
|
||||
final List<StockOutOrder> statusFiltered;
|
||||
if (filterStatus == 'pending') {
|
||||
// 出库审核：服务端按 pending,draft 拉取
|
||||
statusFiltered = allOrders
|
||||
.where((o) => o.status == 'draft' || o.status == 'pending')
|
||||
.toList();
|
||||
} else if (filterStatus == 'exclude_pending') {
|
||||
statusFiltered = allOrders
|
||||
.where((o) => o.status != 'draft' && o.status != 'pending')
|
||||
.toList();
|
||||
// 出库单：服务端按下拉状态拉取；'全部状态' 显示全部（含未审核）
|
||||
statusFiltered = _statusFilter.isEmpty
|
||||
? allOrders
|
||||
: allOrders.where((o) => o.status == _statusFilter).toList();
|
||||
} else {
|
||||
statusFiltered = allOrders;
|
||||
}
|
||||
@@ -950,6 +968,7 @@ class _StatusFilterDropdown extends StatelessWidget {
|
||||
items: const [
|
||||
DropdownMenuItem(value: '', child: Text('全部状态', style: TextStyle(fontSize: 13))),
|
||||
DropdownMenuItem(value: 'draft', child: Text('草稿', style: TextStyle(fontSize: 13))),
|
||||
DropdownMenuItem(value: 'pending', child: Text('待审核', style: TextStyle(fontSize: 13))),
|
||||
DropdownMenuItem(value: 'approved', child: Text('已审核', style: TextStyle(fontSize: 13))),
|
||||
DropdownMenuItem(value: 'rejected', child: Text('已拒绝', style: TextStyle(fontSize: 13))),
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user