完成前端人员基本信息的新旧接口过渡
yzw
parent
02ffefefe4
commit
afe9fb1933
|
|
@ -5,31 +5,31 @@
|
|||
<table class="info-table">
|
||||
<tr>
|
||||
<td class="text-key">姓名:</td>
|
||||
<td class="text-value">{{ personData["姓名"] }}</td>
|
||||
<td class="text-value">{{ personData["name"] }}</td>
|
||||
<td class="text-key">性别:</td>
|
||||
<td class="text-value">{{ personData["性别"] }}</td>
|
||||
<td class="text-key">{{ personData["证件类型"] }}号:</td>
|
||||
<td class="text-value">{{ personData["证件号码"] }}</td>
|
||||
<td class="text-value">{{ personData["sex"] }}</td>
|
||||
<td class="text-key">{{ personData["certificate"] }}号:</td>
|
||||
<td class="text-value">{{ personData["card_num"] }}</td>
|
||||
<td class="text-key">出生日期:</td>
|
||||
<td class="text-value">{{ personData["出生日期"] }}</td>
|
||||
<td class="text-value">{{ personData["birth_time"] }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="text-key">民族:</td>
|
||||
<td class="text-value">{{ personData["民族"] }}</td>
|
||||
<td class="text-value">{{ personData["nation"] }}</td>
|
||||
<td class="text-key">国籍:</td>
|
||||
<td class="text-value">{{ personData["国籍"] }}</td>
|
||||
<td class="text-value">{{ personData["citizenship"] }}</td>
|
||||
<td class="text-key">政治面貌:</td>
|
||||
<td class="text-value">{{ personData["政治面貌"] }}</td>
|
||||
<td class="text-value">{{ personData["politics"] }}</td>
|
||||
<td class="text-key">入党时间:</td>
|
||||
<td class="text-value">{{ personData["入党时间"] }}</td>
|
||||
<td class="text-value">{{ personData["party_start_time"] }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="text-key">籍贯:</td>
|
||||
<td class="text-value">{{ personData["籍贯"] }}</td>
|
||||
<td class="text-key">籍贯地:</td>
|
||||
<td class="text-value">{{ personData["native_place"] }}</td>
|
||||
<td class="text-key">出生地:</td>
|
||||
<td class="text-value">{{ personData["出生地"] }}</td>
|
||||
<td class="text-value">{{ personData["birth_place"] }}</td>
|
||||
<td class="text-key">联系电话:</td>
|
||||
<td class="text-value">{{ personData["联系电话"] }}</td>
|
||||
<td class="text-value">{{ personData["phone_num"] }}</td>
|
||||
<td class="text-key"></td>
|
||||
<td class="text-value"></td>
|
||||
</tr>
|
||||
|
|
@ -40,28 +40,28 @@
|
|||
<div class="info-box">
|
||||
<div>
|
||||
<span class="text-key">最高全日制学历: </span>
|
||||
<span class="text-value">{{ personData.最高全日制学历 }}</span>
|
||||
<span class="text-value">{{ personData.full_education }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="text-key">最高全日制学位: </span>
|
||||
<span class="text-value">{{ personData.最高全日制学位 }}</span>
|
||||
<span class="text-value">{{ personData.full_degree }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="text-key">全日制毕（肄）业学校（单位）名称: </span>
|
||||
<span class="text-value">{{
|
||||
personData["全日制毕（肄）业学校（单位）名称"]
|
||||
personData["full_school"]
|
||||
}}</span>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<span class="text-key">全日制毕（肄）业专业名称: </span>
|
||||
<span class="text-value">{{
|
||||
personData["全日制毕（肄）业专业名称"]
|
||||
personData["full_major"]
|
||||
}}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="text-key">全日制学校所在国家: </span>
|
||||
<span class="text-value">{{ personData.全日制学校所在国家 }}</span>
|
||||
<span class="text-value">{{ personData.full_school_nation }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -69,27 +69,27 @@
|
|||
<div class="info-box">
|
||||
<div>
|
||||
<span class="text-key">最高在职学历: </span>
|
||||
<span class="text-value">{{ personData.最高在职学历 }}</span>
|
||||
<span class="text-value">{{ personData.work_education }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="text-key">最高在职学位: </span>
|
||||
<span class="text-value">{{ personData.最高在职学位 }}</span>
|
||||
<span class="text-value">{{ personData.work_degree }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="text-key">在职毕（肄）业学校（单位）名称: </span>
|
||||
<span class="text-value">{{
|
||||
personData["在职毕（肄）业学校（单位）名称"]
|
||||
personData["work_school"]
|
||||
}}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="text-key">在职毕（肄）业专业名称: </span>
|
||||
<span class="text-value">{{
|
||||
personData["在职毕（肄）业专业名称"]
|
||||
personData["work_major"]
|
||||
}}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="text-key">在职学校所在国家: </span>
|
||||
<span class="text-value">{{ personData.在职学校所在国家 }}</span>
|
||||
<span class="text-value">{{ personData.work_school_nation }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -98,21 +98,21 @@
|
|||
<table class="info-table">
|
||||
<tr>
|
||||
<td class="text-key" style="width: 160px">最高专业技术资格名: </td>
|
||||
<td class="text-value">{{ personData["最高专业技术资格名称"] }}</td>
|
||||
<td class="text-value">{{ personData["professional_skill"] }}</td>
|
||||
<td class="text-key">等级: </td>
|
||||
<td class="text-value">{{ personData["最高专业技术资格等级"] }}</td>
|
||||
<td class="text-value">{{ personData["professional_skill_level"] }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="text-key" style="width: 160px">最高职业技能等级名: </td>
|
||||
<td class="text-value">{{ personData["最高职业技能等级名称"] }}</td>
|
||||
<td class="text-value">{{ personData["vocational_skill"] }}</td>
|
||||
<td class="text-key">级别: </td>
|
||||
<td class="text-value">{{ personData["最高职业技能等级级别"] }}</td>
|
||||
<td class="text-value">{{ personData["vocational_skill_level"] }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<p class="item-title-p">备注</p>
|
||||
<p class="last-p">{{ personData["备注说明"] }}</p>
|
||||
<p class="last-p">{{ personData["remark"] }}</p>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -23,29 +23,29 @@
|
|||
</div>
|
||||
<div class="tag-bar">
|
||||
<span>教育经历</span>
|
||||
<el-tag v-if="personData['全日制毕（肄）业学校（单位）名称']"
|
||||
<el-tag v-if="personData['full_school']"
|
||||
>全日制
|
||||
{{ personData["全日制毕（肄）业学校（单位）名称"] }}</el-tag
|
||||
{{ personData["full_school"] }}</el-tag
|
||||
>
|
||||
<el-tag v-if="personData['全日制毕（肄）业专业名称']"
|
||||
>全日制 {{ personData["全日制毕（肄）业专业名称"] }}</el-tag
|
||||
<el-tag v-if="personData['full_major']"
|
||||
>全日制 {{ personData["full_major"] }}</el-tag
|
||||
>
|
||||
<el-tag v-if="personData['在职毕（肄）业学校（单位）名称']"
|
||||
>在职 {{ personData["在职毕（肄）业学校（单位）名称"] }}</el-tag
|
||||
<el-tag v-if="personData['work_school']"
|
||||
>在职 {{ personData["work_school"] }}</el-tag
|
||||
>
|
||||
<el-tag v-if="personData['在职毕（肄）业专业名称']"
|
||||
>在职 {{ personData["在职毕（肄）业专业名称"] }}</el-tag
|
||||
<el-tag v-if="personData['work_major']"
|
||||
>在职 {{ personData["work_major"] }}</el-tag
|
||||
>
|
||||
</div>
|
||||
<div class="tag-bar">
|
||||
<span>知识技能</span>
|
||||
<el-tag v-if="personData['最高专业技术资格等级']"
|
||||
>{{ personData["最高专业技术资格等级"]
|
||||
}}{{ personData["最高专业技术资格名称"] }}</el-tag
|
||||
<el-tag v-if="personData['professional_skill_level']"
|
||||
>{{ personData["professional_skill_level"]
|
||||
}}{{ personData["professional_skill"] }}</el-tag
|
||||
>
|
||||
<el-tag v-if="personData['最高职业技能等级级别']"
|
||||
>{{ personData["最高职业技能等级级别"]
|
||||
}}{{ personData["最高职业技能等级名称"] }}</el-tag
|
||||
<el-tag v-if="personData['vocational_skill_level']"
|
||||
>{{ personData["vocational_skill_level"]
|
||||
}}{{ personData["vocational_skill"] }}</el-tag
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -230,7 +230,7 @@ export default {
|
|||
};
|
||||
},
|
||||
mounted() {
|
||||
if (!this.personData.hasOwnProperty("姓名")) {
|
||||
if (!this.personData.hasOwnProperty("card_num")) {
|
||||
return;
|
||||
}
|
||||
// 发送词云请求
|
||||
|
|
@ -383,10 +383,10 @@ export default {
|
|||
},
|
||||
computed: {
|
||||
industryExperience() {
|
||||
return this.getAge(this.personData["进入行业时间"]);
|
||||
return this.getAge(this.personData["industry_start_time"]);
|
||||
},
|
||||
jobExperience() {
|
||||
return this.getAge(this.personData["现岗位起始时间"]);
|
||||
return this.getAge(this.personData["job_start_time"]);
|
||||
},
|
||||
activityColumns() {
|
||||
let columns = [
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
<template>
|
||||
<div class="info-body">
|
||||
<div class="info-header">
|
||||
<span v-if="personData.个人职级" class="header-left">
|
||||
<span v-if="personData.level" class="header-left">
|
||||
<span class="text-key">个人职级: </span>
|
||||
<span class="text-value">{{ personData.个人职级 }} </span>
|
||||
<span class="text-value">{{ personData.level }} </span>
|
||||
</span>
|
||||
<span class="header-left">
|
||||
<span class="text-key">用工形式: </span>
|
||||
<span class="text-value">{{ personData.用工形式 }}</span>
|
||||
<span class="text-value">{{ personData.jobform }}</span>
|
||||
</span>
|
||||
<span class="header-right text-value"
|
||||
>{{ personData.人员状态 }}
|
||||
>{{ personData.person_status }}
|
||||
<span
|
||||
class="point"
|
||||
:style="{
|
||||
borderColor: personData.人员状态 == '在职' ? '#09f175' : '#adadad',
|
||||
borderColor: personData.person_status == '在职' ? '#09f175' : '#adadad',
|
||||
}"
|
||||
></span>
|
||||
</span>
|
||||
|
|
@ -24,19 +24,19 @@
|
|||
<div class="info-box">
|
||||
<div>
|
||||
<span class="text-key">机构名称: </span>
|
||||
<span class="text-value">{{ personData.机构名称 }}</span>
|
||||
<span class="text-value">{{ personData.organization }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="text-key">部门名称: </span>
|
||||
<span class="text-value">{{ personData.部门名称 }}</span>
|
||||
<span class="text-value">{{ personData.department }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="text-key">岗位名称: </span>
|
||||
<span class="text-value">{{ personData.岗位名称 }}</span>
|
||||
<span class="text-value">{{ personData.jobname }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="text-key">岗位类别: </span>
|
||||
<span class="text-value">{{ personData.岗位类别 }}</span>
|
||||
<span class="text-value">{{ personData.jobtype }}</span>
|
||||
</div>
|
||||
<!-- <div>
|
||||
<span class="text-key">现岗位起始时间: </span>
|
||||
|
|
@ -45,26 +45,26 @@
|
|||
</div>
|
||||
|
||||
<p class="item-title-p">职务信息</p>
|
||||
<div class="info-box" v-if="personData.任职单位">
|
||||
<div class="info-box" v-if="personData.company">
|
||||
<div>
|
||||
<span class="text-key">任职单位: </span>
|
||||
<span class="text-value">{{ personData.任职单位 }}</span>
|
||||
<span class="text-value">{{ personData.company }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="text-key">职务名称: </span>
|
||||
<span class="text-value">{{ personData.职务名称 }}</span>
|
||||
<span class="text-value">{{ personData.dutyname }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="text-key">职务属性: </span>
|
||||
<span class="text-value">{{ personData.职务属性 }}</span>
|
||||
<span class="text-value">{{ personData.attribute }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="text-key">职务级别: </span>
|
||||
<span class="text-value">{{ personData.职务级别 }}</span>
|
||||
<span class="text-value">{{ personData.dutylevel }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="text-key">任现职务级别时间: </span>
|
||||
<span class="text-value">{{ personData.任现职务级别时间 }}</span>
|
||||
<span class="text-value">{{ personData.duty_level_start_time }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -73,31 +73,31 @@
|
|||
<table class="info-table">
|
||||
<tr>
|
||||
<td class="text-key">参加工作时间:</td>
|
||||
<td class="text-value">{{ personData.参加工作时间 }}</td>
|
||||
<td class="text-value">{{ personData.work_start_time }}</td>
|
||||
<td class="text-key">预计退休年龄:</td>
|
||||
<td class="text-value">{{ personData.预计退休年龄 }}</td>
|
||||
<td class="text-value">{{ personData.retire_age }}</td>
|
||||
<td class="text-key">工龄:</td>
|
||||
<td class="text-value">{{ workAge }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="text-key">进入行业时间:</td>
|
||||
<td class="text-value">{{ personData.进入行业时间 }}</td>
|
||||
<td class="text-value">{{ personData.industry_start_time }}</td>
|
||||
<td class="text-key">行业入职类别:</td>
|
||||
<td class="text-value">{{ personData.行业入职类别 }}</td>
|
||||
<td class="text-key"></td>
|
||||
<td class="text-value"></td>
|
||||
<td class="text-value">{{ personData.industry_entry }}</td>
|
||||
<td class="text-key">行龄:</td>
|
||||
<td class="text-value">{{ industryAge }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="text-key">到本单位时间:</td>
|
||||
<td class="text-value">{{ personData.到本单位时间 }}</td>
|
||||
<td class="text-value">{{ personData.company_start_time }}</td>
|
||||
<td class="text-key">本单位入职类别:</td>
|
||||
<td class="text-value">{{ personData.本单位入职类别 }}</td>
|
||||
<td class="text-value">{{ personData.company_entry }}</td>
|
||||
<td class="text-key">厂龄:</td>
|
||||
<td class="text-value">{{ factoryAge }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="text-key">任现岗位时间:</td>
|
||||
<td class="text-value">{{ personData.现岗位起始时间 }}</td>
|
||||
<td class="text-value">{{ personData.job_start_time }}</td>
|
||||
<td class="text-key"></td>
|
||||
<td class="text-value"></td>
|
||||
<td class="text-key">岗龄:</td>
|
||||
|
|
@ -105,7 +105,7 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td class="text-key">档案保管机构:</td>
|
||||
<td class="text-value">{{ personData.档案保管机构 }}</td>
|
||||
<td class="text-value">{{ personData.file }}</td>
|
||||
<td class="text-key"></td>
|
||||
<td class="text-value"></td>
|
||||
<td class="text-key"></td>
|
||||
|
|
@ -128,13 +128,16 @@ export default {
|
|||
},
|
||||
computed: {
|
||||
workAge: function () {
|
||||
return this.getAge(this.personData.参加工作时间);
|
||||
return this.getAge(this.personData.work_start_time);
|
||||
},
|
||||
industryAge: function () {
|
||||
return this.getAge(this.personData.industry_start_time);
|
||||
},
|
||||
factoryAge: function () {
|
||||
return this.getAge(this.personData.到本单位时间);
|
||||
return this.getAge(this.personData.company_start_time);
|
||||
},
|
||||
jobAge: function () {
|
||||
return this.getAge(this.personData.现岗位起始时间);
|
||||
return this.getAge(this.personData.job_start_time);
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
|
|
|
|||
|
|
@ -10,19 +10,19 @@
|
|||
</div>
|
||||
<div class="basic-msg-box">
|
||||
<p>
|
||||
<span class="basic-msg-item">{{ personData["姓名"] }}</span>
|
||||
<span class="basic-msg-item">{{ personData.name }}</span>
|
||||
</p>
|
||||
<p>
|
||||
<span class="basic-msg-item">{{ personData["性别"] }}</span>
|
||||
<span class="basic-msg-item">{{ personData.sex }}</span>
|
||||
<span class="basic-msg-item">{{ personAge }}岁</span>
|
||||
<span class="basic-msg-item">{{ personEd }}</span>
|
||||
<span class="basic-msg-item">{{ personData["政治面貌"] }}</span>
|
||||
<span class="basic-msg-item">{{ personData["politics"] }}</span>
|
||||
</p>
|
||||
<p>
|
||||
<span class="basic-msg-item">{{ personData["部门名称"] }}</span>
|
||||
<span class="basic-msg-item">{{ personData["岗位名称"] }}</span>
|
||||
<span class="basic-msg-item">{{ personData["department"] }}</span>
|
||||
<span class="basic-msg-item">{{ personData["jobname"] }}</span>
|
||||
<span class="basic-msg-item"
|
||||
>手机号：{{ personData["联系电话"] }}</span
|
||||
>手机号：{{ personData["phone_num"] }}</span
|
||||
>
|
||||
</p>
|
||||
</div>
|
||||
|
|
@ -33,7 +33,11 @@
|
|||
<el-tab-pane label="个人信息" name="ComPersonInformation"></el-tab-pane>
|
||||
<el-tab-pane label="人事变动记录" name="ComChange"></el-tab-pane>
|
||||
</el-tabs>
|
||||
<component :is="comName" :data="personData" :key="personData['证件号码']"></component>
|
||||
<component
|
||||
:is="comName"
|
||||
:data="personData"
|
||||
:key="personData['card_num']"
|
||||
></component>
|
||||
</el-container>
|
||||
</template>
|
||||
|
||||
|
|
@ -57,35 +61,38 @@ export default {
|
|||
return {
|
||||
comName: "ComPersonPicture",
|
||||
personData: {},
|
||||
avatarUrl: require("@/assets/images/女.png")
|
||||
avatarUrl: null,
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
// 发送获取基本信息请求
|
||||
personApi.getPersonData({
|
||||
"id_card": this.$store.state.user.id_card
|
||||
}).then(
|
||||
personApi
|
||||
.selectBasicInfo({
|
||||
id_card: this.$store.state.user.id_card,
|
||||
})
|
||||
.then(
|
||||
(res) => {
|
||||
this.personData = res.data;
|
||||
this.avatarUrl = require("@/assets/images/" + this.personData["性别"] + ".png");
|
||||
console.log(this.personData);
|
||||
this.avatarUrl = require("@/assets/images/" +
|
||||
this.personData["sex"] +
|
||||
".png");
|
||||
},
|
||||
(err) => {
|
||||
console.log('err:', err);
|
||||
console.log("err:", err);
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
);
|
||||
},
|
||||
computed: {
|
||||
personAge() {
|
||||
return this.getAge(this.personData["出生日期"]);
|
||||
return this.getAge(this.personData["birth_time"]);
|
||||
},
|
||||
personEd() {
|
||||
let education = "-";
|
||||
if (this.personData["最高在职学历"]) {
|
||||
education = this.personData["最高在职学历"];
|
||||
} else if (this.personData["最高全日制学历"]) {
|
||||
education = this.personData["最高全日制学历"];
|
||||
if (this.personData["work_education"]) {
|
||||
education = this.personData["work_education"];
|
||||
} else if (this.personData["full_education"]) {
|
||||
education = this.personData["full_education"];
|
||||
}
|
||||
return education;
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue