From b400da676d69501d695865388486813b0676686a Mon Sep 17 00:00:00 2001 From: dzq Date: Mon, 28 Apr 2025 09:54:46 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=AE=A1=E6=89=B9=E6=A8=A1=E5=9D=97):=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E5=92=8C?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=80=E8=B4=A7=E5=92=8C=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在审批模块中新增了支付方式和审批时间字段，支持微信支付和余额支付两种支付方式。同时，将退货图片和审核图片的展示方式从数组改为逗号分隔的字符串，优化了图片的预览功能。此外，还新增了批量导出订单的功能，并调整了审批详情弹窗的布局。 --- src/api/shop/approval.ts | 43 +++++++++--- src/views/shop/approval/index.vue | 104 ++++++++++++++++++++++-------- 2 files changed, 113 insertions(+), 34 deletions(-) diff --git a/src/api/shop/approval.ts b/src/api/shop/approval.ts index 22c59fa..37c3c48 100644 --- a/src/api/shop/approval.ts +++ b/src/api/shop/approval.ts @@ -5,6 +5,13 @@ export interface SearchReturnApprovalQuery extends BasePageQuery { orderId?: number; goodsId?: number; status?: number; + approvalTime?: string; + /** + * 支付方式 + * @remarks + * wechat-微信支付 | balance-余额支付 + */ + paymentMethod?: string; } /** 退货审批DTO */ @@ -22,10 +29,10 @@ export interface ReturnApprovalDTO { goodsPrice: number; /** 退还金额 */ returnAmount: number; - /** 归还图片路径数组 */ - returnImages: string[]; - /** 审核图片路径数组 */ - auditImages: string[]; + /** 归还图片路径（逗号分隔） */ + returnImages: string; + /** 审核图片路径（逗号分隔） */ + auditImages: string; /** 归还说明 */ returnRemark?: string; /** 审核说明 */ @@ -37,6 +44,17 @@ export interface ReturnApprovalDTO { createTime?: Date; updaterId?: number; updateTime?: Date; + approvalTime?: Date; + goodsName?: string; + coverImg?: string; + mobile?: string; + name?: string; + /** + * 支付方式 + * @remarks + * wechat-微信支付 | balance-余额支付 + */ + paymentMethod?: string; } export interface AddReturnApprovalCommand { @@ -46,8 +64,8 @@ export interface AddReturnApprovalCommand { goodsId: number; /** 归还数量 */ returnQuantity: number; - /** 归还图片路径数组 */ - returnImages: string[]; + /** 归还图片路径（逗号分隔） */ + returnImages: string; /** 归还说明 */ returnRemark?: string; } @@ -57,8 +75,8 @@ export interface UpdateReturnApprovalCommand { approvalId: number; /** 归还数量 */ returnQuantity: number; - /** 审核图片路径数组 */ - auditImages: string[]; + /** 审核图片路径（逗号分隔） */ + auditImages: string; /** 审核说明 */ auditRemark?: string; /** 审批状态(1待审核 2已通过 3已驳回) */ @@ -73,6 +91,15 @@ export const getReturnApprovalListApi = (params?: SearchReturnApprovalQuery) => { params } ); }; +/** 批量导出订单 */ +export const exportOrderExcelApi = (params: SearchReturnApprovalQuery, fileName: string) => { + return http.download("/shop/returnApproval/excel", fileName, { + params: { + ...params, + approvalTime: params?.approvalTime ? params.approvalTime : undefined + } + }); +}; /** 新增退货审批 */ export const addReturnApprovalApi = (data: AddReturnApprovalCommand) => { diff --git a/src/views/shop/approval/index.vue b/src/views/shop/approval/index.vue index ee8e77d..9b6acfe 100644 --- a/src/views/shop/approval/index.vue +++ b/src/views/shop/approval/index.vue @@ -2,7 +2,7 @@ import { ref } from "vue"; import { PureTableBar } from "@/components/RePureTableBar"; import { useRenderIcon } from "@/components/ReIcon/src/hooks"; -import { getReturnApprovalListApi, deleteReturnApprovalApi, ReturnApprovalDTO } from "@/api/shop/approval"; +import { getReturnApprovalListApi, deleteReturnApprovalApi, ReturnApprovalDTO, SearchReturnApprovalQuery } from "@/api/shop/approval"; import Delete from "@iconify-icons/ep/delete"; import Search from "@iconify-icons/ep/search"; import Refresh from "@iconify-icons/ep/refresh"; @@ -17,11 +17,13 @@ const formRef = ref(); const tableRef = ref(); // 搜索表单 -const searchFormParams = ref({ +const searchFormParams = ref({ approvalId: null, orderId: null, goodsId: null, - status: null + status: null, + approvalTime: null, + paymentMethod: null }); // 分页参数 @@ -48,7 +50,8 @@ const getList = async () => { }); dataList.value = data.rows.map(item => ({ ...item, - statusStr: { 1: '待审核', 2: '已通过', 3: '已驳回' }[item.status] + statusStr: { 1: '待审核', 2: '已通过', 3: '已驳回' }[item.status], + auditImages: item.status === 2 ? item.auditImages : '' })); pagination.value.total = data.total; } finally { @@ -104,6 +107,10 @@ getList();
+ + + @@ -120,6 +127,12 @@ getList(); + + + + + + 搜索 @@ -139,31 +152,71 @@ getList(); - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -175,22 +228,21 @@ getList(); - -
- -
- - -
- -
- {{ currentDetail?.returnRemark || '无' }} {{ currentDetail?.auditRemark || '无' }} + +
+ +
+ + +
+ +
+