Commit 61d0692d by golton_gao

Merge branches 'master' and 'master' of http://git.xmmakeit.com/gaodongd/jf-yzj-resume

parents 61d06f96 463d1e78
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=0"> <meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
<title>简历</title> <title>简历</title>
<script src="miniapp://common/js/qing/qing.js"></script> <script src="miniapp://common/js/qing/qing.js"></script>
<!-- <script src="https://staging.jffctest.com/public/js/qing/latest/qing.js"></script>-->
</head> </head>
<body> <body>
<div class="header"> <div class="header">
......
import cube from '../../CubeModule.json'; import cube from '../../CubeModule.json';
const RENDER_TYPE = { const RENDER_TYPE = {
A: Symbol('A'), A: Symbol('A'),
B: Symbol('B'), B: Symbol('B'),
C: Symbol('C'), C: Symbol('C'),
D: Symbol('D'), D: Symbol('D'),
E: Symbol('E'), E: Symbol('E'),
F: Symbol('F'), F: Symbol('F'),
G: Symbol('G'), G: Symbol('G'),
H: Symbol('H'), H: Symbol('H'),
}; };
let config = { let config = {
identifier: cube.identifier, identifier: cube.identifier,
ssoTokenPlaceholder: '___mideatoken___', ssoTokenPlaceholder: '___mideatoken___',
uidPlaceholder: '___uid___', uidPlaceholder: '___uid___',
isMock: false, isMock: false,
mockPath: 'json/', mockPath: 'json/',
code: 'cnd-hr-res', code: 'cnd-hr-res',
yjyCode: 'yjy-hr-res', yjyCode: 'yjy-hr-res',
hjCode: 'hj-hr-res', hjCode: 'hj-hr-res',
wyCode: 'cnd-wyhr-base', wyCode: 'cnd-wyhr-base',
methods: { hcCode: 'cnd-hc-res',
resume: '/hrInterface/resumeBaseV.do?', methods: {
yjyResume: '', resume: '/hrInterface/resumeBaseV.do?',
hjResume: '', yjyResume: '',
wyResume: '/hrInterface/resumeBaseV.do', hjResume: '',
photo: 'imm-api/api/emp/getExtInfo', wyResume: '/hrInterface/resumeBaseV.do',
hcResume: '/hrInterface/resumeBaseV.do',//合诚
photo: 'imm-api/api/emp/getExtInfo',
},
renderType: RENDER_TYPE,
renderItem: {
resumeBaseVo: {
name: '基本信息',
type: RENDER_TYPE.A,
img: 'base',
list: {
gender: '性别',
birthday: '出生年月',
fnative: '籍贯',
marriage: '婚姻状况',
political: '政治面貌',
partyAccessionDate: '党(团)派加入时间',
highesttitle: '最高职称',
highestedu: '最高学历',
highdegree: '最高学位',
jobtime: '参加工作时间',
worktime: '入司时间',
idcardno: '身份证(护照)',
},
},
jobVoList: {
name: '当前任职',
type: RENDER_TYPE.B,
img: 'job',
list: {
title: 'depart',
subTitle: ['job'],
note: ['jobstarttime', 'jobendtime'],
},
},
jobHistoryVoList: {
name: '历史任职',
type: RENDER_TYPE.B,
img: 'jobhistory',
list: {
title: 'depart',
subTitle: ['job'],
note: ['jobstarttime', 'jobendtime'],
},
},
//旧版
assessVoList: {
name: '绩效考核',
type: RENDER_TYPE.D,
img: 'assess',
list: {
title: 'assyear',
note: 'assgrade',
},
},
// 新版
// assessVoList: {
// name: '员工绩效',
// type: RENDER_TYPE.D,
// img: 'reward',
// list: {
// // 物业
// title: 'assyear',
// note: 'assgrade',
// // 房产
// yearShow: 'yearShow',
// performance: 'performance',
// appraise: 'appraise',
// award: 'award',
// punish: 'punish',
// },
// },
workVoList: {
name: '工作经历',
type: RENDER_TYPE.B,
img: 'work',
list: {
title: 'company',
subTitle: ['job'],
note: ['jobstarttime', 'jobendtime'],
},
},
eduVoList: {
name: '教育经历',
type: RENDER_TYPE.C,
img: 'edu',
list: {
title: 'school',
subTitle: ['major', 'educational', 'degree'],
note: 'graduationtime',
},
},
familyVoList: {
name: '社会关系',
type: RENDER_TYPE.E,
img: 'family',
list: {
title: 'name',
title1: 'relation',
title2: 'phone',
subTitle: ['political', 'birthday', 'workUnit'],
subTitleName: ['政治面貌', '出生日期', '工作单位'],
},
}, },
renderType: RENDER_TYPE,
renderItem: {
resumeBaseVo: {
name: '基本信息',
type: RENDER_TYPE.A,
img: 'base',
list: {
gender: '性别',
birthday: '出生年月',
fnative: '籍贯',
marriage: '婚姻状况',
political: '政治面貌',
partyAccessionDate: '党(团)派加入时间',
highesttitle: '最高职称',
highestedu: '最高学历',
highdegree: '最高学位',
jobtime: '参加工作时间',
worktime: '入司时间',
idcardno: '身份证(护照)',
},
},
jobVoList: {
name: '当前任职',
type: RENDER_TYPE.B,
img: 'job',
list: {
title: 'depart',
subTitle: ['job'],
note: ['jobstarttime', 'jobendtime'],
},
},
jobHistoryVoList: {
name: '历史任职',
type: RENDER_TYPE.B,
img: 'jobhistory',
list: {
title: 'depart',
subTitle: ['job'],
note: ['jobstarttime', 'jobendtime'],
},
},
// assessVoList: {
// name: '绩效考核',
// type: RENDER_TYPE.D,
// img: 'assess',
// list: {
// title: 'assyear',
// note: 'assgrade',
// },
// },
workVoList: {
name: '工作经历',
type: RENDER_TYPE.B,
img: 'work',
list: {
title: 'company',
subTitle: ['job'],
note: ['jobstarttime', 'jobendtime'],
},
},
eduVoList: {
name: '教育经历',
type: RENDER_TYPE.C,
img: 'edu',
list: {
title: 'school',
subTitle: ['major', 'educational', 'degree'],
note: 'graduationtime',
},
},
familyVoList: {
name: '社会关系',
type: RENDER_TYPE.E,
img: 'family',
list: {
title: 'name',
title1: 'relation',
title2: 'phone',
subTitle: ['political', 'birthday', 'workUnit'],
subTitleName: ['政治面貌', '出生日期', '工作单位'],
},
},
assessVoList: {
name: '员工绩效',
type: RENDER_TYPE.D,
img: 'reward',
list: {
// 物业
title: 'assyear',
note: 'assgrade',
// 房产
yearShow: 'yearShow',
performance: 'performance',
appraise: 'appraise',
award: 'award',
punish: 'punish',
},
},
rewardPunishVoList: {
name: '奖惩信息',
type: RENDER_TYPE.F,
img: 'reward',
list: {
title: 'content',
title1: 'type',
subTitle: 'company',
subTitle1: 'year',
},
},
rewardPunishVoList: {
name: '奖惩信息',
type: RENDER_TYPE.F,
img: 'reward',
list: {
title: 'content',
title1: 'type',
subTitle: 'company',
subTitle1: 'year',
},
}, },
},
}; };
export default config; export default config;
...@@ -65,6 +65,7 @@ const app = { ...@@ -65,6 +65,7 @@ const app = {
* @returns {Promise} * @returns {Promise}
*/ */
getUser () { getUser () {
console.log('getUser---');
return app.callApi(MODULE_NAMES.MIDEA_USER, 'getUser') return app.callApi(MODULE_NAMES.MIDEA_USER, 'getUser')
}, },
/** /**
......
...@@ -65,6 +65,7 @@ export default class MAS { ...@@ -65,6 +65,7 @@ export default class MAS {
* @memberof MAS * @memberof MAS
*/ */
getData(url, params, options = {}) { getData(url, params, options = {}) {
console.log('getData');
let method = (options && options.method) || this.method || 'get'; let method = (options && options.method) || this.method || 'get';
// let baseUrl = (options && options.baseUrl) || this.baseUrl; // let baseUrl = (options && options.baseUrl) || this.baseUrl;
return axios({ return axios({
......
...@@ -33,7 +33,7 @@ window.customEvt = { ...@@ -33,7 +33,7 @@ window.customEvt = {
var customEvt = window.customEvt var customEvt = window.customEvt
var qing = window.qing var qing = window.qing
console.log('qing---1');
qing.ready(function () { qing.ready(function () {
// 重写左侧返回按钮 // 重写左侧返回按钮
qing.call('defback', { qing.call('defback', {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment