chinese

date

web/admin/follower/index.aspx

@@ -45,7 +45,6 @@
                             { text: '身分別', value: 'identity_type_desc' },
                             { text: '性別', value: 'sex' },
                             { text: '生日', value: 'birthday' },
-                            { text: '生肖/干支', value: 'sign', sortable: false },
                             { text: '報名記錄', value: 'order_record' },
                             { text: '', value: 'slot', sortable: false },
                             { text: '', value: 'slot_btn', sortable: false, align: 'end' },
@@ -414,12 +413,16 @@
             class="elevation-1">
     
             <template #item.birthday="{ item }" >
-                <div><span class="badge bg-secondary">西元</span> {{ item.birthday|timeString('YYYY/MM/DD') }} </div>
-                <div><span class="badge bg-secondary">農曆</span> {{ item.birthday2 }} </div>
+                <div v-if="item.birthday">
+                    <span class="badge bg-secondary">西元</span> {{ item.birthday|timeString('YYYY/MM/DD') }} 
+                </div>
+                <div v-if="item.birthday2">
+                    <span class="badge bg-secondary">農曆</span> {{ item.birthday2 }} ({{ item.sign }})
+                </div>
+                <div v-if="!item.birthday && !item.birthday2">
+                    <span class="badge bg-light text-muted">未填寫</span>
+                </div>
             </template>   
-                <template #item.sign="{ item }" >
-                {{ item.sign }}/{{ item.sexagenary }}
-            </template>  
             <template #item.slot_btn="{ item }">
                 <a :href="'reg.aspx?num='+item.num" class="btn btn-outline-secondary btn-sm"><i class="mdi mdi-pencil-box-outline"></i>修改</a>
                 <a @click="deleteItem(item)" class="btn btn-outline-secondary btn-sm"><i class="mdi mdi-trash-can"></i>刪除</a>