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] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=8C=BB=E7=94=9F=E8=AF=A6?=
 =?UTF-8?q?=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('签章申请成功');