From f34faa7db36e7c65602150986010a02fb21e2162 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 12 Nov 2024 14:59:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8E=86=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reviewers/components/TrialExperience.vue            | 2 +-
 .../curriculumVitae/components/info/clinicalTrials.vue        | 4 +++-
 .../curriculumVitae/components/info/continuingTraining.vue    | 2 +-
 .../curriculumVitae/components/info/educationalExperience.vue | 2 +-
 .../reviewers/curriculumVitae/components/info/holiday.vue     | 2 +-
 src/views/reviewers/curriculumVitae/preview.vue               | 4 +++-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/reviewers/components/TrialExperience.vue b/src/views/reviewers/components/TrialExperience.vue
index f3701d58..0575e077 100644
--- a/src/views/reviewers/components/TrialExperience.vue
+++ b/src/views/reviewers/components/TrialExperience.vue
@@ -57,7 +57,7 @@
         >
           <template slot-scope="scope">
             <span v-if="scope.row.StartTime"
-              >{{ scope.row.StartTime.split('-')[0] }}-{{
+              >{{ scope.row.StartTime.split('-')[0] }} ~ {{
                 scope.row.EndTime ? scope.row.EndTime.split('-')[0] : '至今'
               }}</span
             >
diff --git a/src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue b/src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue
index d5a2220c..fea28d75 100644
--- a/src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue
@@ -69,7 +69,9 @@
         <template slot-scope="scope">
           <span v-if="scope.row.StartTime"
             >{{ scope.row.StartTime.split('-')[0] }}-{{
-              scope.row.EndTime ? scope.row.EndTime.split('-')[0] : ''
+              scope.row.EndTime
+                ? scope.row.EndTime.split('-')[0]
+                : $t('curriculumVitae:lineIIcon:soFar')
             }}</span
           >
         </template>
diff --git a/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue b/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue
index 72941201..1ad1192a 100644
--- a/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue
@@ -22,7 +22,7 @@
         :label="$t('curriculumVitae:continuingTraining:table:time')"
       >
         <template slot-scope="scope">
-          <span>{{ scope.row.BeginDateStr }}-{{ scope.row.EndDateStr }}</span>
+          <span>{{ scope.row.BeginDateStr }} ~ {{ scope.row.EndDateStr }}</span>
         </template>
       </el-table-column>
       <el-table-column
diff --git a/src/views/reviewers/curriculumVitae/components/info/educationalExperience.vue b/src/views/reviewers/curriculumVitae/components/info/educationalExperience.vue
index 73f3940a..cca64618 100644
--- a/src/views/reviewers/curriculumVitae/components/info/educationalExperience.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/educationalExperience.vue
@@ -22,7 +22,7 @@
         :label="$t('curriculumVitae:EducationalExperience:table:time')"
       >
         <template slot-scope="scope">
-          <span>{{ scope.row.BeginDateStr }}-{{ scope.row.EndDateStr }}</span>
+          <span>{{ scope.row.BeginDateStr }} ~ {{ scope.row.EndDateStr }}</span>
         </template>
       </el-table-column>
       <el-table-column
diff --git a/src/views/reviewers/curriculumVitae/components/info/holiday.vue b/src/views/reviewers/curriculumVitae/components/info/holiday.vue
index 53d7744b..d6e23e5e 100644
--- a/src/views/reviewers/curriculumVitae/components/info/holiday.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/holiday.vue
@@ -111,7 +111,7 @@ export default {
       this.$emit('update:visible', false)
     },
     handleAddHoliday() {
-      if (this.daterange) {
+      if (this.daterange && this.daterange.length > 0) {
         const param = {
           DoctorId: this.reviewerId,
           StartDate: this.daterange[0],
diff --git a/src/views/reviewers/curriculumVitae/preview.vue b/src/views/reviewers/curriculumVitae/preview.vue
index 53d7d0cc..7519147e 100644
--- a/src/views/reviewers/curriculumVitae/preview.vue
+++ b/src/views/reviewers/curriculumVitae/preview.vue
@@ -389,7 +389,9 @@
             <template slot-scope="scope">
               <span v-if="scope.row.StartTime"
                 >{{ scope.row.StartTime.split('-')[0] }}-{{
-                  scope.row.EndTime ? scope.row.EndTime.split('-')[0] : ''
+                  scope.row.EndTime
+                    ? scope.row.EndTime.split('-')[0]
+                    : $t('curriculumVitae:lineIIcon:soFar')
                 }}</span
               >
             </template>