Skip to content

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

国内线，餐和门票修改

parent 0fe8af85
Show whitespace changes
Inline Side-by-side
Showing with 79 additions and 68 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ ea46f992
......@@ -889,8 +889,6 @@
//关闭组件
this.$refs[str][0].doClose();
}
} else {
this.Error(this.$t('ground.qingqiucanscw'));
}
}, err => {})
},
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ ea46f992
......@@ -52,7 +52,6 @@
<p class="teamRevenueExpenditureTitle">
{{$t('MarketingActi.car')}}
<span class="fr" style="margin-top: -8px;">
</span>
</p>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
......@@ -574,9 +573,9 @@
<th width="80">{{$t('objFill.mianfeirenshu')}}</th>
<th width="">{{$t('fnc.danjia')}}</th>
<th width="">{{$t('objFill.jingexj')}}</th>
<th width="">{{$t('hotel.hotel_commission')}})</th>
<th width="">{{$t('hotel.hotel_commission')}}</th>
<th width="">{{$t('fnc.a_zongjine')}}</th>
<th width="">{{$t('hotel.hotel_payType')}})</th>
<th width="">{{$t('hotel.hotel_payType')}}</th>
<th width="">{{$t('hotel.hotel_Currency')}}</th>
<th width="100">{{$t('pub.pubRemark')}}</th>
<th width="110">{{$t('objFill.costdocument')}}</th>
......@@ -1460,7 +1459,10 @@
//用款计划下载
downloadMoneyPlan() {
var fileName = "test";
fileName += ".xls"
if (this.NewCombinationNum) {
fileName = this.NewCombinationNum;
}
fileName += "用款计划表.xls"
this.loading = true;
let userInfo = this.getLocalStorage();
this.GetLocalFile("dmcstatistics_post_NewDownLoadGroupLeaderUserMoneyPlan", {
......@@ -2348,7 +2350,7 @@
tempShowPrice = Math.round(tempShowPrice / 10000) * 10000;
} else {
tempShowPrice =tempShowPrice;
tempShowPrice = tempShowPrice;
}
//未领取，日本线 *0.95 在精确到万
if (isreceive == 0) {
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ ea46f992
......@@ -9,6 +9,7 @@
z-index: 10;
border: 1px solid #d1d1d1;
}
</style>
<template>
<div>
......@@ -46,8 +47,8 @@
<th width="200">{{$t('ground.xiugaict')}}</th>
<th width="80">{{$t('ground.leibie')}}</th>
<th width="70">{{$t('ground.zongrenshu')}}</th>
<th width="70">{{$t('ground.yongcanren')}}<br />{{$t('advmanager.v_type')}}</th>
<th width="70">{{$t('commonPickUp.Pick_Ding')}}<br />{{$t('admin.admin_personNumber')}}</th>
<th width="100">{{$t('ground.yongcanren')}}<br />{{$t('advmanager.v_type')}}</th>
<th width="70">{{$t('commonPickUp.Pick_Ding')}}<br />{{$t('admin.admin_personNumber')}}/桌数</th>
<th width="120">{{$t('Operation.Op_price')}}</th>
<th width="90">{{$t('ground.mianrenshu')}}</th>
<th width="90">{{$t('hotel.hotel_commission')}}</th>
......@@ -61,10 +62,10 @@
<template v-for="(item,index) in dinnerList">
<template v-for="(subItem,subIndex) in item.DiningSummaryList">
<tr v-for="(childItem,childIndex) in subItem.DiningPriceList" :key="`d_`+index+subIndex+childIndex">
<td v-if="childIndex==0" :rowspan="3">
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{item.UseTimeStr}}
</td>
<td v-if="childIndex==0" :rowspan="3">
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
<table class="dinnerTable">
<tr>
<td colspan="2">
......@@ -93,13 +94,11 @@
</tr>
</table>
</td>
<td v-if="childIndex==0" :rowspan="3">
<el-select style="display:none;" class='w160 sel' v-model='subItem.NewDiningID' filterable
:placeholder="$t('pub.pleaseSel')" @visible-change='getDingList(item)'
@change='sendValue(subItem,item)'>
<el-option v-for='itemHotel in item.DinnerList' :label='itemHotel.RealName' :value='itemHotel.ID'
:key='itemHotel.ID'></el-option>
</el-select>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
<template v-if="LineId==90">
<el-input class='w100' v-model='subItem.BookName' type="text"></el-input>
</template>
<template v-else>
<template v-if="subItem.NewDiningRealName">
<span style="color:green">{{subItem.NewDiningRealName}}</span><br />
</template>
......@@ -115,6 +114,7 @@
{{$t('ground.cantingxuanz')}}
</el-button>
</el-popover>
</template>
<template v-if="subItem.DinnerOfferPrice&&subItem.DinnerOfferPrice>0">
<br />
<span style="font-weight:bold;font-size:14px;">{{$t('objFill.baojiacanting')}}:<font
......@@ -136,17 +136,22 @@
</font></span>
</template>
</td>
<td v-if="childIndex==0" :rowspan="3">
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{subItem.UseDinnerTypeStr}}
</td>
<td v-if="childIndex==0" :rowspan="3" style="display:none;">
{{subItem.MealName}}
</td>
<td v-if="childIndex==0" :rowspan="3">
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{subItem.UseAccount}}
</td>
<td>
<template v-if="LineId==90">
<el-select v-model="subItem.BookStyle" :placeholder="$t('pub.pleaseSel')" class='w135 sel'>
<el-option :value="0" label="按人数预定"></el-option>
<el-option :value="1" label="按桌预定"></el-option>
</el-select>
</template>
<template v-else>
{{personStrToWord(childItem.PeopleType)}}
</template>
</td>
<td>
<template v-if="EditBtn||LineId==90">
......@@ -183,13 +188,13 @@
<td>
{{(childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice}}
</td>
<td v-if="childIndex==0" :rowspan="3">
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{subItem.TotalPrice}}
<template v-if="subItem.NewTotalPrice">
<br /><span style="color:red;">{{subItem.NewTotalPrice}}</span>
</template>
</td>
<td v-if="childIndex==0" :rowspan="3">
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
<table class="dinnerTable">
<tr>
<td width="70" style="text-align:right;">{{$t('hotel.hotel_Currency')}}：</td>
......@@ -222,7 +227,7 @@
</el-select>
</td>
</tr>
<tr>
<tr v-if="LineId!=90">
<td width="60" style="text-align:right;">
{{$t('ground.dingcanfangs')}}：
</td>
......@@ -249,7 +254,7 @@
</td>
</tr>
<template v-if="subItem.OrderState==1">
<tr>
<tr v-if="LineId!=90">
<td width="60" style="text-align:right;">
{{$t('salesModule.SureTime')}}：
</td>
......@@ -259,7 +264,7 @@
</el-date-picker>
</td>
</tr>
<tr>
<tr v-if="LineId!=90">
<td width="60" style="text-align:right;">
{{$t('objFill.yuyuetime')}}：
</td>
......@@ -289,7 +294,7 @@
<el-input class='w135' v-model='subItem.PayTypeTCNUM' type="text"></el-input>
</td>
</tr>
<tr>
<tr v-if="LineId!=90">
<td width="60" style="text-align:right;">
{{$t('ground.dingtuanhao')}}:
</td>
......@@ -299,7 +304,7 @@
</tr>
</table>
</td>
<td v-if="childIndex==0" :rowspan="3">
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
<table class="dinnerTable">
<tr>
<td width="80" style="text-align:right;">{{$t('pub.pubRemark')}}：</td>
......@@ -307,14 +312,6 @@
<el-input type='textarea' rows="6" class='w120' v-model='subItem.Remarks'></el-input>
</td>
</tr>
<tr style="display:none;">
<td width="80" style="text-align:right;">
{{$t('ground.canpeibz')}}：
</td>
<td style="text-align:left;">
<el-input type='textarea' rows="2" class='w120' v-model='subItem.DinnerRemark'></el-input>
</td>
</tr>
</table>
</td>
</tr>
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ ea46f992
......@@ -8,6 +8,7 @@
top: 0;
z-index: 10;
}
</style>
<template>
<div>
......@@ -59,10 +60,10 @@
<template v-for="(item,index) in DataList">
<template v-for="(subItem,subIndex) in item.ScenicStatisticsList">
<tr v-for="(childItem,childIndex) in subItem.TicketPriceList" :key="`s_`+index+subIndex+childIndex">
<td v-if="childIndex==0" :rowspan="3">
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
{{item.UseTimeStr}}
</td>
<td v-if="childIndex==0" :rowspan="3">
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
<table class="scenicTable">
<tr>
<td colspan="2" style="text-align:left;padding-left:8px;">
......@@ -108,7 +109,7 @@
</span>
</template>
</td>
<td v-if="childIndex==0" :rowspan="3">
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
{{subItem.UseAccount}}
</td>
<td>
......@@ -154,10 +155,10 @@
<span v-if='childItem.DiscountPrice!=0'>{{childItem.DiscountPrice}}%</span>
</template>
</td>
<td v-if="childIndex==0" :rowspan="3">
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
{{subItem.TotalPrice}}
</td>
<td v-if="childIndex==0" :rowspan="3">
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
<table class="scenicTable">
<tr>
<td width="60" style="text-align:right;">
......@@ -196,7 +197,7 @@
</tr>
</table>
</td>
<td v-if="childIndex==0" :rowspan="3">
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
<el-input type='textarea' rows="4" class='w170' v-model='subItem.Remarks'></el-input>
</td>
</tr>
......@@ -261,13 +262,26 @@
}
},
methods: {
personStrToWord(str) {
if (str == 1)
return this.$t('objFill.darens')[0]
if (str == 2)
return this.$t('objFill.darens')[1]
if (str == 3)
return this.$t('objFill.xiaoren')
personStrToWord(PeopleType) {
var resultStr = "";
if (this.LineId == 90) {
if (PeopleType == 1) {
resultStr = "门票";
} else if (PeopleType == 2) {
resultStr = "小交通";
} else if (PeopleType == 3) {
resultStr = "";
}
} else {
if (PeopleType == 1) {
resultStr = this.$t('objFill.darens')[0];
} else if (PeopleType == 2) {
resultStr = this.$t('objFill.darens')[1];
} else if (PeopleType == 3) {
resultStr = this.$t('objFill.xiaoren');
}
}
return resultStr;
},
//页面跳转[小写]
goUrlT(path, obj, title) {
......@@ -329,6 +343,7 @@
this.loading = false;
if (res.data.resultCode == 1) {
this.DataList = res.data.data.ScenicList;
this.IsOperation = res.data.data.IsOperation;
this.calculationPrice();
} else {
......@@ -398,7 +413,6 @@
this.GuestNum = this.$route.query.GuestNum;
this.getList();
this.getCurrencyList();
let height = window.innerHeight - 65 - 55;
this.boxHeight = height;
},
......
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