Skip to content

S
SuperMan
Commit d01133ba authored by liudong1993's avatar liudong1993
Browse files
Options

1

parent 3ac81b72
Show whitespace changes
Inline Side-by-side
Showing with 74 additions and 69 deletions
src/components/FinancialModule/ReportForm/MonthReport.vue
View file @ d01133ba
...@@ -690,6 +690,7 @@ export default { ...@@ -690,6 +690,7 @@ export default {
}, },
{ {
field: "JAN", field: "JAN",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[0], title: this.$t('objFill.yuefens')[0],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -698,6 +699,7 @@ export default { ...@@ -698,6 +699,7 @@ export default {
}, },
{ {
field: "FEB", field: "FEB",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[1], title: this.$t('objFill.yuefens')[1],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -706,6 +708,7 @@ export default { ...@@ -706,6 +708,7 @@ export default {
}, },
{ {
field: "MAR", field: "MAR",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[2], title: this.$t('objFill.yuefens')[2],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -714,6 +717,7 @@ export default { ...@@ -714,6 +717,7 @@ export default {
}, },
{ {
field: "FirstQuarter", field: "FirstQuarter",
formatter: this.moneyFormat,
title: this.$t('objFill.jidus')[0], title: this.$t('objFill.jidus')[0],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -722,6 +726,7 @@ export default { ...@@ -722,6 +726,7 @@ export default {
}, },
{ {
field: "APR", field: "APR",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[3], title: this.$t('objFill.yuefens')[3],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -730,6 +735,7 @@ export default { ...@@ -730,6 +735,7 @@ export default {
}, },
{ {
field: "MAY", field: "MAY",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[4], title: this.$t('objFill.yuefens')[4],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -738,6 +744,7 @@ export default { ...@@ -738,6 +744,7 @@ export default {
}, },
{ {
field: "JUN", field: "JUN",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[5], title: this.$t('objFill.yuefens')[5],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -746,6 +753,7 @@ export default { ...@@ -746,6 +753,7 @@ export default {
}, },
{ {
field: "TwoQuarter", field: "TwoQuarter",
formatter: this.moneyFormat,
title: this.$t('objFill.jidus')[1], title: this.$t('objFill.jidus')[1],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -754,6 +762,7 @@ export default { ...@@ -754,6 +762,7 @@ export default {
}, },
{ {
field: "FirstHalf", field: "FirstHalf",
formatter: this.moneyFormat,
title: this.$t('objFill.jidus')[2], title: this.$t('objFill.jidus')[2],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -762,6 +771,7 @@ export default { ...@@ -762,6 +771,7 @@ export default {
}, },
{ {
field: "JUL", field: "JUL",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[6], title: this.$t('objFill.yuefens')[6],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -770,6 +780,7 @@ export default { ...@@ -770,6 +780,7 @@ export default {
}, },
{ {
field: "AUG", field: "AUG",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[7], title: this.$t('objFill.yuefens')[7],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -778,6 +789,7 @@ export default { ...@@ -778,6 +789,7 @@ export default {
}, },
{ {
field: "SEP", field: "SEP",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[8], title: this.$t('objFill.yuefens')[8],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -786,6 +798,7 @@ export default { ...@@ -786,6 +798,7 @@ export default {
}, },
{ {
field: "ThreeQuarter", field: "ThreeQuarter",
formatter: this.moneyFormat,
title: this.$t('objFill.jidus')[3], title: this.$t('objFill.jidus')[3],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -794,6 +807,7 @@ export default { ...@@ -794,6 +807,7 @@ export default {
}, },
{ {
field: "OCT", field: "OCT",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[9], title: this.$t('objFill.yuefens')[9],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -802,6 +816,7 @@ export default { ...@@ -802,6 +816,7 @@ export default {
}, },
{ {
field: "NOV", field: "NOV",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[10], title: this.$t('objFill.yuefens')[10],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -810,6 +825,7 @@ export default { ...@@ -810,6 +825,7 @@ export default {
}, },
{ {
field: "DEC", field: "DEC",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[11], title: this.$t('objFill.yuefens')[11],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -818,6 +834,7 @@ export default { ...@@ -818,6 +834,7 @@ export default {
}, },
{ {
field: "FourQuarter", field: "FourQuarter",
formatter: this.moneyFormat,
title: this.$t('objFill.jidus')[4], title: this.$t('objFill.jidus')[4],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -826,6 +843,7 @@ export default { ...@@ -826,6 +843,7 @@ export default {
}, },
{ {
field: "EndHalf", field: "EndHalf",
formatter: this.moneyFormat,
title: this.$t('objFill.jidus')[5], title: this.$t('objFill.jidus')[5],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -834,6 +852,7 @@ export default { ...@@ -834,6 +852,7 @@ export default {
}, },
{ {
field: "Total", field: "Total",
formatter: this.moneyFormat,
title: this.$t('ground.zongji'), title: this.$t('ground.zongji'),
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -850,24 +869,24 @@ export default { ...@@ -850,24 +869,24 @@ export default {
}) })
}, },
moneyFormat(rowData, rowIndex, pagingIndex, field) { moneyFormat(rowData, rowIndex, pagingIndex, field) {
if (field === "JAN") return this.priceFormat(rowData.JAN); if (field === "JAN") return this.moneyFormatN(rowData.JAN);
if (field === "FEB") return this.priceFormat(rowData.FEB); if (field === "FEB") return this.moneyFormatN(rowData.FEB);
if (field === "MAR") return this.priceFormat(rowData.MAR); if (field === "MAR") return this.moneyFormatN(rowData.MAR);
if (field === "APR") return this.priceFormat(rowData.APR); if (field === "APR") return this.moneyFormatN(rowData.APR);
if (field === "MAY") return this.priceFormat(rowData.MAY); if (field === "MAY") return this.moneyFormatN(rowData.MAY);
if (field === "JUN") return this.priceFormat(rowData.JUN); if (field === "JUN") return this.moneyFormatN(rowData.JUN);
if (field === "TwoQuarter") return this.priceFormat(rowData.TwoQuarter); if (field === "TwoQuarter") return this.moneyFormatN(rowData.TwoQuarter);
if (field === "FirstHalf") return this.priceFormat(rowData.FirstHalf); if (field === "FirstHalf") return this.moneyFormatN(rowData.FirstHalf);
if (field === "JUL") return this.priceFormat(rowData.JUL); if (field === "JUL") return this.moneyFormatN(rowData.JUL);
if (field === "AUG") return this.priceFormat(rowData.AUG); if (field === "AUG") return this.moneyFormatN(rowData.AUG);
if (field === "SEP") return this.priceFormat(rowData.SEP); if (field === "SEP") return this.moneyFormatN(rowData.SEP);
if (field === "ThreeQuarter") return this.priceFormat(rowData.ThreeQuarter); if (field === "ThreeQuarter") return this.moneyFormatN(rowData.ThreeQuarter);
if (field === "OCT") return this.priceFormat(rowData.OCT); if (field === "OCT") return this.moneyFormatN(rowData.OCT);
if (field === "NOV") return this.priceFormat(rowData.NOV); if (field === "NOV") return this.moneyFormatN(rowData.NOV);
if (field === "DEC") return this.priceFormat(rowData.DEC); if (field === "DEC") return this.moneyFormatN(rowData.DEC);
if (field === "FourQuarter") return this.priceFormat(rowData.FourQuarter); if (field === "FourQuarter") return this.moneyFormatN(rowData.FourQuarter);
if (field === "EndHalf") return this.priceFormat(rowData.EndHalf); if (field === "EndHalf") return this.moneyFormatN(rowData.EndHalf);
if (field === "Total") return this.priceFormat(rowData.Total ); if (field === "Total") return this.moneyFormatN(rowData.Total );
}, },
rowClick(rowIndex,rowData,column){ rowClick(rowIndex,rowData,column){
let field=column.field; let field=column.field;
...@@ -886,24 +905,6 @@ export default { ...@@ -886,24 +905,6 @@ export default {
tab: '营收报表' tab: '营收报表'
} }
}); });
},
priceFormat(value) {
if (value == null) {
return 0.0;
}
let nStr = value.toFixed(2);
nStr += "";
let x = nStr.split(".");
let x1 = x[0];
let x2 = x.length > 1 ? "." + x[1] : "";
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, "$1" + "," + "$2");
}
return x1 + x2;
}, },
method5: function() { method5: function() {
this.loading = true; this.loading = true;
......
src/components/FinancialModule/ReportForm/NumberStatistics.vue
View file @ d01133ba
...@@ -692,6 +692,7 @@ export default { ...@@ -692,6 +692,7 @@ export default {
}, },
{ {
field: "JAN", field: "JAN",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[0], title: this.$t('objFill.yuefens')[0],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -700,6 +701,7 @@ export default { ...@@ -700,6 +701,7 @@ export default {
}, },
{ {
field: "FEB", field: "FEB",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[1], title: this.$t('objFill.yuefens')[1],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -708,6 +710,7 @@ export default { ...@@ -708,6 +710,7 @@ export default {
}, },
{ {
field: "MAR", field: "MAR",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[2], title: this.$t('objFill.yuefens')[2],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -716,6 +719,7 @@ export default { ...@@ -716,6 +719,7 @@ export default {
}, },
{ {
field: "FirstQuarter", field: "FirstQuarter",
formatter: this.moneyFormat,
title: this.$t('objFill.v101.FinancialModule.jidupingjun')[0], title: this.$t('objFill.v101.FinancialModule.jidupingjun')[0],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -724,6 +728,7 @@ export default { ...@@ -724,6 +728,7 @@ export default {
}, },
{ {
field: "APR", field: "APR",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[3], title: this.$t('objFill.yuefens')[3],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -732,6 +737,7 @@ export default { ...@@ -732,6 +737,7 @@ export default {
}, },
{ {
field: "MAY", field: "MAY",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[4], title: this.$t('objFill.yuefens')[4],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -740,6 +746,7 @@ export default { ...@@ -740,6 +746,7 @@ export default {
}, },
{ {
field: "JUN", field: "JUN",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[5], title: this.$t('objFill.yuefens')[5],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -748,6 +755,7 @@ export default { ...@@ -748,6 +755,7 @@ export default {
}, },
{ {
field: "TwoQuarter", field: "TwoQuarter",
formatter: this.moneyFormat,
title: this.$t('objFill.v101.FinancialModule.jidupingjun')[1], title: this.$t('objFill.v101.FinancialModule.jidupingjun')[1],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -756,6 +764,7 @@ export default { ...@@ -756,6 +764,7 @@ export default {
}, },
{ {
field: "FirstHalf", field: "FirstHalf",
formatter: this.moneyFormat,
title: this.$t('objFill.v101.FinancialModule.jidupingjun')[2], title: this.$t('objFill.v101.FinancialModule.jidupingjun')[2],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -764,6 +773,7 @@ export default { ...@@ -764,6 +773,7 @@ export default {
}, },
{ {
field: "JUL", field: "JUL",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[6], title: this.$t('objFill.yuefens')[6],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -772,6 +782,7 @@ export default { ...@@ -772,6 +782,7 @@ export default {
}, },
{ {
field: "AUG", field: "AUG",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[7], title: this.$t('objFill.yuefens')[7],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -780,6 +791,7 @@ export default { ...@@ -780,6 +791,7 @@ export default {
}, },
{ {
field: "SEP", field: "SEP",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[8], title: this.$t('objFill.yuefens')[8],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -788,6 +800,7 @@ export default { ...@@ -788,6 +800,7 @@ export default {
}, },
{ {
field: "ThreeQuarter", field: "ThreeQuarter",
formatter: this.moneyFormat,
title: this.$t('objFill.v101.FinancialModule.jidupingjun')[3], title: this.$t('objFill.v101.FinancialModule.jidupingjun')[3],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -796,6 +809,7 @@ export default { ...@@ -796,6 +809,7 @@ export default {
}, },
{ {
field: "OCT", field: "OCT",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[9], title: this.$t('objFill.yuefens')[9],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -804,6 +818,7 @@ export default { ...@@ -804,6 +818,7 @@ export default {
}, },
{ {
field: "NOV", field: "NOV",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[10], title: this.$t('objFill.yuefens')[10],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -812,6 +827,7 @@ export default { ...@@ -812,6 +827,7 @@ export default {
}, },
{ {
field: "DEC", field: "DEC",
formatter: this.moneyFormat,
title: this.$t('objFill.yuefens')[11], title: this.$t('objFill.yuefens')[11],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -820,6 +836,7 @@ export default { ...@@ -820,6 +836,7 @@ export default {
}, },
{ {
field: "FourQuarter", field: "FourQuarter",
formatter: this.moneyFormat,
title: this.$t('objFill.v101.FinancialModule.jidupingjun')[4], title: this.$t('objFill.v101.FinancialModule.jidupingjun')[4],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -828,6 +845,7 @@ export default { ...@@ -828,6 +845,7 @@ export default {
}, },
{ {
field: "EndHalf", field: "EndHalf",
formatter: this.moneyFormat,
title: this.$t('objFill.v101.FinancialModule.jidupingjun')[5], title: this.$t('objFill.v101.FinancialModule.jidupingjun')[5],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -836,6 +854,7 @@ export default { ...@@ -836,6 +854,7 @@ export default {
}, },
{ {
field: "Total", field: "Total",
formatter: this.moneyFormat,
title: this.$t('objFill.v101.FinancialModule.jidupingjun')[6], title: this.$t('objFill.v101.FinancialModule.jidupingjun')[6],
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
...@@ -852,24 +871,24 @@ export default { ...@@ -852,24 +871,24 @@ export default {
}) })
}, },
moneyFormat(rowData, rowIndex, pagingIndex, field) { moneyFormat(rowData, rowIndex, pagingIndex, field) {
if (field === "JAN") return this.priceFormat(rowData.JAN); if (field === "JAN") return this.moneyFormatN(rowData.JAN);
if (field === "FEB") return this.priceFormat(rowData.FEB); if (field === "FEB") return this.moneyFormatN(rowData.FEB);
if (field === "MAR") return this.priceFormat(rowData.MAR); if (field === "MAR") return this.moneyFormatN(rowData.MAR);
if (field === "APR") return this.priceFormat(rowData.APR); if (field === "APR") return this.moneyFormatN(rowData.APR);
if (field === "MAY") return this.priceFormat(rowData.MAY); if (field === "MAY") return this.moneyFormatN(rowData.MAY);
if (field === "JUN") return this.priceFormat(rowData.JUN); if (field === "JUN") return this.moneyFormatN(rowData.JUN);
if (field === "TwoQuarter") return this.priceFormat(rowData.TwoQuarter); if (field === "TwoQuarter") return this.moneyFormatN(rowData.TwoQuarter);
if (field === "FirstHalf") return this.priceFormat(rowData.FirstHalf); if (field === "FirstHalf") return this.moneyFormatN(rowData.FirstHalf);
if (field === "JUL") return this.priceFormat(rowData.JUL); if (field === "JUL") return this.moneyFormatN(rowData.JUL);
if (field === "AUG") return this.priceFormat(rowData.AUG); if (field === "AUG") return this.moneyFormatN(rowData.AUG);
if (field === "SEP") return this.priceFormat(rowData.SEP); if (field === "SEP") return this.moneyFormatN(rowData.SEP);
if (field === "ThreeQuarter") return this.priceFormat(rowData.ThreeQuarter); if (field === "ThreeQuarter") return this.moneyFormatN(rowData.ThreeQuarter);
if (field === "OCT") return this.priceFormat(rowData.OCT); if (field === "OCT") return this.moneyFormatN(rowData.OCT);
if (field === "NOV") return this.priceFormat(rowData.NOV); if (field === "NOV") return this.moneyFormatN(rowData.NOV);
if (field === "DEC") return this.priceFormat(rowData.DEC); if (field === "DEC") return this.moneyFormatN(rowData.DEC);
if (field === "FourQuarter") return this.priceFormat(rowData.FourQuarter); if (field === "FourQuarter") return this.moneyFormatN(rowData.FourQuarter);
if (field === "EndHalf") return this.priceFormat(rowData.EndHalf); if (field === "EndHalf") return this.moneyFormatN(rowData.EndHalf);
if (field === "Total") return this.priceFormat(rowData.Total ); if (field === "Total") return this.moneyFormatN(rowData.Total );
}, },
rowClick(rowIndex,rowData,column){ rowClick(rowIndex,rowData,column){
let field=column.field; let field=column.field;
...@@ -903,21 +922,6 @@ export default { ...@@ -903,21 +922,6 @@ export default {
},
priceFormat(value) {
if (value == null) {
return 0.0;
}
let nStr = value.toFixed(2);
nStr += "";
let x = nStr.split(".");
let x1 = x[0];
let x2 = x.length > 1 ? "." + x[1] : "";
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, "$1" + "," + "$2");
}
return x1 + x2;
}, },
method5: function() { method5: function() {
this.loading = true; this.loading = true;
......
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 to comment