1. 優化報名頁面:彈出查詢頁面、顯示剛新增資料
2. 新增報名頁面加上取消鍵 3. 優化登入頁面:按下 enter 自動換格/送出 4. 修復新增報名頁面中,不同 search_dialog 中的 page 參數相互連動之異常 5. 修改報名頁面列印格式 6. 修復報名頁面匯出功能 7. 優化報到功能 8. 報名頁面中,無查詢資料時不可點選匯出/列印按鈕 9. 匯出/列印報名管理報表時,若無資料則顯示提示 10. 修復列印管理報表後父視窗 UI 不能點擊的問題 11. 新增報名管理表單匯出 excel 功能 12. 於新增信眾、新增活動頁面加上取消鍵 13. 優化報名管理匯出功能:若篩選條件包含特定活動,自動於「匯出條件」欄位標註活動名稱 14. 優化報名查詢匯出功能:匯出之文件中加上「匯出條件」欄位 15. 修復信眾資料頁面中,使用「生日」作為篩選基準時,後續執行「列印查詢資料」與「匯出查詢資料」會報錯 16. 修復「列印信眾查詢」功能中,電話搜尋欄位未正確帶入查詢條件之異常 17. 解決中文輸入法輸入電話號碼的跳字問題 18. 新增品項管理介面排序功能
This commit is contained in:
@@ -135,7 +135,7 @@
|
||||
},
|
||||
watch: {
|
||||
options: {
|
||||
handler() {
|
||||
handler() {
|
||||
if (this.isSearched) {
|
||||
this.getList()
|
||||
}
|
||||
@@ -200,23 +200,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
//if (params.has('year')) {
|
||||
// this.print_search.year = parseInt(params.get('year'));
|
||||
// this.print_dialog.show = true;
|
||||
//}
|
||||
//if (params.has('month')) {
|
||||
// this.print_search.month = parseInt(params.get('month'));
|
||||
// this.print_dialog.show = true;
|
||||
//}
|
||||
//if (params.has('season')) {
|
||||
// this.print_search.season = parseInt(params.get('season'));
|
||||
// this.print_dialog.show = true;
|
||||
//}
|
||||
//if (params.has('mode')) {
|
||||
// this.print_conditions = params.get('mode');
|
||||
// this.print_dialog.show = true;
|
||||
//}
|
||||
|
||||
if (printResult === 'nodata' || printResult === 'success') {
|
||||
this.$nextTick(() => {
|
||||
this.print_search.year = parseInt(document.getElementById('<%= hid_print_year.ClientID %>').value) || this.print_search.year;
|
||||
@@ -231,8 +214,9 @@
|
||||
}
|
||||
this.$nextTick(() => {
|
||||
setTimeout(() => {
|
||||
['year', 'month', 'season', 'mode', 'msg'].forEach(p => params.delete(p));
|
||||
window.history.replaceState({}, '', url.pathname + url.search);
|
||||
// 清空 URL
|
||||
const cleanUrl = window.location.protocol + "//" + window.location.host + window.location.pathname;
|
||||
window.history.replaceState({}, '', cleanUrl);
|
||||
}, 100);
|
||||
});
|
||||
},
|
||||
@@ -255,7 +239,6 @@
|
||||
}
|
||||
|
||||
if (mode === 'print') {
|
||||
const printWindow = window.open('about:blank', '列印信眾資料');
|
||||
document.getElementById('<%= print_management.ClientID %>').click();
|
||||
}
|
||||
else if (mode === "excel") {
|
||||
@@ -397,13 +380,13 @@
|
||||
}
|
||||
},
|
||||
btn_search() {
|
||||
isSearched = true;
|
||||
this.isSearched = true;
|
||||
sessionStorage.setItem("member_query_params", JSON.stringify(this.search));
|
||||
this.getList(true)
|
||||
bootstrap.Offcanvas.getInstance(document.getElementById("offcanvasRight")).hide()
|
||||
},
|
||||
btn_all() {
|
||||
isSearched = false;
|
||||
this.isSearched = false;
|
||||
clearObjProps(this.search);
|
||||
sessionStorage.setItem("member_query_params", JSON.stringify(this.search));
|
||||
//this.btn_search()
|
||||
@@ -527,6 +510,7 @@
|
||||
<asp:HiddenField ID="hid_print_month" runat="server" />
|
||||
<asp:HiddenField ID="hid_print_season" runat="server" />
|
||||
<asp:HiddenField ID="hid_print_mode" runat="server" />
|
||||
<asp:HiddenField ID="hid_qry" runat="server" />
|
||||
<asp:LinkButton ID="excel_management" runat="server" OnClick="export_Click" style="display:none;" />
|
||||
<asp:LinkButton ID="print_management" runat="server" OnClick="export_Click" style="display:none;" />
|
||||
<div id="content" class="container-fluid">
|
||||
|
||||
Reference in New Issue
Block a user