From bb784f85e73410f312472b942e233d17b43a9be6 Mon Sep 17 00:00:00 2001
From: sichan <sichanwong0527@gmail.com>
Date: Fri, 7 Jun 2024 00:28:39 +0800
Subject: [PATCH] commit

---
 .../templates/accounts/group_perm_list.html   |  1 -
 .../accounts/user_permissions_list.html       | 36 ++++++++++++++++---
 application/accounts/views.py                 |  3 +-
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/application/accounts/templates/accounts/group_perm_list.html b/application/accounts/templates/accounts/group_perm_list.html
index f5e1965..9d1b73a 100644
--- a/application/accounts/templates/accounts/group_perm_list.html
+++ b/application/accounts/templates/accounts/group_perm_list.html
@@ -87,7 +87,6 @@
 </section>
 <!-- [ 主内容页 ] 结束 -->
 
-{% include 'add_modify_modal.html' %}
 <div class="modal" id="groupPermissionModal" tabindex="-1" aria-labelledby="groupPermissionModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
diff --git a/application/accounts/templates/accounts/user_permissions_list.html b/application/accounts/templates/accounts/user_permissions_list.html
index 2de2cf1..5c6fcc7 100644
--- a/application/accounts/templates/accounts/user_permissions_list.html
+++ b/application/accounts/templates/accounts/user_permissions_list.html
@@ -16,11 +16,9 @@
                                 <div class="card">
                                     <div class="card-body">
                                         <div class="row">
-                                            <!-- 筛选查询表单 -->
                                             <div class="col-md-8">
                                                 {% include "filter.html" %}
                                             </div>
-                                            <!-- 按钮 -->
                                             <div class="col-md-4 mt-4 text-end">
                                                 <button class="btn btn-outline-secondary" data-bs-toggle="modal" data-bs-target="#modifyRecordsModal">修改记录</button>
                                                 <button class="btn btn-outline-secondary" data-bs-toggle="modal" data-bs-target="#addModifyModal">添加</button>
@@ -34,11 +32,41 @@
                         <div class="row mb-3">
                             <div class="col-sm-12">
                                 <div class="card">
-                                    {% include 'table.html' %}
+                                    <div class="card-body table-border-style">
+                                        <div class="table-responsive">
+                                            <table class="table">
+                                                <thead>
+                                                <tr>
+                                                    {% for column in table_columns %}
+                                                        <th class="text-center">{{ column.header }}</th>
+                                                    {% endfor %}
+                                                </tr>
+                                                </thead>
+                                                <tbody id="result" style="color: white;">
+                                                {% for item in items %}
+                                                    <tr data-id="{{ item|getattr_filter:list_key }}">
+                                                        {% for column in table_columns %}
+                                                            {% if column.field == 'authority' %}
+                                                                <td class="text-center">
+                                                                    <button id="permission-btn-{{ item|getattr_filter:list_key }}" class="btn btn-outline-primary" data-bs-toggle="modal" data-bs-target="#groupPermissionModal">权限设置</button>
+                                                                </td>
+                                                            {% else %}
+                                                                <td class="text-center">{{ item|getattr_filter:column.field }}</td>
+                                                            {% endif %}
+                                                        {% endfor %}
+                                                    </tr>
+                                                {% empty %}
+                                                    <tr>
+                                                        <td class="text-center" colspan="{{ table_columns|length }}">暂无数据</td>
+                                                    </tr>
+                                                {% endfor %}
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
-                        <!-- 分页 -->
                     </div>
                 </div>
             </div>
diff --git a/application/accounts/views.py b/application/accounts/views.py
index 06b86da..ff3946f 100644
--- a/application/accounts/views.py
+++ b/application/accounts/views.py
@@ -147,8 +147,7 @@ def user_permissions_list(request):
             {"header": "部门", "field": "employee_information.primary_department"},
             {"header": "职务", "field": "employee_information.position"},
             {"header": "状态", "field": "employee_information.status"},
-            {"header": "权限", "field": "authority"},
-            {"header": "编辑", "field": "actions"}
+            {"header": "权限", "field": "authority"}
         ],
         'query_params': query_params,
         'items': items,