feat: 新增软件资产(软资产)管理模块

- 新增 SoftwareCategory/SoftwareAsset/SoftwareChangeLog 模型与迁移0010
- 软资产CRUD:编号/名称/分类/供应商/版本/许可类型/授权数量/许可密钥/账号/费用/起止日期/负责人/部门/状态
- 许可类型:永久授权/订阅/开源免费/按需付费;状态:在用/闲置/已过期/已注销
- 到期提醒:已过期/即将到期(30天)自动标识
- Excel导入导出:模板下载、ID存在时更新、分类自动创建、空白行跳过、缺编号/名称报错
- 软件分类独立管理,分类下有资产时禁止删除
- 独立软件变更记录页;仪表盘增加软件统计卡片、软件分类统计、许可类型分布
- 导航栏改造:资产管理/分类管理/变更记录/导入导出下拉菜单
- 全流程15项功能验证通过(CRUD/导入导出/权限/仪表盘)
This commit is contained in:
cnbugs
2026-11-11 17:22:23 +08:00
parent e894f61ddf
commit 9b79c14267
19 changed files with 1908 additions and 69 deletions
+28 -10
View File
@@ -28,20 +28,35 @@
<i class="bi bi-speedometer2 me-1"></i>仪表盘
</a>
</li>
<li class="nav-item">
<a class="nav-link {% if 'assets' in request.path and 'import' not in request.path %}active{% endif %}" href="{% url 'asset_list' %}">
<i class="bi bi-list-ul me-1"></i>资产列表
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle {% if 'asset' in request.resolver_match.url_name or 'software' in request.resolver_match.url_name and 'category' not in request.resolver_match.url_name %}active{% endif %}"
href="#" role="button" data-bs-toggle="dropdown">
<i class="bi bi-boxes me-1"></i>资产管理
</a>
<ul class="dropdown-menu dropdown-menu-dark">
<li><a class="dropdown-item" href="{% url 'asset_list' %}"><i class="bi bi-hdd-rack me-2"></i>硬件资产</a></li>
<li><a class="dropdown-item" href="{% url 'software_list' %}"><i class="bi bi-window-stack me-2"></i>软件资产</a></li>
</ul>
</li>
<li class="nav-item">
<a class="nav-link {% if request.resolver_match.url_name == 'category_list' %}active{% endif %}" href="{% url 'category_list' %}">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle {% if 'category' in request.resolver_match.url_name %}active{% endif %}"
href="#" role="button" data-bs-toggle="dropdown">
<i class="bi bi-tags me-1"></i>分类管理
</a>
<ul class="dropdown-menu dropdown-menu-dark">
<li><a class="dropdown-item" href="{% url 'category_list' %}"><i class="bi bi-hdd-rack me-2"></i>设备分类</a></li>
<li><a class="dropdown-item" href="{% url 'software_category_list' %}"><i class="bi bi-bookmarks me-2"></i>软件分类</a></li>
</ul>
</li>
<li class="nav-item">
<a class="nav-link {% if request.resolver_match.url_name == 'change_log_list' %}active{% endif %}" href="{% url 'change_log_list' %}">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle {% if 'changelog' in request.resolver_match.url_name %}active{% endif %}"
href="#" role="button" data-bs-toggle="dropdown">
<i class="bi bi-clock-history me-1"></i>变更记录
</a>
<ul class="dropdown-menu dropdown-menu-dark">
<li><a class="dropdown-item" href="{% url 'change_log_list' %}"><i class="bi bi-hdd-rack me-2"></i>硬件变更</a></li>
<li><a class="dropdown-item" href="{% url 'software_changelog' %}"><i class="bi bi-window-stack me-2"></i>软件变更</a></li>
</ul>
</li>
{% if user.is_superuser %}
<li class="nav-item">
@@ -55,10 +70,13 @@
<i class="bi bi-file-earmark-spreadsheet me-1"></i>导入导出
</a>
<ul class="dropdown-menu dropdown-menu-dark">
<li><a class="dropdown-item" href="{% url 'asset_import' %}"><i class="bi bi-upload me-2"></i>导入Excel</a></li>
<li><a class="dropdown-item" href="{% url 'asset_export' %}"><i class="bi bi-download me-2"></i>导出Excel</a></li>
<li><a class="dropdown-item" href="{% url 'asset_import' %}"><i class="bi bi-upload me-2"></i>导入硬件Excel</a></li>
<li><a class="dropdown-item" href="{% url 'asset_export' %}"><i class="bi bi-download me-2"></i>导出硬件Excel</a></li>
<li><a class="dropdown-item" href="{% url 'download_template' %}"><i class="bi bi-file-earmark-arrow-down me-2"></i>硬件导入模板</a></li>
<li><hr class="dropdown-divider"></li>
<li><a class="dropdown-item" href="{% url 'download_template' %}"><i class="bi bi-file-earmark-arrow-down me-2"></i>下载模板</a></li>
<li><a class="dropdown-item" href="{% url 'software_import' %}"><i class="bi bi-upload me-2"></i>导入软件Excel</a></li>
<li><a class="dropdown-item" href="{% url 'software_export' %}"><i class="bi bi-download me-2"></i>导出软件Excel</a></li>
<li><a class="dropdown-item" href="{% url 'download_software_template' %}"><i class="bi bi-file-earmark-arrow-down me-2"></i>软件导入模板</a></li>
</ul>
</li>
</ul>
+219 -52
View File
@@ -6,12 +6,18 @@
{% block content %}
<div class="d-flex justify-content-between align-items-center mb-4">
<h4 class="mb-0"><i class="bi bi-speedometer2 me-2"></i>仪表盘</h4>
<a href="{% url 'asset_create' %}" class="btn btn-primary">
<i class="bi bi-plus-circle me-1"></i>新增资产
</a>
<div>
<a href="{% url 'software_create' %}" class="btn btn-outline-info me-2">
<i class="bi bi-window-stack me-1"></i>新增软件资产
</a>
<a href="{% url 'asset_create' %}" class="btn btn-primary">
<i class="bi bi-plus-circle me-1"></i>新增资产
</a>
</div>
</div>
<!-- 统计卡片 -->
<!-- 硬件统计卡片 -->
<h6 class="text-muted mb-2"><i class="bi bi-hdd-rack me-1"></i>硬件资产</h6>
<div class="row g-3 mb-4">
<div class="col-md-3">
<div class="stat-card stat-total">
@@ -51,12 +57,53 @@
</div>
</div>
<!-- 软件资产统计卡片 -->
<h6 class="text-muted mb-2"><i class="bi bi-window-stack me-1"></i>软件资产</h6>
<div class="row g-3 mb-4">
<div class="col-md-3">
<div class="stat-card stat-total">
<div class="stat-icon"><i class="bi bi-window-stack"></i></div>
<div class="stat-info">
<div class="stat-value">{{ total_software }}</div>
<div class="stat-label">软件总数</div>
</div>
</div>
</div>
<div class="col-md-3">
<div class="stat-card stat-in-use">
<div class="stat-icon"><i class="bi bi-check-circle"></i></div>
<div class="stat-info">
<div class="stat-value">{{ software_status_data.in_use|default:0 }}</div>
<div class="stat-label">在用</div>
</div>
</div>
</div>
<div class="col-md-3">
<div class="stat-card stat-warning">
<div class="stat-icon"><i class="bi bi-exclamation-triangle"></i></div>
<div class="stat-info">
<div class="stat-value">{{ sw_expiring_soon }}</div>
<div class="stat-label">即将到期(30天)</div>
</div>
</div>
</div>
<div class="col-md-3">
<div class="stat-card stat-danger">
<div class="stat-icon"><i class="bi bi-shield-exclamation"></i></div>
<div class="stat-info">
<div class="stat-value">{{ sw_expired }}</div>
<div class="stat-label">已过期</div>
</div>
</div>
</div>
</div>
<div class="row g-3">
<!-- 分类统计 -->
<div class="col-md-6">
<div class="card card-dark">
<div class="col-md-3">
<div class="card card-dark h-100">
<div class="card-header">
<i class="bi bi-pie-chart me-2"></i>分类统计
<i class="bi bi-pie-chart me-2"></i>硬件分类统计
</div>
<div class="card-body">
{% if category_stats %}
@@ -64,7 +111,7 @@
<div class="d-flex justify-content-between align-items-center py-2 border-bottom border-secondary">
<span class="text-light">{{ item.category__name }}</span>
<div class="d-flex align-items-center">
<div class="progress me-2" style="width: 120px; height: 8px;">
<div class="progress me-2" style="width: 80px; height: 8px;">
{% widthratio item.count total_assets 100 as pct %}
<div class="progress-bar bg-primary" style="width: {{ pct }}%"></div>
</div>
@@ -79,16 +126,43 @@
</div>
</div>
<!-- 软件分类统计 -->
<div class="col-md-3">
<div class="card card-dark h-100">
<div class="card-header">
<i class="bi bi-bookmarks me-2"></i>软件分类统计
</div>
<div class="card-body">
{% if software_category_stats %}
{% for item in software_category_stats %}
<div class="d-flex justify-content-between align-items-center py-2 border-bottom border-secondary">
<span class="text-light">{{ item.category__name }}</span>
<div class="d-flex align-items-center">
<div class="progress me-2" style="width: 80px; height: 8px;">
{% widthratio item.count total_software 100 as pct %}
<div class="progress-bar bg-info" style="width: {{ pct }}%"></div>
</div>
<span class="badge bg-info">{{ item.count }}</span>
</div>
</div>
{% endfor %}
{% else %}
<p class="text-muted text-center my-4">暂无数据</p>
{% endif %}
</div>
</div>
</div>
<!-- 状态分布 -->
<div class="col-md-6">
<div class="card card-dark">
<div class="col-md-3">
<div class="card card-dark h-100">
<div class="card-header">
<i class="bi bi-bar-chart me-2"></i>状态分布
</div>
<div class="card-body">
{% for key, label in status_map.items %}
<div class="d-flex justify-content-between align-items-center py-2 border-bottom border-secondary">
<span class="text-light">{{ label }}</span>
<span class="text-light"><i class="bi bi-hdd-rack me-1 text-muted small"></i>{{ label }}</span>
<span class="badge
{% if key == 'in_use' %}bg-success
{% elif key == 'idle' %}bg-warning text-dark
@@ -98,53 +172,146 @@
</span>
</div>
{% endfor %}
{% for key, label in software_status_map.items %}
<div class="d-flex justify-content-between align-items-center py-2 border-bottom border-secondary">
<span class="text-light"><i class="bi bi-window-stack me-1 text-muted small"></i>{{ label }}</span>
<span class="badge
{% if key == 'in_use' %}bg-success
{% elif key == 'idle' %}bg-warning text-dark
{% elif key == 'expired' %}bg-danger
{% else %}bg-secondary{% endif %}">
{{ software_status_data|get_item:key|default:0 }}
</span>
</div>
{% endfor %}
</div>
</div>
</div>
<!-- 软件许可类型分布 -->
<div class="col-md-3">
<div class="card card-dark h-100">
<div class="card-header">
<i class="bi bi-key me-2"></i>许可类型分布
</div>
<div class="card-body">
<div class="d-flex justify-content-between align-items-center py-2 border-bottom border-secondary">
<span class="text-light">永久授权</span>
<span class="badge bg-primary">{{ software_license_data.permanent|default:0 }}</span>
</div>
<div class="d-flex justify-content-between align-items-center py-2 border-bottom border-secondary">
<span class="text-light">订阅</span>
<span class="badge bg-info">{{ software_license_data.subscription|default:0 }}</span>
</div>
<div class="d-flex justify-content-between align-items-center py-2 border-bottom border-secondary">
<span class="text-light">开源免费</span>
<span class="badge bg-secondary">{{ software_license_data.open_source|default:0 }}</span>
</div>
<div class="d-flex justify-content-between align-items-center py-2 border-bottom border-secondary">
<span class="text-light">按需付费</span>
<span class="badge bg-warning text-dark">{{ software_license_data.pay_as_you_go|default:0 }}</span>
</div>
</div>
</div>
</div>
</div>
<!-- 最近变更 -->
<div class="card card-dark mt-3">
<div class="card-header d-flex justify-content-between align-items-center">
<span><i class="bi bi-clock-history me-2"></i>最近变更</span>
<a href="{% url 'change_log_list' %}" class="btn btn-sm btn-outline-light">查看全部</a>
<!-- 最近变更(硬件+软件合并展示) -->
<div class="row g-3 mt-0">
<div class="col-lg-6">
<div class="card card-dark h-100">
<div class="card-header d-flex justify-content-between align-items-center">
<span><i class="bi bi-hdd-rack me-2"></i>硬件最近变更</span>
<a href="{% url 'change_log_list' %}" class="btn btn-sm btn-outline-light">查看全部</a>
</div>
<div class="card-body p-0">
<div class="table-responsive">
<table class="table table-dark table-hover mb-0">
<thead>
<tr>
<th>时间</th>
<th>资产编号</th>
<th>操作</th>
<th>描述</th>
<th>操作人</th>
</tr>
</thead>
<tbody>
{% for log in recent_changes %}
<tr>
<td>{{ log.created_at|date:"m-d H:i" }}</td>
<td><a href="{% url 'asset_list' %}?search={{ log.asset_number }}" class="text-info">{{ log.asset_number }}</a></td>
<td>
<span class="badge
{% if log.action == 'create' %}bg-success
{% elif log.action == 'update' %}bg-primary
{% elif log.action == 'delete' %}bg-danger
{% elif log.action == 'import' %}bg-info
{% elif log.action == 'export' %}bg-secondary
{% else %}bg-warning{% endif %}">
{{ log.get_action_display }}
</span>
</td>
<td>{{ log.description|default:"-" }}</td>
<td>{{ log.operator|default:"-" }}</td>
</tr>
{% empty %}
<tr><td colspan="5" class="text-center text-light opacity-75 py-3">暂无变更记录</td></tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
</div>
<div class="card-body p-0">
<div class="table-responsive">
<table class="table table-dark table-hover mb-0">
<thead>
<tr>
<th>时间</th>
<th>资产编号</th>
<th>操作</th>
<th>描述</th>
<th>操作人</th>
</tr>
</thead>
<tbody>
{% for log in recent_changes %}
<tr>
<td>{{ log.created_at|date:"m-d H:i" }}</td>
<td><a href="{% url 'asset_list' %}?search={{ log.asset_number }}" class="text-info">{{ log.asset_number }}</a></td>
<td>
<span class="badge
{% if log.action == 'create' %}bg-success
{% elif log.action == 'update' %}bg-primary
{% elif log.action == 'delete' %}bg-danger
{% elif log.action == 'import' %}bg-info
{% elif log.action == 'export' %}bg-secondary
{% else %}bg-warning{% endif %}">
{{ log.get_action_display }}
</span>
</td>
<td>{{ log.description|default:"-" }}</td>
<td>{{ log.operator|default:"-" }}</td>
</tr>
{% empty %}
<tr><td colspan="5" class="text-center text-light opacity-75 py-3">暂无变更记录</td></tr>
{% endfor %}
</tbody>
</table>
<div class="col-lg-6">
<div class="card card-dark h-100">
<div class="card-header d-flex justify-content-between align-items-center">
<span><i class="bi bi-window-stack me-2"></i>软件最近变更</span>
<a href="{% url 'software_changelog' %}" class="btn btn-sm btn-outline-light">查看全部</a>
</div>
<div class="card-body p-0">
<div class="table-responsive">
<table class="table table-dark table-hover mb-0">
<thead>
<tr>
<th>时间</th>
<th>资产编号</th>
<th>操作</th>
<th>描述</th>
<th>操作人</th>
</tr>
</thead>
<tbody>
{% for log in recent_software_changes %}
<tr>
<td>{{ log.created_at|date:"m-d H:i" }}</td>
<td>
{% if log.software_asset %}
<a href="{% url 'software_detail' log.software_asset.pk %}" class="text-info">{{ log.asset_number }}</a>
{% else %}{{ log.asset_number }}{% endif %}
</td>
<td>
<span class="badge
{% if log.action == 'create' %}bg-success
{% elif log.action == 'update' %}bg-primary
{% elif log.action == 'delete' %}bg-danger
{% elif log.action == 'import' %}bg-info
{% elif log.action == 'export' %}bg-secondary
{% else %}bg-warning{% endif %}">
{{ log.get_action_display }}
</span>
</td>
<td>{{ log.description|default:"-" }}</td>
<td>{{ log.operator|default:"-" }}</td>
</tr>
{% empty %}
<tr><td colspan="5" class="text-center text-light opacity-75 py-3">暂无变更记录</td></tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
@@ -0,0 +1,32 @@
{% extends "assetapp/base.html" %}
{% block title %}删除软件分类{% endblock %}
{% block content %}
<div class="d-flex align-items-center mb-4">
<a href="{% url 'software_category_list' %}" class="btn btn-outline-secondary btn-sm me-3">
<i class="bi bi-arrow-left"></i> 返回
</a>
<h4 class="mb-0"><i class="bi bi-trash me-2"></i>删除软件分类</h4>
</div>
<div class="row justify-content-center">
<div class="col-md-6">
<div class="card card-dark border-danger">
<div class="card-body">
<div class="alert alert-danger">
<i class="bi bi-exclamation-triangle me-2"></i>
确定要删除软件分类 <strong>{{ category.name }}</strong> 吗?
</div>
<form method="post">
{% csrf_token %}
<button type="submit" class="btn btn-danger">
<i class="bi bi-trash me-1"></i>确认删除
</button>
<a href="{% url 'software_category_list' %}" class="btn btn-outline-secondary ms-2">取消</a>
</form>
</div>
</div>
</div>
</div>
{% endblock %}
@@ -0,0 +1,40 @@
{% extends "assetapp/base.html" %}
{% block title %}{% if action == 'create' %}新增软件分类{% else %}编辑软件分类{% endif %}{% endblock %}
{% block content %}
<div class="d-flex align-items-center mb-4">
<a href="{% url 'software_category_list' %}" class="btn btn-outline-secondary btn-sm me-3">
<i class="bi bi-arrow-left"></i> 返回
</a>
<h4 class="mb-0">
<i class="bi bi-{% if action == 'create' %}plus-circle{% else %}pencil{% endif %} me-2"></i>
{% if action == 'create' %}新增软件分类{% else %}编辑软件分类 - {{ category.name }}{% endif %}
</h4>
</div>
<div class="row justify-content-center">
<div class="col-md-6">
<div class="card card-dark">
<div class="card-body">
<form method="post">
{% csrf_token %}
<div class="mb-3">
<label class="form-label text-muted">分类名称 <span class="text-danger">*</span></label>
{{ form.name }}
{% if form.name.errors %}<div class="text-danger small mt-1">{{ form.name.errors.0 }}</div>{% endif %}
</div>
<div class="mb-3">
<label class="form-label text-muted">描述</label>
{{ form.description }}
</div>
<button type="submit" class="btn btn-primary">
<i class="bi bi-check-circle me-1"></i>{% if action == 'create' %}创建{% else %}保存{% endif %}
</button>
<a href="{% url 'software_category_list' %}" class="btn btn-outline-secondary ms-2">取消</a>
</form>
</div>
</div>
</div>
</div>
{% endblock %}
@@ -0,0 +1,52 @@
{% extends "assetapp/base.html" %}
{% block title %}软件分类管理{% endblock %}
{% block content %}
<div class="d-flex justify-content-between align-items-center mb-4">
<h4 class="mb-0"><i class="bi bi-bookmarks me-2"></i>软件分类管理</h4>
<a href="{% url 'software_category_create' %}" class="btn btn-primary btn-sm">
<i class="bi bi-plus-circle me-1"></i>新增软件分类
</a>
</div>
<div class="card card-dark">
<div class="card-body p-0">
<div class="table-responsive">
<table class="table table-dark table-hover mb-0">
<thead>
<tr>
<th>ID</th>
<th>分类名称</th>
<th>描述</th>
<th>软件资产数量</th>
<th>创建时间</th>
<th>操作</th>
</tr>
</thead>
<tbody>
{% for category in categories %}
<tr>
<td>{{ category.id }}</td>
<td><strong>{{ category.name }}</strong></td>
<td>{{ category.description|default:"-" }}</td>
<td><span class="badge bg-primary">{{ category.sw_count }}</span></td>
<td>{{ category.created_at|date:"Y-m-d H:i" }}</td>
<td>
<a href="{% url 'software_category_update' category.pk %}" class="btn btn-outline-warning btn-xs" title="编辑">
<i class="bi bi-pencil"></i>
</a>
<a href="{% url 'software_category_delete' category.pk %}" class="btn btn-outline-danger btn-xs" title="删除">
<i class="bi bi-trash"></i>
</a>
</td>
</tr>
{% empty %}
<tr><td colspan="6" class="text-center text-muted py-4">暂无软件分类</td></tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
{% endblock %}
+112
View File
@@ -0,0 +1,112 @@
{% extends "assetapp/base.html" %}
{% block title %}软件资产变更记录{% endblock %}
{% block content %}
<div class="d-flex justify-content-between align-items-center mb-4">
<h4 class="mb-0"><i class="bi bi-clock-history me-2"></i>软件资产变更记录</h4>
</div>
<div class="card card-dark mb-3">
<div class="card-body py-3">
<form method="get" class="row g-2 align-items-center">
<div class="col-md-4">
<div class="input-group input-group-sm">
<span class="input-group-text"><i class="bi bi-search"></i></span>
<input type="text" name="asset_number" value="{{ asset_number }}" class="form-control"
placeholder="按资产编号搜索">
</div>
</div>
<div class="col-md-3">
<select name="action" class="form-select form-select-sm">
<option value="">全部操作</option>
<option value="create" {% if current_action == 'create' %}selected{% endif %}>创建</option>
<option value="update" {% if current_action == 'update' %}selected{% endif %}>更新</option>
<option value="delete" {% if current_action == 'delete' %}selected{% endif %}>删除</option>
<option value="import" {% if current_action == 'import' %}selected{% endif %}>导入</option>
<option value="export" {% if current_action == 'export' %}selected{% endif %}>导出</option>
<option value="status_change" {% if current_action == 'status_change' %}selected{% endif %}>状态变更</option>
</select>
</div>
<div class="col-md-2">
<button type="submit" class="btn btn-primary btn-sm w-100">
<i class="bi bi-funnel me-1"></i>筛选
</button>
</div>
</form>
</div>
</div>
<div class="card card-dark">
<div class="card-body p-0">
<div class="table-responsive">
<table class="table table-dark table-hover mb-0">
<thead>
<tr>
<th>时间</th>
<th>资产编号</th>
<th>操作</th>
<th>变更字段</th>
<th>旧值</th>
<th>新值</th>
<th>描述</th>
<th>操作人</th>
</tr>
</thead>
<tbody>
{% for log in page_obj %}
<tr>
<td>{{ log.created_at|date:"m-d H:i" }}</td>
<td>
{% if log.software_asset %}
<a href="{% url 'software_detail' log.software_asset.pk %}" class="text-info">{{ log.asset_number }}</a>
{% else %}
{{ log.asset_number }}
{% endif %}
</td>
<td>
<span class="badge
{% if log.action == 'create' %}bg-success
{% elif log.action == 'update' %}bg-primary
{% elif log.action == 'delete' %}bg-danger
{% elif log.action == 'import' %}bg-info
{% elif log.action == 'export' %}bg-secondary
{% else %}bg-warning{% endif %}">
{{ log.get_action_display }}
</span>
</td>
<td>{{ log.field_name|default:"-" }}</td>
<td class="text-wrap" style="max-width:150px;">{{ log.old_value|default:"-"|truncatechars:30 }}</td>
<td class="text-wrap" style="max-width:150px;">{{ log.new_value|default:"-"|truncatechars:30 }}</td>
<td>{{ log.description|default:"-" }}</td>
<td>{{ log.operator|default:"-" }}</td>
</tr>
{% empty %}
<tr><td colspan="8" class="text-center text-muted py-4">暂无变更记录</td></tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
{% if page_obj.paginator.num_pages > 1 %}
<nav class="mt-3">
<ul class="pagination pagination-sm justify-content-center">
{% if page_obj.has_previous %}
<li class="page-item">
<a class="page-link" href="?page={{ page_obj.previous_page_number }}&asset_number={{ asset_number }}&action={{ current_action }}">上一页</a>
</li>
{% endif %}
<li class="page-item active">
<span class="page-link">{{ page_obj.number }} / {{ page_obj.paginator.num_pages }}</span>
</li>
{% if page_obj.has_next %}
<li class="page-item">
<a class="page-link" href="?page={{ page_obj.next_page_number }}&asset_number={{ asset_number }}&action={{ current_action }}">下一页</a>
</li>
{% endif %}
</ul>
</nav>
{% endif %}
{% endblock %}
@@ -0,0 +1,33 @@
{% extends "assetapp/base.html" %}
{% block title %}删除软件资产{% endblock %}
{% block content %}
<div class="d-flex align-items-center mb-4">
<a href="{% url 'software_list' %}" class="btn btn-outline-secondary btn-sm me-3">
<i class="bi bi-arrow-left"></i> 返回
</a>
<h4 class="mb-0"><i class="bi bi-trash me-2"></i>删除软件资产</h4>
</div>
<div class="row justify-content-center">
<div class="col-md-6">
<div class="card card-dark border-danger">
<div class="card-body">
<div class="alert alert-danger">
<i class="bi bi-exclamation-triangle me-2"></i>
确定要删除软件资产 <strong>{{ sw_asset.asset_number }} - {{ sw_asset.name }}</strong> 吗?
此操作不可恢复!
</div>
<form method="post">
{% csrf_token %}
<button type="submit" class="btn btn-danger">
<i class="bi bi-trash me-1"></i>确认删除
</button>
<a href="{% url 'software_list' %}" class="btn btn-outline-secondary ms-2">取消</a>
</form>
</div>
</div>
</div>
</div>
{% endblock %}
+137
View File
@@ -0,0 +1,137 @@
{% extends "assetapp/base.html" %}
{% load asset_tags %}
{% block title %}{{ sw_asset.name }} - 软件资产详情{% endblock %}
{% block content %}
<div class="d-flex align-items-center mb-4">
<a href="{% url 'software_list' %}" class="btn btn-outline-secondary btn-sm me-3">
<i class="bi bi-arrow-left"></i> 返回
</a>
<h4 class="mb-0"><i class="bi bi-window-stack me-2"></i>{{ sw_asset.asset_number }} - {{ sw_asset.name }}</h4>
<div class="ms-auto">
<a href="{% url 'software_update' sw_asset.pk %}" class="btn btn-warning btn-sm me-2">
<i class="bi bi-pencil me-1"></i>编辑
</a>
<a href="{% url 'software_delete' sw_asset.pk %}" class="btn btn-outline-danger btn-sm">
<i class="bi bi-trash me-1"></i>删除
</a>
</div>
</div>
<div class="row g-3">
<div class="col-lg-8">
<div class="card card-dark mb-3">
<div class="card-header"><i class="bi bi-info-circle me-2"></i>基本信息</div>
<div class="card-body">
<div class="row">
<div class="col-md-6 mb-2"><span class="text-muted">资产编号:</span>{{ sw_asset.asset_number }}</div>
<div class="col-md-6 mb-2"><span class="text-muted">软件名称:</span>{{ sw_asset.name }}</div>
<div class="col-md-6 mb-2"><span class="text-muted">软件分类:</span>{{ sw_asset.category.name }}</div>
<div class="col-md-6 mb-2"><span class="text-muted">供应商:</span>{{ sw_asset.vendor|default:"-" }}</div>
<div class="col-md-6 mb-2"><span class="text-muted">版本:</span>{{ sw_asset.version|default:"-" }}</div>
<div class="col-md-6 mb-2"><span class="text-muted">账号:</span>{{ sw_asset.account|default:"-" }}</div>
</div>
</div>
</div>
<div class="card card-dark mb-3">
<div class="card-header"><i class="bi bi-key me-2"></i>许可信息</div>
<div class="card-body">
<div class="row">
<div class="col-md-6 mb-2">
<span class="text-muted">许可类型:</span>
{{ license_type_map|get_item:sw_asset.license_type }}
</div>
<div class="col-md-6 mb-2"><span class="text-muted">授权数量:</span>{{ sw_asset.seats|default:"-" }}</div>
<div class="col-12 mb-2"><span class="text-muted">许可密钥/激活码:</span><code>{{ sw_asset.license_key|default:"-" }}</code></div>
</div>
</div>
</div>
<div class="card card-dark mb-3">
<div class="card-header"><i class="bi bi-cash-coin me-2"></i>费用与有效期</div>
<div class="card-body">
<div class="row">
<div class="col-md-3 mb-2"><span class="text-muted">费用:</span>{{ sw_asset.cost|default:"-" }}{% if sw_asset.cost %} 元{% endif %}</div>
<div class="col-md-3 mb-2"><span class="text-muted">启用日期:</span>{{ sw_asset.start_date|default:"-" }}</div>
<div class="col-md-3 mb-2">
<span class="text-muted">到期日期:</span>{{ sw_asset.expire_date|default:"-" }}
{% if sw_asset.is_expired %}<span class="badge bg-danger ms-1">已到期</span>
{% elif sw_asset.is_expiring_soon %}<span class="badge bg-warning text-dark ms-1">即将到期</span>{% endif %}
</div>
<div class="col-md-3 mb-2">
<span class="text-muted">状态:</span>
<span class="badge
{% if sw_asset.status == 'in_use' %}bg-success
{% elif sw_asset.status == 'idle' %}bg-warning text-dark
{% elif sw_asset.status == 'expired' %}bg-danger
{% else %}bg-secondary{% endif %}">
{{ status_map|get_item:sw_asset.status }}
</span>
</div>
</div>
</div>
</div>
<div class="card card-dark mb-3">
<div class="card-header"><i class="bi bi-person-badge me-2"></i>管理信息</div>
<div class="card-body">
<div class="row">
<div class="col-md-6 mb-2"><span class="text-muted">负责人:</span>{{ sw_asset.responsible_person|default:"-" }}</div>
<div class="col-md-6 mb-2"><span class="text-muted">使用部门:</span>{{ sw_asset.department|default:"-" }}</div>
<div class="col-12 mb-2"><span class="text-muted">备注:</span>{{ sw_asset.remark|default:"-" }}</div>
</div>
</div>
</div>
</div>
<div class="col-lg-4">
<div class="card card-dark">
<div class="card-header"><i class="bi bi-clock-history me-2"></i>变更记录</div>
<div class="card-body p-0">
<div class="table-responsive" style="max-height: 500px;">
<table class="table table-dark table-hover mb-0">
<tbody>
{% for log in change_logs %}
<tr>
<td class="py-2">
<div class="small text-muted">{{ log.created_at|date:"Y-m-d H:i" }}</div>
<span class="badge
{% if log.action == 'create' %}bg-success
{% elif log.action == 'update' %}bg-primary
{% elif log.action == 'delete' %}bg-danger
{% elif log.action == 'import' %}bg-info
{% else %}bg-secondary{% endif %}">
{{ log.get_action_display }}
</span>
{% if log.field_name %}
<span class="small">{{ log.field_name }}: {{ log.old_value }} → {{ log.new_value }}</span>
{% endif %}
{% if log.description %}
<div class="small text-muted">{{ log.description }}</div>
{% endif %}
<div class="small text-muted">操作人: {{ log.operator|default:"-" }}</div>
</td>
</tr>
{% empty %}
<tr><td class="text-center text-muted py-4">暂无变更记录</td></tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
<div class="card card-dark mt-3">
<div class="card-body">
<div class="small text-muted">
<div><i class="bi bi-person me-1"></i>创建人: {{ sw_asset.created_by|default:"-" }}</div>
<div><i class="bi bi-calendar-plus me-1"></i>创建时间: {{ sw_asset.created_at|date:"Y-m-d H:i" }}</div>
<div><i class="bi bi-arrow-repeat me-1"></i>更新时间: {{ sw_asset.updated_at|date:"Y-m-d H:i" }}</div>
</div>
</div>
</div>
</div>
</div>
{% endblock %}
+116
View File
@@ -0,0 +1,116 @@
{% extends "assetapp/base.html" %}
{% block title %}{% if action == 'create' %}新增软件资产{% else %}编辑软件资产{% endif %}{% endblock %}
{% block content %}
<div class="d-flex align-items-center mb-4">
<a href="{% if action == 'update' %}{% url 'software_detail' sw_asset.pk %}{% else %}{% url 'software_list' %}{% endif %}"
class="btn btn-outline-secondary btn-sm me-3">
<i class="bi bi-arrow-left"></i> 返回
</a>
<h4 class="mb-0">
<i class="bi bi-{% if action == 'create' %}plus-circle{% else %}pencil{% endif %} me-2"></i>
{% if action == 'create' %}新增软件资产{% else %}编辑软件资产 - {{ sw_asset.name }}{% endif %}
</h4>
</div>
<div class="row justify-content-center">
<div class="col-lg-8">
<div class="card card-dark">
<div class="card-body">
<form method="post">
{% csrf_token %}
<h6 class="text-info mb-3"><i class="bi bi-info-circle me-1"></i>基本信息</h6>
<div class="row">
<div class="col-md-4 mb-3">
<label class="form-label text-muted">资产编号 <span class="text-danger">*</span></label>
{{ form.asset_number }}
{% if form.asset_number.errors %}<div class="text-danger small mt-1">{{ form.asset_number.errors.0 }}</div>{% endif %}
</div>
<div class="col-md-4 mb-3">
<label class="form-label text-muted">软件名称 <span class="text-danger">*</span></label>
{{ form.name }}
{% if form.name.errors %}<div class="text-danger small mt-1">{{ form.name.errors.0 }}</div>{% endif %}
</div>
<div class="col-md-4 mb-3">
<label class="form-label text-muted">软件分类</label>
{{ form.category }}
</div>
<div class="col-md-6 mb-3">
<label class="form-label text-muted">供应商</label>
{{ form.vendor }}
</div>
<div class="col-md-6 mb-3">
<label class="form-label text-muted">版本</label>
{{ form.version }}
</div>
</div>
<h6 class="text-info mb-3 mt-4"><i class="bi bi-key me-1"></i>许可信息</h6>
<div class="row">
<div class="col-md-3 mb-3">
<label class="form-label text-muted">许可类型</label>
{{ form.license_type }}
</div>
<div class="col-md-3 mb-3">
<label class="form-label text-muted">授权数量</label>
{{ form.seats }}
</div>
<div class="col-md-6 mb-3">
<label class="form-label text-muted">账号</label>
{{ form.account }}
</div>
<div class="col-12 mb-3">
<label class="form-label text-muted">许可密钥/激活码</label>
{{ form.license_key }}
</div>
</div>
<h6 class="text-info mb-3 mt-4"><i class="bi bi-cash-coin me-1"></i>费用与有效期</h6>
<div class="row">
<div class="col-md-4 mb-3">
<label class="form-label text-muted">费用(元)</label>
{{ form.cost }}
</div>
<div class="col-md-4 mb-3">
<label class="form-label text-muted">启用日期</label>
{{ form.start_date }}
</div>
<div class="col-md-4 mb-3">
<label class="form-label text-muted">到期日期</label>
{{ form.expire_date }}
</div>
</div>
<h6 class="text-info mb-3 mt-4"><i class="bi bi-person-badge me-1"></i>管理信息</h6>
<div class="row">
<div class="col-md-4 mb-3">
<label class="form-label text-muted">负责人</label>
{{ form.responsible_person }}
</div>
<div class="col-md-4 mb-3">
<label class="form-label text-muted">使用部门</label>
{{ form.department }}
</div>
<div class="col-md-4 mb-3">
<label class="form-label text-muted">状态</label>
{{ form.status }}
</div>
<div class="col-12 mb-3">
<label class="form-label text-muted">备注</label>
{{ form.remark }}
</div>
</div>
<button type="submit" class="btn btn-primary">
<i class="bi bi-check-circle me-1"></i>{% if action == 'create' %}创建{% else %}保存{% endif %}
</button>
<a href="{% if action == 'update' %}{% url 'software_detail' sw_asset.pk %}{% else %}{% url 'software_list' %}{% endif %}"
class="btn btn-outline-secondary ms-2">取消</a>
</form>
</div>
</div>
</div>
</div>
{% endblock %}
+71
View File
@@ -0,0 +1,71 @@
{% extends "assetapp/base.html" %}
{% block title %}导入软件资产{% endblock %}
{% block content %}
<div class="d-flex align-items-center mb-4">
<a href="{% url 'software_list' %}" class="btn btn-outline-secondary btn-sm me-3">
<i class="bi bi-arrow-left"></i> 返回
</a>
<h4 class="mb-0"><i class="bi bi-upload me-2"></i>导入软件资产</h4>
</div>
<div class="row justify-content-center">
<div class="col-md-8">
<div class="card card-dark">
<div class="card-header"><i class="bi bi-file-earmark-spreadsheet me-2"></i>上传文件</div>
<div class="card-body">
<div class="alert alert-info">
<i class="bi bi-info-circle me-2"></i>
<strong>使用说明:</strong>
<ol class="mb-0 mt-2">
<li>先 <a href="{% url 'download_software_template' %}" class="text-info">下载软件资产导入模板</a></li>
<li>按模板格式填写软件资产数据</li>
<li>上传填写好的Excel文件(.xlsx)</li>
<li>提供ID列且该ID已存在时更新原记录,否则创建新记录</li>
<li>软件分类不存在时会自动创建</li>
</ol>
</div>
<form method="post" enctype="multipart/form-data">
{% csrf_token %}
<div class="mb-3">
<label class="form-label">选择Excel文件</label>
<div class="file-upload-wrapper">
<input type="file" name="excel_file" id="id_excel_file" accept=".xlsx,.xls" class="d-none" onchange="updateFileName(this)">
<button type="button" class="btn btn-outline-info" onclick="document.getElementById('id_excel_file').click()">
<i class="bi bi-folder2-open me-1"></i>浏览文件
</button>
<span id="file-name" class="ms-3 file-name-text">未选择文件</span>
</div>
{% if form.excel_file.errors %}
<div class="text-danger small mt-1">{{ form.excel_file.errors.0 }}</div>
{% endif %}
</div>
<div class="d-flex">
<button type="submit" class="btn btn-primary me-2">
<i class="bi bi-upload me-1"></i>开始导入
</button>
<a href="{% url 'download_software_template' %}" class="btn btn-outline-info">
<i class="bi bi-file-earmark-arrow-down me-1"></i>下载模板
</a>
</div>
</form>
</div>
</div>
</div>
</div>
<script>
function updateFileName(input) {
var nameSpan = document.getElementById('file-name');
if (input.files && input.files.length > 0) {
nameSpan.textContent = input.files[0].name;
nameSpan.style.color = '#4A9EFF';
} else {
nameSpan.textContent = '未选择文件';
nameSpan.style.color = '#8b949e';
}
}
</script>
{% endblock %}
+166
View File
@@ -0,0 +1,166 @@
{% extends "assetapp/base.html" %}
{% load asset_tags %}
{% block title %}软件资产{% endblock %}
{% block content %}
<div class="d-flex justify-content-between align-items-center mb-4">
<h4 class="mb-0"><i class="bi bi-window-stack me-2"></i>软件资产</h4>
<div>
<a href="{% url 'software_import' %}" class="btn btn-outline-info btn-sm me-2">
<i class="bi bi-upload me-1"></i>导入
</a>
<a href="{% url 'software_export' %}{{ query_string|default:'' }}" class="btn btn-outline-info btn-sm me-2">
<i class="bi bi-download me-1"></i>导出
</a>
<a href="{% url 'software_create' %}" class="btn btn-primary btn-sm">
<i class="bi bi-plus-circle me-1"></i>新增软件资产
</a>
</div>
</div>
<!-- 搜索与筛选 -->
<div class="card card-dark mb-3">
<div class="card-body py-3">
<form method="get" class="row g-2 align-items-center">
<div class="col-md-4">
<div class="input-group input-group-sm">
<span class="input-group-text"><i class="bi bi-search"></i></span>
<input type="text" name="search" value="{{ search }}" class="form-control"
placeholder="搜索编号 / 名称 / 供应商 / 版本 / 账号 / 负责人">
</div>
</div>
<div class="col-md-2">
<select name="category" class="form-select form-select-sm">
<option value="">全部分类</option>
{% for c in categories %}
<option value="{{ c.id }}" {% if current_category == c.id|stringformat:"s" %}selected{% endif %}>{{ c.name }}</option>
{% endfor %}
</select>
</div>
<div class="col-md-2">
<select name="status" class="form-select form-select-sm">
<option value="">全部状态</option>
{% for key, label in status_map.items %}
<option value="{{ key }}" {% if current_status == key %}selected{% endif %}>{{ label }}</option>
{% endfor %}
</select>
</div>
<div class="col-md-2">
<select name="license_type" class="form-select form-select-sm">
<option value="">全部许可类型</option>
{% for key, label in license_type_map.items %}
<option value="{{ key }}" {% if current_license_type == key %}selected{% endif %}>{{ label }}</option>
{% endfor %}
</select>
</div>
<div class="col-md-2">
<button type="submit" class="btn btn-primary btn-sm w-100">
<i class="bi bi-funnel me-1"></i>筛选
</button>
</div>
</form>
</div>
</div>
<div class="card card-dark">
<div class="card-body p-0">
<div class="table-responsive">
<table class="table table-dark table-hover mb-0 align-middle">
<thead>
<tr>
<th><a href="?sort={% if sort == 'id' %}-{% else %}id{% endif %}&search={{ search }}">ID</a></th>
<th><a href="?sort={% if sort == 'asset_number' %}-asset_number{% else %}asset_number{% endif %}&search={{ search }}">资产编号</a></th>
<th><a href="?sort={% if sort == 'name' %}-name{% else %}name{% endif %}&search={{ search }}">软件名称</a></th>
<th>软件分类</th>
<th>供应商</th>
<th>版本</th>
<th>许可类型</th>
<th>授权数量</th>
<th>账号</th>
<th>负责人</th>
<th>使用部门</th>
<th><a href="?sort={% if sort == 'expire_date' %}-expire_date{% else %}expire_date{% endif %}&search={{ search }}">到期日期</a></th>
<th>状态</th>
<th>操作</th>
</tr>
</thead>
<tbody>
{% for sw in page_obj %}
<tr>
<td>{{ sw.id }}</td>
<td><strong>{{ sw.asset_number }}</strong></td>
<td>
<a href="{% url 'software_detail' sw.pk %}" class="text-info text-decoration-none">{{ sw.name }}</a>
</td>
<td>{{ sw.category.name }}</td>
<td>{{ sw.vendor|default:"-" }}</td>
<td>{{ sw.version|default:"-" }}</td>
<td>
<span class="badge
{% if sw.license_type == 'permanent' %}bg-primary
{% elif sw.license_type == 'subscription' %}bg-info
{% elif sw.license_type == 'open_source' %}bg-secondary
{% else %}bg-warning text-dark{% endif %}">
{{ license_type_map|get_item:sw.license_type }}
</span>
</td>
<td>{{ sw.seats|default:"-" }}</td>
<td>{{ sw.account|default:"-" }}</td>
<td>{{ sw.responsible_person|default:"-" }}</td>
<td>{{ sw.department|default:"-" }}</td>
<td>
{{ sw.expire_date|default:"-" }}
{% if sw.is_expired %}<span class="badge bg-danger ms-1">已到期</span>
{% elif sw.is_expiring_soon %}<span class="badge bg-warning text-dark ms-1">即将到期</span>{% endif %}
</td>
<td>
<span class="badge
{% if sw.status == 'in_use' %}bg-success
{% elif sw.status == 'idle' %}bg-warning text-dark
{% elif sw.status == 'expired' %}bg-danger
{% else %}bg-secondary{% endif %}">
{{ status_map|get_item:sw.status }}
</span>
</td>
<td class="text-nowrap">
<a href="{% url 'software_detail' sw.pk %}" class="btn btn-outline-info btn-xs" title="详情">
<i class="bi bi-eye"></i>
</a>
<a href="{% url 'software_update' sw.pk %}" class="btn btn-outline-warning btn-xs" title="编辑">
<i class="bi bi-pencil"></i>
</a>
<a href="{% url 'software_delete' sw.pk %}" class="btn btn-outline-danger btn-xs" title="删除">
<i class="bi bi-trash"></i>
</a>
</td>
</tr>
{% empty %}
<tr><td colspan="14" class="text-center text-muted py-4">暂无软件资产</td></tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
{% if page_obj.paginator.num_pages > 1 %}
<nav class="mt-3">
<ul class="pagination pagination-sm justify-content-center">
{% if page_obj.has_previous %}
<li class="page-item">
<a class="page-link" href="?page={{ page_obj.previous_page_number }}&search={{ search }}&category={{ current_category }}&status={{ current_status }}&license_type={{ current_license_type }}">上一页</a>
</li>
{% endif %}
<li class="page-item active">
<span class="page-link">{{ page_obj.number }} / {{ page_obj.paginator.num_pages }}</span>
</li>
{% if page_obj.has_next %}
<li class="page-item">
<a class="page-link" href="?page={{ page_obj.next_page_number }}&search={{ search }}&category={{ current_category }}&status={{ current_status }}&license_type={{ current_license_type }}">下一页</a>
</li>
{% endif %}
</ul>
</nav>
{% endif %}
{% endblock %}