21
This commit is contained in:
parent
6bcce64408
commit
eeb5fa36fc
|
|
@ -368,7 +368,7 @@
|
||||||
| ScoreBiology | int | 否 | - | 生物成绩 |
|
| ScoreBiology | int | 否 | - | 生物成绩 |
|
||||||
| ScoreGeography | int | 否 | - | 地理成绩 |
|
| ScoreGeography | int | 否 | - | 地理成绩 |
|
||||||
| ScorePolitics | int | 否 | - | 政治成绩 |
|
| ScorePolitics | int | 否 | - | 政治成绩 |
|
||||||
| Status | int | 是 | 1 | 状态:1待联系 2已联系 3已完成 4已取消 |
|
| Status | int | 是 | 1 | 状态:1待联系 2联系中 3已完成 4已取消 |
|
||||||
| CreateTime | datetime2 | 是 | GETDATE() | 创建时间 |
|
| CreateTime | datetime2 | 是 | GETDATE() | 创建时间 |
|
||||||
| UpdateTime | datetime2 | 是 | GETDATE() | 更新时间 |
|
| UpdateTime | datetime2 | 是 | GETDATE() | 更新时间 |
|
||||||
| IsDeleted | bit | 是 | 0 | 软删除 |
|
| IsDeleted | bit | 是 | 0 | 软删除 |
|
||||||
|
|
|
||||||
|
|
@ -127,7 +127,7 @@ public class PlannerBooking
|
||||||
public string? Expectation { get; set; }
|
public string? Expectation { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 状态:1待联系 2已联系 3已完成 4已取消
|
/// 状态:1待联系 2联系中 3已完成 4已取消
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int Status { get; set; } = 1;
|
public int Status { get; set; } = 1;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,7 @@ public class BookingDto
|
||||||
public string GradeName { get; set; } = null!;
|
public string GradeName { get; set; } = null!;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 状态:1待联系 2已联系 3已完成 4已取消
|
/// 状态:1待联系 2联系中 3已完成 4已取消
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int Status { get; set; }
|
public int Status { get; set; }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ public class BookingQueryRequest : PagedRequest
|
||||||
public DateTime? BookingDateEnd { get; set; }
|
public DateTime? BookingDateEnd { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 状态:1待联系 2已联系 3已完成 4已取消
|
/// 状态:1待联系 2联系中 3已完成 4已取消
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? Status { get; set; }
|
public int? Status { get; set; }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ public class UpdateBookingStatusRequest
|
||||||
public long Id { get; set; }
|
public long Id { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 状态:1待联系 2已联系 3已完成 4已取消
|
/// 状态:1待联系 2联系中 3已完成 4已取消
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Range(1, 4, ErrorMessage = "状态值无效")]
|
[Range(1, 4, ErrorMessage = "状态值无效")]
|
||||||
public int Status { get; set; }
|
public int Status { get; set; }
|
||||||
|
|
|
||||||
|
|
@ -79,7 +79,7 @@ export interface TrendsQuery {
|
||||||
export interface PendingItems {
|
export interface PendingItems {
|
||||||
/** 待审核提现数量 */
|
/** 待审核提现数量 */
|
||||||
pendingWithdrawals: number
|
pendingWithdrawals: number
|
||||||
/** 待确认预约数量 */
|
/** 待联系预约数量 */
|
||||||
pendingBookings: number
|
pendingBookings: number
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -111,7 +111,7 @@ export function getTrends(params: TrendsQuery): Promise<ApiResponse<TrendsData>>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取待办事项
|
* 获取待办事项
|
||||||
* @returns 待办事项数据,包含待审核提现和待确认预约数量
|
* @returns 待办事项数据,包含待审核提现和待联系预约数量
|
||||||
*/
|
*/
|
||||||
export function getPendingItems(): Promise<ApiResponse<PendingItems>> {
|
export function getPendingItems(): Promise<ApiResponse<PendingItems>> {
|
||||||
return request<PendingItems>({
|
return request<PendingItems>({
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,8 @@ const dictData: Record<string, DictItem[]> = {
|
||||||
{ value: 6, label: '已取消' }
|
{ value: 6, label: '已取消' }
|
||||||
],
|
],
|
||||||
booking_status: [
|
booking_status: [
|
||||||
{ value: 1, label: '待确认' },
|
{ value: 1, label: '待联系' },
|
||||||
{ value: 2, label: '已确认' },
|
{ value: 2, label: '联系中' },
|
||||||
{ value: 3, label: '已完成' },
|
{ value: 3, label: '已完成' },
|
||||||
{ value: 4, label: '已取消' }
|
{ value: 4, label: '已取消' }
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -201,7 +201,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="pending-content">
|
<div class="pending-content">
|
||||||
<div class="pending-count">{{ state.pendingItems?.pendingBookings ?? 0 }}</div>
|
<div class="pending-count">{{ state.pendingItems?.pendingBookings ?? 0 }}</div>
|
||||||
<div class="pending-label">待确认预约</div>
|
<div class="pending-label">待联系预约</div>
|
||||||
</div>
|
</div>
|
||||||
<el-icon class="pending-arrow"><ArrowRight /></el-icon>
|
<el-icon class="pending-arrow"><ArrowRight /></el-icon>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -768,8 +768,8 @@ public class OrderService : IOrderService
|
||||||
{
|
{
|
||||||
return status switch
|
return status switch
|
||||||
{
|
{
|
||||||
1 => "待确认",
|
1 => "待联系",
|
||||||
2 => "已确认",
|
2 => "联系中",
|
||||||
3 => "已完成",
|
3 => "已完成",
|
||||||
4 => "已取消",
|
4 => "已取消",
|
||||||
_ => "未知"
|
_ => "未知"
|
||||||
|
|
|
||||||
|
|
@ -544,7 +544,7 @@ public partial class MiAssessmentDbContext : DbContext
|
||||||
.HasComment("政治成绩");
|
.HasComment("政治成绩");
|
||||||
entity.Property(e => e.Status)
|
entity.Property(e => e.Status)
|
||||||
.HasDefaultValue(1)
|
.HasDefaultValue(1)
|
||||||
.HasComment("状态:1待联系 2已联系 3已完成 4已取消");
|
.HasComment("状态:1待联系 2联系中 3已完成 4已取消");
|
||||||
entity.Property(e => e.CreateTime)
|
entity.Property(e => e.CreateTime)
|
||||||
.HasDefaultValueSql("(getdate())")
|
.HasDefaultValueSql("(getdate())")
|
||||||
.HasComment("创建时间");
|
.HasComment("创建时间");
|
||||||
|
|
|
||||||
|
|
@ -127,7 +127,7 @@ public class PlannerBooking
|
||||||
public string? Expectation { get; set; }
|
public string? Expectation { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 状态:1待联系 2已联系 3已完成 4已取消
|
/// 状态:1待联系 2联系中 3已完成 4已取消
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int Status { get; set; } = 1;
|
public int Status { get; set; } = 1;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user