From 73662c67ebefd30b332bfcdd499880290ecf9095 Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Wed, 31 Jan 2024 15:00:57 +0800
Subject: [PATCH] =?UTF-8?q?style=20=E8=AE=A2=E5=8D=95=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=8F=B7=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../record/repair/PayRepairRecordInfo.vue     | 23 +++++++++----------
 .../payment/record/sync/PaySyncRecord.api.ts  |  2 ++
 .../payment/record/sync/PaySyncRecordInfo.vue |  9 ++++----
 .../payment/record/sync/PaySyncRecordList.vue | 10 ++++----
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/views/payment/record/repair/PayRepairRecordInfo.vue b/src/views/payment/record/repair/PayRepairRecordInfo.vue
index 16542d703..4087edc9a 100644
--- a/src/views/payment/record/repair/PayRepairRecordInfo.vue
+++ b/src/views/payment/record/repair/PayRepairRecordInfo.vue
@@ -23,24 +23,23 @@
           {{ form.orderNo }}
         </a-descriptions-item>
         <a-descriptions-item label="修复类型">
-          {{ dictConvert('PaymentType', form.repairType) }}
-          {{ form.repairType }}
-        </a-descriptions-item>
-        <a-descriptions-item label="修复来源">
-          {{ dictConvert('PayRepairSource', form.repairSource) }}
-        </a-descriptions-item>
-        <a-descriptions-item label="修复方式">
-          <a-tag v-if="form.repairType === 'pay'">{{ dictConvert('PayRepairWay', row.repairWay) }}</a-tag>
-          <a-tag v-else>{{ dictConvert('RefundRepairWay', form.repairWay) }}</a-tag>
+          <a-tag>{{ dictConvert('PaymentType', form.repairType) }}</a-tag>
         </a-descriptions-item>
         <a-descriptions-item label="修复通道">
-          {{ dictConvert('AsyncPayChannel', form.asyncChannel) }}
+          <a-tag>{{ dictConvert('AsyncPayChannel', form.asyncChannel) }}</a-tag>
+        </a-descriptions-item>
+        <a-descriptions-item label="修复来源">
+          <a-tag>{{ dictConvert('PayRepairSource', form.repairSource) }}</a-tag>
+        </a-descriptions-item>
+        <a-descriptions-item label="修复方式">
+          <a-tag v-if="form.repairType === 'pay'">{{ dictConvert('PayRepairWay', form.repairWay) }}</a-tag>
+          <a-tag v-else>{{ dictConvert('RefundRepairWay', form.repairWay) }}</a-tag>
         </a-descriptions-item>
         <a-descriptions-item label="修复前订单状态">
-          {{ dictConvert('PayStatus', form.beforeStatus) }}
+          <a-tag>{{ dictConvert('PayStatus', form.beforeStatus) }}</a-tag>
         </a-descriptions-item>
         <a-descriptions-item label="修复后订单状态">
-          {{ dictConvert('PayStatus', form.afterStatus) }}
+          <a-tag>{{ dictConvert('PayStatus', form.afterStatus) }}</a-tag>
         </a-descriptions-item>
         <a-descriptions-item label="修复时间">
           {{ form.createTime }}
diff --git a/src/views/payment/record/sync/PaySyncRecord.api.ts b/src/views/payment/record/sync/PaySyncRecord.api.ts
index 0a50ee681..eb5387275 100644
--- a/src/views/payment/record/sync/PaySyncRecord.api.ts
+++ b/src/views/payment/record/sync/PaySyncRecord.api.ts
@@ -42,6 +42,8 @@ export interface SyncRecord extends BaseEntity {
   gatewayStatus?: string
   // 是否进行修复
   repairOrder?: boolean
+  // 修复号
+  repairOrderNo?: boolean
   // 错误消息
   errorMsg?: string
   // 同步时间
diff --git a/src/views/payment/record/sync/PaySyncRecordInfo.vue b/src/views/payment/record/sync/PaySyncRecordInfo.vue
index f7579d881..6f928fcb5 100644
--- a/src/views/payment/record/sync/PaySyncRecordInfo.vue
+++ b/src/views/payment/record/sync/PaySyncRecordInfo.vue
@@ -30,13 +30,14 @@
           <a-tag v-else>{{ dictConvert('RefundSyncStatus', form.gatewayStatus) }}</a-tag>
         </a-descriptions-item>
         <a-descriptions-item label="是否修复">
-          <a-tag>{{ form.repairOrder ? '是' : '否' }}</a-tag>
+          <a-tag v-if="form.repairOrder" color="green"> {{ form.repairOrderNo }} </a-tag>
+          <a-tag v-else>否</a-tag>
         </a-descriptions-item>
         <a-descriptions-item label="同步时间">
           {{ form.createTime }}
-          <a-descriptions-item label="同步消息">
-            <json-preview :data="XEUtils.toStringJSON(form.syncInfo || '{}')" />
-          </a-descriptions-item>
+        </a-descriptions-item>
+        <a-descriptions-item label="同步消息">
+          <json-preview :data="XEUtils.toStringJSON(form.syncInfo || '{}')" />
         </a-descriptions-item>
         <a-descriptions-item label="错误信息" v-if="form.errorMsg">
           {{ form.errorMsg }}
diff --git a/src/views/payment/record/sync/PaySyncRecordList.vue b/src/views/payment/record/sync/PaySyncRecordList.vue
index 3f53e4ef9..ff93bbe3a 100644
--- a/src/views/payment/record/sync/PaySyncRecordList.vue
+++ b/src/views/payment/record/sync/PaySyncRecordList.vue
@@ -7,14 +7,14 @@
       <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
       <vxe-table row-id="id" ref="xTable" :data="pagination.records" :loading="loading">
         <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="orderId" title="本地支付号" width="170" sortable>
+        <vxe-column field="orderId" title="本地订单号" width="170" sortable>
           <template #default="{ row }">
             <a @click="showOrder(row)">
               {{ row.orderId }}
             </a>
           </template>
         </vxe-column>
-        <vxe-column field="orderNo" title="业务号" />
+        <vxe-column field="orderNo" title="本地业务号" />
         <vxe-column field="channel" title="同步类型">
           <template #default="{ row }">
             <a-tag>{{ dictConvert('PaymentType', row.syncType) }}</a-tag>
@@ -25,15 +25,15 @@
             <a-tag>{{ dictConvert('AsyncPayChannel', row.asyncChannel) }}</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="status" title="同步结果" width="140">
+        <vxe-column field="status" title="同步结果">
           <template #default="{ row }">
             <a-tag v-if="row.syncType === 'pay'">{{ dictConvert('PaySyncStatus', row.gatewayStatus) }}</a-tag>
             <a-tag v-else>{{ dictConvert('RefundSyncStatus', row.gatewayStatus) }}</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="repairOrder" title="是否修复">
+        <vxe-column field="repairOrder" title="是否修复" width="170">
           <template #default="{ row }">
-            <a v-if="row.repairOrder" @click="showRepairInfo(row.repairOrderId)"> 修复单 </a>
+            <a-tag v-if="row.repairOrder" color="green"> {{ row.repairOrderNo }} </a-tag>
             <a-tag v-else>否</a-tag>
           </template>
         </vxe-column>