xiaji/fzjg_local
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改了分支机构排序的逻辑：省份优先

Browse Source
This commit is contained in:
xiaji
2026-01-12 16:04:22 +08:00
parent 8eba3f0160
commit b99c2303e5
6 changed files with 106 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
fzjgact/huodong/templates/branch_info.html
View File

@@ -6,6 +6,9 @@
<table class="items-center bg-transparent w-full border-collapse ">
<thead>
<tr class="bg-gray-100">
<th class="px-6 bg-blueGray-50 text-blueGray-500 align-middle border border-solid border-blueGray-100 py-3 text-base uppercase border-l-0 border-r-0 whitespace-nowrap font-semibold text-left">
所在省份
</th>
<th class="px-6 bg-blueGray-50 text-blueGray-500 align-middle border border-solid border-blueGray-100 py-3 text-base uppercase border-l-0 border-r-0 whitespace-nowrap font-semibold text-left">
分支机构名称
<br>
@@ -17,33 +20,39 @@
</tr>
</thead>
<tbody>
{% for item in branches %}
<!-- 这里是其他行的处理逻辑 -->
<tr class="{% if forloop.counter|divisibleby:2 %}bg-gray-100{% else %}bg-white{% endif %}">
<td class="px-6 py-4 whitespace-no-wrap text-left border-b border-gray-200">
<a href="{% url 'branch-detail' item.pk %}"
class="bg-transparent hover:bg-blue-900 hover:text-white p-2 rounded-md">
{{ item.name }}
</a>
</td>
<td class="px-6 py-4 whitespace-no-wrap text-left border-b border-gray-200">
{{ item.category }}
</td>
{% for province, branches in branches_by_province.items %}
{% for item in branches %}
<tr class="{% if forloop.parentloop.counter|divisibleby:2 %}bg-gray-100{% else %}bg-white{% endif %}">
{% if forloop.first %}
<td class="px-6 py-4 whitespace-no-wrap text-left border-b border-gray-200" rowspan="{{ branches|length }}">
{{ province }}
</td>
{% endif %}
<td class="px-6 py-4 whitespace-no-wrap text-left border-b border-gray-200">
<a href="{% url 'branch-detail' item.pk %}"
class="bg-transparent hover:bg-blue-900 hover:text-white p-2 rounded-md">
{{ item.name }}
</a>
</td>
<td class="px-6 py-4 whitespace-no-wrap text-left border-b border-gray-200">
{{ item.category }}
</td>
</tr>
</tr>
{% endfor %}
{% endfor %}
</tbody>
<tr class="bg-gray-200 font-bold">
<td class="px-6 py-4 whitespace-no-wrap text-left border-b border-gray-200">
分支机构类别统计
</td>
<td class="px-6 py-4 whitespace-no-wrap text-left border-b border-gray-200">
<td class="px-6 py-4 whitespace-no-wrap text-left border-b border-gray-200" colspan="2">
A型: {{ type_a_count }}家 | B型: {{ type_b_count }}家 | C型: {{ type_c_count }}家
</td>
</tr>
<tfoot>
<tr class="bg-gray-50">
<td colspan="2" class="px-6 py-4 text-right border-b border-gray-200">
<td colspan="3" class="px-6 py-4 text-right border-b border-gray-200">
<div class="flex justify-end space-x-3">
<a href="{% url 'export-branches-xls' %}" class="inline-flex items-center px-4 py-2 bg-blue-600 hover:bg-blue-700 text-black font-medium rounded-lg shadow-md transition duration-150 ease-in-out transform hover:scale-105">
<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-2" viewBox="0 0 20 20" fill="currentColor">