Skip to content

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

页面修改

parent 13147ce3
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 94 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ aa1e268b
......@@ -328,7 +328,6 @@
<!-- 单价/每人 -->
<td>
<template v-if="childIndex==1">
<!--&&subItem.HotelBookType==2-->
<template v-if="(subItem.LineId==14||subItem.LineId==118)">
<template v-if="subItem.IsHaveHotelStock==1||childItem.UnitPrice>0">
<el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ aa1e268b
......@@ -52,7 +52,7 @@
<p class="teamRevenueExpenditureTitle">
{{$t('MarketingActi.car')}}
<span class="fr" style="margin-top: -8px;">
<!-- <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(5,2)" /> -->
</span>
</p>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
......@@ -257,7 +257,7 @@
<p class="teamRevenueExpenditureTitle">
{{$t('hotel.hotel')}}
<span class="fr" style="margin-top: -8px;">
<!-- <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(1,2)" /> -->
</span>
</p>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
......@@ -291,9 +291,6 @@
<th width="60">{{$t('hotel.hotel_commission')}})<br />{{$t('advmanager.v_type')}}</th>
<th width="60">{{$t('hotel.hotel_commission')}})</th>
<th width="60">{{$t('hotel.hotel_commission')}})<br />{{$t('fnc.jine')}}</th>
<th width="60">{{$t('objFill.rutangshui')}}</th>
<th width="60">{{$t('objFill.chengsshui')}}</th>
<th width="60">{{$t('objFill.tingchefei')}}</th>
<th width="60">{{$t('pub.SR')}}<br />{{$t('pub.SB')}}</th>
<th width="60">{{$t('fnc.a_zongjine')}}</th>
<th width="60">{{$t('fnc.fukuan')}}<br />{{$t('objFill.fangshi')}}</th>
......@@ -432,15 +429,6 @@
</template>
</template>
</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
{{subItem.InTangTax}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
{{subItem.CityTax}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
{{subItem.ParkFee}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
<template v-if="subItem.TaxType==1">
{{$t('pub.SR')}}
......@@ -565,12 +553,9 @@
</td>
</tr>
</table>
<p class="teamRevenueExpenditureTitle">
{{$t('ground.canshi')}}
<span class="fr" style="margin-top: -8px;">
<!-- <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(2,2)" /> -->
</span>
<span class="fr" style="margin-top: -8px;"> </span>
</p>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
......@@ -789,7 +774,6 @@
<td>
<p class="cursorpointer text-decoration"
@click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'admissionStatisticsDetails')">
<!-- {{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}} -->
{{ moneyFormat(childItem.PeoplePrice)}}
</p>
</td>
......@@ -875,7 +859,7 @@
<th width="110">{{$t('system.table_operation')}}</th>
</tr>
<template v-for='(item,index) in TotalNav.leaderOtherExpensesList'>
<tr>
<tr :key="`loe_`+index">
<td>{{item.OtherName}}</td>
<td>{{item.OtherPrice}}</td>
<td>{{item.PayTypeName}}</td>
......@@ -891,7 +875,6 @@
<p class="teamRevenueExpenditureTitle">
{{$t('objFill.qita')}}
<span class="fr" style="margin-top: -8px;">
<!-- <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(8,2)" /> -->
</span>
</p>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
......@@ -1068,7 +1051,6 @@
@click="OpenCompanyAlipay(item,0,leadr,cur)" />
</el-tooltip>
</template>
<template v-else-if="item.CompanyAlipay===1">
<span style="color:red;" @click="GoCompanyAlipay(item)"> {{$t('objFill.v101.dmc.yikqqydf')}}</span>
</template>
......@@ -1085,12 +1067,13 @@
<input type="button" :value="$t('objFill.preparedocument')" class="normalBtn"
@click="goDiJieZhiDanValidate(item,0,leadr,cur)" />
</el-tooltip>
<template v-if="item.CompanyAlipay==0&&leadr.CurrencyId===1"> <!-- -->
<el-tooltip class="item" effect="dark" placement="top" :content="currencyTypeObj[leadr.CurrencyId]" >
<input style="margin-top:5px;" type="button" :value="$t('objFill.v101.LeaderManagement.kaiqiqydsdf')" class="normalBtn" @click="OpenCompanyAlipay(item,0,leadr,cur)" />
</el-tooltip>
</template>
<template v-if="item.CompanyAlipay==0&&leadr.CurrencyId===1">
<el-tooltip class="item" effect="dark" placement="top" :content="currencyTypeObj[leadr.CurrencyId]">
<input style="margin-top:5px;" type="button"
:value="$t('objFill.v101.LeaderManagement.kaiqiqydsdf')" class="normalBtn"
@click="OpenCompanyAlipay(item,0,leadr,cur)" />
</el-tooltip>
</template>
<template v-else-if="item.CompanyAlipay===1&&leadr.CurrencyId===1">
<span style="color:red;text-decoration: underline;" @click="GoCompanyAlipay(item)">
{{$t('objFill.v101.dmc.yikqqydf')}}</span>
......@@ -1102,7 +1085,6 @@
</template>
</div>
</template>
</td>
</tr>
</table>
......@@ -1188,8 +1170,10 @@
</el-carousel-item>
</el-carousel>
</div>
<el-dialog :visible.sync="ShowCompanyAlipay" width="1000px" :title="$t('objFill.v101.LeaderManagement.feikongzhid')" @close="clearMsg()">
<companyalipay ref="companyalipay" @change="getMsg" :UseTotalPrice="UseTotalPrice" :CompanyAlipayTCID="CompanyAlipayTCID" :TeamStartDateList="TeamStartDateList" >
<el-dialog :visible.sync="ShowCompanyAlipay" width="1000px" :title="$t('objFill.v101.LeaderManagement.feikongzhid')"
@close="clearMsg()">
<companyalipay ref="companyalipay" @change="getMsg" :UseTotalPrice="UseTotalPrice"
:CompanyAlipayTCID="CompanyAlipayTCID" :TeamStartDateList="TeamStartDateList">
</companyalipay>
<el-row :gutter="20">
<el-col style="text-align: right;margin-bottom:20px;"
......@@ -1418,11 +1402,13 @@
}
})
},
//添加其他费用
addOExpenses() {
this.OtherExpensesMsg.OtherExpensesList.push(JSON.parse(JSON.stringify(this.OtherExpensesObj)))
},
//删除其他费用
deleteOExpenses(index) {
this.OtherExpensesMsg.OtherExpensesList.splice(index, 1)
this.OtherExpensesMsg.OtherExpensesList.splice(index, 1);
},
addOtherExpenses() {
this.OtherExpensesTitle = this.$t('objFill.v101.dmc.xinzengqtzc');
......@@ -1431,7 +1417,9 @@
}
this.showOtherExpenses = true
},
//删除
editorOtherExpenses(item, index) {
console.log("item", item);
this.$confirm(this.$t('objFill.ydscbkhf'), this.$t("tips.tips"), {
confirmButtonText: this.$t("pub.sureBtn"),
cancelButtonText: this.$t("pub.cancelBtn"),
......@@ -1447,8 +1435,11 @@
if (this.OtherExpensesMsg.OtherExpensesList && this.OtherExpensesMsg.OtherExpensesList.length > 0) {
this.OtherExpensesMsg.OtherExpensesList.splice(index, 1);
}
var postMsg = {
Id: item.ID
};
this.apipost(
'dmcstatistics_post_SetOtherExpenses', this.OtherExpensesMsg,
'dmcstatistics_post_DeleteOtherExpenses', postMsg,
res => {
if (res.data.resultCode == 1) {
this.getTotalNav()
......@@ -1465,9 +1456,6 @@
.catch(() => {
return false;
});
// this.OtherExpensesMsg = JSON.parse(JSON.stringify(item))
// this.OtherExpensesTitle = this.$t('objFill.v101.dmc.bianjiqizc')
// this.showOtherExpenses = true
},
//用款计划下载
downloadMoneyPlan() {
......@@ -1760,43 +1748,43 @@
TCID: item.TCIDS
}, res => {
if (res.data.resultCode == 1) {
if(res.data.data.State==1){
if(res.data.data.roomZeroNum>0){
this.$confirm('存在用款计划酒店数据未维护价格，请维护单价后再试', this.$t('tips.tips'), {
if (res.data.data.State == 1) {
if (res.data.data.roomZeroNum > 0) {
this.$confirm('存在用款计划酒店数据未维护价格，请维护单价后再试', this.$t('tips.tips'), {
confirmButtonText: this.$t('objFill.ckbjd'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.$router.push({
name: 'OfferChange',
query: {
'offerid':res.data.data.OfferId,
'Qtype':3,
'blank': 'y',
}
});
name: 'OfferChange',
query: {
'offerid': res.data.data.OfferId,
'Qtype': 3,
'blank': 'y',
}
});
}).catch(() => {
});
}else{
this.$confirm(res.data.data.Msg, this.$t('tips.tips'), {
} else {
this.$confirm(res.data.data.Msg, this.$t('tips.tips'), {
confirmButtonText: this.$t('objFill.ckbjd'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.$router.push({
name: 'OfferChange',
query: {
'offerid':res.data.data.OfferId,
'Qtype':3,
'blank': 'y',
}
});
name: 'OfferChange',
query: {
'offerid': res.data.data.OfferId,
'Qtype': 3,
'blank': 'y',
}
});
}).catch(() => {
});
}
}else {
} else {
let TCIDARR = [item.TCIDS]; // [this.$route.query.id]
let orderObj = {
OrderID: 0,
......@@ -1898,50 +1886,50 @@
}
});
},
goDiJieZhiDanValidate: function(obj, num, leadr, cur){
goDiJieZhiDanValidate: function (obj, num, leadr, cur) {
this.apipost('financestatistics_post_GetTravelPrerealContrast', {
TCID: obj.TCIDS
}, res => {
if (res.data.resultCode == 1) {
if(res.data.data.State==1){
if(res.data.data.roomZeroNum>0){
this.$confirm('存在用款计划酒店数据未维护价格，请维护单价后再试', this.$t('tips.tips'), {
if (res.data.data.State == 1) {
if (res.data.data.roomZeroNum > 0) {
this.$confirm('存在用款计划酒店数据未维护价格，请维护单价后再试', this.$t('tips.tips'), {
confirmButtonText: this.$t('objFill.ckbjd'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.$router.push({
name: 'OfferChange',
query: {
'offerid':res.data.data.OfferId,
'Qtype':3,
'blank': 'y',
}
});
name: 'OfferChange',
query: {
'offerid': res.data.data.OfferId,
'Qtype': 3,
'blank': 'y',
}
});
}).catch(() => {
});
}else{
this.$confirm(res.data.data.Msg, this.$t('tips.tips'), {
} else {
this.$confirm(res.data.data.Msg, this.$t('tips.tips'), {
confirmButtonText: this.$t('objFill.ckbjd'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.$router.push({
name: 'OfferChange',
query: {
'offerid':res.data.data.OfferId,
'Qtype':3,
'blank': 'y',
}
});
name: 'OfferChange',
query: {
'offerid': res.data.data.OfferId,
'Qtype': 3,
'blank': 'y',
}
});
}).catch(() => {
});
}
}else{
} else {
this.goDiJieZhiDan(obj, num, leadr, cur);
}
}
}
}, err => {})
},
......@@ -2084,10 +2072,10 @@
});
}
});
if (totalUseMoney > 0 && totalUsePercentMoney > 0 && totalUseMoney > totalUsePercentMoney) {
this.$message.error(this.$t('objFill.zonglkbnc') + "【" + totalUsePercentMoney + "】");
return;
}
// if (totalUseMoney > 0 && totalUsePercentMoney > 0 && totalUseMoney > totalUsePercentMoney) {
// this.$message.error(this.$t('objFill.zonglkbnc') + "【" + totalUsePercentMoney + "】");
// return;
// }
}
this.CompanyAlipayTCID = obj.TCIDS;
this.ShowCompanyAlipay = true;
......@@ -2353,13 +2341,13 @@
});
this.CurrencyListMoney.forEach((cur, i) => {
cur.LeaderGetPriceArr.forEach(lead => {
var tempMoney = (cur.money * this.comRate - cur.yiLing);
var tempShowPrice = cur.money * this.comRate;
//日本
if (this.myLineId == 14) {
tempShowPrice = Math.round(tempShowPrice / 10000) * 10000;
} else {
tempShowPrice = Math.round(tempShowPrice / 100) * 100;
}
......@@ -2399,7 +2387,6 @@
res => {
if (res.data.resultCode == 1) {
this.TotalNav = res.data.data;
this.getNav();
} else {
this.Error(res.data.message);
......@@ -2553,8 +2540,8 @@
arrList(x.ScenicStatisticsList) //门票
})
arrList(data.OtherOrderReportList) //其它
this.list = data;
this.list = data;
var lineArray = [168]; //新欧洲线只显示标准间
var lineId = 0;
//转成数字类型
......@@ -2749,6 +2736,7 @@
this.getTuanMsg()
}
};
</script>
<style scoped>
......@@ -3040,6 +3028,7 @@
._bank_type2 {
background-color: #ff9c01;
}
</style>
<style scoped>
.cblack {
......@@ -3162,4 +3151,5 @@
padding: 8px;
background-color: #ffffff;
}
</style>
\ No newline at end of file
</style>
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ aa1e268b
......@@ -292,7 +292,7 @@
}
});
}
this.sTotalPrice = tempPrice;
this.sTotalPrice = tempPrice.toFixed(2);
},
getCurrencyList: function () {
this.apipost("financeinfo_post_GetList", {
......
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