From 8e727006dcd5f7de5b42c82ea334b4f14b9398e7 Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Tue, 14 May 2024 17:48:32 +0800
Subject: [PATCH] =?UTF-8?q?style=20=E5=88=86=E8=B4=A6=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/AllocationGroupConfig.vue           |  2 +-
 .../group/AllocationGroupSelect.vue           |  4 +-
 .../allocation/order/AllocationOrder.api.ts   | 20 +++---
 .../order/AllocationOrderDetailInfo.vue       |  6 +-
 .../order/AllocationOrderDetailList.vue       |  4 +-
 .../allocation/order/AllocationOrderInfo.vue  | 67 +++++++++++--------
 .../allocation/order/AllocationOrderList.vue  |  6 +-
 .../receiver/AllocationReceiverList.vue       |  4 +-
 8 files changed, 60 insertions(+), 53 deletions(-)

diff --git a/src/views/payment/allocation/group/AllocationGroupConfig.vue b/src/views/payment/allocation/group/AllocationGroupConfig.vue
index c3116b79b..7f90cb6e9 100644
--- a/src/views/payment/allocation/group/AllocationGroupConfig.vue
+++ b/src/views/payment/allocation/group/AllocationGroupConfig.vue
@@ -21,7 +21,7 @@
       <vxe-column field="name" title="账号别名" :min-width="100" />
       <vxe-column field="receiverType" title="接收方类型" :min-width="100">
         <template #default="{ row }">
-          <a-tag>{{ dictConvert('AllocationReceiverType', row.receiverType) }}</a-tag>
+          <a-tag>{{ dictConvert('AllocReceiverType', row.receiverType) }}</a-tag>
         </template>
       </vxe-column>
       <vxe-column field="receiverAccount" title="接收方账号" :min-width="220" />
diff --git a/src/views/payment/allocation/group/AllocationGroupSelect.vue b/src/views/payment/allocation/group/AllocationGroupSelect.vue
index 50bb1744d..22c1f32d6 100644
--- a/src/views/payment/allocation/group/AllocationGroupSelect.vue
+++ b/src/views/payment/allocation/group/AllocationGroupSelect.vue
@@ -18,14 +18,14 @@
       <vxe-column field="name" title="账号别名" :min-width="100"/>
       <vxe-column field="receiverType" title="分账接收方类型" :min-width="100">
         <template #default="{ row }">
-          <a-tag>{{ dictConvert('AllocationReceiverType', row.receiverType) }}</a-tag>
+          <a-tag>{{ dictConvert('AllocReceiverType', row.receiverType) }}</a-tag>
         </template>
       </vxe-column>
       <vxe-column field="receiverAccount" title="接收方账号" :min-width="160" />
       <vxe-column field="receiverName" title="接收方姓名" :min-width="100" />
       <vxe-column field="relationType" title="分账关系" :min-width="100">
         <template #default="{ row }">
-          <a-tag>{{ dictConvert('AllocationRelationType', row.relationType) }}</a-tag>
+          <a-tag>{{ dictConvert('AllocRelationType', row.relationType) }}</a-tag>
         </template>
       </vxe-column>
     </vxe-table>
diff --git a/src/views/payment/allocation/order/AllocationOrder.api.ts b/src/views/payment/allocation/order/AllocationOrder.api.ts
index ed1f1f8b7..a8e2c78d3 100644
--- a/src/views/payment/allocation/order/AllocationOrder.api.ts
+++ b/src/views/payment/allocation/order/AllocationOrder.api.ts
@@ -86,6 +86,12 @@ export function sync(allocationNo){
  * 分账订单
  */
 export interface AllocationOrder extends BaseEntity {
+  // 分账单号
+  allocationNo?: string
+  // 商户分账单号
+  bizAllocationNo?: string
+  // 通道分账号
+  outAllocationNo?: string
   // 支付订单ID
   orderId?: string
   // 支付订单号
@@ -94,18 +100,8 @@ export interface AllocationOrder extends BaseEntity {
   bizOrderNo?: string
   // 外部系统支付订单号
   outOrderNo?: string
-  // 支付订单号
+  // 支付订单标题
   title?: string
-  // 网关支付订单号
-  gatewayPayOrderNo?: string
-  // 通道分账号
-  outAllocationNo?: string
-  // 分账单号
-  allocationNo?: string
-  // 商户分账单号
-  bizAllocationNo?: string
-  // 外部请求号
-  outReqNo?: string
   // 所属通道
   channel?: string
   // 总分账金额
@@ -114,6 +110,8 @@ export interface AllocationOrder extends BaseEntity {
   description?: string
   // 状态
   status?: string
+  // 处理结果
+  result?: string
   // 错误码
   errorCode?: string
   // 错误原因
diff --git a/src/views/payment/allocation/order/AllocationOrderDetailInfo.vue b/src/views/payment/allocation/order/AllocationOrderDetailInfo.vue
index 588ec750f..cc988ccf5 100644
--- a/src/views/payment/allocation/order/AllocationOrderDetailInfo.vue
+++ b/src/views/payment/allocation/order/AllocationOrderDetailInfo.vue
@@ -3,7 +3,7 @@
     title="查看分账单信息"
     v-bind="$attrs"
     :loading="confirmLoading"
-    :width="800"
+    :width="1000"
     :visible="visible"
     :mask-closable="showable"
     @cancel="handleCancel"
@@ -14,12 +14,12 @@
           {{ order.receiverName }}
         </a-descriptions-item>
         <a-descriptions-item label="分账接收方类型">
-          <a-tag>{{ dictConvert('AllocationReceiverType', order.receiverType) }}</a-tag>
+          <a-tag>{{ dictConvert('AllocReceiverType', order.receiverType) }}</a-tag>
         </a-descriptions-item>
         <a-descriptions-item label="分账比例"> {{ order.rate / 100.0 }}% </a-descriptions-item>
         <a-descriptions-item label="分账金额(元)"> {{ order.amount ? (order.amount / 100).toFixed(2) : 0 }} </a-descriptions-item>
         <a-descriptions-item label="分账结果">
-          <a-tag>{{ dictConvert('AllocationDetailResult', order.result) }}</a-tag>
+          <a-tag>{{ dictConvert('AllocDetailResult', order.result) }}</a-tag>
         </a-descriptions-item>
         <a-descriptions-item label="完成时间">
           {{ order.finishTime }}
diff --git a/src/views/payment/allocation/order/AllocationOrderDetailList.vue b/src/views/payment/allocation/order/AllocationOrderDetailList.vue
index 543456a16..63895f4cf 100644
--- a/src/views/payment/allocation/order/AllocationOrderDetailList.vue
+++ b/src/views/payment/allocation/order/AllocationOrderDetailList.vue
@@ -6,7 +6,7 @@
       <vxe-column field="receiverName" title="接收方姓名" :min-width="100" />
       <vxe-column field="receiverType" title="接收方类型" :min-width="100">
         <template #default="{ row }">
-          {{ dictConvert('AllocationReceiverType', row.receiverType) }}
+          {{ dictConvert('AllocReceiverType', row.receiverType) }}
         </template>
       </vxe-column>
       <vxe-column field="rate" title="分账比例" :min-width="100">
@@ -16,7 +16,7 @@
         <template #default="{ row }"> {{ row.amount / 100.0 }} 元 </template>
       </vxe-column>
       <vxe-column field="result" title="分账结果" :min-width="130">
-        <template #default="{ row }"> {{ dictConvert('AllocationDetailResult', row.result) }} </template>
+        <template #default="{ row }"> {{ dictConvert('AllocDetailResult', row.result) }} </template>
       </vxe-column>
       <vxe-column field="result" title="错误原因" :min-width="160">
         <template #default="{ row }"> {{ row.errorMsg }} </template>
diff --git a/src/views/payment/allocation/order/AllocationOrderInfo.vue b/src/views/payment/allocation/order/AllocationOrderInfo.vue
index 4f26c7aa7..60130959e 100644
--- a/src/views/payment/allocation/order/AllocationOrderInfo.vue
+++ b/src/views/payment/allocation/order/AllocationOrderInfo.vue
@@ -9,45 +9,54 @@
     @cancel="handleCancel"
   >
     <a-spin :spinning="confirmLoading">
-      <a-descriptions title="" bordered   >
-        <a-descriptions-item label="支付订单标题" :span="3">
+      <a-descriptions title="" bordered>
+        <a-descriptions-item label="支付订单标题" :span="2">
           {{ order.title }}
         </a-descriptions-item>
-        <a-descriptions-item label="分账订单号" :span="1">
-          {{ order.orderNo }}
-        </a-descriptions-item>
-        <a-descriptions-item label="支付订单ID" :span="2">
-          {{ order.paymentId }}
-        </a-descriptions-item>
-      
-        <a-descriptions-item label="网关支付订单号" :span="1">
-          {{ order.gatewayPayOrderNo }}
-        </a-descriptions-item>
-        <a-descriptions-item label="网关分账单号" :span="2">
-          {{ order.gatewayAllocationNo }}
-        </a-descriptions-item>
-        <a-descriptions-item label="分账单号" :span="1">
-          {{ order.allocationNo }}
-        </a-descriptions-item>
         <a-descriptions-item label="所属通道" :span="2">
-       {{ dictConvert('PayChannel', order.channel) }}
-        </a-descriptions-item>
-        <a-descriptions-item label="状态" :span="1">
-          {{ dictConvert('AllocationOrderStatus', order.status) }}
+          {{ dictConvert('PayChannel', order.channel) }}
         </a-descriptions-item>
         <a-descriptions-item label="总分账金额(元)" :span="2">
           {{ order.amount ? (order.amount / 100).toFixed(2) : 0 }}
-
         </a-descriptions-item>
-      
-        <a-descriptions-item label="错误原因" :span="3">
-          {{ order.errorMsg }}
+        <a-descriptions-item label="状态" :span="2">
+          {{ dictConvert('AllocOrderStatus', order.status) }}
         </a-descriptions-item>
-        <a-descriptions-item label="完成时间" :span="1" >
+        <a-descriptions-item label="处理结果" :span="2">
+          {{ dictConvert('AllocOrderResult', order.result) }}
+        </a-descriptions-item>
+        <a-descriptions-item label="分账描述" :span="2">
+          {{ order.description }}
+        </a-descriptions-item>
+        <a-descriptions-item label="分账号" :span="2">
+          {{ order.allocationNo }}
+        </a-descriptions-item>
+        <a-descriptions-item label="支付订单号" :span="2">
+          {{ order.orderNo }}
+        </a-descriptions-item>
+        <a-descriptions-item label="商户分账号" :span="2">
+          {{ order.allocationNo }}
+        </a-descriptions-item>
+        <a-descriptions-item label="商户支付订单号" :span="2">
+          {{ order.bizOrderNo }}
+        </a-descriptions-item>
+        <a-descriptions-item label="通道分账号" :span="2">
+          {{ order.outAllocationNo || '无' }}
+        </a-descriptions-item>
+        <a-descriptions-item label="通道支付订单号" :span="2">
+          {{ order.outOrderNo }}
+        </a-descriptions-item>
+        <a-descriptions-item label="创建时间" :span="2">
+          {{ order.createTime }}
+        </a-descriptions-item>
+        <a-descriptions-item label="完成时间" :span="2">
           {{ order.finishTime }}
         </a-descriptions-item>
-        <a-descriptions-item label="创建时间" :span="1">
-          {{ order.createTime }}
+        <a-descriptions-item v-if="order.errorCode" label="错误编码" :span="2">
+          {{ order.errorMsg }}
+        </a-descriptions-item>
+        <a-descriptions-item v-if="order.errorMsg" label="错误原因" :span="2">
+          {{ order.errorMsg }}
         </a-descriptions-item>
       </a-descriptions>
     </a-spin>
diff --git a/src/views/payment/allocation/order/AllocationOrderList.vue b/src/views/payment/allocation/order/AllocationOrderList.vue
index 4338df46a..81f5550bb 100644
--- a/src/views/payment/allocation/order/AllocationOrderList.vue
+++ b/src/views/payment/allocation/order/AllocationOrderList.vue
@@ -14,7 +14,7 @@
         @sort-change="sortChange"
       >
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="allocationNo" title="分账单号" :min-width="200">
+        <vxe-column field="allocationNo" title="分账单号" :min-width="220">
           <template #default="{ row }">
             <a @click="show(row)">
               {{ row.allocationNo }}
@@ -40,11 +40,11 @@
         </vxe-column>
         <vxe-column field="status" title="状态" :min-width="100">
           <template #default="{ row }">
-            <a-tag>{{ dictConvert('AllocationOrderStatus', row.status) }}</a-tag>
+            <a-tag>{{ dictConvert('AllocOrderStatus', row.status) }}</a-tag>
           </template>
         </vxe-column>
         <vxe-column field="result" title="分账结果" :min-width="100">
-          <template #default="{ row }"> {{ dictConvert('AllocationOrderResult', row.result) }} </template> </vxe-column
+          <template #default="{ row }"> {{ dictConvert('AllocOrderResult', row.result) }} </template> </vxe-column
         ><vxe-column field="errorMsg" title="错误原因" :min-width="160" />
         <vxe-column field="createTime" title="创建时间" :min-width="160" />
         <vxe-column fixed="right" :min-width="200" :showOverflow="false" title="操作">
diff --git a/src/views/payment/allocation/receiver/AllocationReceiverList.vue b/src/views/payment/allocation/receiver/AllocationReceiverList.vue
index 7e2883ec6..b16d4141f 100644
--- a/src/views/payment/allocation/receiver/AllocationReceiverList.vue
+++ b/src/views/payment/allocation/receiver/AllocationReceiverList.vue
@@ -28,14 +28,14 @@
         </vxe-column>
         <vxe-column field="receiverType" title="接收方类型" :min-width="100">
           <template #default="{ row }">
-            <a-tag>{{ dictConvert('AllocationReceiverType', row.receiverType) }}</a-tag>
+            <a-tag>{{ dictConvert('AllocReceiverType', row.receiverType) }}</a-tag>
           </template>
         </vxe-column>
         <vxe-column field="receiverAccount" title="接收方账号" :min-width="220" />
         <vxe-column field="receiverName" title="接收方姓名" :min-width="160" />
         <vxe-column field="relationType" title="分账关系" :min-width="100">
           <template #default="{ row }">
-            <a-tag>{{ dictConvert('AllocationRelationType', row.relationType) }}</a-tag>
+            <a-tag>{{ dictConvert('AllocRelationType', row.relationType) }}</a-tag>
           </template>
         </vxe-column>
         <vxe-column field="sync" title="是否同步" :min-width="100">