From 8eee2c5b01969acb983e299c1103559ef13f9a3e Mon Sep 17 00:00:00 2001
From: yangqingyuan <yangqingyuan@163.com>
Date: Fri, 19 Jul 2024 10:07:09 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E9=80=80=E7=A7=9F=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=A2=9E=E5=8A=A0=EF=BC=88=E6=8B=92=E7=BB=9D=E5=8E=9F?=
 =?UTF-8?q?=E5=9B=A0=E3=80=81=E5=AE=A1=E6=A0=B8=E6=97=B6=E9=97=B4=EF=BC=89?=
 =?UTF-8?q?=20fix=EF=BC=9A=E6=8F=90=E7=8E=B0=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=B2=A1=E6=9C=89=E5=AE=A1=E6=A0=B8=EF=BC=8C=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=B7=B2=E7=BB=8F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/order/refund/model/index.ts            |  2 +-
 src/views/yunxinwei/refund/components/edit.vue |  5 +++--
 src/views/yunxinwei/refund/index.vue           | 16 ++++++++++++++++
 src/views/yunxinwei/withdraw/index.vue         |  3 ++-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/api/order/refund/model/index.ts b/src/api/order/refund/model/index.ts
index d4174d0..926a071 100644
--- a/src/api/order/refund/model/index.ts
+++ b/src/api/order/refund/model/index.ts
@@ -24,7 +24,7 @@ export interface OrderRefund {
   status?: number;
   merchantCode?: string;
   createTime?: string;
-  updateTIme?: string;
+  updateTime?: string;
   tenantId?: string;
 }
 
diff --git a/src/views/yunxinwei/refund/components/edit.vue b/src/views/yunxinwei/refund/components/edit.vue
index d7f18b7..14e2f04 100644
--- a/src/views/yunxinwei/refund/components/edit.vue
+++ b/src/views/yunxinwei/refund/components/edit.vue
@@ -43,7 +43,7 @@ import {ref, reactive, watch, computed} from 'vue';
   import { useUserStore } from '@/store/modules/user';
 import { OrderRefund } from "@/api/order/refund/model";
 import { updateOrderRefund } from "@/api/order/refund";
-import { assignObject } from "ele-admin-pro";
+import {assignObject, toDateString} from "ele-admin-pro";
 
   const userStore = useUserStore();
   // 当前用户信息
@@ -109,7 +109,8 @@ import { assignObject } from "ele-admin-pro";
           ...form,
           orderRefundId: props.data?.orderRefundId,
           orderId: props.data?.orderId,
-          tenantId: props.data?.tenantId
+          tenantId: props.data?.tenantId,
+          updateTime:toDateString(new Date(), 'yyyy-MM-dd HH:mm:ss'),
         };
         // 转字符串
         updateOrderRefund(data)
diff --git a/src/views/yunxinwei/refund/index.vue b/src/views/yunxinwei/refund/index.vue
index f8a8cf5..1ace6af 100644
--- a/src/views/yunxinwei/refund/index.vue
+++ b/src/views/yunxinwei/refund/index.vue
@@ -69,6 +69,10 @@
                 <a-button v-if="record.auditStatus == 10" @click="openEdit(record)">审核</a-button>
               </a-space>
             </template>
+            <template v-if="column.key === 'updateTime'">
+              <span v-if="record.auditStatus ===10">-</span>
+              <span v-else>{{ record.updateTime }}</span>
+            </template>
           </template>
         </ele-pro-table>
       </a-card>
@@ -142,6 +146,12 @@
       key: 'applyDesc',
       ellipsis: true
     },
+    {
+      title: '拒绝原因',
+      dataIndex: 'refuseDesc',
+      key: 'refuseDesc',
+      ellipsis: true
+    },
     {
       title: '实际返还金额',
       dataIndex: 'refundMoney',
@@ -152,6 +162,12 @@
       key: 'auditStatus',
       dataIndex: 'auditStatus'
     },
+    {
+      title: '审核时间',
+      dataIndex: 'updateTime',
+      key: 'updateTime',
+      customRender: ({ text }) => toDateString(text)
+    },
     {
       title: '创建时间',
       dataIndex: 'createTime',
diff --git a/src/views/yunxinwei/withdraw/index.vue b/src/views/yunxinwei/withdraw/index.vue
index bad9402..360f954 100644
--- a/src/views/yunxinwei/withdraw/index.vue
+++ b/src/views/yunxinwei/withdraw/index.vue
@@ -78,7 +78,8 @@
               {{ record.createTime }}
             </template>
             <template v-if="column.key === 'updateTime'">
-              {{ record.updateTime }}
+              <span v-if="record.applyStatus ===20">{{ record.updateTime }}</span>
+              <span v-else>-</span>
             </template>
           </template>