Skip to content

Commit 876bf8d

Browse files
YunaiVYunaiV
committed
feat：【PAY 支付】转账单，支持导出功能
1 parent 048ecd7 commit 876bf8d

File tree

5 files changed

+93
-52
lines changed

5 files changed

+93
-52
lines changed

‎src/api/pay/transfer/index.ts

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,16 @@
11
import request from '@/config/axios'
22

3-
// TODO @芋艿：调整字段
4-
export interface TransferVO {
5-
appId: number
6-
channelCode: string
7-
merchantTransferId: string
8-
type: number
9-
price: number
10-
subject: string
11-
userName: string
12-
alipayLogonId: string
13-
openid: string
14-
}
15-
163
// 查询转账单列表
174
export const getTransferPage = async (params: PageParam) => {
185
return await request.get({ url: `/pay/transfer/page`, params })
196
}
207

8+
// 查询转账单详情
219
export const getTransfer = async (id: number) => {
2210
return await request.get({ url: '/pay/transfer/get?id=' + id })
2311
}
12+
13+
// 导出转账单
14+
export const exportTransfer = async (params: PageParam) => {
15+
return await request.download({ url: '/pay/transfer/export-excel', params })
16+
}

‎src/views/pay/notify/NotifyDetail.vue

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
<template>
22
<Dialog v-model="dialogVisible" title="通知详情" width="50%">
33
<el-descriptions :column="2">
4-
<el-descriptions-item label="商户订单编号">
4+
<el-descriptions-item label="通知状态" :span="2">
5+
<dict-tag :type="DICT_TYPE.PAY_NOTIFY_STATUS" :value="detailData.status" />
6+
</el-descriptions-item>
7+
<el-descriptions-item label="商户订单编号" :span="2">
58
<el-tag>{{ detailData.merchantOrderId }}</el-tag>
69
</el-descriptions-item>
7-
<el-descriptions-item label="通知状态">
8-
<dict-tag :type="DICT_TYPE.PAY_NOTIFY_STATUS" :value="detailData.status" />
10+
<el-descriptions-item label="商户退款编号" :span="2" v-if="detailData.merchantRefundId">
11+
<el-tag>{{ detailData.merchantRefundId }}</el-tag>
12+
</el-descriptions-item>
13+
<el-descriptions-item label="商户转账编号" :span="2" v-if="detailData.merchantTransferId">
14+
<el-tag>{{ detailData.merchantTransferId }}</el-tag>
915
</el-descriptions-item>
1016

1117
<el-descriptions-item label="应用编号">{{ detailData.appId }}</el-descriptions-item>

‎src/views/pay/notify/index.vue

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,24 @@
6969
class="!w-240px"
7070
/>
7171
</el-form-item>
72+
<el-form-item label="商户退款编号" prop="merchantRefundId">
73+
<el-input
74+
v-model="queryParams.merchantRefundId"
75+
placeholder="请输入商户退款编号"
76+
clearable
77+
@keyup.enter="handleQuery"
78+
class="!w-240px"
79+
/>
80+
</el-form-item>
81+
<el-form-item label="商户转账编号" prop="merchantTransferId">
82+
<el-input
83+
v-model="queryParams.merchantTransferId"
84+
placeholder="请输入商户转账编号"
85+
clearable
86+
@keyup.enter="handleQuery"
87+
class="!w-240px"
88+
/>
89+
</el-form-item>
7290
<el-form-item label="创建时间" prop="createTime">
7391
<el-date-picker
7492
v-model="queryParams.createTime"
@@ -94,7 +112,19 @@
94112
<el-table v-loading="loading" :data="list">
95113
<el-table-column label="任务编号" align="center" prop="id" />
96114
<el-table-column label="应用编号" align="center" prop="appName" />
97-
<el-table-column label="商户订单编号" align="center" prop="merchantOrderId" />
115+
<el-table-column label="商户单信息" align="center" prop="merchant">
116+
<template #default="scope">
117+
<div v-if="scope.row.merchantOrderId">
118+
<div>商户订单编号：{{ scope.row.merchantOrderId }}</div>
119+
</div>
120+
<div v-if="scope.row.merchantRefundId">
121+
<div>商户退款编号：{{ scope.row.merchantRefundId }}</div>
122+
</div>
123+
<div v-if="scope.row.merchantTransferId">
124+
<div>商户转账编号：{{ scope.row.merchantTransferId }}</div>
125+
</div>
126+
</template>
127+
</el-table-column>
98128
<el-table-column label="通知类型" align="center" prop="type">
99129
<template #default="scope">
100130
<dict-tag :type="DICT_TYPE.PAY_NOTIFY_TYPE" :value="scope.row.type" />
@@ -173,16 +203,12 @@ const queryParams = ref({
173203
dataId: null,
174204
status: null,
175205
merchantOrderId: null,
206+
merchantRefundId: null,
207+
merchantTransferId: null,
176208
createTime: []
177209
})
178210
const queryFormRef = ref() // 搜索的表单
179211
const appList = ref([]) // 支付应用列表集合
180-
// 是否显示弹出层
181-
const open = ref(false)
182-
// 通知详情
183-
const notifyDetail = ref<any>({
184-
logs: []
185-
})
186212
187213
/** 搜索按钮操作 */
188214
const handleQuery = () => {

‎src/views/pay/transfer/TransferDetail.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,7 @@
2525
<el-divider />
2626
<el-descriptions :column="2" label-class-name="desc-label">
2727
<el-descriptions-item label="收款人姓名">{{ detailData.userName }}</el-descriptions-item>
28-
<el-descriptions-item label="支付宝登录账号" v-if="detailData.type === 1">
29-
{{ detailData.alipayLogonId }}
30-
</el-descriptions-item>
31-
<el-descriptions-item label="微信 openid" v-if="detailData.type === 2">
32-
{{ detailData.openid }}
33-
</el-descriptions-item>
28+
<el-descriptions-item label="收款人账号">{{ detailData.userAccount }}</el-descriptions-item>
3429
<el-descriptions-item label="支付渠道">
3530
<dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE" :value="detailData.channelCode" />
3631
</el-descriptions-item>
@@ -45,7 +40,9 @@
4540
<el-divider />
4641
<el-descriptions :column="1" label-class-name="desc-label" direction="vertical" border>
4742
<el-descriptions-item label="转账渠道通知内容">
48-
<el-text>{{ detailData.channelNotifyData }}</el-text>
43+
<el-text style="white-space: pre-wrap; word-break: break-word">
44+
{{ detailData.channelNotifyData }}
45+
</el-text>
4946
</el-descriptions-item>
5047
</el-descriptions>
5148
<el-divider />
@@ -59,10 +56,13 @@
5956
import { DICT_TYPE } from '@/utils/dict'
6057
import * as TransferApi from '@/api/pay/transfer'
6158
import { formatDate } from '@/utils/formatTime'
59+
6260
defineOptions({ name: 'PayTransferDetail' })
61+
6362
const dialogVisible = ref(false) // 弹窗的是否展示
6463
const detailLoading = ref(false) // 表单的加载中
6564
const detailData = ref({})
65+
6666
/** 打开弹窗 */
6767
const open = async (id: number) => {
6868
dialogVisible.value = true

‎src/views/pay/transfer/index.vue

Lines changed: 38 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
/>
6767
</el-select>
6868
</el-form-item>
69-
7069
<el-form-item label="收款人姓名" prop="userName">
7170
<el-input
7271
v-model="queryParams.userName"
@@ -76,6 +75,15 @@
7675
class="!w-240px"
7776
/>
7877
</el-form-item>
78+
<el-form-item label="收款人账号" prop="accountNo">
79+
<el-input
80+
v-model="queryParams.accountNo"
81+
placeholder="请输入收款人账号"
82+
clearable
83+
@keyup.enter="handleQuery"
84+
class="!w-240px"
85+
/>
86+
</el-form-item>
7987
<el-form-item label="渠道单号" prop="channelTransferNo">
8088
<el-input
8189
v-model="queryParams.channelTransferNo"
@@ -99,6 +107,15 @@
99107
<el-form-item>
100108
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
101109
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
110+
<el-button
111+
type="success"
112+
plain
113+
@click="handleExport"
114+
:loading="exportLoading"
115+
v-hasPermi="['pay:transfer:export']"
116+
>
117+
<Icon icon="ep:download" class="mr-5px" /> 导出
118+
</el-button>
102119
</el-form-item>
103120
</el-form>
104121
</ContentWrap>
@@ -114,12 +131,7 @@
114131
:formatter="dateFormatter"
115132
width="180px"
116133
/>
117-
<el-table-column label="应用编号" align="center" prop="appId" />
118-
<el-table-column label="类型" align="center" prop="type" width="120">
119-
<template #default="scope">
120-
<dict-tag :type="DICT_TYPE.PAY_TRANSFER_TYPE" :value="scope.row.type" />
121-
</template>
122-
</el-table-column>
134+
<el-table-column label="支付应用" align="center" prop="appName" min-width="100" />
123135
<el-table-column label="转账金额" align="center" prop="price">
124136
<template #default="scope">
125137
<span>￥{{ (scope.row.price / 100.0).toFixed(2) }}</span>
@@ -147,18 +159,7 @@
147159
</template>
148160
</el-table-column>
149161
<el-table-column label="收款人姓名" align="center" prop="userName" width="120" />
150-
<el-table-column label="收款账号" align="left" width="200">
151-
<template #default="scope">
152-
<p class="transfer-font" v-if="scope.row.alipayLogonId">
153-
<el-tag size="small">支付宝登录号</el-tag>
154-
{{ scope.row.alipayLogonId }}
155-
</p>
156-
<p class="transfer-font" v-if="scope.row.openid">
157-
<el-tag size="small">微信 openId</el-tag>
158-
{{ scope.row.openid }}
159-
</p>
160-
</template>
161-
</el-table-column>
162+
<el-table-column label="收款账号" align="left" prop="userAccount" width="200" />
162163
<el-table-column label="转账标题" align="center" prop="subject" width="120" />
163164
<el-table-column label="转账渠道" align="center" prop="channelCode">
164165
<template #default="scope">
@@ -194,10 +195,11 @@ import { dateFormatter } from '@/utils/formatTime'
194195
import * as TransferApi from '@/api/pay/transfer'
195196
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
196197
import TransferDetail from './TransferDetail.vue'
198+
import download from '@/utils/download'
199+
197200
defineOptions({ name: 'PayTransfer' })
198201
199202
const message = useMessage() // 消息弹窗
200-
const { t } = useI18n() // 国际化
201203
202204
const loading = ref(true) // 列表的加载中
203205
const total = ref(0) // 列表的总页数
@@ -216,8 +218,7 @@ const queryParams = reactive({
216218
price: null,
217219
subject: null,
218220
userName: null,
219-
alipayLogonId: null,
220-
openid: null,
221+
userAccount: null,
221222
createTime: []
222223
})
223224
const queryFormRef = ref() // 搜索的表单
@@ -247,6 +248,21 @@ const resetQuery = () => {
247248
handleQuery()
248249
}
249250
251+
/** 导出按钮操作 */
252+
const handleExport = async () => {
253+
try {
254+
// 导出的二次确认
255+
await message.exportConfirm()
256+
// 发起导出
257+
exportLoading.value = true
258+
const data = await TransferApi.exportTransfer(queryParams)
259+
download.excel(data, '转账单.xls')
260+
} catch {
261+
} finally {
262+
exportLoading.value = false
263+
}
264+
}
265+
250266
/** 添加/修改操作 */
251267
const detailRef = ref()
252268
const openDetail = (id: number) => {

0 commit comments

Comments
 (0)