Skip to content

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

11

parent 3ad35d17
Show whitespace changes
Inline Side-by-side
Showing with 114 additions and 105 deletions
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ db9ed457
...@@ -1065,7 +1065,8 @@ ...@@ -1065,7 +1065,8 @@
.el-input-group__prepend { .el-input-group__prepend {
padding: 0 5px !important; padding: 0 5px !important;
} }
.SimulateDrop-box {
.SimulateDrop-box {
width: 210px; width: 210px;
min-height: 34px; min-height: 34px;
position: relative; position: relative;
...@@ -1073,7 +1074,8 @@ ...@@ -1073,7 +1074,8 @@
float: left; float: left;
/* margin: 4px 0 0 10px; */ /* margin: 4px 0 0 10px; */
border: 1px solid #d1d1d1; border: 1px solid #d1d1d1;
} }
.SD_flight { .SD_flight {
display: inline-block; display: inline-block;
height: 24px; height: 24px;
...@@ -1082,12 +1084,14 @@ ...@@ -1082,12 +1084,14 @@
line-height: 22px; line-height: 22px;
background-color: #f0f2f5; background-color: #f0f2f5;
} }
.SimulaDrop { .SimulaDrop {
position: absolute; position: absolute;
top: 3px; top: 3px;
right: 10px; right: 10px;
color: #c0c4cc; color: #c0c4cc;
} }
._TravelPricePopover .jiDiv { ._TravelPricePopover .jiDiv {
width: 750px; width: 750px;
max-height: 400px; max-height: 400px;
...@@ -1127,6 +1131,7 @@ ...@@ -1127,6 +1131,7 @@
._TravelPricePopover table td._d_name { ._TravelPricePopover table td._d_name {
background-color: #ededed; background-color: #ededed;
} }
</style> </style>
<template> <template>
...@@ -1749,7 +1754,8 @@ ...@@ -1749,7 +1754,8 @@
-￥{{item.RefundMoney}} -￥{{item.RefundMoney}}
</td> </td>
<td> <td>
<el-input class="w80" type="Number" :max='addMsg.GuestNum' v-model="item.Number" @keyup.native="initScenic()"></el-input> <el-input class="w80" type="Number" :max='addMsg.GuestNum' v-model="item.Number"
@keyup.native="initScenic()"></el-input>
<!-- --> <!-- -->
</td> </td>
...@@ -1758,7 +1764,8 @@ ...@@ -1758,7 +1764,8 @@
</div> </div>
</div> </div>
<div slot="reference" class="SimulateDrop-box"> <div slot="reference" class="SimulateDrop-box">
<span class="SD_flight" v-for="subItem in addMsg.ScenicList">{{subItem.ScenicName}}*{{subItem.Number}}</span> <span class="SD_flight"
v-for="subItem in addMsg.ScenicList">{{subItem.ScenicName}}*{{subItem.Number}}</span>
<i class="iconfont icon-arrow-down SimulaDrop"></i> <i class="iconfont icon-arrow-down SimulaDrop"></i>
</div> </div>
</el-popover> </el-popover>
...@@ -2639,8 +2646,7 @@ ...@@ -2639,8 +2646,7 @@
</td> </td>
<td class="RL-BTNlist" rowspan="2"> <td class="RL-BTNlist" rowspan="2">
<el-button-group v-if="isShow === true"> <el-button-group v-if="isShow === true">
<el-tooltip class="item" <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-button type="primary" style="background-color: #00c6ff !important;border-color: #00c6ff;" <el-button type="primary" style="background-color: #00c6ff !important;border-color: #00c6ff;"
icon="iconfont icon-bianji-smal" @click="getDetail(childItem)"></el-button> icon="iconfont icon-bianji-smal" @click="getDetail(childItem)"></el-button>
</el-tooltip> </el-tooltip>
...@@ -2877,10 +2883,13 @@ ...@@ -2877,10 +2883,13 @@
</span> </span>
</div> </div>
</div> </div>
<div v-if="childItem.OrderBackScenicList!=null&&childItem.OrderBackScenicList.length>0 " style="width: 101%;border-top: 1px solid #cccccc;margin-top: 5px"> <div v-if="childItem.OrderBackScenicList!=null&&childItem.OrderBackScenicList.length>0 "
style="width: 101%;border-top: 1px solid #cccccc;margin-top: 5px">
<span style="color:red;margin-top: 10px;display: inline-block">{{$t('ground.tuiJingdian')}}：</span> <span style="color:red;margin-top: 10px;display: inline-block">{{$t('ground.tuiJingdian')}}：</span>
<span v-for="childItems in childItem.OrderBackScenicList" > <span v-for="childItems in childItem.OrderBackScenicList">
<span style="color:green;">{{ childItems.CouponsName }}</span>退票<span style="color:red;">{{childItems.Number}}</span>人：<span style="color: blue">{{childItems.GuestNameList}}</span> <span style="color:green;">{{ childItems.CouponsName }}</span>退票<span
style="color:red;">{{childItems.Number}}</span>人：<span
style="color: blue">{{childItems.GuestNameList}}</span>
&nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp;
</span> </span>
...@@ -4229,7 +4238,7 @@ ...@@ -4229,7 +4238,7 @@
SafeNum: "0", SafeNum: "0",
AirticketNum: "0", AirticketNum: "0",
ScenicRefundArr: [], ScenicRefundArr: [],
ScenicList:[],//2025-07-14 add bY:W ScenicList: [], //2025-07-14 add bY:W
GoCityTime: "", GoCityTime: "",
BackCityTime: "", BackCityTime: "",
CommissionSharePeople: "-1", CommissionSharePeople: "-1",
...@@ -5398,13 +5407,12 @@ ...@@ -5398,13 +5407,12 @@
//初始化景点 //初始化景点
initScenic() { initScenic() {
this.addMsg.ScenicList = []; this.addMsg.ScenicList = [];
var totalGuest=(Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum)) var totalGuest = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum))
this.ScenicRefundList.forEach(x => { this.ScenicRefundList.forEach(x => {
if (/^\d+$/.test(x.Number)&&x.Number>0&&x.Number<=totalGuest) { if (/^\d+$/.test(x.Number) && x.Number > 0 && x.Number <= totalGuest) {
this.addMsg.ScenicList.push(x); this.addMsg.ScenicList.push(x);
} } else {
else{ x.Number = 0;
x.Number=0;
} }
}) })
this.getTotalPrice(); this.getTotalPrice();
...@@ -5417,11 +5425,11 @@ ...@@ -5417,11 +5425,11 @@
} else { } else {
this.ScenicRefundMoney = 0; this.ScenicRefundMoney = 0;
this.addMsg.ScenicRefundArr.forEach((x) => { this.addMsg.ScenicRefundArr.forEach((x) => {
var index=this.ScenicRefundList.findIndex(item=>item.Id===x.Id); var index = this.ScenicRefundList.findIndex(item => item.Id === x.Id);
console.log(index,"x",x); console.log(index, "x", x);
if(index!=-1){ if (index != -1) {
var nowModel=this.ScenicRefundList[index]; var nowModel = this.ScenicRefundList[index];
nowModel.Number=x.Number; nowModel.Number = x.Number;
} }
}); });
this.$forceUpdate() this.$forceUpdate()
...@@ -5762,16 +5770,17 @@ ...@@ -5762,16 +5770,17 @@
this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum); this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
} }
//退景点费用 //退景点费用
var refundScenicPrice =0; var refundScenicPrice = 0;
if(this.addMsg.ScenicList!=null&&this.addMsg.ScenicList.length>0){ if (this.addMsg.ScenicList != null && this.addMsg.ScenicList.length > 0) {
var totalGuest=(Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum)) var totalGuest = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg
.OldPeopleNum))
this.addMsg.ScenicList.forEach(item => { this.addMsg.ScenicList.forEach(item => {
if(totalGuest>=item.Number){ if (totalGuest >= item.Number) {
refundScenicPrice+=item.Number*item.RefundMoney;} refundScenicPrice += item.Number * item.RefundMoney;
}
}); });
} }
this.addMsg.PreferPrice = var tempPrice = this.OpSetLossMoney +
this.OpSetLossMoney +
dandijie + dandijie +
lianyun + lianyun +
chengren + chengren +
...@@ -5780,7 +5789,9 @@ ...@@ -5780,7 +5789,9 @@
laoren + laoren +
zafeiqianzhen + zafeiqianzhen +
danfang + danfang +
ertongbed -refundScenicPrice; ertongbed - refundScenicPrice
this.addMsg.PreferPrice = tempPrice.toFixed(2);
// this.ScenicRefundMoney * // this.ScenicRefundMoney *
// (Number(this.addMsg.ManNum) + // (Number(this.addMsg.ManNum) +
// Number(this.addMsg.ChirdNum) + // Number(this.addMsg.ChirdNum) +
...@@ -5869,16 +5880,17 @@ ...@@ -5869,16 +5880,17 @@
this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum); this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
} }
//退景点费用 //退景点费用
var refundScenicPrice =0; var refundScenicPrice = 0;
if(this.addMsg.ScenicList!=null&&this.addMsg.ScenicList.length>0){ if (this.addMsg.ScenicList != null && this.addMsg.ScenicList.length > 0) {
var totalGuest=(Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum)) var totalGuest = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg
.OldPeopleNum))
this.addMsg.ScenicList.forEach(item => { this.addMsg.ScenicList.forEach(item => {
if(totalGuest>=item.Number){ if (totalGuest >= item.Number) {
refundScenicPrice+=item.Number*item.RefundMoney;} refundScenicPrice += item.Number * item.RefundMoney;
}
}); });
} }
this.addMsg.PreferPrice = var tempPrice = this.OpSetLossMoney +
this.OpSetLossMoney +
dandijie + dandijie +
lianyun + lianyun +
chengren + chengren +
...@@ -5887,11 +5899,8 @@ ...@@ -5887,11 +5899,8 @@
laoren + laoren +
zafeiqianzhen + zafeiqianzhen +
danfang + danfang +
ertongbed -refundScenicPrice; ertongbed - refundScenicPrice;
// this.ScenicRefundMoney * this.addMsg.PreferPrice = tempPrice.toFixed(2);
// (Number(this.addMsg.ManNum) +
// Number(this.addMsg.ChirdNum) +
// Number(this.addMsg.OldPeopleNum));
//ld 2025-01-22 少价管理 //ld 2025-01-22 少价管理
if (this.addMsg.IsLessPrice == 1 && this.addMsg.GroupType == 1 && (this.addMsg.CustomerType == '1' || this if (this.addMsg.IsLessPrice == 1 && this.addMsg.GroupType == 1 && (this.addMsg.CustomerType == '1' || this
...@@ -6082,7 +6091,7 @@ ...@@ -6082,7 +6091,7 @@
this.addMsg.CostType = ""; this.addMsg.CostType = "";
this.addMsg.PlatformOrder = ""; this.addMsg.PlatformOrder = "";
this.ddlyList = []; this.ddlyList = [];
this.addMsg.ScenicList=[]; this.addMsg.ScenicList = [];
this.addMsg.Remarks = ""; this.addMsg.Remarks = "";
this.addMsg.MinOrderPrice = ""; this.addMsg.MinOrderPrice = "";
this.addMsg.LuggageNum = ""; this.addMsg.LuggageNum = "";
......
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