Skip to content

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

Go to a project
Commit 4701004a by zhongqm
Options

update: 物业也要干部考核模块

parent 080130eb
Inline Side-by-side
Showing with 37 additions and 29 deletions
src/js/index.js
...@@ -463,7 +463,7 @@ function render(data) { ...@@ -463,7 +463,7 @@ function render(data) {
for (let r in RENDER_ITEM) { for (let r in RENDER_ITEM) {
if (data[r]) { if (data[r]) {
//物业是用新的绩效 //物业是用新的绩效
let dataArr = filterNew(r, data[r]); let dataArr = filterData(r, data[r],true);
if (!dataArr) { if (!dataArr) {
continue; continue;
} }
...@@ -483,7 +483,7 @@ function render(data) { ...@@ -483,7 +483,7 @@ function render(data) {
for (let r in RENDER_ITEM) { for (let r in RENDER_ITEM) {
if (data[r]) { if (data[r]) {
let dataArr = filterNew(r, data[r]); let dataArr = filterData(r, data[r],true);
if (!dataArr) { if (!dataArr) {
continue; continue;
} }
...@@ -533,7 +533,7 @@ function render(data) { ...@@ -533,7 +533,7 @@ function render(data) {
// } // }
//旧版绩效 //旧版绩效
console.log('旧版绩效 data[r]>>', data[r]); console.log('旧版绩效 data[r]>>', data[r]);
let dataArr = filterOld(r, data[r]); let dataArr = filterData(r, data[r],false);
if (!dataArr) { if (!dataArr) {
continue; continue;
} }
...@@ -2745,46 +2745,39 @@ function getDateFormat(date) { ...@@ -2745,46 +2745,39 @@ function getDateFormat(date) {
// let date = now.getDate(); // 得到日期 // let date = now.getDate(); // 得到日期
} }
//新版(物业还是用新版的) // 重新过滤数据
function filterNew(item, data) { function filterData(item, data, isAssessNew) {
let assessData = data; let assessData = data;
// 处理绩效异常 // 处理绩效异常
if (item === 'assessVoList') { if (item === 'assessVoList') {
if (isAssessNew) {
// 物业是用新版绩效
if (data.length === 0) { if (data.length === 0) {
assessData = ''; assessData = '';
} else { } else {
for (let i = 0; i < assessData.length; i++) { for (let i = 0; i < assessData.length; i++) {
if (!assessData[i].assgrade) { if (!assessData[ i ].assgrade) {
assessData = ''; assessData = '';
break; break;
} }
} }
} }
} } else {
return assessData; // 旧版绩效
}
//旧版
//旧版
function filterOld(item, data) {
let assessData = data;
// 处理绩效异常
if (item === 'assessVoList') {
if (data.length === 0) { if (data.length === 0) {
assessData = []; assessData = [];
} else { } else {
for (let i = 0; i < assessData.length; i++) { for (let i = 0; i < assessData.length; i++) {
if (!assessData[i].assgrade) { if (!assessData[ i ].assgrade) {
assessData[i].assgrade = ''; assessData[ i ].assgrade = '';
break; break;
} }
} }
let templist = [] let templist = []
let sumList = [] let sumList = []
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
const index = templist.indexOf(data[i].assyear) const index = templist.indexOf(data[ i ].assyear)
let _assyear = data[i].asstype let _assyear = data[ i ].asstype
// if(data[i].asstype==="半年度"){ // if(data[i].asstype==="半年度"){
// if(data[i].assendtime.substring(5,10)==="06-30"){ // if(data[i].assendtime.substring(5,10)==="06-30"){
// _assyear='上半年度' // _assyear='上半年度'
...@@ -2824,13 +2817,13 @@ function filterOld(item, data) { ...@@ -2824,13 +2817,13 @@ function filterOld(item, data) {
let obj = {}; let obj = {};
assessData.forEach(item => { assessData.forEach(item => {
if (!obj[item.assyear]) { if (!obj[ item.assyear ]) {
obj[item.assyear] = []; obj[ item.assyear ] = [];
} }
if (item.asstype === '月度') { if (item.asstype === '月度') {
item.month = Number(item.assendtime.substring(5, 7)) + '月' item.month = Number(item.assendtime.substring(5, 7)) + '月'
item.monthNum = Number(item.assendtime.substring(5, 7)) item.monthNum = Number(item.assendtime.substring(5, 7))
obj[item.assyear].push(item); obj[ item.assyear ].push(item);
} }
}); });
...@@ -2845,8 +2838,8 @@ function filterOld(item, data) { ...@@ -2845,8 +2838,8 @@ function filterOld(item, data) {
// noYearData = {assyear: objKeys.find(item => !dataYears.includes(item)), assgrade: ''} // noYearData = {assyear: objKeys.find(item => !dataYears.includes(item)), assgrade: ''}
//兼容多条没有年度数据的情况 //兼容多条没有年度数据的情况
for (let i = 0; i < objKeys.length; i++) { for (let i = 0; i < objKeys.length; i++) {
if (!dataYears.includes(objKeys[i])) { if (!dataYears.includes(objKeys[ i ])) {
noYearData.push({assyear: objKeys[i], assgrade: ''}) noYearData.push({assyear: objKeys[ i ], assgrade: ''})
} }
} }
} }
...@@ -2860,7 +2853,7 @@ function filterOld(item, data) { ...@@ -2860,7 +2853,7 @@ function filterOld(item, data) {
} }
assessData.forEach(item => { assessData.forEach(item => {
item.months = obj[item.assyear] item.months = obj[ item.assyear ]
}) })
//月份升序 //月份升序
assessData.forEach(item => { assessData.forEach(item => {
...@@ -2876,13 +2869,28 @@ function filterOld(item, data) { ...@@ -2876,13 +2869,28 @@ function filterOld(item, data) {
} }
} }
}
//处理干部考核半年度数据 //处理干部考核半年度数据
if (item === 'cadreEvaluationVoList') { if (item === 'cadreEvaluationVoList') {
let arr = [] let arr = []
console.log('干部考核数据处理 前>>', assessData)
// 将数据按 先半年度再年度的顺序排序
assessData.map(i => {
if (i.checkTypeName === '半年度') {
i.timeTemp = new Date(i.year, 5, 1).getTime()
console.log('半年度 timeTemp>>', i.timeTemp)
} else if (i.checkTypeName === '年度') {
i.timeTemp = new Date(i.year, 11, 1).getTime()
console.log('年度 timeTemp>>', i.timeTemp)
}
return i
})
assessData.sort((a, b) => b.timeTemp - a.timeTemp) //降序
console.log('干部考核数据处理 后>>', assessData)
assessData.forEach(item => { assessData.forEach(item => {
if (item.checkTypeName === '年度') { if (item.checkTypeName === '年度') {
arr.push({...item,halfArr:[]}) arr.push({...item, halfArr: []})
} else if (item.checkTypeName === '半年度') { } else if (item.checkTypeName === '半年度') {
let idx = arr.findIndex(i => item.year === i.year) let idx = arr.findIndex(i => item.year === i.year)
if (idx === -1) { if (idx === -1) {
...@@ -2895,7 +2903,7 @@ function filterOld(item, data) { ...@@ -2895,7 +2903,7 @@ function filterOld(item, data) {
halfArr: [item] halfArr: [item]
}) })
} else { } else {
arr[idx].halfArr.push(item) arr[ idx ].halfArr.push(item)
} }
} }
......
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