Skip to content

S
SuperMan
Commit 2a7e5734 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

团队收支

parent 4a0c164b
Show whitespace changes
Inline Side-by-side
Showing with 360 additions and 44 deletions
src/assets/common/lang/zh.js
View file @ 2a7e5734
...@@ -1579,7 +1579,15 @@ export const adm={ ...@@ -1579,7 +1579,15 @@ export const adm={
adm_xbdkdizhi:"下班打卡地址", adm_xbdkdizhi:"下班打卡地址",
adm_dkshebei:"打卡设备", adm_dkshebei:"打卡设备",
adm_timenomorethan:"时间跨度不能超过31天!", adm_timenomorethan:"时间跨度不能超过31天!",
adm_time:"时间",
adm_exportexcel:"导出报表",
adm_Sunday:"星期日",
adm_Monday:"星期一",
adm_Tuesday:"星期二",
adm_Wednesday:"星期三",
adm_Thursday:"星期四",
adm_Friday:"星期五",
adm_Saturday:"星期六",
} }
export const visaT = { export const visaT = {
......
src/assets/css/cssReset.css
View file @ 2a7e5734
...@@ -481,7 +481,10 @@ vertical-align:middle ...@@ -481,7 +481,10 @@ vertical-align:middle
overflow:auto; overflow:auto;
padding: 0 20px; padding: 0 20px;
} }
.My_table_tell .v-table-body-cell{
display: block!important;
line-height: 30px!important;
}
.column-cell-class-name-test-red .v-table-body-cell{ .column-cell-class-name-test-red .v-table-body-cell{
background-color:#e95252; background-color:#e95252;
color:#fff; color:#fff;
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ 2a7e5734
...@@ -805,7 +805,7 @@ export default { ...@@ -805,7 +805,7 @@ export default {
QStartDate:'', QStartDate:'',
UpdateBy:'', UpdateBy:'',
Sort:'2', Sort:'2',
IsSpecial:1 IsSpecial:0
}, },
getCompanyMsg:{ // 公司 getCompanyMsg:{ // 公司
RB_Group_Id:'0', RB_Group_Id:'0',
......
src/components/FinancialModule/ReportForm/EasyReport.vue
View file @ 2a7e5734
...@@ -22,18 +22,14 @@ ...@@ -22,18 +22,14 @@
top: 55px; top: 55px;
right: 0; right: 0;
} }
.page_EasyReport .v-table-body-cell{ /* .My_table_tell .v-table-body-cell{
display: block!important; display: block!important;
line-height: 30px!important; line-height: 30px!important;
} }
/* .gourl_span>span{ */
display: block;
width: 100%;
height: 100%;
} */
</style> </style>
<template> <template>
<div class="page_EasyReport" v-loading="AALloading"> <div class="page_EasyReport My_table_tell" v-loading="AALloading">
<div class="page_EasyReport_set clearfix"> <div class="page_EasyReport_set clearfix">
<el-form class="clearfix page_EasyReport_form" label-width="110px"> <el-form class="clearfix page_EasyReport_form" label-width="110px">
<el-row style="padding:15px 0 0 0;"> <el-row style="padding:15px 0 0 0;">
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 2a7e5734
<style> <style scoped>
.page_fnDm { .page_fnDm {
background-color: white; background-color: white;
} }
.query-box { .PAGE_teamRE .query-box {
overflow: inherit; overflow: inherit;
padding-bottom: 0; padding-bottom: 0;
} }
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
.el-range-editor.el-input__inner { .el-range-editor.el-input__inner {
border-radius: 0; border-radius: 0;
} }
.query-box { .PAGE_teamRE .query-box {
border: none; border: none;
} }
.hight_query { .hight_query {
...@@ -404,16 +404,13 @@ tr._item_list td:last-child { ...@@ -404,16 +404,13 @@ tr._item_list td:last-child {
border-radius: 4px; border-radius: 4px;
margin-bottom: 10px; margin-bottom: 10px;
} }
._fnDm_content .v-table-body-cell{
display: block!important;
line-height: 30px!important;
}
</style> </style>
<template> <template>
<div class="page_fnDm page_RecPayQuery PAGE_teamRE" v-loading="AALloading"> <div class="My_table_tell page_fnDm page_RecPayQuery PAGE_teamRE" v-loading="AALloading">
<div class="query-box"> <div class="query-box">
<el-form class="_info_box clearfix" label-width="110px"> <el-form class="_info_box clearfix" label-width="110px">
<el-row style="padding:15px 20px 0 0;"> <el-row style="padding:15px 20px 0 0;">
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 2a7e5734
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
margin-bottom: 10px; margin-bottom: 10px;
} }
.Team_DList div { .Team_DList div {
margin-bottom: 10px; margin-bottom: 8px;
color: #666666; color: #666666;
} }
.Team_firstTitle { .Team_firstTitle {
...@@ -114,6 +114,9 @@ ...@@ -114,6 +114,9 @@
margin-left: 20px; margin-left: 20px;
} }
.TeamBalancePayment .TB_PrintDiv{height:40px;} .TeamBalancePayment .TB_PrintDiv{height:40px;}
.span_all{
margin-left:15px;
}
</style> </style>
<template> <template>
...@@ -144,6 +147,9 @@ ...@@ -144,6 +147,9 @@
<div>应收<span>￥{{DataList.TeamBalance.ShouldReceive}}</span></div> <div>应收<span>￥{{DataList.TeamBalance.ShouldReceive}}</span></div>
<div>实收<span class="Team_Coins">￥{{DataList.TeamBalance.ActualReceive}}</span></div> <div>实收<span class="Team_Coins">￥{{DataList.TeamBalance.ActualReceive}}</span></div>
<div>待收<span class="Team_Coins">￥{{DataList.TeamBalance.WaitRecive}}</span></div> <div>待收<span class="Team_Coins">￥{{DataList.TeamBalance.WaitRecive}}</span></div>
<div>
注：应收=订单应收总额，实收=订单实收总额
</div>
</div> </div>
</div> </div>
</el-col> </el-col>
...@@ -158,6 +164,9 @@ ...@@ -158,6 +164,9 @@
<div>应付<span>￥{{DataList.TeamBalance.ShouldPay}}</span></div> <div>应付<span>￥{{DataList.TeamBalance.ShouldPay}}</span></div>
<div>实付<span class="Team_Coins">￥{{DataList.TeamBalance.ActualPay}}</span></div> <div>实付<span class="Team_Coins">￥{{DataList.TeamBalance.ActualPay}}</span></div>
<div>待付<span class="Team_Coins">￥{{DataList.TeamBalance.WaitPay}}</span></div> <div>待付<span class="Team_Coins">￥{{DataList.TeamBalance.WaitPay}}</span></div>
<div>
注：成本单据总额(包含退款)+提成-小费收入-地接收入
</div>
</div> </div>
</div> </div>
</el-col> </el-col>
...@@ -171,6 +180,9 @@ ...@@ -171,6 +180,9 @@
<div class="Team_Incontent"> <div class="Team_Incontent">
<div>实际利润<span>￥{{DataList.TeamBalance.ExpectedProfit}}</span></div> <div>实际利润<span>￥{{DataList.TeamBalance.ExpectedProfit}}</span></div>
<div>当前利润<span class="Team_Coins">￥{{DataList.TeamBalance.ActualProfit}}</span></div> <div>当前利润<span class="Team_Coins">￥{{DataList.TeamBalance.ActualProfit}}</span></div>
<div>
注：实收-(应付/实付)+佣金收入+自费收入-联运成本
</div>
</div> </div>
</div> </div>
</el-col> </el-col>
...@@ -208,7 +220,14 @@ ...@@ -208,7 +220,14 @@
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddIncomeDetail" /> <input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddIncomeDetail" />
</div> </div>
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">团费收入：</div> <div class="TB_comtitle TB-Title">团费收入：
<span v-if="moneyAll.Moneyall>0 || moneyAll.PayMoneyall>0">
<span class="span_all">应收：¥{{moneyFormat(moneyAll.Moneyall)}}</span>
<span class="span_all">实收：¥{{moneyFormat(moneyAll.PayMoneyall)}}</span>
</span>
</div>
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
...@@ -252,7 +271,13 @@ ...@@ -252,7 +271,13 @@
</template> </template>
</table> </table>
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">地接款收入：</div> <div class="TB_comtitle TB-Title">地接款收入：
<span v-if="moneyAll.dijieys>0 || moneyAll.dijiess>0">
<span class="span_all">应收：¥{{moneyFormat(moneyAll.dijieys)}}</span>
<span class="span_all">实收：¥{{moneyFormat(moneyAll.dijiess)}}</span>
</span>
</div>
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
...@@ -296,7 +321,13 @@ ...@@ -296,7 +321,13 @@
</template> </template>
</table> </table>
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">自费收入：</div> <div class="TB_comtitle TB-Title">自费收入：
<span v-if="moneyAll.zifeiys>0 || moneyAll.zifeiss>0">
<span class="span_all">应收：¥{{moneyFormat(moneyAll.zifeiys)}}</span>
<span class="span_all">实收：¥{{moneyFormat(moneyAll.zifeiss)}}</span>
</span>
</div>
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
...@@ -340,7 +371,13 @@ ...@@ -340,7 +371,13 @@
</template> </template>
</table> </table>
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">小费收入：</div> <div class="TB_comtitle TB-Title">小费收入：
<span v-if="moneyAll.xiaofeiys>0 || moneyAll.xiaofeiss>0">
<span class="span_all">应收：¥{{moneyFormat(moneyAll.xiaofeiys)}}</span>
<span class="span_all">实收：¥{{moneyFormat(moneyAll.xiaofeiss)}}</span>
</span>
</div>
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
...@@ -384,7 +421,13 @@ ...@@ -384,7 +421,13 @@
</template> </template>
</table> </table>
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">佣金收入：</div> <div class="TB_comtitle TB-Title">佣金收入：
<span v-if="moneyAll.yongjinys>0 || moneyAll.yongjinss>0">
<span class="span_all">应收：¥{{moneyFormat(moneyAll.yongjinys)}}</span>
<span class="span_all">实收：¥{{moneyFormat(moneyAll.yongjinss)}}</span>
</span>
</div>
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
...@@ -428,7 +471,13 @@ ...@@ -428,7 +471,13 @@
</template> </template>
</table> </table>
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">其他收入：</div> <div class="TB_comtitle TB-Title">其他收入：
<span v-if="moneyAll.otherys>0 || moneyAll.otherss>0">
<span class="span_all">应收：¥{{moneyFormat(moneyAll.otherys)}}</span>
<span class="span_all">实收：¥{{moneyFormat(moneyAll.otherss)}}</span>
</span>
</div>
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
...@@ -472,13 +521,20 @@ ...@@ -472,13 +521,20 @@
</template> </template>
</table> </table>
</div> </div>
<div class="Team_collection" v-loading="loading"> <div class="Team_collection" v-loading="loading">
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">成本</div> <div class="TB_comtitle TB-Title">成本</div>
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" /> <input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
</div> </div>
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">邀请函：</div> <div class="TB_comtitle TB-Title">邀请函：
<span v-if="moneyAll.yqhyf>0 || moneyAll.yqhsf>0">
<span class="span_all">应付：¥{{moneyFormat(moneyAll.yqhyf)}}</span>
<span class="span_all">实付：¥{{moneyFormat(moneyAll.yqhsf)}}</span>
</span>
</div>
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
...@@ -525,7 +581,13 @@ ...@@ -525,7 +581,13 @@
</template> </template>
</table> </table>
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">车资：</div> <div class="TB_comtitle TB-Title">车资：
<span v-if="moneyAll.cheziyf>0 || moneyAll.chezisf>0">
<span class="span_all">应付：¥{{moneyFormat(moneyAll.cheziyf)}}</span>
<span class="span_all">实付：¥{{moneyFormat(moneyAll.chezisf)}}</span>
</span>
</div>
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
...@@ -572,7 +634,13 @@ ...@@ -572,7 +634,13 @@
</template> </template>
</table> </table>
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">机票款：</div> <div class="TB_comtitle TB-Title">机票款：
<span v-if="moneyAll.ticketyf>0 || moneyAll.ticketsf>0">
<span class="span_all">应付：¥{{moneyFormat(moneyAll.ticketyf)}}</span>
<span class="span_all">实付：¥{{moneyFormat(moneyAll.ticketsf)}}</span>
</span>
</div>
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
...@@ -667,7 +735,14 @@ ...@@ -667,7 +735,14 @@
</template> </template>
</table> --> </table> -->
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">签证：</div> <div class="TB_comtitle TB-Title">签证：
<span v-if="moneyAll.qzyf>0 || moneyAll.qzsf>0">
<span class="span_all">应付：¥{{moneyFormat(moneyAll.qzyf)}}</span>
<span class="span_all">实付：¥{{moneyFormat(moneyAll.qzsf)}}</span>
</span>
</div>
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
...@@ -714,7 +789,14 @@ ...@@ -714,7 +789,14 @@
</template> </template>
</table> </table>
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">提成：</div> <div class="TB_comtitle TB-Title">提成：
<span v-if="moneyAll.tichengyf>0 || moneyAll.tichengsf>0">
<span class="span_all">应付：¥{{moneyFormat(moneyAll.tichengyf)}}</span>
<span class="span_all">实付：¥{{moneyFormat(moneyAll.tichengsf)}}</span>
</span>
</div>
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
...@@ -761,7 +843,13 @@ ...@@ -761,7 +843,13 @@
</template> </template>
</table> </table>
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">地接款支出：</div> <div class="TB_comtitle TB-Title">地接款支出：
<span v-if="moneyAll.dijieyf>0 || moneyAll.dijiesf>0">
<span class="span_all">应付：¥{{moneyFormat(moneyAll.dijieyf)}}</span>
<span class="span_all">实付：¥{{moneyFormat(moneyAll.dijiesf)}}</span>
</span>
</div>
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
...@@ -808,7 +896,14 @@ ...@@ -808,7 +896,14 @@
</template> </template>
</table> </table>
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">赔偿</div> <div class="TB_comtitle TB-Title">赔偿:
<span v-if="moneyAll.peichangyf>0 || moneyAll.peichangsf>0">
<span class="span_all">应付：¥{{moneyFormat(moneyAll.peichangyf)}}</span>
<span class="span_all">实付：¥{{moneyFormat(moneyAll.peichangsf)}}</span>
</span>
</div>
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
...@@ -855,7 +950,14 @@ ...@@ -855,7 +950,14 @@
</template> </template>
</table> </table>
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">保险费：</div> <div class="TB_comtitle TB-Title">保险费：
<span v-if="moneyAll.baoxianyf>0 || moneyAll.baoxiansf>0">
<span class="span_all">应付：¥{{moneyFormat(moneyAll.baoxianyf)}}</span>
<span class="span_all">实付：¥{{moneyFormat(moneyAll.baoxiansf)}}</span>
</span>
</div>
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
...@@ -902,7 +1004,14 @@ ...@@ -902,7 +1004,14 @@
</table> </table>
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">其他：</div> <div class="TB_comtitle TB-Title">其他：
<span v-if="moneyAll.othersf>0 || moneyAll.otheryf>0">
<span class="span_all">应付：¥{{moneyFormat(moneyAll.otheryf)}}</span>
<span class="span_all">实付：¥{{moneyFormat(moneyAll.othersf)}}</span>
</span>
</div>
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
...@@ -955,7 +1064,13 @@ ...@@ -955,7 +1064,13 @@
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" /> <input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
</div> </div>
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">领队佣金：</div> <div class="TB_comtitle TB-Title">领队佣金：
<span v-if="moneyAll.leaderyf>0 || moneyAll.leadersf>0">
<span class="span_all">应付：¥{{moneyFormat(moneyAll.leaderyf)}}</span>
<span class="span_all">实付：¥{{moneyFormat(moneyAll.leadersf)}}</span>
</span>
</div>
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
...@@ -1002,7 +1117,14 @@ ...@@ -1002,7 +1117,14 @@
</template> </template>
</table> </table>
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">导游佣金：</div> <div class="TB_comtitle TB-Title">导游佣金：
<span v-if="moneyAll.Guideyf>0 || moneyAll.Guidesf>0">
<span class="span_all">应付：¥{{moneyFormat(moneyAll.Guideyf)}}</span>
<span class="span_all">实付：¥{{moneyFormat(moneyAll.Guidesf)}}</span>
</span>
</div>
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
...@@ -1150,6 +1272,63 @@ ...@@ -1150,6 +1272,63 @@
FrIds: '', FrIds: '',
}, },
zhuanLoading: false, zhuanLoading: false,
moneyAll:{
Moneyall:0,
PayMoneyall:0,
// 收入 地接款
dijieys:0,
dijiess:0,
// 收入 自费
zifeiys:0,
zifeiss:0,
// 收入 小费
xiaofeiys:0,
xiaofeiss:0,
// 收入 佣金
yongjinys:0,
yongjinss:0,
// 收入 其他收入
otherys:0,
otherss:0,
// 成本 邀请函
yqhyf:0,
yqhsf:0,
// 成本 车资
cheziyf:0,
chezisf:0,
// 成本 机票款
ticketyf:0,
ticketsf:0,
// 成本 签证
qzyf:0,
qzsf:0,
// 成本 提成
tichengyf:0,
tichengsf:0,
// 成本 地接
dijieyf:0,
dijiesf:0,
// 成本 赔偿
peichangyf:0,
peichangsf:0,
// 保险费
baoxianyf:0,
baoxiansf:0,
// 其他收入
otheryf:0,
othersf:0,
// 非成本 领队
leaderyf:0,
leadersf:0,
// 导游
Guideyf:0,
Guidesf:0,
},
}; };
}, },
methods: { methods: {
...@@ -1228,6 +1407,41 @@ ...@@ -1228,6 +1407,41 @@
}); });
}, },
getList() { getList() {
let that=this;
this.moneyAll.Moneyall=0;
this.moneyAll.PayMoneyall=0;
this.moneyAll.dijieys=0;
this.moneyAll.dijiess=0;
this.moneyAll.zifeiys=0;
this.moneyAll.zifeiss=0;
this.moneyAll.xiaofeiys=0;
this.moneyAll.xiaofeiss=0;
this.moneyAll.yongjinys=0;
this.moneyAll.yongjinss=0;
this.moneyAll.otherys=0;
this.moneyAll.otherss=0;
this.moneyAll.yqhyf=0;
this.moneyAll.yqhsf=0;
this.moneyAll.cheziyf=0;
this.moneyAll.chezisf=0;
this.moneyAll.ticketyf=0;
this.moneyAll.ticketsf=0;
this.moneyAll.qzyf=0;
this.moneyAll.qzsf=0;
this.moneyAll.tichengyf=0;
this.moneyAll.tichengsf=0;
this.moneyAll.dijieyf=0;
this.moneyAll.dijiesf=0;
this.moneyAll.peichangyf=0;
this.moneyAll.peichangsf=0;
this.moneyAll.baoxianyf=0;
this.moneyAll.baoxiansf=0;
this.moneyAll.otheryf=0;
this.moneyAll.othersf=0;
this.moneyAll.leaderyf=0;
this.moneyAll.leadersf=0;
this.moneyAll.Guideyf=0;
this.moneyAll.Guidesf=0;
this.loading = true; this.loading = true;
let msg = { let msg = {
TCID: this.TCID TCID: this.TCID
...@@ -1241,7 +1455,105 @@ ...@@ -1241,7 +1455,105 @@
x.checked = false; x.checked = false;
}) })
this.DataList = data; this.DataList = data;
console.log("resa",this.DataList) this.DataList.FiniceReciveList.forEach(item=>{
if(that.isExists(item.CostTypeList,'团费') || that.isExists(item.CostTypeList,'团款')){
// 收入 团费
this.moneyAll.Moneyall+=item.Money;
this.moneyAll.PayMoneyall+=item.PayMoney;
}
// 收入 地接款
if(that.isExists(item.CostTypeList,'地接费（结算）')){
this.moneyAll.dijieys+=item.Money;
this.moneyAll.dijiess+=item.PayMoney;
}
// 收入 自费
if(that.isExists(item.CostTypeList,'自费')){
this.moneyAll.zifeiys+=item.Money;
this.moneyAll.zifeiss+=item.PayMoney;
}
// 收入 小费
if(that.isExists(item.CostTypeList,'小费')){
this.moneyAll.xiaofeiys+=item.Money;
this.moneyAll.xiaofeiss+=item.PayMoney;
}
// 收入 佣金
if(item.OrderSource===7){
this.moneyAll.yongjinys+=item.Money;
this.moneyAll.yongjinss+=item.PayMoney;
}
// 收入 其他
if(that.NotExists(item.CostTypeList,'团费')&& that.NotExists(item.CostTypeList,'小费')&&that.NotExists(item.CostTypeList,'自费') && that.NotExists(item.CostTypeList,'团款') && that.NotExists(item.CostTypeList,'地接费（结算）') && that.NotExists(item.CostTypeList,'小费收入') && that.NotExists(item.CostTypeList,'自费') && that.NotExists(item.CostTypeList,'佣金收入')&& item.OrderSource!==7){
this.moneyAll.otherys+=item.Money;
this.moneyAll.otherss+=item.PayMoney;
}
})
this.DataList.FinicePayList.forEach(item=>{
// 邀请函：
if(that.isExists(item.CostTypeList,'邀请函费用') || that.isExists(item.CostTypeList,'名单表费')){
this.moneyAll.yqhyf+=item.Money;
this.moneyAll.yqhsf+=item.PayMoney;
}
// 车资
if(that.isExists(item.CostTypeList,'车资')){
this.moneyAll.zheziyf+=item.Money;
this.moneyAll.zhezisf+=item.PayMoney;
}
// 机票款
if(that.isExists(item.CostTypeList,'国际段机票') || item.OrderSource===4 || that.isExists(item.CostTypeList,'机票退税') || that.isExists(item.CostTypeList,'机票罚金') || that.isExists(item.CostTypeList,'机票税金') || that.isExists(item.CostTypeList,'国内联运段机票')){
this.moneyAll.ticketyf+=item.Money;
this.moneyAll.ticketsf+=item.PayMoney;
}
// 签证
if(that.isExists(item.CostTypeList,'签证费') || that.isExists(item.CostTypeList,'签证佣金')){
this.moneyAll.qzyf+=item.Money;
this.moneyAll.qzsf+=item.PayMoney;
}
// 提成
if(that.isExists(item.CostTypeList,'提成')){
this.moneyAll.tichengyf+=item.Money;
this.moneyAll.tichengsf+=item.PayMoney;
}
// 地接
if((that.isExists(item.CostTypeList,'地接费（领取）') || (that.isExists(item.CostTypeList,'地接费（结算）'))) && item.Type==2){
this.moneyAll.dijieyf+=item.Money;
this.moneyAll.dijiesf+=item.PayMoney;
}
// 赔偿
if(item.OrderSource===11 || that.isExists(item.CostTypeList,'赔偿')){
this.moneyAll.peichangyf+=item.Money;
this.moneyAll.peichangsf+=item.PayMoney;
}
// 保险费
if(that.isExists(item.CostTypeList,'保险费') || that.isExists(item.CostTypeList,'旅游责任险')){
this.moneyAll.baoxianyf+=item.Money;
this.moneyAll.baoxiansf+=item.PayMoney;
}
// 其他
if(that.NotExists(item.CostTypeList,'签证费')&&that.NotExists(item.CostTypeList,'签证佣金') && that.NotExists(item.CostTypeList,'地接费（领取）') && that.NotExists(item.CostTypeList,'地接费（结算）') && that.NotExists(item.CostTypeList,'提成') && that.NotExists(item.CostTypeList,'国内联运')&& that.NotExists(item.CostTypeList,'车资') && that.NotExists(item.CostTypeList,'邀请函费用') && that.NotExists(item.CostTypeList,'名单表费') && that.NotExists(item.CostTypeList,'领队佣金') && that.NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 && that.NotExists(item.CostTypeList,'国际段机票') && that.NotExists(item.CostTypeList,'机票退税') && that.NotExists(item.CostTypeList,'机票罚金') && that.NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && that.NotExists(item.CostTypeList,'赔偿') && that.NotExists(item.CostTypeList,'保险费') && that.NotExists(item.CostTypeList,'旅游责任险')){
this.moneyAll.otheryf+=item.Money;
this.moneyAll.othersf+=item.PayMoney;
}
// 非成本 领队佣金
if(that.isExists(item.CostTypeList,'领队佣金')){
this.moneyAll.leaderyf+=item.Money;
this.moneyAll.leadersf+=item.PayMoney;
}
// 非成本 导游佣金
if(that.isExists(item.CostTypeList,'导游佣金')){
this.moneyAll.Guideyf+=item.Money;
this.moneyAll.Guidesf+=item.PayMoney;
}
})
} }
}); });
}, },
......
src/components/administrative/Attendance.vue
View file @ 2a7e5734
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<th>{{$t('adm.adm_Bindingattendance')}}</th> <th>{{$t('adm.adm_Bindingattendance')}}</th>
<th>{{$t('admin.admin_kqTime')}}</th> <th>{{$t('admin.admin_kqTime')}}</th>
<th >{{$t('admin.admin_czPerson')}}</th> <th >{{$t('admin.admin_czPerson')}}</th>
<th width="80">{{$t('admin.admin_operate')}}</th> <th width="150">{{$t('admin.admin_operate')}}</th>
</tr> </tr>
<tr v-for="(item,index) in dataList"> <tr v-for="(item,index) in dataList">
<td>{{item.BranchName}}</td> <td>{{item.BranchName}}</td>
......
src/components/administrative/statisticsCheckTime.vue
View file @ 2a7e5734
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</el-option> </el-option>
</el-select> </el-select>
</span></li> </span></li>
<li><span><em>时间</em> <li><span><em>{{$t('adm.adm_time')}}</em>
<el-date-picker :picker-options="pickerOptions0" v-model='msg.StartTime' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker :picker-options="pickerOptions0" v-model='msg.StartTime' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
- -
<el-date-picker :picker-options="pickerOptions1" v-model='msg.EndTime' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker :picker-options="pickerOptions1" v-model='msg.EndTime' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<li> <li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
<input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" /> <input type="button" class="normalBtn" :value="$t('adm.adm_exportexcel')" @click="exportExcel()" />
</li> </li>
</ul> </ul>
</div> </div>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="DepartmentName" :label="$t('admin.admin_Department')" min-width="120"> <el-table-column prop="DepartmentName" :label="$t('admin.admin_Department')" min-width="120">
</el-table-column> </el-table-column>
<el-table-column prop="EmployeeId" label="工号" min-width="80"> <el-table-column prop="EmployeeId" :label="$t('adm.adm_Jobnumber')" min-width="80">
</el-table-column> </el-table-column>
<el-table-column prop="PostName" :label="$t('admin.admin_Post')" min-width="120"> <el-table-column prop="PostName" :label="$t('admin.admin_Post')" min-width="120">
</el-table-column> </el-table-column>
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
let endTime = new Date(this.msg.EndTime) let endTime = new Date(this.msg.EndTime)
let starTime = new Date(this.msg.StartTime) let starTime = new Date(this.msg.StartTime)
if(endTime - starTime > 2.6784e9) { if(endTime - starTime > 2.6784e9) {
this.$alert('时间跨度不能超过31天！！', '提示') this.$alert(this.$t('adm.adm_timenomorethan'), this.$t('tips.tips'))
return return
} }
this.apipost('User_get_GetClockTimeRecordList', this.msg, res => { this.apipost('User_get_GetClockTimeRecordList', this.msg, res => {
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
}, },
getWeekByDay(dayValue) { getWeekByDay(dayValue) {
var day = new Date(Date.parse(dayValue.replace(/-/g, '/'))); var day = new Date(Date.parse(dayValue.replace(/-/g, '/')));
var today = new Array("星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"); var today = new Array(this.$t('adm.adm_Sunday'), this.$t('adm.adm_Monday'), this.$t('adm.adm_adm_Tuesday'), this.$t('adm.adm_Wednesday'), this.$t('adm.adm_Thursday'), this.$t('adm.adm_Friday'), this.$t('adm.adm_Saturday'));
return today[day.getDay()]; return today[day.getDay()];
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
......
src/components/administrative/statisticsDetail.vue
View file @ 2a7e5734
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
let endTime = new Date(this.msg.EndTime) let endTime = new Date(this.msg.EndTime)
let starTime = new Date(this.msg.StartTime) let starTime = new Date(this.msg.StartTime)
if(endTime - starTime > 2.6784e9) { if(endTime - starTime > 2.6784e9) {
this.$alert('时间跨度不能超过31天！！', '提示') this.$alert(this.$t('adm.adm_timenomorethan'), this.$t('tips.tips'))
return return
} }
......
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