diff --git a/src/views/payment/order/refund/RefundRecordList.vue b/src/views/payment/order/refund/RefundRecordList.vue index d39a9f624..9f178756b 100644 --- a/src/views/payment/order/refund/RefundRecordList.vue +++ b/src/views/payment/order/refund/RefundRecordList.vue @@ -138,8 +138,12 @@ refundRecordInfo.init(record.id) } + /** + * 查看支付单信息 + * @param paymentId + */ function showPayment(paymentId) { - payOrderInfo.init(paymentId, 'show') + payOrderInfo.init(paymentId) } diff --git a/src/views/payment/record/callback/PayCallbackRecordList.vue b/src/views/payment/record/callback/PayCallbackRecordList.vue index 6d67691bf..77902757a 100644 --- a/src/views/payment/record/callback/PayCallbackRecordList.vue +++ b/src/views/payment/record/callback/PayCallbackRecordList.vue @@ -7,7 +7,13 @@ - + + + @@ -53,6 +59,7 @@ import { useDict } from '/@/hooks/bootx/useDict' import PayCallbackRecordInfo from './PayCallbackRecordInfo.vue' import { LabeledValue } from 'ant-design-vue/lib/select' + import PayOrderInfo from "/@/views/payment/order/pay/PayOrderInfo.vue"; // 使用hooks const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage) @@ -86,6 +93,7 @@ const xTable = $ref() const xToolbar = $ref() const payCallbackRecordInfo = $ref() + const payOrderInfo = $ref() onMounted(() => { initData() @@ -123,6 +131,14 @@ function show(record) { payCallbackRecordInfo.init(record.id) } + + /** + * 查看支付单信息 + * @param paymentId + */ + function showPayment(paymentId) { + payOrderInfo.init(paymentId) + } diff --git a/src/views/payment/record/close/PayCloseRecordList.vue b/src/views/payment/record/close/PayCloseRecordList.vue index 49b7e436a..d9ef5da96 100644 --- a/src/views/payment/record/close/PayCloseRecordList.vue +++ b/src/views/payment/record/close/PayCloseRecordList.vue @@ -7,14 +7,25 @@ - - + + + + + + + @@ -36,6 +47,7 @@ /> + @@ -51,6 +63,7 @@ import { useDict } from '/@/hooks/bootx/useDict' import { LabeledValue } from 'ant-design-vue/lib/select' import PayCloseRecordInfo from './PayCloseRecordInfo.vue' + import PayOrderInfo from "/@/views/payment/order/pay/PayOrderInfo.vue"; // 使用hooks const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage) @@ -87,6 +100,7 @@ const xTable = $ref() const xToolbar = $ref() const payCloseRecordInfo = $ref() + const payOrderInfo = $ref() onMounted(() => { init() @@ -123,6 +137,14 @@ function show(record) { payCloseRecordInfo.init(record.id) } + + /** + * 查看支付单信息 + * @param paymentId + */ + function showPayment(paymentId) { + payOrderInfo.init(paymentId) + } diff --git a/src/views/payment/record/repair/PayRepairRecordList.vue b/src/views/payment/record/repair/PayRepairRecordList.vue index 120c6bccf..c49de5cce 100644 --- a/src/views/payment/record/repair/PayRepairRecordList.vue +++ b/src/views/payment/record/repair/PayRepairRecordList.vue @@ -7,7 +7,13 @@ - + + + @@ -68,6 +75,7 @@ import { useDict } from '/@/hooks/bootx/useDict' import { LabeledValue } from 'ant-design-vue/lib/select' import PayRepairRecordInfo from './PayRepairRecordInfo.vue' + import PayOrderInfo from "/@/views/payment/order/pay/PayOrderInfo.vue"; // 使用hooks const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage) @@ -76,6 +84,7 @@ let repairSourceList = $ref([]) let repairTypeList = $ref([]) + let asyncChannelList = $ref([]) // 查询条件 const fields = computed(() => { @@ -96,12 +105,20 @@ placeholder: '请选择修复类型', selectList: repairTypeList, }, + { + field: 'asyncChannel', + type: LIST, + name: '修复通道', + placeholder: '请选择修复通道', + selectList: asyncChannelList, + }, ] as QueryField[] }) const xTable = $ref() const xToolbar = $ref() const payRepairRecordInfo = $ref() + const payOrderInfo = $ref() onMounted(() => { init() @@ -118,6 +135,7 @@ async function init() { repairSourceList = await dictDropDown('PayRepairSource') repairTypeList = await dictDropDown('PayRepairType') + asyncChannelList = await dictDropDown('AsyncPayChannel') } /** @@ -139,6 +157,14 @@ function show(record) { payRepairRecordInfo.init(record.id) } + + /** + * 查看支付单信息 + * @param paymentId + */ + function showPayment(paymentId) { + payOrderInfo.init(paymentId) + } diff --git a/src/views/payment/record/sync/PaySyncRecordList.vue b/src/views/payment/record/sync/PaySyncRecordList.vue index 369ee7aac..22dd6e541 100644 --- a/src/views/payment/record/sync/PaySyncRecordList.vue +++ b/src/views/payment/record/sync/PaySyncRecordList.vue @@ -7,24 +7,37 @@ - + + + - + - + + + + @@ -44,7 +57,9 @@ @page-change="handleTableChange" /> - + + + @@ -60,6 +75,8 @@ import { useDict } from '/@/hooks/bootx/useDict' import { LabeledValue } from 'ant-design-vue/lib/select' import PaySyncRecordInfo from './PaySyncRecordInfo.vue' + import PayOrderInfo from '/@/views/payment/order/pay/PayOrderInfo.vue' + import PayRepairRecordInfo from '/@/views/payment/record/repair/PayRepairRecordInfo.vue' // 使用hooks const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage) @@ -75,10 +92,10 @@ { field: 'paymentId', type: STRING, name: '支付单号', placeholder: '请输入支付单号' }, { field: 'businessNo', type: STRING, name: '业务号', placeholder: '请输入业务号' }, { - field: 'status', + field: 'gatewayStatus', type: LIST, - name: '同步状态', - placeholder: '请选择同步状态', + name: '同步结果', + placeholder: '请选择同步结果', selectList: syncStatusList, }, { @@ -94,6 +111,8 @@ const xTable = $ref() const xToolbar = $ref() const paySyncRecordInfo = $ref() + const payOrderInfo = $ref() + const payRepairRecordInfo = $ref() onMounted(() => { init() @@ -131,6 +150,20 @@ function show(record) { paySyncRecordInfo.init(record.id) } + + /** + * 查看支付单信息 + * @param paymentId + */ + function showPayment(paymentId) { + payOrderInfo.init(paymentId) + } + /** + * 查看支付单信息 + */ + function showRepairInfo(repairId) { + payRepairRecordInfo.init(repairId) + }