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 @@
<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/js/index.js
......@@ -171,6 +171,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();
......@@ -249,11 +257,12 @@ function mount() {
.then(({
data
}) => {
console.log(555, data)
console.log('restful>>',url, data)
render(data);
return data;
})
.catch(e => {});
// 获取头像
$mas.getData(configuration.baseUrl + configuration.methods.photo, {
uid: _uid,
appKey,
......@@ -366,6 +375,7 @@ function render(data) {
}
}
break;
case '3':
var RENDER_ITEM = {
// 基础信息
......@@ -382,31 +392,47 @@ function render(data) {
familyVoList: configuration.renderItem.familyVoList,
// 绩效信息
assessVoList: configuration.renderItem.assessVoList,
//奖惩
rewardPunishVoList: configuration.renderItem.rewardPunishVoList,
};
// showToast('房开人员');
console.log('房开人员',RENDER_ITEM)
// // 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 = data[r];
// if (r == 'assessVoList') {
// dataArr = {
// // 绩效
// assessVoList: data['assessVoList'],
// // 评优
// rewardPunishVoList: data['rewardPunishVoList'],
// // 奖励/处罚
// specialtyRewadVoList: data['specialtyRewadVoList'],
// // 营销小红花
// 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]);
// if (!dataArr) {
// continue;
// }
// console.log(222222,dataArr,r)
renderer(RENDER_ITEM[r], dataArr);
}
}
// // propertyRenderer(RENDER_ITEM[r], dataArr);
// // renderer(RENDER_ITEM[r], dataArr);
// }
// }
break;
default:
showToast(`#jobGradeType = ${jobGradeType}; 不明人员`);
......@@ -418,7 +444,6 @@ function render(data) {
function renderer(renderTemp, data) {
let type = renderTemp.type;
// console.log('type',type)
container.appendChild(headerRenderer(renderTemp));
switch (type) {
case RENDER_TYPE.A:
......@@ -428,18 +453,20 @@ function renderer(renderTemp, data) {
container.appendChild(listBRenderer(renderTemp.list, data));
break;
case RENDER_TYPE.C:
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));
break;
// case RENDER_TYPE.F:
// container.appendChild(listFRenderer(renderTemp.list, data));
// break;
case RENDER_TYPE.F:
container.appendChild(listFRenderer(renderTemp.list, data));
break;
}
......@@ -608,6 +635,7 @@ function listBRenderer(list, data) {
}
function listCRenderer(list, data) {
let temp = ``;
if (data && data.length) {
data.forEach((item, index) => {
......@@ -1960,47 +1988,85 @@ function listenerChange(target, clickNode, i) {
}
function listDRenderer(list, data) {
console.log(111, data)
console.log('绩效', {list,data})
//旧版绩效
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>`
let sub = '';
let note = list.note;
// console.log('propertyListDRenderer',list);
if (list.subTitle) {
list.subTitle.forEach((s, i) => {
sub += (i && '|') || '';
sub += item[s] || '无';
});
}
if (note instanceof Object && note.length) {
let t1 = data[index][list.note[0]];
let t2 = data[index][list.note[1]];
temp += itemRenderer(
`${
item[list.title]
}<p class="item__content-sub-title">${sub}</p>`,
`<span class="item__content-note">${t1}至${nowOrNot(
t2
)}</span>`
);
} else {
temp += itemRenderer(
`${item[list.title]}年`,
`<span class="item__content-note">${item[note]}</span>`
);
}
});
} else {
temp = noDataRenderer();
}
console.log(646)
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) {
}
function propertyListDRenderer(list, data) {
// console.log('奇怪的',data,list)
let temp = ``;
if (data && data.length) {
data.forEach((item, index) => {
let sub = '';
let note = list.note;
// console.log(list);
// console.log('propertyListDRenderer',list);
if (list.subTitle) {
list.subTitle.forEach((s, i) => {
sub += (i && '|') || '';
......@@ -2305,7 +2372,26 @@ function getDateFormat(date) {
// let month = now.getMonth(); // 得到月份
// 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) {
let assessData = data;
// 处理绩效异常
......@@ -2319,8 +2405,51 @@ function filter(item, data) {
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;
}
......
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