From 3cecb164980ba99c377ba9957b06cf7ac25ee015 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 3 Nov 2023 17:15:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/accountModal.vue    | 13 ++++++++++---
 src/components/withdrawalModal.vue |  3 ++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/components/accountModal.vue b/src/components/accountModal.vue
index ac59506..3b81005 100644
--- a/src/components/accountModal.vue
+++ b/src/components/accountModal.vue
@@ -73,7 +73,7 @@
        <div class="tablebox"   style="width:100%">
                    <!-- table -->
     <a-table :columns="columns" :data="tableData" 
-     :scroll="{ x:1500 }"
+     :scroll="{ x:1700 }"
    
       :row-selection="{ type: 'checkbox', showCheckedAll: true }"
       :pagination="{ 'show-total': true, 'show-jumper': true, 'show-page-size': true, total: pager.total, current: currentPage }"
@@ -102,9 +102,14 @@
         {{record.payment_amount_total}}元
       </template>
       <template #doctor_amount="{ record }">
-        {{Math.floor(record.amount_total*0.75*100)/100}}元
+        {{record.doctor_amount}}元
+      </template>
+      <template #amount_total="{ record }">
+        {{record.amount_total}}元
+      </template>
+      <template #coupon_amount_total="{ record }">
+        {{record.coupon_amount_total}}元
       </template>
-  
       <template #patient_name_mask="{ record }">
         <div class="ta-patient" :title="record.patient_name_mask">{{record.patient_name_mask}}({{record.patient_sex==1?'男，':'女，'}}{{record.patient_age}}岁)</div>
       </template>
@@ -234,6 +239,8 @@ watch(()=>queryForm.create_range_time,(value)=>{
   { title: '医生姓名', dataIndex: 'doctor_name',width:100  },
   { title: '就诊人', dataIndex: 'patient_name_mask',slotName:'patient_name_mask',width:200},
   { title: '实付金额', dataIndex: 'payment_amount_total',slotName:'payment_amount_total',width:100 },
+  { title: '订单金额', dataIndex: 'amount_total',slotName:'amount_total',width:100 },
+  { title: '优惠券金额', dataIndex: 'coupon_amount_total',slotName:'coupon_amount_total',width:100 },
   { title: '医生收益', dataIndex: 'doctor_amount',slotName:'doctor_amount',width:100 },
   { title: '支付方式', dataIndex: 'inquiry_pay_channel',slotName:  'inquiry_pay_channel'},
   { title: '订单状态', dataIndex: 'inquiry_status', slotName:'inquiry_status' },
diff --git a/src/components/withdrawalModal.vue b/src/components/withdrawalModal.vue
index a19512c..8983fd0 100644
--- a/src/components/withdrawalModal.vue
+++ b/src/components/withdrawalModal.vue
@@ -405,8 +405,9 @@ const closeReject=()=>{
 const handleConfirmPay=async()=>{
   const {data,code}=await confirmPay(withdrawal_order_id.value);
   if(code==200){
-    Message.success("打款成功")
+    Message.success("打款成功");
   }
+  emits('freshDetail');
 };
 const handleSubmitConfirm=()=>{
  if(okStatus.value==1){