From b8dfc98b089e47fdb3e269941bbd2de3f7fb7de1 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 13 Sep 2021 17:14:57 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises

---
 src/views/securityGuard/securityGuardDetail.vue |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/views/securityGuard/securityGuardDetail.vue b/src/views/securityGuard/securityGuardDetail.vue
index b388b1a..f4141d8 100644
--- a/src/views/securityGuard/securityGuardDetail.vue
+++ b/src/views/securityGuard/securityGuardDetail.vue
@@ -37,8 +37,8 @@
           <div class="baz-m-body" ref="baoanzheng">
             <div class="bmb-heard">保安员证</div>
             <div class="img">
-              <div v-if="!obj0.myPicture">暂无照片</div>
-              <img :src="obj0.myPicture" alt="" v-else />
+              <div v-if="!obj0.avatar">暂无照片</div>
+              <img :src="obj0.avatar" alt="" v-else />
             </div>
             <div class="imgs">
               <div v-if="erweima == ''">暂无二维码</div>
@@ -81,6 +81,9 @@
         </div>
       </div>
     </span>
+    <span v-else-if="typeTABS.prop === 'tab5'">
+      <securityCertificate :data="obj0"></securityCertificate>
+    </span>
   </div>
 </template> 
 
@@ -95,7 +98,7 @@
   updateExperience,
   getExperienceDetail,
   experienceRemove,
-  getExperienceList
+  getExperienceList,
 } from "@/api/experience/experience";
 
 import {
@@ -108,8 +111,12 @@
 } from "@/api/performance/performance";
 
 // import vueQr from "vue-qr";
+import securityCertificate from "./securityCertificate.vue";
 
 export default {
+  components: {
+    securityCertificate: securityCertificate,
+  },
   data() {
     return {
       typeTABS: {}, //标签页
@@ -135,6 +142,11 @@
             // icon: "el-icon-info",
             label: "保安员证",
             prop: "tab4",
+          },
+          {
+            // icon: "el-icon-info",
+            label: "保安员证书",
+            prop: "tab5",
           },
         ],
       },
@@ -261,7 +273,7 @@
       };
       //获取用户从业信息
       console.log(this.id, "cid");
-      getExperienceList(this.current, this.size,param).then((res1) => {
+      getExperienceList(this.current, this.size, param).then((res1) => {
         const data = res1.data.data;
         this.page1.total = data.total;
         this.data1 = data.records;
@@ -282,7 +294,6 @@
         this.loading2 = false;
       });
     },
-    
 
     rowSave2(form, done, loading) {
       form.securityid = this.id;

--
Gitblit v1.9.3