林海 1 месяц назад
Родитель
Сommit
e643c77a52
2 измененных файлов с 7 добавлено и 1 удалено
  1. 2 1
      app.py
  2. 5 0
      templates/member_detail.html

+ 2 - 1
app.py

@@ -2508,10 +2508,11 @@ def member_detail(member_id):
             parents = cursor.fetchall()
             
             cursor.execute("""
-                SELECT m.id, m.name, r.relation_type, r.sub_relation_type 
+                SELECT m.id, m.name, r.relation_type, r.sub_relation_type, r.child_order
                 FROM family_relation_info r 
                 JOIN family_member_info m ON r.child_mid = m.id 
                 WHERE r.parent_mid = %s
+                ORDER BY COALESCE(r.child_order, 99999), m.id
             """, (member_id,))
             children = cursor.fetchall()
     finally:

+ 5 - 0
templates/member_detail.html

@@ -340,6 +340,11 @@
                                 {% set rel_map = {1: '子女', 2: '子女', 10: '配偶', 11: '兄弟', 12: '姐妹'} %}
                                 {{ rel_map.get(c.relation_type, '后辈') }}
                             </span>
+                            {% if c.child_order %}
+                            <span class="badge bg-info small">
+                                {{ child_order_labels.get(c.child_order, '第' ~ c.child_order ~ '子') }}
+                            </span>
+                            {% endif %}
                             {% if c.sub_relation_type %}
                             <span class="badge bg-warning small">
                                 {% set sub_rel_map = {0: '亲生', 1: '养父', 2: '出继', 3: '入继', 10: '妾', 11: '外室'} %}