From 2125c6de5a044a71c58292d0429e12a4ba5f48c9 Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Mon, 6 May 2024 19:25:23 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E5=AF=B9=E8=B4=A6=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/reconcile/diff/ReconcileDiffList.vue    |  2 +-
 .../payment/reconcile/order/ReconcileOrderList.vue  | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/payment/reconcile/diff/ReconcileDiffList.vue b/src/views/payment/reconcile/diff/ReconcileDiffList.vue
index e31492b1a..b03e8c50c 100644
--- a/src/views/payment/reconcile/diff/ReconcileDiffList.vue
+++ b/src/views/payment/reconcile/diff/ReconcileDiffList.vue
@@ -26,7 +26,7 @@
           </template>
         </vxe-column>
         <vxe-column field="reconcileDate" title="对账日期" sortable min-width="120" />
-        <vxe-column field="tradeNo" title="交易号" min-width="180" />
+        <vxe-column field="tradeNo" title="本地交易号" min-width="180" />
         <vxe-column field="outTradeNo" title="外部交易号" min-width="220" />
         <vxe-column field="amount" title="交易金额(元)" sortable min-width="120">
           <template #default="{ row }"> {{ row.amount ? (row.amount / 100).toFixed(2) : '无' }} </template>
diff --git a/src/views/payment/reconcile/order/ReconcileOrderList.vue b/src/views/payment/reconcile/order/ReconcileOrderList.vue
index bf4995bed..b0b1870fc 100644
--- a/src/views/payment/reconcile/order/ReconcileOrderList.vue
+++ b/src/views/payment/reconcile/order/ReconcileOrderList.vue
@@ -285,9 +285,11 @@
     createConfirm({
       iconType: 'info',
       title: '提示',
-      content: '将三方支付系统中的原始交易对账文件，转换为格式统一的CSV，确定要下载吗？',
+      content: '将三方支付系统中的原始交易对账文件，转换为统一格式的CSV，确定要下载吗？',
       onOk: () => {
-        createMessage.info('下载保存中.....')
+        const token = useUserStore.getToken
+        // 跳转到新页面进行下载
+        window.open(`${downUrl}/order/reconcile/downOriginal2Csv?id=${record.id}&Accesstoken=${token}`)
       },
     })
   }
@@ -301,7 +303,9 @@
       title: '提示',
       content: '通过本系统中订单生成的对账单，确定要下载吗？',
       onOk: () => {
-        createMessage.info('对账单下载保存中.....')
+        const token = useUserStore.getToken
+        // 跳转到新页面进行下载
+        window.open(`${downUrl}/order/reconcile/downLocalCsv?id=${record.id}&Accesstoken=${token}`)
       },
     })
   }
@@ -315,6 +319,9 @@
       title: '提示',
       content: '确定要下载对账差异明细吗？',
       onOk: () => {
+        const token = useUserStore.getToken
+        // 跳转到新页面进行下载
+        window.open(`${downUrl}/order/reconcile/downDiffCsv?id=${record.id}&Accesstoken=${token}`)
         createMessage.info('对账差异明细单下载保存中.....')
       },
     })