Skip to content

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

11

parent 3ad35d17
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 105 deletions
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ db9ed457
...@@ -1065,15 +1065,17 @@ ...@@ -1065,15 +1065,17 @@
.el-input-group__prepend { .el-input-group__prepend {
padding: 0 5px !important; padding: 0 5px !important;
} }
.SimulateDrop-box {
width: 210px; .SimulateDrop-box {
min-height: 34px; width: 210px;
position: relative; min-height: 34px;
padding: 5px 21px 5px 6px; position: relative;
float: left; padding: 5px 21px 5px 6px;
/* margin: 4px 0 0 10px; */ float: left;
border: 1px solid #d1d1d1; /* margin: 4px 0 0 10px; */
} 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>
...@@ -1729,40 +1734,42 @@ ...@@ -1729,40 +1734,42 @@
<el-input v-model="addMsg.FSeatNum" @input="getNumber()"></el-input> <el-input v-model="addMsg.FSeatNum" @input="getNumber()"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('salesModule.ScenicRefund')"> <el-form-item :label="$t('salesModule.ScenicRefund')">
<el-popover popper-class="_TravelPricePopover" trigger="click"> <el-popover popper-class="_TravelPricePopover" trigger="click">
<div> <div>
<div class="ScenicDiv"> <div class="ScenicDiv">
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<!-- <td class="_color_666">{{$t('fnc.xuanze')}}</td> --> <!-- <td class="_color_666">{{$t('fnc.xuanze')}}</td> -->
<td class="_color_666">{{$t('visaT.jdname')}}</td> <td class="_color_666">{{$t('visaT.jdname')}}</td>
<td class="_color_666">{{$t('fnc.tkjine')}}</td> <td class="_color_666">{{$t('fnc.tkjine')}}</td>
<td class="_color_666">{{$t('fnc.qxrenshu')}}</td> <td class="_color_666">{{$t('fnc.qxrenshu')}}</td>
</tr> </tr>
<tr v-for="item in ScenicRefundList"> <tr v-for="item in ScenicRefundList">
<td> <td>
{{item.CouponsName}} {{item.CouponsName}}
</td> </td>
<td> <td>
-￥{{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>
</tr>
</table> </tr>
</div> </table>
</div> </div>
<div slot="reference" class="SimulateDrop-box"> </div>
<span class="SD_flight" v-for="subItem in addMsg.ScenicList">{{subItem.ScenicName}}*{{subItem.Number}}</span> <div slot="reference" class="SimulateDrop-box">
<i class="iconfont icon-arrow-down SimulaDrop"></i> <span class="SD_flight"
</div> v-for="subItem in addMsg.ScenicList">{{subItem.ScenicName}}*{{subItem.Number}}</span>
</el-popover> <i class="iconfont icon-arrow-down SimulaDrop"></i>
</el-form-item> </div>
</el-popover>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
...@@ -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,14 +2883,17 @@ ...@@ -2877,14 +2883,17 @@
</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 "
<span style="color:red;margin-top: 10px;display: inline-block">{{$t('ground.tuiJingdian')}}：</span> style="width: 101%;border-top: 1px solid #cccccc;margin-top: 5px">
<span v-for="childItems in childItem.OrderBackScenicList" > <span style="color:red;margin-top: 10px;display: inline-block">{{$t('ground.tuiJingdian')}}：</span>
<span style="color:green;">{{ childItems.CouponsName }}</span>退票<span style="color:red;">{{childItems.Number}}</span>人：<span style="color: blue">{{childItems.GuestNameList}}</span> <span v-for="childItems in childItem.OrderBackScenicList">
&nbsp;&nbsp; &nbsp;&nbsp; <span style="color:green;">{{ childItems.CouponsName }}</span>退票<span
</span> style="color:red;">{{childItems.Number}}</span>人：<span
style="color: blue">{{childItems.GuestNameList}}</span>
&nbsp;&nbsp; &nbsp;&nbsp;
</span>
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -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",
...@@ -5395,36 +5404,35 @@ ...@@ -5395,36 +5404,35 @@
changeSelect: function () { changeSelect: function () {
this.$forceUpdate(); this.$forceUpdate();
}, },
//初始化景点 //初始化景点
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();
this.getTicheng(); this.getTicheng();
}, },
ScenicRefundMethods() { ScenicRefundMethods() {
if (this.addMsg.ScenicRefundArr.length == 0) { if (this.addMsg.ScenicRefundArr.length == 0) {
this.ScenicRefundMoney = 0; this.ScenicRefundMoney = 0;
} 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()
} }
this.initScenic(); this.initScenic();
}, },
...@@ -5457,7 +5465,7 @@ ...@@ -5457,7 +5465,7 @@
msg, msg,
(res) => { (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.ScenicRefundList = res.data.data; this.ScenicRefundList = res.data.data;
this.ScenicRefundList.forEach((item) => { this.ScenicRefundList.forEach((item) => {
item["ScenicName"] = item["ScenicName"] =
item.CouponsName + " -￥" + this.moneyFormat(item.RefundMoney); item.CouponsName + " -￥" + this.moneyFormat(item.RefundMoney);
...@@ -5468,7 +5476,7 @@ ...@@ -5468,7 +5476,7 @@
(err) => {} (err) => {}
); );
}, },
getScenicRefund_V1(TCID, OrderId) { getScenicRefund_V1(TCID, OrderId) {
this.OrderId = OrderId; this.OrderId = OrderId;
let msg = { let msg = {
TCID: TCID, TCID: TCID,
...@@ -5761,17 +5769,18 @@ ...@@ -5761,17 +5769,18 @@
dandijie = dandijie =
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
this.addMsg.ScenicList.forEach(item => { .OldPeopleNum))
if(totalGuest>=item.Number){ this.addMsg.ScenicList.forEach(item => {
refundScenicPrice+=item.Number*item.RefundMoney;} if (totalGuest >= item.Number) {
}); refundScenicPrice += item.Number * item.RefundMoney;
} }
this.addMsg.PreferPrice = });
this.OpSetLossMoney + }
var tempPrice = this.OpSetLossMoney +
dandijie + dandijie +
lianyun + lianyun +
chengren + chengren +
...@@ -5780,11 +5789,13 @@ ...@@ -5780,11 +5789,13 @@
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) + // this.ScenicRefundMoney *
// Number(this.addMsg.OldPeopleNum)); // (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
...@@ -5868,17 +5879,18 @@ ...@@ -5868,17 +5879,18 @@
dandijie = dandijie =
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
this.addMsg.ScenicList.forEach(item => { .OldPeopleNum))
if(totalGuest>=item.Number){ this.addMsg.ScenicList.forEach(item => {
refundScenicPrice+=item.Number*item.RefundMoney;} if (totalGuest >= item.Number) {
}); refundScenicPrice += item.Number * item.RefundMoney;
} }
this.addMsg.PreferPrice = });
this.OpSetLossMoney + }
var tempPrice = 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