diff --git a/web/App_Code/api/guadanGuestQueryController.cs b/web/App_Code/api/guadanGuestQueryController.cs index 0abc658..fa92dde 100644 --- a/web/App_Code/api/guadanGuestQueryController.cs +++ b/web/App_Code/api/guadanGuestQueryController.cs @@ -66,6 +66,7 @@ public class guadanGuestQueryController: ApiController checkoutdate = a.CheckOutAt, guadanorderno = a.GuaDanOrderNo, roomName = GetRoomAndBedString(a.RegionRoomBed), + statusName = a.RegionRoomBedStatus.Name }).ToList(); return Ok(new { diff --git a/web/App_Code/api/guadanOrderController.cs b/web/App_Code/api/guadanOrderController.cs index 51cb399..7cb068f 100644 --- a/web/App_Code/api/guadanOrderController.cs +++ b/web/App_Code/api/guadanOrderController.cs @@ -54,7 +54,7 @@ public class guadanOrderController : ApiController } } var total = query.Count(); - var data1 = query.ToList(); + var data1 = await query.ToListAsync(); var data = data1 .OrderByDescending(b => b.CreatedAt) .Select(a => new @@ -86,19 +86,19 @@ public class guadanOrderController : ApiController .Where(c => c.GuaDanOrderNo == a.GuaDanOrderNo && c.IsDeleted == false) .Where(c => c.RegionRoomBedStatus.Code != GuaDanOrderGuest.STATUS_CANCELLED) .Count(), - statusName = _db.GuaDanOrderGuest + guadan_status = _db.GuaDanOrderGuest .Where(g => g.GuaDanOrderNo == a.GuaDanOrderNo && a.IsDeleted == false) .Where(g => g.StatusCode != GuaDanOrderGuest.STATUS_CANCELLED) - .All(g => g.StatusCode == "401") ? "預約" : + .All(g => g.StatusCode == "401") ? new { code=501, name="預約" }: _db.GuaDanOrderGuest .Where(g => g.GuaDanOrderNo == a.GuaDanOrderNo && a.IsDeleted == false) .Where(g => g.StatusCode != GuaDanOrderGuest.STATUS_CANCELLED) - .All(g => g.StatusCode == "403") ? "全部退房" : + .All(g => g.StatusCode == "403") ? new { code = 502, name = "全部退房" } : _db.GuaDanOrderGuest .Where(g => g.GuaDanOrderNo == a.GuaDanOrderNo && a.IsDeleted == false) .Where(g => g.StatusCode != GuaDanOrderGuest.STATUS_CANCELLED) - .Any(g => g.StatusCode == "402" && a.IsCancel == false) ? "正在入住" : - "部分退房" + .Any(g => g.StatusCode == "402" && a.IsCancel == false) ? new { code = 503, name = "正在入住" } : + new { code = 504, name = "部分退房" } }) .Skip((search.page - 1) * search.pageSize) .Take(search.pageSize) @@ -232,7 +232,7 @@ public class guadanOrderController : ApiController { return NotFound(); } - if (_db.GuaDanOrderGuest.Any(a => a.GuaDanOrderNo == guadan.GuaDanOrderNo)) + if (_db.GuaDanOrderGuest.Any(a => (a.GuaDanOrderNo == guadan.GuaDanOrderNo) && a.StatusCode != "404")) { return BadRequest($"該掛單已經存在掛單蓮友,不能取消!"); } diff --git a/web/admin/guadan/guest/index.aspx b/web/admin/guadan/guest/index.aspx index ac07da3..4f8ca6a 100644 --- a/web/admin/guadan/guest/index.aspx +++ b/web/admin/guadan/guest/index.aspx @@ -74,7 +74,7 @@ - 共 {{ }} 筆, 頁數: + 共 {{ total }} 筆, 頁數: - 編輯 - 取消 + 查看 + 編輯 + + 取消 + + {{item.room.name}} @@ -42,8 +52,8 @@ {{item.bed.name}} - - {{item.status}} + + {{item.guadan_status?.name}} {{item.start_date | timeString('YYYY/MM/DD')}} @@ -121,7 +131,7 @@ { text: '起始日期', value: 'start_date', align: 'center' }, { text: '結束日期', value: 'end_date', align: 'center' }, { text: '掛單人數', value: 'guest_count' }, - { text: '狀態', value: 'statusName', align: 'center' }, + { text: '狀態', value: 'guadan_status', align: 'center' }, { text: '建立時間', value: 'created_at', align: 'center' }, { text: '關聯活動', value: 'activity', align: 'center' }, { text: '超時退房', value: 'is_timeout', align: 'center' }, diff --git a/web/admin/guadan/view.aspx b/web/admin/guadan/view.aspx new file mode 100644 index 0000000..3209306 --- /dev/null +++ b/web/admin/guadan/view.aspx @@ -0,0 +1,539 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/admin/Templates/TBS5ADM001/MasterPage.master" AutoEventWireup="true" CodeFile="view.aspx.cs" Inherits="admin_guadan_view" %> + + + + + + + + 掛單資訊 + + + 📝掛單資訊 + + 掛單單號(不可修改) + + + + 關聯活動 + + + 未關聯 + + {{activity.subject}} + + + + + + + 預約開始日期 + + + + + + 預約結束日期 + + + + + + + + 預定人姓名 + + + + 預定人電話 + + + + + + 備註 + + + + + + + + + + + + + + 掛單蓮友 + + + + + + + + {{item.checkinat |timeString('YYYY-MM-DD')}} + + + {{item.checkoutat |timeString('YYYY-MM-DD')}} + + + {{item.follower?.u_name}} + + + {{item.follower?.sex}} + + + + + + + + + + + \ No newline at end of file diff --git a/web/admin/guadan/view.aspx.cs b/web/admin/guadan/view.aspx.cs new file mode 100644 index 0000000..f481a55 --- /dev/null +++ b/web/admin/guadan/view.aspx.cs @@ -0,0 +1,14 @@ +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_guadan_view : MyWeb.config +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} \ No newline at end of file