Skip to content

高东东-金蝶建发 / jf-yzj-resume

Go to a project
Commit 61d0692d by golton_gao
Options

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

parents 61d06f96 463d1e78
Expand all
Inline Side-by-side
Showing with 28 additions and 19 deletions
index.html
...@@ -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">
......
src/config/common.js
...@@ -20,12 +20,15 @@ let config = { ...@@ -20,12 +20,15 @@ let config = {
yjyCode: 'yjy-hr-res', yjyCode: 'yjy-hr-res',
hjCode: 'hj-hr-res', hjCode: 'hj-hr-res',
wyCode: 'cnd-wyhr-base', wyCode: 'cnd-wyhr-base',
hcCode: 'cnd-hc-res',
methods: { methods: {
resume: '/hrInterface/resumeBaseV.do?', resume: '/hrInterface/resumeBaseV.do?',
yjyResume: '', yjyResume: '',
hjResume: '', hjResume: '',
wyResume: '/hrInterface/resumeBaseV.do', wyResume: '/hrInterface/resumeBaseV.do',
hcResume: '/hrInterface/resumeBaseV.do',//合诚
photo: 'imm-api/api/emp/getExtInfo', photo: 'imm-api/api/emp/getExtInfo',
}, },
renderType: RENDER_TYPE, renderType: RENDER_TYPE,
renderItem: { renderItem: {
...@@ -68,13 +71,31 @@ let config = { ...@@ -68,13 +71,31 @@ let config = {
note: ['jobstarttime', 'jobendtime'], note: ['jobstarttime', 'jobendtime'],
}, },
}, },
//旧版
assessVoList: {
name: '绩效考核',
type: RENDER_TYPE.D,
img: 'assess',
list: {
title: 'assyear',
note: 'assgrade',
},
},
// 新版
// assessVoList: { // assessVoList: {
// name: '绩效考核', // name: '员工绩效',
// type: RENDER_TYPE.D, // type: RENDER_TYPE.D,
// img: 'assess', // img: 'reward',
// list: { // list: {
// // 物业
// title: 'assyear', // title: 'assyear',
// note: 'assgrade', // note: 'assgrade',
// // 房产
// yearShow: 'yearShow',
// performance: 'performance',
// appraise: 'appraise',
// award: 'award',
// punish: 'punish',
// }, // },
// }, // },
workVoList: { workVoList: {
...@@ -109,22 +130,7 @@ let config = { ...@@ -109,22 +130,7 @@ let config = {
subTitleName: ['政治面貌', '出生日期', '工作单位'], 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: { rewardPunishVoList: {
name: '奖惩信息', name: '奖惩信息',
type: RENDER_TYPE.F, type: RENDER_TYPE.F,
......
src/js/lib/app.js
...@@ -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')
}, },
/** /**
......
src/js/lib/mas.js
...@@ -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({
......
src/js/polyfill/index.js
...@@ -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