From 5b4916e4534d1b96eba849fe94201a62a87137ac Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 24 Oct 2023 14:13:57 +0800
Subject: [PATCH 01/32] =?UTF-8?q?=E9=97=AE=E8=AF=8A=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inquiry/config.js                  |  20 +-
 src/api/inquiry/sysconfig.js               |  41 ++
 src/components/addInquiryConfigModal.vue   | 421 ++++++++++++++----
 src/components/addSysconfigModal.vue       | 470 +++++++++++++++++++++
 src/components/doctorModal.vue             |   2 +-
 src/components/upload.vue                  |   2 +-
 src/layout/components/Menu/SubMenu.vue     |   4 +-
 src/utils/format.js                        |  10 +
 src/views/inquiry/inquiry-list/index.vue   |  38 +-
 src/views/inquiry/sysconfig-list/index.vue | 343 +++++++++++++++
 10 files changed, 1237 insertions(+), 114 deletions(-)
 create mode 100644 src/api/inquiry/sysconfig.js
 create mode 100644 src/components/addSysconfigModal.vue
 create mode 100644 src/views/inquiry/sysconfig-list/index.vue

diff --git a/src/api/inquiry/config.js b/src/api/inquiry/config.js
index 05d4fa3..4422262 100644
--- a/src/api/inquiry/config.js
+++ b/src/api/inquiry/config.js
@@ -14,7 +14,7 @@ export function getInquiryconfigList(params){
 export function addInquiryconfig(data){//添加配置
   return request({
     url:'/admin/inquiry/config/doctor',
-    method: 'put',
+    method: 'post',
     data
   })
 }
@@ -30,4 +30,20 @@ export function getInquiryconfigDetail(id){
       url:'/admin/inquiry/config/doctor/'+id,
       method: 'get'
     })
-  }
\ No newline at end of file
+  }
+  export function getDoctorList(params){//获取医生列表
+    return request({
+      url:'/admin/doctor/list',
+      method: 'get',
+      params
+    })
+  }
+
+  export function inquiryPriceAndTime(params){//获取问诊价格和问诊时间
+    return request({
+      url:'/admin/inquiry/config/system/detail',
+      method: 'get',
+      params
+    })
+  }
+  
\ No newline at end of file
diff --git a/src/api/inquiry/sysconfig.js b/src/api/inquiry/sysconfig.js
new file mode 100644
index 0000000..c7f1ec5
--- /dev/null
+++ b/src/api/inquiry/sysconfig.js
@@ -0,0 +1,41 @@
+import request from '../../utils/request'
+
+const url = '/admin/inquiry/config/system';
+
+
+export function getSysconfigList(params){
+  return request({
+    url:'/admin/inquiry/config/system',
+    method: 'get',
+    params
+  })
+}
+
+export function addSysconfig(data){//添加配置
+  return request({
+    url:'/admin/inquiry/config/system',
+    method: 'post',
+    data
+  })
+}
+export function editSysconfig(data,id){//添加配置
+  return request({
+    url:'/admin/inquiry/config/system/'+id,
+    method: 'put',
+    data
+  })
+}
+export function getSysconfigDetail(id){
+    return request({
+      url:'/admin/inquiry/config/system/'+id,
+      method: 'get'
+    })
+  }
+  export function getDoctorList(params){//获取医生列表
+    return request({
+      url:'/admin/doctor/list',
+      method: 'get',
+      params
+    })
+  }
+
diff --git a/src/components/addInquiryConfigModal.vue b/src/components/addInquiryConfigModal.vue
index 4b11411..03c3040 100644
--- a/src/components/addInquiryConfigModal.vue
+++ b/src/components/addInquiryConfigModal.vue
@@ -3,7 +3,7 @@
   <a-modal
     v-model:visible="modalVisible"
     fullscreen
-    title="添加问诊配置"
+    :title="title"
     title-align="start"
     :footer="false"
     @cancel="handleClose"
@@ -12,15 +12,20 @@
       <div class="bar"></div>
       <div class="name">添加医生</div>
     </div>
-    <a-form :model="modalForm" ref="modalFormRef" :auto-label-width="true">
+    <a-form :model="modalForm" ref="modalFormRefConfig" :auto-label-width="true" :rules="rules">
       <a-row :gutter="24" style="margin-top: 35px">
         <a-col :span="12">
-          <a-form-item field="avatar" :hide-label="true">
-            <a-input
-              :style="{width:'320px'}"
-              v-model="modalForm.card_num"
-              placeholder="请输入医生名字并选择想要添加的医生"
-            />
+          <a-form-item field="doctor_id" :hide-label="true">
+            <a-space direction="vertical" size="large">
+            <a-select :style="{width:'400px'}" allow-search placeholder="请选择医生" :disabled="inquiry_config_id?true:false" v-model="modalForm.doctor_id" allow-clear
+              :loading="loading" @change="changeDoctor" @search="handleDoctorList">
+              <a-option size="large" style="max-width:500px" v-for="item in doctorData" :key="item.hospital_id"
+                :value="item.doctor_id" :label="item.user_name">
+                <span v-if="item.doctor_title || item.hospital_name || item.department_custom_name"> {{item.user_name+'('+formatDoctorTitle(item.doctor_title)+item.hospital_name+item.department_custom_name+')'}}</span>
+                <span v-else> {{item.user_name}}</span>
+              </a-option>
+            </a-select> 
+        </a-space>
           </a-form-item>
         </a-col>
       </a-row>
@@ -32,10 +37,12 @@
       </div>
       <a-row :gutter="24" style="margin-top: 35px">
         <a-col :span="12">
-          <a-form-item field="avatar" :hide-label="true">
+          <a-form-item field="inquiry_type" :hide-label="true">
             <a-select
+            :disabled="inquiry_config_id?true:false" 
               v-model="modalForm.inquiry_type"
-              placeholder="请选择服务类型"
+              placeholder="请选择问诊类型"
+              @change="changeType"
               :style="{ width: '320px' }"
             >
               <!-- 1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药 -->
@@ -48,49 +55,27 @@
         </a-col>
       </a-row>
       <a-divider />
-      <div class="typebox">
-        <div class="titlebox">
-          <div class="bar"></div>
-          <div class="name">问诊价格</div>
-        </div>
-        <a-row :gutter="24" style="margin-top: 35px;">
-          <a-col :span="12">
-            <a-input
-            :style="{width:'320px'}"
-              v-model="modalForm.card_num"
-              placeholder="请选择问诊价格"
-            />
-          </a-col>
-        </a-row>
-        <a-divider /> 
-        <div class="titlebox" >
-        <div class="bar"></div>
-        <div class="name">接诊数量</div>
-      </div>
-      <a-row :gutter="24" style="margin-top: 35px;" >
-        <a-col :span="24">
-          <a-form-item field="" label="" no-style>
-            <a-space  direction="vertical" size="large">
-              <a-input-number v-model="value" :style="{width:'320px'}" placeholder="Please Enter" class="input-demo" :min="10" :max="100"/>
-            </a-space>
-          </a-form-item>
-        </a-col>
-      </a-row> 
-      </div>
-      <div class="typebox">
-        <div class="titlebox">
+      <!-- <div class="typebox" v-if="toggleType">
+    
+       
+      </div> -->
+     
+      <div class="typebox" v-if="!toggleType ">
+        <div class="titlebox" v-if="is_platform_deep_cooperation==1">
           <div class="bar"></div>
           <div class="name">问诊日期</div>
         </div>
-        <a-form>
-         <div class="timecon">
+       
+         <div class="timecon" v-if="is_platform_deep_cooperation==1">
           <div class="left">
           <a-row :gutter="24" style="margin-top: 35px;">
           <a-col :span="24">
             <el-config-provider :locale="locale">
               <a-form-item field="" label="问诊日期：" >
             <el-date-picker
-        v-model="modalForm.value1"
+            value-format="YYYY-MM-DD"
+            :style="{ width: '320px' }"
+        v-model="inquiry_date"
         type="dates"
         placeholder="选择问诊日期（可多选）"
       />
@@ -100,29 +85,30 @@
         </a-row>
         <a-row :gutter="24" >
           <a-col :span="24">
-            <el-config-provider :locale="locale">
+           
               <a-form-item field="" label="问诊时间：" >
-            <el-date-picker
-        v-model="modalForm.value1"
-        type="dates"
-        placeholder="选择问诊日期（可多选）"
-      />
+                <a-select
+                v-model="inquiry_time"
+               placeholder="请选择问诊时间"
+               multiple
+              :style="{ width: '320px' }"
+              @change="changeTime"
+            >
+              <a-option :value="item.inquiry_time_id" v-for="item in system_inquiry_time">{{ item.start_time }}—{{item.end_time}}</a-option>
+            </a-select>
     </a-form-item>
-    
-    </el-config-provider>
           </a-col>
         </a-row>
         <a-row :gutter="24" >
           <a-col :span="24">
-            
               <a-form-item field="" label="" >
                 <a-space>
                   <a-button type="primary"
-            ><icon-check-circle /> 确定</a-button
+             @click="addTime"><icon-check-circle /> 添加</a-button
           >
           <a-button @click="reset"><icon-loop /> 重置</a-button>
                 </a-space>
-              
+
     </a-form-item>
 
           </a-col>
@@ -131,17 +117,19 @@
          </div>
          <div class="line"></div>
          <div class="right">
-          <a-form-item field="" label="" >
+          <a-form-item field="doctor_inquiry_time" :hide-label="true" :rules="[{ required: true, message: '请选择问诊价格' }]">
                <div class="surebox">
                 <div class="title">已选问诊时间</div>
               <div class="timebox">
-                <a-tag color="green" closable>111</a-tag>
+                 <a-space wrap>
+                  <a-tag color="green" class="tag" closable v-for="(item,index) in slect_all_date" :key="item" @close="closeTag(index)">{{item}}</a-tag>
+                 </a-space>
               </div>
                </div>
             </a-form-item>
          </div>
          </div>
-        </a-form>
+        
         <a-divider /> 
         <div class="titlebox" >
         <div class="bar"></div>
@@ -151,13 +139,71 @@
         <a-col :span="24">
           <a-form-item field="" label="" no-style>
             <a-space  direction="vertical" size="large">
-              <a-switch />
+              <a-switch v-model="is_platform_deep_cooperation"   :checked-value="1" :unchecked-value="0"  disabled :style="{cursor:'not-allowed!important'}" />
             </a-space>
           </a-form-item>
         </a-col>
       </a-row> 
       <a-divider /> 
       </div>
+      <div class="titlebox">
+          <div class="bar"></div>
+          <div class="name">问诊价格</div>
+        </div>
+        <a-row :gutter="24" style="margin-top: 35px;">
+          <a-col :span="12">
+           <a-form-item field="inquiry_price" :hide-label="true"  v-if="modalForm.inquiry_type!=3" :rules="[{ required: true, message: '请输入问诊价格' }]">
+            <a-input-number
+             :min="min"
+             :max="max"
+            :style="{width:'180px'}"
+              v-model="modalForm.inquiry_price"
+              placeholder="输入问诊价格"
+              :disabled="modalForm.inquiry_type==2 || modalForm.inquiry_type==4"
+             
+              mode="button"
+            />
+          </a-form-item>
+            <a-form-item field="inquiry_price" :hide-label="true"  :rules="[{ required:true, message: '请添加问诊时间' }]" v-if="modalForm.inquiry_type==3">
+            <a-select
+              v-model="modalForm.inquiry_price"
+              placeholder="请选择问诊价格"
+              :style="{ width: '320px' }"
+            >
+              <a-option :value="item" v-for="item in inquiry_price_list" :key="item">{{ item }}</a-option>
+            </a-select>
+           </a-form-item>
+          </a-col>
+        </a-row>
+        <a-divider /> 
+      <div class="titlebox" >
+        <div class="bar"></div>
+        <div class="name">接诊数量</div>
+      </div>
+      <a-row :gutter="24" style="margin-top: 35px;" >
+        <a-col :span="24">
+          <a-form-item field="work_num_day" :hide-label="true">
+            <a-space  direction="vertical" size="large">
+              <a-input-number mode="button" v-model="modalForm.work_num_day" :style="{width:'180px'}" placeholder="请输入接诊数量" class="input-demo" :min="0" :max="max_patient"/> 
+            </a-space>
+          </a-form-item>
+        </a-col>
+      </a-row> 
+      <a-divider /> 
+      <div class="titlebox" >
+        <div class="bar"></div>
+        <div class="name">开启问诊</div>
+      </div>
+      <a-row :gutter="24" style="margin-top: 35px;" >
+        <a-col :span="24">
+          <a-form-item field="" :hide-label="true" :rules="[{required:true,message:'请设置问诊状态'}]">
+            <a-space  direction="vertical" size="large">
+              <a-switch v-model="modalForm.is_enable"   :checked-value="1" :unchecked-value="0" />
+            </a-space>
+          </a-form-item>
+        </a-col>
+      </a-row> 
+      <a-divider /> 
     </a-form>
     <div class="titlebox" >
         <div class="bar"></div>
@@ -167,8 +213,7 @@
         <a-col :span="24">
           <a-form-item field="" label="" no-style>
             <a-space >
-              <a-button type="primary"  @click="">开启</a-button>
-              <a-button type="primary" status="danger" @click="">关闭</a-button>
+              <a-button type="primary"  @click="handleSubmit">保存</a-button>
             </a-space>
           </a-form-item>
         </a-col>
@@ -176,37 +221,259 @@
   </a-modal>
 </template>
 <script setup>
-import { ref, toRefs } from 'vue';
-import { addInquiryconfig } from '@/api/inquiry/config';
-import { formatRelation } from '@/utils/format';
+import { ref,toRef, toRefs,onMounted,watch,getCurrentInstance,reactive } from 'vue';
+import { addInquiryconfig,getDoctorList,inquiryPriceAndTime,getInquiryconfigDetail,editInquiryconfig} from '@/api/inquiry/config';
+import { formatDoctorTitle } from '@/utils/format';
+import { parseTime } from '@/utils/parseTime';
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
-import { reactive } from 'vue';
+const { proxy } = getCurrentInstance();
 const props = defineProps({
   // 是否显示
   modalVisible: {
     type: Boolean,
     default: false,
+  },
+  inquiry_config_id:{
+   type:String,
+   default:''
   }
 });
-const  modalForm=reactive({
-  
-})
-const {modalVisible}=toRefs(props);
-const emits = defineEmits(['familyVisibleChange']);
+const is_platform_deep_cooperation=ref(null);
 
+const loading = ref(false);
+const title=ref('添加问诊配置');
+const  modalForm=reactive({
+  inquiry_mode:1,
+  inquiry_price:null,
+  doctor_inquiry_time:[],
+  is_enable:1
+})
+const locale=ref('');
+const toggleType=ref(true);
+const slect_all_date=ref([]);
+const {modalVisible,inquiry_config_id}=toRefs(props);
+const emits = defineEmits(['familyVisibleChange','freshList']);
+ // Rules
+const doctorData=ref([]);
+const handleDetail=(id)=>{
+  getInquiryconfigDetail(id).then(data=>{
+    if(data.code==200){
+      let result=data.data;
+      Object.assign(modalForm,result);
+      if (result.inquiry_type == 1 || result.inquiry_type  == 3) {
+        toggleType.value = true;
+      } else {
+        toggleType.value = false;
+      }
+      if(result.doctor_inquiry_time){
+       slect_all_date.value=result.doctor_inquiry_time.map(item=>{
+          return parseTime(item.inquiry_date,'{y}-{m}-{d}')+" "+item.start_time+"—"+item.end_time
+
+        })
+      };
+      handleInquiryPriceAndTime();
+      is_platform_deep_cooperation.value=result.user_doctor.is_platform_deep_cooperation;
+      handleDoctorList(result.user_doctor.user_name);
+
+    }
+  })
+}
+const handleDoctorList=(value)=>{
+  loading.value=true;
+  getDoctorList({
+    user_name:value
+  }).then(data=>{
+    if(data.code=200){
+      doctorData.value=data.data;
+      if(!value){
+        modalForm.doctor_id='';
+      }
+    }
+    loading.value=false;
+  })
+};
+watch(()=>props.inquiry_config_id,(newVal,oldValval)=>{
+  if(newVal){
+    title.value='修改问诊配置'
+    handleDetail(newVal)
+  }else{
+    //handleDoctorList();
+    title.value='添加问诊配置';
+    toggleType.value=true;
+  }
+},{immediate:true})
+
+ let rules = reactive({
+         doctor_id: [{ required: true, message: '请选择医生' }],
+         inquiry_type: [{ required: true, message: '请选择问诊类型' }],
+         work_num_day: [{ required: true, message: '请输入每日接诊数量' }],
+         inquiry_price: [{ required: true, message: '请输入问诊价格' }]
+ })
+
+
+const changeDoctor=(value)=>{
+   let cur=doctorData.value.filter((item)=> item.doctor_id==value);
+  
+   if(cur && cur.length==1){
+    alert(cur[0].is_platform_deep_cooperation)
+    is_platform_deep_cooperation.value=cur[0].is_platform_deep_cooperation
+   }else{
+    is_platform_deep_cooperation.value=0
+   }
+};
+
+
+const reset=()=>{
+ inquiry_date.value=[];
+ inquiry_time.value=[];
+}
+const addTime=()=>{
+  let temp=[];
+  if(inquiry_date.value.length==0){
+    proxy.$message.warning('请选择问诊日期!');
+    return false;
+  }
+  if(inquiry_time.value.length==0){
+    proxy.$message.warning('请选择问诊时间!');
+    return false;
+  }
+  let arr1=inquiry_date.value
+  let arr2=select_time.value;
+  for (let i = 0; i < arr1.length; i++) {
+        for (let j = 0; j < arr2.length; j++) {
+          temp.push(arr1[i]+" "+arr2[j]);
+        }
+  }
+  slect_all_date.value.push(...new Set(temp));
+  reset();
+}
+watch(slect_all_date,(newVal,oldVal)=>{
+  if(newVal.length>0){
+    console.log(newVal.length)
+    modalForm.doctor_inquiry_time=newVal.map((item)=>{
+      const [inquiry_date,time]=item.split(' ');
+       const [start_time,end_time]=time.split("—");
+       return {inquiry_date,start_time,end_time}
+    })
+  }else{
+    modalForm.doctor_inquiry_time=[] 
+  }
+},{deep:true})
+//删除标签tag
+const closeTag=(index)=>{
+slect_all_date.value.splice(index,1);
+}
+locale.value=zhCn;
+//最小价格
+const min=ref(0);
+const max=ref(1000000);
+const max_patient=ref(1000000);
+const system_inquiry_time=ref([]);
+//问诊日期
+const inquiry_date=ref([]);
+//问诊时间
+const inquiry_time=ref([]);
+const select_time=ref([]);
+
+
+const changeTime=(value)=>{
+  select_time.value=[];
+  let arr=system_inquiry_time.value;
+  for (let i = 0; i < arr.length; i++) {
+            for (let j = 0; j < value.length; j++) {
+                if(arr[j].inquiry_time_id === value[i]){
+                  select_time.value.push(arr[j].start_time+"—"+arr[j].end_time);
+                }
+        }
+     };
+};
+
+
+
+const changeType=(value)=>{
+  if(value==1 || value==3){
+    toggleType.value=true
+   }else{
+    toggleType.value=false
+   };
+   modalForm.doctor_inquiry_time=[];
+   modalForm.inquiry_price=null;
+   slect_all_date.value=[];
+   //切换重新验证
+    proxy.$refs.modalFormRefConfig.clearValidate();
+   handleInquiryPriceAndTime()
+}
+const inquiry_price_list=ref([]);
+const handleInquiryPriceAndTime=()=>{
+  inquiryPriceAndTime({
+    inquiry_type:modalForm.inquiry_type,
+    inquiry_mode:modalForm.inquiry_mode
+  }).then(data=>{
+    if(data.code=200){
+      const result=data.data;
+      if(modalForm.inquiry_type==1){
+        min.value=Number(result.min_inquiry_price);
+        max.value=Number(result.max_inquiry_price);
+        
+      }else if(modalForm.inquiry_type==3){
+        inquiry_price_list.value=result.inquiry_price.split(",").map((item)=>{
+           return Number(item)
+         })
+      }else{
+        system_inquiry_time.value=result.system_inquiry_time;
+        modalForm.inquiry_price=Number(result.inquiry_price);
+      };
+     
+      //modalForm.work_num_day=result.max_work_num_day;
+      max_patient.value=result.max_work_num_day;
+      // rules = reactive(rules_obj);
+    }
+  })
+}
 //添加配置
 const handleAddInquiryconfig = async () => {
-  const { data, code, message } = await AddInquiryconfig(modalForm);
-}
+  
+};
 // Akiraka 20230210 关闭弹窗
 const handleClose = () => {
+  proxy.$refs.modalFormRefConfig.resetFields();
+  reset();
   emits('familyVisibleChange', false);
+  
+
 };
-const reset=()=>{
-  alert("重置")
-}
+const handleSubmit=()=>{
+  proxy.$refs.modalFormRefConfig.validate(async (valid) => {
+      let data=null;
+      if (!valid) {
+        if(props.inquiry_config_id){
+          data= await editInquiryconfig(modalForm,props.inquiry_config_id)
+        }else{
+          data= await addInquiryconfig(modalForm);
+        }
+        if(data.code==200){
+          props.inquiry_config_id?proxy.$message.success('修改成功'):proxy.$message.success('添加成功');
+          emits('freshList', '');
+        }
+        handleClose();
+      }else {
+        console.log(valid)
+        proxy.$message.error('表单校验失败');
+        //done(false);
+      }
+    });
+};
+// onMounted(()=>{
+//   handleDoctorList()
+// })
 </script>
 <style scoped>
+.tag{
+  margin-bottom: 10px;
+}
+.tag:last-child{
+  margin-bottom: 0;
+}
 .cardNum {
   width: 150px;
 }
@@ -236,7 +503,7 @@ const reset=()=>{
 }
 .timebox{
   min-height:200px;
-  width:300px;
+  width:418px;
   margin-top: 20px;
   padding: 20px;
   border:1px solid  var(--color-neutral-3);
@@ -245,6 +512,7 @@ const reset=()=>{
 .timecon{
   display: flex;
   width: 1000px;
+  justify-content: space-between;
   align-items: center;
 }
 .left{
@@ -258,6 +526,7 @@ const reset=()=>{
 .line{
   height: 240px;
   width:2px;
+  margin:0 30px;
   background: var(--color-neutral-3);
 }
 </style>
\ No newline at end of file
diff --git a/src/components/addSysconfigModal.vue b/src/components/addSysconfigModal.vue
new file mode 100644
index 0000000..9ccc32d
--- /dev/null
+++ b/src/components/addSysconfigModal.vue
@@ -0,0 +1,470 @@
+<template>
+  <!-- Modal -->
+  <a-modal
+    v-model:visible="modalVisible"
+    fullscreen
+    :title="title"
+    title-align="start"
+    :footer="false"
+    @cancel="handleClose"
+  >
+    <a-form
+      :model="modalForm"
+      ref="modalFormRefConfig"
+      :auto-label-width="true"
+      :rules="rules"
+    >
+      <div class="titlebox">
+        <div class="bar"></div>
+        <div class="name">问诊类型</div>
+      </div>
+      <a-row :gutter="24" style="margin-top: 35px">
+        <a-col :span="12">
+          <a-form-item field="inquiry_type" :hide-label="true">
+            <a-select
+              :disabled="inquiry_config_id ? true : false"
+              v-model="modalForm.inquiry_type"
+              placeholder="请选择问诊类型"
+              @change="changeType"
+              :style="{ width: '320px' }"
+            >
+              <!-- 1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药 -->
+              <a-option :value="1">专家问诊</a-option>
+              <a-option :value="2">快速问诊</a-option>
+              <a-option :value="3">公益问诊</a-option>
+              <a-option :value="4">问诊购药</a-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-divider />
+      <!-- <div class="typebox" v-if="toggleType">
+    
+       
+      </div> -->
+
+      <div class="typebox" v-if="!toggleType">
+        <div class="titlebox" >
+          <div class="bar"></div>
+          <div class="name">问诊时间段</div>
+        </div>
+
+        <div class="timecon" >
+          <div class="left">
+            <a-row :gutter="24" style="margin-top: 35px">
+              <a-col :span="24">
+                <a-button type="primary" @click="addTime" style="margin-bottom: 10px;">添加</a-button>
+               <div class="timebox">
+                <div class="timecell">
+                  <a-form-item v-for="(item,index) in modalForm.system_inquiry_time" :key="item.id"  :field="`system_inquiry_time[${index}].start_time`"  :rules="timerules" >
+                     <div class="timecell">
+                      <div class="timetitle" :hide-label="true"> 时间范围{{index+1}}：</div>
+                  <a-time-picker
+                  type="time-range"
+                  format="HH:mm"
+                  :default-value="[item.start_time, item.end_time]"
+                  @change="(valueString, value) =>changeTime(valueString,value,index)"
+                  style="width: 252px;" />
+                  <icon-minus-circle-fill style="color:red;font-size: 25px;margin-left: 5px;" @click="delTime(index)" v-if="modalForm.system_inquiry_time.length>1"/>
+                     </div>
+                 </a-form-item>
+                </div>
+               </div>
+              </a-col>
+            </a-row>
+          </div>
+        
+        </div>
+        <a-divider />
+      </div>
+      <div class="titlebox">
+        <div class="bar"></div>
+        <div class="name">问诊价格</div>
+      </div>
+      <a-row :gutter="24" style="margin-top: 35px">
+        <a-col :span="12">
+           <div class="priceRange"  v-if="modalForm.inquiry_type == 1"  style="width:460px">
+            <div style="white-space:nowrap;margin-right: 10px;" class="pricestyle">价格范围:</div>
+          <a-form-item
+            field="min_inquiry_price"
+            :hide-label="true"
+            :rules="[{ required: true, message: '请输入最低问诊价格' }]"
+          >
+           
+            <a-input-number
+              :min="0"
+              :style="{ width: '180px' }"
+              v-model="modalForm.min_inquiry_price"
+              placeholder="输入最低问诊价格"
+              
+              mode="button"
+            />
+          </a-form-item>
+          <span class="pricestyle">&nbsp;&nbsp;~&nbsp;&nbsp; </span>
+          <a-form-item  field="max_inquiry_price"
+            :hide-label="true" style="width:auto"
+            :rules="[{ required: true, message: '请输入最高问诊价格' },{type:'number',min:modalForm.min_inquiry_price,message:'最高问诊价格不能小于最低价格'}]">
+            <a-input-number
+              :min="0"
+              :style="{ width: '180px' }"
+              v-model="modalForm.max_inquiry_price"
+              placeholder="输入最高问诊价格"
+             
+              mode="button"
+            />
+          </a-form-item>
+           </div>
+          <a-form-item
+            field="inquiry_price"
+            :hide-label="true"
+            v-if="modalForm.inquiry_type == 2 || modalForm.inquiry_type == 4"
+            :rules="[{ required: true, message: '请输入问诊价格' }]"
+          >
+            <a-input-number
+              :min="min"
+              :style="{ width: '180px' }"
+              v-model="modalForm.inquiry_price"
+              placeholder="输入问诊价格"
+              mode="button"
+            />
+          </a-form-item>
+          <a-form-item
+            field="temp_free_price"
+            :hide-label="true"
+            :rules="[
+              { type: 'array', minLength: 1, message: '请选择问诊价格' },
+            ]"
+            v-if="modalForm.inquiry_type == 3"
+          >
+            <a-select
+              v-model="modalForm.temp_free_price"
+              placeholder="请选择问诊价格（多选）"
+              multiple
+              :style="{ width: '320px' }"
+            >
+              <a-option :value="item" v-for="item in inquiry_price_list">{{
+                item
+              }}</a-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-divider />
+      <div class="titlebox">
+        <div class="bar"></div>
+        <div class="name">接诊数量</div>
+      </div>
+      <a-row :gutter="24" style="margin-top: 35px">
+        <a-col :span="24">
+          <a-form-item field="max_work_num_day" :hide-label="true">
+            <a-space direction="vertical" size="large">
+              <a-input-number
+                mode="button"
+                v-model="modalForm.max_work_num_day"
+                :style="{ width: '180px' }"
+                placeholder="请输入接诊数量"
+                class="input-demo"
+                :min="0"
+              />
+            </a-space>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-divider />
+      <div class="titlebox">
+        <div class="bar"></div>
+        <div class="name">沟通时长(分钟)</div>
+      </div>
+      <a-row :gutter="24" style="margin-top: 35px">
+        <a-col :span="24">
+          <a-form-item field="duration" :hide-label="true">
+            <a-space direction="vertical" size="large">
+              <a-input-number
+                mode="button"
+                v-model="modalForm.duration"
+                :style="{ width: '180px' }"
+                placeholder="请输入沟通时长"
+                class="input-demo"
+                :min="0"
+      
+              />
+            </a-space>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-divider />
+      <div class="titlebox">
+        <div class="bar"></div>
+        <div class="name">沟通次数(次)</div>
+      </div>
+      <a-row :gutter="24" style="margin-top: 35px">
+        <a-col :span="24">
+          <a-form-item field="times_number" :hide-label="true">
+            <a-space direction="vertical" size="large">
+              <a-input-number
+                mode="button"
+                v-model="modalForm.times_number"
+                :style="{ width: '200px' }"
+                placeholder="请输入沟通次数"
+                class="input-demo"
+                :min="0"
+              />
+            </a-space>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-divider />
+    </a-form>
+    <div class="titlebox">
+      <div class="bar"></div>
+      <div class="name">操作</div>
+    </div>
+    <a-row :gutter="24" style="margin-top: 35px">
+      <a-col :span="24">
+        <a-form-item field="" label="" no-style>
+          <a-space>
+            <a-button type="primary" @click="handleSubmit">保存</a-button>
+          </a-space>
+        </a-form-item>
+      </a-col>
+    </a-row>
+  </a-modal>
+</template>
+<script setup>
+import {
+  ref,
+  toRefs,
+  watch,
+  getCurrentInstance,
+  reactive,
+} from 'vue';
+import {
+  getSysconfigDetail,
+  editSysconfig,
+} from '@/api/inquiry/sysconfig';
+import { formatDoctorTitle } from '@/utils/format';
+
+const { proxy } = getCurrentInstance();
+const props = defineProps({
+  // 是否显示
+  modalVisible: {
+    type: Boolean,
+    default: false,
+  },
+  inquiry_config_id: {
+    type: String,
+    default: '',
+  },
+});
+const is_platform_deep_cooperation = ref(null);
+const timerules=[{
+      validator: (value, cb) => {
+        return new Promise(resolve => {
+          window.setTimeout(() => {
+            if (!value) {
+              cb('请填写时间')
+            }
+            resolve()
+          },300)
+        })
+      }
+    }];
+const loading = ref(false);
+const title = ref('添加问诊配置');
+const modalForm = reactive({
+  inquiry_mode: 1,
+  inquiry_price:0,
+  doctor_inquiry_time: [],
+  is_enable: 1,
+  temp_free_price:[],
+  max_work_num_day:null,
+  system_inquiry_time:[{
+    start_time:'',
+    end_time:'',
+    id:new Date().getTime()
+  }]
+});
+
+const handleDetail = (id) => {
+  getSysconfigDetail(id).then((data) => {
+    if (data.code == 200) {
+      let result = data.data;
+      Object.assign(modalForm, result);
+      if (result.inquiry_type == 1 || result.inquiry_type  == 3) {
+        toggleType.value = true;
+      } else {
+        toggleType.value = false;
+      }
+     
+      if(result.inquiry_type == 3){
+        modalForm.temp_free_price=result.inquiry_price.split(",").map((item)=>{
+           return Number(item)
+         })
+        for (let i = 0; i < 51; i++) {
+          inquiry_price_list.value.push(i)
+          
+        }
+      }
+      if (result.inquiry_type == 2 || result.inquiry_type == 4 ) {
+        modalForm.inquiry_price = Number(result.inquiry_price);
+      } 
+    
+    
+    }
+  });
+};
+watch(
+  () => props.inquiry_config_id,
+  (newVal, oldValval) => {
+    if (newVal) {
+      title.value = '修改系统问诊配置';
+      handleDetail(newVal);
+    }
+  },
+  { immediate: true }
+);
+const locale = ref('');
+const toggleType = ref(true);
+const { modalVisible, inquiry_config_id } = toRefs(props);
+const emits = defineEmits(['familyVisibleChange', 'freshList']);
+// Rules
+let rules = reactive({
+  inquiry_type: [{ required: true, message: '请选择问诊类型' }],
+  work_num_day: [{ required: true, message: '请输入每日接诊数量' }],
+  duration: [{ required: true, message: '请输入沟通时长' }],
+  times_number: [{ required: true, message: '请输入沟通次数' }],
+  
+});
+
+const changeDoctor = (value) => {
+  let cur = doctorData.value.filter((item) => item.doctor_id == value);
+  if (cur && cur.lenght == 1) {
+    is_platform_deep_cooperation.value = cur[0].is_platform_deep_cooperation;
+  }
+};
+const slect_all_date = ref([]);
+
+
+const addTime = () => {
+  modalForm.inquiry_price_listsystem_inquiry_time.push({ 
+  start_time:'',
+  id:new Date().getTime(),
+  end_time:''})
+};
+const delTime=(index)=>{
+  modalForm.system_inquiry_time.splice(index,1)
+}
+
+//最小价格
+const min = ref(0);
+
+const changeTime = (timeString,time,index) => {
+if(timeString){
+  modalForm.system_inquiry_time[index].start_time=timeString[0];
+ modalForm.system_inquiry_time[index].end_time=timeString[1];
+}else{
+  modalForm.system_inquiry_time[index].start_time='';
+  modalForm.system_inquiry_time[index].end_time=='';
+}
+};
+
+const changeType = (value) => {
+  if (value == 1 || value == 3) {
+    toggleType.value = true;
+  } else {
+    toggleType.value = false;
+  }
+  modalForm.inquiry_price = null;
+  //切换重新验证
+  proxy.$refs.modalFormRefConfig.clearValidate();
+};
+const inquiry_price_list = ref([]);
+
+// Akiraka 20230210 关闭弹窗
+const handleClose = () => {
+  proxy.$refs.modalFormRefConfig.resetFields();
+  emits('familyVisibleChange', false);
+};
+const handleSubmit = () => {
+  proxy.$refs.modalFormRefConfig.validate(async (valid) => {
+    if (!valid) {
+      if(modalForm.inquiry_type==3){
+        modalForm.inquiry_price=modalForm.temp_free_price.join(',')
+      }else if(modalForm.inquiry_type==2 || modalForm.inquiry_type==4){
+        modalForm.inquiry_price=String(modalForm.inquiry_price)
+      }
+      const {data,code}=await editSysconfig(modalForm, props.inquiry_config_id);
+      if (code == 200) {
+        proxy.$message.success('修改成功')
+        emits('freshList', '');
+      }
+      handleClose();
+    } else {
+      console.log(valid);
+      proxy.$message.error('表单校验失败');
+      //done(false);
+    }
+  });
+};
+</script>
+<style scoped>
+.tag {
+  margin-bottom: 10px;
+}
+.tag:last-child {
+  margin-bottom: 0;
+}
+.priceRange{
+  display: flex;
+  height: 32px;
+  vertical-align: middle;
+  align-items: center;
+ 
+}
+.pricestyle{
+  margin-bottom: 20px;
+  height: 32px;
+  align-items: center;
+  display: flex;
+}
+.arco-form-item-layout-horizontal:first-child,
+.arco-form-item-layout-horizontal:nth-child(2) {
+  align-items: center;
+}
+.cellbox {
+  margin-top: 35px;
+}
+.cellbox .cell {
+  width: 50%;
+  border-bottom: 1px dashed #efefef;
+  margin-bottom: 20px;
+}
+.cellbox .cell:first-child {
+  border: none;
+}
+
+.box {
+  display: flex;
+  align-items: center;
+}
+
+.cert .arco-form-item-label-col {
+  flex: 0 0 8px !important;
+}
+.timecon {
+  display: flex;
+  width: 1000px;
+  justify-content: space-between;
+  align-items: center;
+}
+.timecell{
+  display: flex;
+  align-items: center;
+  margin-right: 15px;
+  flex-wrap: wrap;
+}
+.timebox{
+  display: flex;
+  
+}
+</style>
\ No newline at end of file
diff --git a/src/components/doctorModal.vue b/src/components/doctorModal.vue
index b694c37..f90c0e8 100644
--- a/src/components/doctorModal.vue
+++ b/src/components/doctorModal.vue
@@ -894,7 +894,7 @@ const modalForm = reactive({
   //获取oss签名
   const getOssSign = async (scene, File) => {
     const { data, code, message } = await ossSign({
-      user_type: 4,
+      user_type: 2,
       scene,
     });
     if (code == 200) {
diff --git a/src/components/upload.vue b/src/components/upload.vue
index 3324de7..0e95aea 100644
--- a/src/components/upload.vue
+++ b/src/components/upload.vue
@@ -63,7 +63,7 @@
   const getOssSign = async (scene, File) => {
     proxy.$loading.show();
     const { data, code, message } = await ossSign({
-      user_type: 4,
+      user_type: 2,
       scene,
     });
     if (code == 200) {
diff --git a/src/layout/components/Menu/SubMenu.vue b/src/layout/components/Menu/SubMenu.vue
index a15bcbb..b3cd39d 100644
--- a/src/layout/components/Menu/SubMenu.vue
+++ b/src/layout/components/Menu/SubMenu.vue
@@ -1,7 +1,7 @@
 <template>
   <template v-for="menu in props.menuList" :key="menu.menu_id">
     <a-sub-menu
-      v-if="menu.parent_id==0"
+      v-if="menu.menu_type== 1 && menu.children"
       :key="menu.path"
     >
        <template #icon>
@@ -11,7 +11,7 @@
       <sub-menu :menuList="menu.children" />
     </a-sub-menu>
     <a-menu-item
-      v-if="menu.parent_id!=0 && isRouteParams(menu.path)"
+      v-if="menu.menu_type== 2 && isRouteParams(menu.path)"
       :key="menu.path"
       >{{ menu.menu_title }}</a-menu-item>
   </template>
diff --git a/src/utils/format.js b/src/utils/format.js
index 9285380..1530cba 100644
--- a/src/utils/format.js
+++ b/src/utils/format.js
@@ -97,4 +97,14 @@ export const formatRelation=(val)=>{
       }else{
        return ''
       }
+ };
+
+ export const formatMode=(val)=>{
+   //1:图文 2:视频 3:语音 4:电话 5:会员
+   let data={1:'图文',2:'视频', 3:'语音', 4:'电话',5:'会员'}
+      if(val){
+       return data[val]
+      }else{
+       return ''
+      }
  };
\ No newline at end of file
diff --git a/src/views/inquiry/inquiry-list/index.vue b/src/views/inquiry/inquiry-list/index.vue
index 65d4c49..222db16 100644
--- a/src/views/inquiry/inquiry-list/index.vue
+++ b/src/views/inquiry/inquiry-list/index.vue
@@ -84,7 +84,7 @@
         </template>
       </a-table>
   
-      <addInquiryConfigModal :modalVisible="modalVisible" :modalForm="modalForm" @familyVisibleChange="()=>{modalVisible=false}"></addInquiryConfigModal>
+      <addInquiryConfigModal :modalVisible="modalVisible" :inquiry_config_id="inquiry_config_id" :modalForm="modalForm" @freshList="getInquiryInfo(pager);" @familyVisibleChange="()=>{modalVisible=false;inquiry_config_id='';}"></addInquiryConfigModal>
       <!-- Akiraka 20230223 删除与批量删除 开始 -->
       <!-- <DeleteModal :data="deleteData" :visible="deleteVisible" :apiDelete="removeFamily"
         @deleteVisibleChange="() => deleteVisible = false" /> -->
@@ -101,7 +101,7 @@
   
   <script setup>
     import { reactive, ref, getCurrentInstance, onMounted, nextTick, watch, computed } from 'vue';
-    import { getInquiryconfigList,getInquiryconfigDetail} from '@/api/inquiry/config';
+    import { getInquiryconfigList} from '@/api/inquiry/config';
     import {formatDoctorTitle,formatInquiryType,formatMultipoint} from "@/utils/format"
   
     // Akiraka 20230210 删除数据
@@ -110,7 +110,7 @@
     const deleteVisible = ref(false)
     // Akiraka 20230210 监听删除事件
     const okVisible = ref(false);
-  
+   const inquiry_config_id=ref("");
     watch(() => deleteVisible.value, (value) => {
       if (value == false) {
         getInquiryInfo(pager);
@@ -184,39 +184,13 @@
     // 新增Satus
     const handleAdd = () => {
       modalVisible.value = true;
-      modalTitle.value = '新增患者';
-      modalSatus.value = 'add';
-      modalForm.patient_id = null;
+      inquiry_config_id.value='';
     };
   
     //详情
     const handleDetail = async (record) => {
-      const { code, data, message } = await getInquiryconfigDetail(record.family_id);
-  
-      if (code == 200) {
-          Object.assign(modalForm, data);
-          modalVisible.value = true;
-        }
-      };
-    // 批量删除
-    const handleBatchDelete = () => {
-      if (batchList.length !== 0) {
-        proxy.$modal.warning({
-          title: '提示',
-          content: '是否批量删除以下选中的数据？',
-          hideCancel: false,
-          onOk: async () => {
-            const res = await removeFamily({ ids: batchList });
-            proxy.$message.success(res.message);
-            getInquiryInfo(pager);
-          },
-          onCancel: () => {
-            proxy.$message.info('已取消批量删除数据');
-          },
-        });
-      } else {
-        proxy.$message.error('请勾选需要删除的数据！');
-      }
+      inquiry_config_id.value=record.inquiry_config_id;
+      modalVisible.value = true;
     };
   
     /**
diff --git a/src/views/inquiry/sysconfig-list/index.vue b/src/views/inquiry/sysconfig-list/index.vue
new file mode 100644
index 0000000..1f593f8
--- /dev/null
+++ b/src/views/inquiry/sysconfig-list/index.vue
@@ -0,0 +1,343 @@
+<template>
+    <div class="app-container">
+      <a-form :model="queryForm" ref="queryFormRef" layout="inline">
+  
+        <a-form-item field="inquiry_type" label="问诊类型">
+        <a-select  v-model="queryForm.inquiry_type" placeholder="请选择服务类型" :style="{ width: '182px' }">
+          <!-- 1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药 -->
+          <a-option :value="1">专家问诊</a-option>
+          <a-option :value="2">快速问诊</a-option>
+          <a-option :value="3">公益问诊</a-option>
+          <a-option :value="4">问诊购药</a-option>
+        </a-select>
+        
+      </a-form-item>
+         <a-form-item field="is_enable" label="接诊方式">
+          <a-select  v-model="queryForm.inquiry_mode" placeholder="请选择接诊方式" :style="{ width: '182px' }">
+            <a-option :value="1">图文</a-option>
+            <a-option :value="2">视频</a-option>
+            <a-option :value="3">语音</a-option>
+            <a-option :value="4">电话</a-option>
+            <a-option :value="5">会员</a-option>
+          </a-select>
+        </a-form-item>
+        
+        <a-form-item>
+          <a-space>
+            <a-button type="primary" @click="handleQuery"><icon-search /> 搜索</a-button>
+            <a-button @click="handleResetQuery"><icon-loop /> 重置</a-button>
+          </a-space>
+        </a-form-item>
+      </a-form>
+  
+      <a-divider />
+  
+      <!-- action -->
+      <!-- <div class="action">
+        <a-space>
+          <a-button v-has="'admin:sysFamilyList:add'" type="primary" @click="handleAdd"><icon-plus /> 新增 </a-button>
+           <a-button v-has="'admin:sysFamilyList:remove'" type="primary" status="danger"><icon-delete /> 批量删除 </a-button> 
+        </a-space>
+      </div>  -->
+  
+      <!-- table -->
+      <a-table :columns="columns" :data="tableData" 
+      :scroll="{ x: 1400 }"
+        :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)}"
+        @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
+        <template #doctor_id="{record,rowIndex}">
+          <div>{{(rowIndex+1)+(pager.page-1)*10}}</div>
+        </template>
+        <template #inquiry_mode="{ record }">
+           <div>{{ formatMode(record.inquiry_mode) }}</div>
+        </template>
+        <template #inquiry_price="{ record }">
+          <div v-if="record.inquiry_price">{{ record.inquiry_price}}</div>
+        </template>
+    
+        <template #inquiry_type="{record}">
+          <div>{{ formatInquiryType(record.inquiry_type) }}</div>
+        </template>
+        <template #times_number="{record}">
+          <div  v-if="record.times_number==0" >不限次数</div>
+          <div v-else>{{record.times_number}}次</div>
+        </template>
+        <template #duration="{record}">
+          <div  v-if="record.duration==0" >不限时长</div>
+          <div v-else-if="record.duration>0 && record.duration<60">{{record.duration}}分钟</div>
+          <div v-else-if="record.duration>=60">{{record.duration/60}}小时</div>
+        </template>
+      
+        <template #action="{ record }">
+          <a-space>
+            <a-button v-has="'admin:sysFamilyList:detail'" type="text"
+              @click="handleDetail(record)"><icon-edit />修改</a-button>
+            <!-- <a-button v-has="'admin:sysFamilyList:edit'" type="text" @click="handleUpdate(record)"><icon-edit />
+              修改</a-button> -->
+            <!-- <a-button v-has="'admin:sysFamilyList:remove'" type="text"
+              @click="() => { deleteVisible = true; deleteData = [record.doctor_id];  }"><icon-delete /> 删除</a-button> -->
+          </a-space>
+        </template>
+      </a-table>
+  
+     
+      <addSysconfigModal :modalVisible="modalVisible" :inquiry_config_id="inquiry_config_id" :modalForm="modalForm" @freshList="getInquiryInfo(pager);" @familyVisibleChange="()=>{modalVisible=false;inquiry_config_id='';}"></addSysconfigModal>
+      <!-- Akiraka 20230223 删除与批量删除 开始 -->
+      <!-- <DeleteModal :data="deleteData" :visible="deleteVisible" :apiDelete="removeFamily"
+        @deleteVisibleChange="() => deleteVisible = false" /> -->
+      <!-- Akiraka 20230223 删除与批量删除 结束 -->
+      <a-modal v-model:visible="okVisible" :modal-style="{width:'320px'}" body-class="okmodal" 
+        @cancel="()=>okVisible=false">
+        <template #title>
+          提示
+        </template>
+        <div>确定保存当前信息？</div>
+      </a-modal>
+    </div>
+  </template>
+  
+  <script setup>
+    import { reactive, ref, getCurrentInstance, onMounted, nextTick, watch, computed } from 'vue';
+    import { getSysconfigList} from '@/api/inquiry/sysconfig';
+    import {formatMode,formatInquiryType} from "@/utils/format"
+  
+    // Akiraka 20230210 删除数据
+    const deleteData = ref([])
+    // Akiraka 20230210 删除对话框
+    const deleteVisible = ref(false)
+    // Akiraka 20230210 监听删除事件
+    const okVisible = ref(false);
+   const inquiry_config_id=ref("");
+    watch(() => deleteVisible.value, (value) => {
+      if (value == false) {
+        getInquiryInfo(pager);
+      }
+    });
+  
+    const file = ref();
+    const { proxy } = getCurrentInstance();
+    const currentPage = ref(1);
+    const family_data=ref([]);
+    const family_columns=ref([{
+      title: '编号',
+      dataIndex: 'code',
+      slotName:'code'
+    },{
+      title: '就诊人姓名',
+      dataIndex: 'card_name_mask',
+    },{
+      title: '身份证号',
+      dataIndex: 'id_number_mask',
+    },{
+      title: '与账号关系',
+      dataIndex: 'relation',
+      slotName:'relation'
+    },{
+      title: '添加时间',
+      dataIndex: 'created_at',
+      slotName:'created_at'
+    }, { title: '操作', slotName: 'action'}])
+    // Pager
+    const pager = {
+      total: 0,
+      page: 1,
+      page_size: 10,
+    };
+    // form
+    const queryForm = reactive({
+  
+    });
+    const modalForm = reactive({
+      user:{},
+      avatar: 'https://img.applets.igandanyiyuan.com/basic/file/patient_avatar.png',
+   
+    });
+    // Modal
+    const modalVisible = ref(false);
+    const modalTitle = ref('默认标题');
+   
+    // Batch Del List
+    let batchList = [];
+  
+    // Table Columns
+    const columns = [
+      { title: '编号', dataIndex: 'doctor_id', slotName: 'doctor_id', width: '90' },
+      {
+      title: '问诊类型',
+      dataIndex: 'inquiry_type',
+      slotName:'inquiry_type'
+    },{
+      title: '接诊方式',
+      dataIndex: 'inquiry_mode',
+      slotName:'inquiry_mode'
+    },{
+      title: '接诊价格',
+      dataIndex: 'inquiry_price',
+      slotName:'inquiry_price'
+    },
+    {
+      title: '最高接诊价格',
+      dataIndex: 'max_inquiry_price',
+      slotName:'max_inquiry_price'
+    },
+    {
+      title: '最低接诊价格',
+      dataIndex: 'min_inquiry_price',
+      slotName:'min_inquiry_price'
+    },
+    {
+      title: '沟通次数',
+      dataIndex: 'times_number',
+      slotName:'times_number'
+    },
+    {
+      title: '沟通时长',
+      dataIndex: 'duration',
+      slotName:'duration'
+     },
+     { title: '操作', slotName: 'action', fixed: "right", width: 150 }]
+  
+    // Table Data
+    const tableData = ref([]);
+    //弹框状态
+    const modalSatus = ref('add');
+  
+    // 新增Satus
+    const handleAdd = () => {
+      modalVisible.value = true;
+      inquiry_config_id.value='';
+    };
+  
+    //详情
+    const handleDetail = async (record) => {
+      inquiry_config_id.value=record.system_inquiry_config_id;
+      modalVisible.value = true;
+    };
+  
+    /**
+     * 分页改变
+     * @param {Number} [page]
+     */
+    const handlePageChange = (page) => {
+      pager.page = page;
+  
+      // 修改当前页码
+      currentPage.value = page;
+      getInquiryInfo({ ...pager, ...queryForm });
+    };
+  
+    // 每页数据量
+    const handlepage_sizeChange = (page_size) => {
+      pager.page_size = page_size;
+      getInquiryInfo({ ...pager, ...queryForm });
+    };
+  
+    // 获取患者信息
+    const getInquiryInfo = async (params = {}) => {
+      const { data, code, message } = await getSysconfigList(params);
+      if (code == 200) {
+        tableData.value = data.data;
+        Object.assign(pager, { total: data.total, page: data.page, page_size: data.page_size });
+      }
+    };
+  
+    // 查询患者信息
+    const handleQuery = async () => {
+      pager.page = 1;
+      const params = {
+        page: pager.page,
+        page_size: pager.page_size,
+        ...queryForm,
+      };
+  
+      getInquiryInfo(params);
+    };
+  
+    // 重置搜索
+    const handleResetQuery = () => {
+      proxy.$refs.queryFormRef.resetFields();
+      getInquiryInfo(queryForm);
+    }
+    
+    
+    onMounted(() => {
+      getInquiryInfo(pager);
+    });
+  </script>
+  
+  <style lang="scss" scoped>
+    .action {
+      margin-bottom: 12px;
+    }
+  
+    .okmodal div {
+      text-align: center;
+    }
+  
+    .hospital_name {
+      width: 140px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  
+    .headImg {
+      margin-right: 20px;
+      border-radius: 50%;
+      width: 80px;
+      height: 80px;
+    }
+  
+    .arco-form-item-layout-horizontal:first-child,
+    .arco-form-item-layout-horizontal:nth-child(2) {
+      align-items: center;
+    }
+    .cellbox{
+      margin-top: 35px;
+    }
+    .cellbox .cell{
+      width:50%;
+      border-bottom:1px dashed #efefef;
+      margin-bottom: 20px;
+    }
+    .cellbox .cell:first-child{
+      border: none;
+    }
+    .cell{
+      .arco-form-item{
+        margin-bottom: 10px;
+      }
+    }
+    .box {
+      display: flex;
+      align-items: center;
+    }
+  
+    .cert .arco-form-item-label-col {
+      flex: 0 0 8px !important;
+    }
+  
+    .red {
+      display: inline-block;
+      margin-right: 5px;
+      font-size: 14px;
+      color: red;
+      margin-top: 5px;
+    }
+  
+    .cardNum {
+      width: 148px;
+    }
+    .codbox{
+      display: flex;
+      align-items: center;
+    }
+    .reason{
+      width:250px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  </style>
\ No newline at end of file

From 45da0d169959c1cf2be1b81907a5b9e14e544340 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 24 Oct 2023 14:30:38 +0800
Subject: [PATCH 02/32] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/addInquiryConfigModal.vue   | 19 +++++++++----------
 src/components/addSysconfigModal.vue       |  2 +-
 src/views/inquiry/inquiry-list/index.vue   |  4 ++--
 src/views/inquiry/sysconfig-list/index.vue |  2 +-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/components/addInquiryConfigModal.vue b/src/components/addInquiryConfigModal.vue
index 03c3040..8ee374f 100644
--- a/src/components/addInquiryConfigModal.vue
+++ b/src/components/addInquiryConfigModal.vue
@@ -17,12 +17,12 @@
         <a-col :span="12">
           <a-form-item field="doctor_id" :hide-label="true">
             <a-space direction="vertical" size="large">
-            <a-select :style="{width:'400px'}" allow-search placeholder="请选择医生" :disabled="inquiry_config_id?true:false" v-model="modalForm.doctor_id" allow-clear
+            <a-select :style="{width:'320px'}" allow-search placeholder="请输入医生姓名" :disabled="inquiry_config_id?true:false" v-model="modalForm.doctor_id" allow-clear
               :loading="loading" @change="changeDoctor" @search="handleDoctorList">
               <a-option size="large" style="max-width:500px" v-for="item in doctorData" :key="item.hospital_id"
                 :value="item.doctor_id" :label="item.user_name">
-                <span v-if="item.doctor_title || item.hospital_name || item.department_custom_name"> {{item.user_name+'('+formatDoctorTitle(item.doctor_title)+item.hospital_name+item.department_custom_name+')'}}</span>
-                <span v-else> {{item.user_name}}</span>
+                <span v-if="item.doctor_title || item.hospital_name || item.department_custom_name" :title="item.user_name+'('+formatDoctorTitle(item.doctor_title)+item.hospital_name+item.department_custom_name+')'"> {{item.user_name+'('+formatDoctorTitle(item.doctor_title)+item.hospital_name+item.department_custom_name+')'}}</span>
+                <span v-else :title="item.user_name"> {{item.user_name}}</span>
               </a-option>
             </a-select> 
         </a-space>
@@ -164,7 +164,7 @@
               mode="button"
             />
           </a-form-item>
-            <a-form-item field="inquiry_price" :hide-label="true"  :rules="[{ required:true, message: '请添加问诊时间' }]" v-if="modalForm.inquiry_type==3">
+            <a-form-item field="inquiry_price" :hide-label="true"  :rules="[{ required:true, message: '请选择问诊价格' }]" v-if="modalForm.inquiry_type==3">
             <a-select
               v-model="modalForm.inquiry_price"
               placeholder="请选择问诊价格"
@@ -213,7 +213,7 @@
         <a-col :span="24">
           <a-form-item field="" label="" no-style>
             <a-space >
-              <a-button type="primary"  @click="handleSubmit">保存</a-button>
+              <a-button type="primary"  @click="handleSubmit" v-has="'admin:sysDoctorconfigList:save'">保存</a-button>
             </a-space>
           </a-form-item>
         </a-col>
@@ -294,17 +294,17 @@ const handleDoctorList=(value)=>{
 };
 watch(()=>props.inquiry_config_id,(newVal,oldValval)=>{
   if(newVal){
-    title.value='修改问诊配置'
+    title.value='修改医生问诊配置'
     handleDetail(newVal)
   }else{
     //handleDoctorList();
-    title.value='添加问诊配置';
+    title.value='添加医生问诊配置';
     toggleType.value=true;
   }
 },{immediate:true})
 
  let rules = reactive({
-         doctor_id: [{ required: true, message: '请选择医生' }],
+         doctor_id: [{ required: true, message: '请输入医生姓名' }],
          inquiry_type: [{ required: true, message: '请选择问诊类型' }],
          work_num_day: [{ required: true, message: '请输入每日接诊数量' }],
          inquiry_price: [{ required: true, message: '请输入问诊价格' }]
@@ -414,11 +414,10 @@ const handleInquiryPriceAndTime=()=>{
       if(modalForm.inquiry_type==1){
         min.value=Number(result.min_inquiry_price);
         max.value=Number(result.max_inquiry_price);
-        
       }else if(modalForm.inquiry_type==3){
         inquiry_price_list.value=result.inquiry_price.split(",").map((item)=>{
            return Number(item)
-         })
+         }).sort((a, b)=>{return a-b})
       }else{
         system_inquiry_time.value=result.system_inquiry_time;
         modalForm.inquiry_price=Number(result.inquiry_price);
diff --git a/src/components/addSysconfigModal.vue b/src/components/addSysconfigModal.vue
index 9ccc32d..1336458 100644
--- a/src/components/addSysconfigModal.vue
+++ b/src/components/addSysconfigModal.vue
@@ -223,7 +223,7 @@
       <a-col :span="24">
         <a-form-item field="" label="" no-style>
           <a-space>
-            <a-button type="primary" @click="handleSubmit">保存</a-button>
+            <a-button type="primary" @click="handleSubmit" v-has="'admin:sysconfigList:save'">保存</a-button>
           </a-space>
         </a-form-item>
       </a-col>
diff --git a/src/views/inquiry/inquiry-list/index.vue b/src/views/inquiry/inquiry-list/index.vue
index 222db16..6afca19 100644
--- a/src/views/inquiry/inquiry-list/index.vue
+++ b/src/views/inquiry/inquiry-list/index.vue
@@ -39,7 +39,7 @@
       <!-- action -->
       <div class="action">
         <a-space>
-          <a-button v-has="'admin:sysFamilyList:add'" type="primary" @click="handleAdd"><icon-plus /> 新增 </a-button>
+          <a-button v-has="'admin:sysDoctorconfigList:add'" type="primary" @click="handleAdd"><icon-plus /> 新增 </a-button>
           <!-- <a-button v-has="'admin:sysFamilyList:remove'" type="primary" status="danger"><icon-delete /> 批量删除 </a-button>  -->
         </a-space>
       </div> 
@@ -74,7 +74,7 @@
         </template>
         <template #action="{ record }">
           <a-space>
-            <a-button v-has="'admin:sysFamilyList:detail'" type="text"
+            <a-button v-has="'admin:sysDoctorconfigList:edit'" type="text"
               @click="handleDetail(record)"><icon-edit />修改</a-button>
             <!-- <a-button v-has="'admin:sysFamilyList:edit'" type="text" @click="handleUpdate(record)"><icon-edit />
               修改</a-button> -->
diff --git a/src/views/inquiry/sysconfig-list/index.vue b/src/views/inquiry/sysconfig-list/index.vue
index 1f593f8..5d930f8 100644
--- a/src/views/inquiry/sysconfig-list/index.vue
+++ b/src/views/inquiry/sysconfig-list/index.vue
@@ -72,7 +72,7 @@
       
         <template #action="{ record }">
           <a-space>
-            <a-button v-has="'admin:sysFamilyList:detail'" type="text"
+            <a-button v-has="'admin:sysconfigList:detail'" type="text"
               @click="handleDetail(record)"><icon-edit />修改</a-button>
             <!-- <a-button v-has="'admin:sysFamilyList:edit'" type="text" @click="handleUpdate(record)"><icon-edit />
               修改</a-button> -->

From 203baeb792c9ebcc5054bab05c11bc6091687464 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 24 Oct 2023 16:52:08 +0800
Subject: [PATCH 03/32] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BB=E7=94=9F?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/addInquiryConfigModal.vue   |  9 ++++---
 src/components/addSysconfigModal.vue       |  1 +
 src/views/doctor/doctor-list/index.vue     | 29 +++++++++++++++++-----
 src/views/inquiry/sysconfig-list/index.vue |  1 +
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/components/addInquiryConfigModal.vue b/src/components/addInquiryConfigModal.vue
index 8ee374f..14b96c3 100644
--- a/src/components/addInquiryConfigModal.vue
+++ b/src/components/addInquiryConfigModal.vue
@@ -74,6 +74,7 @@
               <a-form-item field="" label="问诊日期：" >
             <el-date-picker
             value-format="YYYY-MM-DD"
+            :disabled-date="disabledDate"
             :style="{ width: '320px' }"
         v-model="inquiry_date"
         type="dates"
@@ -247,7 +248,10 @@ const  modalForm=reactive({
   inquiry_price:null,
   doctor_inquiry_time:[],
   is_enable:1
-})
+});
+const disabledDate=(time)=>{
+  return time.getTime() < Date.now();
+}
 const locale=ref('');
 const toggleType=ref(true);
 const slect_all_date=ref([]);
@@ -300,6 +304,7 @@ watch(()=>props.inquiry_config_id,(newVal,oldValval)=>{
     //handleDoctorList();
     title.value='添加医生问诊配置';
     toggleType.value=true;
+    modalForm.inquiry_price=null
   }
 },{immediate:true})
 
@@ -313,9 +318,7 @@ watch(()=>props.inquiry_config_id,(newVal,oldValval)=>{
 
 const changeDoctor=(value)=>{
    let cur=doctorData.value.filter((item)=> item.doctor_id==value);
-  
    if(cur && cur.length==1){
-    alert(cur[0].is_platform_deep_cooperation)
     is_platform_deep_cooperation.value=cur[0].is_platform_deep_cooperation
    }else{
     is_platform_deep_cooperation.value=0
diff --git a/src/components/addSysconfigModal.vue b/src/components/addSysconfigModal.vue
index 1336458..aba68b5 100644
--- a/src/components/addSysconfigModal.vue
+++ b/src/components/addSysconfigModal.vue
@@ -33,6 +33,7 @@
               <a-option :value="2">快速问诊</a-option>
               <a-option :value="3">公益问诊</a-option>
               <a-option :value="4">问诊购药</a-option>
+             
             </a-select>
           </a-form-item>
         </a-col>
diff --git a/src/views/doctor/doctor-list/index.vue b/src/views/doctor/doctor-list/index.vue
index 249bfc5..32cb2e6 100644
--- a/src/views/doctor/doctor-list/index.vue
+++ b/src/views/doctor/doctor-list/index.vue
@@ -368,11 +368,11 @@
           </a-col>
         </a-row>
         <a-divider />
-        <div class="titlebox">
+        <div class="titlebox" v-if="modalForm.doctor_bank_card">
           <div class="bar"></div>
           <div class="name">银行卡信息</div>
         </div>
-        <a-row :gutter="24" style="margin-top: 35px;">
+        <a-row :gutter="24" style="margin-top: 35px;" v-if="modalForm.doctor_bank_card">
           <a-col :span="12">
             <a-form-item field="doctor_bank_card.province_id" label="开户银行所在地：">
               <a-space size="large" style="margin-right: 12px;">
@@ -409,15 +409,15 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
+        <a-row :gutter="24" v-if="modalForm.doctor_bank_card">
           <a-col :span="12">
             <a-form-item field="bank_card_code" label="银行卡号：">
               <a-input v-model="modalForm.bank_card_code" placeholder="请输入银行卡号" />
             </a-form-item>
           </a-col>
         </a-row>
-        <a-divider />
-        <div class="titlebox">
+        <a-divider v-if="modalForm.doctor_bank_card"/>
+        <div class="titlebox" v-if="(modalForm.user_doctor_info.license_cert && modalForm.user_doctor_info.license_cert.length>0) || modalSatus!='detail'">
           <div class="bar"></div>
           <div class="name">医师证件</div>
         </div>
@@ -557,8 +557,25 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-divider v-show="modalSatus!='detail'" />
+        <a-divider v-if="(modalForm.user_doctor_info.license_cert && modalForm.user_doctor_info.license_cert.length>0) || modalSatus!='detail'"/>
+        <div class="titlebox">
+          <div class="bar"></div>
+          <div class="name">CA证书配置</div>
+        </div>
+        <a-row :gutter="24" style="margin-top: 35px;" >
+        <a-col :span="24">
+          <a-form-item field="" label="" no-style>
+            <div>证书有效期:2023.02.01-2023.08.01</div>
+            <a-space style="margin-top: 15px;">
+              <a-button type="primary" status="success">更新</a-button>
+              <a-button type="primary" status="danger">注销</a-button>
+              <a-button type="primary" >重新申请</a-button>
+            </a-space>
+          </a-form-item>
+        </a-col>
+      </a-row>
       </a-form>
+      <a-divider v-show="modalSatus!='detail'" />
       <div class="titlebox" v-if="modalSatus!='detail'">
         <div class="bar"></div>
         <div class="name">操作</div>
diff --git a/src/views/inquiry/sysconfig-list/index.vue b/src/views/inquiry/sysconfig-list/index.vue
index 5d930f8..b2e6ab3 100644
--- a/src/views/inquiry/sysconfig-list/index.vue
+++ b/src/views/inquiry/sysconfig-list/index.vue
@@ -9,6 +9,7 @@
           <a-option :value="2">快速问诊</a-option>
           <a-option :value="3">公益问诊</a-option>
           <a-option :value="4">问诊购药</a-option>
+          <a-option :value="5">糖组检测</a-option>
         </a-select>
         
       </a-form-item>

From 7ed1a3862ee85ca27445d39e191008fc49fd1cd8 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 24 Oct 2023 17:32:36 +0800
Subject: [PATCH 04/32] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inquiry/sysconfig-list/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/inquiry/sysconfig-list/index.vue b/src/views/inquiry/sysconfig-list/index.vue
index b2e6ab3..b18c42a 100644
--- a/src/views/inquiry/sysconfig-list/index.vue
+++ b/src/views/inquiry/sysconfig-list/index.vue
@@ -73,7 +73,7 @@
       
         <template #action="{ record }">
           <a-space>
-            <a-button v-has="'admin:sysconfigList:detail'" type="text"
+            <a-button v-has="'admin:sysconfigList:edit'" type="text"
               @click="handleDetail(record)"><icon-edit />修改</a-button>
             <!-- <a-button v-has="'admin:sysFamilyList:edit'" type="text" @click="handleUpdate(record)"><icon-edit />
               修改</a-button> -->

From 4dad81c031939a32fc42fa6c3352406ba746dbf2 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 25 Oct 2023 09:37:13 +0800
Subject: [PATCH 05/32] =?UTF-8?q?bug=20=E9=97=AE=E8=AF=8A=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/addInquiryConfigModal.vue   | 17 ++++++++++-------
 src/components/addSysconfigModal.vue       | 15 ++++++++++++---
 src/views/inquiry/inquiry-list/index.vue   | 13 ++++++++++---
 src/views/inquiry/sysconfig-list/index.vue |  2 +-
 4 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/components/addInquiryConfigModal.vue b/src/components/addInquiryConfigModal.vue
index 14b96c3..41895ea 100644
--- a/src/components/addInquiryConfigModal.vue
+++ b/src/components/addInquiryConfigModal.vue
@@ -140,7 +140,8 @@
         <a-col :span="24">
           <a-form-item field="" label="" no-style>
             <a-space  direction="vertical" size="large">
-              <a-switch v-model="is_platform_deep_cooperation"   :checked-value="1" :unchecked-value="0"  disabled :style="{cursor:'not-allowed!important'}" />
+              <div v-if="is_platform_deep_cooperation==1">是</div>
+              <div v-else>否</div>
             </a-space>
           </a-form-item>
         </a-col>
@@ -149,7 +150,7 @@
       </div>
       <div class="titlebox">
           <div class="bar"></div>
-          <div class="name">问诊价格</div>
+          <div class="name">问诊价格（元）</div>
         </div>
         <a-row :gutter="24" style="margin-top: 35px;">
           <a-col :span="12">
@@ -179,13 +180,13 @@
         <a-divider /> 
       <div class="titlebox" >
         <div class="bar"></div>
-        <div class="name">接诊数量</div>
+        <div class="name">每日最大接诊量</div>
       </div>
       <a-row :gutter="24" style="margin-top: 35px;" >
         <a-col :span="24">
           <a-form-item field="work_num_day" :hide-label="true">
             <a-space  direction="vertical" size="large">
-              <a-input-number mode="button" v-model="modalForm.work_num_day" :style="{width:'180px'}" placeholder="请输入接诊数量" class="input-demo" :min="0" :max="max_patient"/> 
+              <a-input-number mode="button" v-model="modalForm.work_num_day" :style="{width:'180px'}" placeholder="每日最大接诊量" class="input-demo" :min="0" :max="max_patient"/> 
             </a-space>
           </a-form-item>
         </a-col>
@@ -250,7 +251,7 @@ const  modalForm=reactive({
   is_enable:1
 });
 const disabledDate=(time)=>{
-  return time.getTime() < Date.now();
+  return time.getTime() < Date.now() - 8.64e7;
 }
 const locale=ref('');
 const toggleType=ref(true);
@@ -329,7 +330,8 @@ const changeDoctor=(value)=>{
 const reset=()=>{
  inquiry_date.value=[];
  inquiry_time.value=[];
-}
+};
+let temp_date=[];
 const addTime=()=>{
   let temp=[];
   if(inquiry_date.value.length==0){
@@ -347,7 +349,8 @@ const addTime=()=>{
           temp.push(arr1[i]+" "+arr2[j]);
         }
   }
-  slect_all_date.value.push(...new Set(temp));
+  temp_date=temp_date.concat(temp);
+  slect_all_date.value=[...new Set(temp_date)];
   reset();
 }
 watch(slect_all_date,(newVal,oldVal)=>{
diff --git a/src/components/addSysconfigModal.vue b/src/components/addSysconfigModal.vue
index aba68b5..ed97b72 100644
--- a/src/components/addSysconfigModal.vue
+++ b/src/components/addSysconfigModal.vue
@@ -80,7 +80,7 @@
       </div>
       <div class="titlebox">
         <div class="bar"></div>
-        <div class="name">问诊价格</div>
+        <div class="name">问诊价格（元）</div>
       </div>
       <a-row :gutter="24" style="margin-top: 35px">
         <a-col :span="12">
@@ -153,7 +153,7 @@
       <a-divider />
       <div class="titlebox">
         <div class="bar"></div>
-        <div class="name">接诊数量</div>
+        <div class="name">每日最大接诊量</div>
       </div>
       <a-row :gutter="24" style="margin-top: 35px">
         <a-col :span="24">
@@ -163,7 +163,7 @@
                 mode="button"
                 v-model="modalForm.max_work_num_day"
                 :style="{ width: '180px' }"
-                placeholder="请输入接诊数量"
+                placeholder="每日最大接诊量"
                 class="input-demo"
                 :min="0"
               />
@@ -189,8 +189,11 @@
                 :min="0"
       
               />
+             
             </a-space>
+           
           </a-form-item>
+          <div class="tip">备注：0代表不限时长</div>
         </a-col>
       </a-row>
       <a-divider />
@@ -211,7 +214,9 @@
                 :min="0"
               />
             </a-space>
+            
           </a-form-item>
+          <div class="tip">备注：0代表不限次数</div>
         </a-col>
       </a-row>
       <a-divider />
@@ -409,6 +414,10 @@ const handleSubmit = () => {
 };
 </script>
 <style scoped>
+.tip{
+  font-size: 12px;
+  color:#666;
+}
 .tag {
   margin-bottom: 10px;
 }
diff --git a/src/views/inquiry/inquiry-list/index.vue b/src/views/inquiry/inquiry-list/index.vue
index 6afca19..28f798e 100644
--- a/src/views/inquiry/inquiry-list/index.vue
+++ b/src/views/inquiry/inquiry-list/index.vue
@@ -3,7 +3,7 @@
       <a-form :model="queryForm" ref="queryFormRef" layout="inline">
   
         <a-form-item field="doctor_name" label="医生姓名">
-          <a-input :style="{ width: '182px' }" v-model="queryForm.user_name" placeholder="请输入账号或者姓名" @press-enter="handleQuery" />
+          <a-input :style="{ width: '182px' }" v-model="queryForm.doctor_name" placeholder="请输入账号或者姓名" @press-enter="handleQuery" />
         </a-form-item>
         <a-form-item field="mobile" label="电话号码">
           <a-input :style="{ width: '182px' }" v-model="queryForm.mobile" placeholder="请输入电话号码" @press-enter="handleQuery" />
@@ -20,8 +20,8 @@
       </a-form-item>
          <a-form-item field="is_enable" label="启用状态">
           <a-select  v-model="queryForm.is_enable" placeholder="请选择启用状态" :style="{ width: '182px' }">
-            <a-option :value="0">否</a-option>
-            <a-option :value="1">是</a-option>
+            <a-option :value="0">禁用</a-option>
+            <a-option :value="1">正常</a-option>
   
           </a-select>
         </a-form-item>
@@ -68,6 +68,12 @@
           <div class="reason" v-if="record.last_enable_method==1" >自己</div>
           <div v-else>后台</div>
         </template>
+        <template #is_enable="{record}">
+          <a-tag v-if="record.is_enable == 0" color="red">禁用</a-tag>
+         <a-tag v-else-if="record.is_enable== 1" color="green">正常</a-tag>
+       
+        </template>
+        
         <template #relation="{record}">
           <div>{{formatRelation(record.relation)}}</div>
          
@@ -172,6 +178,7 @@
        { title: '接诊数量', dataIndex: 'work_num_day' },
        { title: '多点执业', dataIndex: 'multi_point_status',slotName:'multi_point_status' },
        { title: '问诊类型', dataIndex: 'inquiry_type',slotName:'inquiry_type' },
+       { title: '启用状态', dataIndex: 'is_enable',slotName:'is_enable' },
        { title: '申请人', dataIndex: 'last_enable_method',slotName:'last_enable_method' },
       { title: '操作', slotName: 'action', fixed: "right", width: 180 },
     ];
diff --git a/src/views/inquiry/sysconfig-list/index.vue b/src/views/inquiry/sysconfig-list/index.vue
index b18c42a..ea574d1 100644
--- a/src/views/inquiry/sysconfig-list/index.vue
+++ b/src/views/inquiry/sysconfig-list/index.vue
@@ -13,7 +13,7 @@
         </a-select>
         
       </a-form-item>
-         <a-form-item field="is_enable" label="接诊方式">
+         <a-form-item field="inquiry_mode" label="接诊方式">
           <a-select  v-model="queryForm.inquiry_mode" placeholder="请选择接诊方式" :style="{ width: '182px' }">
             <a-option :value="1">图文</a-option>
             <a-option :value="2">视频</a-option>

From 2bb6022b0038c7781d1877ce86fbe98f890fb96f Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 25 Oct 2023 10:00:26 +0800
Subject: [PATCH 06/32] =?UTF-8?q?=E6=B8=85=E7=A9=BA=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/addInquiryConfigModal.vue | 21 +++++++++++++++------
 src/components/addSysconfigModal.vue     |  2 +-
 src/views/inquiry/inquiry-list/index.vue |  8 ++++----
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/components/addInquiryConfigModal.vue b/src/components/addInquiryConfigModal.vue
index 41895ea..85d9628 100644
--- a/src/components/addInquiryConfigModal.vue
+++ b/src/components/addInquiryConfigModal.vue
@@ -86,7 +86,6 @@
         </a-row>
         <a-row :gutter="24" >
           <a-col :span="24">
-           
               <a-form-item field="" label="问诊时间：" >
                 <a-select
                 v-model="inquiry_time"
@@ -120,7 +119,10 @@
          <div class="right">
           <a-form-item field="doctor_inquiry_time" :hide-label="true" :rules="[{ required: true, message: '请选择问诊价格' }]">
                <div class="surebox">
+               <div class="titlebox">
                 <div class="title">已选问诊时间</div>
+                <a-button style="margin-left: 20px;" @click="clearTime" type="primary">清空</a-button>
+               </div>
               <div class="timebox">
                  <a-space wrap>
                   <a-tag color="green" class="tag" closable v-for="(item,index) in slect_all_date" :key="item" @close="closeTag(index)">{{item}}</a-tag>
@@ -150,7 +152,7 @@
       </div>
       <div class="titlebox">
           <div class="bar"></div>
-          <div class="name">问诊价格（元）</div>
+          <div class="name">问诊价格(元)</div>
         </div>
         <a-row :gutter="24" style="margin-top: 35px;">
           <a-col :span="12">
@@ -353,6 +355,10 @@ const addTime=()=>{
   slect_all_date.value=[...new Set(temp_date)];
   reset();
 }
+const clearTime=()=>{
+  temp_date=[];
+  slect_all_date.value=[];
+}
 watch(slect_all_date,(newVal,oldVal)=>{
   if(newVal.length>0){
     console.log(newVal.length)
@@ -486,6 +492,9 @@ const handleSubmit=()=>{
 .arco-form-item-layout-horizontal:nth-child(2) {
   align-items: center;
 }
+.surebox{
+  width:100%;
+}
 .cellbox {
   margin-top: 35px;
 }
@@ -508,7 +517,7 @@ const handleSubmit=()=>{
 }
 .timebox{
   min-height:200px;
-  width:418px;
+  width:100%;
   margin-top: 20px;
   padding: 20px;
   border:1px solid  var(--color-neutral-3);
@@ -516,7 +525,7 @@ const handleSubmit=()=>{
 }
 .timecon{
   display: flex;
-  width: 1000px;
+  width:100%;
   justify-content: space-between;
   align-items: center;
 }
@@ -525,13 +534,13 @@ const handleSubmit=()=>{
 }
 
 .right{
-  width:600px;
+ 
   flex:1;
 }
 .line{
   height: 240px;
   width:2px;
-  margin:0 30px;
+  margin:0 100px;
   background: var(--color-neutral-3);
 }
 </style>
\ No newline at end of file
diff --git a/src/components/addSysconfigModal.vue b/src/components/addSysconfigModal.vue
index ed97b72..ee9b372 100644
--- a/src/components/addSysconfigModal.vue
+++ b/src/components/addSysconfigModal.vue
@@ -80,7 +80,7 @@
       </div>
       <div class="titlebox">
         <div class="bar"></div>
-        <div class="name">问诊价格（元）</div>
+        <div class="name">问诊价格(元)</div>
       </div>
       <a-row :gutter="24" style="margin-top: 35px">
         <a-col :span="12">
diff --git a/src/views/inquiry/inquiry-list/index.vue b/src/views/inquiry/inquiry-list/index.vue
index 28f798e..8e27302 100644
--- a/src/views/inquiry/inquiry-list/index.vue
+++ b/src/views/inquiry/inquiry-list/index.vue
@@ -20,8 +20,8 @@
       </a-form-item>
          <a-form-item field="is_enable" label="启用状态">
           <a-select  v-model="queryForm.is_enable" placeholder="请选择启用状态" :style="{ width: '182px' }">
-            <a-option :value="0">禁用</a-option>
-            <a-option :value="1">正常</a-option>
+            <a-option :value="0">关闭</a-option>
+            <a-option :value="1">开启</a-option>
   
           </a-select>
         </a-form-item>
@@ -69,8 +69,8 @@
           <div v-else>后台</div>
         </template>
         <template #is_enable="{record}">
-          <a-tag v-if="record.is_enable == 0" color="red">禁用</a-tag>
-         <a-tag v-else-if="record.is_enable== 1" color="green">正常</a-tag>
+          <a-tag v-if="record.is_enable == 0" color="red">关闭</a-tag>
+         <a-tag v-else-if="record.is_enable== 1" color="green">开启</a-tag>
        
         </template>
         

From dc261b418c68e6ff8f4e9919c19f075f0eb1ad8b Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 25 Oct 2023 13:11:54 +0800
Subject: [PATCH 07/32] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/addInquiryConfigModal.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/addInquiryConfigModal.vue b/src/components/addInquiryConfigModal.vue
index 85d9628..4a3881c 100644
--- a/src/components/addInquiryConfigModal.vue
+++ b/src/components/addInquiryConfigModal.vue
@@ -17,11 +17,11 @@
         <a-col :span="12">
           <a-form-item field="doctor_id" :hide-label="true">
             <a-space direction="vertical" size="large">
-            <a-select :style="{width:'320px'}" allow-search placeholder="请输入医生姓名" :disabled="inquiry_config_id?true:false" v-model="modalForm.doctor_id" allow-clear
+            <a-select :style="{width:'420px'}" allow-search placeholder="请输入医生姓名" :disabled="inquiry_config_id?true:false" v-model="modalForm.doctor_id" allow-clear
               :loading="loading" @change="changeDoctor" @search="handleDoctorList">
               <a-option size="large" style="max-width:500px" v-for="item in doctorData" :key="item.hospital_id"
                 :value="item.doctor_id" :label="item.user_name">
-                <span v-if="item.doctor_title || item.hospital_name || item.department_custom_name" :title="item.user_name+'('+formatDoctorTitle(item.doctor_title)+item.hospital_name+item.department_custom_name+')'"> {{item.user_name+'('+formatDoctorTitle(item.doctor_title)+item.hospital_name+item.department_custom_name+')'}}</span>
+                <span v-if="item.doctor_title || item.hospital_name || item.department_custom_name" :title="item.user_name+'('+formatDoctorTitle(item.doctor_title)+'—'+item.hospital_name+'—'+item.department_custom_name+')'"> {{item.user_name+'('+formatDoctorTitle(item.doctor_title)+'—'+item.hospital_name+'—'+item.department_custom_name+')'}}</span>
                 <span v-else :title="item.user_name"> {{item.user_name}}</span>
               </a-option>
             </a-select> 

From 087b0a3663e7f047d35a2da6bc7ae881e32efa4d Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 25 Oct 2023 13:37:48 +0800
Subject: [PATCH 08/32] =?UTF-8?q?=E9=97=AE=E8=AF=8A=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/addInquiryConfigModal.vue | 73 +++++++++++++++---------
 1 file changed, 47 insertions(+), 26 deletions(-)

diff --git a/src/components/addInquiryConfigModal.vue b/src/components/addInquiryConfigModal.vue
index 4a3881c..1d6809b 100644
--- a/src/components/addInquiryConfigModal.vue
+++ b/src/components/addInquiryConfigModal.vue
@@ -8,29 +8,8 @@
     :footer="false"
     @cancel="handleClose"
   >
-    <div class="titlebox">
-      <div class="bar"></div>
-      <div class="name">添加医生</div>
-    </div>
+    
     <a-form :model="modalForm" ref="modalFormRefConfig" :auto-label-width="true" :rules="rules">
-      <a-row :gutter="24" style="margin-top: 35px">
-        <a-col :span="12">
-          <a-form-item field="doctor_id" :hide-label="true">
-            <a-space direction="vertical" size="large">
-            <a-select :style="{width:'420px'}" allow-search placeholder="请输入医生姓名" :disabled="inquiry_config_id?true:false" v-model="modalForm.doctor_id" allow-clear
-              :loading="loading" @change="changeDoctor" @search="handleDoctorList">
-              <a-option size="large" style="max-width:500px" v-for="item in doctorData" :key="item.hospital_id"
-                :value="item.doctor_id" :label="item.user_name">
-                <span v-if="item.doctor_title || item.hospital_name || item.department_custom_name" :title="item.user_name+'('+formatDoctorTitle(item.doctor_title)+'—'+item.hospital_name+'—'+item.department_custom_name+')'"> {{item.user_name+'('+formatDoctorTitle(item.doctor_title)+'—'+item.hospital_name+'—'+item.department_custom_name+')'}}</span>
-                <span v-else :title="item.user_name"> {{item.user_name}}</span>
-              </a-option>
-            </a-select> 
-        </a-space>
-          </a-form-item>
-        </a-col>
-      </a-row>
-
-      <a-divider />
       <div class="titlebox">
         <div class="bar"></div>
         <div class="name">问诊类型</div>
@@ -54,6 +33,30 @@
           </a-form-item>
         </a-col>
       </a-row>
+      <a-divider />
+      <div class="titlebox">
+      <div class="bar"></div>
+      <div class="name">添加医生</div>
+    </div>
+      <a-row :gutter="24" style="margin-top: 35px">
+        <a-col :span="12">
+          <a-form-item field="doctor_id" :hide-label="true">
+            <a-space direction="vertical" size="large">
+            <a-select :style="{width:'420px'}" allow-search placeholder="请输入医生姓名" :disabled="inquiry_config_id?true:false" v-model="modalForm.doctor_id" allow-clear
+              :loading="loading" @change="changeDoctor" @search="handleDoctorList">
+              <a-option size="large" style="max-width:500px" v-for="item in doctorData" :key="item.hospital_id"
+                :value="item.doctor_id" :label="item.user_name">
+                <span v-if="item.doctor_title || item.hospital_name || item.department_custom_name" :title="item.user_name+'('+formatDoctorTitle(item.doctor_title)+'—'+item.hospital_name+'—'+item.department_custom_name+')'"> {{item.user_name+'('+formatDoctorTitle(item.doctor_title)+'—'+item.hospital_name+'—'+item.department_custom_name+')'}}</span>
+                <span v-else :title="item.user_name"> {{item.user_name}}</span>
+              </a-option>
+            </a-select> 
+        </a-space>
+          </a-form-item>
+        </a-col>
+      </a-row>
+
+      
+  
       <a-divider />
       <!-- <div class="typebox" v-if="toggleType">
     
@@ -231,6 +234,7 @@ import { formatDoctorTitle } from '@/utils/format';
 import { parseTime } from '@/utils/parseTime';
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 const { proxy } = getCurrentInstance();
+let multi_point_status='';
 const props = defineProps({
   // 是否显示
   modalVisible: {
@@ -284,12 +288,28 @@ const handleDetail=(id)=>{
 
     }
   })
-}
+};
+
 const handleDoctorList=(value)=>{
   loading.value=true;
-  getDoctorList({
-    user_name:value
-  }).then(data=>{
+  let formData=null;
+  if(modalForm.inquiry_type==4){
+      formData={
+      user_name:value,
+      idcard_status:1,
+      iden_auth_status:1,
+      is_bind_bank:1,
+      multi_point_status: 1
+    }
+  }else{
+    formData= {
+    user_name:value,
+    idcard_status:1,
+    iden_auth_status:1,
+    is_bind_bank:1,
+  }
+  }
+  getDoctorList(formData).then(data=>{
     if(data.code=200){
       doctorData.value=data.data;
       if(!value){
@@ -408,6 +428,7 @@ const changeType=(value)=>{
    }else{
     toggleType.value=false
    };
+   doctorData.value=[];
    modalForm.doctor_inquiry_time=[];
    modalForm.inquiry_price=null;
    slect_all_date.value=[];

From 56f8373650b3c76756b96a514ceca533ed0356a5 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 25 Oct 2023 14:28:27 +0800
Subject: [PATCH 09/32] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/addInquiryConfigModal.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/addInquiryConfigModal.vue b/src/components/addInquiryConfigModal.vue
index 1d6809b..536a04a 100644
--- a/src/components/addInquiryConfigModal.vue
+++ b/src/components/addInquiryConfigModal.vue
@@ -42,8 +42,8 @@
         <a-col :span="12">
           <a-form-item field="doctor_id" :hide-label="true">
             <a-space direction="vertical" size="large">
-            <a-select :style="{width:'420px'}" allow-search placeholder="请输入医生姓名" :disabled="inquiry_config_id?true:false" v-model="modalForm.doctor_id" allow-clear
-              :loading="loading" @change="changeDoctor" @search="handleDoctorList">
+            <a-select  :style="{width:'420px'}" allow-search placeholder="请输入医生姓名" :disabled="(inquiry_config_id || !modalForm.inquiry_type)?true:false" v-model="modalForm.doctor_id" allow-clear
+              :loading="loading" @change="changeDoctor" @search="handleDoctorList" @click="isHasType">
               <a-option size="large" style="max-width:500px" v-for="item in doctorData" :key="item.hospital_id"
                 :value="item.doctor_id" :label="item.user_name">
                 <span v-if="item.doctor_title || item.hospital_name || item.department_custom_name" :title="item.user_name+'('+formatDoctorTitle(item.doctor_title)+'—'+item.hospital_name+'—'+item.department_custom_name+')'"> {{item.user_name+'('+formatDoctorTitle(item.doctor_title)+'—'+item.hospital_name+'—'+item.department_custom_name+')'}}</span>
@@ -429,6 +429,7 @@ const changeType=(value)=>{
     toggleType.value=false
    };
    doctorData.value=[];
+   modalForm.doctor_id='';
    modalForm.doctor_inquiry_time=[];
    modalForm.inquiry_price=null;
    slect_all_date.value=[];
@@ -473,6 +474,11 @@ const handleClose = () => {
   emits('familyVisibleChange', false);
   
 
+};
+const isHasType=()=>{
+   if(!modalForm.inquiry_type){
+    proxy.$message.error('请先选择问诊类型');
+   }
 };
 const handleSubmit=()=>{
   proxy.$refs.modalFormRefConfig.validate(async (valid) => {

From ea9113a98a3059a56432ae6342e1f34d1fcd5e8c Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 26 Oct 2023 08:41:40 +0800
Subject: [PATCH 10/32] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/addInquiryConfigModal.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/addInquiryConfigModal.vue b/src/components/addInquiryConfigModal.vue
index 536a04a..976cbb2 100644
--- a/src/components/addInquiryConfigModal.vue
+++ b/src/components/addInquiryConfigModal.vue
@@ -49,7 +49,7 @@
                 <span v-if="item.doctor_title || item.hospital_name || item.department_custom_name" :title="item.user_name+'('+formatDoctorTitle(item.doctor_title)+'—'+item.hospital_name+'—'+item.department_custom_name+')'"> {{item.user_name+'('+formatDoctorTitle(item.doctor_title)+'—'+item.hospital_name+'—'+item.department_custom_name+')'}}</span>
                 <span v-else :title="item.user_name"> {{item.user_name}}</span>
               </a-option>
-            </a-select> 
+            </a-select>
         </a-space>
           </a-form-item>
         </a-col>
@@ -59,16 +59,12 @@
   
       <a-divider />
       <!-- <div class="typebox" v-if="toggleType">
-    
-       
       </div> -->
-     
       <div class="typebox" v-if="!toggleType ">
         <div class="titlebox" v-if="is_platform_deep_cooperation==1">
           <div class="bar"></div>
           <div class="name">问诊日期</div>
         </div>
-       
          <div class="timecon" v-if="is_platform_deep_cooperation==1">
           <div class="left">
           <a-row :gutter="24" style="margin-top: 35px;">

From b82466f17df8f359945c0ee0bf5897e08e4f63df Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 26 Oct 2023 09:08:10 +0800
Subject: [PATCH 11/32] =?UTF-8?q?=E5=8A=A0=E6=B0=B4=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js       | 26 ++++++++++++++------------
 src/store/userInfo.js     |  6 +++---
 src/views/login/index.vue |  2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index dc4e1a9..1837141 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -104,23 +104,25 @@ router.beforeEach(async(to, from, next) => {
 // afterEach Router
 router.afterEach((to) => {
   const store = useUserStore();
-
-  // 修改网页标题
-  if (to.name !== 'login') {
-    document.title = `${to.meta.title} - ${store.sysConfig.sys_app_name}`;
-  } else {
-    document.title = store.sysConfig.sys_app_name;
-  }
-
-  // Vincent 2023004 修复加载水印的bug 
-  if (store.userInfo != undefined){
-    if ( store.userInfo.name != undefined ) {
-      Watermark.set(store.userInfo.name)
+   // Vincent 2023004 修复加载水印的bug 
+   if (store.userInfo != undefined){
+    if ( store.userInfo.nick_name != undefined ) {
+      Watermark.set(store.userInfo.nick_name)
     } else {
       Watermark.out() // 清除水印
     }
   } else{
     Watermark.out() // 清除水印
   }
+
+  // 修改网页标题
+  if (to.name !== 'login') {
+    document.title = `${to.meta.title} - ${store.sysConfig.sys_app_name}`;
+  } else {
+    document.title = store.sysConfig.sys_app_name;
+    Watermark.out()
+  }
+  
+ 
 });
 export default router;
diff --git a/src/store/userInfo.js b/src/store/userInfo.js
index 07e31da..5610cc2 100644
--- a/src/store/userInfo.js
+++ b/src/store/userInfo.js
@@ -2,8 +2,8 @@ import { defineStore } from 'pinia';
 import { setLocalStorage, getLocalStorage } from '@/utils/storage';
 import {logout} from '@/api/admin/login'
 import { usePermissionStore } from '@/store/permission';
-import { getInfo } from '@/api/admin/sys-user';
-import { getAppConfig } from '@/api/admin/login';
+// import { getInfo } from '@/api/admin/sys-user';
+// import { getAppConfig } from '@/api/admin/login';
 
 export const useUserStore = defineStore('user', {
   state: () => {
@@ -47,7 +47,7 @@ export const useUserStore = defineStore('user', {
    
     if(code==200){
       this.clearInfo();
-      window.location.href="/login"
+      window.location.href="/login";
     }
    
   }
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 9fa7b3d..8a3aae5 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -13,7 +13,7 @@
           <div class="login-form-container">
             <div class="account-top">
               <div class="account-top-logo">
-                <img :src="store.sysConfig.sys_app_logo" />
+                <img src="../../icons/logo.png" />
                 <span class="project-title">用户登录</span>
               </div>
               <div class="account-top-desc">肝胆相照 健康中国</div>

From dc09f9b497e61adb9d961b6de04d15ffd28a2ab2 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 26 Oct 2023 17:07:24 +0800
Subject: [PATCH 12/32] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=81=E4=B9=A6?=
 =?UTF-8?q?=E5=92=8C=E7=AD=BE=E7=AB=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html                             |  1 +
 src/api/doctor/ca.js                   | 34 +++++++++++
 src/main.js                            |  1 -
 src/views/doctor/doctor-list/index.vue | 83 ++++++++++++++++++++++----
 4 files changed, 108 insertions(+), 11 deletions(-)
 create mode 100644 src/api/doctor/ca.js

diff --git a/index.html b/index.html
index 89d5c65..b47ba07 100644
--- a/index.html
+++ b/index.html
@@ -10,4 +10,5 @@
     <div id="app"></div>
     <script type="module" src="/src/main.js"></script>
   </body>
+ 
 </html>
diff --git a/src/api/doctor/ca.js b/src/api/doctor/ca.js
new file mode 100644
index 0000000..b651fda
--- /dev/null
+++ b/src/api/doctor/ca.js
@@ -0,0 +1,34 @@
+import request from '../../utils/request'
+export function updateCA(id){//更新证书
+  return request({
+    url:'/admin/ca/cert/user/renew/'+id,
+    method: 'put',
+
+  })
+}
+export function removeCA(id){//注销证书
+    return request({
+      url:'/admin/ca/cert/user/remove/'+id,
+      method: 'put',
+    })
+  }
+export function applyCA(id){//申请证书
+    return request({
+      url:'/admin/ca/cert/user/'+id,
+      method: 'post',
+    })
+  }
+
+  export function updateSign(id){//更新签章
+    return request({
+      url:'/admin/ca/cert/user/renew/'+id,
+      method: 'put',
+  
+    })
+  }
+  export function applySign(id){//申请签章
+    return request({
+      url:'/admin/ca/cert/user/'+id,
+      method: 'post',
+    })
+  }
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 91c3e3a..9868b05 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,7 +6,6 @@ import { Message, Modal, Notification } from '@arco-design/web-vue';
 import '@arco-design/web-vue/dist/arco.css';
 import router from './router/';
 import { parseTime } from '@/utils/parseTime';
-
 import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
 // Directive
 import permission from '@/directive/permission/permission';
diff --git a/src/views/doctor/doctor-list/index.vue b/src/views/doctor/doctor-list/index.vue
index 32cb2e6..d0743fb 100644
--- a/src/views/doctor/doctor-list/index.vue
+++ b/src/views/doctor/doctor-list/index.vue
@@ -558,24 +558,33 @@
           </a-col>
         </a-row>
         <a-divider v-if="(modalForm.user_doctor_info.license_cert && modalForm.user_doctor_info.license_cert.length>0) || modalSatus!='detail'"/>
-        <div class="titlebox">
+        <div class="titlebox" v-if="modalForm.department_custom_name && modalForm.iden_auth_status==1 && modalForm.user_doctor_info.sign_image">
           <div class="bar"></div>
           <div class="name">CA证书配置</div>
         </div>
-        <a-row :gutter="24" style="margin-top: 35px;" >
+        <a-row :gutter="24" style="margin-top: 35px;" v-if="modalForm.department_custom_name && modalForm.iden_auth_status==1 && modalForm.user_doctor_info.sign_image">
         <a-col :span="24">
           <a-form-item field="" label="" no-style>
             <div>证书有效期:2023.02.01-2023.08.01</div>
             <a-space style="margin-top: 15px;">
-              <a-button type="primary" status="success">更新</a-button>
-              <a-button type="primary" status="danger">注销</a-button>
-              <a-button type="primary" >重新申请</a-button>
+              <!-- <a-button type="primary" >证书申请</a-button> -->
+              <a-button type="primary" status="success" @click="()=>{okVisible=true;okStatus=2;}">证书续期</a-button>
+              <a-button type="primary" status="danger" @click="()=>{okVisible=true;okStatus=3;}">证书注销</a-button>
+              
+            </a-space>
+            <a-divider />
+            <div class="title">签章配置</div>
+            <a-space style="margin-top: 15px;">
+              <!-- <a-button type="primary" >证书申请</a-button> -->
+              <a-button type="primary" status="success" @click="()=>{okVisible=true;okStatus=4;}">签章申请</a-button>
+              <a-button type="primary" status="danger" @click="()=>{okVisible=true;okStatus=5;}">签章更新</a-button>
+              
             </a-space>
           </a-form-item>
         </a-col>
       </a-row>
       </a-form>
-      <a-divider v-show="modalSatus!='detail'" />
+      <a-divider v-show="modalSatus!='detail' " v-if="modalForm.department_custom_name && modalForm.iden_auth_status==1 && modalForm.user_doctor_info.sign_image"/>
       <div class="titlebox" v-if="modalSatus!='detail'">
         <div class="bar"></div>
         <div class="name">操作</div>
@@ -584,7 +593,7 @@
         <a-col :span="24">
           <a-form-item field="" label="" no-style>
             <a-space v-if="modalSatus!='detail'" style="margin-right: 8px;">
-              <a-button type="primary" @click="()=>okVisible=true">保存</a-button>
+              <a-button type="primary" @click="()=>{okVisible=true,okStatus=1}">保存</a-button>
             </a-space>
             <!-- <a-space v-if="modalSatus=='edit'">
               <a-button type="primary" status="warning">拉黑</a-button>
@@ -604,7 +613,11 @@
       <template #title>
         提示
       </template>
-      <div>确定保存当前信息？</div>
+      <div v-if="okStatus==1">确定保存当前信息？</div>
+      <div v-else-if="okStatus==2">确定重新续期CA证书？</div>
+      <div v-else-if="okStatus==3">确定注销CA证书？</div>
+      <div v-else-if="okStatus==4">确定申请签章？</div>
+      <div v-else-if="okStatus==5">确定更新签章？</div>
     </a-modal>
   </div>
 </template>
@@ -612,6 +625,7 @@
 <script setup>
   import { reactive, ref, getCurrentInstance, onMounted, nextTick, watch, computed } from 'vue';
   import { getDoctorList, addDoctor, removeDoctor, updateDoctor, getDoctorDetail, departmentList, decryptCard, hospitalList, expertiseList, areaList, bankList, decryptBank } from '@/api/doctor/list';
+  import { updateCA,removeCA,updateSign,applySign } from '@/api/doctor/ca';
   import { ossSign, ossUpload } from '@/api/oss';
   import dayjs from 'dayjs'
   // Akiraka 20230210 删除数据
@@ -620,7 +634,7 @@
   const deleteVisible = ref(false)
   // Akiraka 20230210 监听删除事件
   const okVisible = ref(false);
-
+   const okStatus=ref(1); //1保存 2证书续期 3//证书注销 //4申请签章 //5更新签章
   watch(() => deleteVisible.value, (value) => {
     if (value == false) {
       getDoctorInfo(pager);
@@ -1130,6 +1144,38 @@
     //await nextTick();
 
   };
+  const handleUpdateCA=()=>{
+    updateCA(modalForm.user_doctor_info.user_id).then(data=>{
+      let result=data.data;
+      if(result.code==200){
+        proxy.$message.success('证书更新成功');
+      }
+    })
+  }
+  const handleRemoveCA=()=>{
+    removeCA(modalForm.user_doctor_info.user_id).then(data=>{
+      let result=data.data;
+      if(result.code==200){
+        proxy.$message.success('证书注销成功');
+      }
+    })
+  }
+  const handleApplySign=()=>{
+    applySign(modalForm.user_doctor_info.user_id).then(data=>{
+      let result=data.data;
+      if(result.code==200){
+        proxy.$message.success('签章申请成功');
+      }
+    })
+  }
+  const handleUpdateSign=()=>{
+    updateSign(modalForm.user_doctor_info.user_id).then(data=>{
+      let result=data.data;
+      if(result.code==200){
+        proxy.$message.success('签章更新成功');
+      }
+    })
+  }
   //开启服务处理
   // const filterService = (record) => {
   //   let arr = [];
@@ -1158,7 +1204,8 @@
   // Modal ok
   // 异步关闭Modal需要调用 done()
   const handleSubmit = (done) => {
-    proxy.$refs.modalFormRef.validate(async (valid) => {
+    if(okStatus.value==1){
+      proxy.$refs.modalFormRef.validate(async (valid) => {
       if (!valid) {
         let res;
         let modalData = {
@@ -1279,6 +1326,21 @@
         //done(false);
       }
     });
+    }else if(okStatus.value==2){
+      //证书续期
+      handleUpdateCA();
+    }else if(okStatus.value==3){
+       //证书注销
+       handleRemoveCA();
+    }else if(okStatus.value==4){
+      //签章申请
+      handleApplySign();
+    }else if(okStatus.value==5){
+       //签章更新
+      handleUpdateSign();
+    }
+    
+    
   };
 
   // 批量删除
@@ -1498,6 +1560,7 @@
 
     getOssSign(1, fileList[0].file);
   }
+  //ca证书
   onMounted(() => {
     getDoctorInfo(pager);
     handleHospitalList();

From 2e2e622bc81ef8188efe231fdd20c9bd3753a364 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 27 Oct 2023 15:43:51 +0800
Subject: [PATCH 13/32] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=8C=BB=E7=94=9F?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html                             |  1 -
 src/api/doctor/ca.js                   |  5 ++--
 src/components/doctorModal.vue         | 32 +++++++++++++++++++++++---
 src/views/doctor/doctor-list/index.vue | 27 +++++++++++++---------
 4 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/index.html b/index.html
index b47ba07..89d5c65 100644
--- a/index.html
+++ b/index.html
@@ -10,5 +10,4 @@
     <div id="app"></div>
     <script type="module" src="/src/main.js"></script>
   </body>
- 
 </html>
diff --git a/src/api/doctor/ca.js b/src/api/doctor/ca.js
index b651fda..4353bf1 100644
--- a/src/api/doctor/ca.js
+++ b/src/api/doctor/ca.js
@@ -26,9 +26,10 @@ export function applyCA(id){//申请证书
   
     })
   }
-  export function applySign(id){//申请签章
+  export function applySign(data){//申请签章
     return request({
-      url:'/admin/ca/cert/user/'+id,
+      url:'/admin/ca/sign',
       method: 'post',
+      data
     })
   }
\ No newline at end of file
diff --git a/src/components/doctorModal.vue b/src/components/doctorModal.vue
index f90c0e8..87327a3 100644
--- a/src/components/doctorModal.vue
+++ b/src/components/doctorModal.vue
@@ -245,12 +245,12 @@
     </a-col>
   </a-row>
   <a-divider />
-  <div class="titlebox">
+  <div class="titlebox" v-if="Object.keys(modalForm.user_doctor_info).length != 0">
     <div class="bar"></div>
     <div class="name">医师证件</div>
   </div>
   <a-row :gutter="24" style="margin-top: 35px;"
-    v-if="(modalForm.user_doctor_info.license_cert && modalForm.user_doctor_info.license_cert.length>0) || modalSatus!='detail'">
+  v-if="(modalForm.user_doctor_info.license_cert && modalForm.user_doctor_info.license_cert.length>0) || modalSatus!='detail'">
 
     <a-col :span="24">
       <div class="titletip"><span
@@ -372,8 +372,31 @@
       </a-form-item>
     </a-col>
   </a-row>
-  <a-divider v-show="modalSatus!='detail'" />
+  <a-divider v-if="Object.keys(modalForm.user_doctor_info).length != 0" />
+  <div class="titlebox" v-if="modalForm.department_custom_name && modalForm.iden_auth_status==1 && modalForm.user_doctor_info.sign_image && modalForm.multi_point_status==1">
+          <div class="bar"></div>
+          <div class="name">CA证书配置</div>
+        </div>
+        <a-row :gutter="24" style="margin-top: 35px;" v-if="modalForm.department_custom_name && modalForm.iden_auth_status==1 && modalForm.user_doctor_info.sign_image && modalForm.multi_point_status==1">
+        <a-col :span="24">
+          <a-form-item field="" label="" no-style>
+            <div>证书有效期:{{parseTime(modalForm.user_ca_cert.cert_application_time,'{y}-{m}-{d}')}}-{{parseTime(modalForm.user_ca_cert.cert_expire_time,'{y}-{m}-{d}')}}</div>
+            <a-space style="margin-top: 15px;">
+              <!-- <a-button type="primary" >证书申请</a-button> -->
+              <a-button type="primary" status="success" @click="()=>{okVisible=true;okStatus=2;}">证书续期</a-button>
+              <a-button type="primary" status="danger" @click="()=>{okVisible=true;okStatus=3;}">证书注销</a-button>
+            </a-space>
+            <a-divider />
+            <div class="title">签章配置</div>
+            <a-space style="margin-top: 15px;">
+              <a-button type="primary" status="success" @click="()=>{okVisible=true;okStatus=4;}">签章申请</a-button>
+              <!-- <a-button type="primary" status="danger" @click="()=>{okVisible=true;okStatus=5;}">签章更新</a-button> -->
+            </a-space>
+          </a-form-item>
+        </a-col>
+      </a-row>
 </a-form>
+<a-divider v-show="modalSatus!='detail' " v-if="modalForm.department_custom_name && modalForm.iden_auth_status==1 && modalForm.user_doctor_info.sign_image && modalForm.multi_point_status==1"/>
 <div class="titlebox" v-if="modalSatus!='detail'">
   <div class="bar"></div>
   <div class="name">操作</div>
@@ -399,6 +422,7 @@ import { reactive, ref, getCurrentInstance,watch,toRefs,onMounted  } from 'vue';
 import { getDoctorDetail, departmentList, decryptCard, hospitalList, expertiseList, areaList, bankList, decryptBank } from '@/api/doctor/list';
 import { ossSign, ossUpload } from '@/api/oss';
 import dayjs from 'dayjs'
+import { parseTime } from '@/utils/parseTime';
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   // 是否显示
@@ -421,6 +445,8 @@ watch(()=>props.doctorVisible,(value)=>{
      doctorVisible.value=value
    }
 })
+const okVisible=ref(false)
+const okStatus=ref(1); //1保存 2证书续期 3//证书注销 //4申请签章 //5更新签章
 watch(()=>props.doctor_id,(value)=>{
    if(doctor_id){
     doctor_id.value=value
diff --git a/src/views/doctor/doctor-list/index.vue b/src/views/doctor/doctor-list/index.vue
index d0743fb..76a4143 100644
--- a/src/views/doctor/doctor-list/index.vue
+++ b/src/views/doctor/doctor-list/index.vue
@@ -417,7 +417,7 @@
           </a-col>
         </a-row>
         <a-divider v-if="modalForm.doctor_bank_card"/>
-        <div class="titlebox" v-if="(modalForm.user_doctor_info.license_cert && modalForm.user_doctor_info.license_cert.length>0) || modalSatus!='detail'">
+        <div class="titlebox" v-if="Object.keys(modalForm.user_doctor_info).length != 0">
           <div class="bar"></div>
           <div class="name">医师证件</div>
         </div>
@@ -557,15 +557,15 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-divider v-if="(modalForm.user_doctor_info.license_cert && modalForm.user_doctor_info.license_cert.length>0) || modalSatus!='detail'"/>
-        <div class="titlebox" v-if="modalForm.department_custom_name && modalForm.iden_auth_status==1 && modalForm.user_doctor_info.sign_image">
+        <a-divider v-if="Object.keys(modalForm.user_doctor_info).length != 0"/>
+        <div class="titlebox" v-if="modalForm.department_custom_name && modalForm.iden_auth_status==1 && modalForm.user_doctor_info.sign_image && modalForm.multi_point_status==1">
           <div class="bar"></div>
           <div class="name">CA证书配置</div>
         </div>
-        <a-row :gutter="24" style="margin-top: 35px;" v-if="modalForm.department_custom_name && modalForm.iden_auth_status==1 && modalForm.user_doctor_info.sign_image">
+        <a-row :gutter="24" style="margin-top: 35px;" v-if="modalForm.department_custom_name && modalForm.iden_auth_status==1 && modalForm.user_doctor_info.sign_image && modalForm.multi_point_status==1">
         <a-col :span="24">
           <a-form-item field="" label="" no-style>
-            <div>证书有效期:2023.02.01-2023.08.01</div>
+            <div>证书有效期:{{parseTime(modalForm.user_ca_cert.cert_application_time,'{y}-{m}-{d}')}}-{{parseTime(modalForm.user_ca_cert.cert_expire_time,'{y}-{m}-{d}')}}</div>
             <a-space style="margin-top: 15px;">
               <!-- <a-button type="primary" >证书申请</a-button> -->
               <a-button type="primary" status="success" @click="()=>{okVisible=true;okStatus=2;}">证书续期</a-button>
@@ -575,16 +575,14 @@
             <a-divider />
             <div class="title">签章配置</div>
             <a-space style="margin-top: 15px;">
-              <!-- <a-button type="primary" >证书申请</a-button> -->
               <a-button type="primary" status="success" @click="()=>{okVisible=true;okStatus=4;}">签章申请</a-button>
-              <a-button type="primary" status="danger" @click="()=>{okVisible=true;okStatus=5;}">签章更新</a-button>
-              
+              <!-- <a-button type="primary" status="danger" @click="()=>{okVisible=true;okStatus=5;}">签章更新</a-button> -->
             </a-space>
           </a-form-item>
         </a-col>
       </a-row>
       </a-form>
-      <a-divider v-show="modalSatus!='detail' " v-if="modalForm.department_custom_name && modalForm.iden_auth_status==1 && modalForm.user_doctor_info.sign_image"/>
+      <a-divider v-show="modalSatus!='detail' " v-if="modalForm.department_custom_name && modalForm.iden_auth_status==1 && modalForm.user_doctor_info.sign_image && modalForm.multi_point_status==1"/>
       <div class="titlebox" v-if="modalSatus!='detail'">
         <div class="bar"></div>
         <div class="name">操作</div>
@@ -623,10 +621,11 @@
 </template>
 
 <script setup>
-  import { reactive, ref, getCurrentInstance, onMounted, nextTick, watch, computed } from 'vue';
+  import { reactive, ref, getCurrentInstance, onMounted,  watch } from 'vue';
   import { getDoctorList, addDoctor, removeDoctor, updateDoctor, getDoctorDetail, departmentList, decryptCard, hospitalList, expertiseList, areaList, bankList, decryptBank } from '@/api/doctor/list';
   import { updateCA,removeCA,updateSign,applySign } from '@/api/doctor/ca';
   import { ossSign, ossUpload } from '@/api/oss';
+  import { parseTime } from '@/utils/parseTime';
   import dayjs from 'dayjs'
   // Akiraka 20230210 删除数据
   const deleteData = ref([])
@@ -665,6 +664,9 @@
     },
     user_doctor_info: {
       card_num_mask:''
+    },
+    user_ca_cert:{
+
     },
     doctor_bank_card: {
       province_id:'',
@@ -1161,7 +1163,10 @@
     })
   }
   const handleApplySign=()=>{
-    applySign(modalForm.user_doctor_info.user_id).then(data=>{
+    applySign({
+      type:2,
+      user_id:modalForm.user_doctor_info.user_id
+    }).then(data=>{
       let result=data.data;
       if(result.code==200){
         proxy.$message.success('签章申请成功');

From 55905a87aba9ab8b6d762a91c61fa6b7c5feb119 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 27 Oct 2023 16:20:57 +0800
Subject: [PATCH 14/32] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=81=E4=B9=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/doctor/doctor-list/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/doctor/doctor-list/index.vue b/src/views/doctor/doctor-list/index.vue
index 76a4143..90a238d 100644
--- a/src/views/doctor/doctor-list/index.vue
+++ b/src/views/doctor/doctor-list/index.vue
@@ -565,17 +565,17 @@
         <a-row :gutter="24" style="margin-top: 35px;" v-if="modalForm.department_custom_name && modalForm.iden_auth_status==1 && modalForm.user_doctor_info.sign_image && modalForm.multi_point_status==1">
         <a-col :span="24">
           <a-form-item field="" label="" no-style>
-            <div>证书有效期:{{parseTime(modalForm.user_ca_cert.cert_application_time,'{y}-{m}-{d}')}}-{{parseTime(modalForm.user_ca_cert.cert_expire_time,'{y}-{m}-{d}')}}</div>
+            <div v-if="modalForm.user_ca_cert">证书有效期:{{parseTime(modalForm.user_ca_cert.cert_application_time,'{y}-{m}-{d}')}}-{{parseTime(modalForm.user_ca_cert.cert_expire_time,'{y}-{m}-{d}')}}</div>
             <a-space style="margin-top: 15px;">
               <!-- <a-button type="primary" >证书申请</a-button> -->
-              <a-button type="primary" status="success" @click="()=>{okVisible=true;okStatus=2;}">证书续期</a-button>
-              <a-button type="primary" status="danger" @click="()=>{okVisible=true;okStatus=3;}">证书注销</a-button>
+              <a-button type="primary" status="success" @click="()=>{okVisible=true;okStatus=2;}" v-has="'admin:sysDoctorList:updateCA'">证书续期</a-button>
+              <a-button type="primary" status="danger" @click="()=>{okVisible=true;okStatus=3;}" v-has="'admin:sysDoctorList:removeCA'">证书注销</a-button>
               
             </a-space>
             <a-divider />
             <div class="title">签章配置</div>
             <a-space style="margin-top: 15px;">
-              <a-button type="primary" status="success" @click="()=>{okVisible=true;okStatus=4;}">签章申请</a-button>
+              <a-button type="primary" status="success" @click="()=>{okVisible=true;okStatus=4;}" v-has="'admin:sysDoctorList:applySign'">签章申请</a-button>
               <!-- <a-button type="primary" status="danger" @click="()=>{okVisible=true;okStatus=5;}">签章更新</a-button> -->
             </a-space>
           </a-form-item>
@@ -591,7 +591,7 @@
         <a-col :span="24">
           <a-form-item field="" label="" no-style>
             <a-space v-if="modalSatus!='detail'" style="margin-right: 8px;">
-              <a-button type="primary" @click="()=>{okVisible=true,okStatus=1}">保存</a-button>
+              <a-button type="primary" @click="()=>{okVisible=true,okStatus=1}" v-has="'admin:sysDoctorList:save'">保存</a-button>
             </a-space>
             <!-- <a-space v-if="modalSatus=='edit'">
               <a-button type="primary" status="warning">拉黑</a-button>

From d46b5810677123197e23cbc9cb6dae3e8fec8a88 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 27 Oct 2023 16:21:54 +0800
Subject: [PATCH 15/32] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=81=E4=B9=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/doctorModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/doctorModal.vue b/src/components/doctorModal.vue
index 87327a3..c29ad2f 100644
--- a/src/components/doctorModal.vue
+++ b/src/components/doctorModal.vue
@@ -380,7 +380,7 @@
         <a-row :gutter="24" style="margin-top: 35px;" v-if="modalForm.department_custom_name && modalForm.iden_auth_status==1 && modalForm.user_doctor_info.sign_image && modalForm.multi_point_status==1">
         <a-col :span="24">
           <a-form-item field="" label="" no-style>
-            <div>证书有效期:{{parseTime(modalForm.user_ca_cert.cert_application_time,'{y}-{m}-{d}')}}-{{parseTime(modalForm.user_ca_cert.cert_expire_time,'{y}-{m}-{d}')}}</div>
+            <div v-if="modalForm.user_ca_cert">证书有效期:{{parseTime(modalForm.user_ca_cert.cert_application_time,'{y}-{m}-{d}')}}-{{parseTime(modalForm.user_ca_cert.cert_expire_time,'{y}-{m}-{d}')}}</div>
             <a-space style="margin-top: 15px;">
               <!-- <a-button type="primary" >证书申请</a-button> -->
               <a-button type="primary" status="success" @click="()=>{okVisible=true;okStatus=2;}">证书续期</a-button>

From 5f40cb7d41080119a1e690f38373459a02a78cfb Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 27 Oct 2023 17:34:06 +0800
Subject: [PATCH 16/32] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/doctor/ca.js                     |  16 +-
 src/views/dictionary/sign-list/index.vue | 210 +++++++++++++++++++++++
 src/views/doctor/doctor-list/index.vue   |  19 +-
 3 files changed, 235 insertions(+), 10 deletions(-)
 create mode 100644 src/views/dictionary/sign-list/index.vue

diff --git a/src/api/doctor/ca.js b/src/api/doctor/ca.js
index 4353bf1..4f8d492 100644
--- a/src/api/doctor/ca.js
+++ b/src/api/doctor/ca.js
@@ -32,4 +32,18 @@ export function applyCA(id){//申请证书
       method: 'post',
       data
     })
-  }
\ No newline at end of file
+  }
+  export function getCA(){//获取云证书数据
+    return request({
+      url:'/admin/ca/cert/hospital',
+      method: 'get'
+    })
+  }
+  export function updateHospitalCA(){//更新证书
+    return request({
+      url:'/admin/ca/cert/hospital/renew',
+      method: 'put',
+  
+    })
+  }
+ 
\ No newline at end of file
diff --git a/src/views/dictionary/sign-list/index.vue b/src/views/dictionary/sign-list/index.vue
new file mode 100644
index 0000000..2bacd7d
--- /dev/null
+++ b/src/views/dictionary/sign-list/index.vue
@@ -0,0 +1,210 @@
+<template>
+    <div class="app-container">
+   
+      <!-- table -->
+      <a-table :columns="columns" :data="tableData" 
+       
+        :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)}"
+        @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
+        <template #doctor_id="{record,rowIndex}">
+          <div>{{(rowIndex+1)+(pager.page-1)*10}}</div>
+        </template>
+        <template #cert_application_time="{ record }">
+          <div><span >{{ parseTime(record.cert_application_time,'{y}-{m}-{d}')}}</span>-<span>{{parseTime(record.cert_expire_time,'{y}-{m}-{d}')}}</span></div>
+            
+        </template>
+        <template #cert_name="{ record }">
+            <div>肝胆相照互联网医院签章</div>
+        </template>
+    
+        <template #action="{ record }">
+          <a-space>
+            <a-button v-has="'admin:sysFamilyList:detail'" type="text"
+              @click="handleUpdateCA(record)"><icon-book />证书续期</a-button>
+            <!-- <a-button v-has="'admin:sysFamilyList:edit'" type="text" @click="handleUpdate(record)"><icon-edit />
+              修改</a-button> -->
+            <!-- <a-button v-has="'admin:sysFamilyList:remove'" type="text"
+              @click="() => { deleteVisible = true; deleteData = [record.doctor_id];  }"><icon-delete /> 删除</a-button> -->
+          </a-space>
+        </template>
+      </a-table>
+      <a-modal v-model:visible="okVisible" :modal-style="{width:'320px'}" body-class="okmodal" 
+        @cancel="()=>okVisible=false">
+        <template #title>
+          提示
+        </template>
+        <div>确定保存当前信息？</div>
+      </a-modal>
+    </div>
+  </template>
+  
+  <script setup>
+    import { reactive, ref, getCurrentInstance, onMounted, nextTick, watch, computed } from 'vue';
+    import { getCA,updateHospitalCA} from '@/api/doctor/ca';
+    import { parseTime } from '@/utils/parseTime';
+    import { Message } from '@arco-design/web-vue';
+    const okVisible = ref(false);
+    const file = ref();
+    const { proxy } = getCurrentInstance();
+    const currentPage = ref(1);
+   
+    const queryForm = reactive({
+  
+    });
+    const modalForm = reactive({
+     
+    });
+    const pager = {
+    total: 1,
+    page: 1,
+    page_size: 10,
+  };
+    // Modal
+    const modalVisible = ref(false);
+    const modalTitle = ref('默认标题');
+    // Table Columns
+    const columns = [
+      { title: '编号', dataIndex: 'doctor_id', slotName: 'doctor_id', width: '90' },
+      { title: '名称', dataIndex: 'cert_name',slotName:'cert_name'},
+      { title: '有效期', dataIndex: 'cert_application_time',slotName:'cert_application_time'},
+     
+      { title: '操作', slotName: 'action', fixed: "right", width: 180 },
+    ];
+  
+    // Table Data
+    const tableData = ref([]);
+
+
+    const handleUpdateCA=(record)=>{
+        updateHospitalCA().then(data=>{
+      let result=data.data;
+      if(result.code==200){
+       Message.success('证书更新成功');
+      }
+    })
+  }
+    /**
+     * 分页改变
+     * @param {Number} [page]
+     */
+    const handlePageChange = (page) => {
+      pager.page = page;
+  
+      // 修改当前页码
+      currentPage.value = page;
+      getCAInfo({ ...pager, ...queryForm });
+    };
+  
+    // 每页数据量
+    const handlepage_sizeChange = (page_size) => {
+      pager.page_size = page_size;
+      getCAInfo({ ...pager, ...queryForm });
+    };
+  
+    // 获取患者信息
+    const getCAInfo = async (params = {}) => {
+      const { data, code, message } = await getCA(params);
+      if (code == 200) {
+        tableData.value =[data];
+       
+      }
+    };
+  
+    // 查询患者信息
+    const handleQuery = async () => {
+      pager.page = 1;
+      const params = {
+        page: pager.page,
+        page_size: pager.page_size,
+        ...queryForm,
+      };
+  
+      getCAInfo(params);
+    };
+  
+    // 重置搜索
+    const handleResetQuery = () => {
+      proxy.$refs.queryFormRef.resetFields();
+      getCAInfo(queryForm);
+    }
+    
+    
+    onMounted(() => {
+      getCAInfo(pager);
+    });
+  </script>
+  
+  <style lang="scss" scoped>
+    .action {
+      margin-bottom: 12px;
+    }
+  
+    .okmodal div {
+      text-align: center;
+    }
+  
+    .hospital_name {
+      width: 140px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    .headImg {
+      margin-right: 20px;
+      border-radius: 50%;
+      width: 80px;
+      height: 80px;
+    }
+  
+    .arco-form-item-layout-horizontal:first-child,
+    .arco-form-item-layout-horizontal:nth-child(2) {
+      align-items: center;
+    }
+    .cellbox{
+      margin-top: 35px;
+    }
+    .cellbox .cell{
+      width:50%;
+      border-bottom:1px dashed #efefef;
+      margin-bottom: 20px;
+    }
+    .cellbox .cell:first-child{
+      border: none;
+    }
+    .cell{
+      .arco-form-item{
+        margin-bottom: 10px;
+      }
+    }
+    .box {
+      display: flex;
+      align-items: center;
+    }
+  
+    .cert .arco-form-item-label-col {
+      flex: 0 0 8px !important;
+    }
+  
+    .red {
+      display: inline-block;
+      margin-right: 5px;
+      font-size: 14px;
+      color: red;
+      margin-top: 5px;
+    }
+  
+    .cardNum {
+      width: 148px;
+    }
+    .codbox{
+      display: flex;
+      align-items: center;
+    }
+    .reason{
+      width:250px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  </style>
\ No newline at end of file
diff --git a/src/views/doctor/doctor-list/index.vue b/src/views/doctor/doctor-list/index.vue
index 90a238d..77fe057 100644
--- a/src/views/doctor/doctor-list/index.vue
+++ b/src/views/doctor/doctor-list/index.vue
@@ -626,6 +626,7 @@
   import { updateCA,removeCA,updateSign,applySign } from '@/api/doctor/ca';
   import { ossSign, ossUpload } from '@/api/oss';
   import { parseTime } from '@/utils/parseTime';
+  import { Message } from '@arco-design/web-vue';
   import dayjs from 'dayjs'
   // Akiraka 20230210 删除数据
   const deleteData = ref([])
@@ -1133,7 +1134,7 @@
       oldBackImg.value = id_card_back;
       oldSignImg.value = sign_image;
       if (modalForm.iden_auth_status == 2) {
-        proxy.$message.warning('正在审核中,暂时不能修改');
+       Message.warning('正在审核中,暂时不能修改');
       }
       if (data.doctor_expertise && data.doctor_expertise.length > 0) {
         let arr = [];
@@ -1150,7 +1151,7 @@
     updateCA(modalForm.user_doctor_info.user_id).then(data=>{
       let result=data.data;
       if(result.code==200){
-        proxy.$message.success('证书更新成功');
+       Message.success('证书更新成功');
       }
     })
   }
@@ -1158,7 +1159,7 @@
     removeCA(modalForm.user_doctor_info.user_id).then(data=>{
       let result=data.data;
       if(result.code==200){
-        proxy.$message.success('证书注销成功');
+       Message.success('证书注销成功');
       }
     })
   }
@@ -1169,7 +1170,7 @@
     }).then(data=>{
       let result=data.data;
       if(result.code==200){
-        proxy.$message.success('签章申请成功');
+       Message.success('签章申请成功');
       }
     })
   }
@@ -1177,7 +1178,7 @@
     updateSign(modalForm.user_doctor_info.user_id).then(data=>{
       let result=data.data;
       if(result.code==200){
-        proxy.$message.success('签章更新成功');
+       Message.success('签章更新成功');
       }
     })
   }
@@ -1327,7 +1328,7 @@
 
       } else {
         console.log(valid)
-        proxy.$message.error('表单校验失败');
+       Message.error('表单校验失败');
         //done(false);
       }
     });
@@ -1357,15 +1358,15 @@
         hideCancel: false,
         onOk: async () => {
           const res = await removeDoctor({ ids: batchList });
-          proxy.$message.success(res.message);
+         Message.success(res.message);
           getDoctorInfo(pager);
         },
         onCancel: () => {
-          proxy.$message.info('已取消批量删除数据');
+         Message.info('已取消批量删除数据');
         },
       });
     } else {
-      proxy.$message.error('请勾选需要删除的数据！');
+     Message.error('请勾选需要删除的数据！');
     }
   };
 

From d49e157efb82530e90c207be2291b454b43a6357 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 30 Oct 2023 14:02:52 +0800
Subject: [PATCH 17/32] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/doctorModal.vue           |  8 ++++----
 src/views/dictionary/sign-list/index.vue |  7 ++-----
 src/views/doctor/doctor-list/index.vue   | 23 +++++++++++++++++------
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/components/doctorModal.vue b/src/components/doctorModal.vue
index c29ad2f..14e559e 100644
--- a/src/components/doctorModal.vue
+++ b/src/components/doctorModal.vue
@@ -382,14 +382,14 @@
           <a-form-item field="" label="" no-style>
             <div v-if="modalForm.user_ca_cert">证书有效期:{{parseTime(modalForm.user_ca_cert.cert_application_time,'{y}-{m}-{d}')}}-{{parseTime(modalForm.user_ca_cert.cert_expire_time,'{y}-{m}-{d}')}}</div>
             <a-space style="margin-top: 15px;">
-              <!-- <a-button type="primary" >证书申请</a-button> -->
-              <a-button type="primary" status="success" @click="()=>{okVisible=true;okStatus=2;}">证书续期</a-button>
-              <a-button type="primary" status="danger" @click="()=>{okVisible=true;okStatus=3;}">证书注销</a-button>
+              <a-button type="primary" @click="()=>{okVisible=true;okStatus=6;}" v-has="'admin:sysDoctorList:applyCA'">证书申请</a-button> 
+              <a-button type="primary" status="success" @click="()=>{okVisible=true;okStatus=2;}" v-has="'admin:sysDoctorList:updateCA'">证书续期</a-button>
+              <a-button type="primary" status="danger" @click="()=>{okVisible=true;okStatus=3;}" v-has="'admin:sysDoctorList:removeCA'">证书注销</a-button>
             </a-space>
             <a-divider />
             <div class="title">签章配置</div>
             <a-space style="margin-top: 15px;">
-              <a-button type="primary" status="success" @click="()=>{okVisible=true;okStatus=4;}">签章申请</a-button>
+              <a-button type="primary" status="success" @click="()=>{okVisible=true;okStatus=4;}" v-has="'admin:sysDoctorList:applySign'">签章申请</a-button>
               <!-- <a-button type="primary" status="danger" @click="()=>{okVisible=true;okStatus=5;}">签章更新</a-button> -->
             </a-space>
           </a-form-item>
diff --git a/src/views/dictionary/sign-list/index.vue b/src/views/dictionary/sign-list/index.vue
index 2bacd7d..45485f8 100644
--- a/src/views/dictionary/sign-list/index.vue
+++ b/src/views/dictionary/sign-list/index.vue
@@ -20,7 +20,7 @@
     
         <template #action="{ record }">
           <a-space>
-            <a-button v-has="'admin:sysFamilyList:detail'" type="text"
+            <a-button v-has="'admin:sysDicitonary:updateCA'" type="text"
               @click="handleUpdateCA(record)"><icon-book />证书续期</a-button>
             <!-- <a-button v-has="'admin:sysFamilyList:edit'" type="text" @click="handleUpdate(record)"><icon-edit />
               修改</a-button> -->
@@ -78,8 +78,7 @@
 
     const handleUpdateCA=(record)=>{
         updateHospitalCA().then(data=>{
-      let result=data.data;
-      if(result.code==200){
+      if(data.code==200){
        Message.success('证书更新成功');
       }
     })
@@ -185,7 +184,6 @@
     .cert .arco-form-item-label-col {
       flex: 0 0 8px !important;
     }
-  
     .red {
       display: inline-block;
       margin-right: 5px;
@@ -193,7 +191,6 @@
       color: red;
       margin-top: 5px;
     }
-  
     .cardNum {
       width: 148px;
     }
diff --git a/src/views/doctor/doctor-list/index.vue b/src/views/doctor/doctor-list/index.vue
index 77fe057..bbafc4e 100644
--- a/src/views/doctor/doctor-list/index.vue
+++ b/src/views/doctor/doctor-list/index.vue
@@ -567,7 +567,7 @@
           <a-form-item field="" label="" no-style>
             <div v-if="modalForm.user_ca_cert">证书有效期:{{parseTime(modalForm.user_ca_cert.cert_application_time,'{y}-{m}-{d}')}}-{{parseTime(modalForm.user_ca_cert.cert_expire_time,'{y}-{m}-{d}')}}</div>
             <a-space style="margin-top: 15px;">
-              <!-- <a-button type="primary" >证书申请</a-button> -->
+              <a-button type="primary" @click="()=>{okVisible=true;okStatus=6;}" v-has="'admin:sysDoctorList:applyCA'">证书申请</a-button> 
               <a-button type="primary" status="success" @click="()=>{okVisible=true;okStatus=2;}" v-has="'admin:sysDoctorList:updateCA'">证书续期</a-button>
               <a-button type="primary" status="danger" @click="()=>{okVisible=true;okStatus=3;}" v-has="'admin:sysDoctorList:removeCA'">证书注销</a-button>
               
@@ -616,6 +616,7 @@
       <div v-else-if="okStatus==3">确定注销CA证书？</div>
       <div v-else-if="okStatus==4">确定申请签章？</div>
       <div v-else-if="okStatus==5">确定更新签章？</div>
+      <div v-else-if="okStatus==6">确定申请CA证书？</div>
     </a-modal>
   </div>
 </template>
@@ -623,7 +624,7 @@
 <script setup>
   import { reactive, ref, getCurrentInstance, onMounted,  watch } from 'vue';
   import { getDoctorList, addDoctor, removeDoctor, updateDoctor, getDoctorDetail, departmentList, decryptCard, hospitalList, expertiseList, areaList, bankList, decryptBank } from '@/api/doctor/list';
-  import { updateCA,removeCA,updateSign,applySign } from '@/api/doctor/ca';
+  import { applyCA,updateCA,removeCA,updateSign,applySign } from '@/api/doctor/ca';
   import { ossSign, ossUpload } from '@/api/oss';
   import { parseTime } from '@/utils/parseTime';
   import { Message } from '@arco-design/web-vue';
@@ -1147,18 +1148,26 @@
     //await nextTick();
 
   };
+  //申请证书
+  
+  const handleApplyCA=()=>{
+    applyCA(modalForm.user_doctor_info.user_id).then(data=>{
+      if(data.code==200){
+       Message.success('证书申请成功');
+      }
+    })
+  }
   const handleUpdateCA=()=>{
     updateCA(modalForm.user_doctor_info.user_id).then(data=>{
-      let result=data.data;
-      if(result.code==200){
+
+      if(data.code==200){
        Message.success('证书更新成功');
       }
     })
   }
   const handleRemoveCA=()=>{
     removeCA(modalForm.user_doctor_info.user_id).then(data=>{
-      let result=data.data;
-      if(result.code==200){
+      if(data.code==200){
        Message.success('证书注销成功');
       }
     })
@@ -1344,6 +1353,8 @@
     }else if(okStatus.value==5){
        //签章更新
       handleUpdateSign();
+    }else if(okStatus.value==6){
+      handleApplyCA();
     }
     
     

From ccc87a2a75b34a14ace92e95e197ed1b5a393ca4 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 30 Oct 2023 14:15:14 +0800
Subject: [PATCH 18/32] =?UTF-8?q?=E8=AF=81=E4=B9=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/doctor/doctor-list/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/doctor/doctor-list/index.vue b/src/views/doctor/doctor-list/index.vue
index bbafc4e..a1ee1c6 100644
--- a/src/views/doctor/doctor-list/index.vue
+++ b/src/views/doctor/doctor-list/index.vue
@@ -1154,6 +1154,7 @@
     applyCA(modalForm.user_doctor_info.user_id).then(data=>{
       if(data.code==200){
        Message.success('证书申请成功');
+       handleUpdate({doctor_id:modalForm.doctor_id})
       }
     })
   }
@@ -1161,7 +1162,8 @@
     updateCA(modalForm.user_doctor_info.user_id).then(data=>{
 
       if(data.code==200){
-       Message.success('证书更新成功');
+        Message.success('证书更新成功');
+        handleUpdate({doctor_id:modalForm.doctor_id})
       }
     })
   }
@@ -1169,6 +1171,7 @@
     removeCA(modalForm.user_doctor_info.user_id).then(data=>{
       if(data.code==200){
        Message.success('证书注销成功');
+       handleUpdate({doctor_id:modalForm.doctor_id})
       }
     })
   }

From 4e00bddf63a31b626c49475d3155ccdfe2868cfa Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 30 Oct 2023 15:40:04 +0800
Subject: [PATCH 19/32] =?UTF-8?q?=E7=AD=BE=E7=AB=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/finance/record.js                   |  18 ++
 src/views/doctor/doctor-list/index.vue      |   6 +-
 src/views/finance/financialrecord/index.vue | 327 ++++++++++++++++++++
 3 files changed, 347 insertions(+), 4 deletions(-)
 create mode 100644 src/api/finance/record.js
 create mode 100644 src/views/finance/financialrecord/index.vue

diff --git a/src/api/finance/record.js b/src/api/finance/record.js
new file mode 100644
index 0000000..5fcd6a7
--- /dev/null
+++ b/src/api/finance/record.js
@@ -0,0 +1,18 @@
+import request from '../../utils/request'
+
+const url = '/admin/finance/withdrawal';
+
+
+export function getWithdrawalList(params){
+  return request({
+    url:'/admin/finance/withdrawal',
+    method: 'get',
+    params
+  })
+}
+export function getWithdrawalDetail(id){
+    return request({
+      url:'/admin/finance/withdrawal/'+id,
+      method: 'get'
+    })
+  }
\ No newline at end of file
diff --git a/src/views/doctor/doctor-list/index.vue b/src/views/doctor/doctor-list/index.vue
index a1ee1c6..7f4ed97 100644
--- a/src/views/doctor/doctor-list/index.vue
+++ b/src/views/doctor/doctor-list/index.vue
@@ -1180,16 +1180,14 @@
       type:2,
       user_id:modalForm.user_doctor_info.user_id
     }).then(data=>{
-      let result=data.data;
-      if(result.code==200){
+      if(data.code==200){
        Message.success('签章申请成功');
       }
     })
   }
   const handleUpdateSign=()=>{
     updateSign(modalForm.user_doctor_info.user_id).then(data=>{
-      let result=data.data;
-      if(result.code==200){
+      if(data.code==200){
        Message.success('签章更新成功');
       }
     })
diff --git a/src/views/finance/financialrecord/index.vue b/src/views/finance/financialrecord/index.vue
new file mode 100644
index 0000000..8a39510
--- /dev/null
+++ b/src/views/finance/financialrecord/index.vue
@@ -0,0 +1,327 @@
+<template>
+  <div class="app-container">
+    <a-form :model="queryForm" ref="queryFormRef" layout="inline">
+
+      <a-form-item field="user_name" label="账号名字">
+        <a-input :style="{ width: '182px' }" v-model="queryForm.user_name" placeholder="请输入账号或者姓名" @press-enter="handleQuery" />
+      </a-form-item>
+      <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="status" label="启用状态">
+        <a-select  v-model="queryForm.status" placeholder="请选择启用状态" :style="{ width: '182px' }">
+          <a-option :value="0">禁用</a-option>
+          <a-option :value="1">正常</a-option>
+          <a-option :value="2">删除</a-option>
+        </a-select>
+      </a-form-item> -->
+      <a-form-item field="create_range_time" label="创建时间范围">
+        <a-range-picker
+          style="width: 260px"
+          v-model="queryForm.create_range_time"
+        />
+      </a-form-item>
+      <a-form-item>
+        <a-space>
+          <a-button type="primary" @click="handleQuery"><icon-search /> 搜索</a-button>
+          <a-button @click="handleResetQuery"><icon-loop /> 重置</a-button>
+        </a-space>
+      </a-form-item>
+    </a-form>
+
+    <a-divider />
+
+    <!-- action -->
+    <!-- <div class="action">
+      <a-space>
+        <a-button v-has="'admin:sysFamilyList:add'" type="primary" @click="handleAdd"><icon-plus /> 新增 </a-button>
+        <a-button v-has="'admin:sysFamilyList:remove'" type="primary" status="danger"><icon-delete /> 批量删除 </a-button> 
+      </a-space>
+    </div> -->
+
+    <!-- table -->
+    <a-table :columns="columns" :data="tableData" 
+      :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)}"
+      @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
+      <template #doctor_id="{record,rowIndex}">
+        <div>{{(rowIndex+1)+(pager.page-1)*10}}</div>
+      </template>
+      <template #status="{ record }">
+        <!-- 状态（0:禁用 1:正常 2:删除） -->
+        <a-tag v-if="record.status == 0" color="#ffb400">禁用</a-tag>
+        <a-tag v-else-if="record.status == 1" color="green">正常</a-tag>
+        <a-tag v-else color="red">删除</a-tag>
+      </template>
+      <template #is_platform_deep_cooperation="{ record }">
+        <a-tag v-if="record.is_platform_deep_cooperation == 0" color="gray">否</a-tag>
+        <a-tag v-else color="green">是</a-tag>
+      </template>
+  
+      <template #disable_reason="{record}">
+        <div class="reason" v-if="record.disable_reason" :title="record.disable_reason">{{ record.disable_reason }}</div>
+        <div v-else>-</div>
+      </template>
+      <template #relation="{record}">
+        <div>{{formatRelation(record.relation)}}</div>
+       
+      </template>
+      <template #action="{ record }">
+        <a-space>
+          <a-button v-has="'admin:sysFamilyList:detail'" type="text"
+            @click="handleDetail(record)"><icon-book />详情</a-button>
+          <!-- <a-button v-has="'admin:sysFamilyList:edit'" type="text" @click="handleUpdate(record)"><icon-edit />
+            修改</a-button> -->
+          <!-- <a-button v-has="'admin:sysFamilyList:remove'" type="text"
+            @click="() => { deleteVisible = true; deleteData = [record.doctor_id];  }"><icon-delete /> 删除</a-button> -->
+        </a-space>
+      </template>
+    </a-table>
+
+    <familyModal :modalVisible="modalVisible" :modalForm="modalForm" @familyVisibleChange="()=>{modalVisible=false}"></familyModal>
+    <!-- Akiraka 20230223 删除与批量删除 开始 -->
+    <!-- <DeleteModal :data="deleteData" :visible="deleteVisible" :apiDelete="removeFamily"
+      @deleteVisibleChange="() => deleteVisible = false" /> -->
+    <!-- Akiraka 20230223 删除与批量删除 结束 -->
+    <a-modal v-model:visible="okVisible" :modal-style="{width:'320px'}" body-class="okmodal" 
+      @cancel="()=>okVisible=false">
+      <template #title>
+        提示
+      </template>
+      <div>确定保存当前信息？</div>
+    </a-modal>
+  </div>
+</template>
+
+<script setup>
+  import { reactive, ref, getCurrentInstance, onMounted, nextTick, watch, computed } from 'vue';
+  import { getWithdrawalList,getWithdrawalDetail} from '@/api/finance/record';
+  // import {formatRelation} from "@/utils/format"
+  // Akiraka 20230210 删除数据
+  const deleteData = ref([])
+  // Akiraka 20230210 删除对话框
+  const deleteVisible = ref(false)
+  // Akiraka 20230210 监听删除事件
+  const okVisible = ref(false);
+
+  watch(() => deleteVisible.value, (value) => {
+    if (value == false) {
+      getWithdrawalInfo(pager);
+    }
+  });
+
+  const file = ref();
+  const { proxy } = getCurrentInstance();
+  const currentPage = ref(1);
+  // Pager
+  const pager = {
+    total: 0,
+    page: 1,
+    page_size: 10,
+  };
+  // form
+  const queryForm = reactive({
+
+  });
+  const modalForm = reactive({
+    user:{},
+    avatar: 'https://img.applets.igandanyiyuan.com/basic/file/patient_avatar.png',
+ 
+  });
+  watch(() => queryForm.create_range_time,
+  (value) => {
+    if (value) {
+      let [startTime, endTime] = value;
+      queryForm.created_at = startTime + '&' + endTime;
+    } else {
+      queryForm.created_at = '';
+    }
+  }
+);
+  // Modal
+  const modalVisible = ref(false);
+  const modalTitle = ref('默认标题');
+ 
+  // Batch Del List
+  let batchList = [];
+
+  // Table Columns
+  const columns = [
+    { title: '编号', dataIndex: 'doctor_id', slotName: 'doctor_id', width: '90' },
+    { title: '医生签名', dataIndex: 'card_name',width:200 },
+    { title: '所属账号', dataIndex: 'user_name', width:200 },
+    { title: '账号电话', dataIndex: 'mobile_mask',width:200 },
+    { title: '与账号关系', dataIndex: 'relation', slotName: 'relation',width: 150 },
+    // { title: '启用状态', dataIndex: 'status', slotName: 'status' },
+    { title: '操作', slotName: 'action', fixed: "right", width: 180 },
+  ];
+
+  // Table Data
+  const tableData = ref([]);
+  //弹框状态
+  const modalSatus = ref('add');
+
+  // 新增Satus
+  const handleAdd = () => {
+    modalVisible.value = true;
+    modalTitle.value = '新增患者';
+    modalSatus.value = 'add';
+    modalForm.patient_id = null;
+  };
+
+  //详情
+  const handleDetail = async (record) => {
+    const { code, data, message } = await getWithdrawalDetail(record.family_id);
+
+    if (code == 200) {
+        Object.assign(modalForm, data);
+        modalVisible.value = true;
+      }
+    };
+  // 批量删除
+  const handleBatchDelete = () => {
+    if (batchList.length !== 0) {
+      proxy.$modal.warning({
+        title: '提示',
+        content: '是否批量删除以下选中的数据？',
+        hideCancel: false,
+        onOk: async () => {
+          const res = await removeFamily({ ids: batchList });
+          proxy.$message.success(res.message);
+          getWithdrawalInfo(pager);
+        },
+        onCancel: () => {
+          proxy.$message.info('已取消批量删除数据');
+        },
+      });
+    } else {
+      proxy.$message.error('请勾选需要删除的数据！');
+    }
+  };
+
+  /**
+   * 分页改变
+   * @param {Number} [page]
+   */
+  const handlePageChange = (page) => {
+    pager.page = page;
+
+    // 修改当前页码
+    currentPage.value = page;
+    getWithdrawalInfo({ ...pager, ...queryForm });
+  };
+
+  // 每页数据量
+  const handlepage_sizeChange = (page_size) => {
+    pager.page_size = page_size;
+    getWithdrawalInfo({ ...pager, ...queryForm });
+  };
+
+  // 获取患者信息
+  const getWithdrawalInfo = async (params = {}) => {
+    const { data, code, message } = await getWithdrawalList(params);
+    if (code == 200) {
+      tableData.value = data.data;
+      Object.assign(pager, { total: data.total, page: data.page, page_size: data.page_size });
+    }
+  };
+
+  // 查询患者信息
+  const handleQuery = async () => {
+    pager.page = 1;
+    const params = {
+      page: pager.page,
+      page_size: pager.page_size,
+      ...queryForm,
+    };
+
+    getWithdrawalInfo(params);
+  };
+
+  // 重置搜索
+  const handleResetQuery = () => {
+    proxy.$refs.queryFormRef.resetFields();
+    getWithdrawalInfo(queryForm);
+  }
+  
+  
+  onMounted(() => {
+    getWithdrawalInfo(pager);
+  });
+</script>
+
+<style lang="scss" scoped>
+  .action {
+    margin-bottom: 12px;
+  }
+
+  .okmodal div {
+    text-align: center;
+  }
+
+  .hospital_name {
+    width: 140px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .headImg {
+    margin-right: 20px;
+    border-radius: 50%;
+    width: 80px;
+    height: 80px;
+  }
+
+  .arco-form-item-layout-horizontal:first-child,
+  .arco-form-item-layout-horizontal:nth-child(2) {
+    align-items: center;
+  }
+  .cellbox{
+    margin-top: 35px;
+  }
+  .cellbox .cell{
+    width:50%;
+    border-bottom:1px dashed #efefef;
+    margin-bottom: 20px;
+  }
+  .cellbox .cell:first-child{
+    border: none;
+  }
+  .cell{
+    .arco-form-item{
+      margin-bottom: 10px;
+    }
+  }
+  .box {
+    display: flex;
+    align-items: center;
+  }
+
+  .cert .arco-form-item-label-col {
+    flex: 0 0 8px !important;
+  }
+
+  .red {
+    display: inline-block;
+    margin-right: 5px;
+    font-size: 14px;
+    color: red;
+    margin-top: 5px;
+  }
+
+  .cardNum {
+    width: 148px;
+  }
+  .codbox{
+    display: flex;
+    align-items: center;
+  }
+  .reason{
+    width:250px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+</style>
\ No newline at end of file

From 0ee35c266e024cb8a0d48372c07596c56ba3558c Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 3 Nov 2023 08:57:37 +0800
Subject: [PATCH 20/32] =?UTF-8?q?page=5Fsize=E6=94=B9=E5=8A=A8=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E8=B4=A2=E5=8A=A1=E7=BB=93=E7=AE=97=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/finance/account.js                    |  21 +
 src/api/finance/bank.js                       |   9 +
 src/api/finance/record.js                     |  37 +-
 src/components/accountModal.vue               | 314 +++++++++++++
 src/components/inquiryDetailMoneyModal.vue    | 308 +++++++++++++
 src/components/numberModal.vue                |  68 +++
 src/components/withdrawalModal.vue            | 432 ++++++++++++++++++
 src/utils/format.js                           |  12 +-
 src/views/admin/sys-post/index.vue            |   2 +-
 src/views/admin/sys-role/index.vue            |   2 +-
 src/views/admin/sys-user/index.vue            |   2 +-
 src/views/dictionary/sign-list/index.vue      |   2 +-
 src/views/doctor/doctor-examine/index.vue     |   2 +-
 src/views/doctor/doctor-list/index.vue        |   2 +-
 src/views/doctor/doctor-multipoint/index.vue  |   2 +-
 src/views/finance/bankcard/index.vue          | 307 +++++++++++++
 src/views/finance/doctoraccount/index.vue     | 298 ++++++++++++
 src/views/finance/financialrecord/index.vue   | 116 +++--
 src/views/inquiry/inquiry-list/index.vue      |   2 +-
 src/views/inquiry/sysconfig-list/index.vue    |   2 +-
 src/views/order/inquiry-record/index.vue      |   2 +-
 src/views/order/order-list/index.vue          |   2 +-
 src/views/patient/family-list/index.vue       |   2 +-
 src/views/patient/patient-list/index.vue      |   2 +-
 .../prescription/prescription-list/index.vue  |   2 +-
 25 files changed, 1890 insertions(+), 60 deletions(-)
 create mode 100644 src/api/finance/account.js
 create mode 100644 src/api/finance/bank.js
 create mode 100644 src/components/accountModal.vue
 create mode 100644 src/components/inquiryDetailMoneyModal.vue
 create mode 100644 src/components/numberModal.vue
 create mode 100644 src/components/withdrawalModal.vue
 create mode 100644 src/views/finance/bankcard/index.vue
 create mode 100644 src/views/finance/doctoraccount/index.vue

diff --git a/src/api/finance/account.js b/src/api/finance/account.js
new file mode 100644
index 0000000..d99942b
--- /dev/null
+++ b/src/api/finance/account.js
@@ -0,0 +1,21 @@
+import request from '../../utils/request'
+export function getAccountList(params){
+  return request({
+    url:'/admin/doctor/account',
+    method: 'get',
+    params
+  })
+}
+export function getAccountDetail(id){
+    return request({
+      url:'/admin/doctor/account/'+id,
+      method: 'get'
+    })
+  }
+  export function getAccountOrder(id,params){//关联订单列表
+    return request({
+      url:'/admin/doctor/account/order/'+id,
+      method: 'get',
+      params
+    })
+  }
\ No newline at end of file
diff --git a/src/api/finance/bank.js b/src/api/finance/bank.js
new file mode 100644
index 0000000..49e5463
--- /dev/null
+++ b/src/api/finance/bank.js
@@ -0,0 +1,9 @@
+import request from '../../utils/request'
+export function getBankList(params){
+  return request({
+    url:'/admin/doctor/bank',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/finance/record.js b/src/api/finance/record.js
index 5fcd6a7..276052e 100644
--- a/src/api/finance/record.js
+++ b/src/api/finance/record.js
@@ -1,8 +1,6 @@
 import request from '../../utils/request'
 
 const url = '/admin/finance/withdrawal';
-
-
 export function getWithdrawalList(params){
   return request({
     url:'/admin/finance/withdrawal',
@@ -15,4 +13,37 @@ export function getWithdrawalDetail(id){
       url:'/admin/finance/withdrawal/'+id,
       method: 'get'
     })
-  }
\ No newline at end of file
+  }
+export function getOrder(id,params){
+    return request({
+      url:'/admin/finance/withdrawal/order/'+id,
+      method: 'get',
+      params
+    })
+  }
+ 
+  export function editIncome(id,data){
+    return request({
+      url:'/admin/finance/withdrawal/income/'+id,
+      method: 'put',
+      data
+    })
+  }
+   
+  export function withdrawalStatus(id,data){//提现-修改提现审核状态
+    return request({
+      url:'/admin/finance/withdrawal/examine/'+id,
+      method: 'put',
+      data
+    })
+  }
+     
+  export function confirmPay(id){//提现-确认打款
+    return request({
+      url:'/admin/finance/withdrawal/payment/'+id,
+      method: 'put'
+    })
+  }
+ 
+ 
+ 
\ No newline at end of file
diff --git a/src/components/accountModal.vue b/src/components/accountModal.vue
new file mode 100644
index 0000000..de681ae
--- /dev/null
+++ b/src/components/accountModal.vue
@@ -0,0 +1,314 @@
+<template>
+ <!-- Modal -->
+ <a-modal v-model:visible="modalVisible" fullscreen title="医生账户详情" title-align="start" :footer="false"
+       @cancel="handleClose" >
+      <a-form :model="modalForm"    ref="modalFormRef" :auto-label-width="true">
+        <div class="titlebox">
+          <div class="bar"></div>
+          <div class="name">关联订单</div>
+        </div>
+        <a-row style="margin-top: 35px;">
+          <a-form :model="queryForm"  ref="queryFormRef" layout="inline">
+
+<a-form-item field="patient_name" label="患者姓名">
+  <a-input :style="{ width: '182px' }" v-model="queryForm.patient_name" placeholder="请输入患者姓名" @press-enter="handleQuery" />
+</a-form-item>
+<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="inquiry_status" label="订单状态">
+  <a-select  v-model="queryForm.inquiry_status" placeholder="请订单状态" :style="{ width: '182px' }">
+    <!-- 1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消 -->
+    <a-option :value="1">待支付</a-option>
+    <a-option :value="2">待分配</a-option>
+    <a-option :value="3">待接诊</a-option>
+    <a-option :value="4">已接诊</a-option>
+    <a-option :value="5">已完成</a-option>
+    <a-option :value="6">已结束</a-option>
+    <a-option :value="7">已取消</a-option>
+  </a-select>
+</a-form-item> 
+
+<a-row>
+        <a-form-item field="pay_range_time" label="支付时间范围">
+        <a-range-picker style="width: 330px;" v-model="queryForm.pay_range_time" />
+      </a-form-item>
+      <a-form-item field="complete_range_time" label="完成时间范围">
+        <a-range-picker style="width: 330px;" v-model="queryForm.complete_range_time" />
+      </a-form-item>
+      <a-form-item field="end_range_time" label="结束时间范围">
+        <a-range-picker style="width: 330px;" v-model="queryForm.end_range_time" />
+      </a-form-item>
+      <a-form-item field="cancel_range_time" label="取消时间范围">
+        <a-range-picker
+          style="width: 330px"
+          v-model="queryForm.cancel_range_time"
+        />
+      </a-form-item>
+      <a-form-item field="reception_range_time" label="接诊时间范围">
+        <a-range-picker
+          style="width: 330px"
+          v-model="queryForm.reception_range_time"
+        />
+      </a-form-item>
+      <a-form-item field="create_range_time" label="创建时间范围">
+        <a-range-picker
+          style="width: 330px"
+          v-model="queryForm.create_range_time"
+        />
+      </a-form-item>
+      <a-form-item>
+        <a-space>
+          <a-button type="primary" @click="handleQuery"><icon-search /> 搜索</a-button>
+          <a-button @click="handleResetQuery"><icon-loop /> 重置</a-button>
+        </a-space>
+      </a-form-item>
+      </a-row>
+</a-form>
+<a-divider /> 
+        </a-row>
+        <a-row :gutter="24" >
+          <a-col :span="24">
+            <a-form-item field="idCard" hide-label="true" >
+       <div class="tablebox"   style="width:100%">
+                   <!-- table -->
+    <a-table :columns="columns" :data="tableData" 
+     :scroll="{ x:1500 }"
+   
+      :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)}"
+      @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
+      <template #doctor_id="{record,rowIndex}">
+        <div>{{(rowIndex+1)+(pager.page-1)*pager.page_size}}</div>
+      </template>
+      <template #inquiry_pay_channel="{record}">
+          <div v-if="record.inquiry_pay_channel==1">小程序支付</div>
+          <div v-else-if="record.inquiry_pay_channel==2">微信扫码</div>
+          <div v-else-if="record.inquiry_pay_channel==3">模拟支付</div>
+      </template>
+      <!-- 1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消） -->
+      <template #inquiry_status="{record}">
+          <div v-if="record.inquiry_status==1">待支付</div>
+          <div v-else-if="record.inquiry_status==2">待分配</div>
+          <div v-else-if="record.inquiry_status==3">待接诊</div>
+          <div v-else-if="record.inquiry_status==4">已接诊</div>
+          <div v-else-if="record.inquiry_status==5">已完成</div>
+          <div v-else-if="record.inquiry_status==6">已结束</div>
+          <div v-else-if="record.inquiry_status==7">已取消</div>
+      </template>
+      <template #doctor_amount="{ record }">
+        {{(record.doctor_amount) }}元
+      </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>
+      <template #inquiry_type="{ record }">
+        {{ formatInquiryType(record.inquiry_type) }}
+      </template>
+      <template #cancel_reason="{ record }">
+        {{ formatOrderCancelReason(record.cancel_reason) }}
+      </template>
+      <template #entry_status="{ record }">
+        {{ formatEnteyStatus(record.entry_status) }}
+      </template>
+      <!-- <template #action="{ record }">
+        <a-space>
+          <a-button v-has="'admin:sysOrderList:detail'" type="text"
+            @click="handleDetail(record)"><icon-book />详情</a-button>
+        </a-space>
+      </template> -->
+    </a-table>
+       </div>
+            </a-form-item>
+          </a-col>
+        </a-row>
+       
+      </a-form>
+    </a-modal>
+   
+</template>
+<script setup>
+import {ref,toRefs,watch,reactive,getCurrentInstance} from 'vue';
+import {getAccountOrder} from "@/api/finance/account"
+import { parseTime } from '@/utils/parseTime';
+import {formatInquiryType,formatOrderCancelReason,formatEnteyStatus} from "@/utils/format"
+import { Message } from '@arco-design/web-vue';
+const props = defineProps({
+  // 是否显示
+  modalVisible: {
+    type: Boolean,
+    default: false,
+  },
+  modalForm: {
+    type: Object,
+  },
+});
+const { proxy } = getCurrentInstance();
+const doctor_id=ref('');
+const currentPage = ref(1);
+const pager = {
+    total: 1,
+    page: 1,
+    page_size: 10,
+  };
+   // form
+   const queryForm = reactive({});
+const emits = defineEmits(['familyVisibleChange']);
+const {modalVisible,modalForm} = toRefs(props);
+//切换小眼睛
+  const showEye = ref(false);
+  const id_card_num = ref('');
+  watch(()=>props.modalForm.doctor_id,()=>{
+    if(props.modalForm.doctor_id){
+      doctor_id.value=props.modalForm.doctor_id;
+      handleGetOrder(props.modalForm.doctor_id,{...pager})
+    }else{
+      doctor_id.value='';
+    }
+  })
+
+  watch(()=>queryForm.end_range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.finish_time=startTime+"&"+endTime;
+  }else{
+    queryForm.finish_time=''
+  };
+  console.log(queryForm.finish_time)
+})
+watch(()=>queryForm.pay_range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.pay_time=startTime+"&"+endTime;
+  }else{
+    queryForm.pay_time=''
+  };
+})
+watch(()=>queryForm.complete_range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.complete_time=startTime+"&"+endTime;
+  }else{
+    queryForm.complete_time=''
+  };
+})
+watch(()=>queryForm.cancel_range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.cancel_time=startTime+"&"+endTime;
+  }else{
+    queryForm.cancel_time=''
+  };
+})
+watch(()=>queryForm.reception_range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.reception_time=startTime+"&"+endTime;
+  }else{
+    queryForm.reception_time=''
+  };
+})
+watch(()=>queryForm.create_range_time,(value)=>{
+  if(value){
+    let[startTime,endTime]=value
+    queryForm.created_at=startTime+"&"+endTime;
+  }else{
+    queryForm.created_at=''
+  };
+})
+ 
+   // Table Columns
+   const columns = [
+    { title: '编号', dataIndex: 'doctor_id', slotName: 'doctor_id', width: '90' },
+    { title: '订单编号', dataIndex: 'inquiry_no',width:200 },
+  { 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: 'doctor_amount',slotName:'doctor_amount',width:100 },
+  { 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: '操作', slotName: 'action',fixed: "right", width: 100  },
+]
+// Akiraka 20230210 关闭弹窗
+const handleClose = () => {
+  emits('familyVisibleChange', false);
+};
+const tableData=ref([]);
+const handleGetOrder=(id,params={})=>{
+  getAccountOrder(id,params).then(res=>{
+    if(res.code==200){
+      let data=res.data; 
+      tableData.value=data.data;
+      Object.assign(pager, { total: data.total, page: data.page, page_size: data.page_size });
+    }
+  })
+}
+  /**
+   * 分页改变
+   * @param {Number} [page]
+   */
+   const handlePageChange = (page) => {
+    pager.page = page;
+    // 修改当前页码
+    currentPage.value = page;
+    handleGetOrder(doctor_id.value,{ ...pager});
+  };
+
+  // 每页数据量
+  const handlepage_sizeChange = (page_size) => {
+   
+    pager.page_size = page_size;
+    handleGetOrder(doctor_id.value,{ ...pager});
+  };
+const handleQuery = async () => {
+    pager.page = 1;
+    const params = {
+      page: pager.page,
+      page_size: pager.page_size,
+      ...queryForm,
+    };
+
+    handleGetOrder(params);
+  };
+
+  // 重置搜索
+  const handleResetQuery = () => {
+    proxy.$refs.queryFormRef.resetFields();
+    handleGetOrder(queryForm);
+  }
+  
+</script>
+<style scoped>
+  .cardNum {
+    width: 150px;
+  }
+ .arco-form-item-layout-horizontal:first-child,
+  .arco-form-item-layout-horizontal:nth-child(2) {
+    align-items: center;
+  }
+  .cellbox{
+    margin-top: 35px;
+  }
+  .cellbox .cell{
+    width:50%;
+    border-bottom:1px dashed #efefef;
+    margin-bottom: 20px;
+  }
+  .cellbox .cell:first-child{
+    border: none;
+  }
+ 
+  .box {
+    display: flex;
+    align-items: center;
+  }
+
+  .cert .arco-form-item-label-col {
+    flex: 0 0 8px !important;
+  }
+
+</style>
\ No newline at end of file
diff --git a/src/components/inquiryDetailMoneyModal.vue b/src/components/inquiryDetailMoneyModal.vue
new file mode 100644
index 0000000..cf16b8a
--- /dev/null
+++ b/src/components/inquiryDetailMoneyModal.vue
@@ -0,0 +1,308 @@
+<template>
+  <!-- Modal -->
+  <a-modal
+    v-model:visible="modalVisible"
+    fullscreen
+    :title="'问诊订单详情'"
+    title-align="start"
+    :auto-label-width="true"
+    :footer="false"
+    @cancel="handleClose"
+  >
+    <div class="titlebox">
+      <div class="bar"></div>
+      <div class="name">订单信息</div>
+    </div>
+    <a-form :model="modalForm" ref="modalFormRef" :auto-label-width="true">
+      <a-row :gutter="24" style="margin-top: 35px">
+        <a-col :span="12">
+          <a-form-item field="inquiry_no" label="订单编号：">
+            <span>{{ modalForm.inquiry_no }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item field="order_product_status" label="订单状态：">
+            <span>{{ formatInquiryStatus(modalForm.inquiry_status) }}</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24" >
+          <a-col :span="12">
+            <a-form-item field="user.created_at" label="下单时间：">
+              <span >{{modalForm.created_at}}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item field="pay_time" label="支付时间：">
+              <span v-if="parseTime(modalForm.pay_time)">{{parseTime(modalForm.pay_time)}}</span>
+              <span v-else>-</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item field="amount_total" label="订单金额：">
+               <span>{{modalForm.amount_total}}元</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item field="coupon_amount_total" label="优惠卷：">
+              <span  v-if="modalForm.coupon_amount_total>0">{{modalForm.coupon_amount_total}}元</span>
+              <span  v-else>无</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item field="payment_amount_total" label="实付金额：">
+              <span>{{modalForm.payment_amount_total}}元</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item field="inquiry_type" label="问诊类型：">
+              <span>{{formatInquiryType(modalForm.inquiry_type)}}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24" v-if="modalForm.cancel_reason">
+          <a-col :span="24">
+            <a-form-item field="department_custom_name" label="备   注 ：">
+             <span>{{ formatOrderCancelReason(modalForm.cancel_reason)}}</span>
+        </a-form-item>
+          </a-col>
+        </a-row>
+      <a-divider />
+      <div class="titlebox" >
+        <div class="bar"></div>
+        <div class="name">收益信息（订单金额*分成比例）</div>
+      </div>
+      <a-row :gutter="24" style="margin-top: 35px">
+        <a-col :span="12">
+          <a-form-item field="" label="平台与医生分成比例：">
+            <span>2.5/7.5</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item field="" label="平台收益：">
+            <span v-if="modalForm.payment_amount_total*0.25==0">0元</span>
+            <span v-else>{{ (modalForm.payment_amount_total*0.25).toFixed(2) }}</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24" >
+        <a-col :span="12">
+          <a-form-item field="" label="医生收益：">
+            <span v-if="modalForm.payment_amount_total*0.75==0">0元</span>
+            <span v-else>{{ (modalForm.payment_amount_total*0.75).toFixed(2) }}</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-divider />
+      <div class="titlebox" v-if="modalForm.user_doctor">
+        <div class="bar"></div>
+        <div class="name">医生信息</div>
+        <a-space
+          style="
+            margin-right: 8px;
+            flex: 1;
+            display: flex;
+            justify-content: flex-end;
+          "
+        >
+          <a-button type="primary" @click="openDcotor"
+            >查看医生完整信息</a-button
+          >
+        </a-space>
+      </div>
+      <a-row :gutter="24" style="margin-top: 35px">
+        <a-col :span="24">
+          <a-form-item field="license_cert" :hide-label="true">
+            <div class="doctorInfo" v-if="modalForm.user_doctor">
+              <a-space size="large">
+                <a-image
+                  width="80"
+                  height="80"
+                  class="headImg"
+                  :src="modalForm.user_doctor.avatar"
+                  v-if="modalForm.user_doctor.avatar"
+                >
+                </a-image>
+                <a-image
+                  width="80"
+                  height="80"
+                  class="headImg"
+                  src="https://img.applets.igandanyiyuan.com/basic/file/doctor_avatar.png"
+                  v-else
+                >
+                </a-image>
+              </a-space>
+              <div class="infobox">
+                <div class="name">
+                  {{ modalForm.user_doctor.user_name }}&nbsp;&nbsp;{{
+                    formatDoctorTitle(modalForm.user_doctor.doctor_title)
+                  }}
+                </div>
+                <div class="hospital">
+                  {{
+                    modalForm.user_doctor.hospital.hospital_name
+                  }}&nbsp;&nbsp;{{
+                    modalForm.user_doctor.department_custom_name
+                  }}
+                </div>
+              </div>
+            </div>
+            <div class="doctorInfo" v-else>暂未分配到医生</div>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-divider v-if="modalForm.user_doctor" />
+      <div class="titlebox">
+        <div class="bar"></div>
+        <div class="name">就诊人信息</div>
+        <a-space
+          style="
+            margin-right: 8px;
+            flex: 1;
+            display: flex;
+            justify-content: flex-end;
+          "
+        >
+          <a-button type="primary" status="warning" @click="openPatient"
+            >查看就诊人完整信息</a-button
+          >
+        </a-space>
+      </div>
+      <a-row
+        :gutter="24"
+        style="margin-top: 35px"
+        v-if="modalForm.order_inquiry_case"
+      >
+        <a-col :span="24">
+          <a-form-item label="就诊人姓名：">
+            <span
+              >{{ modalForm.order_inquiry_case.name }}&nbsp;&nbsp;（{{
+                modalForm.order_inquiry_case.sex == 1 ? '男' : '女'
+              }}&nbsp;&nbsp;{{ modalForm.order_inquiry_case.age }}岁）</span
+            >
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24" v-if="modalForm.order_inquiry_case">
+        <a-col :span="24">
+          <a-form-item field="inquiry_no" label="病情描述：">
+            <span>{{ modalForm.order_inquiry_case.disease_desc }}</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24" v-if="modalForm.order_inquiry_case">
+        <a-col :span="24">
+          <a-form-item field="inquiry_no" label="确诊疾病：">
+            <span
+              >{{
+                modalForm.order_inquiry_case.disease_class_name
+              }}&nbsp;&nbsp;{{
+                modalForm.user_doctor.department_custom_name
+              }}</span
+            >
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-divider />
+    </a-form>
+  </a-modal>
+  <!-- 医生详情弹框 -->
+  <doctorModal
+    :doctorVisible="doctorVisible"
+    :doctor_id="doctor_id"
+    @doctorVisibleChange="
+      () => {
+        doctorVisible = false;
+        doctor_id = '';
+      }
+    "
+  ></doctorModal>
+  <!-- 患者详情弹窗 -->
+  <patientModal
+    :patientVisible="patientVisible"
+    :data="patientData"
+    @patientVisibleChange="
+      () => {
+        patientVisible = false;
+      }
+    "
+  ></patientModal>
+</template>
+<script setup>
+import { ref, toRefs, reactive, watch} from 'vue';
+import { formatDoctorTitle } from '@/utils/format';
+import { parseTime } from '@/utils/parseTime';
+import { inquiryCase} from '@/api/order/list';
+import { formatInquiryType, formatInquiryStatus,formatOrderCancelReason } from '@/utils/format';
+const emits = defineEmits(['inquiryVisibleChange']);
+const props = defineProps({
+  // 是否显示
+  modalVisible: {
+    type: Boolean,
+    default: false,
+  },
+  modalForm: {
+    type: Object,
+    default:{
+      order_inquiry_case:{
+        inquiry_case_id:''
+      }
+    }
+  },
+});
+const doctorVisible = ref(false);
+const doctor_id = ref('');
+const patientVisible = ref(false);
+
+const patientData = reactive({});
+const { modalVisible, modalForm } = toRefs(props);
+const openPatient = () => {
+  patientVisible.value = true;
+};
+const order_inquiry_id=ref('');
+watch(() => props.modalForm,() => {
+    if (
+      props.modalForm.order_inquiry_case &&
+      props.modalForm.order_inquiry_case.inquiry_case_id
+    ) {
+      let id = props.modalForm.order_inquiry_case.inquiry_case_id;
+      inquiryCase(id).then((data) => {
+        Object.assign(patientData, data.data);
+      });
+    }
+    // if(props.modalForm.order_inquiry_id){
+    //     order_inquiry_id.value=props.modalForm.order_inquiry_id;
+    //   }
+  },{ immediate: true, deep: true })
+const openDcotor = () => {
+  doctor_id.value = props.modalForm.doctor_id;
+  doctorVisible.value = true;
+};
+const handleClose = () => {
+  emits('inquiryVisibleChange', (modalVisible.value = false));
+};
+
+</script>
+<style scoped>
+
+.headImg {
+  margin-right: 20px;
+  border-radius: 50%;
+  width: 80px;
+  height: 80px;
+}
+.doctorInfo {
+  display: flex;
+  align-items: center;
+}
+.infobox {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/components/numberModal.vue b/src/components/numberModal.vue
new file mode 100644
index 0000000..d26a731
--- /dev/null
+++ b/src/components/numberModal.vue
@@ -0,0 +1,68 @@
+<template>
+    <a-modal v-model:visible="okVisible" :modal-style="{width:'420px'}" body-class="okmodal" @ok="handleConfirm"
+      @cancel="handleClose" >
+      <template #title>
+        提示
+      </template>
+      <a-form :model="form" :rules="rules" ref="modalFormRef" size="medium" label-align="left" auto-label-width>
+      <a-form-item field="income_tax" label="个人所得税:" >
+        <a-input-number :min="0" :style="{width:'200px'}" v-model="form.income_tax" placeholder="请输入个人所得税"  mode="button" class="input-demo" />
+      </a-form-item>
+    </a-form>
+    <template #footer>
+      <a-button @click="handleClose"><template #icon><icon-close /></template>取消</a-button>
+      <a-button type="primary" @click="handleConfirm"><template #icon><icon-check /></template>确认</a-button>
+    </template>
+
+    </a-modal>
+</template>
+<script setup>
+import { reactive, toRefs, getCurrentInstance } from 'vue';
+import { Message } from '@arco-design/web-vue';
+const { proxy } = getCurrentInstance();
+const form = reactive({
+    income_tax:null
+    });
+const props = defineProps({
+  // 是否显示
+  okVisible: {
+    type: Boolean,
+    default: false,
+  },
+  id:{
+    type: String,
+    default:'',
+  },
+  api: {
+    type: Function,
+  },
+});
+const emits = defineEmits(['closeChange']);
+const {okVisible,id,api} = toRefs(props);
+
+// Akiraka 20230210 关闭弹窗
+const handleClose = () =>  {
+  emits('closeChange',false);
+  proxy.$refs.modalFormRef.resetFields();
+ // alert(flag)
+}
+// Akiraka 20230210 删除数据校验
+const rules = {
+    income_tax:  [{ required: true, message: '请输入个人所得税' }]
+};
+// Akiraka 20230210 确认按钮 => 开始数据检查
+const handleConfirm = () => {
+  proxy.$refs.modalFormRef.validate(async(valid) => {
+    if (!valid) {
+      const {code}= await api.value(id.value,form);
+      if(code==200){
+        Message.success("修改成功");
+          proxy.$refs.modalFormRef.resetFields();
+      }else{
+        proxy.$notification.error(response.message);
+      }
+      emits('closeChange',true);
+    }
+  })
+  }
+</script>
\ No newline at end of file
diff --git a/src/components/withdrawalModal.vue b/src/components/withdrawalModal.vue
new file mode 100644
index 0000000..e3e0433
--- /dev/null
+++ b/src/components/withdrawalModal.vue
@@ -0,0 +1,432 @@
+<template>
+ <!-- Modal -->
+ <a-modal v-model:visible="modalVisible" fullscreen title="提现详情" title-align="start" :footer="false"
+       @cancel="handleClose">
+      <div class="titlebox">
+        <div class="bar"></div>
+        <div class="name">医生信息</div>
+      </div>
+      <a-form :model="modalForm"    ref="modalFormRef" :auto-label-width="true">
+        <a-row :gutter="24" style="margin-top: 35px;">
+          <a-col :span="12">
+            <a-form-item field="avatar" label="医生姓名：">
+              <span>{{modalForm.doctor_name}} </span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item field="idCard" label="身份证号：" >
+              <div class="box" v-show="!showEye">
+                <div class="cardNum">{{modalForm.doctor_card_num_mask}}</div>
+                <icon-eye-invisible class="eye" @click="handelDecryptCard(modalForm.doctor_user_id,'')" />
+              </div>
+              <div class="box" v-show="showEye">
+                <div class="cardNum">{{id_card_num}}</div>
+                <icon-eye class="eye" @click="()=>{showEye=false}" />
+              </div>
+            </a-form-item>
+          </a-col>
+        </a-row>
+  
+        <a-divider />
+        <div class="titlebox">
+        <div class="bar"></div>
+        <div class="name">银行信息</div>
+      </div>
+        <a-row :gutter="24" style="margin-top: 35px;">
+          <a-col :span="12">
+            <a-form-item field="avatar" label="银行卡号：">
+              <span>{{modalForm.bank_card_code}}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+      
+            <a-form-item field="idCard" label="提现状态：" >
+               
+              <div v-if="modalForm.examine_status!=3 && modalForm.payment_status==0">待结算</div>
+              <div v-else-if="modalForm.examine_status==2 && modalForm.payment_status==0">结算中</div>
+              <div v-else-if="modalForm.examine_status==2 && modalForm.payment_status==1">结算成功</div>
+              <div v-else-if="modalForm.examine_status==3 ">结算失败</div>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item field="idCard" label="所在城市：" >
+              <span v-if="modalForm.doctor_withdrawal_bank">{{modalForm.doctor_withdrawal_bank.province}}{{modalForm.doctor_withdrawal_bank.city}}{{modalForm.doctor_withdrawal_bank.county}}</span>
+              <span v-else>-</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item field="idCard" label="开户行：" >
+              <span v-if="modalForm.doctor_withdrawal_bank">{{modalForm.doctor_withdrawal_bank.basic_bank.bank_name
+}}</span>
+              <span v-else>-</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-divider />
+        <div class="titlebox">
+          <div class="bar"></div>
+          <div class="name">账户信息</div>
+        </div>
+        <a-row :gutter="24" style="margin-top: 35px;">
+          <a-col :span="12">
+            <a-form-item field="idCard" label="申请时间：" >
+              <div>{{modalForm.created_at}}</div>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item field="idCard" label="确认账单时间：" >
+              <div v-if="parseTime(modalForm.examine_time)">{{parseTime(modalForm.examine_time)}}</div>
+              <div>-</div>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24" >
+          <a-col :span="12">
+            <a-form-item field="idCard" label="应提现金额：" >
+              <div>{{modalForm.applied_withdrawal_amount}}</div>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item field="idCard" label="实际提现金额：" >
+              <div>{{modalForm.actual_withdrawal_amount}}</div>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24" >
+          <a-col :span="12">
+            <a-form-item field="idCard" label="分成比例：" >
+              <div>平台2.5/医生7.5</div>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item field="idCard" label="个人所得税：" >
+              <div>{{modalForm.income_tax}}</div>
+              <a-button type="primary" @click="()=>okVisible=true" style="margin-left:20px;" v-has="'admin:sysFinancialRecord:tax'">纠正个人所得税</a-button>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24" v-if="parseTime(modalForm.payment_time)">
+          <a-col :span="12">
+            <a-form-item field="idCard" label="打款时间：" >
+              <div>{{parseTime(modalForm.payment_time)}}</div>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-divider /> 
+      
+        <div class="titlebox">
+          <div class="bar"></div>
+          <div class="name">订单记录</div>
+        </div>
+        <a-row :gutter="24" style="margin-top: 35px;">
+          <a-col :span="24">
+            <a-form-item field="idCard" hide-label="true" >
+               <!-- table -->
+    <a-table :columns="columns" :data="tableData" 
+     :scroll="{ x:1500 }"
+     style="width:100%"
+      :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)}"
+      @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
+      <template #doctor_id="{record,rowIndex}">
+        <div>{{(rowIndex+1)+(pager.page-1)*pager.page_size}}</div>
+      </template>
+      <template #pay_channel="{record}">
+          <div v-if="record.pay_channel==1">小程序支付</div>
+          <div v-else-if="record.pay_channel==2">微信扫码</div>
+          <div v-else-if="record.pay_channel==3">模拟支付</div>
+      </template>
+      <!-- 1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消） -->
+      <template #inquiry_status="{record}">
+          <div v-if="record.inquiry_status==1">待支付</div>
+          <div v-else-if="record.inquiry_status==2">待分配</div>
+          <div v-else-if="record.inquiry_status==3">待接诊</div>
+          <div v-else-if="record.inquiry_status==4">已接诊</div>
+          <div v-else-if="record.inquiry_status==5">已完成</div>
+          <div v-else-if="record.inquiry_status==6">已结束</div>
+          <div v-else-if="record.inquiry_status==7">已取消</div>
+      </template>
+      <template #doctor_amount="{ record }">
+        {{(record.doctor_amount) }}元
+      </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>
+      
+      <template #inquiry_type="{ record }">
+        {{ formatInquiryType(record.inquiry_type) }}
+      </template>
+      <template #pay_time="{ record }">
+        {{ parseTime(record.pay_time) }}
+      </template>
+      <template #action="{ record }">
+        <a-space>
+          <a-button v-has="'admin:sysOrderList:detail'" type="text"
+            @click="handleDetail(record)"><icon-book />详情</a-button>
+          <!-- <a-button v-has="'admin:sysFamilyList:edit'" type="text" @click="handleUpdate(record)"><icon-edit />
+            修改</a-button> -->
+          <!-- <a-button v-has="'admin:sysFamilyList:remove'" type="text"
+            @click="() => { deleteVisible = true; deleteData = [record.doctor_id];  }"><icon-delete /> 删除</a-button> -->
+        </a-space>
+      </template>
+    </a-table>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-divider /> 
+      </a-form>
+      <div class="titlebox" >
+        <div class="bar"></div>
+        <div class="name">操作</div>
+      </div>
+      <a-row :gutter="24" style="margin-top: 35px;" >
+        <a-col :span="24">
+          <a-form-item field="" label="" no-style>
+            <a-space >
+              <a-button type="primary" @click="()=>{confirmVisible=true;okStatus=1}" v-if="modalForm.examine_status==1" v-has="'admin:sysFinancialRecord:pass'">确认账单</a-button>
+              <a-button type="primary" @click="()=>{confirmVisible=true;okStatus=2}" v-if="modalForm.examine_status==2 && modalForm.payment_status==0" v-has="'admin:sysFinancialRecord:pay'">确认打款</a-button>
+              <a-button type="primary" status="danger" @click="()=>{rejectVisible=true;}"  v-if="modalForm.examine_status==1" v-has="'admin:sysFinancialRecord:reject'">拒绝提现</a-button>
+            </a-space>
+          </a-form-item>
+        </a-col>
+      </a-row> 
+    </a-modal>
+    <inquiryDetailMoneyModal :modalVisible="recordVisible" :modalForm="modalFormData" @inquiryVisibleChange="()=>{recordVisible=false}"></inquiryDetailMoneyModal>
+    <numberModal
+      :okVisible="okVisible"
+      :api="editIncome"
+      :id="withdrawal_order_id"
+      @closeChange="closeChange"
+    ></numberModal>
+
+    <a-modal v-model:visible="rejectVisible" :modal-style="{width:'420px'}"  @ok="handleConfirmReject"
+      @cancel="()=>rejectVisible=false" >
+      <template #title>
+        提示
+      </template>
+      <a-form :model="rejectform" :rules="rules" ref="rejectFormRef" size="medium" label-align="left" auto-label-width>
+      <a-form-item field="examine_fail_reason" label="拒绝原因:" >
+        <a-textarea v-model.trim="rejectform.examine_fail_reason" allow-clear placeholder="请输入拒绝原因"></a-textarea>
+      </a-form-item>
+    </a-form>
+    <template #footer>
+      <a-button @click="()=>rejectVisible=false"><template #icon><icon-close /></template>取消</a-button>
+      <a-button type="primary" @click="handleConfirmReject"><template #icon><icon-check /></template>确认</a-button>
+    </template>
+
+    </a-modal>
+     <!-- 二次确认弹框 -->
+    <a-modal v-model:visible="confirmVisible" :modal-style="{width:'320px'}" body-class="okmodal" @ok="handleSubmitConfirm"
+      @cancel="()=>confirmVisible=false">
+      <template #title>
+        提示
+      </template>
+      <div v-if="okStatus==1">确定账单审核通过？</div>
+      <div v-else-if="okStatus==2">确定打款？</div>
+    </a-modal>
+</template>
+<script setup>
+import {ref,toRefs,watch,reactive,getCurrentInstance} from 'vue';
+import {decryptCard} from '@/api/doctor/list';
+import {getOrder,editIncome,withdrawalStatus,confirmPay} from "@/api/finance/record"
+import { parseTime } from '@/utils/parseTime';
+import {formatInquiryType} from "@/utils/format"
+import {getOrderDetail,inquiryCase} from '@/api/order/list';
+import { Message } from '@arco-design/web-vue';
+const props = defineProps({
+  // 是否显示
+  modalVisible: {
+    type: Boolean,
+    default: false,
+  },
+  modalForm: {
+    type: Object,
+  },
+});
+const { proxy } = getCurrentInstance();
+const confirmVisible=ref(false);
+const okVisible=ref(false);
+const withdrawal_order_id=ref('');
+const currentPage = ref(1);
+const pager = {
+    total: 1,
+    page: 1,
+    page_size: 10,
+  };
+const emits = defineEmits(['familyVisibleChange','freshDetail']);
+const {modalVisible,modalForm} = toRefs(props);
+//切换小眼睛
+  const showEye = ref(false);
+  const id_card_num = ref('');
+  watch(()=>props.modalForm.withdrawal_id,()=>{
+    if(props.modalForm.withdrawal_id){
+      withdrawal_order_id.value=props.modalForm.withdrawal_id;
+      handleGetOrder(props.modalForm.withdrawal_id,{...pager})
+    }else{
+      withdrawal_order_id.value='';
+    }
+  })
+  //解密身份证号码
+  const handelDecryptCard = async (user_id,family_id) => {
+    showEye.value = true;
+    const { data, code, message } = await decryptCard({
+      user_id,
+      family_id
+    });
+    if (code == 200) {
+      id_card_num.value = data;
+    }
+  };
+ 
+   // Table Columns
+   const columns = [
+    { title: '编号', dataIndex: 'doctor_id', slotName: 'doctor_id', width: '90' },
+    { title: '订单编号', dataIndex: 'inquiry_no',width:200 },
+  { title: '医生姓名', dataIndex: 'doctor_name',width:100  },
+  { title: '就诊人', dataIndex: 'patient_name_mask',slotName:'patient_name_mask',width:200},
+  { title: '联系电话', dataIndex: 'patient_mobile_mask',width: 130  },
+  { title: '医生收益', dataIndex: 'doctor_amount',slotName:'doctor_amount',width:100 },
+  { title: '支付方式', dataIndex: 'pay_channel',slotName:  'pay_channel'},
+  { title: '订单状态', dataIndex: 'inquiry_status', slotName:'inquiry_status' },
+  { title: '支付时间', dataIndex: 'pay_time', slotName: 'pay_time',width:200 },
+  { title: '操作', slotName: 'action',fixed: "right", width: 100  },
+]
+// Akiraka 20230210 关闭弹窗
+const handleClose = () => {
+  emits('familyVisibleChange', false);
+};
+const tableData=ref([]);
+const handleGetOrder=(id,params={})=>{
+  getOrder(id,params).then(res=>{
+    if(res.code==200){
+      let data=res.data; 
+      console.log(data.data)
+      tableData.value=data.data;
+      Object.assign(pager, { total: data.total, page: data.page, page_size: data.page_size });
+    }
+  })
+}
+  /**
+   * 分页改变
+   * @param {Number} [page]
+   */
+   const handlePageChange = (page) => {
+    pager.page = page;
+    // 修改当前页码
+    currentPage.value = page;
+    handleGetOrder(withdrawal_order_id.value,{ ...pager});
+  };
+
+  // 每页数据量
+  const handlepage_sizeChange = (page_size) => {
+    pager.page_size = page_size;
+    handleGetOrder(withdrawal_order_id.value,{ ...pager});
+  };
+const patientData=reactive({});
+const modalFormData=reactive({});
+const recordVisible=ref(false);
+//获取订单详情
+const handleDetail = async (record) => {
+    recordVisible.value = true;
+    Object.assign(patientData,{});
+    const { code, data} = await getOrderDetail(record.order_inquiry_id
+);
+
+    if (code == 200) {
+      Object.assign(modalFormData, data);
+      if(data.order_inquiry_case && data.order_inquiry_case.inquiry_case_id){
+        const caseInfo= await inquiryCase(data.order_inquiry_case.inquiry_case_id);
+        Object.assign(patientData,caseInfo.data);
+
+      }
+    }
+  };
+
+//关闭确认框
+const closeChange = () => {
+  okVisible.value = false;
+  
+};
+const rejectVisible=ref(false);
+const rules = {
+  examine_fail_reason:  [{ required: true, message: '请输入拒绝理由' }]
+};
+const rejectform=reactive({
+  examine_fail_reason:''
+})
+//修改审核状态
+const handleWithdrawalStatus= async(examine_status)=>{
+  let obj=null;
+  if(examine_status==2){
+    obj={
+      examine_status
+    }
+  }else{
+    obj={
+      examine_status,
+      examine_fail_reason:rejectform.examine_fail_reason
+    }
+  }
+ const {data,code}=await withdrawalStatus(withdrawal_order_id.value,obj);
+  if(code==200){
+    examine_status==2?Message.success("已通过审核"):Message.success("已拒绝成功")
+    emits('freshDetail');
+  }
+}
+const okStatus=ref(1);
+const handleConfirmReject=()=>{
+  proxy.$refs.rejectFormRef.validate(async(valid) => {
+    if (!valid) {
+      handleWithdrawalStatus(3);
+    }
+  })
+};
+const handleConfirmPay=async()=>{
+  const {data,code}=await confirmPay(withdrawal_order_id.value);
+  if(code==200){
+    Message.success("打款成功")
+  }
+};
+const handleSubmitConfirm=()=>{
+ if(okStatus.value==1){
+   handleWithdrawalStatus(2);
+ }else{
+  handleConfirmPay();
+ }
+ 
+}
+</script>
+<style scoped>
+  .cardNum {
+    width: 150px;
+  }
+ .arco-form-item-layout-horizontal:first-child,
+  .arco-form-item-layout-horizontal:nth-child(2) {
+    align-items: center;
+  }
+  .cellbox{
+    margin-top: 35px;
+  }
+  .cellbox .cell{
+    width:50%;
+    border-bottom:1px dashed #efefef;
+    margin-bottom: 20px;
+  }
+  .cellbox .cell:first-child{
+    border: none;
+  }
+ 
+  .box {
+    display: flex;
+    align-items: center;
+  }
+
+  .cert .arco-form-item-label-col {
+    flex: 0 0 8px !important;
+  }
+
+</style>
\ No newline at end of file
diff --git a/src/utils/format.js b/src/utils/format.js
index 1530cba..e928781 100644
--- a/src/utils/format.js
+++ b/src/utils/format.js
@@ -107,4 +107,14 @@ export const formatRelation=(val)=>{
       }else{
        return ''
       }
- };
\ No newline at end of file
+ };
+ export const formatEnteyStatus=(val)=>{
+   //入账状态（0:未入账 1:已入账 2:入账中 3:入账失败 4:入账取消）
+   let data={0:'未入账',1:'已入账', 2:'入账中', 3:'入账失败',4:'入账取消'}
+      if(val || val==0){
+       return data[val]
+      }else{
+       return ''
+      }
+ };
+ 
\ No newline at end of file
diff --git a/src/views/admin/sys-post/index.vue b/src/views/admin/sys-post/index.vue
index fce2647..53c771b 100644
--- a/src/views/admin/sys-post/index.vue
+++ b/src/views/admin/sys-post/index.vue
@@ -35,7 +35,7 @@
       @page-size-change="handlepage_sizeChange"
     >
     <template #post_id="{record,rowIndex}">
-      <div>{{(rowIndex+1)+(pager.page-1)*10}}</div>
+      <div>{{(rowIndex+1)+(pager.page-1)*pager.page_size}}</div>
    </template>
       <template #createdAt="{ record }">
         {{ parseTime(record.createdAt) }}
diff --git a/src/views/admin/sys-role/index.vue b/src/views/admin/sys-role/index.vue
index 0dcdb55..c9e3ecc 100644
--- a/src/views/admin/sys-role/index.vue
+++ b/src/views/admin/sys-role/index.vue
@@ -42,7 +42,7 @@
       @selection-change="(selection) => {deleteData = selection;}" @select="handleSelect"
       @page-change="handlePageChange" @page-size-change="handlePageSizeChange">
       <template #role_id="{record,rowIndex}">
-         <div>{{(rowIndex+1)+(pager.page-1)*10}}</div>
+         <div>{{(rowIndex+1)+(pager.page-1)*pager.page_size}}</div>
       </template>
       <template #status="{ record }">
         <a-space direction="vertical" size="large">
diff --git a/src/views/admin/sys-user/index.vue b/src/views/admin/sys-user/index.vue
index 6871a16..addbb34 100644
--- a/src/views/admin/sys-user/index.vue
+++ b/src/views/admin/sys-user/index.vue
@@ -84,7 +84,7 @@
           @page-size-change="handlePageSizeChange"
         >
         <template #user_id="{record,rowIndex}">
-          <div>{{(rowIndex+1)+(pager.page-1)*10}}</div>
+          <div>{{(rowIndex+1)+(pager.page-1)*pager.page_size}}</div>
        </template>
         <template #role_name="{ record }">
           {{ record.role_name?.role_name}}
diff --git a/src/views/dictionary/sign-list/index.vue b/src/views/dictionary/sign-list/index.vue
index 45485f8..d9cd433 100644
--- a/src/views/dictionary/sign-list/index.vue
+++ b/src/views/dictionary/sign-list/index.vue
@@ -8,7 +8,7 @@
         row-key="doctor_id" @selection-change="(selection) => {deleteData = selection;console.log(selection)}"
         @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
         <template #doctor_id="{record,rowIndex}">
-          <div>{{(rowIndex+1)+(pager.page-1)*10}}</div>
+          <div>{{(rowIndex+1)+(pager.page-1)*pager.page_size}}</div>
         </template>
         <template #cert_application_time="{ record }">
           <div><span >{{ parseTime(record.cert_application_time,'{y}-{m}-{d}')}}</span>-<span>{{parseTime(record.cert_expire_time,'{y}-{m}-{d}')}}</span></div>
diff --git a/src/views/doctor/doctor-examine/index.vue b/src/views/doctor/doctor-examine/index.vue
index 405a901..1fa83ba 100644
--- a/src/views/doctor/doctor-examine/index.vue
+++ b/src/views/doctor/doctor-examine/index.vue
@@ -34,7 +34,7 @@
         @selection-change="(selection) => {deleteData = selection;}" @page-change="handlePageChange"
         @page-size-change="handlepage_sizeChange">
         <template #doctor_id="{record,rowIndex}">
-          <div>{{(rowIndex+1)+(pager.page-1)*10}}</div>
+          <div>{{(rowIndex+1)+(pager.page-1)*pager.page_size}}</div>
         </template>
         <template #doctor_title="{ record }">
           <!-- 医生职称（1:主任医师 2:主任中医师 3:副主任医师 4:副主任中医师 5:主治医师 6:住院医师） -->
diff --git a/src/views/doctor/doctor-list/index.vue b/src/views/doctor/doctor-list/index.vue
index 7f4ed97..18f38bb 100644
--- a/src/views/doctor/doctor-list/index.vue
+++ b/src/views/doctor/doctor-list/index.vue
@@ -106,7 +106,7 @@
       row-key="doctor_id" @selection-change="(selection) => {deleteData = selection;console.log(selection)}"
       @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
       <template #doctor_id="{record,rowIndex}">
-        <div>{{(rowIndex+1)+(pager.page-1)*10}}</div>
+        <div>{{(rowIndex+1)+(pager.page-1)*pager.page_size}}</div>
       </template>
       <template #doctor_title="{ record }">
         <!-- 医生职称（1:主任医师 2:主任中医师 3:副主任医师 4:副主任中医师 5:主治医师 6:住院医师） -->
diff --git a/src/views/doctor/doctor-multipoint/index.vue b/src/views/doctor/doctor-multipoint/index.vue
index d45116e..f50b3af 100644
--- a/src/views/doctor/doctor-multipoint/index.vue
+++ b/src/views/doctor/doctor-multipoint/index.vue
@@ -34,7 +34,7 @@
         @selection-change="(selection) => {deleteData = selection;}" @page-change="handlePageChange"
         @page-size-change="handlepage_sizeChange">
         <template #doctor_id="{record,rowIndex}">
-          <div>{{(rowIndex+1)+(pager.page-1)*10}}</div>
+          <div>{{(rowIndex+1)+(pager.page-1)*pager.page_size}}</div>
         </template>
         <template #doctor_title="{ record }">
           <!-- 医生职称（1:主任医师 2:主任中医师 3:副主任医师 4:副主任中医师 5:主治医师 6:住院医师） -->
diff --git a/src/views/finance/bankcard/index.vue b/src/views/finance/bankcard/index.vue
new file mode 100644
index 0000000..92b1c1b
--- /dev/null
+++ b/src/views/finance/bankcard/index.vue
@@ -0,0 +1,307 @@
+<template>
+    <div class="app-container">
+      <a-form :model="queryForm" ref="queryFormRef" layout="inline">
+  
+
+        <a-form-item field="user_name" label="医生姓名">
+        <a-input :style="{ width: '182px' }" v-model="queryForm.user_name" placeholder="请输入医生姓名" @press-enter="handleQuery" />
+      </a-form-item>
+      <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="bank_card_code" label="银行卡号">
+        <a-input :style="{ width: '182px' }" v-model="queryForm.bank_card_code" placeholder="请输入银行卡号" @press-enter="handleQuery" />
+      </a-form-item>
+         <a-form-item field="bank_name" label="开户行">
+          <a-select  v-model="queryForm.bank_name" placeholder="请选择开户行" :style="{ width: '182px' }">
+            <a-option v-for="item in bankData" :key="item.bank_id" :value="item.bank_name"
+                    :label="item.bank_name"></a-option>
+          </a-select>
+        </a-form-item>
+        
+        <a-form-item>
+          <a-space>
+            <a-button type="primary" @click="handleQuery"><icon-search /> 搜索</a-button>
+            <a-button @click="handleResetQuery"><icon-loop /> 重置</a-button>
+          </a-space>
+        </a-form-item>
+      </a-form>
+  
+      <a-divider />
+  
+      <!-- action -->
+      <div class="action">
+        <a-space>
+          <a-button v-has="'admin:sysFamilyList:add'" type="primary" @click="handleAdd"><icon-export /> 导出 </a-button>
+        </a-space>
+      </div> 
+  
+      <!-- table -->
+      <a-table :columns="columns" :data="tableData" 
+      :scroll="{ x: 1400 }"
+        :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)}"
+        @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
+        <template #doctor_id="{record,rowIndex}">
+          <div>{{(rowIndex+1)+(pager.page-1)*pager.page_size}}</div>
+        </template>
+        <template #province="{ record }">
+           <div>{{record.province}}{{record.city}}{{record.county}}</div>
+        </template>
+      
+     
+        <template #action="{ record }">
+          <a-space>
+            <a-button v-has="'admin:sysconfigList:edit'" type="text"
+              @click="handleDetail(record)"><icon-edit />修改</a-button>
+            <!-- <a-button v-has="'admin:sysFamilyList:edit'" type="text" @click="handleUpdate(record)"><icon-edit />
+              修改</a-button> -->
+            <!-- <a-button v-has="'admin:sysFamilyList:remove'" type="text"
+              @click="() => { deleteVisible = true; deleteData = [record.doctor_id];  }"><icon-delete /> 删除</a-button> -->
+          </a-space>
+        </template>
+      </a-table>
+      <!-- Akiraka 20230223 删除与批量删除 开始 -->
+      <!-- <DeleteModal :data="deleteData" :visible="deleteVisible" :apiDelete="removeFamily"
+        @deleteVisibleChange="() => deleteVisible = false" /> -->
+      <!-- Akiraka 20230223 删除与批量删除 结束 -->
+      <a-modal v-model:visible="okVisible" :modal-style="{width:'320px'}" body-class="okmodal" 
+        @cancel="()=>okVisible=false">
+        <template #title>
+          提示
+        </template>
+        <div>确定保存当前信息？</div>
+      </a-modal>
+    </div>
+  </template>
+  
+  <script setup>
+    import { reactive, ref, getCurrentInstance, onMounted, nextTick, watch, computed } from 'vue';
+    import { getBankList} from '@/api/finance/bank';
+    import { bankList} from '@/api/doctor/list';
+
+    // Akiraka 20230210 删除数据
+    const deleteData = ref([])
+    // Akiraka 20230210 删除对话框
+    const deleteVisible = ref(false)
+    // Akiraka 20230210 监听删除事件
+    const okVisible = ref(false);
+   const inquiry_config_id=ref("");
+    watch(() => deleteVisible.value, (value) => {
+      if (value == false) {
+        getBankInfo(pager);
+      }
+    });
+  
+    const file = ref();
+    const { proxy } = getCurrentInstance();
+    const currentPage = ref(1);
+    
+    // Pager
+    const pager = {
+      total: 0,
+      page: 1,
+      page_size: 10,
+    };
+    // form
+    const queryForm = reactive({
+  
+    });
+    const modalForm = reactive({
+      user:{},
+      avatar: 'https://img.applets.igandanyiyuan.com/basic/file/patient_avatar.png',
+   
+    });
+    // Modal
+    const modalVisible = ref(false);
+    const modalTitle = ref('默认标题');
+   
+    // Batch Del List
+    let batchList = [];
+  
+    // Table Columns
+    const columns = [
+      { title: '编号', dataIndex: 'doctor_id', slotName: 'doctor_id', width: '90' },
+      {
+      title: '银行卡号',
+      dataIndex: 'bank_card_code_mask',
+      slotName:'bank_card_code_mask'
+    },
+      {
+      title: '医生姓名',
+      dataIndex: 'doctor_name',
+      slotName:'doctor_name'
+    },{
+      title: '医生电话',
+      dataIndex: 'doctor_mobile_mask',
+      slotName:'doctor_mobile_mask'
+    },
+    {
+      title: '开户行所在地',
+      dataIndex: 'province',
+      slotName:'province'
+    },
+    {
+      title: '开户行',
+      dataIndex: 'bank_name',
+      slotName:'bank_name'
+    },
+    {
+      title: '添加时间',
+      dataIndex: 'created_at',
+      slotName:'created_at'
+    },
+   
+     //{ title: '操作', slotName: 'action', fixed: "right", width: 150 }
+    ]
+  
+    // Table Data
+    const tableData = ref([]);
+    //弹框状态
+    const modalSatus = ref('add');
+  
+    // 新增Satus
+    const handleAdd = () => {
+     alert('导出')
+    };
+  
+    //详情
+    const handleDetail = async (record) => {
+      inquiry_config_id.value=record.system_inquiry_config_id;
+      modalVisible.value = true;
+    };
+  
+    /**
+     * 分页改变
+     * @param {Number} [page]
+     */
+    const handlePageChange = (page) => {
+      pager.page = page;
+      // 修改当前页码
+      currentPage.value = page;
+      getBankInfogetBankInfo({ ...pager, ...queryForm });
+    };
+  
+    // 每页数据量
+    const handlepage_sizeChange = (page_size) => {
+      pager.page_size = page_size;
+      getBankInfo({ ...pager, ...queryForm });
+    };
+  
+    // 获取患者信息
+    const getBankInfo = async (params = {}) => {
+      const { data, code, message } = await getBankList(params);
+      if (code == 200) {
+        tableData.value = data.data;
+        Object.assign(pager, { total: data.total, page: data.page, page_size: data.page_size });
+      }
+    };
+  
+    // 查询患者信息
+    const handleQuery = async () => {
+      pager.page = 1;
+      const params = {
+        page: pager.page,
+        page_size: pager.page_size,
+        ...queryForm,
+      };
+  
+      getBankInfo(params);
+    };
+  
+    // 重置搜索
+    const handleResetQuery = () => {
+      proxy.$refs.queryFormRef.resetFields();
+      getBankInfo(queryForm);
+    }
+    
+const bankData = ref([])
+  const handleBankList = () => {
+    bankList().then((res) => {
+      const { data, code, message } = res;
+      if (code == 200) {
+        bankData.value = data;
+      }
+    })
+  }
+    onMounted(() => {
+      getBankInfo(pager);
+      handleBankList();
+    });
+  </script>
+  
+  <style lang="scss" scoped>
+    .action {
+      margin-bottom: 12px;
+    }
+  
+    .okmodal div {
+      text-align: center;
+    }
+  
+    .hospital_name {
+      width: 140px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  
+    .headImg {
+      margin-right: 20px;
+      border-radius: 50%;
+      width: 80px;
+      height: 80px;
+    }
+  
+    .arco-form-item-layout-horizontal:first-child,
+    .arco-form-item-layout-horizontal:nth-child(2) {
+      align-items: center;
+    }
+    .cellbox{
+      margin-top: 35px;
+    }
+    .cellbox .cell{
+      width:50%;
+      border-bottom:1px dashed #efefef;
+      margin-bottom: 20px;
+    }
+    .cellbox .cell:first-child{
+      border: none;
+    }
+    .cell{
+      .arco-form-item{
+        margin-bottom: 10px;
+      }
+    }
+    .box {
+      display: flex;
+      align-items: center;
+    }
+  
+    .cert .arco-form-item-label-col {
+      flex: 0 0 8px !important;
+    }
+  
+    .red {
+      display: inline-block;
+      margin-right: 5px;
+      font-size: 14px;
+      color: red;
+      margin-top: 5px;
+    }
+  
+    .cardNum {
+      width: 148px;
+    }
+    .codbox{
+      display: flex;
+      align-items: center;
+    }
+    .reason{
+      width:250px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  </style>
\ No newline at end of file
diff --git a/src/views/finance/doctoraccount/index.vue b/src/views/finance/doctoraccount/index.vue
new file mode 100644
index 0000000..f8e8a6f
--- /dev/null
+++ b/src/views/finance/doctoraccount/index.vue
@@ -0,0 +1,298 @@
+<template>
+    <div class="app-container">
+      <a-form :model="queryForm" ref="queryFormRef" layout="inline">
+  
+
+        <a-form-item field="user_name" label="医生姓名">
+        <a-input :style="{ width: '182px' }" v-model="queryForm.user_name" placeholder="请输入医生姓名" @press-enter="handleQuery" />
+      </a-form-item>
+      <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>
+          <a-space>
+            <a-button type="primary" @click="handleQuery"><icon-search /> 搜索</a-button>
+            <a-button @click="handleResetQuery"><icon-loop /> 重置</a-button>
+          </a-space>
+        </a-form-item>
+      </a-form>
+  
+      <a-divider />
+  
+      <!-- action -->
+      <div class="action">
+        <a-space>
+          <a-button v-has="'admin:sysDoctorAccount:export'" type="primary" @click="handleAdd"><icon-export />导出 </a-button>
+        </a-space>
+      </div> 
+  
+      <!-- table -->
+      <a-table :columns="columns" :data="tableData" 
+     
+        :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)}"
+        @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
+        <template #doctor_id="{record,rowIndex}">
+          <div>{{(rowIndex+1)+(pager.page-1)*pager.page_size}}</div>
+        </template>
+        <template #province="{ record }">
+           <div>{{record.province}}{{record.city}}{{record.county}}</div>
+        </template>
+      
+     
+       <template #action="{ record }">
+          <a-space>
+            <a-button v-has="'admin:sysDoctorAccount:detail'" type="text"
+              @click="handleDetail(record)"><icon-book />详情</a-button>
+          </a-space>
+        </template>
+      </a-table>
+  
+     
+      <accountModal :modalVisible="modalVisible" :modalForm="modalForm" @familyVisibleChange="()=>{modalVisible=false,modalForm.doctor_id=''}" ></accountModal>
+      <!-- Akiraka 20230223 删除与批量删除 开始 -->
+      <!-- <DeleteModal :data="deleteData" :visible="deleteVisible" :apiDelete="removeFamily"
+        @deleteVisibleChange="() => deleteVisible = false" /> -->
+      <!-- Akiraka 20230223 删除与批量删除 结束 -->
+      <a-modal v-model:visible="okVisible" :modal-style="{width:'320px'}" body-class="okmodal" 
+        @cancel="()=>okVisible=false">
+        <template #title>
+          提示
+        </template>
+        <div>确定保存当前信息？</div>
+      </a-modal>
+    </div>
+  </template>
+  
+  <script setup>
+    import { reactive, ref, getCurrentInstance, onMounted, nextTick, watch, computed } from 'vue';
+    import { getAccountList,getAccountDetail} from '@/api/finance/account';
+
+    // Akiraka 20230210 删除数据
+    const deleteData = ref([])
+    // Akiraka 20230210 删除对话框
+    const deleteVisible = ref(false)
+    // Akiraka 20230210 监听删除事件
+    const okVisible = ref(false);
+   const inquiry_config_id=ref("");
+    watch(() => deleteVisible.value, (value) => {
+      if (value == false) {
+        getAccountInfo(pager);
+      }
+    });
+  
+    const file = ref();
+    const { proxy } = getCurrentInstance();
+    const currentPage = ref(1);
+    const family_data=ref([]);
+    const family_columns=ref([{
+      title: '编号',
+      dataIndex: 'code',
+      slotName:'code'
+    },{
+      title: '就诊人姓名',
+      dataIndex: 'card_name_mask',
+    },{
+      title: '身份证号',
+      dataIndex: 'id_number_mask',
+    },{
+      title: '与账号关系',
+      dataIndex: 'relation',
+      slotName:'relation'
+    },{
+      title: '添加时间',
+      dataIndex: 'created_at',
+      slotName:'created_at'
+    }, { title: '操作', slotName: 'action'}])
+    // Pager
+    const pager = {
+      total: 0,
+      page: 1,
+      page_size: 10,
+    };
+    // form
+    const queryForm = reactive({
+  
+    });
+    const modalForm = reactive({
+      user:{},
+      avatar: 'https://img.applets.igandanyiyuan.com/basic/file/patient_avatar.png',
+   
+    });
+    // Modal
+    const modalVisible = ref(false);
+    const modalTitle = ref('默认标题');
+   
+    // Batch Del List
+    let batchList = [];
+  
+    // Table Columns
+    const columns = [
+      { title: '编号', dataIndex: 'doctor_id', slotName: 'doctor_id', width: '90' },
+      {
+      title: '医生姓名',
+      dataIndex: 'doctor_name',
+      slotName:'doctor_name'
+    },{
+      title: '医生电话',
+      dataIndex: 'doctor_mobile_mask',
+      slotName:'doctor_mobile_mask',
+      width:120
+    },
+    {
+      title: '账户金额(元)',
+      dataIndex: 'balance_account',
+      slotName:'balance_account'
+    },
+    {
+      title: '已完成待入账金额(元)',
+      dataIndex: 'completed_wait_entry_amount',
+      slotName:'completed_wait_entry_amount'
+    },
+    {
+      title: '今日接诊收入(元)',
+      dataIndex: 'estimate_income',
+      slotName:'estimate_income'
+    },
+   
+     { title: '操作', slotName: 'action', fixed: "right", width: 150 }
+    ]
+  
+    // Table Data
+    const tableData = ref([]);
+ 
+  
+ //详情
+   const handleDetail = async (record) => {
+    const { code, data, message } = await getAccountDetail(record.doctor_id);
+
+    if (code == 200) {
+        Object.assign(modalForm, data);
+        modalVisible.value = true;
+      }
+    };
+    /**
+     * 分页改变
+     * @param {Number} [page]
+     */
+    const handlePageChange = (page) => {
+      pager.page = page;
+      // 修改当前页码
+      currentPage.value = page;
+      getAccountInfogetAccountInfo({ ...pager, ...queryForm });
+    };
+  
+    // 每页数据量
+    const handlepage_sizeChange = (page_size) => {
+      pager.page_size = page_size;
+      getAccountInfo({ ...pager, ...queryForm });
+    };
+  
+    // 获取患者信息
+    const getAccountInfo = async (params = {}) => {
+      const { data, code, message } = await getAccountList(params);
+      if (code == 200) {
+        tableData.value = data.data;
+        Object.assign(pager, { total: data.total, page: data.page, page_size: data.page_size });
+      }
+    };
+  
+    // 查询患者信息
+    const handleQuery = async () => {
+      pager.page = 1;
+      const params = {
+        page: pager.page,
+        page_size: pager.page_size,
+        ...queryForm,
+      };
+  
+      getAccountInfo(params);
+    };
+  
+    // 重置搜索
+    const handleResetQuery = () => {
+      proxy.$refs.queryFormRef.resetFields();
+      getAccountInfo(queryForm);
+    }
+    
+
+    onMounted(() => {
+      getAccountInfo(pager);
+    });
+  </script>
+  
+  <style lang="scss" scoped>
+    .action {
+      margin-bottom: 12px;
+    }
+  
+    .okmodal div {
+      text-align: center;
+    }
+  
+    .hospital_name {
+      width: 140px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  
+    .headImg {
+      margin-right: 20px;
+      border-radius: 50%;
+      width: 80px;
+      height: 80px;
+    }
+  
+    .arco-form-item-layout-horizontal:first-child,
+    .arco-form-item-layout-horizontal:nth-child(2) {
+      align-items: center;
+    }
+    .cellbox{
+      margin-top: 35px;
+    }
+    .cellbox .cell{
+      width:50%;
+      border-bottom:1px dashed #efefef;
+      margin-bottom: 20px;
+    }
+    .cellbox .cell:first-child{
+      border: none;
+    }
+    .cell{
+      .arco-form-item{
+        margin-bottom: 10px;
+      }
+    }
+    .box {
+      display: flex;
+      align-items: center;
+    }
+  
+    .cert .arco-form-item-label-col {
+      flex: 0 0 8px !important;
+    }
+  
+    .red {
+      display: inline-block;
+      margin-right: 5px;
+      font-size: 14px;
+      color: red;
+      margin-top: 5px;
+    }
+  
+    .cardNum {
+      width: 148px;
+    }
+    .codbox{
+      display: flex;
+      align-items: center;
+    }
+    .reason{
+      width:250px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  </style>
\ No newline at end of file
diff --git a/src/views/finance/financialrecord/index.vue b/src/views/finance/financialrecord/index.vue
index 8a39510..35172b1 100644
--- a/src/views/finance/financialrecord/index.vue
+++ b/src/views/finance/financialrecord/index.vue
@@ -2,23 +2,35 @@
   <div class="app-container">
     <a-form :model="queryForm" ref="queryFormRef" layout="inline">
 
-      <a-form-item field="user_name" label="账号名字">
-        <a-input :style="{ width: '182px' }" v-model="queryForm.user_name" placeholder="请输入账号或者姓名" @press-enter="handleQuery" />
+      <a-form-item field="user_name" label="医生姓名">
+        <a-input :style="{ width: '182px' }" v-model="queryForm.user_name" placeholder="请输入医生姓名" @press-enter="handleQuery" />
       </a-form-item>
       <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="status" label="启用状态">
-        <a-select  v-model="queryForm.status" placeholder="请选择启用状态" :style="{ width: '182px' }">
-          <a-option :value="0">禁用</a-option>
-          <a-option :value="1">正常</a-option>
-          <a-option :value="2">删除</a-option>
+      <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>
+          <a-option :value="3">审核未通过</a-option>
         </a-select>
-      </a-form-item> -->
-      <a-form-item field="create_range_time" label="创建时间范围">
+      </a-form-item> 
+      <a-form-item field="payment_status" label="打款状态">
+        <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-form-item field="examine_range_time" label="审核时间范围">
         <a-range-picker
           style="width: 260px"
-          v-model="queryForm.create_range_time"
+          v-model="queryForm.examine_range_time"
+        />
+      </a-form-item>
+      <a-form-item field="payment_range_time" label="打款时间范围">
+        <a-range-picker
+          style="width: 260px"
+          v-model="queryForm.payment_range_time"
         />
       </a-form-item>
       <a-form-item>
@@ -41,35 +53,35 @@
 
     <!-- table -->
     <a-table :columns="columns" :data="tableData" 
+    :scroll="{ x:2000 }"
       :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)}"
       @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
       <template #doctor_id="{record,rowIndex}">
-        <div>{{(rowIndex+1)+(pager.page-1)*10}}</div>
+        <div>{{(rowIndex+1)+(pager.page-1)*pager.page_size}}</div>
       </template>
-      <template #status="{ record }">
+      <template #payment_status="{ record }">
         <!-- 状态（0:禁用 1:正常 2:删除） -->
-        <a-tag v-if="record.status == 0" color="#ffb400">禁用</a-tag>
-        <a-tag v-else-if="record.status == 1" color="green">正常</a-tag>
-        <a-tag v-else color="red">删除</a-tag>
+        <div v-if="record.examine_status!=3 && record.payment_status==0">待结算</div>
+        <div v-else-if="record.examine_status==2 && record.payment_status==0">结算中</div>
+        <div v-else-if="record.examine_status==2 && record.payment_status==1">结算成功</div>
+        <div v-else-if="record.examine_status==3 ">结算失败</div>
+<!--           
+        <a-tag v-if="record.payment_status == 1" color="green">正常</a-tag>
+        <a-tag v-else color="red">失败</a-tag> -->
       </template>
-      <template #is_platform_deep_cooperation="{ record }">
-        <a-tag v-if="record.is_platform_deep_cooperation == 0" color="gray">否</a-tag>
-        <a-tag v-else color="green">是</a-tag>
+      
+
+      <template #created_at="{record}">
+        <div>{{parseTime(record.created_at)}}</div>
       </template>
-  
-      <template #disable_reason="{record}">
-        <div class="reason" v-if="record.disable_reason" :title="record.disable_reason">{{ record.disable_reason }}</div>
-        <div v-else>-</div>
-      </template>
-      <template #relation="{record}">
-        <div>{{formatRelation(record.relation)}}</div>
-       
+      <template #payment_time="{record}">
+        <div>{{parseTime(record.payment_time)}}</div>
       </template>
       <template #action="{ record }">
         <a-space>
-          <a-button v-has="'admin:sysFamilyList:detail'" type="text"
+          <a-button v-has="'admin:sysFinancialRecord:detail'" type="text"
             @click="handleDetail(record)"><icon-book />详情</a-button>
           <!-- <a-button v-has="'admin:sysFamilyList:edit'" type="text" @click="handleUpdate(record)"><icon-edit />
             修改</a-button> -->
@@ -79,25 +91,25 @@
       </template>
     </a-table>
 
-    <familyModal :modalVisible="modalVisible" :modalForm="modalForm" @familyVisibleChange="()=>{modalVisible=false}"></familyModal>
+    <withdrawalModal :modalVisible="modalVisible" :modalForm="modalForm" @familyVisibleChange="()=>{modalVisible=false,modalForm.withdrawal_id=''}" @freshDetail="freshDetail"></withdrawalModal>
     <!-- Akiraka 20230223 删除与批量删除 开始 -->
     <!-- <DeleteModal :data="deleteData" :visible="deleteVisible" :apiDelete="removeFamily"
       @deleteVisibleChange="() => deleteVisible = false" /> -->
     <!-- Akiraka 20230223 删除与批量删除 结束 -->
-    <a-modal v-model:visible="okVisible" :modal-style="{width:'320px'}" body-class="okmodal" 
+    <!-- <a-modal v-model:visible="okVisible" :modal-style="{width:'320px'}" body-class="okmodal" 
       @cancel="()=>okVisible=false">
       <template #title>
         提示
       </template>
       <div>确定保存当前信息？</div>
-    </a-modal>
+    </a-modal> -->
   </div>
 </template>
 
 <script setup>
-  import { reactive, ref, getCurrentInstance, onMounted, nextTick, watch, computed } from 'vue';
+  import { reactive, ref, getCurrentInstance, onMounted, nextTick, watch, computed, withDirectives } from 'vue';
   import { getWithdrawalList,getWithdrawalDetail} from '@/api/finance/record';
-  // import {formatRelation} from "@/utils/format"
+  import { parseTime } from '@/utils/parseTime';
   // Akiraka 20230210 删除数据
   const deleteData = ref([])
   // Akiraka 20230210 删除对话框
@@ -129,13 +141,23 @@
     avatar: 'https://img.applets.igandanyiyuan.com/basic/file/patient_avatar.png',
  
   });
-  watch(() => queryForm.create_range_time,
+  watch(() => queryForm.examine_range_time,
   (value) => {
     if (value) {
       let [startTime, endTime] = value;
-      queryForm.created_at = startTime + '&' + endTime;
+      queryForm.examine_time = startTime + '&' + endTime;
     } else {
-      queryForm.created_at = '';
+      queryForm.examine_time = '';
+    }
+  }
+);
+watch(() => queryForm.payment_range_time,
+  (value) => {
+    if (value) {
+      let [startTime, endTime] = value;
+      queryForm.payment_time = startTime + '&' + endTime;
+    } else {
+      queryForm.payment_time = '';
     }
   }
 );
@@ -149,11 +171,16 @@
   // Table Columns
   const columns = [
     { title: '编号', dataIndex: 'doctor_id', slotName: 'doctor_id', width: '90' },
-    { title: '医生签名', dataIndex: 'card_name',width:200 },
-    { title: '所属账号', dataIndex: 'user_name', width:200 },
-    { title: '账号电话', dataIndex: 'mobile_mask',width:200 },
-    { title: '与账号关系', dataIndex: 'relation', slotName: 'relation',width: 150 },
-    // { title: '启用状态', dataIndex: 'status', slotName: 'status' },
+    { title: '医生姓名', dataIndex: 'doctor_name',width:200 },
+    { title: '应提现金额(元)', dataIndex: 'applied_withdrawal_amount',slotName: 'applied_withdrawal_amount', width:180 },
+    { title: '实际提现金额(元)', dataIndex: 'actual_withdrawal_amount',slotName: 'actual_withdrawal_amount',width:180 },
+    { title: '个人所得税(元)', dataIndex: 'income_tax', slotName: 'income_tax',width: 150 },
+    { title: '开户行', dataIndex: 'bank_name', slotName: 'bank_name',width: 150 },
+    { title: '开户城市', dataIndex: 'bank_city', slotName: 'bank_city',width: 150 },
+    { title: '状态', dataIndex: 'payment_status', slotName: 'payment_status' },
+    { title: '提现时间', dataIndex: 'created_at', slotName: 'created_at' },
+    { title: '打款时间', dataIndex: 'payment_time', slotName: 'payment_time' },
+    { title: '操作人', dataIndex: 'examine_by', slotName: 'examine_by',width: 80 },
     { title: '操作', slotName: 'action', fixed: "right", width: 180 },
   ];
 
@@ -169,16 +196,21 @@
     modalSatus.value = 'add';
     modalForm.patient_id = null;
   };
-
+  
   //详情
   const handleDetail = async (record) => {
-    const { code, data, message } = await getWithdrawalDetail(record.family_id);
+    const { code, data, message } = await getWithdrawalDetail(record.withdrawal_id);
 
     if (code == 200) {
         Object.assign(modalForm, data);
         modalVisible.value = true;
       }
     };
+    const freshDetail=()=>{
+      handleDetail({
+        withdrawal_id:modalForm.withdrawal_id
+      })
+  }
   // 批量删除
   const handleBatchDelete = () => {
     if (batchList.length !== 0) {
diff --git a/src/views/inquiry/inquiry-list/index.vue b/src/views/inquiry/inquiry-list/index.vue
index 8e27302..93caae5 100644
--- a/src/views/inquiry/inquiry-list/index.vue
+++ b/src/views/inquiry/inquiry-list/index.vue
@@ -52,7 +52,7 @@
         row-key="doctor_id" @selection-change="(selection) => {deleteData = selection;console.log(selection)}"
         @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
         <template #doctor_id="{record,rowIndex}">
-          <div>{{(rowIndex+1)+(pager.page-1)*10}}</div>
+          <div>{{(rowIndex+1)+(pager.page-1)*pager.page_size}}</div>
         </template>
         <template #doctor_title="{ record }">
            <div>{{ formatDoctorTitle(record.doctor_title) }}</div>
diff --git a/src/views/inquiry/sysconfig-list/index.vue b/src/views/inquiry/sysconfig-list/index.vue
index ea574d1..1023ef4 100644
--- a/src/views/inquiry/sysconfig-list/index.vue
+++ b/src/views/inquiry/sysconfig-list/index.vue
@@ -49,7 +49,7 @@
         row-key="doctor_id" @selection-change="(selection) => {deleteData = selection;console.log(selection)}"
         @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
         <template #doctor_id="{record,rowIndex}">
-          <div>{{(rowIndex+1)+(pager.page-1)*10}}</div>
+          <div>{{(rowIndex+1)+(pager.page-1)*pager.page_size}}</div>
         </template>
         <template #inquiry_mode="{ record }">
            <div>{{ formatMode(record.inquiry_mode) }}</div>
diff --git a/src/views/order/inquiry-record/index.vue b/src/views/order/inquiry-record/index.vue
index 976ed95..861ff5e 100644
--- a/src/views/order/inquiry-record/index.vue
+++ b/src/views/order/inquiry-record/index.vue
@@ -69,7 +69,7 @@
         row-key="doctor_id" @selection-change="(selection) => {deleteData = selection;console.log(selection)}"
         @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
         <template #doctor_id="{record,rowIndex}">
-          <div>{{(rowIndex+1)+(pager.page-1)*10}}</div>
+          <div>{{(rowIndex+1)+(pager.page-1)*pager.page_size}}</div>
         </template>
         <template #inquiry_type="{record}">
           <div>{{formatInquiryType(record.inquiry_type)}}</div>
diff --git a/src/views/order/order-list/index.vue b/src/views/order/order-list/index.vue
index 98f41e8..4bdb418 100644
--- a/src/views/order/order-list/index.vue
+++ b/src/views/order/order-list/index.vue
@@ -96,7 +96,7 @@
       @page-size-change="handlepage_sizeChange"
     >
       <template #post_id="{record,rowIndex}">
-          <div>{{(rowIndex+1)+(pager.page-1)*10}}</div>
+          <div>{{(rowIndex+1)+(pager.page-1)*pager.page_size}}</div>
       </template>
       <template #inquiry_pay_channel="{record}">
           <div v-if="record.inquiry_pay_channel==1">小程序支付</div>
diff --git a/src/views/patient/family-list/index.vue b/src/views/patient/family-list/index.vue
index 9d204ed..41bc4a8 100644
--- a/src/views/patient/family-list/index.vue
+++ b/src/views/patient/family-list/index.vue
@@ -46,7 +46,7 @@
       row-key="doctor_id" @selection-change="(selection) => {deleteData = selection;console.log(selection)}"
       @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
       <template #doctor_id="{record,rowIndex}">
-        <div>{{(rowIndex+1)+(pager.page-1)*10}}</div>
+        <div>{{(rowIndex+1)+(pager.page-1)*pager.page_size}}</div>
       </template>
       <template #status="{ record }">
         <!-- 状态（0:禁用 1:正常 2:删除） -->
diff --git a/src/views/patient/patient-list/index.vue b/src/views/patient/patient-list/index.vue
index f50e7b1..b3778b2 100644
--- a/src/views/patient/patient-list/index.vue
+++ b/src/views/patient/patient-list/index.vue
@@ -47,7 +47,7 @@
       row-key="doctor_id" @selection-change="(selection) => {deleteData = selection;console.log(selection)}"
       @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
       <template #doctor_id="{record,rowIndex}">
-        <div>{{(rowIndex+1)+(pager.page-1)*10}}</div>
+        <div>{{(rowIndex+1)+(pager.page-1)*pager.page_size}}</div>
       </template>
       <template #status="{ record }">
         <!-- 状态（0:禁用 1:正常 2:删除） -->
diff --git a/src/views/prescription/prescription-list/index.vue b/src/views/prescription/prescription-list/index.vue
index 6046cfd..abaf3d7 100644
--- a/src/views/prescription/prescription-list/index.vue
+++ b/src/views/prescription/prescription-list/index.vue
@@ -92,7 +92,7 @@
       row-key="doctor_id" @selection-change="(selection) => {deleteData = selection;console.log(selection)}"
       @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
       <template #doctor_id="{record,rowIndex}">
-        <div>{{(rowIndex+1)+(pager.page-1)*10}}</div>
+        <div>{{(rowIndex+1)+(pager.page-1)*pager.page_size}}</div>
       </template>
       <template #prescription_status="{ record }">
         <span>{{formatPrescriptionStatus(record.prescription_status)}}</span>

From 05556c360123306bf7ecd1ad113059e75562abfa Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 3 Nov 2023 10:14:39 +0800
Subject: [PATCH 21/32] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E6=89=80=E5=BE=97=E7=A8=8E=E4=BB=A5=E5=8F=8A=E5=8C=BB=E7=94=9F?=
 =?UTF-8?q?=E6=94=B6=E7=9B=8A=E9=87=91=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/accountModal.vue            |  2 +-
 src/components/inquiryDetailMoneyModal.vue |  8 ++++----
 src/components/numberModal.vue             | 24 +++++++++++++++++-----
 src/components/withdrawalModal.vue         |  3 ++-
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/components/accountModal.vue b/src/components/accountModal.vue
index de681ae..531b968 100644
--- a/src/components/accountModal.vue
+++ b/src/components/accountModal.vue
@@ -98,7 +98,7 @@
           <div v-else-if="record.inquiry_status==7">已取消</div>
       </template>
       <template #doctor_amount="{ record }">
-        {{(record.doctor_amount) }}元
+        {{Math.floor(record.amount_total*0.75*100)/100}}元
       </template>
   
       <template #patient_name_mask="{ record }">
diff --git a/src/components/inquiryDetailMoneyModal.vue b/src/components/inquiryDetailMoneyModal.vue
index cf16b8a..a545c1e 100644
--- a/src/components/inquiryDetailMoneyModal.vue
+++ b/src/components/inquiryDetailMoneyModal.vue
@@ -84,16 +84,16 @@
         </a-col>
         <a-col :span="12">
           <a-form-item field="" label="平台收益：">
-            <span v-if="modalForm.payment_amount_total*0.25==0">0元</span>
-            <span v-else>{{ (modalForm.payment_amount_total*0.25).toFixed(2) }}</span>
+            <span v-if="modalForm.amount_total*0.25==0">0元</span>
+            <span v-else>{{ Math.floor(modalForm.amount_total*0.25*100)/100}}元</span>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24" >
         <a-col :span="12">
           <a-form-item field="" label="医生收益：">
-            <span v-if="modalForm.payment_amount_total*0.75==0">0元</span>
-            <span v-else>{{ (modalForm.payment_amount_total*0.75).toFixed(2) }}</span>
+            <span v-if="modalForm.amount_total*0.75==0">0元</span>
+            <span v-else>{{Math.floor(modalForm.amount_total*0.75*100)/100}}元</span>
           </a-form-item>
         </a-col>
       </a-row>
diff --git a/src/components/numberModal.vue b/src/components/numberModal.vue
index d26a731..7043b24 100644
--- a/src/components/numberModal.vue
+++ b/src/components/numberModal.vue
@@ -29,6 +29,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  max:{
+    type: Number,
+    default: 0,
+  },
   id:{
     type: String,
     default:'',
@@ -38,7 +42,7 @@ const props = defineProps({
   },
 });
 const emits = defineEmits(['closeChange']);
-const {okVisible,id,api} = toRefs(props);
+const {okVisible,id,api,max} = toRefs(props);
 
 // Akiraka 20230210 关闭弹窗
 const handleClose = () =>  {
@@ -48,18 +52,28 @@ const handleClose = () =>  {
 }
 // Akiraka 20230210 删除数据校验
 const rules = {
-    income_tax:  [{ required: true, message: '请输入个人所得税' }]
+    income_tax:  [
+      { required: true, message: '请输入个人所得税' },
+      {
+        validator: (value, cb) => {
+          if (value==0) {
+            cb('金额需要大于0');
+          }
+          if (value>props.max) {
+            cb('修改金额不可超出提现金额');
+          }
+        }
+      }
+    ]
 };
 // Akiraka 20230210 确认按钮 => 开始数据检查
 const handleConfirm = () => {
   proxy.$refs.modalFormRef.validate(async(valid) => {
     if (!valid) {
-      const {code}= await api.value(id.value,form);
+      const {code,message}= await api.value(id.value,form);
       if(code==200){
         Message.success("修改成功");
           proxy.$refs.modalFormRef.resetFields();
-      }else{
-        proxy.$notification.error(response.message);
       }
       emits('closeChange',true);
     }
diff --git a/src/components/withdrawalModal.vue b/src/components/withdrawalModal.vue
index e3e0433..d4a2dfd 100644
--- a/src/components/withdrawalModal.vue
+++ b/src/components/withdrawalModal.vue
@@ -103,7 +103,7 @@
           <a-col :span="12">
             <a-form-item field="idCard" label="个人所得税：" >
               <div>{{modalForm.income_tax}}</div>
-              <a-button type="primary" @click="()=>okVisible=true" style="margin-left:20px;" v-has="'admin:sysFinancialRecord:tax'">纠正个人所得税</a-button>
+              <a-button type="primary" @click="()=>okVisible=true" style="margin-left:20px;" v-has="'admin:sysFinancialRecord:tax'" :disabled="modalForm.examine_status==1 && modalForm.payment_status==0">纠正个人所得税</a-button>
             </a-form-item>
           </a-col>
         </a-row>
@@ -200,6 +200,7 @@
       :okVisible="okVisible"
       :api="editIncome"
       :id="withdrawal_order_id"
+      :max="modalForm.actual_withdrawal_amount"
       @closeChange="closeChange"
     ></numberModal>
 

From 572b3f0cdb057cb8ed4576e0b7167db6aaeb5be0 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 3 Nov 2023 10:25:11 +0800
Subject: [PATCH 22/32] =?UTF-8?q?=E9=87=91=E9=A2=9D=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/accountModal.vue    | 8 ++++++--
 src/components/withdrawalModal.vue | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/accountModal.vue b/src/components/accountModal.vue
index 531b968..2cc9e02 100644
--- a/src/components/accountModal.vue
+++ b/src/components/accountModal.vue
@@ -97,6 +97,10 @@
           <div v-else-if="record.inquiry_status==6">已结束</div>
           <div v-else-if="record.inquiry_status==7">已取消</div>
       </template>
+      
+      <template #payment_amount_total="{ record }">
+        {{record.payment_amount_total}}元
+      </template>
       <template #doctor_amount="{ record }">
         {{Math.floor(record.amount_total*0.75*100)/100}}元
       </template>
@@ -225,8 +229,8 @@ watch(()=>queryForm.create_range_time,(value)=>{
     { title: '订单编号', dataIndex: 'inquiry_no',width:200 },
   { 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: 'doctor_amount',slotName:'doctor_amount',width:100 },
+  { title: '实付金额', dataIndex: 'payment_amount_total',slotName:'payment_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' },
   { title: '入账状态', dataIndex: 'entry_status', slotName:'entry_status' },
diff --git a/src/components/withdrawalModal.vue b/src/components/withdrawalModal.vue
index d4a2dfd..f72ff1a 100644
--- a/src/components/withdrawalModal.vue
+++ b/src/components/withdrawalModal.vue
@@ -78,19 +78,19 @@
           <a-col :span="12">
             <a-form-item field="idCard" label="确认账单时间：" >
               <div v-if="parseTime(modalForm.examine_time)">{{parseTime(modalForm.examine_time)}}</div>
-              <div>-</div>
+              <div v-else>-</div>
             </a-form-item>
           </a-col>
         </a-row>
         <a-row :gutter="24" >
           <a-col :span="12">
             <a-form-item field="idCard" label="应提现金额：" >
-              <div>{{modalForm.applied_withdrawal_amount}}</div>
+              <div>{{modalForm.applied_withdrawal_amount}}元</div>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item field="idCard" label="实际提现金额：" >
-              <div>{{modalForm.actual_withdrawal_amount}}</div>
+              <div>{{modalForm.actual_withdrawal_amount}}元</div>
             </a-form-item>
           </a-col>
         </a-row>

From e81cb36926e439d9697dd4fe53ac35a08911cdbc Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 3 Nov 2023 11:29:26 +0800
Subject: [PATCH 23/32] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/accountModal.vue b/src/components/accountModal.vue
index 2cc9e02..f3d7edf 100644
--- a/src/components/accountModal.vue
+++ b/src/components/accountModal.vue
@@ -276,13 +276,13 @@ const handleQuery = async () => {
       ...queryForm,
     };
 
-    handleGetOrder(params);
+    handleGetOrder(doctor_id.value,params);
   };
 
   // 重置搜索
   const handleResetQuery = () => {
     proxy.$refs.queryFormRef.resetFields();
-    handleGetOrder(queryForm);
+    handleGetOrder(doctor_id.value,queryForm);
   }
   
 </script>
diff --git a/src/components/withdrawalModal.vue b/src/components/withdrawalModal.vue
index f72ff1a..346188b 100644
--- a/src/components/withdrawalModal.vue
+++ b/src/components/withdrawalModal.vue
@@ -122,7 +122,7 @@
         </div>
         <a-row :gutter="24" style="margin-top: 35px;">
           <a-col :span="24">
-            <a-form-item field="idCard" hide-label="true" >
+            <a-form-item field="idCard" :hide-label="true" >
                <!-- table -->
     <a-table :columns="columns" :data="tableData" 
      :scroll="{ x:1500 }"

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 24/32] =?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();
   }
   
   

From 6fef74fe741b7ff20a90f2bb367e35890ebdc45f Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 3 Nov 2023 15:56:48 +0800
Subject: [PATCH 25/32] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/finance/account.js         |  4 ++--
 src/api/finance/record.js          |  4 ++--
 src/components/accountModal.vue    | 14 +++++++-------
 src/components/withdrawalModal.vue | 15 +++++++++------
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/api/finance/account.js b/src/api/finance/account.js
index d99942b..3de141d 100644
--- a/src/api/finance/account.js
+++ b/src/api/finance/account.js
@@ -12,9 +12,9 @@ export function getAccountDetail(id){
       method: 'get'
     })
   }
-  export function getAccountOrder(id,params){//关联订单列表
+  export function getAccountOrder(params){//关联订单列表
     return request({
-      url:'/admin/doctor/account/order/'+id,
+      url:'/admin/doctor/account/order',
       method: 'get',
       params
     })
diff --git a/src/api/finance/record.js b/src/api/finance/record.js
index 276052e..8a33e2b 100644
--- a/src/api/finance/record.js
+++ b/src/api/finance/record.js
@@ -14,9 +14,9 @@ export function getWithdrawalDetail(id){
       method: 'get'
     })
   }
-export function getOrder(id,params){
+export function getOrder(params){
     return request({
-      url:'/admin/finance/withdrawal/order/'+id,
+      url:'/admin/finance/withdrawal/order',
       method: 'get',
       params
     })
diff --git a/src/components/accountModal.vue b/src/components/accountModal.vue
index 0c3ab28..ac59506 100644
--- a/src/components/accountModal.vue
+++ b/src/components/accountModal.vue
@@ -171,7 +171,7 @@ const {modalVisible,modalForm} = toRefs(props);
   watch(()=>props.modalForm.doctor_id,()=>{
     if(props.modalForm.doctor_id){
       doctor_id.value=props.modalForm.doctor_id;
-      handleGetOrder(props.modalForm.doctor_id,{...pager})
+      handleGetOrder({...pager,doctor_id:props.modalForm.doctor_id})
     }else{
       doctor_id.value='';
     }
@@ -247,8 +247,8 @@ const handleClose = () => {
   emits('familyVisibleChange', false);
 };
 const tableData=ref([]);
-const handleGetOrder=(id,params={})=>{
-  getAccountOrder(id,params).then(res=>{
+const handleGetOrder=(params={})=>{
+  getAccountOrder(params).then(res=>{
     if(res.code==200){
       let data=res.data; 
       tableData.value=data.data;
@@ -264,14 +264,14 @@ const handleGetOrder=(id,params={})=>{
     pager.page = page;
     // 修改当前页码
     currentPage.value = page;
-    handleGetOrder(doctor_id.value,{ ...pager});
+    handleGetOrder({ ...pager,doctor_id:doctor_id.value});
   };
 
   // 每页数据量
   const handlepage_sizeChange = (page_size) => {
    
     pager.page_size = page_size;
-    handleGetOrder(doctor_id.value,{ ...pager});
+    handleGetOrder({ ...pager,doctor_id:doctor_id.value});
   };
 const handleQuery = async () => {
     pager.page = 1;
@@ -279,9 +279,9 @@ const handleQuery = async () => {
       page: pager.page,
       page_size: pager.page_size,
       ...queryForm,
+      doctor_id:doctor_id.value
     };
-
-    handleGetOrder(doctor_id.value,params);
+    handleGetOrder(params);
   };
 
   // 重置搜索
diff --git a/src/components/withdrawalModal.vue b/src/components/withdrawalModal.vue
index 346188b..2b44a5e 100644
--- a/src/components/withdrawalModal.vue
+++ b/src/components/withdrawalModal.vue
@@ -102,7 +102,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item field="idCard" label="个人所得税：" >
-              <div>{{modalForm.income_tax}}</div>
+              <div>{{modalForm.income_tax}}元</div>
               <a-button type="primary" @click="()=>okVisible=true" style="margin-left:20px;" v-has="'admin:sysFinancialRecord:tax'" :disabled="modalForm.examine_status==1 && modalForm.payment_status==0">纠正个人所得税</a-button>
             </a-form-item>
           </a-col>
@@ -266,7 +266,10 @@ const {modalVisible,modalForm} = toRefs(props);
   watch(()=>props.modalForm.withdrawal_id,()=>{
     if(props.modalForm.withdrawal_id){
       withdrawal_order_id.value=props.modalForm.withdrawal_id;
-      handleGetOrder(props.modalForm.withdrawal_id,{...pager})
+      handleGetOrder({
+        ...pager,
+        withdrawal_id:props.modalForm.withdrawal_id
+      })
     }else{
       withdrawal_order_id.value='';
     }
@@ -301,8 +304,8 @@ const handleClose = () => {
   emits('familyVisibleChange', false);
 };
 const tableData=ref([]);
-const handleGetOrder=(id,params={})=>{
-  getOrder(id,params).then(res=>{
+const handleGetOrder=(params={})=>{
+  getOrder(params).then(res=>{
     if(res.code==200){
       let data=res.data; 
       console.log(data.data)
@@ -319,13 +322,13 @@ const handleGetOrder=(id,params={})=>{
     pager.page = page;
     // 修改当前页码
     currentPage.value = page;
-    handleGetOrder(withdrawal_order_id.value,{ ...pager});
+    handleGetOrder({ ...pager, withdrawal_id:withdrawal_order_id.value});
   };
 
   // 每页数据量
   const handlepage_sizeChange = (page_size) => {
     pager.page_size = page_size;
-    handleGetOrder(withdrawal_order_id.value,{ ...pager});
+    handleGetOrder({ ...pager, withdrawal_id:withdrawal_order_id.value});
   };
 const patientData=reactive({});
 const modalFormData=reactive({});

From e8cac74960aafc15666a29b52cebd11437ab2960 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 3 Nov 2023 16:14:15 +0800
Subject: [PATCH 26/32] =?UTF-8?q?=E7=BA=A0=E6=AD=A3=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E6=89=80=E5=BE=97=E7=A8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/withdrawalModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/withdrawalModal.vue b/src/components/withdrawalModal.vue
index 2b44a5e..ad6a17a 100644
--- a/src/components/withdrawalModal.vue
+++ b/src/components/withdrawalModal.vue
@@ -103,7 +103,7 @@
           <a-col :span="12">
             <a-form-item field="idCard" label="个人所得税：" >
               <div>{{modalForm.income_tax}}元</div>
-              <a-button type="primary" @click="()=>okVisible=true" style="margin-left:20px;" v-has="'admin:sysFinancialRecord:tax'" :disabled="modalForm.examine_status==1 && modalForm.payment_status==0">纠正个人所得税</a-button>
+              <a-button type="primary" @click="()=>okVisible=true" style="margin-left:20px;" v-has="'admin:sysFinancialRecord:tax'" :disabled="!(modalForm.examine_status==1 && modalForm.payment_status==0)">纠正个人所得税</a-button>
             </a-form-item>
           </a-col>
         </a-row>

From e8ea81b924043a996c795dda2d0a743a5e98ddb0 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 3 Nov 2023 16:47:54 +0800
Subject: [PATCH 27/32] =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/withdrawalModal.vue          | 19 ++++++++++++++++---
 src/views/finance/financialrecord/index.vue | 16 ++++++++++++----
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/components/withdrawalModal.vue b/src/components/withdrawalModal.vue
index ad6a17a..a19512c 100644
--- a/src/components/withdrawalModal.vue
+++ b/src/components/withdrawalModal.vue
@@ -42,7 +42,7 @@
       
             <a-form-item field="idCard" label="提现状态：" >
                
-              <div v-if="modalForm.examine_status!=3 && modalForm.payment_status==0">待结算</div>
+              <div v-if="modalForm.examine_status==1 && modalForm.payment_status==0">待结算</div>
               <div v-else-if="modalForm.examine_status==2 && modalForm.payment_status==0">结算中</div>
               <div v-else-if="modalForm.examine_status==2 && modalForm.payment_status==1">结算成功</div>
               <div v-else-if="modalForm.examine_status==3 ">结算失败</div>
@@ -64,6 +64,15 @@
             </a-form-item>
           </a-col>
         </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item field="idCard" label="拒绝理由：" >
+              <span v-if="modalForm.doctor_withdrawal_bank">{{modalForm.doctor_withdrawal_bank.province}}{{modalForm.doctor_withdrawal_bank.city}}{{modalForm.doctor_withdrawal_bank.county}}</span>
+              <span v-else>-</span>
+            </a-form-item>
+          </a-col>
+          
+        </a-row>
         <a-divider />
         <div class="titlebox">
           <div class="bar"></div>
@@ -205,7 +214,7 @@
     ></numberModal>
 
     <a-modal v-model:visible="rejectVisible" :modal-style="{width:'420px'}"  @ok="handleConfirmReject"
-      @cancel="()=>rejectVisible=false" >
+      @cancel="closeReject" >
       <template #title>
         提示
       </template>
@@ -215,7 +224,7 @@
       </a-form-item>
     </a-form>
     <template #footer>
-      <a-button @click="()=>rejectVisible=false"><template #icon><icon-close /></template>取消</a-button>
+      <a-button @click="closeReject"><template #icon><icon-close /></template>取消</a-button>
       <a-button type="primary" @click="handleConfirmReject"><template #icon><icon-check /></template>确认</a-button>
     </template>
 
@@ -389,6 +398,10 @@ const handleConfirmReject=()=>{
     }
   })
 };
+const closeReject=()=>{
+  rejectVisible.value=false;
+  proxy.$refs.rejectFormRef.resetFields();
+}
 const handleConfirmPay=async()=>{
   const {data,code}=await confirmPay(withdrawal_order_id.value);
   if(code==200){
diff --git a/src/views/finance/financialrecord/index.vue b/src/views/finance/financialrecord/index.vue
index a0c12de..40fdac4 100644
--- a/src/views/finance/financialrecord/index.vue
+++ b/src/views/finance/financialrecord/index.vue
@@ -11,8 +11,9 @@
       <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-option :value="2">结算中</a-option>
+          <a-option :value="3">结算成功</a-option>
+          <a-option :value="4">结算失败</a-option>
         </a-select>
       </a-form-item> 
       <!-- <a-form-item field="examine_status" label="审核状态">
@@ -239,13 +240,20 @@ watch(() => queryForm.payment_range_time,
     }
   };
   const changeSettle=(value)=>{
+    // <div v-if="record.examine_status!=3 && record.payment_status==0">待结算</div>
+    //     <div v-else-if="record.examine_status==2 && record.payment_status==0">结算中</div>
+    //     <div v-else-if="record.examine_status==2 && record.payment_status==1">结算成功</div>
+    //     <div v-else-if="record.examine_status==3 ">结算失败</div>
     if(value==1){
-      queryForm.examine_status=2;
-      queryForm.payment_status=1;
+      queryForm.examine_status=1;
+      queryForm.payment_status=0;
     }else if(value==2){
       queryForm.examine_status=2;
       queryForm.payment_status=0;
     }else if(value==3){
+      queryForm.examine_status=2;
+      queryForm.payment_status=1;
+    }else if(value==4){
       queryForm.examine_status=3;
       delete queryForm.payment_status;
     }else{

From 7dbf3c7d8b533fea36b024f161be469c3b4a3409 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 3 Nov 2023 16:49:10 +0800
Subject: [PATCH 28/32] =?UTF-8?q?=E7=BB=93=E7=AE=97=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/finance/financialrecord/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/finance/financialrecord/index.vue b/src/views/finance/financialrecord/index.vue
index 40fdac4..4f169c8 100644
--- a/src/views/finance/financialrecord/index.vue
+++ b/src/views/finance/financialrecord/index.vue
@@ -71,7 +71,7 @@
       </template>
       <template #payment_status="{ record }">
         <!-- 状态（0:禁用 1:正常 2:删除） -->
-        <div v-if="record.examine_status!=3 && record.payment_status==0">待结算</div>
+        <div v-if="record.examine_status==1 && record.payment_status==0">待结算</div>
         <div v-else-if="record.examine_status==2 && record.payment_status==0">结算中</div>
         <div v-else-if="record.examine_status==2 && record.payment_status==1">结算成功</div>
         <div v-else-if="record.examine_status==3 ">结算失败</div>

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 29/32] =?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){

From 27420f34bd57bf5951098df27931bd356e7a0195 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 6 Nov 2023 09:10:19 +0800
Subject: [PATCH 30/32] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E6=8F=90=E7=8E=B0=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/withdrawalModal.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/withdrawalModal.vue b/src/components/withdrawalModal.vue
index 8983fd0..f5e8286 100644
--- a/src/components/withdrawalModal.vue
+++ b/src/components/withdrawalModal.vue
@@ -64,11 +64,10 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
+        <a-row :gutter="24" v-if="modalForm.examine_fail_reason">
           <a-col :span="12">
             <a-form-item field="idCard" label="拒绝理由：" >
-              <span v-if="modalForm.doctor_withdrawal_bank">{{modalForm.doctor_withdrawal_bank.province}}{{modalForm.doctor_withdrawal_bank.city}}{{modalForm.doctor_withdrawal_bank.county}}</span>
-              <span v-else>-</span>
+              <span >{{modalForm.doctor_withdrawal_bank.province}}{{modalForm.doctor_withdrawal_bank.city}}{{modalForm.doctor_withdrawal_bank.county}}</span>
             </a-form-item>
           </a-col>
           
@@ -211,6 +210,7 @@
       :id="withdrawal_order_id"
       :max="modalForm.actual_withdrawal_amount"
       @closeChange="closeChange"
+     
     ></numberModal>
 
     <a-modal v-model:visible="rejectVisible" :modal-style="{width:'420px'}"  @ok="handleConfirmReject"
@@ -362,7 +362,7 @@ const handleDetail = async (record) => {
 //关闭确认框
 const closeChange = () => {
   okVisible.value = false;
-  
+  emits('freshDetail');
 };
 const rejectVisible=ref(false);
 const rules = {
@@ -389,6 +389,9 @@ const handleWithdrawalStatus= async(examine_status)=>{
     examine_status==2?Message.success("已通过审核"):Message.success("已拒绝成功")
     emits('freshDetail');
   }
+  if(examine_status==3){
+    closeReject()
+  }
 }
 const okStatus=ref(1);
 const handleConfirmReject=()=>{

From 53da3d7231f41f25662beac846576f3dfb7a7bfe Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 6 Nov 2023 10:25:19 +0800
Subject: [PATCH 31/32] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/withdrawalModal.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/withdrawalModal.vue b/src/components/withdrawalModal.vue
index f5e8286..564ad6b 100644
--- a/src/components/withdrawalModal.vue
+++ b/src/components/withdrawalModal.vue
@@ -449,5 +449,7 @@ const handleSubmitConfirm=()=>{
   .cert .arco-form-item-label-col {
     flex: 0 0 8px !important;
   }
-
+  .arco-btn-disabled{
+    cursor: not-allowed!important;
+  }
 </style>
\ No newline at end of file

From 93ae44c7897b595a80666f8cb57297341687a486 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 7 Nov 2023 08:59:11 +0800
Subject: [PATCH 32/32] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/numberModal.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/numberModal.vue b/src/components/numberModal.vue
index 7043b24..8435a9a 100644
--- a/src/components/numberModal.vue
+++ b/src/components/numberModal.vue
@@ -56,9 +56,6 @@ const rules = {
       { required: true, message: '请输入个人所得税' },
       {
         validator: (value, cb) => {
-          if (value==0) {
-            cb('金额需要大于0');
-          }
           if (value>props.max) {
             cb('修改金额不可超出提现金额');
           }