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

修复：1-应用配置单选回显问题 2-退款订单查询条件不生效问题

This commit is contained in:
xiaoyu 2021-07-23 17:52:04 +08:00
parent 28fada2229
commit e019d0a5b4
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jeepay-ui-manager/src/views/mchApp/MchPayConfigAddOrEdit.vue
View File

@ -149,8 +149,11 @@ export default {
const valueItems = item.values.split(',')
const titleItems = item.titles.split(',')
for (const i in valueItems) {
// 检查参数是否为数字类型 然后赋值给radio值
let radioVal = valueItems[i]
if (!isNaN((radioVal))) { radioVal = Number(radioVal) }
radioItems.push({
value: valueItems[i],
value: radioVal,
title: titleItems[i]
})
}

5
jeepay-ui-merchant/src/views/mchApp/MchPayConfigAddOrEdit.vue
View File

@ -149,8 +149,11 @@ export default {
const valueItems = item.values.split(',')
const titleItems = item.titles.split(',')
for (const i in valueItems) {
// 检查参数是否为数字类型 然后赋值给radio值
let radioVal = valueItems[i]
if (!isNaN((radioVal))) { radioVal = Number(radioVal) }
radioItems.push({
value: valueItems[i],
value: radioVal,
title: titleItems[i]
})
}

16
jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue
View File

@ -15,9 +15,9 @@
</a-range-picker>
</a-form-item>
<jeepay-text-up :placeholder="'退款订单号'" :msg="searchData.refundOrderId" v-model="searchData.refundOrderId" />
<jeepay-text-up :placeholder="'商户退款单号'" :msg="searchData.mchRefundNo" v-model="searchData.mchRefundNo" />
<jeepay-text-up :placeholder="'支付订单号'" :msg="searchData.payOrderId" v-model="searchData.payOrderId" />
<jeepay-text-up :placeholder="'渠道支付订单号'" :msg="searchData.channelPayOrderNo" v-model="searchData.channelPayOrderNo" />
<jeepay-text-up :placeholder="'服务商号'" :msg="searchData.isvNo" v-model="searchData.isvNo" />
<jeepay-text-up :placeholder="'渠道订单号'" :msg="searchData.channelPayOrderNo" v-model="searchData.channelPayOrderNo" />
<jeepay-text-up :placeholder="'应用AppId'" :msg="searchData.appId" v-model="searchData.appId"/>
<a-form-item label="" class="table-head-layout">
<a-select v-model="searchData.state" placeholder="退款状态" default-value="">
@ -28,13 +28,6 @@
<a-select-option value="3">退款失败</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="" class="table-head-layout">
<a-select v-model="searchData.mchType" placeholder="商户类型" default-value="">
<a-select-option value="">全部</a-select-option>
<a-select-option value="1">普通商户</a-select-option>
<a-select-option value="2">特约商户</a-select-option>
</a-select>
</a-form-item>
<span class="table-page-search-submitButtons">
<a-button type="primary" icon="search" @click="queryFunc" :loading="btnLoading">搜索</a-button>
@ -50,6 +43,7 @@
ref="infoTable"
:initData="true"
:closable="true"
:searchData="searchData"
:reqTableDataFunc="reqTableDataFunc"
:tableColumns="tableColumns"
rowKey="refundOrderId"
@ -296,9 +290,9 @@
{ key: 'payAmount', title: '支付金额', scopedSlots: { customRender: 'payAmountSlot' } },
{ key: 'refundAmount', title: '退款金额', scopedSlots: { customRender: 'refundAmountSlot' } },
{ key: 'refundOrderId', title: '退款订单号', dataIndex: 'refundOrderId' },
{ key: 'channelPayOrderNo', title: '渠道订单号', dataIndex: 'channelPayOrderNo' },
{ key: 'payOrderId', title: '支付订单号', dataIndex: 'payOrderId' },
{ key: 'mchRefundNo', title: '商户退款单号', dataIndex: 'mchRefundNo' },
{ key: 'payOrderId', title: '支付订单号', dataIndex: 'payOrderId' },
{ key: 'channelPayOrderNo', title: '渠道订单号', dataIndex: 'channelPayOrderNo' },
{ key: 'state', title: '支付状态', scopedSlots: { customRender: 'stateSlot' } },
{ key: 'createdAt', dataIndex: 'createdAt', title: '创建日期' },
{ key: 'op', title: '操作', width: '100px', fixed: 'right', align: 'center', scopedSlots: { customRender: 'opSlot' } }