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
Inline Side-by-side
Showing with 215 additions and 77 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/index.js
...@@ -171,6 +171,14 @@ function initUser() { ...@@ -171,6 +171,14 @@ function initUser() {
}); });
url = configuration.methods.wyResume; url = configuration.methods.wyResume;
break; break;
// 合诚
case 7:
$mas.config({
baseUrl: configuration.baseUrl,
code: configuration.hcCode,
});
url = configuration.methods.hcResume;
break;
default: default:
// alert('权限不足，无法查看简历'); // alert('权限不足，无法查看简历');
// app.exit(); // app.exit();
...@@ -249,11 +257,12 @@ function mount() { ...@@ -249,11 +257,12 @@ function mount() {
.then(({ .then(({
data data
}) => { }) => {
console.log(555, data) console.log('restful>>',url, data)
render(data); render(data);
return data; return data;
}) })
.catch(e => {}); .catch(e => {});
// 获取头像
$mas.getData(configuration.baseUrl + configuration.methods.photo, { $mas.getData(configuration.baseUrl + configuration.methods.photo, {
uid: _uid, uid: _uid,
appKey, appKey,
...@@ -366,6 +375,7 @@ function render(data) { ...@@ -366,6 +375,7 @@ function render(data) {
} }
} }
break; break;
case '3': case '3':
var RENDER_ITEM = { var RENDER_ITEM = {
// 基础信息 // 基础信息
...@@ -382,31 +392,47 @@ function render(data) { ...@@ -382,31 +392,47 @@ function render(data) {
familyVoList: configuration.renderItem.familyVoList, familyVoList: configuration.renderItem.familyVoList,
// 绩效信息 // 绩效信息
assessVoList: configuration.renderItem.assessVoList, assessVoList: configuration.renderItem.assessVoList,
//奖惩
rewardPunishVoList: configuration.renderItem.rewardPunishVoList,
}; };
// showToast('房开人员'); console.log('房开人员',RENDER_ITEM)
// // showToast('房开人员');
for (let r in RENDER_ITEM) { for (let r in RENDER_ITEM) {
if (data[r]) { if (data[r]) {
let dataArr = data[r]; //新版绩效
if (r == 'assessVoList') { // let dataArr = data[r];
dataArr = { // if (r == 'assessVoList') {
// 绩效 // dataArr = {
assessVoList: data['assessVoList'], // // 绩效
// 评优 // assessVoList: data['assessVoList'],
rewardPunishVoList: data['rewardPunishVoList'], // // 评优
// 奖励/处罚 // rewardPunishVoList: data['rewardPunishVoList'],
specialtyRewadVoList: data['specialtyRewadVoList'], // // 奖励/处罚
// 营销小红花 // specialtyRewadVoList: data['specialtyRewadVoList'],
sakeredFlowerVoList: data['sakeredFlowerVoList'] // // 营销小红花
// sakeredFlowerVoList: data['sakeredFlowerVoList']
// }
// }
//旧版绩效
console.log('data[r]',data[r])
let dataArr = filter(r, data[r]);
if (!dataArr) {
continue;
}
renderer(RENDER_ITEM[r], dataArr);
} }
} }
// for (let r in RENDER_ITEM) {
// if (data[r]) {
// let dataArr = filter(r, data[r]); // let dataArr = filter(r, data[r]);
// if (!dataArr) { // if (!dataArr) {
// continue; // continue;
// } // }
// console.log(222222,dataArr,r) // // propertyRenderer(RENDER_ITEM[r], dataArr);
renderer(RENDER_ITEM[r], dataArr); // // renderer(RENDER_ITEM[r], dataArr);
} // }
} // }
break; break;
default: default:
showToast(`#jobGradeType = ${jobGradeType}; 不明人员`); showToast(`#jobGradeType = ${jobGradeType}; 不明人员`);
...@@ -418,7 +444,6 @@ function render(data) { ...@@ -418,7 +444,6 @@ function render(data) {
function renderer(renderTemp, data) { function renderer(renderTemp, data) {
let type = renderTemp.type; let type = renderTemp.type;
// console.log('type',type)
container.appendChild(headerRenderer(renderTemp)); container.appendChild(headerRenderer(renderTemp));
switch (type) { switch (type) {
case RENDER_TYPE.A: case RENDER_TYPE.A:
...@@ -428,18 +453,20 @@ function renderer(renderTemp, data) { ...@@ -428,18 +453,20 @@ function renderer(renderTemp, data) {
container.appendChild(listBRenderer(renderTemp.list, data)); container.appendChild(listBRenderer(renderTemp.list, data));
break; break;
case RENDER_TYPE.C: case RENDER_TYPE.C:
container.appendChild(listCRenderer(renderTemp.list, data)); container.appendChild(listCRenderer(renderTemp.list, data));
break; break;
case RENDER_TYPE.D: 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; break;
case RENDER_TYPE.E: case RENDER_TYPE.E:
container.appendChild(listERenderer(renderTemp.list, data)); container.appendChild(listERenderer(renderTemp.list, data));
break; break;
// case RENDER_TYPE.F: case RENDER_TYPE.F:
// container.appendChild(listFRenderer(renderTemp.list, data)); container.appendChild(listFRenderer(renderTemp.list, data));
// break; break;
} }
...@@ -608,6 +635,7 @@ function listBRenderer(list, data) { ...@@ -608,6 +635,7 @@ function listBRenderer(list, data) {
} }
function listCRenderer(list, data) { function listCRenderer(list, data) {
let temp = ``; let temp = ``;
if (data && data.length) { if (data && data.length) {
data.forEach((item, index) => { data.forEach((item, index) => {
...@@ -1960,47 +1988,85 @@ function listenerChange(target, clickNode, i) { ...@@ -1960,47 +1988,85 @@ function listenerChange(target, clickNode, i) {
} }
function listDRenderer(list, data) { function listDRenderer(list, data) {
console.log(111, data) console.log('绩效', {list,data})
//旧版绩效
let temp = ``; let temp = ``;
if (data && data.length) { if (data && data.length) {
data.forEach((item, index) => { data.forEach((item, index) => {
temp += let sub = '';
`<div> let note = list.note;
<div class="frist-row flex-between"> // console.log('propertyListDRenderer',list);
<div class="flex-row"> if (list.subTitle) {
${item.children.length>0? `<div class="icon_img ${index==0?'icon_02_img':'icon_01_img'}"></div>`:''} list.subTitle.forEach((s, i) => {
<div>${item.assyear}</div> sub += (i && '|') || '';
</div> sub += item[s] || '无';
<div>${item.assgrade}</div> });
</div>` }
temp += `<div class="second-box ${index==0?'box-block':'box-none'}">` if (note instanceof Object && note.length) {
item.children && item.children.forEach((item1) => { let t1 = data[index][list.note[0]];
temp += let t2 = data[index][list.note[1]];
`<div class="second-row flex-between"> temp += itemRenderer(
<div class="flex-start"> `${
<div class="title-text">${item1.asstype}</div> item[list.title]
</div> }<p class="item__content-sub-title">${sub}</p>`,
<div>${item1.assgrade}</div> `<span class="item__content-note">${t1}至${nowOrNot(
</div>` t2
// item1.children&&item1.children.forEach((item2)=>{ )}</span>`
// temp += );
// `<div class="third-row flex-between"> } else {
// <div class="flex-start"> temp += itemRenderer(
// <div class="title-text"><span class="dot-icon">·</span>${item2[list.title]}</div> `${item[list.title]}年`,
// </div> `<span class="item__content-note">${item[note]}</span>`
// <div>${item2[list.note]}</div> );
// </div>` }
// })
})
temp += `</div>`
temp += `</div>`
}); });
} else { } else {
temp = noDataRenderer(); temp = noDataRenderer();
} }
console.log(646)
return renderWrap(temp, data.length > 3); return renderWrap(temp, data.length > 3);
// 新版
// let temp = ``;
// if (data && data.length) {
// data.forEach((item, index) => {
// temp +=
// `<div>
// <div class="frist-row flex-between">
// <div class="flex-row">
// ${item.children.length>0? `<div class="icon_img ${index==0?'icon_02_img':'icon_01_img'}"></div>`:''}
// <div>${item.assyear}</div>
// </div>
// <div>${item.assgrade}</div>
// </div>`
// temp += `<div class="second-box ${index==0?'box-block':'box-none'}">`
// item.children && item.children.forEach((item1) => {
// temp +=
// `<div class="second-row flex-between">
// <div class="flex-start">
// <div class="title-text">${item1.asstype}</div>
// </div>
// <div>${item1.assgrade}</div>
// </div>`
// // item1.children&&item1.children.forEach((item2)=>{
// // temp +=
// // `<div class="third-row flex-between">
// // <div class="flex-start">
// // <div class="title-text"><span class="dot-icon">·</span>${item2[list.title]}</div>
// // </div>
// // <div>${item2[list.note]}</div>
// // </div>`
// // })
// })
// temp += `</div>`
// temp += `</div>`
//
// });
// } else {
// temp = noDataRenderer();
// }
//
// return renderWrap(temp, data.length > 3);
} }
// 物业 // 物业
...@@ -2122,12 +2188,13 @@ function propertyListCRenderer(list, data) { ...@@ -2122,12 +2188,13 @@ function propertyListCRenderer(list, data) {
} }
function propertyListDRenderer(list, data) { function propertyListDRenderer(list, data) {
// console.log('奇怪的',data,list)
let temp = ``; let temp = ``;
if (data && data.length) { if (data && data.length) {
data.forEach((item, index) => { data.forEach((item, index) => {
let sub = ''; let sub = '';
let note = list.note; let note = list.note;
// console.log(list); // console.log('propertyListDRenderer',list);
if (list.subTitle) { if (list.subTitle) {
list.subTitle.forEach((s, i) => { list.subTitle.forEach((s, i) => {
sub += (i && '|') || ''; sub += (i && '|') || '';
...@@ -2305,7 +2372,26 @@ function getDateFormat(date) { ...@@ -2305,7 +2372,26 @@ function getDateFormat(date) {
// let month = now.getMonth(); // 得到月份 // let month = now.getMonth(); // 得到月份
// let date = now.getDate(); // 得到日期 // let date = now.getDate(); // 得到日期
} }
//新版
// function filter(item, data) {
// let assessData = data;
// // 处理绩效异常
// if (item === 'assessVoList') {
// if (data.length === 0) {
// assessData = '';
// } else {
// for (let i = 0; i < assessData.length; i++) {
// if (!assessData[i].assgrade) {
// assessData = '';
// break;
// }
// }
// }
// }
// return assessData;
// }
//旧版
function filter(item, data) { function filter(item, data) {
let assessData = data; let assessData = data;
// 处理绩效异常 // 处理绩效异常
...@@ -2319,8 +2405,51 @@ function filter(item, data) { ...@@ -2319,8 +2405,51 @@ function filter(item, data) {
break; break;
} }
} }
let templist=[]
let sumList=[]
for (let i = 0; i < data.length; i++) {
const index = templist.indexOf(data[i].assyear)
let _assyear = data[i].asstype
// if(data[i].asstype==="半年度"){
// if(data[i].assendtime.substring(5,10)==="06-30"){
// _assyear='上半年度'
// }
// } else if(data[i].asstype==="月度"){
// if(data[i].assendtime.substring(5,10)==="01-31"){
// _assyear='1月'
// }
// } else if(data[i].asstype==="季度"){
// if(data[i].assendtime.substring(5,10)==="03-31"){
// _assyear='第一季度'
// }
// }
// if (index < 0) { //不存在
// templist.push(data[i].assyear)
// if(data[i].asstype==="年度"){
// sumList.push({ assyear: data[i].assyear,assgrade:data[i].assgrade, children: [] })
// }else {
// sumList.push({ assyear: _assyear,assgrade:data[i].assgrade, children: [{...data[i],asstype: _assyear}] })
//
// }
//
// } else {
// if(data[i].asstype==="年度"){
// sumList[index].assgrade=data[i].assgrade
// sumList[index].assyear=data[i].assyear
// } else {
// sumList[index].children.push({...data[i],asstype: _assyear})
// }
// }
} }
// assessData = sumList
} }
assessData= data.filter(i=>i.asstype==='年度')
console.log(3333,assessData)
}
return assessData; return assessData;
} }
......
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