Skip to content

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

Go to a project
Commit 080130eb by zhongqm
Options

update: 迁移干部半年度

parent f2d745e4
Inline Side-by-side
Showing with 146 additions and 67 deletions
index.html
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<meta charset='utf-8'> <meta charset='utf-8'>
<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> <!-- <script src='https://staging.jffctest.com/public/js/qing/latest/qing.js'></script>-->
</head> </head>
<body> <body>
<div class='header'> <div class='header'>
......
src/assets/css/style.css
...@@ -1270,3 +1270,14 @@ span { ...@@ -1270,3 +1270,14 @@ span {
/* -webkit-transform: rotate(180deg);*/ /* -webkit-transform: rotate(180deg);*/
/* transform: rotate(180deg);*/ /* transform: rotate(180deg);*/
/*}*/ /*}*/
/*半年度缩进*/
.half_content{
padding: 0 15px;
}
.half_value{
padding-right: 20px;
}
src/js/index.js
...@@ -462,7 +462,8 @@ function render(data) { ...@@ -462,7 +462,8 @@ function render(data) {
}; };
for (let r in RENDER_ITEM) { for (let r in RENDER_ITEM) {
if (data[r]) { if (data[r]) {
let dataArr = filter(r, data[r]); //物业是用新的绩效
let dataArr = filterNew(r, data[r]);
if (!dataArr) { if (!dataArr) {
continue; continue;
} }
...@@ -482,7 +483,7 @@ function render(data) { ...@@ -482,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 = filter(r, data[r]); let dataArr = filterNew(r, data[r]);
if (!dataArr) { if (!dataArr) {
continue; continue;
} }
...@@ -531,8 +532,8 @@ function render(data) { ...@@ -531,8 +532,8 @@ function render(data) {
// } // }
// } // }
//旧版绩效 //旧版绩效
console.log('data[r]', data[r]); console.log('旧版绩效 data[r]>>', data[r]);
let dataArr = filter(r, data[r]); let dataArr = filterOld(r, data[r]);
if (!dataArr) { if (!dataArr) {
continue; continue;
} }
...@@ -2166,42 +2167,75 @@ function renderFileName(attachmentName) { ...@@ -2166,42 +2167,75 @@ function renderFileName(attachmentName) {
function listGRenderer(list, data) { function listGRenderer(list, data) {
let temp = ``; let temp = ``;
if (data && data.length) { if (data && data.length) {
let cadreFile = []; let cadreFile = []
data.forEach((item, index) => { data.forEach((item, index) => {
let note = list.note; let note = list.note;
let chil = list.chilkey; let chil = list.chilkey
let children = item[list.children]; let children = item[list.children] //附件
if (chil instanceof Array && children) { let halfArr = item.halfArr
let childrenHtml = ``; // 有附件或有半年度
let sortChildren = children.sort((a, b) => { if ((chil instanceof Array && children)|| (halfArr && halfArr.length)) {
return a[list.chilkey[0]].localeCompare(b[list.chilkey[0]]);
}); let childrenHtml = ``
console.log('gbkh-sortChildren>>', sortChildren); // 文件名称排序
let sortChildren =children? children.sort((a, b) => {
return a[list.chilkey[0]].localeCompare(b[list.chilkey[0]])
}):[]
sortChildren.forEach((items) => { sortChildren.forEach((items) => {
childrenHtml += itemRenderer( childrenHtml += itemRenderer(
`<span class='file_link'> ${renderFileIcon(items[list.chilkey[1]])} ${renderFileName(items[list.chilkey[0]])}</span>`, `<span class="file_link"> ${renderFileIcon(items[list.chilkey[1]])} ${renderFileName(items[list.chilkey[0]])}</span>`,
// `<a class="a_link" > ${renderFileIcon(items[list.chilkey[1]])} ${renderFileName(items[list.chilkey[0]])}</a>`,
'', '',
'children_content' 'children_content'
); );
cadreFile.push(items[list.chilkey[1]]); cadreFile.push(items[list.chilkey[1]])
}); })
// 半年度
if(halfArr){
halfArr.forEach((items) => {
childrenHtml += itemRenderer(
`· 半年度`,
`<span class="item__content-note t-black half_value">${items.result || ''}</span>`,
'children_content half_content'
);
// 半年度文件名称排序
let halfattAchmentArray = items.attachmentArray||[]
let sortChildren =halfattAchmentArray.sort((a, b) => {
return a[list.chilkey[0]].localeCompare(b[list.chilkey[0]])
})
sortChildren.forEach((items) => {
childrenHtml += itemRenderer(
`<span class="file_link"> ${renderFileIcon(items[list.chilkey[1]])} ${renderFileName(items[list.chilkey[0]])}</span>`,
'',
'children_content half_content'
);
cadreFile.push(items[list.chilkey[1]])
})
})
}
temp += itemRenderer( temp += itemRenderer(
`${item[list.title]}年`, `${item[list.title]}年`,
`<span class='item__content-note t-black '>${item[note] || ''}</span>`, `<span class="item__content-note t-black ">${item[note] || ''}</span>`,
`${childrenHtml ? 'has-children text-left' : 'text-left'}` `${childrenHtml ? 'has-children text-left' : 'text-left'}`
); );
if (childrenHtml) { if (childrenHtml) {
temp += `<div class='children_box'>${childrenHtml}</div>`; temp += `<div class="children_box">${childrenHtml}</div>`
} }
} else {
}else {
temp += itemRenderer( temp += itemRenderer(
`${item[list.title]}年`, `${item[list.title]}年`,
`<span class='item__content-note t-black'>${item[note]}</span>` `<span class="item__content-note t-black">${item[note]}</span>`
); );
} }
}); });
cadreFileList = cadreFile; cadreFileList = cadreFile
} else { } else {
temp = noDataRenderer(); temp = noDataRenderer();
...@@ -2711,27 +2745,29 @@ function getDateFormat(date) { ...@@ -2711,27 +2745,29 @@ function getDateFormat(date) {
// let date = now.getDate(); // 得到日期 // let date = now.getDate(); // 得到日期
} }
//新版 //新版(物业还是用新版的)
// function filter(item, data) { function filterNew(item, data) {
// let assessData = data; let assessData = data;
// // 处理绩效异常 // 处理绩效异常
// if (item === 'assessVoList') { 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 = ''; assessData = '';
// break; break;
// } }
// } }
// } }
// } }
// return assessData; return assessData;
// } }
//旧版 //旧版
function filter(item, data) { //旧版
function filterOld(item, data) {
let assessData = data; let assessData = data;
// 处理绩效异常 // 处理绩效异常
if (item === 'assessVoList') { if (item === 'assessVoList') {
...@@ -2744,11 +2780,11 @@ function filter(item, data) { ...@@ -2744,11 +2780,11 @@ function filter(item, data) {
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='上半年度'
...@@ -2792,50 +2828,82 @@ function filter(item, data) { ...@@ -2792,50 +2828,82 @@ function filter(item, data) {
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);
} }
}); });
// console.log('年分组>>', obj)
assessData = data.filter(i => i.asstype === '年度'); assessData = data.filter(i => i.asstype === '年度')
let objKeys = Object.keys(obj); let objKeys = Object.keys(obj)
let dataYears = assessData.map(item => item.assyear); let dataYears = assessData.map(item => item.assyear)
let noYearData = {}; let noYearData = []
// let noYearData = {}
if (objKeys.length !== assessData.length) { if (objKeys.length !== assessData.length) {
// 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++) {
if (!dataYears.includes(objKeys[i])) {
noYearData.push({assyear: objKeys[i], assgrade: ''})
}
} }
if (noYearData.assyear) {
assessData.unshift(noYearData);
} }
// if (noYearData.assyear) {
if (noYearData.length) {
// assessData.unshift(noYearData)
assessData = noYearData.concat(assessData)
assessData.sort((a, b) => {
return b.assyear - a.assyear
})
}
assessData.forEach(item => { assessData.forEach(item => {
item.months = obj[item.assyear]; item.months = obj[item.assyear]
}); })
//月份升序 //月份升序
assessData.forEach(item => { assessData.forEach(item => {
if (item.months && item.months.length) { if (item.months && item.months.length) {
item.months.sort((a, b) => { item.months.sort((a, b) => {
return a.monthNum - b.monthNum; return a.monthNum - b.monthNum
}); })
} }
}); })
} }
// assessData = data.filter(i => i.asstype === '年度') }
//处理干部考核半年度数据
if (item === 'cadreEvaluationVoList') {
let arr = []
assessData.forEach(item => {
if (item.checkTypeName === '年度') {
arr.push({...item,halfArr:[]})
} else if (item.checkTypeName === '半年度') {
let idx = arr.findIndex(i => item.year === i.year)
if (idx === -1) {
//只有半年度数据没有年度数据
arr.push({
// ...item,
checkTypeName: '年度',
year: item.year,
result: '',
halfArr: [item]
})
} else {
arr[idx].halfArr.push(item)
}
}
// console.log('filter-assessData>>', assessData) });
// console.log(3333,assessData) assessData = arr
} }
return assessData; return assessData;
} }
......
yarn.lock
This diff could not be displayed because it is too large.
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