admin123
/
shop-front-end
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(借还记录): 添加归还时间和审批时间字段并更新表格显示 

在借还记录DTO中新增returnTime和auditTime字段，并在前端表格中新增对应的列显示。同时移除商品数量列的显示以优化界面布局。
This commit is contained in:
dzq 2025-11-27 17:28:42 +08:00
parent 44d315a953
commit 5e5f2a5fb3
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/shop/order.ts
View File

@ -158,6 +158,10 @@ export interface BorrowReturnRecordDTO {
approvalId?: number; approvalId?: number;
/** 订单创建时间 */ /** 订单创建时间 */
orderTime?: Date; orderTime?: Date;
/** 归还时间 */
returnTime?: Date;
/** 审批时间 */
auditTime?: Date;
/** 归还图片 */ /** 归还图片 */
returnImages?: string; returnImages?: string;
/** 审核图片 */ /** 审核图片 */

14
src/views/shop/goods/borrow-return-record.vue
View File

@ -113,7 +113,7 @@ onMounted(() => {
<el-table-column label="商品价格" prop="goodsPrice" width="120"> <el-table-column label="商品价格" prop="goodsPrice" width="120">
<template #default="{ row }">{{ row.goodsPrice }}元</template> <template #default="{ row }">{{ row.goodsPrice }}元</template>
</el-table-column> </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="orderName" width="120" />
<el-table-column label="订单手机号" prop="orderMobile" width="120" /> <el-table-column label="订单手机号" prop="orderMobile" width="120" />
<el-table-column label="支付方式" prop="paymentMethod" width="120"> <el-table-column label="支付方式" prop="paymentMethod" width="120">
@ -128,7 +128,11 @@ onMounted(() => {
</el-tag> </el-tag>
</template> </template>
</el-table-column> </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"> <el-table-column label="归还图片" prop="returnImages" width="120">
<template #default="{ row }"> <template #default="{ row }">
<div v-if="row.returnImages" class="flex gap-2"> <div v-if="row.returnImages" class="flex gap-2">
@ -139,6 +143,12 @@ onMounted(() => {
<span v-else>-</span> <span v-else>-</span>
</template> </template>
</el-table-column> </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"> <el-table-column label="审核图片" prop="auditImages" width="120">
<template #default="{ row }"> <template #default="{ row }">
<div v-if="row.auditImages" class="flex gap-2"> <div v-if="row.auditImages" class="flex gap-2">