From 0f485b594a83698bf9b107abf36dc4e50dd5968a Mon Sep 17 00:00:00 2001
From: liubo <1060247260@qq.com>
Date: Wed, 7 Jun 2023 13:54:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=80=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

---
 .../userinfo/components/basicInfo.vue         | 312 +++++++++---------
 .../userinfo/components/jobWantedStatus.vue   |   8 +-
 src/components/userinfo/userInfoModal.vue     |   2 +
 src/plugs/utils.js                            |   9 +
 4 files changed, 178 insertions(+), 153 deletions(-)

diff --git a/src/components/userinfo/components/basicInfo.vue b/src/components/userinfo/components/basicInfo.vue
index 3a82001..d7de559 100644
--- a/src/components/userinfo/components/basicInfo.vue
+++ b/src/components/userinfo/components/basicInfo.vue
@@ -161,168 +161,174 @@
           />
         </div>
       </div>
-      <div>
-        <span class="flex-c">
-          <span v-if="statusChange" class="required">*</span>
-          <span>求职人员身份：</span>
-        </span>
-        <span v-if="!statusChange">{{ selectMemberIdentityString || '-' }}</span>
-        <div v-else>
-          <a-select
-            v-model="selectMemberIdentityIndex"
-            :class="{ 'error': selectMemberIdentityIndex == undefined }"
-            allowClear
-            placeholder="请选择"
-          >
-            <a-icon slot="suffixIcon" type="caret-down"/>
-            <a-select-option
-              v-for="(item, index) in memberIdentityWordList"
-              :key="index"
-              :value="index"
+      <template v-if="platform == 'employ'">
+        <div>
+          <span class="flex-c">
+            <span v-if="statusChange" class="required">*</span>
+            <span>求职人员身份：</span>
+          </span>
+          <span v-if="!statusChange">{{ selectMemberIdentityString || '-' }}</span>
+          <div v-else>
+            <a-select
+              v-model="selectMemberIdentityIndex"
+              :class="{ 'error': selectMemberIdentityIndex == undefined }"
+              allowClear
+              placeholder="请选择"
             >
-              <span>{{ item.typeName }}</span>
-            </a-select-option>
-          </a-select>
+              <a-icon slot="suffixIcon" type="caret-down"/>
+              <a-select-option
+                v-for="(item, index) in memberIdentityWordList"
+                :key="index"
+                :value="index"
+              >
+                <span>{{ item.typeName }}</span>
+              </a-select-option>
+            </a-select>
+          </div>
         </div>
-      </div>
-      <div>
-        <span class="flex-c">
-          <span v-if="statusChange" class="required">*</span>
-          <span>民族：</span>
-        </span>
-        <span v-if="!statusChange">{{ selectNationString || '-' }}</span>
-        <div v-else>
-          <a-select
-            v-model="selectNationIndex"
-            :class="{ 'error': selectNationIndex == undefined }"
-            allowClear
-            placeholder="请选择"
-          >
-            <a-icon slot="suffixIcon" type="caret-down"/>
-            <a-select-option v-for="(item, index) in nationWordList" :key="index" :value="index">
-              <span>{{ item.typeName }}</span>
-            </a-select-option>
-          </a-select>
+        <div>
+          <span class="flex-c">
+            <span v-if="statusChange" class="required">*</span>
+            <span>民族：</span>
+          </span>
+          <span v-if="!statusChange">{{ selectNationString || '-' }}</span>
+          <div v-else>
+            <a-select
+              v-model="selectNationIndex"
+              :class="{ 'error': selectNationIndex == undefined }"
+              allowClear
+              placeholder="请选择"
+            >
+              <a-icon slot="suffixIcon" type="caret-down"/>
+              <a-select-option v-for="(item, index) in nationWordList" :key="index" :value="index">
+                <span>{{ item.typeName }}</span>
+              </a-select-option>
+            </a-select>
+          </div>
         </div>
-      </div>
-      <div>
-        <span class="flex-c">
-          <span v-if="statusChange" class="required">*</span>
-          <span>政治面貌：</span>
-        </span>
-        <span v-if="!statusChange">{{ selectPoliticsString || '-' }}</span>
-        <div v-else>
-          <a-select
-            v-model="selectPoliticsIndex"
-            :class="{ 'error': selectPoliticsIndex == undefined }"
-            allowClear
-            placeholder="请选择"
-          >
-            <a-icon slot="suffixIcon" type="caret-down"/>
-            <a-select-option
-              v-for="(item, index) in isPoliticalOutlookWordList"
-              :key="index"
-              :value="index"
+        <div>
+          <span class="flex-c">
+            <span v-if="statusChange" class="required">*</span>
+            <span>政治面貌：</span>
+          </span>
+          <span v-if="!statusChange">{{ selectPoliticsString || '-' }}</span>
+          <div v-else>
+            <a-select
+              v-model="selectPoliticsIndex"
+              :class="{ 'error': selectPoliticsIndex == undefined }"
+              allowClear
+              placeholder="请选择"
             >
-              <span>{{ item.typeName }}</span>
-            </a-select-option>
-          </a-select>
+              <a-icon slot="suffixIcon" type="caret-down"/>
+              <a-select-option
+                v-for="(item, index) in isPoliticalOutlookWordList"
+                :key="index"
+                :value="index"
+              >
+                <span>{{ item.typeName }}</span>
+              </a-select-option>
+            </a-select>
+          </div>
         </div>
-      </div>
-      <div>
-        <span class="flex-c">
-          <span v-if="statusChange" class="required">*</span>
-          <span>婚姻状态：</span>
-        </span>
-        <span v-if="!statusChange">{{ selectMarriageString || '-' }}</span>
-        <div v-else>
-          <a-select
-            v-model="selectMarriageIndex"
-            :class="{ 'error': selectMarriageIndex == undefined }"
-            allowClear
-            placeholder="请选择"
-          >
-            <a-icon slot="suffixIcon" type="caret-down"/>
-            <a-select-option
-              v-for="(item, index) in maritalStatusWordList"
-              :key="index"
-              :value="index"
+        <div>
+          <span class="flex-c">
+            <span v-if="statusChange" class="required">*</span>
+            <span>婚姻状态：</span>
+          </span>
+          <span v-if="!statusChange">{{ selectMarriageString || '-' }}</span>
+          <div v-else>
+            <a-select
+              v-model="selectMarriageIndex"
+              :class="{ 'error': selectMarriageIndex == undefined }"
+              allowClear
+              placeholder="请选择"
             >
-              <span>{{ item.typeName }}</span>
-            </a-select-option>
-          </a-select>
+              <a-icon slot="suffixIcon" type="caret-down"/>
+              <a-select-option
+                v-for="(item, index) in maritalStatusWordList"
+                :key="index"
+                :value="index"
+              >
+                <span>{{ item.typeName }}</span>
+              </a-select-option>
+            </a-select>
+          </div>
         </div>
-      </div>
-      <div>
-        <span class="flex-c">
-          <span v-if="statusChange" class="required">*</span>
-          <span>户口性质：</span>
-        </span>
-        <span v-if="!statusChange">{{ selectHukouXingzhiString || '-' }}</span>
-        <div v-else>
-          <a-select
-            v-model="selectHukouXingzhiIndex"
-            :class="{ 'error': selectHukouXingzhiIndex == undefined }"
-            allowClear
-            placeholder="请选择"
-          >
-            <a-icon slot="suffixIcon" type="caret-down"/>
-            <a-select-option v-for="(item, index) in typeWordList" :key="index" :value="index">
-              <span>{{ item.typeName }}</span>
-            </a-select-option>
-          </a-select>
+        <div>
+          <span class="flex-c">
+            <span v-if="statusChange" class="required">*</span>
+            <span>户口性质：</span>
+          </span>
+          <span v-if="!statusChange">{{ selectHukouXingzhiString || '-' }}</span>
+          <div v-else>
+            <a-select
+              v-model="selectHukouXingzhiIndex"
+              :class="{ 'error': selectHukouXingzhiIndex == undefined }"
+              allowClear
+              placeholder="请选择"
+            >
+              <a-icon slot="suffixIcon" type="caret-down"/>
+              <a-select-option v-for="(item, index) in typeWordList" :key="index" :value="index">
+                <span>{{ item.typeName }}</span>
+              </a-select-option>
+            </a-select>
+          </div>
         </div>
-      </div>
-      <div>
-        <span class="flex-c">
-          <span v-if="statusChange" class="required">*</span>
-          <span>现住址：</span>
-        </span>
-        <span v-if="!statusChange">{{ info.liveAddress || '-' }}</span>
-        <div v-else>
-          <a-input
-            v-model="inputInfo.liveAddress"
-            :class="{ 'error': !inputInfo.liveAddress }"
-            :maxLength="100"
-            placeholder="请输入"
-          />
+        <div>
+          <span class="flex-c">
+            <span v-if="statusChange" class="required">*</span>
+            <span>现住址：</span>
+          </span>
+          <span v-if="!statusChange">{{ info.liveAddress || '-' }}</span>
+          <div v-else>
+            <a-input
+              v-model="inputInfo.liveAddress"
+              :class="{ 'error': !inputInfo.liveAddress }"
+              :maxLength="100"
+              placeholder="请输入"
+            />
+          </div>
         </div>
-      </div>
-      <div>
-        <span class="flex-c">
-          <span v-if="statusChange" class="required">*</span>
-          <span>电子邮箱：</span>
-        </span>
-        <span v-if="!statusChange">{{ info.mailBox || '-' }}</span>
-        <div v-else>
-          <a-input
-            v-model="inputInfo.mailBox"
-            :class="{ 'error': !inputInfo.mailBox }"
-            :maxLength="50"
-            placeholder="请输入"
-          />
+        <div>
+          <span class="flex-c">
+            <span v-if="statusChange" class="required">*</span>
+            <span>电子邮箱：</span>
+          </span>
+          <span v-if="!statusChange">{{ info.mailBox || '-' }}</span>
+          <div v-else>
+            <a-input
+              v-model="inputInfo.mailBox"
+              :class="{ 'error': !inputInfo.mailBox }"
+              :maxLength="50"
+              placeholder="请输入"
+            />
+          </div>
         </div>
-      </div>
-      <div>
-        <span class="flex-c">
-          <span v-if="statusChange" class="required">*</span>
-          <span>健康状况：</span>
-        </span>
-        <span v-if="!statusChange">{{ selectHealthStatusString || '-' }}</span>
-        <div v-else>
-          <a-select
-            v-model="selectHealthStatusIndex"
-            :class="{ 'error': selectHealthStatusIndex == undefined }"
-            allowClear
-            placeholder="请选择"
-          >
-            <a-icon slot="suffixIcon" type="caret-down"/>
-            <a-select-option v-for="(item, index) in healthStatusList" :key="index" :value="index">
-              <span>{{ item.typeName }}</span>
-            </a-select-option>
-          </a-select>
+        <div>
+          <span class="flex-c">
+            <span v-if="statusChange" class="required">*</span>
+            <span>健康状况：</span>
+          </span>
+          <span v-if="!statusChange">{{ selectHealthStatusString || '-' }}</span>
+          <div v-else>
+            <a-select
+              v-model="selectHealthStatusIndex"
+              :class="{ 'error': selectHealthStatusIndex == undefined }"
+              allowClear
+              placeholder="请选择"
+            >
+              <a-icon slot="suffixIcon" type="caret-down"/>
+              <a-select-option
+                v-for="(item, index) in healthStatusList"
+                :key="index"
+                :value="index"
+              >
+                <span>{{ item.typeName }}</span>
+              </a-select-option>
+            </a-select>
+          </div>
         </div>
-      </div>
+      </template>
     </div>
     <div v-else class="msgOut">
       <span class="default">-</span>
@@ -343,6 +349,10 @@ export default {
       type: Number,
       default: 1
     },
+    platform: {
+      type: String,
+      default: ""
+    },
     info: {
       type: Object,
       default: null
diff --git a/src/components/userinfo/components/jobWantedStatus.vue b/src/components/userinfo/components/jobWantedStatus.vue
index 4e5e44f..b8b0210 100644
--- a/src/components/userinfo/components/jobWantedStatus.vue
+++ b/src/components/userinfo/components/jobWantedStatus.vue
@@ -10,7 +10,7 @@
     </div>
     <!-- data 返回未空，无法判断是否为空时展示'-' -->
     <div :class="{ 'active': statusChange }" class="basicInfoOut">
-      <div>
+      <div v-if="platform == 'employ'">
         <span class="flex-c">
           <span v-if="statusChange" class="required">*</span>
           <span>简历名称：</span>
@@ -183,6 +183,10 @@ export default {
       type: Number,
       default: 1
     },
+    platform: {
+      type: String,
+      default: ""
+    },
     info: {
       type: Object,
       default: null
@@ -236,7 +240,6 @@ export default {
       //       return;
       //     }
       const data = this.info;
-      console.info("jobwanted", this.info);
       if (data) {
         // 设置用户求职意向地址
         const address = getWorkCity(
@@ -245,6 +248,7 @@ export default {
           data.cityCode,
           data.districtCode
         );
+        console.info("jobwanted", this.info, address, this.cityList);
         Reflect.set(data, "jobWantedAddress", address);
         // 设置用户求职意向
         const jobWantedStatus = this.getJobWantedStatus(data.status);
diff --git a/src/components/userinfo/userInfoModal.vue b/src/components/userinfo/userInfoModal.vue
index c5e471c..fcfeddf 100644
--- a/src/components/userinfo/userInfoModal.vue
+++ b/src/components/userinfo/userInfoModal.vue
@@ -61,6 +61,7 @@
                   v-if="basicInfo"
                   :id="vipID"
                   :isSelfSupport="isSelfSupport"
+                  :platform="platform"
                   :educationWordList="educationWordList"
                   :info="basicInfo"
                   @update="updateSysMemberBase"
@@ -70,6 +71,7 @@
                   v-if="memberIntentionInfo"
                   :id="vipID"
                   :isSelfSupport="isSelfSupport"
+                  :platform="platform"
                   :info="memberIntentionInfo"
                 />
                 <!-- JobExperience工作经历 -->
diff --git a/src/plugs/utils.js b/src/plugs/utils.js
index 1b24591..d175be2 100644
--- a/src/plugs/utils.js
+++ b/src/plugs/utils.js
@@ -23,6 +23,15 @@ export const removeEmptyArrays = (data) => {
  * @return { String } 为空时返回'-'，非空时返回多级省市区串联字符串，例如：'XXX/XXX/XXX'
  */
 export const getWorkCity = (cityRes, province, city, area) => {
+    if (province && province.length > 6) {
+        province = province.substr(0, 6)
+    }
+    if (city && city.length > 6) {
+        city = city.substr(0, 6)
+    }
+    if (area && area.length > 6) {
+        area = area.substr(0, 6)
+    }
     const addressList = [];
     if (cityRes && province) {
         for (let provinceItem of cityRes) {