diff --git a/src/views/payment/order/pay/PayOrder.api.ts b/src/views/payment/order/pay/PayOrder.api.ts index aa1ee8fb8..d59602cf1 100644 --- a/src/views/payment/order/pay/PayOrder.api.ts +++ b/src/views/payment/order/pay/PayOrder.api.ts @@ -98,7 +98,7 @@ export function allocationById(id) { */ export interface PayOrder extends BaseEntity { payOrder: any - orderNO: string + orderNo: string payOrderExtra: any payChannelOrder: any // 关联的业务号 diff --git a/src/views/payment/order/pay/PayOrderInfo.vue b/src/views/payment/order/pay/PayOrderInfo.vue index f5ccebb7f..32d8d7a8e 100644 --- a/src/views/payment/order/pay/PayOrderInfo.vue +++ b/src/views/payment/order/pay/PayOrderInfo.vue @@ -3,36 +3,36 @@ title="查看支付单" v-bind="$attrs" :loading="confirmLoading" - :width="modalWidth" + :width="1200" :visible="visible" :mask-closable="showable" @cancel="handleCancel" > - - + + + {{ order.title }} + + {{ order.orderNo }} - + {{ order.businessNo }} - + {{ order.gatewayOrderNo }} - - {{ order.title }} - {{ orderExtra.description }} - - {{ order.amount }} + + {{ order.amount?(order.amount/100).toFixed(2):0 }} - - {{ order.refundableBalance }} + + {{ order.refundableBalance?(order.refundableBalance/100).toFixed(2):0 }} - {{ dictConvert('PayStatus', order.status) }} + {{ dictConvert('PayStatus', order.status) }} {{ order.asyncPay ? '是' : '否' }} @@ -43,12 +43,6 @@ {{ dictConvert('PayChannel', order.asyncChannel) }} - - {{ dictConvert('PayChannel', o.channel) }}: {{ o.amount }} - - - {{ dictConvert('PayChannel', o.channel) }}: {{ o.refundableBalance }} - {{ orderExtra.clientIp }} @@ -67,13 +61,13 @@ {{ orderExtra.sign }} - + {{ orderExtra.attach }} {{ orderExtra.reqTime }} - + {{ order.payTime }} diff --git a/src/views/payment/order/refund/RefundOrder.api.ts b/src/views/payment/order/refund/RefundOrder.api.ts index 2379536b5..abc78cfb7 100644 --- a/src/views/payment/order/refund/RefundOrder.api.ts +++ b/src/views/payment/order/refund/RefundOrder.api.ts @@ -80,6 +80,7 @@ export interface RefundOrder extends BaseEntity { paymentId?: string // 原业务号 businessNo?: string + orderNo:string // 异步方式关联退款请求号 refundNo?: string // 网关订单号 diff --git a/src/views/payment/order/refund/RefundOrderInfo.vue b/src/views/payment/order/refund/RefundOrderInfo.vue index f40f00b0c..391b731a5 100644 --- a/src/views/payment/order/refund/RefundOrderInfo.vue +++ b/src/views/payment/order/refund/RefundOrderInfo.vue @@ -3,33 +3,31 @@ title="退款订单" v-bind="$attrs" :loading="confirmLoading" - :width="750" + :width="1200" :visible="visible" :mask-closable="showable" @cancel="handleCancel" > - - - {{ form.id }} - - + + {{ form.refundNo }} - - {{ form.paymentId }} + + {{ form.reason }} - + {{ form.businessNo }} {{ form.gatewayOrderNo }} - + {{ form.title }} - - {{ form.reason }} + + {{ form.orderNo }} + {{ form.amount }}