From 095cf11637707b770e613650e978310abeddf05e Mon Sep 17 00:00:00 2001 From: cnbugs Date: Fri, 6 Nov 2026 13:03:53 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B5=84=E4=BA=A7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8C=89=E8=B5=84=E4=BA=A7=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E5=AF=BC=E5=87=BAExcel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 导出接口新增 asset_numbers 参数,支持逗号/顿号/空格/换行分隔多个编号,精确匹配并自动去重 - 未找到的编号记入消息提示 - 资产列表页新增按编号导出输入框,支持回车触发下载 --- assetapp/views.py | 20 +++++++++++++++++ templates/assetapp/asset_list.html | 36 ++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/assetapp/views.py b/assetapp/views.py index 6a408ae..2498735 100644 --- a/assetapp/views.py +++ b/assetapp/views.py @@ -286,6 +286,26 @@ def asset_export(request): if status: queryset = queryset.filter(status=status) + # 按资产编号导出(支持逗号/空格/换行分隔多个编号,精确匹配) + asset_numbers_raw = request.GET.get('asset_numbers', '').strip() + missing_numbers = [] + if asset_numbers_raw: + numbers = [n.strip() for n in asset_numbers_raw.replace(',', ',').replace('、', ',').replace('\n', ',').replace(' ', ',').split(',') if n.strip()] + # 去重,保持顺序 + seen = set() + numbers = [n for n in numbers if not (n in seen or seen.add(n))] + if numbers: + queryset = queryset.filter(asset_number__in=numbers) + # 检查哪些编号不存在 + found = set(queryset.values_list('asset_number', flat=True)) + missing_numbers = [n for n in numbers if n not in found] + + if missing_numbers: + messages.warning( + request, + f'以下 {len(missing_numbers)} 个资产编号未找到: {", ".join(missing_numbers)}' + ) + wb = export_assets_to_excel(queryset) output = BytesIO() diff --git a/templates/assetapp/asset_list.html b/templates/assetapp/asset_list.html index df3112f..fb743ab 100644 --- a/templates/assetapp/asset_list.html +++ b/templates/assetapp/asset_list.html @@ -6,6 +6,15 @@

资产列表

+ +
+ + +
导出Excel @@ -175,4 +184,31 @@
共 {{ page_obj.paginator.count }} 条记录,第 {{ page_obj.number }}/{{ page_obj.paginator.num_pages }} 页
+ + {% endblock %}