Skip to content

S
SuperMan
Commit 7de01a2a authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

解决财务四舍五入，年度排名统计新增表格

parent bcf9b363
Show whitespace changes
Inline Side-by-side
Showing with 167 additions and 24 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 7de01a2a
...@@ -1506,7 +1506,8 @@ export default { ...@@ -1506,7 +1506,8 @@ export default {
let fee = this.payMsgList[index].Fee, let fee = this.payMsgList[index].Fee,
Rate = this.payMsgList[index].Rate==0?1:this.payMsgList[index].Rate, Rate = this.payMsgList[index].Rate==0?1:this.payMsgList[index].Rate,
Money = this.payMsgList[index].OriginalMoney; Money = this.payMsgList[index].OriginalMoney;
this.payMsgList[index].allMoney = Math.round(((Money*Rate)+fee) * 100) / 100; Rate=Rate*100;
this.payMsgList[index].allMoney = Math.round(((Money*Rate)+fee) * 100) / 100 / 100;
} else { } else {
this.payMsg.Fee = isNaN(parseFloat(this.payMsg.Fee))?0:parseFloat(this.payMsg.Fee); this.payMsg.Fee = isNaN(parseFloat(this.payMsg.Fee))?0:parseFloat(this.payMsg.Fee);
this.payMsg.Rate = isNaN(parseFloat(this.payMsg.Rate))?0:parseFloat(this.payMsg.Rate); this.payMsg.Rate = isNaN(parseFloat(this.payMsg.Rate))?0:parseFloat(this.payMsg.Rate);
...@@ -1514,7 +1515,8 @@ export default { ...@@ -1514,7 +1515,8 @@ export default {
let fee = this.payMsg.Fee, let fee = this.payMsg.Fee,
Rate = this.payMsg.Rate==0?1:this.payMsg.Rate, Rate = this.payMsg.Rate==0?1:this.payMsg.Rate,
Money = this.payMsg.OriginalMoney; Money = this.payMsg.OriginalMoney;
this.payMsg.allMoney = Math.round(((Money*Rate)+fee) * 100) / 100; Rate=Rate*100;
this.payMsg.allMoney = Math.round(((Money*Rate)+fee) * 100) / 100 / 100;
} }
}, },
......
src/components/FinancialModule/ReportForm/AnnualRanking.vue
View file @ 7de01a2a
...@@ -9,10 +9,13 @@ ...@@ -9,10 +9,13 @@
.AnnualRanking .year{ .AnnualRanking .year{
text-align: center; text-align: center;
padding:10px 0; padding:10px 0;
margin-top: 20px; margin-top: 50px;
background: #fff; background: #fff;
} }
.AnnualRanking .dataList{
margin-bottom: 30px;
}
.AnnualRanking .dataList .el-table td, .el-table th{ .AnnualRanking .dataList .el-table td, .el-table th{
padding:3px 0; padding:3px 0;
} }
...@@ -66,6 +69,7 @@ ...@@ -66,6 +69,7 @@
<el-option key="0" label="全部" :value="0"></el-option> <el-option key="0" label="全部" :value="0"></el-option>
<el-option key="1" label="销售额" :value="1"></el-option> <el-option key="1" label="销售额" :value="1"></el-option>
<el-option key="2" label="毛利" :value="2"></el-option> <el-option key="2" label="毛利" :value="2"></el-option>
<el-option key="9" label="毛利率" :value="9"></el-option>
<el-option key="3" label="佣金" :value="3"></el-option> <el-option key="3" label="佣金" :value="3"></el-option>
<el-option key="4" label="收客数量" :value="4"></el-option> <el-option key="4" label="收客数量" :value="4"></el-option>
<el-option key="5" label="联运收入" :value="5"></el-option> <el-option key="5" label="联运收入" :value="5"></el-option>
...@@ -139,13 +143,138 @@ ...@@ -139,13 +143,138 @@
<el-table-column sortable prop="Total" label="全年平均" min-width="120"> </el-table-column> <el-table-column sortable prop="Total" label="全年平均" min-width="120"> </el-table-column>
</el-table> </el-table>
</div> </div>
<!-- 佣金列表排名 --> <!-- 毛利率排名 -->
<div v-show="type==0 || type==3"> <div v-show="type==0 || type==9">
<div class="year">{{msg.Year}}年佣金列表排名</div> <div class="year">{{msg.Year}}年平均毛利率排名</div>
<el-table border <el-table border
:cell-class-name="CellName" :cell-class-name="CellName"
:header-cell-class-name="HeaderName" :header-cell-class-name="HeaderName"
:data="CommissionList" :data="MaoLiLvList"
style="width: 100%">
<el-table-column fixed sortable prop="BranchName" label="公司名称" min-width="100"> </el-table-column>
<el-table-column sortable prop="January" label="一月" min-width="100">
<template slot-scope="scope">
<span v-if="maolitype==1">{{scope.row.January}}</span>
<span v-if="maolitype==2">{{scope.row.January}}%</span>
</template>
</el-table-column>
<el-table-column sortable prop="February" label="二月" min-width="100">
<template slot-scope="scope">
<span v-if="maolitype==1">{{scope.row.February}}</span>
<span v-if="maolitype==2">{{scope.row.February}}%</span>
</template>
</el-table-column>
<el-table-column sortable prop="March" label="三月" min-width="100">
<template slot-scope="scope">
<span v-if="maolitype==1">{{scope.row.March}}</span>
<span v-if="maolitype==2">{{scope.row.March}}%</span>
</template>
</el-table-column>
<el-table-column sortable prop="FirstQuarter" label="第一季度平均" min-width="120">
<template slot-scope="scope">
<span v-if="maolitype==1">{{scope.row.FirstQuarter}}</span>
<span v-if="maolitype==2">{{scope.row.FirstQuarter}}%</span>
</template>
</el-table-column>
<el-table-column sortable prop="April" label="四月" min-width="100">
<template slot-scope="scope">
<span v-if="maolitype==1">{{scope.row.April}}</span>
<span v-if="maolitype==2">{{scope.row.April}}%</span>
</template>
</el-table-column>
<el-table-column sortable prop="May" label="五月" min-width="100">
<template slot-scope="scope">
<span v-if="maolitype==1">{{scope.row.May}}</span>
<span v-if="maolitype==2">{{scope.row.May}}%</span>
</template>
</el-table-column>
<el-table-column sortable prop="June" label="六月" min-width="100">
<template slot-scope="scope">
<span v-if="maolitype==1">{{scope.row.June}}</span>
<span v-if="maolitype==2">{{scope.row.June}}%</span>
</template>
</el-table-column>
<el-table-column sortable prop="SecondQuarter" label="第二季度平均" min-width="120">
<template slot-scope="scope">
<span v-if="maolitype==1">{{scope.row.SecondQuarter}}</span>
<span v-if="maolitype==2">{{scope.row.SecondQuarter}}%</span>
</template>
</el-table-column>
<el-table-column sortable prop="HalfReport" label="上半年平均" min-width="120">
<template slot-scope="scope">
<span v-if="maolitype==1">{{scope.row.HalfReport}}</span>
<span v-if="maolitype==2">{{scope.row.HalfReport}}%</span>
</template>
</el-table-column>
<el-table-column sortable prop="July" label="七月" min-width="100">
<template slot-scope="scope">
<span v-if="maolitype==1">{{scope.row.July}}</span>
<span v-if="maolitype==2">{{scope.row.July}}%</span>
</template>
</el-table-column>
<el-table-column sortable prop="August" label="八月" min-width="100">
<template slot-scope="scope">
<span v-if="maolitype==1">{{scope.row.August}}</span>
<span v-if="maolitype==2">{{scope.row.August}}%</span>
</template>
</el-table-column>
<el-table-column sortable prop="September" label="九月" min-width="100">
<template slot-scope="scope">
<span v-if="maolitype==1">{{scope.row.September}}</span>
<span v-if="maolitype==2">{{scope.row.September}}%</span>
</template>
</el-table-column>
<el-table-column sortable prop="ThirdQuarter" label="第三季度平均" min-width="120">
<template slot-scope="scope">
<span v-if="maolitype==1">{{scope.row.ThirdQuarter}}</span>
<span v-if="maolitype==2">{{scope.row.ThirdQuarter}}%</span>
</template>
</el-table-column>
<el-table-column sortable prop="October" label="十月" min-width="100">
<template slot-scope="scope">
<span v-if="maolitype==1">{{scope.row.October}}</span>
<span v-if="maolitype==2">{{scope.row.October}}%</span>
</template>
</el-table-column>
<el-table-column sortable prop="November" label="十一月" min-width="100">
<template slot-scope="scope">
<span v-if="maolitype==1">{{scope.row.November}}</span>
<span v-if="maolitype==2">{{scope.row.November}}%</span>
</template>
</el-table-column>
<el-table-column sortable prop="December" label="十二月" min-width="100">
<template slot-scope="scope">
<span v-if="maolitype==1">{{scope.row.December}}</span>
<span v-if="maolitype==2">{{scope.row.December}}%</span>
</template>
</el-table-column>
<el-table-column sortable prop="FourthQuarter" label="第四季度平均" min-width="120">
<template slot-scope="scope">
<span v-if="maolitype==1">{{scope.row.FourthQuarter}}</span>
<span v-if="maolitype==2">{{scope.row.FourthQuarter}}%</span>
</template>
</el-table-column>
<el-table-column sortable prop="LastHalfReport" label="下半年平均" min-width="120">
<template slot-scope="scope">
<span v-if="maolitype==1">{{scope.row.LastHalfReport}}</span>
<span v-if="maolitype==2">{{scope.row.LastHalfReport}}%</span>
</template>
</el-table-column>
<el-table-column sortable prop="Total" label="全年平均" min-width="120">
<template slot-scope="scope">
<span v-if="maolitype==1">{{scope.row.Total}}</span>
<span v-if="maolitype==2">{{scope.row.Total}}%</span>
</template>
</el-table-column>
</el-table>
</div>
<!-- 净利润 ProfitsList -->
<div v-show="type==0 || type==7">
<div class="year">{{msg.Year}}年净利润排名</div>
<el-table border
:cell-class-name="CellName"
:header-cell-class-name="HeaderName"
:data="ProfitsList"
style="width: 100%"> style="width: 100%">
<el-table-column fixed sortable prop="BranchName" label="公司名称" min-width="100"> </el-table-column> <el-table-column fixed sortable prop="BranchName" label="公司名称" min-width="100"> </el-table-column>
<el-table-column sortable prop="January" label="一月" min-width="100"></el-table-column> <el-table-column sortable prop="January" label="一月" min-width="100"></el-table-column>
...@@ -169,13 +298,13 @@ ...@@ -169,13 +298,13 @@
<el-table-column sortable prop="Total" label="全年平均" min-width="120"> </el-table-column> <el-table-column sortable prop="Total" label="全年平均" min-width="120"> </el-table-column>
</el-table> </el-table>
</div> </div>
<!-- 收客数量排名 GuestList--> <!-- 佣金列表排名 -->
<div v-show="type==0 || type==4"> <div v-show="type==0 || type==3">
<div class="year">{{msg.Year}}年收客数量排名</div> <div class="year">{{msg.Year}}年佣金收入列表排名</div>
<el-table border <el-table border
:cell-class-name="CellName" :cell-class-name="CellName"
:header-cell-class-name="HeaderName" :header-cell-class-name="HeaderName"
:data="GuestList" :data="CommissionList"
style="width: 100%"> style="width: 100%">
<el-table-column fixed sortable prop="BranchName" label="公司名称" min-width="100"> </el-table-column> <el-table-column fixed sortable prop="BranchName" label="公司名称" min-width="100"> </el-table-column>
<el-table-column sortable prop="January" label="一月" min-width="100"></el-table-column> <el-table-column sortable prop="January" label="一月" min-width="100"></el-table-column>
...@@ -199,13 +328,13 @@ ...@@ -199,13 +328,13 @@
<el-table-column sortable prop="Total" label="全年平均" min-width="120"> </el-table-column> <el-table-column sortable prop="Total" label="全年平均" min-width="120"> </el-table-column>
</el-table> </el-table>
</div> </div>
<!-- 联运收入 UnionList --> <!-- 收客数量排名 GuestList-->
<div v-show="type==0 || type==5"> <div v-show="type==0 || type==4">
<div class="year">{{msg.Year}}年联运收入排名</div> <div class="year">{{msg.Year}}年收客数量排名</div>
<el-table border <el-table border
:cell-class-name="CellName" :cell-class-name="CellName"
:header-cell-class-name="HeaderName" :header-cell-class-name="HeaderName"
:data="UnionList" :data="GuestList"
style="width: 100%"> style="width: 100%">
<el-table-column fixed sortable prop="BranchName" label="公司名称" min-width="100"> </el-table-column> <el-table-column fixed sortable prop="BranchName" label="公司名称" min-width="100"> </el-table-column>
<el-table-column sortable prop="January" label="一月" min-width="100"></el-table-column> <el-table-column sortable prop="January" label="一月" min-width="100"></el-table-column>
...@@ -229,13 +358,13 @@ ...@@ -229,13 +358,13 @@
<el-table-column sortable prop="Total" label="全年平均" min-width="120"> </el-table-column> <el-table-column sortable prop="Total" label="全年平均" min-width="120"> </el-table-column>
</el-table> </el-table>
</div> </div>
<!-- 日本线 AvgMoneyList --> <!-- 联运收入 UnionList -->
<div v-show="type==0 || type==6"> <div v-show="type==0 || type==5">
<div class="year">{{msg.Year}}年日本线排名</div> <div class="year">{{msg.Year}}年联运收入排名</div>
<el-table border <el-table border
:cell-class-name="CellName" :cell-class-name="CellName"
:header-cell-class-name="HeaderName" :header-cell-class-name="HeaderName"
:data="AvgMoneyList" :data="UnionList"
style="width: 100%"> style="width: 100%">
<el-table-column fixed sortable prop="BranchName" label="公司名称" min-width="100"> </el-table-column> <el-table-column fixed sortable prop="BranchName" label="公司名称" min-width="100"> </el-table-column>
<el-table-column sortable prop="January" label="一月" min-width="100"></el-table-column> <el-table-column sortable prop="January" label="一月" min-width="100"></el-table-column>
...@@ -259,13 +388,13 @@ ...@@ -259,13 +388,13 @@
<el-table-column sortable prop="Total" label="全年平均" min-width="120"> </el-table-column> <el-table-column sortable prop="Total" label="全年平均" min-width="120"> </el-table-column>
</el-table> </el-table>
</div> </div>
<!-- 净利润 ProfitsList --> <!-- 日本線平均賣價排名 AvgMoneyList -->
<div v-show="type==0 || type==7"> <div v-show="type==0 || type==6">
<div class="year">{{msg.Year}}年净利润排名</div> <div class="year">{{msg.Year}}年日本線平均賣價排名</div>
<el-table border <el-table border
:cell-class-name="CellName" :cell-class-name="CellName"
:header-cell-class-name="HeaderName" :header-cell-class-name="HeaderName"
:data="ProfitsList" :data="AvgMoneyList"
style="width: 100%"> style="width: 100%">
<el-table-column fixed sortable prop="BranchName" label="公司名称" min-width="100"> </el-table-column> <el-table-column fixed sortable prop="BranchName" label="公司名称" min-width="100"> </el-table-column>
<el-table-column sortable prop="January" label="一月" min-width="100"></el-table-column> <el-table-column sortable prop="January" label="一月" min-width="100"></el-table-column>
...@@ -289,6 +418,7 @@ ...@@ -289,6 +418,7 @@
<el-table-column sortable prop="Total" label="全年平均" min-width="120"> </el-table-column> <el-table-column sortable prop="Total" label="全年平均" min-width="120"> </el-table-column>
</el-table> </el-table>
</div> </div>
<!-- 机票罚金 ProfitsList --> <!-- 机票罚金 ProfitsList -->
<div v-show="type==0 || type==8"> <div v-show="type==0 || type==8">
<div class="year">{{msg.Year}}年机票罚金排名</div> <div class="year">{{msg.Year}}年机票罚金排名</div>
...@@ -340,12 +470,14 @@ ...@@ -340,12 +470,14 @@
AALloading:false, AALloading:false,
SaleMoneyList:[], SaleMoneyList:[],
MaoLiList:[], MaoLiList:[],
MaoLiLvList:[],
CommissionList:[], CommissionList:[],
GuestList:[], GuestList:[],
UnionList:[], UnionList:[],
AvgMoneyList:[], AvgMoneyList:[],
ProfitsList:[], ProfitsList:[],
AirPenalty:[], AirPenalty:[],
maolitype:2,
} }
}, },
created(){ created(){
...@@ -388,13 +520,22 @@ ...@@ -388,13 +520,22 @@
}, },
GetList(){ GetList(){
this.AALloading=true; this.AALloading=true;
if(this.msg.SortType==1){
this.maolitype=1;
}
if(this.msg.SortType==2){
this.maolitype=2;
}
this.apipost('financestatistics_post_GetCompanySaleRankList', this.msg, res=>{ this.apipost('financestatistics_post_GetCompanySaleRankList', this.msg, res=>{
this.AALloading = false this.AALloading = false
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
console.log("res",res); // console.log("res",res);
this.SaleMoneyList=res.data.data.SaleMoneyList; this.SaleMoneyList=res.data.data.SaleMoneyList;
this.MaoLiList=res.data.data.MaoLiList; this.MaoLiList=res.data.data.MaoLiList;
this.MaoLiLvList=res.data.data.MaoLiLvList;
this.CommissionList=res.data.data.CommissionList; this.CommissionList=res.data.data.CommissionList;
this.GuestList=res.data.data.GuestList; this.GuestList=res.data.data.GuestList;
this.UnionList=res.data.data.UnionList; this.UnionList=res.data.data.UnionList;
......
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