From 251c52311da6763dac83232aee58220629f46c18 Mon Sep 17 00:00:00 2001 From: minom Date: Fri, 29 May 2026 16:43:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=AB=E9=9D=A2=E8=AA=BF=E6=95=B4,=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=B5=B1=E8=A8=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/App_Code/Model/ViewModel/statistic.cs | 42 +++ web/App_Code/api/StatisticController.cs | 27 ++ web/admin/activity/item_reg.aspx | 4 +- web/admin/activity/item_reg.aspx.cs | 6 +- web/admin/activity/reg.aspx | 31 +- web/admin/follower/reg.aspx | 4 +- web/admin/follower/reg.aspx.cs | 13 + web/admin/order/fastSignUp.vue | 2 +- web/admin/order/fastSignUp3.vue | 4 +- web/admin/order/fastSignUp4.vue | 360 +++++++++++----------- web/admin/order/index4.aspx | 8 +- 11 files changed, 292 insertions(+), 209 deletions(-) create mode 100644 web/App_Code/Model/ViewModel/statistic.cs create mode 100644 web/App_Code/api/StatisticController.cs diff --git a/web/App_Code/Model/ViewModel/statistic.cs b/web/App_Code/Model/ViewModel/statistic.cs new file mode 100644 index 0000000..aa02cec --- /dev/null +++ b/web/App_Code/Model/ViewModel/statistic.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace Model.ViewModel +{ + /// + /// statistic 的摘要描述 + /// + public class statistic + { + public statistic() + { + // + // TODO: 在這裡新增建構函式邏輯 + // + } + public int num { get; set; } + public int kind { get; set; } + + public string kindName { get; set; } + public string order_no { get; set; } + public string subject { get; set; } + public string u_name { get; set; } + public string pay_type { get; set; } + public double amount { get; set; } + + public double price { get; set; } + public string pay_mode { get; set; } + public string status { get; set; } + public int f_num { get; set; } + public int acc_num { get; set; } + public int acc_kind { get; set; } + public double check_amount { get; set; } + public double remain_amount { get; set; } + + public string check_status { get; set; } + + } + +} \ No newline at end of file diff --git a/web/App_Code/api/StatisticController.cs b/web/App_Code/api/StatisticController.cs new file mode 100644 index 0000000..b540479 --- /dev/null +++ b/web/App_Code/api/StatisticController.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Http; + +/// +/// StatisticController 的摘要描述 +/// +public class StatisticController : BaseApiController +{ + public StatisticController() + { + // + // TODO: 在這裡新增建構函式邏輯 + // + } + + [HttpPost] + [Route("api/Statistic/GetStatistic")] + public IHttpActionResult GetStatistic([FromBody] Model.ViewModel.statistic s) + { + + return Ok(); + } + +} \ No newline at end of file diff --git a/web/admin/activity/item_reg.aspx b/web/admin/activity/item_reg.aspx index 7e8d4f9..ed86470 100644 --- a/web/admin/activity/item_reg.aspx +++ b/web/admin/activity/item_reg.aspx @@ -707,12 +707,12 @@ -
+ <%--
-
+
--%>
diff --git a/web/admin/activity/item_reg.aspx.cs b/web/admin/activity/item_reg.aspx.cs index c9a7891..7928ed4 100644 --- a/web/admin/activity/item_reg.aspx.cs +++ b/web/admin/activity/item_reg.aspx.cs @@ -78,7 +78,7 @@ public partial class admin_activity_item_reg : MyWeb.config if (prod.cycle.HasValue) cycle.Text = prod.cycle.Value.ToString(); - customize_data.Text = prod.customize_data?.ToString(); + //customize_data.Text = prod.customize_data?.ToString(); edit.Visible = true; @@ -158,7 +158,7 @@ public partial class admin_activity_item_reg : MyWeb.config actItem.extend = extend.Checked ? "Y" : "N"; actItem.is_reconcile = is_reconcile_item.Checked ? "Y" : "N"; actItem.demo = demo.Text; - actItem.customize_data = customize_data.Text; + //actItem.customize_data = customize_data.Text; actItem.sort_order = maxSort + 1; _db.actItems.Add(actItem); @@ -218,7 +218,7 @@ public partial class admin_activity_item_reg : MyWeb.config actItem.extend = extend.Checked ? "Y" : "N"; actItem.is_reconcile = is_reconcile_item.Checked ? "Y" : "N"; actItem.demo = demo.Text; - actItem.customize_data = customize_data.Text; + //actItem.customize_data = customize_data.Text; _db.SaveChanges(); Model.admin_log admin_log = new Model.admin_log(); diff --git a/web/admin/activity/reg.aspx b/web/admin/activity/reg.aspx index 94be567..056f57c 100644 --- a/web/admin/activity/reg.aspx +++ b/web/admin/activity/reg.aspx @@ -910,7 +910,7 @@ -
+
@@ -922,9 +922,9 @@ - + 備品項目--%>
@@ -936,7 +936,7 @@
- +
@@ -955,12 +955,12 @@
--%> - +
+ id="kind_txt" runat="server" placeholder="活動(法會)分類" value="">
+ +
+ + + +
- +
@@ -1011,12 +1017,7 @@
- -
- - - -
+
@@ -1043,12 +1044,12 @@
-
+<%--
-
+
--%>
建檔時間:
diff --git a/web/admin/follower/reg.aspx b/web/admin/follower/reg.aspx index 0d21b38..9a6df08 100644 --- a/web/admin/follower/reg.aspx +++ b/web/admin/follower/reg.aspx @@ -1597,12 +1597,12 @@
-
+ <%--
-
+
--%>
建檔時間: 最後修改時間: diff --git a/web/admin/follower/reg.aspx.cs b/web/admin/follower/reg.aspx.cs index d0e2c4d..eaa6d2f 100644 --- a/web/admin/follower/reg.aspx.cs +++ b/web/admin/follower/reg.aspx.cs @@ -244,8 +244,21 @@ public partial class admin_follower_reg : MyWeb.config _db.followers.Add(followers); _db.SaveChanges(); } + int _id = followers.num; + //應該要自動將此人設為第一個親友資料，不然牌位燈打時又要再做一次 + family_members fm=new family_members(); + fm.follower_num = _id; + fm.fam_name = followers.u_name; + fm.fam_gender=followers.sex; + fm.deceased = false; + fm.birthdate = followers.birthday; + + _db.family_members.Add(fm); + _db.SaveChanges(); + + if (_id > 0) { // 如果啟用 search_keywords 功能，生成並更新 search_keywords diff --git a/web/admin/order/fastSignUp.vue b/web/admin/order/fastSignUp.vue index d422cf8..8008d26 100644 --- a/web/admin/order/fastSignUp.vue +++ b/web/admin/order/fastSignUp.vue @@ -73,7 +73,7 @@ - + - +
快速報名
@@ -162,7 +162,7 @@ - + diff --git a/web/admin/order/fastSignUp4.vue b/web/admin/order/fastSignUp4.vue index 58e643e..11abee2 100644 --- a/web/admin/order/fastSignUp4.vue +++ b/web/admin/order/fastSignUp4.vue @@ -1,193 +1,193 @@