From 5e5f2a5fb304117a2c6db618633d8129e4eb3d55 Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Thu, 27 Nov 2025 17:28:42 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=80=9F=E8=BF=98=E8=AE=B0=E5=BD=95):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BD=92=E8=BF=98=E6=97=B6=E9=97=B4=E5=92=8C?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E5=B9=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=A1=A8=E6=A0=BC=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在借还记录DTO中新增returnTime和auditTime字段，并在前端表格中新增对应的列显示。同时移除商品数量列的显示以优化界面布局。
---
 src/api/shop/order.ts                         |  4 ++++
 src/views/shop/goods/borrow-return-record.vue | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/api/shop/order.ts b/src/api/shop/order.ts
index d175e60..a475bd4 100644
--- a/src/api/shop/order.ts
+++ b/src/api/shop/order.ts
@@ -158,6 +158,10 @@ export interface BorrowReturnRecordDTO {
   approvalId?: number;
   /** 订单创建时间 */
   orderTime?: Date;
+  /** 归还时间 */
+  returnTime?: Date;
+  /** 审批时间 */
+  auditTime?: Date;
   /** 归还图片 */
   returnImages?: string;
   /** 审核图片 */
diff --git a/src/views/shop/goods/borrow-return-record.vue b/src/views/shop/goods/borrow-return-record.vue
index 79d6131..53ee858 100644
--- a/src/views/shop/goods/borrow-return-record.vue
+++ b/src/views/shop/goods/borrow-return-record.vue
@@ -113,7 +113,7 @@ onMounted(() => {
         <el-table-column label="商品价格" prop="goodsPrice" width="120">
           <template #default="{ row }">{{ row.goodsPrice }}元</template>
         </el-table-column>
-        <el-table-column label="商品数量" prop="quantity" width="100" />
+        <!-- <el-table-column label="商品数量" prop="quantity" width="100" /> -->
         <el-table-column label="订单姓名" prop="orderName" width="120" />
         <el-table-column label="订单手机号" prop="orderMobile" width="120" />
         <el-table-column label="支付方式" prop="paymentMethod" width="120">
@@ -128,7 +128,11 @@ onMounted(() => {
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="审批人" prop="auditName" width="120" />
+        <el-table-column label="归还时间" prop="returnTime" width="180">
+          <template #default="{ row }">
+            {{ row.returnTime ? new Date(row.returnTime).toLocaleString() : '-' }}
+          </template>
+        </el-table-column>
         <el-table-column label="归还图片" prop="returnImages" width="120">
           <template #default="{ row }">
             <div v-if="row.returnImages" class="flex gap-2">
@@ -139,6 +143,12 @@ onMounted(() => {
             <span v-else>-</span>
           </template>
         </el-table-column>
+        <el-table-column label="审批人" prop="auditName" width="120" />
+        <el-table-column label="审批时间" prop="auditTime" width="180">
+          <template #default="{ row }">
+            {{ row.auditTime ? new Date(row.auditTime).toLocaleString() : '-' }}
+          </template>
+        </el-table-column>
         <el-table-column label="审核图片" prop="auditImages" width="120">
           <template #default="{ row }">
             <div v-if="row.auditImages" class="flex gap-2">