问题修复

src/components/userinfo/components/additionalInformation.vue

@@ -12,9 +12,7 @@
     <div v-if="info" :class="{ 'active': statusChange }" class="basicInfoOut">
       <div>
         <span>用户预警状态：</span>
-                <span v-if="!statusChange">
-                    {{ info.userAlertStatusString || '-' }}
-                </span>
+        <span v-if="!statusChange">{{ info.userAlertStatusString || '-' }}</span>
         <div v-else>
           <a-select v-model="selectAlertListIndex" placeholder="请选择">
             <a-icon slot="suffixIcon" type="caret-down"/>
@@ -54,9 +52,9 @@
       </div>-->
       <div>
         <span>是否缴纳社保：</span>
-                <span v-if="!statusChange">
-                    {{ info.isPayInsurance == null ? "-": info.isPayInsurance == 0 ? "否" : "是" }}
-                </span>
+        <span
+          v-if="!statusChange"
+        >{{ info.isPayInsurance == null ? "-": info.isPayInsurance == 0 ? "否" : "是" }}</span>
         <div v-else>
           <a-select v-model="selectIsPayInsuranceIndex" placeholder="请选择">
             <a-icon slot="suffixIcon" type="caret-down"/>
@@ -68,9 +66,10 @@
       </div>
       <div>
         <span>是否劳动力：</span>
-                <span v-if="!statusChange" class="marginLeft12">
-                    {{ info.isPower == undefined ? "-": info.isPower == 0 ? "否" : "是" }}
-                </span>
+        <span
+          v-if="!statusChange"
+          class="marginLeft12"
+        >{{ info.isPower == undefined ? "-": info.isPower == 0 ? "否" : "是" }}</span>
         <div v-else class="marginLeft12">
           <a-select v-model="selectIsPowerIndex" placeholder="请选择">
             <a-icon slot="suffixIcon" type="caret-down"/>
@@ -82,9 +81,7 @@
       </div>
     </div>
     <div v-else class="msgOut">
-            <span class="default">
-                -
-            </span>
+      <span class="default">-</span>
     </div>
   </div>
 </template>
@@ -99,7 +96,7 @@ export default {
     isSelfSupport: {
       type: Number,
       default: 1
-        },
+    }
   },
   data() {
     return {
@@ -115,20 +112,19 @@ export default {
       // selectNationListIndex: undefined,
       selectIsPowerIndex: undefined,
       selectIsPayInsuranceIndex: undefined,
-            wishJobCodeList: null,
-        }
+      wishJobCodeList: null
+    };
   },
   async created() {
-        this.alertList = await this.getJobLightspotLabel('四色预警');
-        this.politicalOutlookList = await this.getJobLightspotLabel('政治面貌');
-        this.nationList = await this.getJobLightspotLabel('民族');
+    this.alertList = await this.getJobLightspotLabel("四色预警");
+    this.politicalOutlookList = await this.getJobLightspotLabel("政治面貌");
+    this.nationList = await this.getJobLightspotLabel("民族");
     this.init();
   },
-    mounted() {
-    },
+  mounted() {},
   methods: {
     async init() {
-            this.queryAdditionalInformation();
+      //   this.queryAdditionalInformation();
     },
     // 获取补充信息
     async queryAdditionalInformation() {
@@ -140,12 +136,22 @@ export default {
           return;
         }
         if (data) {
-                    Reflect.set(data, 'userAlertStatusString', this.getAlertList(data.userAlertStatus));
+          Reflect.set(
+            data,
+            "userAlertStatusString",
+            this.getAlertList(data.userAlertStatus)
+          );
           // Reflect.set(data, 'politicalOutlookString', this.getPoliticalOutlookList(data.isPoliticalOutlook));
           // Reflect.set(data, 'nationString', this.getNationList(data.nation));
           this.info = data;
-                    this.selectIsPayInsuranceIndex = typeof this.info.isPayInsurance === 'number' ? this.info.isPayInsurance : undefined;
-                    this.selectIsPowerIndex = typeof this.info.isPower === 'number' ? this.info.isPower : undefined;
+          this.selectIsPayInsuranceIndex =
+            typeof this.info.isPayInsurance === "number"
+              ? this.info.isPayInsurance
+              : undefined;
+          this.selectIsPowerIndex =
+            typeof this.info.isPower === "number"
+              ? this.info.isPower
+              : undefined;
           this.inputInfo = { ...this.info };
           console.log(this.inputInfo);
         }
@@ -159,10 +165,12 @@ export default {
      * @return { String } 返回求职字段对应信息
      */
     getAlertList(value) {
-            const index = this.alertList.findIndex(item => item.dataDictionary === value);
+      const index = this.alertList.findIndex(
+        item => item.dataDictionary === value
+      );
       if (index > -1) {
         // this.selectAlertListIndex = index;
-                this.$set(this, 'selectAlertListIndex', index);
+        this.$set(this, "selectAlertListIndex", index);
         return this.alertList[index].typeName;
       }
       return null;
@@ -212,7 +220,7 @@ export default {
           });
         }
       });
-            return withSeconedJob || withFirstJob || '-';
+      return withSeconedJob || withFirstJob || "-";
     },
     cancelStatusChange() {
       this.statusChange = false;
@@ -224,17 +232,27 @@ export default {
       try {
         const url = `${this.$basUrl.member}sysMemberExtend/saveAdditionalInformation`;
         const params = {};
-                Reflect.set(params, 'memberId', this.id);
-                Reflect.set(params, 'isPower', this.selectIsPowerIndex);
+        Reflect.set(params, "memberId", this.id);
+        Reflect.set(params, "isPower", this.selectIsPowerIndex);
         if (this.selectIsPayInsuranceIndex !== undefined) {
-                    Reflect.set(params, 'isPayInsurance', this.selectIsPayInsuranceIndex !== undefined ? this.selectIsPayInsuranceIndex : null);
+          Reflect.set(
+            params,
+            "isPayInsurance",
+            this.selectIsPayInsuranceIndex !== undefined
+              ? this.selectIsPayInsuranceIndex
+              : null
+          );
         } else {
-                    Reflect.set(params, 'isPayInsurance', null);
+          Reflect.set(params, "isPayInsurance", null);
         }
         if (this.selectAlertListIndex !== undefined) {
-                    Reflect.set(params, 'userAlertStatus', this.alertList[this.selectAlertListIndex].dataDictionary);
+          Reflect.set(
+            params,
+            "userAlertStatus",
+            this.alertList[this.selectAlertListIndex].dataDictionary
+          );
         } else {
-                    Reflect.set(params, 'userAlertStatus', null);
+          Reflect.set(params, "userAlertStatus", null);
         }
         // if (this.selectPoliticalOutlookListIndex !== undefined) {
         //     Reflect.set(params, 'isPoliticalOutlook', this.politicalOutlookList[this.selectPoliticalOutlookListIndex].dataDictionary);
@@ -252,18 +270,17 @@ export default {
         if (code !== 200) {
           return;
         } else {
-                    this.$message.success('修改成功');
+          this.$message.success("修改成功");
           this.init();
           this.cancelStatusChange();
         }
       } catch (error) {
         console.log(error);
       }
-        },
     }
   }
+};
 </script>
 
 <style>
-
 </style>

src/components/userinfo/components/educationList.vue

@@ -2,7 +2,7 @@
   <div class="userInfoList marginBottom24" :class="{ 'active': statusChange }">
     <div class="userInfoTitle">
       <span>教育经历</span>
-      <span v-if="isSelfSupport === 1" :class="{ 'active': statusChange }" class="handle">
+      <span v-if="isSelfSupport == 1" :class="{ 'active': statusChange }" class="handle">
         <span v-if="statusChange" class="gary" @click="cancelStatusChange">取消</span>
         <span v-if="!statusChange" class="blue" @click="editStatusChange">添加</span>
         <span v-if="statusChange" class="blue" @click="save">保存</span>
@@ -90,15 +90,15 @@
       </div>
       <div v-if="!statusChange">
         <div v-for="(item, index) in info" :key="index" class="basicInfoList marginBottom12">
-          <div v-if="info" class="experienceInfo">
+          <div class="experienceInfo">
             <span>{{ item.name || '-' }}</span>
             <span class="splitIcon">|</span>
             <span>{{ item.major || '-' }}</span>
             <span class="splitIcon">|</span>
-            <span>{{ item.educationName || '-' }}</span>
+            <span>{{ getEducationName(item.education) }}</span>
             <span class="splitIcon">|</span>
             <span>{{ item.beginDate || '-' }}～{{ item.endDate || '-' }}</span>
-            <span v-if="isSelfSupport === 1" class="handle flex">
+            <span v-if="isSelfSupport == 1" class="handle flex">
               <span @click="editItem(index)">
                 <img src="../../../assets/user/experienceEditIcon.png" alt="editIcon">
               </span>
@@ -134,8 +134,8 @@ export default {
       default: null
     },
     info: {
-      type: Object,
-      default: null
+      type: Array,
+      default: []
     }
   },
   data() {
@@ -165,12 +165,11 @@ export default {
   },
   created() {
     this.defaultInfo = { ...this.inputInfo };
-    this.init();
+    // this.init();
   },
   mounted() {},
   methods: {
     init() {
-      //   this.info = null;
       this.querySysMemberEdu();
     },
     // 查询用户教育经历
@@ -183,25 +182,31 @@ export default {
       //         return;
       //     }
       console.info("educationlist", this.info);
-      const data = this.info;
+      const data = [...this.info];
+      this.info = [];
       if (data) {
         data.map(async item => {
           const educationName = item.education
-            ? await this.getEducation(data[0].education)
+            ? await this.getEducation(item.education)
             : "-";
           Reflect.set(item, "educationName", educationName);
         });
         this.inputFirstClick = [true, true, true];
         this.info = data;
       }
+      console.info(this.info[0].educationName);
       // } catch (error) {
       //     console.log(error);
       //     return '-';
       // }
     },
+    getEducationName(education) {
+      const educationName = education ? this.getEducation(education) : "-";
+      return educationName;
+    },
     setDefaultSelectEducation(education) {
       const index = this.educationWordList.findIndex(
-        item => item.dataDictionary === education
+        item => item.dataDictionary == education
       );
       if (index > -1) {
         this.selectEducationIndex = index;
@@ -212,11 +217,11 @@ export default {
      * @param { String } education 对应字典中学历编号
      * @return { String } 返回对应学历信息
      */
-    async getEducation(education) {
+    getEducation(education) {
       try {
         let educationString = "-";
         this.educationWordList.map(item => {
-          if (item.dataDictionary === education) {
+          if (item.dataDictionary == education) {
             educationString = item.typeName;
           }
         });
@@ -287,7 +292,7 @@ export default {
     },
     checkData() {
       if (isEmpty(this.inputInfo.name)) return "请输入学校";
-      if (this.selectEducationIndex === undefined) return "请选择学历";
+      if (this.selectEducationIndex == undefined) return "请选择学历";
       if (isEmpty(this.inputInfo.beginDate)) return "请选择入学时间";
       if (isEmpty(this.inputInfo.endDate)) return "请选择毕业时间";
       if (this.inputInfo.beginDate._d > this.inputInfo.endDate._d)

src/components/userinfo/components/jobExperience.vue

@@ -164,8 +164,8 @@ export default {
       default: 1
     },
     info: {
-      type: Object,
-      default: null
+      type: Array,
+      default: []
     }
   },
   data() {
@@ -193,8 +193,8 @@ export default {
   },
   async created() {
     this.defaultInputInfo = { ...this.inputInfo };
-    this.jobList = await this.getJobTypeList("岗位分类");
-    this.jobList = removeEmptyArrays(this.jobList);
+    const jobList = await this.getJobTypeList("岗位分类");
+    this.jobList = removeEmptyArrays(jobList);
     this.init();
   },
   mounted() {},
@@ -226,6 +226,12 @@ export default {
       //     console.log(error);
       //   }
     },
+    async getEducationName(education) {
+      const educationName = education
+        ? await this.getEducation(education)
+        : "-";
+      return educationName;
+    },
     /**
      * 字典查询匹配期望岗位
      * @param { String } jobTypeOne 层级一岗位匹配

src/components/userinfo/components/jobWantedStatus.vue

@@ -30,7 +30,7 @@
           <span v-if="statusChange" class="required">*</span>
           <span>求职状态：</span>
         </span>
-        <span v-if="!statusChange">{{ info && info.jobWantedStatus || '-' }}</span>
+        <span v-if="!statusChange">{{ info && getJobWantedStatus(info.status) || '-' }}</span>
         <div v-else>
           <a-select
             v-model="selectJobWantedStatusIndex"
@@ -54,7 +54,7 @@
           <span v-if="statusChange" class="required">*</span>
           <span>意向薪资：</span>
         </span>
-        <span v-if="!statusChange">{{ info && info.wishSalaryRange || '-' }}</span>
+        <span v-if="!statusChange">{{ info && getSalaryRange(info.salary) || '-' }}</span>
         <div v-else>
           <a-select
             v-model="selectWishSalaryRangeIndex"
@@ -80,7 +80,7 @@
         </span>
         <span
           v-if="!statusChange"
-        >{{ info && info.provinceCode ? getWorkCity(cityList, info.provinceCode, info.cityCode, info.districtCode) : '-' }}</span>
+        >{{ info && info.provinceCode ? getWorkCity(cityList, info.provinceCode, info.cityCode, info.districtCode) || '-' : '-' }}</span>
         <div v-if="statusChange" class="cascaderOut">
           <a-cascader
             v-model="addressCodeList"
@@ -104,7 +104,7 @@
           <span v-if="statusChange" class="required">*</span>
           <span>意向岗位：</span>
         </span>
-        <span v-if="!statusChange">{{ info && info.wishJob || '-' }}</span>
+        <span v-if="!statusChange">{{ info && getWithJob(info.jobTypeOne, info.jobTypeTwo) || '-' }}</span>
         <div v-else>
           <a-cascader
             v-model="wishJobCodeList"
@@ -128,7 +128,12 @@
           <span v-if="statusChange" class="required">*</span>
           <span>期望行业：</span>
         </span>
-        <span v-if="!statusChange">{{ info && info.laborType || '-' }}</span>
+        <span v-if="!statusChange">
+          {{ info && getLaborType(
+          info.laborTypeOne,
+          info.laborTypeTwo
+          ) || '-' }}
+        </span>
         <div v-else>
           <a-cascader
             v-model="selectLaborTypeItem"
@@ -152,7 +157,11 @@
           <span v-if="statusChange" class="required">*</span>
           <span>工作性质：</span>
         </span>
-        <span v-if="!statusChange">{{ info && info.jobCategory || '-' }}</span>
+        <span v-if="!statusChange">
+          {{ info && getJobCategory(
+          info.jobCategory ? info.jobCategory.toString() : null
+          ) || '-' }}
+        </span>
         <div v-else>
           <a-select
             v-model="selecJobCategoryIndex"
@@ -223,7 +232,7 @@ export default {
     this.laborTypeList = removeEmptyArrays(this.laborTypeList);
     this.jobCategoryList = await this.getJobLightspotLabel("工作性质");
     await this.getCityList();
-    this.init();
+    // this.init();
   },
   mounted() {},
   methods: {

src/components/userinfo/components/personnelCategory/personnelCategoryList.vue

@@ -98,7 +98,7 @@ export default {
     };
   },
   created() {
-    this.init();
+    // this.init();
   },
   mounted() {},
   methods: {

src/components/userinfo/components/trainingIntention.vue

@@ -104,7 +104,7 @@ export default {
     };
   },
   created() {
-    this.init();
+    // this.init();
   },
   mounted() {},
   methods: {

src/components/userinfo/userInfoModal.vue

@@ -88,28 +88,28 @@
                   :educationWordList="educationWordList"
                   :info="eduExperienceInfo"
                 />
-                <div v-if="platform == 'employ'" class="dashline marginBottom8"/>
+                <div v-if="isSelfSupport == 1" class="dashline marginBottom8"/>
                 <!-- AdditionalInformation补充信息 -->
                 <AdditionalInformation
-                  v-if="platform == 'employ'"
+                  v-if="isSelfSupport == 1"
                   :id="vipID"
                   :isSelfSupport="isSelfSupport"
                 />
                 <!-- PersonnelCategoryList人员类别 -->
                 <PersonnelCategoryList
-                  v-if="platform == 'employ'"
+                  v-if="isSelfSupport == 1"
                   :id="vipID"
                   :isSelfSupport="isSelfSupport"
                 />
                 <!-- TrainingIntention 培训意向-->
                 <TrainingIntention
-                  v-if="platform == 'employ'"
+                  v-if="isSelfSupport == 1"
                   :id="vipID"
                   :isSelfSupport="isSelfSupport"
                 />
                 <!-- EntrepreneurialIntention 创业意向-->
                 <EntrepreneurialIntention
-                  v-if="platform == 'employ'"
+                  v-if="isSelfSupport == 1"
                   :id="vipID"
                   :isSelfSupport="isSelfSupport"
                 />
@@ -221,6 +221,7 @@ export default {
   async mounted() {
     try {
       this.educationWordList = await this.getJobLightspotLabel("学历分类");
+      console.info("educationWordList", this.educationWordList);
     } catch (error) {
       console.log("error", error);
     }

src/plugs/utils.js

@@ -35,16 +35,16 @@ export const getWorkCity = (cityRes, province, city, area) => {
     const addressList = [];
     if (cityRes && province) {
         for (let provinceItem of cityRes) {
-            if (provinceItem.code == province) {
+            if (provinceItem.code.substr(0, 6) == province) {
                 addressList.push(provinceItem.name);
             }
             if (city) {
                 for (let cityItem of provinceItem.list) {
-                    if (cityItem.code == city) {
+                    if (cityItem.code.substr(0, 6) == city) {
                         addressList.push(cityItem.name);
                         if (area) {
                             for (let areaItem of cityItem.list) {
-                                if (areaItem.code == area) {
+                                if (areaItem.code.substr(0, 6) == area) {
                                     addressList.push(areaItem.name);
                                 }
                             }