lisang
/
jeepay-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

前端添加 分账已受理状态；

This commit is contained in:
terrfly 2023-03-29 14:08:13 +08:00
parent 24b70acb75
commit c0a90482c0
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -53,3 +53,4 @@ unpackage/
# [package-lock.json。 已放开，请添加到假定未更改文件 ]
# package-lock.json
/.history/

11
jeepay-ui-merchant/src/views/division/record/Detail.vue
View File

@ -14,14 +14,17 @@
<a-col :sm="12"><a-descriptions><a-descriptions-item label="支付接口代码">{{ detailData.ifCode }}</a-descriptions-item></a-descriptions></a-col>
<a-col :sm="12"><a-descriptions><a-descriptions-item label="系统支付订单号">{{ detailData.payOrderId }}</a-descriptions-item></a-descriptions></a-col>
<a-col :sm="12"><a-descriptions><a-descriptions-item label="支付订单渠道支付订单号">{{ detailData.payOrderChannelOrderNo }}</a-descriptions-item></a-descriptions></a-col>
<a-col :sm="12"><a-descriptions><a-descriptions-item label="订单金额">{{ detailData.payOrderAmount / 100}}</a-descriptions-item></a-descriptions></a-col>
<a-col :sm="12"><a-descriptions><a-descriptions-item label="订单金额">{{ detailData.payOrderAmount / 100 }}</a-descriptions-item></a-descriptions></a-col>
<a-col :sm="12"><a-descriptions><a-descriptions-item label="分账基数">{{ detailData.payOrderDivisionAmount / 100 }} （订单金额-手续费-退款金额）</a-descriptions-item></a-descriptions></a-col>
<a-col :sm="12"><a-descriptions><a-descriptions-item label="系统分账批次号">{{ detailData.batchOrderId }}</a-descriptions-item></a-descriptions></a-col>
<a-col :sm="12"><a-descriptions><a-descriptions-item label="上游分账批次号">{{ detailData.channelBatchOrderId }}</a-descriptions-item></a-descriptions></a-col>
<a-col :sm="12"><a-descriptions><a-descriptions-item label="状态">
<a-tag :key="detailData.state" :color="detailData.state === 0?'orange':detailData.state === 1?'blue':detailData.state === 2?'volcano':'volcano'">
{{ detailData.state === 0?'分账中':detailData.state === 1?'分账成功':detailData.state === 2?'分账失败' : '未知' }}
</a-tag>
<a-tag v-if="detailData.state === 0" :key="detailData.state" color="orange">分账中</a-tag>
<a-tag v-if="detailData.state === 1" :key="detailData.state" color="blue">分账成功</a-tag>
<a-tag v-if="detailData.state === 2" :key="detailData.state" color="volcano">分账失败</a-tag>
<a-tag v-if="detailData.state === 3" :key="detailData.state" color="purple">已受理</a-tag>
</a-descriptions-item></a-descriptions></a-col>
<a-col :sm="12"><a-descriptions><a-descriptions-item label="分账接收者ID">{{ detailData.receiverId }}</a-descriptions-item></a-descriptions></a-col>
<a-col :sm="12"><a-descriptions><a-descriptions-item label="收款账号组ID">{{ detailData.receiverGroupId }}</a-descriptions-item></a-descriptions></a-col>

13
jeepay-ui-merchant/src/views/division/record/DivisionRecordPage.vue
View File

@ -26,6 +26,7 @@
<a-select-option value="0">待分账</a-select-option>
<a-select-option value="1">分账成功</a-select-option>
<a-select-option value="2">分账失败</a-select-option>
<a-select-option value="3">已受理</a-select-option>
</a-select>
</a-form-item>
@ -49,12 +50,12 @@
>
<template slot="amountSlot" slot-scope="{record}"><b>￥{{ record.calDivisionAmount/100 }}</b></template> <!-- 自定义插槽 -->
<template slot="stateSlot" slot-scope="{record}">
<a-tag
:key="record.state"
:color="record.state === 0?'orange':record.state === 1?'blue':record.state === 2?'volcano':'volcano'"
>
{{ record.state === 0?'分账中':record.state === 1?'分账成功':record.state === 2?'分账失败' : '未知' }}
</a-tag>
<a-tag v-if="record.state === 0" :key="record.state" color="orange">分账中</a-tag>
<a-tag v-if="record.state === 1" :key="record.state" color="blue">分账成功</a-tag>
<a-tag v-if="record.state === 2" :key="record.state" color="volcano">分账失败</a-tag>
<a-tag v-if="record.state === 3" :key="record.state" color="purple">已受理</a-tag>
</template>
<template slot="opSlot" slot-scope="{record}"> <!-- 操作列插槽 -->
<JeepayTableColumns>