diff --git a/web/App_Code/Model/Model.Designer.cs b/web/App_Code/Model/Model.Designer.cs
index 0d63a4e..dc691dc 100644
--- a/web/App_Code/Model/Model.Designer.cs
+++ b/web/App_Code/Model/Model.Designer.cs
@@ -1,4 +1,4 @@
-// 已啟用模型 'D:\merge\17168ERP\web\App_Code\Model\Model.edmx' 的 T4 程式碼產生。
+// 已啟用模型 'D:\17168ERP\web\App_Code\Model\Model.edmx' 的 T4 程式碼產生。
 // 若要啟用舊版程式碼產生，請將 [程式碼產生策略] 設計工具屬性的值
 //變更為 [舊版 ObjectContext]。當模型在設計工具中開啟時，這個屬性便可
 //以在 [屬性] 視窗中使用。
diff --git a/web/admin/activity/reg.aspx b/web/admin/activity/reg.aspx
index 6c1bcf9..a587148 100644
--- a/web/admin/activity/reg.aspx
+++ b/web/admin/activity/reg.aspx
@@ -57,11 +57,11 @@
                                       { id: 'kind', title: '分類名稱' },
                                   ],
                                   selected: {},
-                                  select(item,t) {
+                                  select(item, t) {
                                       console.log("select search1", t);
                                       //帶入預設日期
                                       axios
-                                          .get(HTTP_HOST + 'api/activity/GetKindDate/' + t.num )
+                                          .get(HTTP_HOST + 'api/activity/GetKindDate/' + t.num)
                                           .then(response => {
                                               console.log(response.data.startDate_solar);
                                               $('#<%= startDate_solar.ClientID%>').val(response.data.startDate_solar);
@@ -90,12 +90,12 @@
                                       { id: 'kindTxt', title: '項目分類' },
                                   ],
                                   selected: {},
-                                  select(item,t) {
+                                  select(item, t) {
                                       console.log("select search2", t);
-                             
+
                                       item.act_item_selected.text = t.subject
-                                      item.act_item_selected.val = t.num 
-                                      item.price = t.price 
+                                      item.act_item_selected.val = t.num
+                                      item.price = t.price
                                       item.qty = t.qty
                                   }
                               },
@@ -114,12 +114,12 @@
                                       { id: 'kindTxt', title: '項目分類' },
                                   ],
                                   selected: {},
-                                  select(item,t) {
+                                  select(item, t) {
                                       console.log("select search3", t);
 
                                       item.act_item_selected.text = t.subject
                                       item.act_item_selected.val = t.num
-                                   
+
                                   }
                               },
                               search4: {
@@ -141,7 +141,7 @@
                                   }
                               },
                           },
-                          
+
                           show: false,
                           current: {},
                           list: [],
@@ -165,8 +165,8 @@
                           { text: '* 品項名稱', value: 'act_item_selected.text', sortable: false },
                           { text: '預設金額', value: 'price', sortable: false },
                           { text: '數量', value: 'qty', sortable: false },
-						  { text: '陽上／祈福人數限制', value: 'limit_yang', sortable: false },
-                          { text: '超渡人數限制', value: 'limit_chao', sortable: false },																																					   
+                          { text: '陽上／祈福人數限制', value: 'limit_yang', sortable: false },
+                          { text: '超渡人數限制', value: 'limit_chao', sortable: false },
                           { text: '', value: 'actions', sortable: false, width: "200px" },
                       ],
                       footersDetail: {
@@ -180,12 +180,12 @@
                           'items-per-page-options': []
                       },
                       desserts: [],
-                      desserts_count :0,
-                      editedIndex: -1,                      
+                      desserts_count: 0,
+                      editedIndex: -1,
                       editedItem: {
                           id: 0,
                           num: 0,
-                          activity_num: 0,                          
+                          activity_num: 0,
                           act_item_selected: {
                               text: '',
                               val: 0
@@ -196,112 +196,102 @@
                           has_yang_limit: false,
                           has_chao_limit: false,
                           yang_limit_count: 0,
-                          chao_limit_count: 0,																		  
-                      defaultItem: {
-                          id: 0,
-                          num: 0,
-                          activity_num: 0,                          
-                          act_item_selected: {
-                              text: '',
-                              val: 0
+                          chao_limit_count: 0,
+                      },
+                          defaultItem: {
+                              id: 0,
+                              num: 0,
+                              activity_num: 0,
+                              act_item_selected: {
+                                  text: '',
+                                  val: 0
+                              },
+                              price: 0,
+                              qty: 0,
+                              files: [],
+                              has_yang_limit: false,
+                              has_chao_limit: false,
+                              yang_limit_count: 0,
+                              chao_limit_count: 0,
                           },
-                          price: 0,
-                          qty: 0,
-                          files: [],
-                          has_yang_limit: false,
-                          has_chao_limit: false,
-                          yang_limit_count: 0,
-                          chao_limit_count: 0,																						  
-                      },
-                      //列印
-                      data_table: {
-                          selected: [],
-                          editFilesItem: [],
-                          headersFilesList: [
-                              { text: '訂單編號', value: 'order_no', sortable: false },
-                              { text: '牌位編號', value: 'print_id', sortable: false },
-                              //{ text: '信眾姓名', value: 'from_id', sortable: false },
-                              { text: '已列印', value: 'isprinted', sortable: false },
-                          ],
-                          singleSelect: false,
-                          searchList: '',
-                      },                      
-                      thisFilesSelected: {
-                          text: '',
-                          val: 0,
-                      },
-                      thisItemSelected: {
-                          text: '',
-                          val: 0,
-                      },
-                      printfiles:[],
-                      //備品項目
-                      searchSpares: '',
-                      headersSpares: [//項目名稱				
-                          { text: '* 品項名稱', value: 'act', sortable: false },
-                          { text: '總數量', value: 'totalqty', sortable: false },                      
-                          { text: '備註', value: 'demo', sortable: false },
-                          { text: '', value: 'actions', sortable: false, width: "200px" },
-                      ],
-                      sparesItems: [],
-                      sparesItems_count:0,
-                      modifyIndex: -1,
-                      modifyItem: {
-                          id: 0,
-                          num: 0,
-                          activity_num: 0,                         
-                          act_item_selected: {
-                              text: '',
-                              val: 0
+                          //列印
+                          data_table: {
+                              selected: [],
+                              editFilesItem: [],
+                              headersFilesList: [
+                                  { text: '訂單編號', value: 'order_no', sortable: false },
+                                  { text: '牌位編號', value: 'print_id', sortable: false },
+                                  //{ text: '信眾姓名', value: 'from_id', sortable: false },
+                                  { text: '已列印', value: 'isprinted', sortable: false },
+                              ],
+                              singleSelect: false,
+                              searchList: '',
                           },
-                          totalqty: 0,
-                          demo: '',
-                      },
-                      simpleItem: {
-                          id: 0,
-                          num: 0,
-                          activity_num: 0,                          
-                          act_item_selected: {
+                          thisFilesSelected: {
                               text: '',
-                              val: 0
+                              val: 0,
                           },
-                          totalqty: 0,
-                          demo: '',
-                      },
-                      //列印文件
-                      file_dialog: {
-                          show: false,
-                      },
-                      //報名名單
-                      order_dialog: {
-                          show: false,
-                      },
-							  loading: false,
-							  search: '',
-							  headers: [
-								  { text: '訂單編號', value: 'order_no' },
-								  { text: '信眾編號', value: 'f_number' },
-								  { text: '信眾姓名', value: 'u_name' },
-								  { text: '聯絡電話', value: 'phone' },
-								  { text: '建立日期', value: 'order_date' },
-							  ],
-							  items: [
-								  { order_no: "D", member_name: "S", order_date:"2025-12-07"}
-							  ],
-                      unfilled_list: {
-                          loading: false,
-                          search: '',
-                          headers: [
-                              { text: '訂單編號', value: 'order_no' },
-                              { text: '信眾編號', value: 'f_number' },
-                              { text: '信眾姓名', value: 'u_name' },
-                              { text: '聯絡電話', value: 'phone' },
-                              { text: '建立日期', value: 'order_date' },
+                          thisItemSelected: {
+                              text: '',
+                              val: 0,
+                          },
+                          printfiles: [],
+                          //備品項目
+                          searchSpares: '',
+                          headersSpares: [//項目名稱				
+                              { text: '* 品項名稱', value: 'act', sortable: false },
+                              { text: '總數量', value: 'totalqty', sortable: false },
+                              { text: '備註', value: 'demo', sortable: false },
+                              { text: '', value: 'actions', sortable: false, width: "200px" },
                           ],
-                          items: [
-                              { order_no: "D", member_name: "S", order_date:"2025-12-07"}
-                          ],
-                      },
+                          sparesItems: [],
+                          sparesItems_count: 0,
+                          modifyIndex: -1,
+                          modifyItem: {
+                              id: 0,
+                              num: 0,
+                              activity_num: 0,
+                              act_item_selected: {
+                                  text: '',
+                                  val: 0
+                              },
+                              totalqty: 0,
+                              demo: '',
+                          },
+                          simpleItem: {
+                              id: 0,
+                              num: 0,
+                              activity_num: 0,
+                              act_item_selected: {
+                                  text: '',
+                                  val: 0
+                              },
+                              totalqty: 0,
+                              demo: '',
+                          },
+                          //列印文件
+                          file_dialog: {
+                              show: false,
+                          },
+                          //報名名單
+                          order_dialog: {
+                              show: false,
+                          },
+                          unfilled_list: {
+                              loading: false,
+                              search: '',
+                              headers: [
+                                  { text: '訂單編號', value: 'order_no' },
+                                  { text: '信眾編號', value: 'f_number' },
+                                  { text: '信眾姓名', value: 'u_name' },
+                                  { text: '聯絡電話', value: 'phone' },
+                                  { text: '建立日期', value: 'order_date' },
+                              ],
+                              items: [
+                                  { order_no: "D", member_name: "S", order_date: "2025-12-07" }
+                              ],
+                          },
+                      
                   }
               },
               mounted() {
@@ -1328,83 +1318,7 @@
                     
                     
                     </div>
-                    <div class="tab-pane fade giftItems" id="sec2-page3" role="tabpanel" aria-labelledby="sec2-tab3" v-if="this_id!=''">
-
-                         <v-card class="mx-auto" outlined v-if="this_id!=''">
-                                    
-                           <v-data-table 
-                               :headers="headersSpares" 
-                               :items="sparesItems"
-                               :footer-props="footersDetail"
-                               :search="searchSpares"
-                               :options.sync="optionsSpares" class="elevation-1" fixed-header height="350px"
-                                 
-                               >
-                             <v-divider inset></v-divider>
-                             <template v-slot:top>
-                                <v-toolbar flat color="white">
-                                    <div class="d-flex w-100">
-                                       <v-text-field v-model="searchSpares" append-icon="mdi-magnify" label="查詢" dense outlined single-line hide-details></v-text-field>
-                                       <v-btn
-                                          color="primary"
-                                          class="ml-2 white--text"
-                                          @click="addNewSp">
-                                          <v-icon dark>mdi-plus</v-icon>新增
-                                       </v-btn>
-                                    </div>
-                                </v-toolbar>
-                             </template>                
-                              <template v-slot:item.act="{ item }">     
-                                  <div class="input-group mb-3" data-search-control="search3" @click="search_show(search_dialog.controls.search3)" v-if="item.id === modifyItem.id">
-                                   <input class="form-control search-text" type="text" readonly
-                                          placeholder="品項名稱"  v-model="modifyItem.act_item_selected.text"  >      
-                                   <input type="hidden" v-model="modifyItem.act_item_selected.val">
-                                   <button class="btn btn-outline-secondary" type="button">
-                                       <i class="mdi mdi-view-list-outline"></i>
-                                    </button>
-                                    
-                                </div>
-                                <span v-else>{{item.act_item_selected.text}}
-                                     <span v-if="item.num==0" class="text-danger">(預設資料,未存檔)</span>                                   
-                                </span>                               
-                              </template>                                
-                             <%-- <template v-slot:item.qty1="{ item }">
-                                <v-text-field v-model="modifyItem.qty1" :hide-details="true" dense single-line v-if="item.id === modifyItem.id" ></v-text-field>
-                                <span v-else>{{item.qty1}}</span>
-                              </template>
-                                  <template v-slot:item.qty2="{ item }">
-                                <v-text-field v-model="modifyItem.qty2" :hide-details="true" dense single-line v-if="item.id === modifyItem.id" ></v-text-field>
-                                <span v-else>{{item.qty2}}</span>
-                              </template>--%>
-                                     <template v-slot:item.demo="{ item }">
-                                <v-text-field v-model="modifyItem.demo" :hide-details="true" dense single-line v-if="item.id === modifyItem.id" ></v-text-field>
-                                <span v-else>{{item.demo}}</span>
-                              </template>
-                              <template v-slot:item.actions="{ item }">                                 
-                                <div v-if="item.id === modifyItem.id">
-                                  <v-icon color="red" class="mr-3" @click="cancelSp">
-                                    mdi-window-close
-                                  </v-icon>
-                                  <v-icon color="green"  @click="saveSp">
-                                    mdi-content-save
-                                  </v-icon>
-                                </div>
-                                <div v-else>
-                                  <v-icon color="green" class="mr-3" @click="editItem(item,true);">
-                                    mdi-pencil
-                                  </v-icon>
-                                  <v-icon color="red" @click="deleteItemSp(item)">
-                                    mdi-delete
-                                  </v-icon>
-                                </div>
-                               
-                              </template>
-                        
-                            </v-data-table>
-                       </v-card> 
-
                    
-                    </div>
 
                     <div class="tab-pane fade" id="sec2-page4" role="tabpanel" aria-labelledby="sec2-tab4" v-if="this_id!=''">
                         <v-card class="mx-auto" outlined id="print-unfilled-area">