Skip to content

S
SuperMan
Commit eb8de9b7 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents ef4f1219 d61371cf
Show whitespace changes
Inline Side-by-side
Showing with 76 additions and 33 deletions
src/components/ShoppingStore/ShoppingStore.vue
View file @ eb8de9b7
...@@ -509,11 +509,44 @@ ...@@ -509,11 +509,44 @@
<button class="normalBtn" type="button" @click="showDiv">{{$t('pub.addBtn')}}</button> <button class="normalBtn" type="button" @click="showDiv">{{$t('pub.addBtn')}}</button>
<button class="normalBtn importBtn" type="button" @click="outerVisible=true">导入营销数据</button> <button class="normalBtn importBtn" type="button" @click="outerVisible=true">导入营销数据</button>
<a class="hollowFixedBtn downBtn" :href="downList">下载模板</a> <a class="hollowFixedBtn downBtn" :href="downList">下载模板</a>
<button class="hollowFixedBtn" type="button" style="display:none;"
@click="DownLoadShop()">导出</button>
</li> </li>
</ul> </ul>
</div> </div>
<!--不要删除-->
<div style="display:none">
<table>
<tr>
<td>
进店时间:
</td>
<td>
<el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder=""
v-model="DownLoadmsg.EnterTime"></el-date-picker>
</td>
<td>
创建时间:
</td>
<td>
<el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder=""
v-model="DownLoadmsg.CreateDate">
</el-date-picker>
</td>
<td>
购物店:
</td>
<td>
<el-select multiple="" class="w150" v-model='DownLoadmsg.ShopIds' filterable placeholder="请选择购物店">
<el-option v-for='item in getShop' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</td>
<td>
<button class="hollowFixedBtn" type="button" @click="DownLoadShop()">导出</button>
</td>
</tr>
</table>
</div>
<div class="hotelResource clearfix" v-loading="loading" :class="{'divTop':isShow,'fillTop':fillShow}"> <div class="hotelResource clearfix" v-loading="loading" :class="{'divTop':isShow,'fillTop':fillShow}">
<div class="resourceList" v-for="item in dataInfo" :key="item.subCode"> <div class="resourceList" v-for="item in dataInfo" :key="item.subCode">
<div class="reTopInfo"> <div class="reTopInfo">
...@@ -804,6 +837,17 @@ ...@@ -804,6 +837,17 @@
QDistrict: "", QDistrict: "",
Name: "" Name: ""
}, },
//文件下载参数
DownLoadmsg: {
//创建日期
CreateDate: "",
//进店时间
EnterTime: "",
//操作人
CreateBy: 0,
//购物店Ids
ShopIds: ""
},
addMsg: { addMsg: {
ID: "0", ID: "0",
Name: "", Name: "",
...@@ -852,12 +896,9 @@ ...@@ -852,12 +896,9 @@
//下载Excel //下载Excel
DownLoadShop() { DownLoadShop() {
this.loading = true; this.loading = true;
let qMsg = { this.DownLoadmsg.CreateBy = this.getLocalStorage().EmployeeId;
queryMsg: this.msg,
uid: this.getLocalStorage().EmployeeId
};
let fileName = "购物店单据导出" + this.$commonUtils.getCurrentDate() + ".xls"; let fileName = "购物店单据导出" + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("shop_get_downloadShopFinaceList", qMsg, fileName, this.GetLocalFile("shop_get_downloadShopFinaceList", this.DownLoadmsg, fileName,
res => { res => {
this.loading = false; this.loading = false;
}); });
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ eb8de9b7
...@@ -102,10 +102,6 @@ ...@@ -102,10 +102,6 @@
color: #4d7afd; color: #4d7afd;
} }
.Team_Incontent {
margin-left: 35px;
}
.Team_firstTitle span { .Team_firstTitle span {
margin-right: 10px; margin-right: 10px;
text-align: center; text-align: center;
...@@ -114,7 +110,6 @@ ...@@ -114,7 +110,6 @@
} }
.Team_Incontent span { .Team_Incontent span {
margin-left: 20px;
font-size: 14px; font-size: 14px;
font-family: 'PingFangSC-Fine'; font-family: 'PingFangSC-Fine';
} }
...@@ -174,9 +169,9 @@ ...@@ -174,9 +169,9 @@
</span>团费收入 </span>团费收入
</div> </div>
<div class="Team_Incontent"> <div class="Team_Incontent">
<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>
...@@ -191,9 +186,9 @@ ...@@ -191,9 +186,9 @@
</span>其他收入 </span>其他收入
</div> </div>
<div class="Team_Incontent"> <div class="Team_Incontent">
<div>应收<span>￥{{moneyFormat(moneyAll.otheryTotalyf)}}</span></div> <div>应收：<span>￥{{moneyFormat(moneyAll.otheryTotalyf)}}</span></div>
<div>实收<span class="Team_Coins">￥{{moneyFormat(moneyAll.otheryTotalsf)}}</span></div> <div>实收：<span class="Team_Coins">￥{{moneyFormat(moneyAll.otheryTotalsf)}}</span></div>
<div>待收<span class="Team_Coins">￥{{moneyFormat(moneyAll.otheryTotalyf-moneyAll.otheryTotalsf)}}</span></div> <div>待收：<span class="Team_Coins">￥{{moneyFormat(moneyAll.otheryTotalyf-moneyAll.otheryTotalsf)}}</span></div>
<!--<div> <!--<div>
注：应收=订单应收总额，实收=订单实收总额 注：应收=订单应收总额，实收=订单实收总额
</div>--> </div>-->
...@@ -208,9 +203,9 @@ ...@@ -208,9 +203,9 @@
</span>支出 </span>支出
</div> </div>
<div class="Team_Incontent"> <div class="Team_Incontent">
<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>
...@@ -225,8 +220,8 @@ ...@@ -225,8 +220,8 @@
</span>利润 </span>利润
</div> </div>
<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>
...@@ -240,16 +235,16 @@ ...@@ -240,16 +235,16 @@
<i class="iconfont icon-qian"></i> <i class="iconfont icon-qian"></i>
</span>其他 </span>其他
</div> </div>
<div class="Team_Incontent" style="height:80px;overflow:auto;"> <div>提成：</div>
<div class="Team_Incontent" style="height:50px;overflow:auto;margin-bottom:10px;">
<div> <div>
<div>提&nbsp;&nbsp;&nbsp;成</div>
<div style="margin-bottom:6px;"> <div style="margin-bottom:6px;">
<template v-for="subItem in DataList.ExpectedCutList"> <template v-for="subItem in DataList.ExpectedCutList">
<div style="margin-bottom:10px;">{{subItem.BranchName}} ￥{{subItem.expectedCut}} </div> <div style="margin-bottom:5px;">{{subItem.BranchName}} ￥{{subItem.expectedCut}} </div>
</template> </template>
</div> </div>
</div> </div>
<div>联运成本<span>￥{{DataList.LYCB}}</span></div> <div>联运成本：<span>￥{{DataList.LYCB}}</span></div>
</div> </div>
<div class="Team_firstTitle"> <div class="Team_firstTitle">
<span class="Team_comCoinType Team_lirun"> <span class="Team_comCoinType Team_lirun">
...@@ -257,7 +252,7 @@ ...@@ -257,7 +252,7 @@
</span>优惠 </span>优惠
</div> </div>
<div class="Team_Incontent"> <div class="Team_Incontent">
<div>金&nbsp;&nbsp;&nbsp;额<span>￥{{DataList.TeamBalance.DiscountMoney}}</span></div> <div>金额：<span>￥{{DataList.TeamBalance.DiscountMoney}}</span></div>
</div> </div>
</div> </div>
</el-col> </el-col>
......
src/components/busManagement/BusInfo.vue
View file @ eb8de9b7
...@@ -534,9 +534,16 @@ ...@@ -534,9 +534,16 @@
tempHighSpeedFee += parseFloat(busTypeObj.AllDayHighSpeedFee); tempHighSpeedFee += parseFloat(busTypeObj.AllDayHighSpeedFee);
} }
}); });
if(obj.HighSpeedPrice==0)
{
obj.HighSpeedPrice = tempHighSpeedFee; obj.HighSpeedPrice = tempHighSpeedFee;
}
if(obj.CostPrice==0)
{
obj.CostPrice = tempCostFee; obj.CostPrice = tempCostFee;
} }
}
}else{ }else{
obj.PayType=null; obj.PayType=null;
} }
......
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