From c0a90482c034678cc8ed8f355b11bf87a0b66be9 Mon Sep 17 00:00:00 2001
From: terrfly <tengfei9753@sina.com>
Date: Wed, 29 Mar 2023 14:08:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=B7=BB=E5=8A=A0=20?=
 =?UTF-8?q?=E5=88=86=E8=B4=A6=E5=B7=B2=E5=8F=97=E7=90=86=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                          |  1 +
 .../src/views/division/record/Detail.vue            | 11 +++++++----
 .../views/division/record/DivisionRecordPage.vue    | 13 +++++++------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index a3cdee0..c11b5e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,4 @@ unpackage/
 
 # [package-lock.json。 已放开，请添加到假定未更改文件 ]
 # package-lock.json
+/.history/
diff --git a/jeepay-ui-merchant/src/views/division/record/Detail.vue b/jeepay-ui-merchant/src/views/division/record/Detail.vue
index e903fe3..6f352a8 100644
--- a/jeepay-ui-merchant/src/views/division/record/Detail.vue
+++ b/jeepay-ui-merchant/src/views/division/record/Detail.vue
@@ -14,14 +14,17 @@
       <a-col :sm="12"><a-descriptions><a-descriptions-item label="支付接口代码">{{ detailData.ifCode }}</a-descriptions-item></a-descriptions></a-col>
       <a-col :sm="12"><a-descriptions><a-descriptions-item label="系统支付订单号">{{ detailData.payOrderId }}</a-descriptions-item></a-descriptions></a-col>
       <a-col :sm="12"><a-descriptions><a-descriptions-item label="支付订单渠道支付订单号">{{ detailData.payOrderChannelOrderNo }}</a-descriptions-item></a-descriptions></a-col>
-      <a-col :sm="12"><a-descriptions><a-descriptions-item label="订单金额">{{ detailData.payOrderAmount / 100}}</a-descriptions-item></a-descriptions></a-col>
+      <a-col :sm="12"><a-descriptions><a-descriptions-item label="订单金额">{{ detailData.payOrderAmount / 100 }}</a-descriptions-item></a-descriptions></a-col>
       <a-col :sm="12"><a-descriptions><a-descriptions-item label="分账基数">{{ detailData.payOrderDivisionAmount / 100 }} （订单金额-手续费-退款金额）</a-descriptions-item></a-descriptions></a-col>
       <a-col :sm="12"><a-descriptions><a-descriptions-item label="系统分账批次号">{{ detailData.batchOrderId }}</a-descriptions-item></a-descriptions></a-col>
       <a-col :sm="12"><a-descriptions><a-descriptions-item label="上游分账批次号">{{ detailData.channelBatchOrderId }}</a-descriptions-item></a-descriptions></a-col>
       <a-col :sm="12"><a-descriptions><a-descriptions-item label="状态">
-        <a-tag :key="detailData.state" :color="detailData.state === 0?'orange':detailData.state === 1?'blue':detailData.state === 2?'volcano':'volcano'">
-          {{ detailData.state === 0?'分账中':detailData.state === 1?'分账成功':detailData.state === 2?'分账失败' : '未知' }}
-        </a-tag>
+
+        <a-tag v-if="detailData.state === 0" :key="detailData.state" color="orange">分账中</a-tag>
+        <a-tag v-if="detailData.state === 1" :key="detailData.state" color="blue">分账成功</a-tag>
+        <a-tag v-if="detailData.state === 2" :key="detailData.state" color="volcano">分账失败</a-tag>
+        <a-tag v-if="detailData.state === 3" :key="detailData.state" color="purple">已受理</a-tag>
+
       </a-descriptions-item></a-descriptions></a-col>
       <a-col :sm="12"><a-descriptions><a-descriptions-item label="分账接收者ID">{{ detailData.receiverId }}</a-descriptions-item></a-descriptions></a-col>
       <a-col :sm="12"><a-descriptions><a-descriptions-item label="收款账号组ID">{{ detailData.receiverGroupId }}</a-descriptions-item></a-descriptions></a-col>
diff --git a/jeepay-ui-merchant/src/views/division/record/DivisionRecordPage.vue b/jeepay-ui-merchant/src/views/division/record/DivisionRecordPage.vue
index 0492874..6ab2c45 100644
--- a/jeepay-ui-merchant/src/views/division/record/DivisionRecordPage.vue
+++ b/jeepay-ui-merchant/src/views/division/record/DivisionRecordPage.vue
@@ -26,6 +26,7 @@
                 <a-select-option value="0">待分账</a-select-option>
                 <a-select-option value="1">分账成功</a-select-option>
                 <a-select-option value="2">分账失败</a-select-option>
+                <a-select-option value="3">已受理</a-select-option>
               </a-select>
             </a-form-item>
 
@@ -49,12 +50,12 @@
       >
         <template slot="amountSlot" slot-scope="{record}"><b>￥{{ record.calDivisionAmount/100 }}</b></template> <!-- 自定义插槽 -->
         <template slot="stateSlot" slot-scope="{record}">
-          <a-tag
-            :key="record.state"
-            :color="record.state === 0?'orange':record.state === 1?'blue':record.state === 2?'volcano':'volcano'"
-          >
-            {{ record.state === 0?'分账中':record.state === 1?'分账成功':record.state === 2?'分账失败' : '未知' }}
-          </a-tag>
+
+          <a-tag v-if="record.state === 0" :key="record.state" color="orange">分账中</a-tag>
+          <a-tag v-if="record.state === 1" :key="record.state" color="blue">分账成功</a-tag>
+          <a-tag v-if="record.state === 2" :key="record.state" color="volcano">分账失败</a-tag>
+          <a-tag v-if="record.state === 3" :key="record.state" color="purple">已受理</a-tag>
+
         </template>
         <template slot="opSlot" slot-scope="{record}">  <!-- 操作列插槽 -->
           <JeepayTableColumns>