|
|
@@ -315,6 +315,8 @@ export default {
|
|
|
// 获取费用统计数据
|
|
|
getCostSummaryListFunc() {
|
|
|
getCostSummaryList({ yearAndMonth: `${this.currYear}12` }).then(({ data }) => {
|
|
|
+ let costList = data.data;
|
|
|
+
|
|
|
let ryrgfyTotal = new Decimal(0); // 人员人工费用
|
|
|
let zjtrfyTotal = new Decimal(0); // 直接投入费用
|
|
|
let zjfyycqdtfyTotal = new Decimal(0); // 折旧费用和长期待摊费用
|
|
|
@@ -323,7 +325,11 @@ export default {
|
|
|
let zbtsfyysyfyTotal = new Decimal(0); // 装备调试费用与试验费用
|
|
|
let qtfyTotal = new Decimal(0); // 其他费用
|
|
|
let wwfyTotal = new Decimal(0); // 委外费用
|
|
|
- data.data.forEach(item => {
|
|
|
+
|
|
|
+ let monthArr = [];
|
|
|
+ let monthSalesArr = [];
|
|
|
+
|
|
|
+ costList.forEach(item => {
|
|
|
ryrgfyTotal = ryrgfyTotal.add(new Decimal(item.ryrgfy));
|
|
|
zjtrfyTotal = zjtrfyTotal.add(new Decimal(item.zjtrfy));
|
|
|
zjfyycqdtfyTotal = zjfyycqdtfyTotal.add(new Decimal(item.zjfyycqdtfy));
|
|
|
@@ -332,6 +338,9 @@ export default {
|
|
|
zbtsfyysyfyTotal = zbtsfyysyfyTotal.add(new Decimal(item.zbtsfyysyfy));
|
|
|
qtfyTotal = qtfyTotal.add(new Decimal(item.qtfy));
|
|
|
wwfyTotal = wwfyTotal.add(new Decimal(item.wwfy));
|
|
|
+
|
|
|
+ monthArr.push(item.yearAndMonth);
|
|
|
+ monthSalesArr.push(Number(new Decimal(item.total).div(new Decimal(0.8))));
|
|
|
});
|
|
|
// 研发费用总额
|
|
|
let costAmount = ryrgfyTotal
|
|
|
@@ -357,8 +366,6 @@ export default {
|
|
|
|
|
|
|
|
|
// 本年度月研发归集趋势图
|
|
|
- let monthArr = data.data.map(item => item.yearAndMonth);
|
|
|
- let salesArr = data.data.map(item => item.total);
|
|
|
this.monthAggregationBarOpt = {
|
|
|
grid: {
|
|
|
top: "3%",
|
|
|
@@ -386,7 +393,7 @@ export default {
|
|
|
},
|
|
|
series: [
|
|
|
{
|
|
|
- data: salesArr,
|
|
|
+ data: monthSalesArr,
|
|
|
type: 'bar',
|
|
|
barWidth: "25%",
|
|
|
label: {
|