From 5fa147f9604a55f41b4339e62780ebe9b7e4d4c0 Mon Sep 17 00:00:00 2001
From: minom <minomdu@gmail.com>
Date: Mon, 22 Jun 2026 17:58:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=AD=A3=E8=AA=BF?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/App_Code/api/activityController.cs |  2 +
 web/App_Code/api/orderController.cs    |  1 +
 web/admin/order/fastSignUp.vue         | 70 ++++++++++++++------------
 web/admin/order/fastSignUp2.vue        | 29 +++++++----
 web/admin/order/fastSignUp3.vue        |  7 ++-
 web/admin/order/index4.aspx            |  3 +-
 6 files changed, 68 insertions(+), 44 deletions(-)

diff --git a/web/App_Code/api/activityController.cs b/web/App_Code/api/activityController.cs
index dce9c0b..c2c3b52 100644
--- a/web/App_Code/api/activityController.cs
+++ b/web/App_Code/api/activityController.cs
@@ -363,6 +363,8 @@ public class activityController : ApiController
                     }).ToList(), x.kind) : "",
                     startDate_solar = x.startDate_solar,
                     endDate_solar = x.endDate_solar,
+                    startDate = x.startDate_solar?.ToString("yyyy-MM-dd"),
+                    endDate = x.endDate_solar?.ToString("yyyy-MM-dd"),
                     startDate_lunar = x.startDate_lunar,
                     endDate_lunar = x.endDate_lunar,
                     dueDate = x.dueDate,
diff --git a/web/App_Code/api/orderController.cs b/web/App_Code/api/orderController.cs
index 8c2525e..8a921ca 100644
--- a/web/App_Code/api/orderController.cs
+++ b/web/App_Code/api/orderController.cs
@@ -565,6 +565,7 @@ public class orderController : ApiController
                 subject = x.activity_num.HasValue ? x.activity.subject : "",
                 keyin1 = x.keyin1,
                 up_time = x.up_time,
+                uptime=x.up_time?.ToString("yyyy-MM-dd"),
                 keyin1_txt = Model.pro_order.keyin1_value_to_text(x.keyin1),
                 status = x.activity.activity_check.FirstOrDefault(a => x.activity_num == a.activity_num && x.f_num == a.f_num)?.status ?? 0,
             }),
diff --git a/web/admin/order/fastSignUp.vue b/web/admin/order/fastSignUp.vue
index bbdaff2..a834e8e 100644
--- a/web/admin/order/fastSignUp.vue
+++ b/web/admin/order/fastSignUp.vue
@@ -12,12 +12,12 @@
 
                               </v-text-field>-->
                           <!--</v-col>-->
-                          <v-col cols="2" md="2">
+                          <v-col cols="12" md="2">
                               <v-text-field label="法會名稱" v-model="search.subject">
 
                               </v-text-field>
                           </v-col>
-                          <v-col cols="2" md="2">
+                          <v-col cols="12" md="2">
                               <!--<v-text-field label="開始日期" v-model="search.uptime1">
 
                               </v-text-field>-->
@@ -39,7 +39,7 @@
                                                  @input="startmenu = false"></v-date-picker>
                               </v-menu>
                           </v-col>
-                          <v-col cols="2" md="2">
+                          <v-col cols="12" md="2">
                               <v-btn @click.prevent="getDefault()">查詢</v-btn>
                               <v-btn @click.prevent="clearSearch()">清空條件</v-btn>
                           </v-col>
@@ -47,33 +47,31 @@
                   </v-expansion-panel-content>
               </v-expansion-panel>
           </v-expansion-panels>
-        <v-data-table v-model="data_table.selected"
-                      :items="data_table.list"
-                      item-key="order_no"
-                      :options.sync="options"
-                      :headers="data_table.header"
-                      :footer-props="data_table.footer"
-                      :server-items-length="data_table.count"
-                      :loading="data_table.loading"
-                      :single-select="data_table.singleSelect"
-                      hide-default-footer
-                      :page.sync="data_table.page"
-                      :items-per-page.sync="data_table.pageSize"
-                      class="elevation-1">
-            <template #item.up_time="{ item }">
-                {{ item.up_time|timeString('YYYY/MM/DD') }}
-            </template>
-            <template #item.u_name="{ item }">
-                <a v-if="item.f_num != null && item.activity_num != null" @click="checkInMsg(item)" class="btn btn-outline-secondary btn-sm"><i class="mdi mdi-account-check"></i>報到</a>
-                {{ item.u_name }}
-            </template>
-            <template #item.slot_btn="{ item }">
-                <a @click="gotoSignup(item)" class="btn btn-outline-secondary btn-sm">報名</a>
-                <a @click="gotoBatchSignup(item)" class="btn btn-outline-secondary btn-sm">批次報名</a>
-                <a @click="gotoSignupList(item)" class="btn btn-outline-secondary btn-sm">明細</a>
+          <v-data-table v-model="data_table.selected"
+                        :items="data_table.list"
+                        item-key="order_no"
+                        :options.sync="options"
+                        :headers="data_table.header"
+                        :footer-props="data_table.footer"
+                        :server-items-length="data_table.count"
+                        :loading="data_table.loading"
+                        :single-select="data_table.singleSelect"
+                        hide-default-footer
+                        :page.sync="data_table.page"
+                        :items-per-page.sync="data_table.pageSize"
+                        disable-sort
+                        class="elevation-1">
+              <template #item.u_name="{ item }">
+                  <a v-if="item.f_num != null && item.activity_num != null" @click="checkInMsg(item)" class="btn btn-outline-secondary btn-sm"><i class="mdi mdi-account-check"></i>報到</a>
+                  {{ item.u_name }}
+              </template>
+              <template #item.slot_btn="{ item }">
+                  <a @click="gotoSignup(item)" class="btn btn-outline-secondary btn-sm">報名</a>
+                  <a @click="gotoBatchSignup(item)" class="btn btn-outline-secondary btn-sm">批次報名</a>
+                  <a @click="gotoSignupList(item)" class="btn btn-outline-secondary btn-sm">明細</a>
 
-            </template>
-        </v-data-table>
+              </template>
+          </v-data-table>
         <v-container class="container-fluid">
             <v-row class="align-baseline" wrap>
                 <v-col cols="12" md="9">
@@ -99,7 +97,6 @@
 </template>
 
 <script>
-
     module.exports = {
         props: ['formData'],
         data() {
@@ -121,8 +118,8 @@
                     header: [
                         { text: '活動分類', value: 'kindsTxt' },
                         { text: '活動名稱', value: 'subject' },
-                        { text: '開始日期', value: 'startDate_solar' },
-                        { text: '結束日期', value: 'endDate_solar', align: 'start' },
+                        { text: '開始日期', value: 'startDate' },
+                        { text: '結束日期', value: 'endDate' },
                         { text: '報名人數', value: 'orderCounts' },
                         { text: '', value: 'slot_btn', sortable: false, align: 'end' }
                     ],
@@ -192,7 +189,16 @@
                 deep: true,
             },
         },
+        filters: {
+            timestring(value) {
+                console.log("timeString:", value)
+                return "20260102";
+                //return (value == null || value == "") ? "" : moment(value).format('YYYY-MM-DD');
+            },
+          
+        },
         methods: {
+            
             initKindList() {
                 axios
                     //.get(HTTP_HOST + 'api/activity_kind')
diff --git a/web/admin/order/fastSignUp2.vue b/web/admin/order/fastSignUp2.vue
index 34e1f36..720907c 100644
--- a/web/admin/order/fastSignUp2.vue
+++ b/web/admin/order/fastSignUp2.vue
@@ -8,10 +8,10 @@
                                 <v-expansion-panel-header color="#006fc9"
                                                           class="white--text">
                                     <v-row>
-                                        <v-col cols="10" md="10">
+                                        <v-col cols="4" sm="4" md="10">
                                             <label>查詢條件</label>
                                         </v-col>
-                                        <v-col cols="2" md="2">
+                                        <v-col cols="8" sm="8" md="2">
                                             <v-btn @click.prevent='fast_signup' class="ms-auto">快速報名</v-btn>
                                             <v-btn @click.prevent="back01()" class="ms-auto">返回</v-btn>
                                         </v-col>
@@ -19,27 +19,27 @@
                                 </v-expansion-panel-header>
                                 <v-expansion-panel-content>
                                     <v-row>
-                                        <v-col cols="2" md="2">
+                                        <v-col cols="12" sm="12"  md="2">
                                             <v-text-field label="姓名" v-model="search.u_name">
 
                                             </v-text-field>
                                         </v-col>
-                                        <v-col cols="2" md="2">
+                                        <v-col cols="12"  sm="12" md="2">
                                             <v-text-field label="電話" v-model="search.phone">
 
                                             </v-text-field>
                                         </v-col>
-                                        <v-col cols="2" md="2">
+                                        <v-col cols="12"  sm="12" md="2">
                                             <v-text-field label="行動電話" v-model="search.cellphone">
 
                                             </v-text-field>
                                         </v-col>
-                                        <v-col cols="2" md="2">
+                                        <v-col cols="12" sm="12"  md="2">
                                             <v-text-field label="身分證號" v-model="search.id_code">
 
                                             </v-text-field>
                                         </v-col>
-                                        <v-col cols="2" md="2">
+                                        <v-col cols="12"  sm="12" md="4">
                                             <v-btn @click.prevent="getDetail()">查詢</v-btn>
                                             <v-btn @click.prevent="clearSearch()">清空條件</v-btn>
                                         </v-col>
@@ -62,11 +62,13 @@
                               hide-default-footer
                               :page.sync="detail_table.page"
                               :items-per-page.sync="detail_table.pageSize"
+                              disable-sort
                               class="elevation-1">
+                   
                     <template #item.slot_btn="{ item }">
                         <!--<a :href="'reg.aspx?order_no='+item.order_no" class="btn btn-outline-secondary btn-sm"><i class="mdi mdi-pencil-box-outline"></i>修改</a>
-            <a @click="$root.currentView='step-three';$root.selected_order=item.order_no" class="btn btn-outline-secondary btn-sm">明細</a>
-            <a @click="deleteItem(item)" class="btn btn-outline-secondary btn-sm"><i class="mdi mdi-trash-can"></i>刪除</a>-->
+        <a @click="$root.currentView='step-three';$root.selected_order=item.order_no" class="btn btn-outline-secondary btn-sm">明細</a>
+        <a @click="deleteItem(item)" class="btn btn-outline-secondary btn-sm"><i class="mdi mdi-trash-can"></i>刪除</a>-->
                     </template>
                 </v-data-table>
                 <v-container>
@@ -95,6 +97,7 @@
 </template>
 
 <script>
+
     module.exports = {
         props: {
             num: {
@@ -122,7 +125,7 @@
                     header: [
                         { text: '單號', value: 'order_no' },
                         { text: '姓名', value: 'u_name' },
-                        { text: '報名日期', value: 'up_time' },
+                        { text: '報名日期', value: 'uptime' },
                         { text: '單據狀態', value: 'keyin1_txt', align: 'start' },
                         { text: '', value: 'slot_btn', sortable: false, align: 'end' }
                     ],
@@ -148,6 +151,12 @@
             },
 
         },
+        filters: {
+            timeString(value, myFormat) {
+                console.log("timeString:", value, myFormat)
+                return value == null || value == "" ? "" : moment(value).format(myFormat || 'YYYY-MM-DD, HH:mm:ss');
+            },
+        },
         methods: {
             back01() {
                 this.$emit('custom-event', { action: 'signup1', item: this.num });
diff --git a/web/admin/order/fastSignUp3.vue b/web/admin/order/fastSignUp3.vue
index 9772a99..a169453 100644
--- a/web/admin/order/fastSignUp3.vue
+++ b/web/admin/order/fastSignUp3.vue
@@ -423,7 +423,12 @@
                         // console.log("saveOrder:", x, x.num, x.order_no)
                     }
                 })
-          
+                if (detail.length === 0) {
+                    this.message_dialog.show_confirm = false
+                    this.message_dialog.show = true
+                    this.message_dialog.message = "沒有選擇功德項目，如果無法選擇，請使用一般報名程序"
+                    return false
+                }
                 //放主檔資料，
                 let main = {
                     activity_num: this.num, f_num: this.follower.num,
diff --git a/web/admin/order/index4.aspx b/web/admin/order/index4.aspx
index 43f11bd..f14cffe 100644
--- a/web/admin/order/index4.aspx
+++ b/web/admin/order/index4.aspx
@@ -62,7 +62,7 @@
                     header: [
                         { text: '單號', value: 'order_no' },
                         { text: '姓名', value: 'u_name' },
-                        { text: '報名日期', value: 'up_time' },
+                        { text: '報名日期', value: 'uptime' },
                         { text: '單據狀態', value: 'keyin1_txt', align: 'start' },
                         { text: '', value: 'slot_btn', sortable: false, align: 'end' }
                     ],
@@ -109,6 +109,7 @@
         methods: {
             changeView(item) {
                 if (item.action === "detail") {
+                    console.log("change to fastSignup2")
                     this.twoData = item.item.num
                     this.currentView = "fastSignUp2-component"
                 } else if (item.action === "add") {