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:
@@ -13,6 +13,7 @@ using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Interop;
|
||||
using static TreeView;
|
||||
|
||||
@@ -243,7 +244,7 @@ public partial class admin_follower_index : MyWeb.config
|
||||
int selMonth = !string.IsNullOrEmpty(hid_print_month.Value) ? int.Parse(hid_print_month.Value) : 0;
|
||||
int selSeason = !string.IsNullOrEmpty(hid_print_season.Value) ? int.Parse(hid_print_season.Value) : 0;
|
||||
string selMode = !string.IsNullOrEmpty(hid_print_mode.Value) ? hid_print_mode.Value : "";
|
||||
|
||||
|
||||
var qry = _db.followers.AsQueryable();
|
||||
if (selYear > 0)
|
||||
{
|
||||
@@ -255,7 +256,7 @@ public partial class admin_follower_index : MyWeb.config
|
||||
}
|
||||
else if (selMode == "ss" && selSeason > 0)
|
||||
{
|
||||
urlParams += "&season=" + selSeason;
|
||||
urlParams += "&season=" + selSeason;
|
||||
}
|
||||
|
||||
if (list.Count > 0)
|
||||
@@ -266,17 +267,12 @@ public partial class admin_follower_index : MyWeb.config
|
||||
hid_print_season.Value = selSeason.ToString();
|
||||
hid_print_mode.Value = selMode;
|
||||
|
||||
string script = $@"window.open('print.aspx?{urlParams}&mode={selMode}', '列印信眾資料');";
|
||||
string script = $@"window.open('print.aspx?{urlParams}&mode={selMode}', '列印信眾資料', 'noopener,noreferrer');";
|
||||
ScriptManager.RegisterStartupScript(this, GetType(), "ExecutePrint", script, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
hid_err_msg.Value = "nodata";
|
||||
string script = $@"
|
||||
var win = window.open('', '列印信眾資料');
|
||||
if (win) win.close()";
|
||||
|
||||
ScriptManager.RegisterStartupScript(this, GetType(), "CancelPrint", script, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -357,7 +353,7 @@ public partial class admin_follower_index : MyWeb.config
|
||||
qry = qry.Where(o => o.address.Contains(s_address.Value.Trim()));
|
||||
_query += "地址:" + s_address.Value.Trim() + "\n";
|
||||
}
|
||||
|
||||
|
||||
// 電話/證號搜尋 (使用 search_keywords HEX 編碼)
|
||||
if (!isStrNull(s_phone_idcode.Value) && GlobalVariables.UseSearchKeywords)
|
||||
{
|
||||
@@ -372,12 +368,14 @@ public partial class admin_follower_index : MyWeb.config
|
||||
|
||||
if (!isStrNull(s_birthday.Value) && isDate(s_birthday.Value))
|
||||
{
|
||||
qry = qry.Where(o => o.birthday >= ValDate(s_birthday.Value));
|
||||
var tmp_s_birthday = ValDate(s_birthday.Value);
|
||||
qry = qry.Where(o => o.birthday >= tmp_s_birthday);
|
||||
_query += "生日(起):" + s_birthday.Value.Trim() + "\n";
|
||||
}
|
||||
if (!isStrNull(s_birthday2.Value) && isDate(s_birthday2.Value))
|
||||
{
|
||||
qry = qry.Where(o => o.birthday < Convert.ToDateTime(s_birthday2.Value).AddDays(1));
|
||||
var tmp_s_birthday2 = Convert.ToDateTime(s_birthday2.Value).AddDays(1);
|
||||
qry = qry.Where(o => o.birthday < tmp_s_birthday2);
|
||||
_query += "生日(訖):" + s_birthday2.Value.Trim() + "\n";
|
||||
}
|
||||
qry = qry.OrderByDescending(o => o.num);
|
||||
|
||||
Reference in New Issue
Block a user