diff --git a/web/client/src/sections/business/containers/performanceReport/performanceSummary.jsx b/web/client/src/sections/business/containers/performanceReport/performanceSummary.jsx index 1c6e7f1..1a23643 100644 --- a/web/client/src/sections/business/containers/performanceReport/performanceSummary.jsx +++ b/web/client/src/sections/business/containers/performanceReport/performanceSummary.jsx @@ -148,23 +148,23 @@ const AchievementDetails = (props) => {
入职日期
转正日期
工龄
-
1月
-
2月
-
3月
+
1月
+
2月
+
3月
一季度
-
4月
-
5月
-
6月
+
4月
+
5月
+
6月
二季度
-
7月
-
8月
-
9月
+
7月
+
8月
+
9月
三季度
-
10月
-
11月
-
12月
+
10月
+
11月
+
12月
四季度
- 2022年度 +
四季度
扣除转法务业绩金额
2022年最终业绩合计
@@ -237,6 +237,9 @@ const AchievementDetails = (props) => {
完成率
销售任务
完成率
+
合同金额合计
+
实际业绩合计
+
考核业绩合计
`; //无数据 @@ -249,58 +252,69 @@ const AchievementDetails = (props) => { const oneCompletion = oneAssessmentPerformance && oneTask && oneAssessmentPerformance / oneTask; const twoAssessmentPerformance = item.two && item.two.assessmentPerformance; const twoTask = item.two && item.two.task; - const twoCompletion = twoAssessmentPerformance && twoTask && twoAssessmentPerformance / twoTask || '-'; + const twoCompletion = twoAssessmentPerformance && twoTask && twoAssessmentPerformance / twoTask; const threeAssessmentPerformance = item.three && item.three.assessmentPerformance; const threeTask = item.three && item.three.task; - const threeCompletion = threeAssessmentPerformance && threeTask && threeAssessmentPerformance / threeTask || '-'; + const threeCompletion = threeAssessmentPerformance && threeTask && threeAssessmentPerformance / threeTask; const fourAssessmentPerformance = item.four && item.four.assessmentPerformance; const fourTask = item.four && item.four.task; - const fourCompletion = fourAssessmentPerformance && fourTask && fourAssessmentPerformance / fourTask || '-'; + const fourCompletion = fourAssessmentPerformance && fourTask && fourAssessmentPerformance / fourTask; const fiveAssessmentPerformance = item.five && item.five.assessmentPerformance; const fiveTask = item.five && item.five.task; - const fiveCompletion = fiveAssessmentPerformance && fiveTask && fiveAssessmentPerformance / fiveTask || '-'; + const fiveCompletion = fiveAssessmentPerformance && fiveTask && fiveAssessmentPerformance / fiveTask; const sixAssessmentPerformance = item.six && item.six.assessmentPerformance; const sixTask = item.six && item.six.task; - const sixCompletion = sixAssessmentPerformance && sixTask && sixAssessmentPerformance / sixTask || '-'; + const sixCompletion = sixAssessmentPerformance && sixTask && sixAssessmentPerformance / sixTask; const sevenAssessmentPerformance = item.seven && item.seven.assessmentPerformance; const sevenTask = item.seven && item.seven.task; - const sevenCompletion = sevenAssessmentPerformance && sevenTask && sevenAssessmentPerformance / sevenTask || '-'; + const sevenCompletion = sevenAssessmentPerformance && sevenTask && sevenAssessmentPerformance / sevenTask; const eightAssessmentPerformance = item.eight && item.eight.assessmentPerformance; const eightTask = item.eight && item.eight.task; - const eightCompletion = eightAssessmentPerformance && eightTask && eightAssessmentPerformance / eightTask || '-'; + const eightCompletion = eightAssessmentPerformance && eightTask && eightAssessmentPerformance / eightTask; const nineAssessmentPerformance = item.nine && item.nine.assessmentPerformance; const nineTask = item.nine && item.nine.task; - const nineCompletion = nineAssessmentPerformance && nineTask && nineAssessmentPerformance / nineTask || '-'; + const nineCompletion = nineAssessmentPerformance && nineTask && nineAssessmentPerformance / nineTask; const tenAssessmentPerformance = item.ten && item.ten.assessmentPerformance; const tenTask = item.ten && item.ten.task; - const tenCompletion = tenAssessmentPerformance && tenTask && tenAssessmentPerformance / tenTask || '-'; + const tenCompletion = tenAssessmentPerformance && tenTask && tenAssessmentPerformance / tenTask; const elevenAssessmentPerformance = item.eleven && item.eleven.assessmentPerformance; const elevenTask = item.eleven && item.eleven.task; - const elevenCompletion = elevenAssessmentPerformance && elevenTask && elevenAssessmentPerformance / elevenTask || '-'; + const elevenCompletion = elevenAssessmentPerformance && elevenTask && elevenAssessmentPerformance / elevenTask; const twelveAssessmentPerformance = item.twelve && item.twelve.assessmentPerformance; const twelveTask = item.twelve && item.twelve.task; - const twelveCompletion = twelveAssessmentPerformance && twelveTask && twelveAssessmentPerformance / twelveTask || '-'; - + const twelveCompletion = twelveAssessmentPerformance && twelveTask && twelveAssessmentPerformance / twelveTask; + let days = moment().diff(moment(item.hiredate).format('YYYY-MM-DD'), 'days') let day = days / 365 const workingYears = day.toFixed(1) - + console.log(Number(fourTask ? fourTask : 0) + Number(fiveTask ? fiveTask : 0) + Number(sixTask ? sixTask : 0)); return Object.assign({}, item, { - oneCompletion: oneCompletion || '-', - twoCompletion: twoCompletion || '-', - threeCompletion: threeCompletion || '-', - oneQuarterTask: (oneAssessmentPerformance || twoAssessmentPerformance || threeAssessmentPerformance) && (oneTask || twoTask || threeTask) && (oneAssessmentPerformance || 0 + twoAssessmentPerformance || 0 + threeAssessmentPerformance || 0) / (oneTask || 0 + twoTask || 0 + threeTask || 0) || '-', - fourCompletion: fourTask || '-', - fiveCompletion: fiveCompletion || '-', - sixCompletion: sixCompletion || '-', - twoQuarterTask: (fourAssessmentPerformance || fiveAssessmentPerformance || sixAssessmentPerformance) && (fourTask || fiveTask || sixTask) && (fourAssessmentPerformance || 0 + fiveAssessmentPerformance || 0 + sixAssessmentPerformance || 0) / (fourTask || 0 + fiveTask || 0 + sixTask || 0) || '-', - sevenCompletion: sevenCompletion || '-', - eightCompletion: eightCompletion || '-', - nineCompletion: nineCompletion || '-', - tenCompletion: tenCompletion || '-', - elevenCompletion: elevenCompletion || '-', - twelveCompletion: twelveCompletion || '-', - workingYears:workingYears, + oneCompletion: oneCompletion, + twoCompletion: twoCompletion, + threeCompletion: threeCompletion, + oneQuarterTaskNnu: Number(oneTask ? oneTask : 0) + Number(twoTask ? twoTask : 0) + Number(threeTask ? threeTask : 0), + oneQuarterTask: (oneAssessmentPerformance || twoAssessmentPerformance || threeAssessmentPerformance) && (oneTask || twoTask || threeTask) && (oneAssessmentPerformance || 0 + twoAssessmentPerformance || 0 + threeAssessmentPerformance || 0) / (oneTask || 0 + twoTask || 0 + threeTask || 0), + fourCompletion: fourCompletion, + fiveCompletion: fiveCompletion, + sixCompletion: sixCompletion, + twoQuarterTaskNnu: Number(fourTask ? fourTask : 0) + Number(fiveTask ? fiveTask : 0) + Number(sixTask ? sixTask : 0), + twoQuarterTask: (fourAssessmentPerformance || fiveAssessmentPerformance || sixAssessmentPerformance) && (fourTask || fiveTask || sixTask) && (fourAssessmentPerformance || 0 + fiveAssessmentPerformance || 0 + sixAssessmentPerformance || 0) / (fourTask || 0 + fiveTask || 0 + sixTask || 0), + sevenCompletion: sevenCompletion, + eightCompletion: eightCompletion, + nineCompletion: nineCompletion, + threeQuarterTaskNnu: Number(sevenTask ? sevenTask : 0) + Number(eightTask ? eightTask : 0) + Number(nineTask ? nineTask : 0), + threeQuarterTask: (sevenAssessmentPerformance || eightAssessmentPerformance || nineAssessmentPerformance) && (sevenTask || eightTask || nineTask) && (sevenAssessmentPerformance || 0 + eightAssessmentPerformance || 0 + nineAssessmentPerformance || 0) / (sevenTask || 0 + eightTask || 0 + nineTask || 0), + tenCompletion: tenCompletion, + elevenCompletion: elevenCompletion, + twelveCompletion: twelveCompletion, + fourQuarterTaskNnu: Number(tenTask ? tenTask : 0) + Number(elevenTask ? elevenTask : 0) + Number(twelveTask ? twelveTask : 0), + fourQuarterTask: (tenAssessmentPerformance || elevenAssessmentPerformance || twelveAssessmentPerformance) && (tenTask || elevenTask || twelveTask) && (tenAssessmentPerformance || 0 + elevenAssessmentPerformance || 0 + twelveAssessmentPerformance || 0) / (tenTask || 0 + elevenTask || 0 + twelveTask || 0), + workingYears: workingYears, + allAmount: Number(item.one ? item.one.amount : 0) + Number(item.two ? item.two.amount : 0) + Number(item.three ? item.three.amount : 0) + Number(item.four ? item.four.amount : 0) + Number(item.five ? item.five.amount : 0) + Number(item.six ? item.six.amount : 0) + Number(item.seven ? item.seven.amount : 0) + Number(item.eight ? item.eight.amount : 0) + Number(item.nine ? item.nine.amount : 0) + Number(item.ten ? item.ten.amount : 0) + Number(item.eleven ? item.eleven.amount : 0) + Number(item.twelve ? item.twelve.amount : 0), + + allactualPerformance: Number(item.one ? item.one.actualPerformance : 0) + Number(item.two ? item.two.actualPerformance : 0) + Number(item.three ? item.three.actualPerformance : 0) + Number(item.four ? item.four.actualPerformance : 0) + Number(item.five ? item.five.actualPerformance : 0) + Number(item.six ? item.six.actualPerformance : 0) + Number(item.seven ? item.seven.actualPerformance : 0) + Number(item.eight ? item.eight.actualPerformance : 0) + Number(item.nine ? item.nine.actualPerformance : 0) + Number(item.ten ? item.ten.actualPerformance : 0) + Number(item.eleven ? item.eleven.actualPerformance : 0) + Number(item.twelve ? item.twelve.actualPerformance : 0), + + allassessmentPerformance: Number(item.one ? item.one.assessmentPerformance : 0) + Number(item.two ? item.two.assessmentPerformance : 0) + Number(item.three ? item.three.assessmentPerformance : 0) + Number(item.four ? item.four.assessmentPerformance : 0) + Number(item.five ? item.five.assessmentPerformance : 0) + Number(item.six ? item.six.assessmentPerformance : 0) + Number(item.seven ? item.seven.assessmentPerformance : 0) + Number(item.eight ? item.eight.assessmentPerformance : 0) + Number(item.nine ? item.nine.assessmentPerformance : 0) + Number(item.ten ? item.ten.assessmentPerformance : 0) + Number(item.eleven ? item.eleven.assessmentPerformance : 0) + Number(item.twelve ? item.twelve.assessmentPerformance : 0), }) }) for (let d of allList) { @@ -311,35 +325,88 @@ const AchievementDetails = (props) => {
${d['business']}
${d['hiredate']}
${d['regularDate']}
-
${d['workingYears']}
-
${d['oneCompletion']}
-
${d['twoCompletion']}
-
${d['threeCompletion']}
-
${d['oneQuarterTask']}
-
${d['phone']}
-
${d['post'] ? d['post'] : '暂无'}
-
${d['email'] ? d['email'] : '暂无'}
-
${d['wechat'] ? d['wechat'] : '暂无'}
-
${d['region']}
-
${d['regionPathName']}
-
${d['projectState']}
-
${d['LostTypeName'] ? d['LostTypeName'] : '暂无'}
-
${d['cause'] ? d['cause'] : '暂无'}
-
${d['groundTime'] ? d['groundTime'] : '暂无'}
-
${d['projectSuccess']}
-
${d['amountMoney'] ? d['amountMoney'] : '暂无'}
-
${d['bidding'] ? '是' : '否'}
-
${d['competitor'] ? d['competitor'] : '暂无'}
-
${d['fundsSufficient'] ? '是' : '否'}
-
${d['planAgreed'] ? '是' : '否'}
-
${d['projectProgress'] ? d['projectProgress'] : '暂无'}
-
${d['problemAnalysis'] ? d['problemAnalysis'] : '暂无'}
-
${d['nextTodo'] ? d['nextTodo'] : '暂无'}
-
${d['remarks'] ? d['remarks'] : '暂无'}
-
${d['recordTime']}
-
${d['intervalDays']}
-
${d['newUpdateTime'] ? d['newUpdateTime'] : '暂无'}
-
${d['updateInterval']}
+
${d['workingYears']}
+ +
${d.one ? d.one.amount : ''}
+
${d.one ? d.one.actualPerformance : ''}
+
${d.one ? d.one.assessmentPerformance : ''}
+
${d.one ? d.one.task : ''}
+
${d.oneCompletion ? d.oneCompletion : ''}
+
${d.two ? d.two.amount : ''}
+
${d.two ? d.two.actualPerformance : ''}
+
${d.two ? d.two.assessmentPerformance : ''}
+
${d.two ? d.two.task : ''}
+
${d.twoCompletion ? d.twoCompletion : ''}
+
${d.three ? d.three.amount : ''}
+
${d.three ? d.three.actualPerformance : ''}
+
${d.three ? d.three.assessmentPerformance : ''}
+
${d.three ? d.three.task : ''}
+
${d.threeCompletion ? d.threeCompletion : ''}
+
${d.oneQuarterTaskNnu == 0 ? '' : d.oneQuarterTaskNnu}
+
${d.oneQuarterTask ? d.oneQuarterTask : ''}
+ +
${d.four ? d.four.amount : ''}
+
${d.four ? d.four.actualPerformance : ''}
+
${d.four ? d.four.assessmentPerformance : ''}
+
${d.four ? d.four.task : ''}
+
${d.fourCompletion ? d.fourCompletion : ''}
+
${d.five ? d.five.amount : ''}
+
${d.five ? d.five.actualPerformance : ''}
+
${d.five ? d.five.assessmentPerformance : ''}
+
${d.five ? d.five.task : ''}
+
${d.fiveCompletion ? d.fiveCompletion : ''}
+
${d.six ? d.six.amount : ''}
+
${d.six ? d.six.actualPerformance : ''}
+
${d.six ? d.six.assessmentPerformance : ''}
+
${d.six ? d.six.task : ''}
+
${d.sixCompletion ? d.sixCompletion : ''}
+
${d.twoQuarterTaskNnu == 0 ? '' : d.twoQuarterTaskNnu}
+
${d.twoQuarterTask ? d.twoQuarterTask : ''}
+ +
${d.seven ? d.seven.amount : ''}
+
${d.seven ? d.seven.actualPerformance : ''}
+
${d.seven ? d.seven.assessmentPerformance : ''}
+
${d.seven ? d.seven.task : ''}
+
${d.sevenCompletion ? d.sevenCompletion : ''}
+
${d.eight ? d.eight.amount : ''}
+
${d.eight ? d.eight.actualPerformance : ''}
+
${d.eight ? d.eight.assessmentPerformance : ''}
+
${d.eight ? d.eight.task : ''}
+
${d.eightCompletion ? d.eightCompletion : ''}
+
${d.nine ? d.nine.amount : ''}
+
${d.nine ? d.nine.actualPerformance : ''}
+
${d.nine ? d.nine.assessmentPerformance : ''}
+
${d.nine ? d.nine.task : ''}
+
${d.nineCompletion ? d.nineCompletion : ''}
+
${d.threeQuarterTaskNnu == 0 ? '' : d.threeQuarterTaskNnu}
+
${d.threeQuarterTask ? d.threeQuarterTask : ''}
+ +
${d.ten ? d.ten.amount : ''}
+
${d.ten ? d.ten.actualPerformance : ''}
+
${d.ten ? d.ten.assessmentPerformance : ''}
+
${d.ten ? d.ten.task : ''}
+
${d.tenCompletion ? d.tenCompletion : ''}
+
${d.eleven ? d.eleven.amount : ''}
+
${d.eleven ? d.eleven.actualPerformance : ''}
+
${d.eleven ? d.eleven.assessmentPerformance : ''}
+
${d.eleven ? d.eleven.task : ''}
+
${d.elevenCompletion ? d.elevenCompletion : ''}
+
${d.twelve ? d.twelve.amount : ''}
+
${d.twelve ? d.twelve.actualPerformance : ''}
+
${d.twelve ? d.twelve.assessmentPerformance : ''}
+
${d.twelve ? d.twelve.task : ''}
+
${d.twelveCompletion ? d.twelveCompletion : ''}
+
${d.fourQuarterTaskNnu == 0 ? '' : d.fourQuarterTaskNnu}
+
${d.fourQuarterTask ? d.fourQuarterTask : ''}
+ +
${d.allAmount ? d.allAmount : ''}
+
${d.allactualPerformance ? d.allactualPerformance : ''}
+
${d.allassessmentPerformance ? d.allassessmentPerformance : ''}
+ +
+
+ + ` } diff --git a/web/package.json b/web/package.json index 51976e1..5ef2a30 100644 --- a/web/package.json +++ b/web/package.json @@ -32,6 +32,7 @@ "css-loader": "^3.5.0", "express": "^4.17.1", "file-loader": "^6.0.0", + "file-saver": "^2.0.5", "html-webpack-plugin": "^4.5.0", "immutable": "^4.0.0-rc.12", "less": "^3.12.2", @@ -58,7 +59,6 @@ "echarts": "^5.3.3", "echarts-for-react": "^3.0.2", "ezuikit-js": "^0.6.1", - "file-saver": "^2.0.5", "fs-attachment": "^1.0.0", "fs-web-server-scaffold": "^1.0.6", "js-cookie": "^3.0.1",