From 9b79c1426773ffc6e3cbffbede8100e5652f56ce Mon Sep 17 00:00:00 2001 From: cnbugs Date: Wed, 11 Nov 2026 17:22:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E8=BD=AF=E4=BB=B6?= =?UTF-8?q?=E8=B5=84=E4=BA=A7=EF=BC=88=E8=BD=AF=E8=B5=84=E4=BA=A7=EF=BC=89?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 SoftwareCategory/SoftwareAsset/SoftwareChangeLog 模型与迁移0010 - 软资产CRUD:编号/名称/分类/供应商/版本/许可类型/授权数量/许可密钥/账号/费用/起止日期/负责人/部门/状态 - 许可类型:永久授权/订阅/开源免费/按需付费;状态:在用/闲置/已过期/已注销 - 到期提醒:已过期/即将到期(30天)自动标识 - Excel导入导出:模板下载、ID存在时更新、分类自动创建、空白行跳过、缺编号/名称报错 - 软件分类独立管理,分类下有资产时禁止删除 - 独立软件变更记录页;仪表盘增加软件统计卡片、软件分类统计、许可类型分布 - 导航栏改造:资产管理/分类管理/变更记录/导入导出下拉菜单 - 全流程15项功能验证通过(CRUD/导入导出/权限/仪表盘) --- README.md | 34 +- assetapp/admin.py | 28 +- assetapp/excel_utils.py | 225 +++++++++++ assetapp/forms.py | 27 +- ...ategory_softwareasset_softwarechangelog.py | 80 ++++ assetapp/models.py | 124 ++++++ assetapp/urls.py | 17 + assetapp/views.py | 374 +++++++++++++++++- templates/assetapp/base.html | 38 +- templates/assetapp/dashboard.html | 271 ++++++++++--- .../software_category_confirm_delete.html | 32 ++ .../assetapp/software_category_form.html | 40 ++ .../assetapp/software_category_list.html | 52 +++ templates/assetapp/software_changelog.html | 112 ++++++ .../assetapp/software_confirm_delete.html | 33 ++ templates/assetapp/software_detail.html | 137 +++++++ templates/assetapp/software_form.html | 116 ++++++ templates/assetapp/software_import.html | 71 ++++ templates/assetapp/software_list.html | 166 ++++++++ 19 files changed, 1908 insertions(+), 69 deletions(-) create mode 100644 assetapp/migrations/0010_softwarecategory_softwareasset_softwarechangelog.py create mode 100644 templates/assetapp/software_category_confirm_delete.html create mode 100644 templates/assetapp/software_category_form.html create mode 100644 templates/assetapp/software_category_list.html create mode 100644 templates/assetapp/software_changelog.html create mode 100644 templates/assetapp/software_confirm_delete.html create mode 100644 templates/assetapp/software_detail.html create mode 100644 templates/assetapp/software_form.html create mode 100644 templates/assetapp/software_import.html create mode 100644 templates/assetapp/software_list.html diff --git a/README.md b/README.md index c4d2a11..7f324ce 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,11 @@ # 希姆计算资产管理管理系统 -基于 Django + MySQL 的企业级硬件资产管理系统,支持 Excel 批量导入导出。 +基于 Django + MySQL 的企业级资产管理管理系统,支持硬件资产与软件资产(软资产)管理、Excel 批量导入导出。 ## ✨ 功能特性 -- **仪表盘** — 资产统计总览、分类统计、状态分布、最近变更记录 +- **仪表盘** — 硬件/软件资产统计总览、分类统计、状态分布、最近变更记录 +- **软件资产管理** — 许可证/订阅/域名/证书等软资产全生命周期管理,许可类型与到期提醒 - **资产管理** — 设备增删改查、资产编号/品牌/型号/序列号/资产面值等完整字段 - **分类管理** — 自定义设备分类(服务器、网络设备、存储设备等) - **变更追踪** — 资产信息修改自动记录变更历史 @@ -131,6 +132,15 @@ DATABASES = { - 管理员重置自己的密码后当前登录不会失效 - 该功能仅 **超级管理员(is_superuser)** 可访问,其他用户访问会被拒绝 +## 🖥️ 软件资产管理 + +- 导航栏 **资产管理 → 软件资产**(路径 `/software/`) +- 字段:资产编号、软件名称、软件分类、供应商、版本、许可类型(永久授权/订阅/开源免费/按需付费)、授权数量、许可密钥/激活码、账号、费用、启用/到期日期、负责人、使用部门、状态(在用/闲置/已过期/已注销)、备注 +- 到期提醒:已过期/即将到期(30天内)自动标识 +- 软件分类独立管理(路径 `/software/categories/`),分类下有资产时禁止删除 +- 变更记录:创建/更新/删除/导入/导出全程留痕(路径 `/software/changelog/`) +- Excel 导入导出与硬件一致:模板下载、ID 存在时更新、分类自动创建 + ## 📊 Excel 导入格式 | 资产编号 | 设备名称 | 分类 | 品牌 | 型号 | 资产面值 | 序列号 | 状态 | IP地址 | BMC地址 | 设备位置 | 负责人 | 使用部门 | 维护人 | 采购日期 | 质保到期 | 备注 | @@ -141,6 +151,16 @@ DATABASES = { - 日期格式:YYYY-MM-DD - 状态可选:在用、闲置、维修中、已报废 +## 📊 软件资产导入格式 + +| ID | 资产编号 | 软件名称 | 软件分类 | 供应商 | 版本 | 许可类型 | 授权数量 | 许可密钥/激活码 | 账号 | 费用(元) | 启用日期 | 到期日期 | 负责人 | 使用部门 | 状态 | 备注 | +|----|---------|---------|---------|--------|------|---------|---------|----------------|------|---------|---------|---------|--------|---------|------|------| + +- ID 列可选:ID 已存在时更新该记录,否则创建新记录 +- 许可类型可选:永久授权、订阅、开源免费、按需付费 +- 状态可选:在用、闲置、已过期、已注销 +- 日期格式:YYYY-MM-DD + ## 📁 项目结构 ``` @@ -158,7 +178,8 @@ asset-management/ │ ├── settings.py │ ├── urls.py │ └── wsgi.py -├── templates/assetapp/ # HTML 模板(含 user_list / user_password_reset) +│ ├── models.py # 数据模型(硬件资产 + 软件资产) +├── templates/assetapp/ # HTML 模板(含 user_list / software_* 系列) ├── static/css/ # 静态资源 ├── docker-compose.yml # Docker 编排 ├── Dockerfile # 容器构建 @@ -169,6 +190,13 @@ asset-management/ ## 📝 版本历史 +### 1.0.1 + +- 新增软件资产(软资产)管理:软件分类、软件资产 CRUD、许可类型、到期提醒 +- 软件资产 Excel 导入导出、模板下载、独立变更记录 +- 仪表盘增加软件资产统计(总数/状态/许可类型分布) +- 导航栏改造:资产管理/分类管理/变更记录/导入导出下拉菜单 + ### v1.1.0 - 新增用户管理:超级管理员可查看用户列表、搜索筛选、重置任意用户密码 diff --git a/assetapp/admin.py b/assetapp/admin.py index 534028f..2207f87 100644 --- a/assetapp/admin.py +++ b/assetapp/admin.py @@ -1,5 +1,8 @@ from django.contrib import admin -from .models import Asset, Category, AssetChangeLog +from .models import ( + Asset, Category, AssetChangeLog, + SoftwareAsset, SoftwareCategory, SoftwareChangeLog, +) @admin.register(Category) @@ -22,3 +25,26 @@ class AssetChangeLogAdmin(admin.ModelAdmin): list_filter = ['action'] search_fields = ['asset_number'] readonly_fields = ['created_at'] + + +@admin.register(SoftwareCategory) +class SoftwareCategoryAdmin(admin.ModelAdmin): + list_display = ['name', 'description', 'created_at'] + search_fields = ['name'] + + +@admin.register(SoftwareAsset) +class SoftwareAssetAdmin(admin.ModelAdmin): + list_display = ['asset_number', 'name', 'category', 'vendor', 'version', + 'license_type', 'seats', 'status', 'expire_date', 'created_at'] + list_filter = ['status', 'category', 'license_type'] + search_fields = ['asset_number', 'name', 'vendor', 'license_key', 'account'] + readonly_fields = ['created_at', 'updated_at'] + + +@admin.register(SoftwareChangeLog) +class SoftwareChangeLogAdmin(admin.ModelAdmin): + list_display = ['asset_number', 'action', 'field_name', 'operator', 'created_at'] + list_filter = ['action'] + search_fields = ['asset_number'] + readonly_fields = ['created_at'] diff --git a/assetapp/excel_utils.py b/assetapp/excel_utils.py index 418dcd8..1807308 100644 --- a/assetapp/excel_utils.py +++ b/assetapp/excel_utils.py @@ -289,3 +289,228 @@ def import_assets_from_excel(ws, category_map, operator=None): results['errors'].append(f'第{row_idx}行: {str(e)}') return results + + +# ─── 软资产(软件资产)Excel 支持 ───────────────── + +# Excel列定义(顺序与软件资产列表一致) +SOFTWARE_EXPORT_COLUMNS = [ + ('id', 'ID', 8), + ('asset_number', '资产编号', 18), + ('name', '软件名称', 25), + ('category', '软件分类', 12), + ('vendor', '供应商', 18), + ('version', '版本', 12), + ('license_type', '许可类型', 12), + ('seats', '授权数量', 10), + ('license_key', '许可密钥/激活码', 30), + ('account', '账号', 18), + ('cost', '费用(元)', 12), + ('start_date', '启用日期', 12), + ('expire_date', '到期日期', 12), + ('responsible_person', '负责人', 10), + ('department', '使用部门', 15), + ('status', '状态', 8), + ('remark', '备注', 30), +] + +SOFTWARE_LICENSE_TYPE_MAP = { + 'permanent': '永久授权', 'subscription': '订阅', + 'open_source': '开源免费', 'pay_as_you_go': '按需付费', +} +SOFTWARE_LICENSE_TYPE_REVERSE = {v: k for k, v in SOFTWARE_LICENSE_TYPE_MAP.items()} + +SOFTWARE_STATUS_MAP = { + 'in_use': '在用', 'idle': '闲置', 'expired': '已过期', 'cancelled': '已注销', +} +SOFTWARE_STATUS_MAP_REVERSE = {v: k for k, v in SOFTWARE_STATUS_MAP.items()} + + +def export_software_assets_to_excel(queryset): + """导出软件资产到Excel""" + wb = Workbook() + ws = wb.active + ws.title = '软件资产' + + for col_idx, (field, header, width) in enumerate(SOFTWARE_EXPORT_COLUMNS, 1): + cell = ws.cell(row=1, column=col_idx, value=header) + cell.fill = HEADER_FILL + cell.font = HEADER_FONT + cell.alignment = Alignment(horizontal='center', vertical='center') + cell.border = THIN_BORDER + ws.column_dimensions[get_column_letter(col_idx)].width = width + + for row_idx, sw in enumerate(queryset, 2): + for col_idx, (field, _, _) in enumerate(SOFTWARE_EXPORT_COLUMNS, 1): + if field == 'id': + value = sw.id + elif field == 'category': + value = str(sw.category) if sw.category else '' + elif field == 'status': + value = SOFTWARE_STATUS_MAP.get(sw.status, sw.status) + elif field == 'license_type': + value = SOFTWARE_LICENSE_TYPE_MAP.get(sw.license_type, sw.license_type) + else: + value = getattr(sw, field, '') or '' + + cell = ws.cell(row=row_idx, column=col_idx, value=value) + cell.font = CELL_FONT + cell.border = THIN_BORDER + cell.alignment = Alignment(vertical='center') + + ws.freeze_panes = 'A2' + return wb + + +def generate_software_import_template(): + """生成软件资产导入模板""" + wb = Workbook() + ws = wb.active + ws.title = '软件资产导入模板' + + for col_idx, (field, header, width) in enumerate(SOFTWARE_EXPORT_COLUMNS, 1): + cell = ws.cell(row=1, column=col_idx, value=header) + cell.fill = HEADER_FILL + cell.font = HEADER_FONT + cell.alignment = Alignment(horizontal='center', vertical='center') + cell.border = THIN_BORDER + ws.column_dimensions[get_column_letter(col_idx)].width = width + + example_data = [ + '1', 'SW-2026-0001', 'Windows Server 2022', '操作系统', '微软', '2022 Datacenter', + '永久授权', '50', 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', 'it@company.com', + '120000', '2025-01-01', '2027-01-01', '张三', '研发部', '在用', '采购备注' + ] + for col_idx, value in enumerate(example_data, 1): + cell = ws.cell(row=2, column=col_idx, value=value) + cell.font = Font(name='微软雅黑', size=10, color='666666') + cell.border = THIN_BORDER + + ws.freeze_panes = 'A2' + return wb + + +def import_software_from_excel(ws, category_map, operator=None): + """从Excel导入软件资产,返回结果统计""" + from .models import SoftwareAsset, SoftwareCategory, SoftwareChangeLog + + header_row = [cell.value for cell in ws[1]] + field_map = {header: field for field, header, _ in SOFTWARE_EXPORT_COLUMNS} + + results = { + 'success': 0, + 'skipped': 0, + 'errors': [], + 'total': 0, + } + + for row_idx, row in enumerate(ws.iter_rows(min_row=2, values_only=True), 2): + # 跳过完全空白的行(ID 列可以为空) + if not row or all(v is None or str(v).strip() == '' for v in row): + continue + + results['total'] += 1 + + try: + data = {} + for col_idx, value in enumerate(row): + if col_idx < len(header_row): + field = field_map.get(header_row[col_idx]) + if field: + data[field] = str(value).strip() if value is not None else '' + + # 资产编号必填 + asset_number = data.get('asset_number', '').strip() + if not asset_number: + results['errors'].append(f'第{row_idx}行: 缺少资产编号') + continue + + # 软件名称必填 + sw_name = data.get('name', '').strip() + if not sw_name: + results['errors'].append(f'第{row_idx}行: 缺少软件名称') + continue + + # 处理分类 - 不存在则自动创建 + category_name = data.get('category', '').strip() + category = category_map.get(category_name) + if not category and category_name: + category = SoftwareCategory.objects.create(name=category_name) + category_map[category_name] = category + elif not category_name: + category = category_map.get('未分类') + if not category: + category = SoftwareCategory.objects.create(name='未分类') + category_map['未分类'] = category + + # 许可类型 + license_type = SOFTWARE_LICENSE_TYPE_REVERSE.get( + data.get('license_type', '订阅'), 'subscription') + + # 状态 + status = SOFTWARE_STATUS_MAP_REVERSE.get(data.get('status', '在用'), 'in_use') + + # 处理ID - 如果提供了ID且已存在,则更新该记录 + import_id = data.get('id', '').strip() + sw_asset = None + if import_id and import_id.isdigit(): + try: + sw_asset = SoftwareAsset.objects.get(id=int(import_id)) + except (SoftwareAsset.DoesNotExist, ValueError): + sw_asset = None + + common_fields = { + 'asset_number': asset_number, + 'name': sw_name, + 'category': category, + 'vendor': data.get('vendor', ''), + 'version': data.get('version', ''), + 'license_type': license_type, + 'license_key': data.get('license_key', ''), + 'seats': data.get('seats', ''), + 'account': data.get('account', ''), + 'cost': data.get('cost', ''), + 'start_date': data.get('start_date', '').strip(), + 'expire_date': data.get('expire_date', '').strip(), + 'responsible_person': data.get('responsible_person', ''), + 'department': data.get('department', ''), + 'status': status, + 'remark': data.get('remark', ''), + } + + if sw_asset: + # 更新已有记录 + for field, value in common_fields.items(): + setattr(sw_asset, field, value) + sw_asset.save() + + SoftwareChangeLog.objects.create( + software_asset=sw_asset, + asset_number=sw_asset.asset_number, + action='import', + description=f'通过Excel导入更新(ID:{sw_asset.id})', + operator=operator, + ) + else: + # 创建新记录 + create_kwargs = dict(common_fields) + create_kwargs['created_by'] = operator + if import_id and import_id.isdigit(): + create_kwargs['id'] = int(import_id) + + sw_asset = SoftwareAsset.objects.create(**create_kwargs) + + SoftwareChangeLog.objects.create( + software_asset=sw_asset, + asset_number=sw_asset.asset_number, + action='import', + description='通过Excel导入创建', + operator=operator, + ) + + results['success'] += 1 + + except Exception as e: + results['errors'].append(f'第{row_idx}行: {str(e)}') + + return results diff --git a/assetapp/forms.py b/assetapp/forms.py index 130cb41..1438220 100644 --- a/assetapp/forms.py +++ b/assetapp/forms.py @@ -1,6 +1,6 @@ from django import forms from django.contrib.auth.password_validation import password_validators_help_text_html, validate_password -from .models import Asset, Category +from .models import Asset, Category, SoftwareAsset, SoftwareCategory class AssetForm(forms.ModelForm): @@ -36,6 +36,31 @@ class CategoryForm(forms.ModelForm): fields = ['name', 'description'] +class SoftwareCategoryForm(forms.ModelForm): + class Meta: + model = SoftwareCategory + fields = ['name', 'description'] + + +class SoftwareAssetForm(forms.ModelForm): + class Meta: + model = SoftwareAsset + fields = [ + 'asset_number', 'name', 'category', + 'vendor', 'version', 'license_type', 'license_key', 'seats', + 'account', 'cost', 'start_date', 'expire_date', + 'responsible_person', 'department', 'status', 'remark', + ] + widgets = { + 'start_date': forms.DateInput(attrs={'type': 'date'}), + 'expire_date': forms.DateInput(attrs={'type': 'date'}), + 'remark': forms.Textarea(attrs={'rows': 3}), + 'status': forms.Select(attrs={'class': 'form-select'}), + 'category': forms.Select(attrs={'class': 'form-select'}), + 'license_type': forms.Select(attrs={'class': 'form-select'}), + } + + class AdminPasswordResetForm(forms.Form): """管理员重置指定用户密码的表单""" diff --git a/assetapp/migrations/0010_softwarecategory_softwareasset_softwarechangelog.py b/assetapp/migrations/0010_softwarecategory_softwareasset_softwarechangelog.py new file mode 100644 index 0000000..267ee49 --- /dev/null +++ b/assetapp/migrations/0010_softwarecategory_softwareasset_softwarechangelog.py @@ -0,0 +1,80 @@ +# Generated by Django 5.2.13 on 2026-11-11 09:12 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('assetapp', '0009_alter_asset_asset_value_alter_asset_bmc_address_and_more'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='SoftwareCategory', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=50, unique=True, verbose_name='分类名称')), + ('description', models.CharField(blank=True, default='', max_length=200, verbose_name='描述')), + ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')), + ], + options={ + 'verbose_name': '软件分类', + 'verbose_name_plural': '软件分类', + 'ordering': ['name'], + }, + ), + migrations.CreateModel( + name='SoftwareAsset', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('asset_number', models.CharField(db_index=True, max_length=50, verbose_name='资产编号')), + ('name', models.CharField(max_length=100, verbose_name='软件名称')), + ('vendor', models.CharField(blank=True, default='', max_length=200, verbose_name='供应商')), + ('version', models.CharField(blank=True, default='', max_length=100, verbose_name='版本')), + ('license_type', models.CharField(choices=[('permanent', '永久授权'), ('subscription', '订阅'), ('open_source', '开源免费'), ('pay_as_you_go', '按需付费')], default='subscription', max_length=50, verbose_name='许可类型')), + ('license_key', models.CharField(blank=True, default='', max_length=500, verbose_name='许可密钥/激活码')), + ('seats', models.CharField(blank=True, default='', max_length=50, verbose_name='授权数量')), + ('account', models.CharField(blank=True, default='', max_length=200, verbose_name='账号')), + ('cost', models.CharField(blank=True, default='', max_length=50, verbose_name='费用(元)')), + ('start_date', models.CharField(blank=True, default='', max_length=50, verbose_name='启用日期')), + ('expire_date', models.CharField(blank=True, default='', max_length=50, verbose_name='到期日期')), + ('responsible_person', models.CharField(blank=True, default='', max_length=200, verbose_name='负责人')), + ('department', models.CharField(blank=True, default='', max_length=200, verbose_name='使用部门')), + ('status', models.CharField(choices=[('in_use', '在用'), ('idle', '闲置'), ('expired', '已过期'), ('cancelled', '已注销')], default='in_use', max_length=50, verbose_name='状态')), + ('remark', models.CharField(blank=True, default='', max_length=500, verbose_name='备注')), + ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')), + ('updated_at', models.DateTimeField(auto_now=True, verbose_name='更新时间')), + ('created_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('category', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='software_assets', to='assetapp.softwarecategory', verbose_name='软件分类')), + ], + options={ + 'verbose_name': '软件资产', + 'verbose_name_plural': '软件资产', + 'ordering': ['id'], + }, + ), + migrations.CreateModel( + name='SoftwareChangeLog', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('asset_number', models.CharField(db_index=True, max_length=50, verbose_name='资产编号')), + ('action', models.CharField(choices=[('create', '创建'), ('update', '更新'), ('delete', '删除'), ('import', '导入'), ('export', '导出'), ('status_change', '状态变更')], max_length=20, verbose_name='操作类型')), + ('field_name', models.CharField(blank=True, default='', max_length=50, verbose_name='变更字段')), + ('old_value', models.TextField(blank=True, default='', verbose_name='旧值')), + ('new_value', models.TextField(blank=True, default='', verbose_name='新值')), + ('description', models.TextField(blank=True, default='', verbose_name='描述')), + ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='操作时间')), + ('operator', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='操作人')), + ('software_asset', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='change_logs', to='assetapp.softwareasset', verbose_name='软件资产')), + ], + options={ + 'verbose_name': '软件资产变更记录', + 'verbose_name_plural': '软件资产变更记录', + 'ordering': ['-created_at'], + }, + ), + ] diff --git a/assetapp/models.py b/assetapp/models.py index 1fb2464..3385128 100644 --- a/assetapp/models.py +++ b/assetapp/models.py @@ -132,3 +132,127 @@ class AssetChangeLog(models.Model): def __str__(self): return f'{self.asset_number} - {self.get_action_display()}' + + +class SoftwareCategory(models.Model): + """软件分类(软资产)""" + name = models.CharField('分类名称', max_length=50, unique=True) + description = models.CharField('描述', max_length=200, blank=True, default='') + created_at = models.DateTimeField('创建时间', auto_now_add=True) + + class Meta: + verbose_name = '软件分类' + verbose_name_plural = verbose_name + ordering = ['name'] + + def __str__(self): + return self.name + + +class SoftwareAsset(models.Model): + """软件资产(软资产)""" + + # 基本信息 + asset_number = models.CharField('资产编号', max_length=50, db_index=True) + name = models.CharField('软件名称', max_length=100) + category = models.ForeignKey(SoftwareCategory, on_delete=models.PROTECT, verbose_name='软件分类', related_name='software_assets') + + # 许可信息 + vendor = models.CharField('供应商', max_length=200, blank=True, default='') + version = models.CharField('版本', max_length=100, blank=True, default='') + LICENSE_TYPE_CHOICES = [ + ('permanent', '永久授权'), + ('subscription', '订阅'), + ('open_source', '开源免费'), + ('pay_as_you_go', '按需付费'), + ] + license_type = models.CharField('许可类型', max_length=50, choices=LICENSE_TYPE_CHOICES, default='subscription') + license_key = models.CharField('许可密钥/激活码', max_length=500, blank=True, default='') + seats = models.CharField('授权数量', max_length=50, blank=True, default='') + + # 账号信息 + account = models.CharField('账号', max_length=200, blank=True, default='') + + # 费用与日期 + cost = models.CharField('费用(元)', max_length=50, blank=True, default='') + start_date = models.CharField('启用日期', max_length=50, blank=True, default='') + expire_date = models.CharField('到期日期', max_length=50, blank=True, default='') + + # 管理信息 + responsible_person = models.CharField('负责人', max_length=200, blank=True, default='') + department = models.CharField('使用部门', max_length=200, blank=True, default='') + STATUS_CHOICES = [ + ('in_use', '在用'), + ('idle', '闲置'), + ('expired', '已过期'), + ('cancelled', '已注销'), + ] + status = models.CharField('状态', max_length=50, choices=STATUS_CHOICES, default='in_use') + remark = models.CharField('备注', max_length=500, blank=True, default='') + + # 系统字段 + created_by = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='创建人') + created_at = models.DateTimeField('创建时间', auto_now_add=True) + updated_at = models.DateTimeField('更新时间', auto_now=True) + + class Meta: + verbose_name = '软件资产' + verbose_name_plural = verbose_name + ordering = ['id'] + + def __str__(self): + return f'{self.asset_number} - {self.name}' + + @property + def is_expired(self): + if self.expire_date: + try: + from datetime import datetime + expire = datetime.strptime(self.expire_date, '%Y-%m-%d').date() + return expire < date.today() + except (ValueError, TypeError): + return False + return False + + @property + def is_expiring_soon(self): + if self.expire_date: + try: + from datetime import datetime, timedelta + expire = datetime.strptime(self.expire_date, '%Y-%m-%d').date() + return date.today() <= expire <= date.today() + timedelta(days=30) + except (ValueError, TypeError): + return False + return False + + +class SoftwareChangeLog(models.Model): + """软件资产变更记录""" + + ACTION_CHOICES = [ + ('create', '创建'), + ('update', '更新'), + ('delete', '删除'), + ('import', '导入'), + ('export', '导出'), + ('status_change', '状态变更'), + ] + + software_asset = models.ForeignKey(SoftwareAsset, on_delete=models.SET_NULL, null=True, blank=True, + verbose_name='软件资产', related_name='change_logs') + asset_number = models.CharField('资产编号', max_length=50, db_index=True) + action = models.CharField('操作类型', max_length=20, choices=ACTION_CHOICES) + field_name = models.CharField('变更字段', max_length=50, blank=True, default='') + old_value = models.TextField('旧值', blank=True, default='') + new_value = models.TextField('新值', blank=True, default='') + description = models.TextField('描述', blank=True, default='') + operator = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='操作人') + created_at = models.DateTimeField('操作时间', auto_now_add=True) + + class Meta: + verbose_name = '软件资产变更记录' + verbose_name_plural = verbose_name + ordering = ['-created_at'] + + def __str__(self): + return f'{self.asset_number} - {self.get_action_display()}' diff --git a/assetapp/urls.py b/assetapp/urls.py index 7c9fdf1..6d8f98e 100644 --- a/assetapp/urls.py +++ b/assetapp/urls.py @@ -30,6 +30,23 @@ urlpatterns = [ path('categories//edit/', views.category_update, name='category_update'), path('categories//delete/', views.category_delete, name='category_delete'), + # 软件资产(软资产) + path('software/', views.software_list, name='software_list'), + path('software/create/', views.software_create, name='software_create'), + path('software//', views.software_detail, name='software_detail'), + path('software//edit/', views.software_update, name='software_update'), + path('software//delete/', views.software_delete, name='software_delete'), + path('software/export/', views.software_export, name='software_export'), + path('software/import/', views.software_import, name='software_import'), + path('software/import/template/', views.download_software_template, name='download_software_template'), + path('software/changelog/', views.software_change_log_list, name='software_changelog'), + + # 软件分类管理 + path('software/categories/', views.software_category_list, name='software_category_list'), + path('software/categories/create/', views.software_category_create, name='software_category_create'), + path('software/categories//edit/', views.software_category_update, name='software_category_update'), + path('software/categories//delete/', views.software_category_delete, name='software_category_delete'), + # 用户管理(仅超级管理员) path('users/', views.user_list, name='user_list'), path('users//password/', views.admin_password_reset, name='admin_password_reset'), diff --git a/assetapp/views.py b/assetapp/views.py index 8b5c7a9..c499dbc 100644 --- a/assetapp/views.py +++ b/assetapp/views.py @@ -11,11 +11,14 @@ from openpyxl import load_workbook from io import BytesIO from datetime import date, timedelta -from .models import Asset, Category, AssetChangeLog -from .forms import AssetForm, AssetImportForm, CategoryForm, AdminPasswordResetForm +from .models import Asset, Category, AssetChangeLog, SoftwareAsset, SoftwareCategory, SoftwareChangeLog +from .forms import (AssetForm, AssetImportForm, CategoryForm, AdminPasswordResetForm, + SoftwareAssetForm, SoftwareCategoryForm) from .excel_utils import ( export_assets_to_excel, generate_import_template, import_assets_from_excel, STATUS_MAP, + export_software_assets_to_excel, generate_software_import_template, + import_software_from_excel, SOFTWARE_STATUS_MAP, ) @@ -71,6 +74,25 @@ def dashboard(request): # 最近变更 recent_changes = AssetChangeLog.objects.select_related('operator')[:10] + # 软件资产统计(软资产) + total_software = SoftwareAsset.objects.count() + software_status_stats = SoftwareAsset.objects.values('status').annotate(count=Count('id')) + software_status_data = {item['status']: item['count'] for item in software_status_stats} + software_category_stats = SoftwareAsset.objects.values('category__name').annotate( + count=Count('id')).order_by('-count') + software_license_stats = SoftwareAsset.objects.values('license_type').annotate(count=Count('id')) + software_license_data = {item['license_type']: item['count'] for item in software_license_stats} + sw_expiring_soon = SoftwareAsset.objects.filter( + expire_date__lte=today + timedelta(days=30), + expire_date__gte=today, + status='in_use', + ).count() + sw_expired = SoftwareAsset.objects.filter( + expire_date__lt=today, + status='in_use', + ).count() + recent_software_changes = SoftwareChangeLog.objects.select_related('operator')[:10] + context = { 'total_assets': total_assets, 'status_data': status_data, @@ -79,6 +101,14 @@ def dashboard(request): 'expiring_soon': expiring_soon, 'expired': expired, 'recent_changes': recent_changes, + 'total_software': total_software, + 'software_status_data': software_status_data, + 'software_category_stats': software_category_stats, + 'sw_expiring_soon': sw_expiring_soon, + 'sw_expired': sw_expired, + 'recent_software_changes': recent_software_changes, + 'software_status_map': SOFTWARE_STATUS_MAP, + 'software_license_data': software_license_data, } return render(request, 'assetapp/dashboard.html', context) @@ -519,3 +549,343 @@ def admin_password_reset(request, pk): context = {'form': form, 'target_user': target_user} return render(request, 'assetapp/user_password_reset.html', context) + + +# ─── 软件资产(软资产)管理 ───────────────────────── + +SOFTWARE_LICENSE_TYPE_LABELS = { + 'permanent': '永久授权', 'subscription': '订阅', + 'open_source': '开源免费', 'pay_as_you_go': '按需付费', +} + + +@login_required +def software_list(request): + queryset = SoftwareAsset.objects.select_related('category') + + # 搜索 + search = request.GET.get('search', '').strip() + if search: + queryset = queryset.filter( + Q(asset_number__icontains=search) | + Q(name__icontains=search) | + Q(vendor__icontains=search) | + Q(version__icontains=search) | + Q(license_key__icontains=search) | + Q(account__icontains=search) | + Q(responsible_person__icontains=search) | + Q(department__icontains=search) + ) + + # 筛选 + category_id = request.GET.get('category') + if category_id: + queryset = queryset.filter(category_id=category_id) + + status = request.GET.get('status') + if status: + queryset = queryset.filter(status=status) + + license_type = request.GET.get('license_type') + if license_type: + queryset = queryset.filter(license_type=license_type) + + department = request.GET.get('department') + if department: + queryset = queryset.filter(department__icontains=department) + + # 排序 + sort = request.GET.get('sort', 'id') + valid_sorts = ['id', '-id', 'asset_number', '-asset_number', 'name', '-name', + 'expire_date', '-expire_date', 'created_at', '-created_at'] + if sort not in valid_sorts: + sort = 'id' + queryset = queryset.order_by(sort) + + # 分页 + paginator = Paginator(queryset, settings.ASSETS_PER_PAGE) + page_obj = paginator.get_page(request.GET.get('page', 1)) + + categories = SoftwareCategory.objects.all() + departments = sorted(set( + SoftwareAsset.objects.values_list('department', flat=True) + .exclude(department='') + .exclude(department=None) + )) + + # 导出链接附带当前筛选 + export_params = [] + if search: + export_params.append(f'search={search}') + if category_id: + export_params.append(f'category={category_id}') + if status: + export_params.append(f'status={status}') + query_string = '?' + '&'.join(export_params) if export_params else '' + + context = { + 'page_obj': page_obj, + 'search': search, + 'categories': categories, + 'current_category': category_id, + 'current_status': status, + 'current_license_type': license_type, + 'current_department': department, + 'departments': departments, + 'license_type_map': SOFTWARE_LICENSE_TYPE_LABELS, + 'status_map': SOFTWARE_STATUS_MAP, + 'sort': sort, + 'query_string': query_string, + } + return render(request, 'assetapp/software_list.html', context) + + +@login_required +def software_detail(request, pk): + sw_asset = get_object_or_404( + SoftwareAsset.objects.select_related('category', 'created_by'), pk=pk) + change_logs = sw_asset.change_logs.select_related('operator')[:20] + context = { + 'sw_asset': sw_asset, + 'change_logs': change_logs, + 'status_map': SOFTWARE_STATUS_MAP, + 'license_type_map': SOFTWARE_LICENSE_TYPE_LABELS, + } + return render(request, 'assetapp/software_detail.html', context) + + +@login_required +def software_create(request): + if request.method == 'POST': + form = SoftwareAssetForm(request.POST) + if form.is_valid(): + sw_asset = form.save(commit=False) + sw_asset.created_by = request.user + sw_asset.save() + + SoftwareChangeLog.objects.create( + software_asset=sw_asset, + asset_number=sw_asset.asset_number, + action='create', + description='创建软件资产', + operator=request.user, + ) + + messages.success(request, f'软件资产 {sw_asset.asset_number} 创建成功!') + return redirect('software_detail', pk=sw_asset.pk) + else: + form = SoftwareAssetForm() + + context = {'form': form, 'action': 'create'} + return render(request, 'assetapp/software_form.html', context) + + +@login_required +def software_update(request, pk): + sw_asset = get_object_or_404(SoftwareAsset, pk=pk) + + if request.method == 'POST': + form = SoftwareAssetForm(request.POST, instance=sw_asset) + if form.is_valid(): + # 记录变更 + for field in form.changed_data: + SoftwareChangeLog.objects.create( + software_asset=sw_asset, + asset_number=sw_asset.asset_number, + action='update', + field_name=field, + old_value=str(form.initial.get(field, '')), + new_value=str(form.cleaned_data.get(field, '')), + operator=request.user, + ) + + sw_asset = form.save() + + if form.changed_data: + messages.success(request, f'已更新 {len(form.changed_data)} 个字段') + return redirect('software_detail', pk=sw_asset.pk) + else: + form = SoftwareAssetForm(instance=sw_asset) + + context = {'form': form, 'action': 'update', 'sw_asset': sw_asset} + return render(request, 'assetapp/software_form.html', context) + + +@login_required +def software_delete(request, pk): + sw_asset = get_object_or_404(SoftwareAsset, pk=pk) + + if request.method == 'POST': + SoftwareChangeLog.objects.create( + asset_number=sw_asset.asset_number, + action='delete', + description=f'删除软件资产: {sw_asset.name}', + operator=request.user, + ) + sw_asset.delete() + messages.success(request, f'软件资产 {sw_asset.asset_number} 已删除') + return redirect('software_list') + + context = {'sw_asset': sw_asset} + return render(request, 'assetapp/software_confirm_delete.html', context) + + +@login_required +def software_export(request): + queryset = SoftwareAsset.objects.select_related('category') + + category_id = request.GET.get('category') + if category_id: + queryset = queryset.filter(category_id=category_id) + + status = request.GET.get('status') + if status: + queryset = queryset.filter(status=status) + + wb = export_software_assets_to_excel(queryset) + + output = BytesIO() + wb.save(output) + output.seek(0) + + SoftwareChangeLog.objects.create( + asset_number='-', + action='export', + description=f'导出 {queryset.count()} 条软件资产记录', + operator=request.user, + ) + + today_str = date.today().strftime('%Y%m%d') + response = HttpResponse( + output.read(), + content_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' + ) + response['Content-Disposition'] = f'attachment; filename=软件资产_{today_str}.xlsx' + return response + + +@login_required +def software_import(request): + if request.method == 'POST': + form = AssetImportForm(request.POST, request.FILES) + if form.is_valid(): + try: + wb = load_workbook(request.FILES['excel_file']) + ws = wb.active + + category_map = {c.name: c for c in SoftwareCategory.objects.all()} + results = import_software_from_excel(ws, category_map, operator=request.user) + + if results['success'] > 0: + messages.success(request, f"成功导入 {results['success']} 条软件资产") + + if results['skipped'] > 0: + messages.warning(request, f"跳过 {results['skipped']} 条") + + if results['errors']: + for error in results['errors'][:10]: + messages.error(request, error) + if len(results['errors']) > 10: + messages.error(request, f"...还有 {len(results['errors']) - 10} 条错误") + + except Exception as e: + messages.error(request, f'导入失败: {str(e)}') + + return redirect('software_list') + else: + form = AssetImportForm() + + return render(request, 'assetapp/software_import.html', {'form': form}) + + +@login_required +def download_software_template(request): + wb = generate_software_import_template() + output = BytesIO() + wb.save(output) + output.seek(0) + + response = HttpResponse( + output.read(), + content_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' + ) + response['Content-Disposition'] = 'attachment; filename=软件资产导入模板.xlsx' + return response + + +@login_required +def software_change_log_list(request): + logs = SoftwareChangeLog.objects.select_related('operator', 'software_asset') + + asset_number = request.GET.get('asset_number', '').strip() + if asset_number: + logs = logs.filter(asset_number__icontains=asset_number) + + action = request.GET.get('action') + if action: + logs = logs.filter(action=action) + + paginator = Paginator(logs, 30) + page_obj = paginator.get_page(request.GET.get('page', 1)) + + context = { + 'page_obj': page_obj, + 'asset_number': asset_number, + 'current_action': action, + } + return render(request, 'assetapp/software_changelog.html', context) + + +# ─── 软件分类管理 ────────────────────────────────── + +@login_required +def software_category_list(request): + categories = SoftwareCategory.objects.annotate( + sw_count=Count('software_assets')).order_by('name') + return render(request, 'assetapp/software_category_list.html', {'categories': categories}) + + +@login_required +def software_category_create(request): + if request.method == 'POST': + form = SoftwareCategoryForm(request.POST) + if form.is_valid(): + form.save() + messages.success(request, f'软件分类 "{form.instance.name}" 创建成功') + return redirect('software_category_list') + else: + form = SoftwareCategoryForm() + + return render(request, 'assetapp/software_category_form.html', {'form': form, 'action': 'create'}) + + +@login_required +def software_category_update(request, pk): + category = get_object_or_404(SoftwareCategory, pk=pk) + if request.method == 'POST': + form = SoftwareCategoryForm(request.POST, instance=category) + if form.is_valid(): + form.save() + messages.success(request, f'软件分类 "{category.name}" 已更新') + return redirect('software_category_list') + else: + form = SoftwareCategoryForm(instance=category) + + return render(request, 'assetapp/software_category_form.html', + {'form': form, 'action': 'update', 'category': category}) + + +@login_required +def software_category_delete(request, pk): + category = get_object_or_404(SoftwareCategory, pk=pk) + sw_count = category.software_assets.count() + if sw_count > 0: + messages.error(request, f'软件分类 "{category.name}" 下还有 {sw_count} 个软件资产,无法删除') + return redirect('software_category_list') + + if request.method == 'POST': + category.delete() + messages.success(request, f'软件分类 "{category.name}" 已删除') + return redirect('software_category_list') + + return render(request, 'assetapp/software_category_confirm_delete.html', {'category': category}) diff --git a/templates/assetapp/base.html b/templates/assetapp/base.html index 14dd914..d95a611 100644 --- a/templates/assetapp/base.html +++ b/templates/assetapp/base.html @@ -28,20 +28,35 @@ 仪表盘 - - - {% if user.is_superuser %} diff --git a/templates/assetapp/dashboard.html b/templates/assetapp/dashboard.html index a06ab61..5fc075c 100644 --- a/templates/assetapp/dashboard.html +++ b/templates/assetapp/dashboard.html @@ -6,12 +6,18 @@ {% block content %} - + +
硬件资产
@@ -51,12 +57,53 @@
+ +
软件资产
+
+
+
+
+
+
{{ total_software }}
+
软件总数
+
+
+
+
+
+
+
+
{{ software_status_data.in_use|default:0 }}
+
在用
+
+
+
+
+
+
+
+
{{ sw_expiring_soon }}
+
即将到期(30天)
+
+
+
+
+
+
+
+
{{ sw_expired }}
+
已过期
+
+
+
+
+
-
-
+
+
- 分类统计 + 硬件分类统计
{% if category_stats %} @@ -64,7 +111,7 @@
{{ item.category__name }}
-
+
{% widthratio item.count total_assets 100 as pct %}
@@ -79,16 +126,43 @@
+ +
+
+
+ 软件分类统计 +
+
+ {% if software_category_stats %} + {% for item in software_category_stats %} +
+ {{ item.category__name }} +
+
+ {% widthratio item.count total_software 100 as pct %} +
+
+ {{ item.count }} +
+
+ {% endfor %} + {% else %} +

暂无数据

+ {% endif %} +
+
+
+ -
-
+
+
状态分布
{% for key, label in status_map.items %}
- {{ label }} + {{ label }} + {{ label }} + + {{ software_status_data|get_item:key|default:0 }} + +
+ {% endfor %} +
+
+
+ + +
+
+
+ 许可类型分布 +
+
+
+ 永久授权 + {{ software_license_data.permanent|default:0 }} +
+
+ 订阅 + {{ software_license_data.subscription|default:0 }} +
+
+ 开源免费 + {{ software_license_data.open_source|default:0 }} +
+
+ 按需付费 + {{ software_license_data.pay_as_you_go|default:0 }} +
- -
-
- 最近变更 - 查看全部 + +
+
+
+
+ 硬件最近变更 + 查看全部 +
+
+
+ + + + + + + + + + + + {% for log in recent_changes %} + + + + + + + + {% empty %} + + {% endfor %} + +
时间资产编号操作描述操作人
{{ log.created_at|date:"m-d H:i" }}{{ log.asset_number }} + + {{ log.get_action_display }} + + {{ log.description|default:"-" }}{{ log.operator|default:"-" }}
暂无变更记录
+
+
+
-
-
- - - - - - - - - - - - {% for log in recent_changes %} - - - - - - - - {% empty %} - - {% endfor %} - -
时间资产编号操作描述操作人
{{ log.created_at|date:"m-d H:i" }}{{ log.asset_number }} - - {{ log.get_action_display }} - - {{ log.description|default:"-" }}{{ log.operator|default:"-" }}
暂无变更记录
+
+
+
+ 软件最近变更 + 查看全部 +
+
+
+ + + + + + + + + + + + {% for log in recent_software_changes %} + + + + + + + + {% empty %} + + {% endfor %} + +
时间资产编号操作描述操作人
{{ log.created_at|date:"m-d H:i" }} + {% if log.software_asset %} + {{ log.asset_number }} + {% else %}{{ log.asset_number }}{% endif %} + + + {{ log.get_action_display }} + + {{ log.description|default:"-" }}{{ log.operator|default:"-" }}
暂无变更记录
+
+
diff --git a/templates/assetapp/software_category_confirm_delete.html b/templates/assetapp/software_category_confirm_delete.html new file mode 100644 index 0000000..87ab88e --- /dev/null +++ b/templates/assetapp/software_category_confirm_delete.html @@ -0,0 +1,32 @@ +{% extends "assetapp/base.html" %} + +{% block title %}删除软件分类{% endblock %} + +{% block content %} +
+ + 返回 + +

删除软件分类

+
+ +
+
+
+
+
+ + 确定要删除软件分类 {{ category.name }} 吗? +
+
+ {% csrf_token %} + + 取消 +
+
+
+
+
+{% endblock %} diff --git a/templates/assetapp/software_category_form.html b/templates/assetapp/software_category_form.html new file mode 100644 index 0000000..0554dcc --- /dev/null +++ b/templates/assetapp/software_category_form.html @@ -0,0 +1,40 @@ +{% extends "assetapp/base.html" %} + +{% block title %}{% if action == 'create' %}新增软件分类{% else %}编辑软件分类{% endif %}{% endblock %} + +{% block content %} +
+ + 返回 + +

+ + {% if action == 'create' %}新增软件分类{% else %}编辑软件分类 - {{ category.name }}{% endif %} +

+
+ +
+
+
+
+
+ {% csrf_token %} +
+ + {{ form.name }} + {% if form.name.errors %}
{{ form.name.errors.0 }}
{% endif %} +
+
+ + {{ form.description }} +
+ + 取消 +
+
+
+
+
+{% endblock %} diff --git a/templates/assetapp/software_category_list.html b/templates/assetapp/software_category_list.html new file mode 100644 index 0000000..502946e --- /dev/null +++ b/templates/assetapp/software_category_list.html @@ -0,0 +1,52 @@ +{% extends "assetapp/base.html" %} + +{% block title %}软件分类管理{% endblock %} + +{% block content %} +
+

软件分类管理

+ + 新增软件分类 + +
+ +
+
+
+ + + + + + + + + + + + + {% for category in categories %} + + + + + + + + + {% empty %} + + {% endfor %} + +
ID分类名称描述软件资产数量创建时间操作
{{ category.id }}{{ category.name }}{{ category.description|default:"-" }}{{ category.sw_count }}{{ category.created_at|date:"Y-m-d H:i" }} + + + + + + +
暂无软件分类
+
+
+
+{% endblock %} diff --git a/templates/assetapp/software_changelog.html b/templates/assetapp/software_changelog.html new file mode 100644 index 0000000..7fa5d5b --- /dev/null +++ b/templates/assetapp/software_changelog.html @@ -0,0 +1,112 @@ +{% extends "assetapp/base.html" %} + +{% block title %}软件资产变更记录{% endblock %} + +{% block content %} +
+

软件资产变更记录

+
+ +
+
+
+
+
+ + +
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + {% for log in page_obj %} + + + + + + + + + + + {% empty %} + + {% endfor %} + +
时间资产编号操作变更字段旧值新值描述操作人
{{ log.created_at|date:"m-d H:i" }} + {% if log.software_asset %} + {{ log.asset_number }} + {% else %} + {{ log.asset_number }} + {% endif %} + + + {{ log.get_action_display }} + + {{ log.field_name|default:"-" }}{{ log.old_value|default:"-"|truncatechars:30 }}{{ log.new_value|default:"-"|truncatechars:30 }}{{ log.description|default:"-" }}{{ log.operator|default:"-" }}
暂无变更记录
+
+
+
+ +{% if page_obj.paginator.num_pages > 1 %} + +{% endif %} +{% endblock %} diff --git a/templates/assetapp/software_confirm_delete.html b/templates/assetapp/software_confirm_delete.html new file mode 100644 index 0000000..b8241c0 --- /dev/null +++ b/templates/assetapp/software_confirm_delete.html @@ -0,0 +1,33 @@ +{% extends "assetapp/base.html" %} + +{% block title %}删除软件资产{% endblock %} + +{% block content %} +
+ + 返回 + +

删除软件资产

+
+ +
+
+
+
+
+ + 确定要删除软件资产 {{ sw_asset.asset_number }} - {{ sw_asset.name }} 吗? + 此操作不可恢复! +
+
+ {% csrf_token %} + + 取消 +
+
+
+
+
+{% endblock %} diff --git a/templates/assetapp/software_detail.html b/templates/assetapp/software_detail.html new file mode 100644 index 0000000..158052d --- /dev/null +++ b/templates/assetapp/software_detail.html @@ -0,0 +1,137 @@ +{% extends "assetapp/base.html" %} +{% load asset_tags %} + +{% block title %}{{ sw_asset.name }} - 软件资产详情{% endblock %} + +{% block content %} +
+ + 返回 + +

{{ sw_asset.asset_number }} - {{ sw_asset.name }}

+ +
+ +
+
+
+
基本信息
+
+
+
资产编号:{{ sw_asset.asset_number }}
+
软件名称:{{ sw_asset.name }}
+
软件分类:{{ sw_asset.category.name }}
+
供应商:{{ sw_asset.vendor|default:"-" }}
+
版本:{{ sw_asset.version|default:"-" }}
+
账号:{{ sw_asset.account|default:"-" }}
+
+
+
+ +
+
许可信息
+
+
+
+ 许可类型: + {{ license_type_map|get_item:sw_asset.license_type }} +
+
授权数量:{{ sw_asset.seats|default:"-" }}
+
许可密钥/激活码:{{ sw_asset.license_key|default:"-" }}
+
+
+
+ +
+
费用与有效期
+
+
+
费用:{{ sw_asset.cost|default:"-" }}{% if sw_asset.cost %} 元{% endif %}
+
启用日期:{{ sw_asset.start_date|default:"-" }}
+
+ 到期日期:{{ sw_asset.expire_date|default:"-" }} + {% if sw_asset.is_expired %}已到期 + {% elif sw_asset.is_expiring_soon %}即将到期{% endif %} +
+
+ 状态: + + {{ status_map|get_item:sw_asset.status }} + +
+
+
+
+ +
+
管理信息
+
+
+
负责人:{{ sw_asset.responsible_person|default:"-" }}
+
使用部门:{{ sw_asset.department|default:"-" }}
+
备注:{{ sw_asset.remark|default:"-" }}
+
+
+
+
+ +
+
+
变更记录
+
+
+ + + {% for log in change_logs %} + + + + {% empty %} + + {% endfor %} + +
+
{{ log.created_at|date:"Y-m-d H:i" }}
+ + {{ log.get_action_display }} + + {% if log.field_name %} + {{ log.field_name }}: {{ log.old_value }} → {{ log.new_value }} + {% endif %} + {% if log.description %} +
{{ log.description }}
+ {% endif %} +
操作人: {{ log.operator|default:"-" }}
+
暂无变更记录
+
+
+
+ +
+
+
+
创建人: {{ sw_asset.created_by|default:"-" }}
+
创建时间: {{ sw_asset.created_at|date:"Y-m-d H:i" }}
+
更新时间: {{ sw_asset.updated_at|date:"Y-m-d H:i" }}
+
+
+
+
+
+{% endblock %} diff --git a/templates/assetapp/software_form.html b/templates/assetapp/software_form.html new file mode 100644 index 0000000..7899a6f --- /dev/null +++ b/templates/assetapp/software_form.html @@ -0,0 +1,116 @@ +{% extends "assetapp/base.html" %} + +{% block title %}{% if action == 'create' %}新增软件资产{% else %}编辑软件资产{% endif %}{% endblock %} + +{% block content %} +
+ + 返回 + +

+ + {% if action == 'create' %}新增软件资产{% else %}编辑软件资产 - {{ sw_asset.name }}{% endif %} +

+
+ +
+
+
+
+
+ {% csrf_token %} + +
基本信息
+
+
+ + {{ form.asset_number }} + {% if form.asset_number.errors %}
{{ form.asset_number.errors.0 }}
{% endif %} +
+
+ + {{ form.name }} + {% if form.name.errors %}
{{ form.name.errors.0 }}
{% endif %} +
+
+ + {{ form.category }} +
+
+ + {{ form.vendor }} +
+
+ + {{ form.version }} +
+
+ +
许可信息
+
+
+ + {{ form.license_type }} +
+
+ + {{ form.seats }} +
+
+ + {{ form.account }} +
+
+ + {{ form.license_key }} +
+
+ +
费用与有效期
+
+
+ + {{ form.cost }} +
+
+ + {{ form.start_date }} +
+
+ + {{ form.expire_date }} +
+
+ +
管理信息
+
+
+ + {{ form.responsible_person }} +
+
+ + {{ form.department }} +
+
+ + {{ form.status }} +
+
+ + {{ form.remark }} +
+
+ + + 取消 +
+
+
+
+
+{% endblock %} diff --git a/templates/assetapp/software_import.html b/templates/assetapp/software_import.html new file mode 100644 index 0000000..f37c498 --- /dev/null +++ b/templates/assetapp/software_import.html @@ -0,0 +1,71 @@ +{% extends "assetapp/base.html" %} + +{% block title %}导入软件资产{% endblock %} + +{% block content %} +
+ + 返回 + +

导入软件资产

+
+ +
+
+
+
上传文件
+
+
+ + 使用说明: +
    +
  1. 先 下载软件资产导入模板
  2. +
  3. 按模板格式填写软件资产数据
  4. +
  5. 上传填写好的Excel文件(.xlsx)
  6. +
  7. 提供ID列且该ID已存在时更新原记录,否则创建新记录
  8. +
  9. 软件分类不存在时会自动创建
  10. +
+
+ +
+ {% csrf_token %} +
+ +
+ + + 未选择文件 +
+ {% if form.excel_file.errors %} +
{{ form.excel_file.errors.0 }}
+ {% endif %} +
+
+ + + 下载模板 + +
+
+
+
+
+
+ + +{% endblock %} diff --git a/templates/assetapp/software_list.html b/templates/assetapp/software_list.html new file mode 100644 index 0000000..1b02232 --- /dev/null +++ b/templates/assetapp/software_list.html @@ -0,0 +1,166 @@ +{% extends "assetapp/base.html" %} +{% load asset_tags %} + +{% block title %}软件资产{% endblock %} + +{% block content %} + + + +
+
+
+
+
+ + +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + {% for sw in page_obj %} + + + + + + + + + + + + + + + + + {% empty %} + + {% endfor %} + +
ID资产编号软件名称软件分类供应商版本许可类型授权数量账号负责人使用部门到期日期状态操作
{{ sw.id }}{{ sw.asset_number }} + {{ sw.name }} + {{ sw.category.name }}{{ sw.vendor|default:"-" }}{{ sw.version|default:"-" }} + + {{ license_type_map|get_item:sw.license_type }} + + {{ sw.seats|default:"-" }}{{ sw.account|default:"-" }}{{ sw.responsible_person|default:"-" }}{{ sw.department|default:"-" }} + {{ sw.expire_date|default:"-" }} + {% if sw.is_expired %}已到期 + {% elif sw.is_expiring_soon %}即将到期{% endif %} + + + {{ status_map|get_item:sw.status }} + + + + + + + + + + + +
暂无软件资产
+
+
+
+ +{% if page_obj.paginator.num_pages > 1 %} + +{% endif %} +{% endblock %}