Skip to content

S
SuperMan
Commit 116228ec authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 73a5d1f5 80e2ff80
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 70 deletions
src/components/FinancialModule/RecPayQuery.vue
View file @ 116228ec
......@@ -235,7 +235,7 @@
style="width: 100%">
<el-table-column
prop="address"
label="单号">
label="单号" width="90">
<template slot-scope="scope">
<el-popover
popper-class="detailsIT_Journal"
......@@ -263,7 +263,7 @@
</el-table-column>
<el-table-column
prop=""
label="单据类型">
label="单据类型" width="90">
<template slot-scope="scope">
<span>
<span v-if="scope.row.Type==2" style="display: inline-block;
......@@ -314,7 +314,7 @@
</el-table-column>
<el-table-column
prop=""
label="关联信息">
label="关联信息" width="300">
<template slot-scope="scope">
<div>
<template v-if="scope.row.TCIDAndTCNUMList.length>0">
......@@ -353,7 +353,7 @@
</el-table-column>
<el-table-column
prop=""
label="费用类型">
label="费用类型" width="120">
<template slot-scope="scope">
<div>
<template v-for="(s,si) in scope.row.CostTypeList">
......
src/components/FinancialModule/ReportForm/AirTicketLoss.vue
View file @ 116228ec
......@@ -6,22 +6,28 @@
</style>
<template>
<div class="AirTicketApp" style="padding-bottom:20px">
<div class="Header">
<el-col :span="8" style="margin:10px 0">
<el-date-picker
v-model="value1"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-col>
<button style="margin-top:15px" class="normalBtn" @click="getList">查询</button>
<button style="margin-top:15px" class="hollowFixedBtn" @click="Export">导出</button>
<div class="Header" style="display: flex;flex-wrap: nowrap; justify-content: space-between;padding: 10px 0;">
<div style="flex-shrink: 0; display: flex;align-items: center; flex-wrap: nowrap;">
<el-date-picker
v-model="value1"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
<button class="normalBtn" @click="getList">查询</button>
<button class="hollowFixedBtn" @click="Export">导出</button>
</div>
<div v-if="LossIncomeList&&LossIncomeList.length>0" style="display: flex;flex-wrap: wrap;flex-grow: 1;margin-left: 20px;justify-content: end;">
<div>
<span style="line-height: 60px;font-size: 14px;">机损增收:</span>
<el-tag v-for="(x,index) in LossIncomeList" :key="index" @click="goUrl(x)"
style="margin-left: 5px;margin-top: 2px;margin-bottom: 2px; cursor: pointer;">{{x.LineName}}/{{x.AirLossIncome}}</el-tag>
</div>
</div>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
......@@ -47,6 +53,7 @@
export default {
data(){
return{
LossIncomeList:[],
loading:false,
ColNameList:[],
LossList:[],
......@@ -62,6 +69,17 @@ export default {
},created(){
this.userInfo = this.getLocalStorage();
},methods:{
goUrl(x){
this.$router.push({
name: 'TeamRevenueReport',
query: {
StartTime:this.msg.StartTime,
EndTime:this.msg.EndTime,
LineId:x.LineId,
blank: "y",
}
})
},
Export(){
let msg=this.msg;
......@@ -80,7 +98,7 @@ export default {
}
this.loading = true;
this.apipost('financestatistics_post_GetCompamyAirTicketRatioList',this.msg, res => {
this.apipost('financestatistics_post_GetCompamyAirTicketRatioList',this.msg, res => {
this.loading = false;
if(res.data.resultCode == 1) {
......@@ -88,8 +106,9 @@ export default {
this.Rlist=res.data.data.Rlist;
this.LossList=res.data.data.LossList[0].LossTL;
this.SunMoney = res.data.data.LossList[0].TotalMoney;
this.LossIncomeList = res.data.data.LossIncomeList
} else {
this.$message.error(res.data.message);
this.$message.error(res.data.message);
}
this.loading = false;
}, err => {})
......@@ -119,10 +138,10 @@ export default {
}
});
}
}
}
},mounted(){
//默认查询当月第一个到最后一天日期
if(this.$route.query.startDate && this.$route.query.endDate){
......@@ -144,7 +163,7 @@ export default {
this.value1.push(startDate,endDate);
}
this.getList();
}
}
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 116228ec
......@@ -2132,9 +2132,12 @@ export default {
mounted() {
let STime = this.getBeforeDate(31,this.getBeforeDate(0,new Date().Format("yyyy-MM-dd")))
let ETime = this.getBeforeDate(0,this.getBeforeDate(0,new Date().Format("yyyy-MM-dd")))
this.productionDate = [STime,ETime]
this.msg.startDate = this.productionDate[0];
this.msg.endDate = this.productionDate[1];
if(!this.msg.startDate){
this.productionDate = [STime,ETime]
this.msg.startDate = this.productionDate[0];
this.msg.endDate = this.productionDate[1];
}
let allH, allW, cH, cW;
allH = document.documentElement.clientHeight;
allW = document.documentElement.clientWidth;
......
src/components/FinancialModule/components/BillModule.vue
View file @ 116228ec
......@@ -171,7 +171,6 @@ export default {
},
calculation(i){
if(!i){
let Money = 0
let benMoney = 0
this.currentMoney = 0
......@@ -188,22 +187,22 @@ export default {
benMoney += Money
this.benMoney = benMoney/100;
})
}else{
let Money = 0
let benMoney = 0
this.benMoney2 = 0
this.GetDetail.CashierDetail.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = x.Rate*x.OriginalMoney
// x.Money = Math.round(x.Money)
x.Money = x.Money.toFixed(2)
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
Money = parseFloat(x.Money)*100
benMoney += Money
this.benMoney2 = benMoney/100;
})
}
// 有收款账户需对比总金额
if(this.GetDetail.CashierDetail&&this.GetDetail.CashierDetail.length>0){
let Money1 = 0
let benMoney1 = 0
this.benMoney2 = 0
this.GetDetail.CashierDetail.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = x.Rate*x.OriginalMoney
// x.Money = Math.round(x.Money)
x.Money = x.Money.toFixed(2)
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
Money1 = parseFloat(x.Money)*100
benMoney1 += Money1
this.benMoney2 = benMoney1/100;
})
}
},
Financial_post_GetDetail(id){ //获取单据详情
......@@ -240,6 +239,7 @@ export default {
let TCID = data.TCIDList.length > 0 ? data.TCIDList[0] : 0
this.financeinfo_post_GetList(TCID);
}
this.calculation()
}
}, err => {})
},
......@@ -330,15 +330,15 @@ export default {
watch: { // 监听参数变化
GetDetail: {
handler: function(val, oldVal) {
let isAmount = true
if(this.GetDetail.CashierDetail&&this.GetDetail.CashierDetail.length){
if(this.benMoney2===this.benMoney){
isAmount = false
}else{
isAmount = true
}
}
this.$emit('getList',val,isAmount)
// let isAmount = true
// if(this.GetDetail.CashierDetail&&this.GetDetail.CashierDetail.length){
// if(this.benMoney2===this.benMoney){
// isAmount = false
// }else{
// isAmount = true
// }
// }
this.$emit('getList',val,false)
},
deep: true,
immediate: true
......
src/components/FinancialModule/components/ReceivablesModule.vue
View file @ 116228ec
......@@ -138,7 +138,6 @@ export default {
},
calculation(i){
if(!i){
let Money = 0
let benMoney = 0
this.currentMoney = 0
......@@ -155,21 +154,21 @@ export default {
benMoney += Money
this.benMoney = benMoney/100;
})
}else{
let Money = 0
let benMoney = 0
this.benMoney2 = 0
this.GetDetail.CashierDetail.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = x.Rate*x.OriginalMoney
x.Money = x.Money.toFixed(2)
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
Money = parseFloat(x.Money)*100
benMoney += Money
this.benMoney2 = benMoney/100;
})
}
// 有收款账户需对比总金额
if(this.GetDetail.CashierDetail&&this.GetDetail.CashierDetail.length>0){
let Money1 = 0
let benMoney1 = 0
this.benMoney2 = 0
this.GetDetail.CashierDetail.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = x.Rate*x.OriginalMoney
x.Money = x.Money.toFixed(2)
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
Money1 = parseFloat(x.Money)*100
benMoney1 += Money1
this.benMoney2 = benMoney1/100;
})
}
},
Financial_post_GetDetail(id){ //获取单据详情
if(!id) return;
......@@ -199,6 +198,7 @@ export default {
this.benMoney2 = 0
this.loading=false
this.$set(this.$data,"GetDetail",data);
this.calculation()
}
}, err => {})
},
......
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