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>

web/admin/follower/reg.aspx

@@ -528,6 +528,13 @@
                 //        //this.calculateLunarBirthday();
                 //    }
                 //}
+                
+                // 提示訊息
+                snackbar: {
+                    show: false,
+                    message: '',
+                    color: 'error'
+                }
             },
             methods: {
                 search_show(curr) {
@@ -1046,6 +1053,15 @@
                 },
                 fam_save(item) {
                     console.log("fam_save 1:", this.family.edItem);
+                    
+                    // 驗證必填欄位 - 只有姓名必填
+                    if (!this.family.edItem.fam_name || this.family.edItem.fam_name.trim() === '') {
+                        this.snackbar.message = '請填寫姓名';
+                        this.snackbar.color = 'error';
+                        this.snackbar.show = true;
+                        return;
+                    }
+                    
                     if (!this.family.is_tw) {
                         this.family.edItem.city = '';
                         this.family.edItem.area = '';
@@ -1956,7 +1972,7 @@
                     <v-form ref="familyForm">
                         <v-text-field
                             v-model="family.edItem.fam_name"
-                            label="姓名"
+                            label="姓名 * "
                             required
                         ></v-text-field>
 
@@ -2124,9 +2140,10 @@
         </v-dialog>
         <v-snackbar
             v-model="snackbar.show"
-            timeout="2000"
+            :color="snackbar.color"
+            timeout="3000"
         >
-          {{ snackbar.text }}
+          {{ snackbar.message }}
           <template v-slot:action="{ attrs }">
             <v-btn
               text

web/admin/follower/reg.aspx.cs

@@ -105,7 +105,6 @@ public partial class admin_follower_reg : MyWeb.config
                     {                       
                         Literal1.Text = publicFun.chagenDate(prod.birthday.Value);
                         Literal2.Text = Model.follower.chagenSign(prod.birthday.Value);
-
                     }
                     if (prod.leader.HasValue)
                     {

web/admin/order/reg.aspx

@@ -378,7 +378,7 @@
                         start_date: new Date().format("yyyy-MM-dd"),
                         extend_date: '',
                         price: 0,
-                        qty: 0,
+                        qty: 1,
                         writeBedQty: 0,
                         notBedQty: 0,
                         category: 0,