From 35a0be701b61402bc97c4a87fa6da7aa52582834 Mon Sep 17 00:00:00 2001 From: minom Date: Mon, 27 Jul 2026 18:22:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/App_Code/api/activityController.cs | 7 ++++- web/App_Code/api/receiptController.cs | 10 +++++-- web/admin/activity/item_reg.aspx | 10 +++++++ web/admin/activity/item_reg.aspx.cs | 2 ++ web/admin/order/reg.aspx | 3 +- web/admin/receipt/index.aspx | 4 +-- web/admin/receipt/receipt.vue | 39 +++++++++++++++++++++++-- web/rpt/sample/receipt_sample01.docx | Bin 20328 -> 33070 bytes web/rpt/sample/receipt_sample02.docx | Bin 0 -> 83349 bytes 9 files changed, 66 insertions(+), 9 deletions(-) create mode 100644 web/rpt/sample/receipt_sample02.docx diff --git a/web/App_Code/api/activityController.cs b/web/App_Code/api/activityController.cs index bae9ab5..1fa0503 100644 --- a/web/App_Code/api/activityController.cs +++ b/web/App_Code/api/activityController.cs @@ -1396,8 +1396,13 @@ string sortBy = "", bool sortDesc = false) { int i = 1; var qry2 = _db.activity_kind_detail.Where(o => o.activity_kind_num == kind); + qry2 = qry2.OrderBy(o => o.num); var count2 = qry2.Count(); //pageSize = count2;//一次取回?? - var qry2List = (pageSize > 0) ? qry2.ToPagedList(page, pageSize).ToList() : qry2.ToList(); + IEnumerable qry2List = null; + if (pageSize > 0) + qry2List = qry2.ToPagedList(page, pageSize); + else + qry2List=qry2.ToList(); var ret = new { list = qry2List.Select(x => new diff --git a/web/App_Code/api/receiptController.cs b/web/App_Code/api/receiptController.cs index 7f98fe7..6fa24e4 100644 --- a/web/App_Code/api/receiptController.cs +++ b/web/App_Code/api/receiptController.cs @@ -311,7 +311,8 @@ public class receiptController: ApiController try { - string templatePath = HttpContext.Current.Server.MapPath("~/rpt/sample/receipt_sample01.docx"); + string sample = $"~/rpt/sample/receipt_sample{string.Format("{0:D2}",data.style_num)}.docx"; + string templatePath = HttpContext.Current.Server.MapPath(sample); if (!File.Exists(templatePath)) { @@ -411,7 +412,7 @@ public class receiptController: ApiController } if (textNode.Text.Contains("$ReceiptDate")) { - textNode.Text = textNode.Text.Replace("$ReceiptDate", data.receipt_date ?? ""); + textNode.Text = textNode.Text.Replace("$ReceiptDate", data.details[i].receipt_date ?? ""); } if (textNode.Text.Contains("$ReceiptTitle")) { @@ -429,7 +430,10 @@ public class receiptController: ApiController { textNode.Text = textNode.Text.Replace("$Caseofficer", data.details[i].caseofficer ?? ""); } - + if (textNode.Text.Contains("$ReceiptItem")) + { + textNode.Text = textNode.Text.Replace("$ReceiptItem", data.details[i].receipt_item ?? ""); + } } currentAnchor= body.InsertAfter(newTable, currentAnchor); diff --git a/web/admin/activity/item_reg.aspx b/web/admin/activity/item_reg.aspx index 83de570..4bc172f 100644 --- a/web/admin/activity/item_reg.aspx +++ b/web/admin/activity/item_reg.aspx @@ -496,6 +496,14 @@ }, 300) }, bom_addNew() { + + if (this.prod_bom_num === undefined || this.prod_bom_num ===0) { + this.snackbar.text = "請先點選設定或儲存子項目，點選前先確定此為群組功德項目" + this.snackbar.show = true; + return + } else { + console.log(this.prod_bom_num === undefined || this.prod_bom_num === 0); + } this.spliceNullData(); //addObj.id = this.desserts.length + 1; @@ -798,8 +806,10 @@
diff --git a/web/admin/activity/item_reg.aspx.cs b/web/admin/activity/item_reg.aspx.cs index ac2a18d..9d6267f 100644 --- a/web/admin/activity/item_reg.aspx.cs +++ b/web/admin/activity/item_reg.aspx.cs @@ -272,6 +272,7 @@ public partial class admin_activity_item_reg : MyWeb.config actBom.memo = bom_memo.Text; _db.act_bom.Add(actBom); _db.SaveChanges(); + prod_bom_num=actBom.num; Response.Redirect("item_reg.aspx?num=" + _num); } } @@ -290,6 +291,7 @@ public partial class admin_activity_item_reg : MyWeb.config prodBom.qty = Val(bom_qty.Text); prodBom.memo = bom_memo.Text; _db.SaveChanges(); + prod_bom_num=prodBom.num; //Response.Redirect("item_reg.aspx?num=" + _num); } } diff --git a/web/admin/order/reg.aspx b/web/admin/order/reg.aspx index 8a9ba6e..11ee41a 100644 --- a/web/admin/order/reg.aspx +++ b/web/admin/order/reg.aspx @@ -913,6 +913,7 @@ this.editedItem = $.extend(true, {}, item); //console.log("editTabletNew:",this.editedItem,item) try { + console.log("editTabletNew:",this.editItem) //document.getElementById("tablet_edit_new_iframe").contentWindow.location.reload(); // 如果是新項目，先保存 if (this.editedItem.num <= 0 || this.editedItem.num === null || this.editedItem.num === undefined) { @@ -2057,7 +2058,7 @@ :footer-props="footersDetail" :search="searchDetail" :options.sync="optionsDetail" class="elevation-1" fixed-header height="350px" - item-key="num" + <%--item-key="num"--%> <%-- :server-items-length="desserts_count"--%> > diff --git a/web/admin/receipt/index.aspx b/web/admin/receipt/index.aspx index 908ef68..6df9d48 100644 --- a/web/admin/receipt/index.aspx +++ b/web/admin/receipt/index.aspx @@ -38,8 +38,8 @@ {{ getSourceName(item.source) }}