From 4e06b5ef8714bd65963f28ab08a430255c9cb0ce Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 4 Dec 2024 11:31:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8E=86=E6=97=B6=E9=97=B4=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E3=80=81=E8=BE=93=E5=85=A5=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E3=80=81=E5=85=B6=E5=AE=83=E9=80=89=E9=A1=B9=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reviewers/components/Employment.vue | 21 +++--
 src/views/reviewers/components/Specialty.vue  | 15 ++-
 .../reviewers/components/TrialExperience.vue  |  8 +-
 .../components/info/clinicalTrials.vue        | 91 ++++++++++++++++---
 .../components/info/continuingTraining.vue    |  4 +-
 .../components/info/educationalExperience.vue |  4 +-
 .../curriculumVitae/components/info/info.vue  | 21 +++--
 .../components/info/specialty.vue             | 57 +++++++++---
 .../reviewers/curriculumVitae/preview.vue     | 16 +++-
 9 files changed, 184 insertions(+), 53 deletions(-)

diff --git a/src/views/reviewers/components/Employment.vue b/src/views/reviewers/components/Employment.vue
index bdb6d3a9..7378bd26 100644
--- a/src/views/reviewers/components/Employment.vue
+++ b/src/views/reviewers/components/Employment.vue
@@ -117,7 +117,10 @@
                     :label="item.Value"
                     :value="item.Id"
                   />
-                  <el-option label="Other" :value="otherId" />
+                  <el-option
+                    :label="$t('curriculumVitae:selectLabel:Other')"
+                    :value="otherId"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -186,8 +189,8 @@
             <el-col :span="5">
               <el-form-item
                 v-if="
-                  $fd('Rank', employmentForm.RankId, 'id') === '其它' ||
-                  $fd('Rank', employmentForm.RankId, 'id') === 'Other'
+                  $fd('Rank', employmentForm.RankId, 'id') ===
+                  $t('curriculumVitae:selectLabel:Other')
                 "
                 class="other-item"
                 prop="RankOther"
@@ -204,8 +207,8 @@
             <el-col :span="5">
               <el-form-item
                 v-if="
-                  $fd('Rank', employmentForm.RankId, 'id') === '其它' ||
-                  $fd('Rank', employmentForm.RankId, 'id') === 'Other'
+                  $fd('Rank', employmentForm.RankId, 'id') ===
+                  $t('curriculumVitae:selectLabel:Other')
                 "
                 class="other-item"
                 prop="RankOtherCN"
@@ -286,7 +289,7 @@ export default {
   },
   data() {
     const RankIndication = (rule, value, callback) => {
-      if (value === '其它' || value === 'Other') {
+      if (value === this.$t('curriculumVitae:selectLabel:Other')) {
         if (!this.trialForm.IndicationOther) {
           return callback(new Error('请输入适应症'))
         }
@@ -294,7 +297,7 @@ export default {
       callback()
     }
     const PhysicianIndication = (rule, value, callback) => {
-      if (value === '其它' || value === 'Other') {
+      if (value === this.$t('curriculumVitae:selectLabel:Other')) {
         if (!this.trialForm.IndicationOther) {
           return callback(new Error('请输入适应症'))
         }
@@ -448,7 +451,7 @@ export default {
       var o = this.$d.Rank.find((v) => {
         return v.id === val
       })
-      if (o.label === '其它' || o.label === 'Other') {
+      if (o.label === this.$t('curriculumVitae:selectLabel:Other')) {
         this.employmentForm.RankOther = ''
         this.employmentForm.RankOtherCN = ''
       } else {
@@ -460,7 +463,7 @@ export default {
       var o = this.$d.PhysicianOriginal.find((v) => {
         return v.id === val
       })
-      if (o.label === '其它' || o.label === 'Other') {
+      if (o.label === this.$t('curriculumVitae:selectLabel:Other')) {
         this.employmentForm.Physician = ''
         this.employmentForm.PhysicianCN = ''
       } else {
diff --git a/src/views/reviewers/components/Specialty.vue b/src/views/reviewers/components/Specialty.vue
index 1627fe18..165b3349 100644
--- a/src/views/reviewers/components/Specialty.vue
+++ b/src/views/reviewers/components/Specialty.vue
@@ -35,7 +35,10 @@
                     :label="item.Value"
                     :value="item.Id"
                   />
-                  <el-option label="Other" :value="otherId" />
+                  <el-option
+                    :label="$t('curriculumVitae:selectLabel:Other')"
+                    :value="otherId"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -96,7 +99,10 @@
                     :label="item.Value"
                     :value="item.Id"
                   />
-                  <el-option label="Other" :value="otherId" />
+                  <el-option
+                    :label="$t('curriculumVitae:selectLabel:Other')"
+                    :value="otherId"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -164,7 +170,10 @@
                     :label="item.Value"
                     :value="item.Id"
                   />
-                  <el-option label="Other" :value="otherId" />
+                  <el-option
+                    :label="$t('curriculumVitae:selectLabel:Other')"
+                    :value="otherId"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/reviewers/components/TrialExperience.vue b/src/views/reviewers/components/TrialExperience.vue
index 577f4f0e..2a7ff84d 100644
--- a/src/views/reviewers/components/TrialExperience.vue
+++ b/src/views/reviewers/components/TrialExperience.vue
@@ -459,7 +459,7 @@ export default {
       selectId: '00000000-0000-0000-0000-000000000000',
       dictionaryList: {},
       // otherId: 'ef84e9cb-f1a6-49d7-b6da-34be2c12abd5',
-      otherId:'00000000-0000-0000-0000-000000000000',
+      otherId: '00000000-0000-0000-0000-000000000000',
       GCPData: {},
     }
   },
@@ -491,14 +491,14 @@ export default {
       let value = this.$d.Indication.find(
         (item) => item.value === this.clinicalTrialForm.IndicationEnum
       ).label
-      return value === '其它' || value === 'Other'
+      return value === this.$t('curriculumVitae:selectLabel:Other')
     },
     Trial_Phase_isOther() {
       if (!this.clinicalTrialForm.PhaseId) return false
       let value = this.dictionaryList.Trial_Phase.find(
         (item) => item.Id === this.clinicalTrialForm.PhaseId
       ).Value
-      return value === '其它' || value === 'Other'
+      return value === this.$t('curriculumVitae:selectLabel:Other')
     },
     ReadingStandard_isOther() {
       if (
@@ -516,7 +516,7 @@ export default {
         ...this.dictionaryList.CriterionType,
         {
           Id: this.otherId,
-          Value: 'Other',
+          Value: this.$t('curriculumVitae:selectLabel:Other'),
         },
       ]
     },
diff --git a/src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue b/src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue
index 8ae37e4f..eb74da5a 100644
--- a/src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue
@@ -230,23 +230,45 @@
               :maxlength="400"
             ></el-input>
           </el-form-item>
-          <el-form-item
+          <!-- <el-form-item
             :label="$t('curriculumVitae:clinicalTrials:form:time')"
             prop="BeginDate"
           >
             <el-date-picker
               clearable
               v-model="daterange"
-              type="daterange"
+              type="monthrange"
               value-format="yyyy-MM-dd"
-              format="yyyy-MM-dd"
+              format="yyyy"
               :range-separator="$t('curriculumVitae:daterange:rangeSeparator')"
               :start-placeholder="$t('curriculumVitae:daterange:startTime')"
               :end-placeholder="$t('curriculumVitae:daterange:endTime')"
               @change="changeTimeList"
             >
             </el-date-picker
-          ></el-form-item>
+          ></el-form-item> -->
+          <el-form-item
+            :label="$t('system:TrialExperience:label:Start Time')"
+            prop="StartTime"
+          >
+            <el-date-picker
+              v-model="form.StartTime"
+              type="year"
+              value-format="yyyy-MM-DD"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item
+            :label="$t('system:TrialExperience:label:End Time')"
+            prop="EndTime"
+          >
+            <el-date-picker
+              v-model="form.EndTime"
+              type="year"
+              value-format="yyyy-MM-DD"
+            >
+            </el-date-picker>
+          </el-form-item>
           <el-form-item
             :label="$t('curriculumVitae:clinicalTrials:form:viewingVolumeNum')"
             prop="VisitReadingCount"
@@ -500,6 +522,7 @@ import {
   saveAttachments,
   getAttachmentByType,
 } from '@/api/attachment'
+import moment from 'moment'
 const defaultForm = () => {
   return {
     PhaseId: '',
@@ -581,10 +604,18 @@ export default {
           },
         ],
         VisitReadingCount: [
-          { required: true, message:this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
         ],
         EvaluationContent: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
           {
             max: 400,
             message: this.$t('form:rules:maxLength:400'),
@@ -604,6 +635,44 @@ export default {
             message: this.$t('common:ruleMessage:specify'),
             trigger: 'blur',
           },
+          {
+            validator: (rule, value, callback) => {
+              if (
+                value &&
+                this.form.EndTime &&
+                moment(value).isAfter(moment(this.form.EndTime))
+              ) {
+                callback(
+                  new Error(
+                    this.$t('system:TrialExperience:rule:startBeforeEnd')
+                  )
+                )
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur',
+          },
+        ],
+        EndTime: [
+          {
+            validator: (rule, value, callback) => {
+              if (
+                value &&
+                this.form.StartTime &&
+                moment(value).isBefore(moment(this.form.StartTime))
+              ) {
+                callback(
+                  new Error(
+                    this.$t('system:TrialExperience:rule:endBeforeStart')
+                  )
+                )
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur',
+          },
         ],
         OtherStages: [
           {
@@ -693,7 +762,7 @@ export default {
       },
       dictionaryList: {},
       // otherId: 'ef84e9cb-f1a6-49d7-b6da-34be2c12abd5',
-      otherId:'00000000-0000-0000-0000-000000000000',
+      otherId: '00000000-0000-0000-0000-000000000000',
     }
   },
   watch: {
@@ -753,14 +822,14 @@ export default {
       let value = this.$d.Indication.find(
         (item) => item.value === this.form.IndicationEnum
       ).label
-      return value === '其它' || value === 'Other'
+      return value === this.$t('curriculumVitae:selectLabel:Other')
     },
     Trial_Phase_isOther() {
       if (!this.form.PhaseId) return false
       let value = this.dictionaryList.Trial_Phase.find(
         (item) => item.Id === this.form.PhaseId
       ).Value
-      return value === '其它' || value === 'Other'
+      return value === this.$t('curriculumVitae:selectLabel:Other')
     },
     ReadingStandard_isOther() {
       if (
@@ -776,7 +845,7 @@ export default {
         ...this.dictionaryList.CriterionType,
         {
           Id: this.otherId,
-          Value: 'Other',
+          Value: this.$t('curriculumVitae:selectLabel:Other'),
         },
       ]
     },
@@ -865,7 +934,7 @@ export default {
           let validate = await this.$refs.otherAboutFrom.validate()
           if (!validate) return false
           this.otherForm.DoctorId = this.reviewerId
-          if(this.trialId){
+          if (this.trialId) {
             this.otherForm.TrialId = this.trialId
           }
           this.loading = true
diff --git a/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue b/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue
index 530d8a49..68e68dd9 100644
--- a/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue
@@ -93,9 +93,9 @@
             <el-date-picker
               clearable
               v-model="daterange"
-              type="daterange"
+              type="monthrange"
               value-format="yyyy-MM-dd"
-              format="yyyy-MM-dd"
+              format="yyyy-MM"
               :range-separator="$t('curriculumVitae:daterange:rangeSeparator')"
               :start-placeholder="$t('curriculumVitae:daterange:startTime')"
               :end-placeholder="$t('curriculumVitae:daterange:endTime')"
diff --git a/src/views/reviewers/curriculumVitae/components/info/educationalExperience.vue b/src/views/reviewers/curriculumVitae/components/info/educationalExperience.vue
index fc199b85..a12e0b58 100644
--- a/src/views/reviewers/curriculumVitae/components/info/educationalExperience.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/educationalExperience.vue
@@ -101,9 +101,9 @@
             <el-date-picker
               clearable
               v-model="daterange"
-              type="daterange"
+              type="monthrange"
               value-format="yyyy-MM-dd"
-              format="yyyy-MM-dd"
+              format="yyyy-MM"
               :range-separator="$t('curriculumVitae:daterange:rangeSeparator')"
               :start-placeholder="$t('curriculumVitae:daterange:startTime')"
               :end-placeholder="$t('curriculumVitae:daterange:endTime')"
diff --git a/src/views/reviewers/curriculumVitae/components/info/info.vue b/src/views/reviewers/curriculumVitae/components/info/info.vue
index 40a7e805..1bf054c1 100644
--- a/src/views/reviewers/curriculumVitae/components/info/info.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/info.vue
@@ -34,6 +34,10 @@
           <span v-if="isEN">{{ DATA.Department }}</span>
           <span v-else>{{ DATA.DepartmentCN }}</span>
         </span>
+        <span class="el-icon-first-aid-kit" v-else>
+          <span v-if="isEN">{{ DATA.DepartmentOther }}</span>
+          <span v-else>{{ DATA.DepartmentOtherCN }}</span>
+        </span>
         <span class="el-icon-user" v-if="DATA.Rank || DATA.RankCN">
           <span v-if="isEN">{{ DATA.Rank }}</span>
           <span v-else>{{ DATA.RankCN }}</span>
@@ -273,11 +277,14 @@
                 :label="item.Value"
                 :value="item.Id"
               />
-              <el-option label="Other" :value="otherId" />
+              <el-option
+                :label="$t('curriculumVitae:selectLabel:Other')"
+                :value="otherId"
+              />
             </el-select>
           </el-form-item>
           <el-form-item
-            v-if="form.DepartmentId === otherId"
+            v-if="form.DepartmentId === otherId && isEN"
             class="other-item"
             prop="DepartmentOther"
           >
@@ -291,7 +298,7 @@
             />
           </el-form-item>
           <el-form-item
-            v-if="form.DepartmentId === otherId"
+            v-if="form.DepartmentId === otherId && !isEN"
             class="other-item"
             prop="DepartmentOtherCN"
           >
@@ -319,8 +326,8 @@
           </el-form-item>
           <el-form-item
             v-if="
-              $fd('Rank', form.RankId, 'id') === '其它' ||
-              $fd('Rank', form.RankId, 'id') === 'Other'
+              $fd('Rank', form.RankId, 'id') ===
+                $t('curriculumVitae:selectLabel:Other') && isEN
             "
             class="other-item"
             prop="RankOther"
@@ -336,8 +343,8 @@
           </el-form-item>
           <el-form-item
             v-if="
-              $fd('Rank', form.RankId, 'id') === '其它' ||
-              $fd('Rank', form.RankId, 'id') === 'Other'
+              $fd('Rank', form.RankId, 'id') ===
+                $t('curriculumVitae:selectLabel:Other') && !isEN
             "
             class="other-item"
             prop="RankOtherCN"
diff --git a/src/views/reviewers/curriculumVitae/components/info/specialty.vue b/src/views/reviewers/curriculumVitae/components/info/specialty.vue
index 0fd82cc4..96d63bbb 100644
--- a/src/views/reviewers/curriculumVitae/components/info/specialty.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/specialty.vue
@@ -88,11 +88,14 @@
                 :label="item.Value"
                 :value="item.Id"
               />
-              <el-option label="Other" :value="otherId" />
+              <el-option
+                :label="$t('curriculumVitae:selectLabel:Other')"
+                :value="otherId"
+              />
             </el-select>
           </el-form-item>
           <el-form-item
-            v-if="form.SpecialityId == otherId"
+            v-if="form.SpecialityId == otherId && isEN"
             class="other-item"
             prop="SpecialityOther"
           >
@@ -106,7 +109,7 @@
             />
           </el-form-item>
           <el-form-item
-            v-if="form.SpecialityId == otherId"
+            v-if="form.SpecialityId == otherId && !isEN"
             prop="SpecialityOtherCN"
             class="other-item"
           >
@@ -140,7 +143,8 @@
           <el-form-item
             v-if="
               form.SubspecialityIds &&
-              form.SubspecialityIds.indexOf(otherId) > -1
+              form.SubspecialityIds.indexOf(otherId) > -1 &&
+              isEN
             "
             class="other-item"
             prop="SubspecialityOther"
@@ -157,7 +161,8 @@
           <el-form-item
             v-if="
               form.SubspecialityIds &&
-              form.SubspecialityIds.indexOf(otherId) > -1
+              form.SubspecialityIds.indexOf(otherId) > -1 &&
+              !isEN
             "
             class="other-item"
             prop="SubspecialityOtherCN"
@@ -191,7 +196,9 @@
           </el-form-item>
           <el-form-item
             v-if="
-              form.ReadingTypeIds && form.ReadingTypeIds.indexOf(otherId) > -1
+              form.ReadingTypeIds &&
+              form.ReadingTypeIds.indexOf(otherId) > -1 &&
+              isEN
             "
             prop="ReadingTypeOther"
             class="other-item"
@@ -207,7 +214,9 @@
           </el-form-item>
           <el-form-item
             v-if="
-              form.ReadingTypeIds && form.ReadingTypeIds.indexOf(otherId) > -1
+              form.ReadingTypeIds &&
+              form.ReadingTypeIds.indexOf(otherId) > -1 &&
+              !isEN
             "
             prop="ReadingTypeOtherCN"
             class="other-item"
@@ -302,7 +311,11 @@ export default {
           },
         ],
         SpecialityOther: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
           {
             max: 400,
             message: this.$t('form:rules:maxLength:400'),
@@ -324,7 +337,11 @@ export default {
           },
         ],
         ReadingTypeOther: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
           {
             max: 400,
             message: this.$t('form:rules:maxLength:400'),
@@ -332,7 +349,11 @@ export default {
           },
         ],
         ReadingTypeOtherCN: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
           {
             max: 400,
             message: this.$t('form:rules:maxLength:400'),
@@ -347,7 +368,11 @@ export default {
           },
         ],
         SubspecialityOther: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
           {
             max: 400,
             message: this.$t('form:rules:maxLength:400'),
@@ -355,7 +380,11 @@ export default {
           },
         ],
         SubspecialityOtherCN: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
           {
             max: 400,
             message: this.$t('form:rules:maxLength:400'),
@@ -381,7 +410,7 @@ export default {
         ...this.dictionaryList.Subspeciality,
         {
           Id: this.otherId,
-          Value: 'Other',
+          Value: this.$t('curriculumVitae:selectLabel:Other'),
         },
       ]
     },
@@ -390,7 +419,7 @@ export default {
         ...this.dictionaryList.ReadingType,
         {
           Id: this.otherId,
-          Value: 'Other',
+          Value: this.$t('curriculumVitae:selectLabel:Other'),
         },
       ]
     },
diff --git a/src/views/reviewers/curriculumVitae/preview.vue b/src/views/reviewers/curriculumVitae/preview.vue
index 82618dd4..d752faa3 100644
--- a/src/views/reviewers/curriculumVitae/preview.vue
+++ b/src/views/reviewers/curriculumVitae/preview.vue
@@ -51,12 +51,26 @@
           </span>
         </div>
         <div class="userTitle">
-          <span class="el-icon-first-aid-kit">
+          <span
+            class="el-icon-first-aid-kit"
+            v-if="
+              reviewerData.EmploymentView.Department ||
+              reviewerData.EmploymentView.DepartmentCN
+            "
+          >
             <span v-if="isEN">{{
               reviewerData.EmploymentView.Department
             }}</span>
             <span v-else>{{ reviewerData.EmploymentView.DepartmentCN }}</span>
           </span>
+          <span class="el-icon-first-aid-kit" v-else>
+            <span v-if="isEN">{{
+              reviewerData.EmploymentView.DepartmentOther
+            }}</span>
+            <span v-else>{{
+              reviewerData.EmploymentView.DepartmentOtherCN
+            }}</span>
+          </span>
           <span class="el-icon-user"
             ><span v-if="isEN">{{ reviewerData.EmploymentView.Rank }}</span>
             <span v-else>{{ reviewerData.EmploymentView.RankCN }}</span></span