Skip to content

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

Go to a project
Commit b333714c by zhongqm
Options

update：绩效应显示旧版的

parent 345c915e
Inline Side-by-side
Showing with 79 additions and 56 deletions
index.html
......@@ -5,6 +5,7 @@
<meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
<title>简历</title>
<script src="miniapp://common/js/qing/qing.js"></script>
<!-- <script src="https://staging.jffctest.com/public/js/qing/latest/qing.js"></script>-->
</head>
<body>
<div class="header">
......
src/config/common.js
......@@ -20,12 +20,15 @@ let config = {
yjyCode: 'yjy-hr-res',
hjCode: 'hj-hr-res',
wyCode: 'cnd-wyhr-base',
hcCode: 'cnd-hc-res',
methods: {
resume: '/hrInterface/resumeBaseV.do?',
yjyResume: '',
hjResume: '',
wyResume: '/hrInterface/resumeBaseV.do',
hcResume: '/hrInterface/resumeBaseV.do',//合诚
photo: 'imm-api/api/emp/getExtInfo',
},
renderType: RENDER_TYPE,
renderItem: {
......@@ -68,13 +71,31 @@ let config = {
note: ['jobstarttime', 'jobendtime'],
},
},
//旧版
assessVoList: {
name: '绩效考核',
type: RENDER_TYPE.D,
img: 'assess',
list: {
title: 'assyear',
note: 'assgrade',
},
},
// 新版
// assessVoList: {
// name: '绩效考核',
// name: '员工绩效',
// type: RENDER_TYPE.D,
// img: 'assess',
// img: 'reward',
// list: {
// // 物业
// title: 'assyear',
// note: 'assgrade',
// // 房产
// yearShow: 'yearShow',
// performance: 'performance',
// appraise: 'appraise',
// award: 'award',
// punish: 'punish',
// },
// },
workVoList: {
......@@ -109,22 +130,7 @@ let config = {
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,
......
src/config/test.js
......@@ -10,15 +10,15 @@ import common from './common';
// baseUrl: 'https://mxytest.cndrealty.com:4433/',
// };
// const config = {
// product: false,
// ssoToken: 'token',
// userid: '46000011',
// appKey: 'd504275e',
// uid: 'hqhuang@cndrealty.com',
// token: 'T4769446611354624',
// baseUrl: 'https://mxytest.cndrealty.com:4433/',
// };
const config = {
product: false,
ssoToken: 'token',
userid: '46000011',
appKey: 'd504275e',
uid: 'hqhuang@cndrealty.com',
token: 'T5540702202299392',
baseUrl: 'https://mxytest.cndrealty.com:4433/',
};
// const config = {
// product: false,
......@@ -39,14 +39,14 @@ import common from './common';
// token: 'T4777933018317824',
// baseUrl: 'https://mxytest.cndrealty.com:4433/',
// };
const config = {
product: false,
ssoToken: 'token',
userid: '10001285',
appkey: 'd504275e',
uid: 'xycao@cndrealty.com',
token: 'T4777979921957888',
baseUrl: 'https://mxytest.cndrealty.com:4433/',
};
// const config = {
// product: false,
// ssoToken: 'token',
// userid: '10001285',
// appkey: 'd504275e',
// uid: 'xycao@cndrealty.com',
// token: 'T4777979921957888',
// baseUrl: 'https://mxytest.cndrealty.com:4433/',
// };
export default Object.assign(config, common);
src/js/index.js
......@@ -53,6 +53,7 @@ app.ready(() => {
}, configuration.product);
function initUser() {
// return Promise.all([app.getUser(), app.getExtra(configuration.identifier)])
return app.getUser()
.then((user) => {
......@@ -104,6 +105,14 @@ function initUser() {
});
url = configuration.methods.wyResume;
break;
// 合诚
case 7:
$mas.config({
baseUrl: configuration.baseUrl,
code: configuration.hcCode,
});
url = configuration.methods.hcResume;
break;
default:
// alert('权限不足，无法查看简历');
// app.exit();
......@@ -319,24 +328,26 @@ function render(data) {
// showToast('房开人员');
for (let r in RENDER_ITEM) {
if (data[r]) {
let dataArr = data[r];
if (r == 'assessVoList') {
dataArr = {
// 绩效
assessVoList: data['assessVoList'],
// 评优
rewardPunishVoList: data['rewardPunishVoList'],
// 奖励/处罚
specialtyRewadVoList: data['specialtyRewadVoList'],
// 营销小红花
sakeredFlowerVoList: data['sakeredFlowerVoList']
}
}
// let dataArr = filter(r, data[r]);
// if (!dataArr) {
// continue;
//新版绩效
// let dataArr = data[r];
// if (r == 'assessVoList') {
// dataArr = {
// // 绩效
// assessVoList: data['assessVoList'],
// // 评优
// rewardPunishVoList: data['rewardPunishVoList'],
// // 奖励/处罚
// specialtyRewadVoList: data['specialtyRewadVoList'],
// // 营销小红花
// sakeredFlowerVoList: data['sakeredFlowerVoList']
// }
// }
// console.log(222222,dataArr,r)
//旧版绩效
console.log('data[r]',data[r])
let dataArr = filter(r, data[r]);
if (!dataArr) {
continue;
}
renderer(RENDER_ITEM[r], dataArr);
}
}
......@@ -352,6 +363,7 @@ function render(data) {
function renderer(renderTemp, data) {
let type = renderTemp.type;
// console.log('type',type)
console.log('renderer>>',{renderTemp, data});
container.appendChild(headerRenderer(renderTemp));
switch (type) {
case RENDER_TYPE.A:
......@@ -364,8 +376,8 @@ function renderer(renderTemp, data) {
container.appendChild(listCRenderer(renderTemp.list, data));
break;
case RENDER_TYPE.D:
// container.appendChild(listDRenderer(renderTemp.list, data));
container.appendChild(listJXRenderer(renderTemp.list, data));
container.appendChild(listDRenderer(renderTemp.list, data));//旧版绩效
// container.appendChild(listJXRenderer(renderTemp.list, data));//新版绩效
break;
case RENDER_TYPE.E:
container.appendChild(listERenderer(renderTemp.list, data));
......@@ -2402,4 +2414,6 @@ function createIScroller() {
}
// return scroller;
console.log('xxxxx');
}
src/js/lib/app.js
......@@ -65,6 +65,7 @@ const app = {
* @returns {Promise}
*/
getUser () {
console.log('getUser---');
return app.callApi(MODULE_NAMES.MIDEA_USER, 'getUser')
},
/**
......
src/js/lib/mas.js
......@@ -65,6 +65,7 @@ export default class MAS {
* @memberof MAS
*/
getData(url, params, options = {}) {
console.log('getData');
let method = (options && options.method) || this.method || 'get';
// let baseUrl = (options && options.baseUrl) || this.baseUrl;
return axios({
......
src/js/polyfill/index.js
......@@ -33,7 +33,7 @@ window.customEvt = {
var customEvt = window.customEvt
var qing = window.qing
console.log('qing---1');
qing.ready(function () {
// 重写左侧返回按钮
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