From 6f015d61e1d1b0712118ca95ebcecb9ef937137f Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Tue, 7 Jun 2022 11:35:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/TeacherList.vue    |  3 ++-
 src/views/manage/teacherDetails.vue | 31 +++++++++++++++++------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/views/manage/TeacherList.vue b/src/views/manage/TeacherList.vue
index 5fc5d8c2..df835fc0 100644
--- a/src/views/manage/TeacherList.vue
+++ b/src/views/manage/TeacherList.vue
@@ -48,7 +48,7 @@
           {{scope.row.waitStatus=='0'?'在职': scope.row.waitStatus=='1' ? '离职' :''}}
         </template>
       </el-table-column>
-      <el-table-column label="认证状态" width="90" :filters="[{ text: '未认证', value: '0'}, { text: '已认证', value: '1' }]"
+      <el-table-column label="认证状态" width="90" :filters="[{ text: '未认证', value: 0}, { text: '已认证', value: 1 }]"
       :filter-method="filterCertification">
         <template slot-scope="scope">
           {{scope.row.certStatus==0 ?'未认证': scope.row.certStatus==1 ? '已认证' :''}}
@@ -258,6 +258,7 @@
      showTeacherDetails(val) {
       if(!val) {
         this.teacherDetailsId = '';
+        this.teacherDetailId = '';
       }
      }
     },
diff --git a/src/views/manage/teacherDetails.vue b/src/views/manage/teacherDetails.vue
index 1c94b6b8..74555056 100644
--- a/src/views/manage/teacherDetails.vue
+++ b/src/views/manage/teacherDetails.vue
@@ -22,21 +22,21 @@
                  </el-col>
                 </el-form-item>
              <el-form-item label="讲师组织:" >
-                <el-col :span="12">{{form.company_name}}</el-col>
+                <el-col :span="12">{{form.company_name? form.company_name:'--'}}</el-col>
                  <el-col :span="12">
-                 <el-form-item label="初始授课时长:">{{formatSeconds(form.default_teaching_time)}}</el-form-item></el-col>
+                 <el-form-item label="初始授课时长:">{{form.default_teaching_time? formatSeconds(form.default_teaching_time):'--'}}</el-form-item></el-col>
               </el-form-item>
 
             <el-form-item label="讲师体系:">
-                <el-col :span="12">{{form.system_name}}</el-col>
+                <el-col :span="12">{{newForm.tsystemName? newForm.tsystemName:'--'}}</el-col>
                 <el-col :span="12">
                  <el-form-item label="讲师级别:">
-                 {{form.level_name}}
+                 {{newForm.tlevelName? newForm.tlevelName:'--'}}
                  </el-form-item>
                  </el-col>
             </el-form-item>
             <el-form-item label="总计授课时长:">
-                <el-col :span="12">{{formatSeconds(form.teaching_time)}}</el-col>
+                <el-col :span="12">{{form.teaching_time? formatSeconds(form.teaching_time):'--'}}</el-col>
                 <el-col :span="12">
                     <el-form-item label="认证状态:">
                     {{form.is_certify == 1? '已认证':'未认证'}}
@@ -44,10 +44,11 @@
                 </el-col>
             </el-form-item>
             <el-form-item label="认证时间:">
-               <el-col :span="12">{{formatsec(form.certify_at *1000)}}</el-col>
+               <el-col :span="12">{{form.certify_at? formatsec(form.certify_at *1000):'--'}}</el-col>
                 <el-col :span="12">
                   <el-form-item label="认证资料:">
-                    <i style="color:blue" title="点击下载" @click="downloadActioon(form.certification)" class="el-icon-download"></i>
+                    <i style="color:blue" v-if="form.certification" title="点击下载" @click="downloadActioon(form.certification)" class="el-icon-download"></i>
+                    <span v-else>--</span>
                   </el-form-item>
                 </el-col>
             </el-form-item>
@@ -57,12 +58,12 @@
                  <!-- <el-col :span="12">--</el-col> -->
                  <!-- <el-col :span="12"> -->
             <el-form-item label="讲师介绍:">
-                <div v-html="form.description"></div>
+                <div v-html="newForm.description"></div>
             </el-form-item>
                  <!-- </el-col>
             </el-form-item> -->
             <el-form-item label="讲师备注:">
-               {{form.remark}}
+               {{newForm.remark}}
             </el-form-item>
           </el-form>
           </el-col>
@@ -311,6 +312,10 @@ export default {
   },
   mounted() {
       this.getAvatar();
+      if(this.id) {
+        this.getDetail();
+      }
+      
   },
   watch:{
     id(newVal){
@@ -485,11 +490,11 @@ export default {
     },
     getDetail() {
       //应该是自己系统的教师信息呀
-      teacherApi.detail(this.newId).then(rs=>{
-         if(rs.status==200){
+      // teacherApi.detail(this.newId).then(rs=>{
+      //    if(rs.status==200){
            
-         }
-      });
+      //    }
+      // });
       
       teacherBoeApi.teacherInfo(this.id).then(res => {
         if (res.status == 200) {