简历部分问题修改

src/views/reviewers/components/TrialExperience.vue

@@ -129,7 +129,7 @@
           <el-input
             v-model="OtherClinicalExperience"
             type="textarea"
-            rows="5"
+            rows="8"
             placeholder="Please specify in English"
             size="small"
             :maxlength="4000"
@@ -140,7 +140,7 @@
             v-model="OtherClinicalExperienceCN"
             :disabled="$route.query.ReviewStatus === '1'"
             type="textarea"
-            rows="5"
+            rows="8"
             placeholder="请用中文注明"
             size="small"
             :maxlength="4000"
@@ -385,6 +385,46 @@ export default {
         ],
         StartTime: [
           { required: true, message: 'Please specify', trigger: 'blur' },
+          {
+            validator: (rule, value, callback) => {
+              if (
+                value &&
+                this.clinicalTrialForm.EndTime &&
+                !moment(value).isBefore(moment(this.clinicalTrialForm.EndTime))
+              ) {
+                callback(
+                  new Error(
+                    this.$t('system:TrialExperience:rule:startBeforeEnd')
+                  )
+                )
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur',
+          },
+        ],
+        EndTime: [
+          {
+            validator: (rule, value, callback) => {
+              if (
+                value &&
+                this.clinicalTrialForm.StartTime &&
+                moment(value).isBefore(
+                  moment(this.clinicalTrialForm.StartTime)
+                )
+              ) {
+                callback(
+                  new Error(
+                    this.$t('system:TrialExperience:rule:endBeforeStart')
+                  )
+                )
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur',
+          },
         ],
         OtherStages: [
           {

src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue

@@ -156,11 +156,13 @@
     <template
       v-if="DATA.OtherClinicalExperience || DATA.OtherClinicalExperienceCN"
     >
-      <div class="message">
+      <div
-        {{
+        class="message"
+        style="white-space: pre-wrap"
+        v-html="
           isEN ? DATA.OtherClinicalExperience : DATA.OtherClinicalExperienceCN
-        }}
+        "
-      </div>
+      ></div>
     </template>
     <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
     <!--临床试验-->
@@ -1042,6 +1044,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
+    font-weight: bold;
   }
   .message {
     margin: auto;

src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue

@@ -500,6 +500,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
+    font-weight: bold;
   }
 }
 .el-select,

src/views/reviewers/curriculumVitae/components/info/educationalExperience.vue

@@ -506,6 +506,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
+    font-weight: bold;
   }
 }
 .el-select,

src/views/reviewers/curriculumVitae/components/info/other.vue

@@ -12,8 +12,10 @@
       </el-button>
     </div>
     <div class="message" v-if="DATA.AwardsHonors || DATA.AwardsHonorsCN">
-      <span v-if="isEN">{{ DATA.AwardsHonors }}</span>
+      <span
-      <span v-else>{{ DATA.AwardsHonorsCN }}</span>
+        style="white-space: pre-wrap"
+        v-html="isEN ? DATA.AwardsHonors : DATA.AwardsHonorsCN"
+      ></span>
     </div>
     <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
     <base-model :config="model_cfg">
@@ -177,6 +179,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
+    font-weight: bold;
   }
   .message {
     margin: auto;

src/views/reviewers/curriculumVitae/components/info/pay.vue

@@ -294,6 +294,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
+    font-weight: bold;
   }
   .message {
     margin: auto;

src/views/reviewers/curriculumVitae/components/info/scientificResearchProject.vue

@@ -28,8 +28,10 @@
           :label="$t('curriculumVitae:scientificResearchProject:subject')"
         >
           <div>
-            <span v-if="isEN">{{ DATA.Grants }}</span>
+            <span
-            <span v-else>{{ DATA.GrantsCN }}</span>
+              style="white-space: pre-wrap"
+              v-html="isEN ? DATA.Grants : DATA.GrantsCN"
+            ></span>
           </div>
         </el-form-item>
       </el-form>
@@ -264,6 +266,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
+    font-weight: bold;
   }
   .message {
     margin: auto;

src/views/reviewers/curriculumVitae/components/info/summarize.vue

@@ -14,9 +14,9 @@
     <div
       class="message"
       v-if="mainSummarize.SummarizeEn || mainSummarize.Summarize"
-    >
+      style="white-space: pre-wrap"
-      {{ isEN ? mainSummarize.SummarizeEn : mainSummarize.Summarize }}
+      v-html="isEN ? mainSummarize.SummarizeEn : mainSummarize.Summarize"
-    </div>
+    ></div>
     <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
     <base-model :config="model_cfg">
       <template slot="dialog-body">
@@ -264,6 +264,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
+    font-weight: bold;
   }
   .message {
     width: 100%;

src/views/reviewers/curriculumVitae/components/info/treatise.vue

@@ -11,7 +11,11 @@
         {{ $t('common:button:edit') }}
       </el-button>
     </div>
-    <div class="message" v-if="DATA.Publications">{{ DATA.Publications }}</div>
+    <div
+      class="message"
+      v-if="DATA.Publications"
+      v-html="DATA.Publications"
+    ></div>
     <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
     <base-model :config="model_cfg">
       <template slot="dialog-body">
@@ -149,6 +153,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
+    font-weight: bold;
   }
 }
 .el-select,

src/views/reviewers/curriculumVitae/index.vue

@@ -395,6 +395,7 @@ export default {
   line-height: 50px;
   background-color: #fff;
   text-align: center;
+  font-weight: bold;
 }
 .leftMenu {
   position: absolute;
@@ -458,6 +459,7 @@ export default {
     line-height: 50px;
     background-color: #fff;
     text-align: left;
+    font-weight: bold;
   }
   ::v-deep .fileBox {
     background-color: #eee;
@@ -467,6 +469,7 @@ export default {
   }
   ::v-deep .file_title {
     line-height: 40px;
+    font-weight: bold;
   }
   ::v-deep .btnBox {
     display: flex;

src/views/reviewers/curriculumVitae/preview.vue

@@ -85,9 +85,11 @@
         v-if="mainSummarize.SummarizeEn || mainSummarize.Summarize"
       >
         <div class="title">{{ $t('curriculumVitae:summarize:title') }}</div>
-        <span class="">
+        <span
-          {{ isEN ? mainSummarize.SummarizeEn : mainSummarize.Summarize }}
+          class=""
-        </span>
+          style="white-space: pre-wrap"
+          v-html="isEN ? mainSummarize.SummarizeEn : mainSummarize.Summarize"
+        ></span>
       </div>
       <div class="message" v-if="isAll">
         <el-form class="demo-form-inline">
@@ -308,12 +310,15 @@
             <el-form-item
               :label="$t('curriculumVitae:scientificResearchProject:subject')"
             >
-              <span v-if="isEN" class="break-word">{{
+              <span
-                reviewerData.ResearchPublicationView.Grants
+                class="break-word"
-              }}</span>
+                style="white-space: pre-wrap"
-              <span v-else class="break-word">{{
+                v-html="
-                reviewerData.ResearchPublicationView.GrantsCN
+                  isEN
-              }}</span>
+                    ? reviewerData.ResearchPublicationView.Grants
+                    : reviewerData.ResearchPublicationView.GrantsCN
+                "
+              ></span>
             </el-form-item>
           </el-form>
         </div>
@@ -443,28 +448,43 @@
             reviewerData.TrialExperienceView.OtherClinicalExperienceCN
           "
         >
-          <div class="message break-word">
+          <div
-            {{
+            class="message break-word"
+            style="white-space: pre-wrap"
+            v-html="
               isEN
                 ? reviewerData.TrialExperienceView.OtherClinicalExperience
                 : reviewerData.TrialExperienceView.OtherClinicalExperienceCN
-            }}
+            "
-          </div>
+          ></div>
         </template>
       </div>
-      <div
+      <template v-if="isAll">
-        class="message"
-        v-if="reviewerData.ResearchPublicationView.Publications"
-      >
-        <div class="title">{{ $t('curriculumVitae:treatise:title') }}</div>
         <div
-          class="message break-word"
+          class="message"
-          style="white-space: pre-wrap"
           v-if="reviewerData.ResearchPublicationView.Publications"
         >
-          {{ reviewerData.ResearchPublicationView.Publications }}
+          <div class="title">{{ $t('curriculumVitae:treatise:title') }}</div>
+          <div
+            class="message break-word"
+            style="white-space: pre-wrap"
+            v-html="reviewerData.ResearchPublicationView.Publications"
+          ></div>
         </div>
-      </div>
+      </template>
+      <template v-else>
+        <div
+          class="message"
+          v-if="reviewerData.BasicInfoView.BlindPublications"
+        >
+          <div class="title">{{ $t('curriculumVitae:treatise:title') }}</div>
+          <div
+            class="message break-word"
+            style="white-space: pre-wrap"
+            v-html="reviewerData.BasicInfoView.BlindPublications"
+          ></div>
+        </div>
+      </template>
       <div
         class="message break-word"
         v-if="
@@ -475,12 +495,14 @@
       >
         <div class="title">{{ $t('curriculumVitae:other:AH') }}</div>
         <div class="message">
-          <span v-if="isEN">{{
+          <span
-            reviewerData.ResearchPublicationView.AwardsHonors
+            style="white-space: pre-wrap"
-          }}</span>
+            v-html="
-          <span v-else>{{
+              isEN
-            reviewerData.ResearchPublicationView.AwardsHonorsCN
+                ? reviewerData.ResearchPublicationView.AwardsHonors
-          }}</span>
+                : reviewerData.ResearchPublicationView.AwardsHonorsCN
+            "
+          ></span>
         </div>
       </div>
       <div class="message" v-if="isAll">
@@ -987,6 +1009,7 @@ export default {
       font-size: 14px;
       line-height: 30px;
       margin-bottom: 10px;
+      font-weight: bold;
     }
     .text {
       color: #909399;
@@ -1052,6 +1075,7 @@ export default {
     line-height: 50px;
     background-color: #fff;
     text-align: left;
+    font-weight: bold;
   }
   ::v-deep .fileBox {
     background-color: #eee;
@@ -1061,6 +1085,7 @@ export default {
   }
   ::v-deep .file_title {
     line-height: 40px;
+    font-weight: bold;
   }
   ::v-deep .btnBox {
     display: flex;