From b90eace094bda43f2362b5e052a6c35222a3be00 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 3 Nov 2023 14:35:31 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/accountModal.vue             |  9 ++++--
 src/views/finance/doctoraccount/index.vue   |  6 ++--
 src/views/finance/financialrecord/index.vue | 34 +++++++++++++++++----
 3 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/src/components/accountModal.vue b/src/components/accountModal.vue
index f3d7edf..0c3ab28 100644
--- a/src/components/accountModal.vue
+++ b/src/components/accountModal.vue
@@ -77,7 +77,7 @@
    
       :row-selection="{ type: 'checkbox', showCheckedAll: true }"
       :pagination="{ 'show-total': true, 'show-jumper': true, 'show-page-size': true, total: pager.total, current: currentPage }"
-      row-key="doctor_id" @selection-change="(selection) => {deleteData = selection;console.log(selection)}"
+      row-key="order_inquiry_id" @selection-change="(selection) => {console.log(selection)}"
       @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
       <template #doctor_id="{record,rowIndex}">
         <div>{{(rowIndex+1)+(pager.page-1)*pager.page_size}}</div>
@@ -108,6 +108,10 @@
       <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>
+      
+      <template #reception_time="{ record }">
+        {{ parseTime(record.reception_time) }}
+      </template>
       <template #inquiry_type="{ record }">
         {{ formatInquiryType(record.inquiry_type) }}
       </template>
@@ -234,7 +238,8 @@ watch(()=>queryForm.create_range_time,(value)=>{
   { title: '支付方式', dataIndex: 'inquiry_pay_channel',slotName:  'inquiry_pay_channel'},
   { title: '订单状态', dataIndex: 'inquiry_status', slotName:'inquiry_status' },
   { title: '入账状态', dataIndex: 'entry_status', slotName:'entry_status' },
-  { title: '理由', dataIndex: 'cancel_reason', slotName: 'cancel_reason',width:200 },
+  { title: '理由', dataIndex: 'cancel_reason', slotName: 'cancel_reason' },
+  { title: '接诊时间', dataIndex: 'reception_time', slotName: 'reception_time',width:200 },
   // { title: '操作', slotName: 'action',fixed: "right", width: 100  },
 ]
 // Akiraka 20230210 关闭弹窗
diff --git a/src/views/finance/doctoraccount/index.vue b/src/views/finance/doctoraccount/index.vue
index f8e8a6f..315de2b 100644
--- a/src/views/finance/doctoraccount/index.vue
+++ b/src/views/finance/doctoraccount/index.vue
@@ -22,7 +22,7 @@
       <!-- action -->
       <div class="action">
         <a-space>
-          <a-button v-has="'admin:sysDoctorAccount:export'" type="primary" @click="handleAdd"><icon-export />导出 </a-button>
+          <a-button v-has="'admin:sysDoctorAccount:export'" type="primary" @click="handleExport"><icon-export />导出 </a-button>
         </a-space>
       </div> 
   
@@ -162,7 +162,9 @@
     // Table Data
     const tableData = ref([]);
  
-  
+  const handleExport=()=>{
+    alert('导出')
+  }
  //详情
    const handleDetail = async (record) => {
     const { code, data, message } = await getAccountDetail(record.doctor_id);
diff --git a/src/views/finance/financialrecord/index.vue b/src/views/finance/financialrecord/index.vue
index 35172b1..a0c12de 100644
--- a/src/views/finance/financialrecord/index.vue
+++ b/src/views/finance/financialrecord/index.vue
@@ -8,7 +8,14 @@
       <a-form-item field="mobile" label="电话号码">
         <a-input :style="{ width: '182px' }" v-model="queryForm.mobile" placeholder="请输入电话号码" @press-enter="handleQuery" />
       </a-form-item>
-      <a-form-item field="examine_status" label="审核状态">
+      <a-form-item field="settle_status" label="结算状态">
+        <a-select  @change="changeSettle" v-model="queryForm.settle_status" placeholder="请选择结算状态" :style="{ width: '182px' }">
+          <a-option :value="1">待结算</a-option>
+          <a-option :value="2">结算成功</a-option>
+          <a-option :value="3">结算失败</a-option>
+        </a-select>
+      </a-form-item> 
+      <!-- <a-form-item field="examine_status" label="审核状态">
         <a-select  v-model="queryForm.examine_status" placeholder="请选择审核状态" :style="{ width: '182px' }">
           <a-option :value="1">审核中</a-option>
           <a-option :value="2">审核通过</a-option>
@@ -19,8 +26,8 @@
         <a-select  v-model="queryForm.payment_status" placeholder="请选择打款状态" :style="{ width: '182px' }">
           <a-option :value="0">否</a-option>
           <a-option :value="1">是</a-option>
-        </a-select>
-      </a-form-item> 
+        </a-select> 
+      </a-form-item> -->
       <a-form-item field="examine_range_time" label="审核时间范围">
         <a-range-picker
           style="width: 260px"
@@ -231,7 +238,21 @@ watch(() => queryForm.payment_range_time,
       proxy.$message.error('请勾选需要删除的数据！');
     }
   };
-
+  const changeSettle=(value)=>{
+    if(value==1){
+      queryForm.examine_status=2;
+      queryForm.payment_status=1;
+    }else if(value==2){
+      queryForm.examine_status=2;
+      queryForm.payment_status=0;
+    }else if(value==3){
+      queryForm.examine_status=3;
+      delete queryForm.payment_status;
+    }else{
+      delete queryForm.examine_status;
+     delete queryForm.payment_status;
+    }
+  }
   /**
    * 分页改变
    * @param {Number} [page]
@@ -267,14 +288,15 @@ watch(() => queryForm.payment_range_time,
       page_size: pager.page_size,
       ...queryForm,
     };
-
     getWithdrawalInfo(params);
   };
 
   // 重置搜索
   const handleResetQuery = () => {
+    delete queryForm.examine_status;
+    delete queryForm.payment_status;
     proxy.$refs.queryFormRef.resetFields();
-    getWithdrawalInfo(queryForm);
+    handleQuery();
   }