Skip to content

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

酒店关联团

parent 2767a96d
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 162 deletions
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 59e1f24b
......@@ -242,7 +242,7 @@
</p>
</td>
<td style="white-space:nowrap; ">
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
{{subItem.PayStyle === 1 && subItem.DMCPayType !== 9 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
</td>
<td v-if="childIndex==0" :rowspan="6">
<template v-if="subItem.RebateType==1">
......
src/components/TravelManager/TravelList/HotelOrderTotal.vue
View file @ 59e1f24b
......@@ -562,8 +562,8 @@ export default {
}
},
queren(type, OrderID){
let text = type == 1 ? '确认' : '取消'
this.$confirm('确定“'+ text +'”订单？', this.$t('tips.tips'), {
let text = type == 1 ? '确认后，订单不会自动取消' : '取消后，订单会自动取消'
this.$confirm(text, this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
......@@ -690,25 +690,26 @@ export default {
},
//点击收款
getShouKuan(obj){
let orderObj = {
OrderID:obj.OrderID,
OrderSource:1,
Obj: {},
SourceID:null,
TCIDList: []
let TCIDARR = obj.TCID ? [obj.TCID] : [];
let orderObj = {
OrderID:obj.OrderID,
OrderSource:1,
Obj: {},
SourceID:null,
TCIDList: TCIDARR
}
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query:{
"Type":1,
"companyID":obj.RB_Branch_id,
"path": "",
'blank':'y',
'orderObj':JSON.stringify(orderObj),
'tradeWay':1,
'platformAccount':0
}
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query:{
"Type":1,
"companyID":obj.RB_Branch_id,
"path": "",
'blank':'y',
'orderObj':JSON.stringify(orderObj),
'tradeWay':1,
'platformAccount':0
}
});
});
}
},
mounted() {
......
src/components/leaderPay2.vue
View file @ 59e1f24b
......@@ -362,7 +362,7 @@ input[type="number"] {
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{diningTotalPrice(subItem, subItem.DiningPriceList)}}
</td>
<td v-if="childIndex==0 && subIndex ==0" :rowspan="item.data.length * subItem.DiningPriceList.length">{{subItem.TradingTotalPrice}}</td>
<td v-if="childIndex==0 && subIndex ==0" :rowspan="item.row">{{subItem.TradingTotalPrice}}</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{subItem.Remarks}}
</td>
......@@ -370,46 +370,7 @@ input[type="number"] {
</tr>
</template>
</template>
<!-- <template v-for='(item,index) in list.DiningList'>
<template v-for="(subItem,subIndex) in item.DiningSummaryList">
<tr v-for="(childItem,childIndex) in subItem.DiningPriceList">
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{subItem.RealName? subItem.RealName : subItem.DiningName}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{subItem.UseDinnerTypeStr}}
</td>
<td>
{{peopleStrToWord(childItem.PeopleType)}}:{{childItem.PeopleNum}}
</td>
<td>
<p>
{{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}}
</p>
</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
<span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">公司结算</span>
<span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else></span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td>
{{subItem.PayStyle === 1 ? moneyFormat((childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{diningTotalPrice(subItem, subItem.DiningPriceList)}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">{{subItem.TradingTotalPrice}}</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{subItem.Remarks}}
</td>
</tr>
</template>
</template> -->
</table>
<table border="0" cellspacing="1" class="leaderPayTable leaderPayTable2">
......@@ -496,67 +457,12 @@ input[type="number"] {
</tr>
</template>
</template>
<!-- <template v-for='(outItem,outIndex) in list.HotelOrderListReport'>
<template v-for="(subItem,subIndex) in outItem.HotelOrderList">
<tr v-for="(childItem,childIndex) in subItem.OrderDetailsList">
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
{{subItem.HotelName}}
</td>
<td>
<span v-if="childItem.HouseType === 1">单间</span>
<span v-if="childItem.HouseType === 2">标准双人间</span>
<span v-if="childItem.HouseType === 3">大床房</span>
<span v-if="childItem.HouseType === 4">三人间</span>
<span v-if="childItem.HouseType === 5">司导间</span>
<span v-if="childItem.HouseType === 6">不占床</span>
</td>
<td>
{{childItem.BookNum}}
</td>
<td>
<p>
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice) : 0}}
</p>
</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
<span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">签单</span>
<span v-else-if="subItem.PayStyle === 4">预付</span>
<span v-else-if="subItem.PayStyle === 5">实物抵扣</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else></span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td>
{{moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount))}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
{{hotelTotalPrice(subItem.OrderDetailsList)}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">{{subItem.TradingTotalPrice}}</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
{{subItem.Remarks}}
</td>
</tr>
</template>
</template> -->
</table>
<table border="0" cellspacing="1" class="leaderPayTable">
<tr>
<th>类型</th>
<th>预计总金额</th>
<th>实付金额</th>
<!-- <th>报账金额
<input
v-if="totalList.SelfPayingExpendTotalPrice>0 || totalList.SelfPayingIncomeTotalPrice>0 || (totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice)>0 ||
totalScenicPrice>0 || totalTrafficPrice>0 || totalDinnerPrice>0 || totalHotelPrice>0"
type="button"
value="保存"
class="leader2Btn"
@click="saveBZPrice()"
></th> -->
<th width="40">操作</th>
</tr>
<tr v-show="totalList.SelfPayingExpendTotalPrice>0">
......@@ -564,7 +470,7 @@ input[type="number"] {
<td>0</td>
<td>{{moneyFormat(totalList.SelfPayingExpendTotalPrice)}}</td>
<td>
<!-- <span class="cursorpointer text-decoratio" @click="godetailAll('zifeizhi')">明细</span> -->
<!-- <span class="cursorpointer text-decoratio" @click="godetailAll('zifeizhiZ')">明细</span> -->
</td>
</tr>
<tr v-show="totalList.SelfPayingIncomeTotalPrice>0">
......@@ -572,20 +478,18 @@ input[type="number"] {
<td>0</td>
<td>{{moneyFormat(totalList.SelfPayingIncomeTotalPrice)}}</td>
<td>
</td>
<!-- <span class="cursorpointer text-decoratio" @click="godetailAll('zifeizhiS')">明细</span> -->
</td>
</tr>
<!-- <tr v-show="totalList.IncomeTotalPrice>0">
<td>消费收入</td>
<td>{{moneyFormat(totalList.IncomeTotalPrice)}}</td>
</tr> -->
<tr
v-show="(totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice)>0"
>
<td>其他费用</td>
<td>0</td>
<td>{{moneyFormat(totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice)}}</td>
<td>
</td>
<td>
<!-- <span class="cursorpointer text-decoratio" @click="godetailAll('qitaF')">明细</span> -->
</td>
</tr>
<tr v-for="item in planPriceList">
<td>
......@@ -605,30 +509,6 @@ input[type="number"] {
</td>
</tr>
<!-- <tr v-show="totalScenicPrice>0">
<td>景点门票</td>
<td>{{moneyFormat(OtherTotalPrice)}}</td>
<td>{{moneyFormat(totalScenicPrice)}}</td>
<td><span class="cursorpointer text-decoratio" @click="godetailAll('ticket')">明细</span></td>
</tr>
<tr v-show="totalTrafficPrice>0">
<td>交通</td>
<td>{{moneyFormat(SelfPayingExpendTotalPrice)}}</td>
<td>{{moneyFormat(totalTrafficPrice)}}</td>
<td><span class="cursorpointer text-decoratio" @click="godetailAll('bus')">明细</span></td>
</tr>
<tr v-show="totalDinnerPrice>0">
<td>餐饮</td>
<td>{{moneyFormat(IncomeTotalPrice)}}</td>
<td>{{moneyFormat(totalDinnerPrice)}}</td>
<td><span class="cursorpointer text-decoratio" @click="godetailAll('dining')">明细</span></td>
</tr>
<tr v-show="totalHotelPrice>0">
<td>酒店</td>
<td>{{moneyFormat(ExpendTotalPrice)}}</td>
<td>{{moneyFormat(totalHotelPrice)}}</td>
<td><span class="cursorpointer text-decoratio" @click="godetailAll('hotel')">明细</span></td>
</tr> -->
</table>
<table border="0" cellspacing="1" class="leaderPayTable">
<tr>
......@@ -1169,18 +1049,6 @@ export default {
if(res.data.resultCode == 1) {
let data = res.data.data;
this.ClientAccountListS = data;
// data.forEach(x=>{
// let obj = {
// ID:x.ID,
// Name:x.AccountHolder,
// Nom:x.CardNum,
// OpenBankName:x.OpenBankName,
// allName:x.CardNum,
// ObjID:x.ObjID,
// }
// ClientAccountList.push(obj)
// })
// this.ClientAccountListS = ClientAccountList;
}
}, err => {})
},
......@@ -1205,6 +1073,9 @@ export default {
} else if (name === 'hotel') {
path = 'leaderPayHotelDetail'
date = obj ? obj.CheckInDateStr : 'all'
} else if (name === 'qitaF') {
path = 'leaderPayQiTalDetail'
date = obj ? obj.CheckInDateStr : 'all'
}
let fullPath = `/${path}?TCIDs=${TCIDs}&date=${date}`;
let dom = document.querySelector("#blankLink");
......@@ -1660,7 +1531,14 @@ export default {
break;
}
}
}
}
}
for(var i = 0; i < Diningdest.length; i++){
let row = 0;
for(var l = 0; l < Diningdest[i].data.length; l++){
row = row + Diningdest[i].data[l].DiningPriceList.length
}
Diningdest[i].row = row
}
this.DiningDataList = Diningdest
//票
......
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