瀏覽代碼

commit 优化成员列表展示

Hai Lin 11 小時之前
父節點
當前提交
ed511a75d5
共有 2 個文件被更改,包括 10 次插入4 次删除
  1. 2 2
      app.py
  2. 8 2
      templates/members.html

+ 2 - 2
app.py

@@ -1024,10 +1024,10 @@ def members():
                 if not where_parts:
                 if not where_parts:
                     like = f"%{search_name}%"
                     like = f"%{search_name}%"
                     params = [like, like]
                     params = [like, like]
-                sql = f"SELECT * FROM family_member_info WHERE {where_clause} {order_clause} LIMIT %s OFFSET %s"
+                sql = f"SELECT id, name, simplified_name, sex, name_word_generation, birthday, occupation, family_rank, branch_family_hall, residential_address, is_pass_away, create_time, modified_time FROM family_member_info WHERE {where_clause} {order_clause} LIMIT %s OFFSET %s"
                 cursor.execute(sql, tuple(params + [per_page, offset]))
                 cursor.execute(sql, tuple(params + [per_page, offset]))
             else:
             else:
-                sql = f"SELECT * FROM family_member_info {order_clause} LIMIT %s OFFSET %s"
+                sql = f"SELECT id, name, simplified_name, sex, name_word_generation, birthday, occupation, family_rank, branch_family_hall, residential_address, is_pass_away, create_time, modified_time FROM family_member_info {order_clause} LIMIT %s OFFSET %s"
                 cursor.execute(sql, (per_page, offset))
                 cursor.execute(sql, (per_page, offset))
             
             
             members = cursor.fetchall()
             members = cursor.fetchall()

+ 8 - 2
templates/members.html

@@ -55,6 +55,7 @@
                         <th>基本信息</th>
                         <th>基本信息</th>
                         <th>世系世代</th>
                         <th>世系世代</th>
                         <th>职业背景</th>
                         <th>职业背景</th>
+                        <th>堂内排行</th>
                         <th>分房 / 堂号</th>
                         <th>分房 / 堂号</th>
                         <th>居住地</th>
                         <th>居住地</th>
                         <th>状态</th>
                         <th>状态</th>
@@ -100,7 +101,12 @@
                         </td>
                         </td>
                         <td>
                         <td>
                             <div class="small">
                             <div class="small">
-                                {{ member.family_branch or member.hall_name or '-' }}
+                                {{ member.family_rank or '-' }}
+                            </div>
+                        </td>
+                        <td>
+                            <div class="small">
+                                {{ member.branch_family_hall or '-' }}
                             </div>
                             </div>
                         </td>
                         </td>
                         <td>
                         <td>
@@ -137,7 +143,7 @@
                     {% endfor %}
                     {% endfor %}
                     {% if not members %}
                     {% if not members %}
                     <tr>
                     <tr>
-                        <td colspan="7" class="text-center py-5 text-muted">
+                        <td colspan="8" class="text-center py-5 text-muted">
                             <i class="bi bi-person-x fs-1 d-block mb-2"></i>
                             <i class="bi bi-person-x fs-1 d-block mb-2"></i>
                             暂无成员数据
                             暂无成员数据
                         </td>
                         </td>