From 29f290211917a6bc77c143f05e9157c2ae5c1ec7 Mon Sep 17 00:00:00 2001 From: enchiaaa Date: Mon, 4 May 2026 13:44:16 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=9B=B4=E6=96=B0=E6=B3=95=E6=9C=83?= =?UTF-8?q?=E6=B4=BB=E5=8B=95=E5=93=81=E9=A0=85=E4=B8=AD=E7=9A=84=E7=89=8C?= =?UTF-8?q?=E4=BD=8D=E9=99=BD=E4=B8=8A=E8=88=87=E8=B6=85=E5=BA=A6=E4=BA=BA?= =?UTF-8?q?=E6=95=B8=E9=99=90=E5=88=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/App_Code/api/orderController.cs | 8 ++++++++ web/admin/follower/reg.aspx.cs | 8 -------- web/admin/order/reg.aspx | 3 ++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/web/App_Code/api/orderController.cs b/web/App_Code/api/orderController.cs index 9c3d833..bd5c1c5 100644 --- a/web/App_Code/api/orderController.cs +++ b/web/App_Code/api/orderController.cs @@ -522,6 +522,10 @@ public class orderController : ApiController text = ar.actItem.subject, val = ar.actItem_num, }, + has_yang_limit = ar.has_yang_limit ?? false, + has_chao_limit = ar.has_chao_limit ?? false, + yang_limit_count = ar.yang_limit_count ?? 0, + chao_limit_count = ar.chao_limit_count ?? 0, parent_num = q.num, f_num_selected = new { @@ -602,6 +606,10 @@ public class orderController : ApiController text = x.actItem.subject, val = x.actItem.num, }, + has_yang_limit = x.has_yang_limit, + has_chao_limit = x.has_chao_limit, + yang_limit_count = x.yang_limit_count, + chao_limit_count = x.chao_limit_count, f_num_selected = new { text = "", diff --git a/web/admin/follower/reg.aspx.cs b/web/admin/follower/reg.aspx.cs index 684f28c..53da743 100644 --- a/web/admin/follower/reg.aspx.cs +++ b/web/admin/follower/reg.aspx.cs @@ -502,15 +502,12 @@ public partial class admin_follower_reg : MyWeb.config { if (!isStrNull(pro_order.order_no)) { - Debug.WriteLine(pro_order.order_no); - _db.pro_order.Add(pro_order); _db.SaveChanges(); // 報名品項（最近一次訂單內容） if (latestOrder != null) { - Debug.WriteLine("上次的單號 ", latestOrder.order_no); var last_order_details = _db.pro_order_detail.Where(o => o.order_no == latestOrder.order_no).ToList(); foreach (var last_order_detail in last_order_details) { @@ -564,7 +561,6 @@ public partial class admin_follower_reg : MyWeb.config if (!string.IsNullOrEmpty(hid_delete_order_list.Value)) { var ids = hid_delete_order_list.Value.TrimEnd(',').Split(','); - Debug.WriteLine(ids); var prod = _db.pro_order.Where(q => ids.Contains(q.order_no)).ToList(); if (prod.Count() > 0) { @@ -616,7 +612,6 @@ public partial class admin_follower_reg : MyWeb.config if (!string.IsNullOrEmpty(hid_delete_order_list.Value)) { var ids = hid_delete_order_list.Value.TrimEnd(',').Split(','); - Debug.WriteLine(ids); var prod = _db.pro_order.Where(q => ids.Contains(q.order_no)).ToList(); if (prod.Count() > 0) { @@ -693,15 +688,12 @@ public partial class admin_follower_reg : MyWeb.config { if (!isStrNull(pro_order.order_no)) { - Debug.WriteLine(pro_order.order_no); - _db.pro_order.Add(pro_order); _db.SaveChanges(); // 報名品項（最近一次訂單內容） if (latestOrder != null) { - Debug.WriteLine("上次的單號 ", latestOrder.order_no); var last_order_details = _db.pro_order_detail.Where(o => o.order_no == latestOrder.order_no).ToList(); foreach (var last_order_detail in last_order_details) { diff --git a/web/admin/order/reg.aspx b/web/admin/order/reg.aspx index 83573f9..c780bac 100644 --- a/web/admin/order/reg.aspx +++ b/web/admin/order/reg.aspx @@ -841,7 +841,8 @@ // 顯示對話框 this.tablet_edit.show = true; // 立即恢復數據 - this.editedItem = $.extend(true, {}, currentData); + this.editedItem = $.extend(true, {}, currentData); + console.log(this.editItem); } catch (error) { console.error('Error in editTablet:', error); }