From f5fb7f5885269403902910f596eb561e4c0e4f9f Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Thu, 22 Aug 2024 17:32:59 +0800
Subject: [PATCH] =?UTF-8?q?perf=20=E5=AF=B9=E8=B4=A6=E5=B7=AE=E5=BC=82?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E8=AF=95,=20=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=AE=9D=E9=85=8D=E7=BD=AE=E5=8E=BB=E9=99=A4=E7=BD=91=E5=85=B3?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../daxpay/admin/merchant/app/MchAppEdit.vue  | 16 +++++-----
 .../discrepancy/ReconcileDiscrepancyInfo.vue  |  3 +-
 .../discrepancy/ReconcileDiscrepancyList.vue  | 32 +++++++++----------
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/src/views/daxpay/admin/merchant/app/MchAppEdit.vue b/src/views/daxpay/admin/merchant/app/MchAppEdit.vue
index 2cef8b83e..27332a859 100644
--- a/src/views/daxpay/admin/merchant/app/MchAppEdit.vue
+++ b/src/views/daxpay/admin/merchant/app/MchAppEdit.vue
@@ -36,14 +36,6 @@
         <a-form-item label="应用名称" name="appName">
           <a-input v-model:value="form.appName" :disabled="showable" placeholder="请输入应用名称" />
         </a-form-item>
-        <a-form-item label="请求验签" name="reqSign">
-          <a-switch
-            :disabled="showable"
-            v-model:checked="form.reqSign"
-            checked-children="启用"
-            un-checked-children="停用"
-          />
-        </a-form-item>
         <a-form-item label="支付限额(元)" name="limitAmount">
           <a-input-number
             v-model:value="form.limitAmount"
@@ -62,6 +54,14 @@
             placeholder="请输入订单默认超时时间(分钟)"
           />
         </a-form-item>
+        <a-form-item label="请求验签" name="reqSign">
+          <a-switch
+            :disabled="showable"
+            v-model:checked="form.reqSign"
+            checked-children="启用"
+            un-checked-children="停用"
+          />
+        </a-form-item>
         <a-form-item label="签名方式" name="signType">
           <a-radio-group v-model:value="form.signType" :disabled="showable" button-style="solid">
             <a-radio-button v-for="item in signTypes" :key="item.value" :value="item.value">{{
diff --git a/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyInfo.vue b/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyInfo.vue
index 947f0bcb8..d75129395 100644
--- a/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyInfo.vue
+++ b/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyInfo.vue
@@ -27,8 +27,7 @@
       <a-descriptions-item label="交易号(平台)" :span="1">
         {{ discrepancy.tradeNo }}
       </a-descriptions-item>
-      <a-descriptions-item label="平台交易号(通道)" :span="1">
-        {{ discrepancy.channelTradeNo }}
+      <a-descriptions-item label="" :span="1">
       </a-descriptions-item>
       <a-descriptions-item label="通道交易号(平台)" :span="1">
         {{ discrepancy.outTradeNo }}
diff --git a/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyList.vue b/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyList.vue
index ea3d60607..6625ef354 100644
--- a/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyList.vue
+++ b/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyList.vue
@@ -40,17 +40,16 @@
               <a-tag>{{ dictConvert('reconcile_discrepancy_type', row.discrepancyType) }}</a-tag>
             </template>
           </vxe-column>
+          <vxe-column field="tradeNo" title="平台交易号" :min-width="230">
+            <template #default="{ row }">
+              <a-link v-if="row.tradeNo" @click="showTrade(row)">{{ row.tradeNo }}</a-link>
+            </template>
+          </vxe-column>
           <vxe-colgroup title="平台信息">
-            <vxe-column field="tradeNo" title="交易号" :min-width="230">
-              <template #default="{ row }">
-                <a-link v-if="row.tradeNo" @click="showTrade(row)">{{ row.tradeNo }}</a-link>
-              </template>
-            </vxe-column>
-            <vxe-column field="outTradeNo" title="通道交易号" :min-width="230" />
             <vxe-column field="bizTradeNo" title="商户交易号" :min-width="230" />
             <vxe-column field="tradeType" title="交易类型" :min-width="120">
               <template #default="{ row }">
-                {{ dictConvert('trade_type', row.tradeType) || '无' }}
+                {{ dictConvert('trade_type', row.tradeType) }}
               </template>
             </vxe-column>
             <vxe-column field="tradeAmount" title="交易金额(元)" sortable :min-width="130" />
@@ -62,9 +61,9 @@
                 }}</a-tag>
               </template>
             </vxe-column>
+            <vxe-column field="outTradeNo" title="通道交易号" :min-width="230" />
           </vxe-colgroup>
           <vxe-colgroup title="通道信息">
-            <vxe-column field="channelOutTradeNo" title="平台交易号" :min-width="230" />
             <vxe-column field="channelTradeNo" title="通道交易号" :min-width="230" />
             <vxe-column field="channelTradeAmount" title="交易金额(元)" sortable :min-width="150">
               <template #default="{ row }">
@@ -72,6 +71,11 @@
               </template>
             </vxe-column>
             <vxe-column field="channelTradeTime" title="交易时间" sortable :min-width="150" />
+            <vxe-column field="channelTradeType" title="交易类型" :min-width="120">
+              <template #default="{ row }">
+                {{ dictConvert('trade_type', row.channelTradeType) }}
+              </template>
+            </vxe-column>
             <vxe-column field="channelTradeStatus" title="交易状态" :min-width="150">
               <template #default="{ row }">
                 <a-tag v-if="row.channelTradeStatus">{{
@@ -158,7 +162,7 @@
         placeholder: '请选择对账差异类型',
         selectList: discrepancyTypeList.value,
       },
-      { field: 'tradeNo', type: STRING, name: '交易号(平台)', placeholder: '请输入交易号(平台)' },
+      { field: 'tradeNo', type: STRING, name: '平台交易号', placeholder: '请输入平台交易号' },
       {
         field: 'bizTradeNo',
         type: STRING,
@@ -191,12 +195,6 @@
         name: '交易号(通道)',
         placeholder: '请输入交易号(通道)',
       },
-      {
-        field: 'channelOutTradeNo',
-        type: STRING,
-        name: '平台交易号(通道)',
-        placeholder: '请输入平台交易号(通道)',
-      },
       {
         field: 'channelTradeType',
         type: LIST,
@@ -263,7 +261,7 @@
     })
   }
   /**
-   * 查看
+   * 查看差异记录
    */
   function show(record) {
     reconcileDiscrepancyInfo.value.init(record.id)
@@ -273,7 +271,7 @@
    * 查看对账单
    */
   function showReconcile(record) {
-    reconcileDiscrepancyInfo.value.init(record.reconcileId)
+    reconcileStatementInfo.value.init(record.reconcileId)
   }
 
   /**