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