diff --git a/web/App_Code/Model/Model.cs b/web/App_Code/Model/Model.cs index 1ca239e..2e5c4ed 100644 --- a/web/App_Code/Model/Model.cs +++ b/web/App_Code/Model/Model.cs @@ -1389,6 +1389,7 @@ namespace Model public Nullable parent_num { get; set; } public string print_id { get; set; } public Nullable UpdateTime { get; set; } + public string style { get; set; } public virtual actItem actItem { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] diff --git a/web/App_Code/Model/Model.edmx b/web/App_Code/Model/Model.edmx index 9bd2192..d70820a 100644 --- a/web/App_Code/Model/Model.edmx +++ b/web/App_Code/Model/Model.edmx @@ -724,6 +724,7 @@ + @@ -3188,6 +3189,7 @@ + @@ -5863,6 +5865,7 @@ + diff --git a/web/App_Code/Model/Model.edmx.diagram b/web/App_Code/Model/Model.edmx.diagram index 4147bfb..dbffeda 100644 --- a/web/App_Code/Model/Model.edmx.diagram +++ b/web/App_Code/Model/Model.edmx.diagram @@ -4,7 +4,7 @@ - + diff --git a/web/App_Code/api/orderController.cs b/web/App_Code/api/orderController.cs index 6260df2..761e939 100644 --- a/web/App_Code/api/orderController.cs +++ b/web/App_Code/api/orderController.cs @@ -447,6 +447,7 @@ public class orderController : ApiController ? x.num.ToString() : (x.parent_num.ToString() + x.num.ToString()) ), + style=x.style??"" //cash_record = x.pro_order_record.Select( c => new { // c, // //pay_kind = tdesc2[c.payment.HasValue && x.keyin1.Value > 0 ? x.keyin1.Value : 1], @@ -712,6 +713,7 @@ public class orderController : ApiController order.demo = item.demo; order.customize_data = item.customize_data; order.UpdateTime = DateTime.Now; + order.style = item.style; _db.SaveChanges(); var ret = new { @@ -765,6 +767,7 @@ public class orderController : ApiController demo = item.demo, customize_data = item.customize_data, UpdateTime = DateTime.Now, + style=item.style }; _db.pro_order_detail.Add(orderDetail); _db.SaveChanges(); diff --git a/web/admin/activity/reg.aspx b/web/admin/activity/reg.aspx index 57b390f..d49fe44 100644 --- a/web/admin/activity/reg.aspx +++ b/web/admin/activity/reg.aspx @@ -623,7 +623,7 @@ }) // 送出列印 - _url = HTTP_HOST + 'admin/print/print_multi.aspx'; + _url = HTTP_HOST + 'admin/print/print_multi_new.aspx'; var form = document.createElement("form"); form.method = "POST"; form.action = _url; @@ -643,6 +643,10 @@ addHiddenField("file", this.thisFilesSelected.val); addHiddenField("list", JSON.stringify(list)); addHiddenField("title", `${this.thisItemSelected.text} / ${this.thisFilesSelected.text}`); + localStorage.setItem("item", this.thisItemSelected.val); + localStorage.setItem("file", this.thisFilesSelected.val); + localStorage.setItem("list", JSON.stringify(list)); + localStorage.setItem("title", `${this.thisItemSelected.text} / ${this.thisFilesSelected.text}`); /* var hiddenField = document.createElement("input"); diff --git a/web/admin/order/index3.aspx b/web/admin/order/index3.aspx index 549ff3a..e4a4c37 100644 --- a/web/admin/order/index3.aspx +++ b/web/admin/order/index3.aspx @@ -57,7 +57,6 @@ {{ item.u_name }} @@ -625,9 +624,56 @@ Vue.component('step-two', { template: ` -
QOO
- `, - props: ['oneData'], +
+ + + + + + + + + + + 共 {{ detail_table.count }} 筆, 頁數: + + + + + + +
`, + + props: ['twoData'], activated() { console.log("yes ,go go"); this.getDetail(); @@ -655,6 +701,20 @@ showFirstLastPage: true, itemsPerPageOptions: [5, 10, 20, 30], }, + }, + search: { + keyin1: '', + order_no: '', + subject: '', + u_name: '', + up_time1: '', + up_time2: '', + actItemTxt: '', + introducerTxt: '', + activity_num: '', + country: '', + country2: '', + hasPrice: '', } }; }, @@ -671,12 +731,15 @@ getDetail() { const { sortBy, sortDesc, page, itemsPerPage } = this.options const params = { - sortBy: sortBy[0], sortDesc: sortDesc[0], - page: clearpage ? '1' : page, pageSize: itemsPerPage, - activity_num: $root.selected_act + //sortBy: sortBy == undefined ? "order_no" : sortBy[0], + //sortDesc: sortDesc == undefined ? "" : sortDesc[0], + //page: clearpage ? '1' : page, pageSize: itemsPerPage, + page:'1',pageSize:10, + }; + this.search = { activity_num: this.$root.selected_act } this.detail_table.loading = true - sessionStorage.setItem('orderpage', clearpage ? '1' : page); + sessionStorage.setItem('orderpage','1');// clearpage ? '1' : page axios .post(HTTP_HOST + 'api/order/GetList', this.search, { params: params }) .then(response => { @@ -686,18 +749,108 @@ }) .catch(error => console.log(error)) }, + }, + computed: { + pageCount() { + return Math.ceil(this.detail_table.count / this.detail_table.pageSize) + }, } }); + Vue.component('step-three', { + template: `
放報名資料
`, + props:['signData'] + }); let VueApp = new Vue({ el: '#app', vuetify: new Vuetify(), data() { return { currentView: 'step-one', - selected_act:'', + selected_act: '', + selected_order:'', }; + },activated() { + console.log("yes ,go go"); + this.getDetail(); + }, + data() { + return { + options: { multiSort: false }, + search_options: { multiSort: false }, + sign_table: { + loading: true, + list: [], + selected: [], + singleSelect: false, + count: 0, + page: 1, + pageSize: 10, + header: [ + { text: '單號', value: 'order_no' }, + { text: '姓名', value: 'u_name' }, + { text: '報名日期', value: 'up_time' }, + { text: '單據狀態', value: 'keyin1_txt', align: 'start' }, + { text: '', value: 'slot_btn', sortable: false, align: 'end' } + ], + footer: { + showFirstLastPage: true, + itemsPerPageOptions: [5, 10, 20, 30], + }, + }, + search: { + keyin1: '', + order_no: '', + subject: '', + u_name: '', + up_time1: '', + up_time2: '', + actItemTxt: '', + introducerTxt: '', + activity_num: '', + country: '', + country2: '', + hasPrice: '', + } + }; + }, + watch: { + options: { + handler() { + this.getDetail() + }, + deep: true, + }, + + }, + methods: { + getDetail() { + const { sortBy, sortDesc, page, itemsPerPage } = this.options + const params = { + //sortBy: sortBy == undefined ? "order_no" : sortBy[0], + //sortDesc: sortDesc == undefined ? "" : sortDesc[0], + //page: clearpage ? '1' : page, pageSize: itemsPerPage, + page: '1', pageSize: 10, + + }; + this.search = { activity_num: this.$root.selected_act } + this.detail_table.loading = true + sessionStorage.setItem('orderpage', '1');// clearpage ? '1' : page + axios + .post(HTTP_HOST + 'api/order/GetList', this.search, { params: params }) + .then(response => { + this.detail_table.list = response.data.list + this.detail_table.count = response.data.count; + this.detail_table.loading = false + }) + .catch(error => console.log(error)) + }, + }, + computed: { + pageCount() { + return Math.ceil(this.detail_table.count / this.detail_table.pageSize) + }, } }); diff --git a/web/admin/order/reg.aspx b/web/admin/order/reg.aspx index 50bd964..fe2482e 100644 --- a/web/admin/order/reg.aspx +++ b/web/admin/order/reg.aspx @@ -538,7 +538,8 @@ //currentItem.f_num_tablet = JSON.stringify(receivedData.tablet_data); this.editedItem = { ...currentItem, - f_num_tablet: JSON.stringify(receivedData.tablet_data) + f_num_tablet: JSON.stringify(receivedData.tablet_data), + style: receivedData.style }; // 呼叫 save 方法 await this.save(); @@ -964,6 +965,7 @@ async save(shouldClose = true) { if (this.editedIndex > -1) { if (this.order_no != '') { + console.log("ok:",this.editedItem); //chcck necessary params if (this.editedItem.actitem_num_selected.val != 0 && this.editedItem.keyin1_selected.val !=0 && @@ -1001,6 +1003,7 @@ pay: this.editedItem.pay, pay_date: this.editedItem.pay_date, customize_data: this.editedItem.customize_data, + style: this.editedItem.style } await axios .post(HTTP_HOST + 'api/order/SaveDetailData', pro_order_detail) @@ -2573,7 +2576,7 @@ mdi-close - + diff --git a/web/admin/print/print_multi_new.aspx b/web/admin/print/print_multi_new.aspx new file mode 100644 index 0000000..d7f7f30 --- /dev/null +++ b/web/admin/print/print_multi_new.aspx @@ -0,0 +1,21 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeFile="print_multi_new.aspx.cs" Inherits="admin_print_print_multi_new" %> + + + + + + + + + +
+
+
+
+ + + diff --git a/web/admin/print/print_multi_new.aspx.cs b/web/admin/print/print_multi_new.aspx.cs new file mode 100644 index 0000000..ea5c187 --- /dev/null +++ b/web/admin/print/print_multi_new.aspx.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +public partial class admin_print_print_multi_new :MyWeb.function +{ + private Model.ezEntities _db = new Model.ezEntities(); +protected void Page_Load(object sender, EventArgs e) + { + + } +} \ No newline at end of file diff --git a/web/admin/print/tablet_edit/editornew.html b/web/admin/print/tablet_edit/editornew.html new file mode 100644 index 0000000..da8192b --- /dev/null +++ b/web/admin/print/tablet_edit/editornew.html @@ -0,0 +1,804 @@ + + + + + + Document + + + + + + + + + +
+ + + + + 選擇版型 + + + + + + + +
+
+ +
+
Alternate Text
+
+
+
{{tabletItem.print_id}}
+
+
+
+
+
+
陽上
+
拜薦
+
+
+
+
+ +
+ 儲存牌位 +
+ + + + + + + + + + 超渡-已選 + + + + + mdi-plus + + + + + + + + + + + + + 0 + {{ member.deceased ? '卍' : '' }} + {{ member.fam_name }} + + {{ member.fam_title }} + + + + + mdi-backspace + + + mdi-arrow-up + + + mdi-arrow-down + + + mdi-minus + + + + + + + mdi-subdirectory-arrow-left + + + + + + + + + 超渡-可選 + + + + + + {{ member.deceased ? '卍' : '' }} + {{ member.fam_name }} + + {{ member.fam_title }} + + + + + + mdi-plus + + + + + + + + + + + + + + + + 陽上/祈福-已選 + + + + + mdi-plus + + + + + + + + + + + + + 0 + {{ member.deceased ? '卍' : '' }} + {{ member.fam_name }} + + {{ member.fam_title }} + + + + + mdi-backspace + + + mdi-arrow-up + + + mdi-arrow-down + + + mdi-minus + + + + + + + mdi-subdirectory-arrow-left + + + + + + + + + 陽上/祈福-可選 + + + + + + {{ member.deceased ? '卍' : '' }} + {{ member.fam_name }} + + {{ member.fam_title }} + + + + + + mdi-plus + + + + + + + + + +
+ +
+ + + + + 新增項目 + +
+ {{ phrase.length > 5 ? phrase.slice(0, 5) + '...' : phrase }} +
+ + + +
+ + mdi-backspace +
+ + 取消 + 確定 + + + + + + + + 確認刪除 + + 確定要刪除「{{ deleteMemberName }}」嗎？
+ 此為手動新增項目，刪除後無法復原。 + + + + 取消 + 確定刪除 + + + + +
+ + + + \ No newline at end of file