From e336d90f45b1ac5f58fab0e863084354421e4ef8 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 26 Nov 2024 10:08:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8E=86=E7=A4=BE=E4=BC=9A=E5=85=BC?=
 =?UTF-8?q?=E8=81=8C=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../curriculumVitae/components/info/info.vue  | 63 ++++++++++++++-----
 .../reviewers/curriculumVitae/preview.vue     | 24 +++++--
 2 files changed, 67 insertions(+), 20 deletions(-)

diff --git a/src/views/reviewers/curriculumVitae/components/info/info.vue b/src/views/reviewers/curriculumVitae/components/info/info.vue
index dd7df04f..2ab7478e 100644
--- a/src/views/reviewers/curriculumVitae/components/info/info.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/info.vue
@@ -38,13 +38,6 @@
           <span v-if="isEN">{{ DATA.Rank }}</span>
           <span v-else>{{ DATA.RankCN }}</span>
         </span>
-        <span
-          class="el-icon-medal"
-          v-if="DATA.WorkPartTimeEn || DATA.WorkPartTime"
-        >
-          <span v-if="isEN">{{ DATA.WorkPartTimeEn }}</span>
-          <span v-else>{{ DATA.WorkPartTime }}</span>
-        </span>
       </div>
       <div class="userTel">
         <span class="el-icon-phone-outline">
@@ -55,6 +48,20 @@
           DATA.WeChat
         }}</span>
       </div>
+      <div style="display: flex; font-size: 14px">
+        <span style="display: inline-block; width: 70px; color: #606266">{{
+          $t('curriculumVitae:info:meessage:partTimeJob')
+        }}</span>
+        <span
+          class="break-word"
+          style="
+            white-space: pre-wrap;
+            width: calc(100% - 80px);
+            word-wrap: break-word;
+          "
+          v-html="isEN ? DATA.WorkPartTimeEn : DATA.WorkPartTime"
+        ></span>
+      </div>
     </template>
     <div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
     <base-model :config="model_cfg">
@@ -450,7 +457,11 @@ export default {
           },
         ],
         LastName: [
-          { 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'),
@@ -465,10 +476,18 @@ export default {
           },
         ],
         Sex: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
         ],
         TitleIds: [
-          { required: true, message:this.$t('common:ruleMessage:select'), trigger: 'blur' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
         ],
         Phone: [
           {
@@ -517,7 +536,11 @@ export default {
           },
         ],
         DepartmentOther: [
-          { 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'),
@@ -533,10 +556,18 @@ export default {
           },
         ],
         RankId: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
         ],
         RankOther: [
-          { 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'),
@@ -544,7 +575,11 @@ export default {
           },
         ],
         RankOtherCN: [
-          { 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'),
diff --git a/src/views/reviewers/curriculumVitae/preview.vue b/src/views/reviewers/curriculumVitae/preview.vue
index 4487de04..82618dd4 100644
--- a/src/views/reviewers/curriculumVitae/preview.vue
+++ b/src/views/reviewers/curriculumVitae/preview.vue
@@ -61,12 +61,6 @@
             ><span v-if="isEN">{{ reviewerData.EmploymentView.Rank }}</span>
             <span v-else>{{ reviewerData.EmploymentView.RankCN }}</span></span
           >
-          <span class="el-icon-medal" v-if="isAll">
-            <span v-if="isEN">{{
-              reviewerData.EmploymentView.WorkPartTimeEn
-            }}</span>
-            <span v-else>{{ reviewerData.EmploymentView.WorkPartTime }}</span>
-          </span>
         </div>
         <div class="userTel" v-if="isAll">
           <span class="el-icon-phone-outline">{{
@@ -79,6 +73,24 @@
             reviewerData.BasicInfoView.WeChat
           }}</span>
         </div>
+        <div style="display: flex; font-size: 14px" v-if="isAll">
+          <span style="display: inline-block; width: 70px; color: #606266">{{
+            $t('curriculumVitae:info:meessage:partTimeJob')
+          }}</span>
+          <span
+            class="break-word"
+            style="
+              white-space: pre-wrap;
+              width: calc(100% - 80px);
+              word-wrap: break-word;
+            "
+            v-html="
+              isEN
+                ? reviewerData.EmploymentView.WorkPartTimeEn
+                : reviewerData.EmploymentView.WorkPartTime
+            "
+          ></span>
+        </div>
       </div>
       <div class="message break-word">
         <div class="title">{{ $t('curriculumVitae:summarize:title') }}</div>