CodeCow/ioe
1
0
Fork 0
mirror of https://github.com/zhtyyx/ioe.git synced 2026-06-03 21:02:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 修复商城首页最近操作显示格式问题，修复扫码添加商品is_active默认为0问题

Browse Source
This commit is contained in:
Junglejia 2025-04-30 18:08:42 +08:00
parent 56fcc14d95
commit 423bc340ef
3 changed files with 108 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
inventory/templates/inventory/barcode_product_form.html
View File

@ -269,6 +269,16 @@
</div>
</div>
<div class="mb-3">
<div class="form-check">
<input type="checkbox" name="is_active" id="id_is_active" class="form-check-input" {% if form.is_active.value %}checked{% else %}checked{% endif %}>
<label for="id_is_active" class="form-check-label">启用商品</label>
{% if form.is_active.errors %}
<div class="alert alert-danger mt-1">{{ form.is_active.errors }}</div>
{% endif %}
</div>
</div>
<div class="mb-3">
<label for="id_description" class="form-label">商品描述</label>
{% if form.description.errors %}

145
inventory/templates/inventory/index.html
View File

@ -97,55 +97,6 @@
<canvas id="salesChart" height="200"></canvas>
</div>
</div>
<div class="row">
<!-- 热销商品 -->
<div class="col-md-6">
<div class="card mb-4">
<div class="card-header bg-success text-white">
<h5 class="card-title mb-0">热销商品</h5>
</div>
<div class="card-body">
{% if top_products %}
<div class="list-group list-group-flush">
{% for product in top_products %}
<div class="list-group-item px-0">
<div class="d-flex justify-content-between align-items-center">
<h6 class="mb-0">{{ product.product__name }}</h6>
<span class="badge bg-primary rounded-pill">{{ product.total_qty }}</span>
</div>
<small class="text-muted">销售额: ¥{{ product.total_amount|floatformat:2 }}</small>
</div>
{% endfor %}
</div>
{% else %}
<p class="text-muted">暂无销售数据</p>
{% endif %}
</div>
</div>
</div>
<!-- 库存预警 -->
<div class="col-md-6">
<div class="card mb-4">
<div class="card-header bg-danger text-white">
<h5 class="card-title mb-0">库存预警</h5>
</div>
<div class="card-body">
{% if low_stock_products > 0 %}
<div class="alert alert-warning mb-3">
<strong>注意：</strong> 有 {{ low_stock_products }} 个商品库存不足，其中 {{ out_of_stock_products }} 个商品已无库存！
</div>
<a href="#" class="btn btn-danger btn-sm">查看库存不足商品</a>
{% else %}
<div class="alert alert-success mb-0">
<i class="fas fa-check-circle me-2"></i> 所有商品库存充足
</div>
{% endif %}
</div>
</div>
</div>
</div>
</div>
<!-- 右侧区域 -->
@ -158,7 +109,7 @@
<a href="{% url 'birthday_members_report' %}" class="btn btn-light btn-sm">查看全部</a>
</div>
</div>
<div class="card-body p-0">
<div class="card-body card-scrollable p-0">
{% if birthday_members %}
<div class="list-group list-group-flush">
{% for member in birthday_members %}
@ -190,13 +141,65 @@
{% endif %}
</div>
</div>
<!-- 最近操作日志 -->
<div class="card">
</div>
</div>
<!-- 底部三个卡片区域 -->
<div class="row">
<!-- 热销商品 -->
<div class="col-md-4">
<div class="card mb-4">
<div class="card-header bg-success text-white">
<h5 class="card-title mb-0">热销商品</h5>
</div>
<div class="card-body card-scrollable">
{% if top_products %}
<div class="list-group list-group-flush">
{% for product in top_products %}
<div class="list-group-item px-0">
<div class="d-flex justify-content-between align-items-center">
<h6 class="mb-0">{{ product.product__name }}</h6>
<span class="badge bg-primary rounded-pill">{{ product.total_qty }}</span>
</div>
<small class="text-muted">销售额: ¥{{ product.total_amount|floatformat:2 }}</small>
</div>
{% endfor %}
</div>
{% else %}
<p class="text-muted">暂无销售数据</p>
{% endif %}
</div>
</div>
</div>
<!-- 库存预警 -->
<div class="col-md-4">
<div class="card mb-4">
<div class="card-header bg-danger text-white">
<h5 class="card-title mb-0">库存预警</h5>
</div>
<div class="card-body card-scrollable">
{% if low_stock_products > 0 %}
<div class="alert alert-warning mb-3">
<strong>注意：</strong> 有 {{ low_stock_products }} 个商品库存不足，其中 {{ out_of_stock_products }} 个商品已无库存！
</div>
<a href="#" class="btn btn-danger btn-sm">查看库存不足商品</a>
{% else %}
<div class="alert alert-success mb-0">
<i class="fas fa-check-circle me-2"></i> 所有商品库存充足
</div>
{% endif %}
</div>
</div>
</div>
<!-- 最近操作日志 -->
<div class="col-md-4">
<div class="card mb-4">
<div class="card-header bg-secondary text-white">
<h5 class="card-title mb-0">最近操作</h5>
</div>
<div class="card-body p-0">
<div class="card-body card-scrollable p-0">
{% if recent_logs %}
<div class="list-group list-group-flush">
{% for log in recent_logs %}
@ -238,6 +241,40 @@
justify-content: center;
font-size: 14px;
}
/* 添加固定高度和滚动样式 */
.card-scrollable {
height: 250px;
overflow-y: auto;
scrollbar-width: thin;
}
/* 美化滚动条 */
.card-scrollable::-webkit-scrollbar {
width: 5px;
}
.card-scrollable::-webkit-scrollbar-track {
background: #f1f1f1;
}
.card-scrollable::-webkit-scrollbar-thumb {
background: #888;
border-radius: 5px;
}
.card-scrollable::-webkit-scrollbar-thumb:hover {
background: #555;
}
/* 确保卡片有统一的高度 */
.col-md-4 .card {
height: 100%;
}
.col-md-4 .card-body {
padding: 0.75rem;
}
</style>
{% block extra_js %}

11
inventory/views_barcode.py
View File

@ -41,7 +41,8 @@ def barcode_product_create(request):
'manufacturer': barcode_data.get('manufacturer', ''),
'price': barcode_data.get('suggested_price', 0),
'cost': barcode_data.get('suggested_price', 0) * 0.8 if barcode_data.get('suggested_price') else 0, # 默认成本价为建议售价的80%
'description': barcode_data.get('description', '')
'description': barcode_data.get('description', ''),
'is_active': True # 确保初始化时is_active为True
}
# 尝试从数据库中查找匹配的商品类别
@ -57,14 +58,16 @@ def barcode_product_create(request):
messages.success(request, '成功获取商品信息，请确认并完善商品详情')
else:
messages.info(request, f'未找到条码 {barcode} 的商品信息，请手动填写')
initial_data = {'barcode': barcode}
initial_data = {'barcode': barcode, 'is_active': True} # 确保初始化时is_active为True
# 处理表单提交
if request.method == 'POST':
form = forms.ProductForm(request.POST, request.FILES)
if form.is_valid():
# 保存商品信息
product = form.save()
# 确保is_active为True
product = form.save(commit=False)
product.is_active = True
product.save()
# 创建初始库存记录
initial_stock = request.POST.get('initial_stock', 0)