From 70ea0911ce7519ca802266078624e9fed3559a2c Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期五, 18 九月 2026 14:05:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
talent-card-admin/src/views/HotelReservationView.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/talent-card-admin/src/views/HotelReservationView.vue b/talent-card-admin/src/views/HotelReservationView.vue
index d2de2ab..36a22fa 100644
--- a/talent-card-admin/src/views/HotelReservationView.vue
+++ b/talent-card-admin/src/views/HotelReservationView.vue
@@ -159,8 +159,12 @@
<el-table-column prop="merchantName" label="酒店等级" min-width="96" align="center" />
<el-table-column prop="productName" label="商品名称" min-width="96" align="center" />
<el-table-column prop="guestCount" label="入住人数" min-width="90" align="center" />
- <el-table-column prop="expectedTime" label="预约入住时间" min-width="132" align="center" />
- <el-table-column prop="submittedAt" label="提交时间" min-width="126" align="center" />
+ <el-table-column prop="expectedTime" label="预约入住时间" min-width="132" align="center">
+ <template #default="{ row }">{{ formatDateTime(row.expectedTime) }}</template>
+ </el-table-column>
+ <el-table-column prop="submittedAt" label="提交时间" min-width="126" align="center">
+ <template #default="{ row }">{{ formatDateTime(row.submittedAt) }}</template>
+ </el-table-column>
<el-table-column prop="status" label="状态" min-width="108" align="center" />
<el-table-column label="操作" width="86" fixed="right" align="center">
<template #default="{ row }">
--
Gitblit v1.7.1