1. 加上返回鍵
2. 修改報名記錄中的活動開始結束時間 3. 修正列印問題 4. 信眾資料及報名管理起始不會出現資料 5. 信眾不得重複報名相同活動 6. 信眾資料的 cache(含結果與搜尋條件) 7. 修復信眾、活動、品項刪除功能 8. 增加自訂是否自動編號 9. 優化信眾資料頁面(彈出查詢頁面、顯示剛新增資料) 10. 新增管理表單匯出 excel 功能 11. 無查詢資料時不可點選匯出/列印按鈕 12. 匯出/列印管理報表時,若無資料則顯示提示 13. 新增信眾資料時,加入日期預設為今日
This commit is contained in:
@@ -103,17 +103,18 @@ public class FollowerController : ApiController
|
||||
{
|
||||
foreach (var item in prod)
|
||||
{
|
||||
foreach (var item2 in item.pro_order_detail1)
|
||||
item2.from_id = null; //清空訂單明細的陽上報恩者from_id //f_num設定串聯刪除
|
||||
//foreach (var item2 in item.pro_order_detail1)
|
||||
// item2.from_id = null; //清空訂單明細的陽上報恩者from_id //f_num設定串聯刪除
|
||||
|
||||
foreach (var item2 in item.pro_order)
|
||||
item2.introducer = null;
|
||||
//foreach (var item2 in item.pro_order)
|
||||
// item2.introducer = null;
|
||||
|
||||
item.leader = null;//清空leader
|
||||
//item.leader = null;//清空leader
|
||||
_db.followers.RemoveRange(prod);
|
||||
|
||||
}
|
||||
|
||||
_db.followers.RemoveRange(prod);
|
||||
//_db.followers.RemoveRange(prod);
|
||||
_db.SaveChanges();
|
||||
|
||||
Model.admin_log admin_log = new Model.admin_log();
|
||||
@@ -173,7 +174,7 @@ public class FollowerController : ApiController
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// 電話/證號搜尋 (使用 search_keywords HEX 編碼)
|
||||
if (!string.IsNullOrEmpty(q.phone_idcode) && GlobalVariables.UseSearchKeywords)
|
||||
{
|
||||
@@ -655,8 +656,10 @@ public class FollowerController : ApiController
|
||||
list = orderrecord.Select(x => new
|
||||
{
|
||||
orderno = x.order_no,
|
||||
startdate = x.reg_time,
|
||||
endtime = x.up_time,
|
||||
//startdate = x.reg_time,
|
||||
//endtime = x.up_time,
|
||||
startdate = x.activity.startDate_solar,
|
||||
enddate = x.activity.endDate_solar,
|
||||
pwcount = x.pro_order_detail.Where(a => a.actItem.act_bom.Where(b => b.item_num == a.actItem_num && b.package_num == null).Count() == 0).Count(),
|
||||
amount = x.pro_order_detail.Select(o => (float?)o.price).Sum(),
|
||||
activityname = x.activity.subject,
|
||||
|
||||
Reference in New Issue
Block a user