From 4a16ee57c8dc0520a6cce6b89934cc438f5a786c Mon Sep 17 00:00:00 2001
From: terrfly <tengfei9753@sina.com>
Date: Fri, 18 Jun 2021 10:40:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=80=80=E6=AC=BE=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E5=AD=97=E6=AE=B5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/order/refund/RefundOrderList.vue    | 27 -----------------
 .../views/order/refund/RefundOrderList.vue    | 30 ++-----------------
 2 files changed, 2 insertions(+), 55 deletions(-)

diff --git a/jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue b/jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue
index 11e0570..ab35bdb 100644
--- a/jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue
+++ b/jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue
@@ -29,15 +29,6 @@
                 <a-select-option value="3">退款失败</a-select-option>
               </a-select>
             </a-form-item>
-            <a-form-item label="" class="table-head-layout">
-              <a-select v-model="searchData.result" placeholder="退款结果" default-value="">
-                <a-select-option value="">全部</a-select-option>
-                <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>
             <a-form-item label="" class="table-head-layout">
               <a-select v-model="searchData.mchType" placeholder="商户类型" default-value="">
                 <a-select-option value="">全部</a-select-option>
@@ -76,14 +67,6 @@
             {{ record.state === 0?'订单生成':record.state === 1?'退款中':record.state === 2?'退款成功':record.state === 3?'退款失败':'未知' }}
           </a-tag>
         </template>
-        <template slot="resultSlot" slot-scope="{record}">
-          <a-tag
-            :key="record.result"
-            :color="record.result === 0?'blue':record.result === 1?'orange':record.result === 2?'green':'volcano'"
-          >
-            {{ record.result === 0?'未确认':record.result === 1?'待处理':record.result === 2?'确认成功':record.result === 3?'确认失败':'未知' }}
-          </a-tag>
-        </template>
         <template slot="opSlot" slot-scope="{record}">  <!-- 操作列插槽 -->
           <JeepayTableColumns>
             <a-button type="link" v-if="$access('ENT_REFUND_ORDER_VIEW')" @click="detailFunc(record.refundOrderId)">详情</a-button>
@@ -187,15 +170,6 @@
               </a-descriptions-item>
             </a-descriptions>
           </a-col>
-          <a-col :sm="12">
-            <a-descriptions>
-              <a-descriptions-item label="退款结果">
-                <a-tag :color="detailData.result === 0?'blue':detailData.result === 1?'orange':detailData.result === 2?'green':'volcano'">
-                  {{ detailData.result === 0?'未确认':detailData.result === 1?'待处理':detailData.result === 2?'确认成功':detailData.result === 3?'确认失败':'未知' }}
-                </a-tag>
-              </a-descriptions-item>
-            </a-descriptions>
-          </a-col>
           <a-col :sm="24">
             <a-descriptions>
               <a-descriptions-item label="退款成功时间">
@@ -327,7 +301,6 @@
     { key: 'payOrderId', title: '支付订单号', dataIndex: 'payOrderId' },
     { key: 'mchRefundNo', title: '商户退款单号', dataIndex: 'mchRefundNo' },
     { key: 'state', title: '支付状态', scopedSlots: { customRender: 'stateSlot' }, width: 100 },
-    { key: 'result', title: '退款结果', scopedSlots: { customRender: 'resultSlot' }, width: 100 },
     { key: 'createdAt', dataIndex: 'createdAt', title: '创建日期' },
     { key: 'op', title: '操作', width: '100px', fixed: 'right', align: 'center', scopedSlots: { customRender: 'opSlot' } }
   ]
diff --git a/jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue b/jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue
index 556ecc6..51d1471 100644
--- a/jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue
+++ b/jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue
@@ -28,15 +28,6 @@
                 <a-select-option value="3">退款失败</a-select-option>
               </a-select>
             </a-form-item>
-            <a-form-item label="" class="table-head-layout">
-              <a-select v-model="searchData.result" placeholder="退款结果" default-value="">
-                <a-select-option value="">全部</a-select-option>
-                <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>
             <a-form-item label="" class="table-head-layout">
               <a-select v-model="searchData.mchType" placeholder="商户类型" default-value="">
                 <a-select-option value="">全部</a-select-option>
@@ -67,20 +58,13 @@
         <template slot="payAmountSlot" slot-scope="{record}"><b>￥{{ record.payAmount/100 }}</b></template> <!-- 自定义插槽 -->
         <template slot="refundAmountSlot" slot-scope="{record}"><b>￥{{ record.refundAmount/100 }}</b></template> <!-- 自定义插槽 -->
         <template slot="stateSlot" slot-scope="{record}">
-          <a-tag
+          <div><a-tag
             :key="record.state"
             :color="record.state === 0?'blue':record.state === 1?'orange':record.state === 2?'green':'volcano'"
           >
             {{ record.state === 0?'订单生成':record.state === 1?'退款中':record.state === 2?'退款成功':record.state === 3?'退款失败':'未知' }}
           </a-tag>
-        </template>
-        <template slot="resultSlot" slot-scope="{record}">
-          <a-tag
-            :key="record.result"
-            :color="record.result === 0?'blue':record.result === 1?'orange':record.result === 2?'green':'volcano'"
-          >
-            {{ record.result === 0?'未确认':record.result === 1?'待处理':record.result === 2?'确认成功':record.result === 3?'确认失败':'未知' }}
-          </a-tag>
+          </div>
         </template>
         <template slot="opSlot" slot-scope="{record}">  <!-- 操作列插槽 -->
           <JeepayTableColumns>
@@ -185,15 +169,6 @@
               </a-descriptions-item>
             </a-descriptions>
           </a-col>
-          <a-col :sm="12">
-            <a-descriptions>
-              <a-descriptions-item label="退款结果">
-                <a-tag :color="detailData.result === 0?'blue':detailData.result === 1?'orange':detailData.result === 2?'green':'volcano'">
-                  {{ detailData.result === 0?'未确认':detailData.result === 1?'待处理':detailData.result === 2?'确认成功':detailData.result === 3?'确认失败':'未知' }}
-                </a-tag>
-              </a-descriptions-item>
-            </a-descriptions>
-          </a-col>
           <a-col :sm="24">
             <a-descriptions>
               <a-descriptions-item label="退款成功时间">
@@ -325,7 +300,6 @@
     { key: 'payOrderId', title: '支付订单号', dataIndex: 'payOrderId' },
     { key: 'mchRefundNo', title: '商户退款单号', dataIndex: 'mchRefundNo' },
     { key: 'state', title: '支付状态', scopedSlots: { customRender: 'stateSlot' } },
-    { key: 'result', title: '退款结果', scopedSlots: { customRender: 'resultSlot' } },
     { key: 'createdAt', dataIndex: 'createdAt', title: '创建日期' },
     { key: 'op', title: '操作', width: '100px', fixed: 'right', align: 'center', scopedSlots: { customRender: 'opSlot' } }
   ]
-- 
GitLab