Skip to content

S
SuperMan
Commit fda4213a authored by Mac's avatar Mac
Browse files
Options

Revert "修改" 

This reverts commit aa67219f.
parent aa67219f
Show whitespace changes
Inline Side-by-side
Showing with 755 additions and 903 deletions
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ fda4213a
......@@ -987,7 +987,7 @@
<el-col :span="4">
<el-form-item label="婴儿人数" prop="BabyNum">
<el-input v-model='addMsg.BabyNum' @keyup.native="checkInteger(addMsg,'BabyNum')"
@input='getNumber();getTotalPrice()'></el-input>
@input='getNumber();getTotalPrice();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
......@@ -1094,7 +1094,7 @@
<input type="button" class="normalBtn" value="保存" @click="submitForm('addMsg')" />
</span>
</p>
<el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="90px">
<el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="80px">
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="客户类型" prop="CustomerType">
......@@ -1105,7 +1105,7 @@
</el-select>
</el-form-item>
<el-form-item label="参团类型" prop="GroupType">
<el-select v-model='addMsg.GroupType' filterable :placeholder="$t('pub.pleaseSel')" @change="gettypechange(addMsg.GroupType)">
<el-select v-model='addMsg.GroupType' filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in ctlxList" :label='item.Name' :value='item.Id' :key='item.Id'
v-if="item.Id!=5">
</el-option>
......@@ -1167,7 +1167,7 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="5">
<el-form-item label="本团单价" prop="TC_Price">
<el-input v-model='addMsg.TC_Price' :disabled="true" class="w210"></el-input>
</el-form-item>
......@@ -1180,24 +1180,15 @@
<span class="colorE95252" v-show='!returnPriceShow'>暂无报价！</span>
</el-form-item>
</el-col>
<el-col :span="3" v-if="isChecked==true">
<template>
<el-form-item label="成交单价" prop="Unit_Price" v-if="HightUnitPrice === '2'">
<el-col :span="5" v-if="isChecked==true">
<el-form-item label="成交单价" prop="Unit_Price">
<el-select v-model='addMsg.Unit_Price' filterable :placeholder="$t('pub.pleaseSel')"
@change="getTotalPrice()">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="成交单价" prop="Unit_Price" v-else>
<el-input v-model='addMsg.Unit_Price' @change="getTotalPrice(3)"></el-input>
</el-form-item>
</template>
<el-form-item label="高于本团单价" v-show="addMsg.GroupType != 4" >
<el-switch v-model="HightUnitPrice" active-value="1" inactive-value="2"></el-switch>
</el-form-item>
<el-form-item v-show="addMsg.GroupType != 4">
<el-form-item>
<p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p>
......@@ -1216,7 +1207,7 @@
<div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="成人人数" prop="ManNum" v-show="addMsg.GroupType !== '4'">
<el-form-item label="成人人数" prop="ManNum">
<el-input v-model='addMsg.ManNum' @keyup.native="checkInteger(addMsg,'ManNum')"
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
......@@ -1224,38 +1215,37 @@
<el-col :span="4">
<p v-if='IsChildrenTour==2' style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">
本团不支持儿童出游!</p>
<el-form-item v-if='IsChildrenTour==1' label="儿童不占床" prop="ChirdNoNeedBedNum" v-show="addMsg.GroupType !== '4'">
<el-form-item v-if='IsChildrenTour==1' label="儿童不占床" prop="ChirdNoNeedBedNum">
<el-input v-model='addMsg.ChirdNoNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-if='IsChildrenTour==1'>
<el-form-item label="儿童占床" prop="ChirdNeedBedNum" v-show="addMsg.GroupType !== '4'">
<el-form-item label="儿童占床" prop="ChirdNeedBedNum">
<el-input v-model='addMsg.ChirdNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNeedBedNum')"
@input='getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-if='IsChildrenTour==1'>
<el-form-item label="婴儿人数" prop="BabyNum" v-show="addMsg.GroupType !== '4'">
<el-form-item label="婴儿人数" prop="BabyNum">
<el-input v-model='addMsg.BabyNum' @keyup.native="checkInteger(addMsg,'BabyNum')"
@input='getNumber();getTotalPrice()'></el-input>
@input='getNumber();getTotalPrice();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="老人人数" prop="OldPeopleNum" v-show="addMsg.GroupType !== '4'">
<el-form-item label="老人人数" prop="OldPeopleNum">
<el-input v-model='addMsg.OldPeopleNum' @keyup.native="checkInteger(addMsg,'OldPeopleNum')"
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="单地接数量" prop="AirticketNum" v-show="addMsg.GroupType !== '1'">
</el-row>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="单地接数量" prop="AirticketNum">
<el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')"
@input='getNumber();getTotalPrice();getHouseNo()'></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="单房数量" prop="SingleRoomNum">
<el-input v-model='addMsg.SingleRoomNum' @keyup.native="checkInteger(addMsg,'SingleRoomNum')"
......@@ -1564,6 +1554,10 @@
slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==3' style="color:#666; " class="personNo nowrap"
slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<br/>
<span v-if="item.RefuseVisaNum>0" style="color:red">
(拒签 {{item.RefuseVisaNum}}人)
</span>
</td>
<td>{{item.TC_Price}}</td>
<td>{{item.Unit_Price}}</td>
......@@ -1698,9 +1692,9 @@
<span style="color:blue !important" v-for="(childItem) in item.GuestList"
@click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span>
</p>
<!-- <p class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </p>-->
<!-- <p class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </p>-->
<span>房间信息：{{item.OrderGuestHouseStr}}</span>
<span v-if="item.TipMoney" style="color:red">（小费：{{item.TipMoney}}）</span>
</td>
......@@ -1807,6 +1801,10 @@
slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
<span v-if='childItem.GuestNumStatus==3' style="color:#666; " class="personNo nowrap"
slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
<br/>
<span v-if="childItem.RefuseVisaNum>0" style="color:red">
(拒签 {{childItem.RefuseVisaNum}}人)
</span>
<!-- </el-popover> -->
</td>
<td class="nowrap">{{childItem.TC_Price}}</td>
......@@ -1965,9 +1963,9 @@
<span style="color:blue !important" v-for="(fourthItem) in childItem.GuestList"
@click="goUrl('TravelPassengerList',msg.TCID,fourthItem.OrderId,'旅客名单')">{{fourthItem.userName}}</span>
</span>
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </span>-->
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </span>-->
<span style="display: block">房间信息：{{childItem.OrderGuestHouseStr}}</span>
<span v-if="childItem.TipMoney" style="color:red">（小费：{{childItem.TipMoney}}）</span>
</td>
......@@ -2141,6 +2139,10 @@
slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==3' style="color:#666;" class="personNo"
slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<br/>
<span v-if="item.RefuseVisaNum>0" style="color:red">
(拒签 {{item.RefuseVisaNum}}人)
</span>
<!-- </el-popover> -->
</td>
<td>{{item.TC_Price}}</td>
......@@ -2284,9 +2286,9 @@
<span style="color:blue !important" v-for="(childItem) in item.GuestList"
@click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span>
</span>
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </span>-->
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </span>-->
<span v-if="item.TipMoney" style="color:red">（小费：{{item.TipMoney}}）</span>
</td>
</tr>
......@@ -3073,9 +3075,7 @@
OrderUnitPrice: 0
},
SuperiorPeople: [],
IsBackStatus: 1,
HightUnitPrice: '2',
Unit_Price:0,
IsBackStatus: 1
};
},
components: {
......@@ -3093,6 +3093,7 @@
if (res.data.resultCode === 1) {
this.$message.success(res.data.message)
this.getList()
this.FyongLoading = false
} else {
this.$message.error(res.data.message)
}
......@@ -3181,13 +3182,7 @@
this.IsBirdDiscount = x.IsBirdDiscount;
this.OpSetLossPeople = x.OpSetLossPeople;
this.OpSetLossMoney = x.OpSetLossMoney;
if(this.addMsg.GroupType == 4){
this.HightUnitPrice = '1'
this.Unit_Price = x.Unit_Price
}else {
this.HightUnitPrice = '2'
this.Unit_Price = this.addObj.SingleDMCPrice
}
this.stratPrice = 0;
if (res.data.data.modelPrice && res.data.data.modelPrice.GoAddPrice) {
this.stratPrice = res.data.data.modelPrice.GoAddPrice;
......@@ -3222,7 +3217,7 @@
this.Unit_PriceList = [];
this.apipost('sellorder_post_GetLessPrice', {
"TCID": obj.TCID,
"MaxPeopleNum": maxPeopleNum
"MaxPeopleNum": MaxPeopleNum
}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney) > 0) {
......@@ -3734,19 +3729,7 @@
}
},
getTotalPrice(t) {
if (t === 3) {
if (parseFloat(this.addMsg.Unit_Price).toString() === "NaN") {
this.$message.error('请输入正确的价格！')
this.addMsg.Unit_Price = this.addMsg.TC_Price
return
}
if (this.addMsg.Unit_Price < this.addMsg.TC_Price) {
this.$message.error('成交单价必须大于等于本团单价！')
this.addMsg.Unit_Price = this.addMsg.TC_Price
return
}
}
getTotalPrice() {
if (this.addMsg.GroupType != 5) {
this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1
if (this.addObj.IsBirdDiscount == 1) {
......@@ -3799,14 +3782,8 @@
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum)) *
(Number(this.stratPrice) + Number(this.returnPrice));
let dandijie
if(this.addMsg.GroupType == 4){
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum);
}else {
dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
}
let dandijie =
this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
this.addMsg.PreferPrice =
this.OpSetLossMoney +
dandijie +
......@@ -3861,15 +3838,8 @@
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum)) *
(Number(this.stratPrice) + Number(this.returnPrice));
let dandijie
if(this.addMsg.GroupType == 4){
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum);
}else {
dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
}
let dandijie =
this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
this.addMsg.PreferPrice =
this.OpSetLossMoney +
dandijie +
......@@ -3890,9 +3860,6 @@
this.addMsg.PreferPrice = Number(this.addMsg.YSeatNum) * Number(this.addMsg.Unit_Price) + this.OpSetLossMoney;
}
this.getTicheng();
if (!t) {
this.getTypePrice2()
}
},
yzBigBed2() {
let x =
......@@ -4855,122 +4822,7 @@
// }
// },
// err => {})
},
gettypechange(type){
//切换参团类型时 把值初始化
if(type == 4){
this.addMsg.Unit_Price = this.Unit_Price; //成交单价
this.HightUnitPrice = '1';
this.addMsg.AirticketNum = 0;
this.addMsg.ManNum = 0;
// this.addMsg.ChirdNum = 0;
this.addMsg.BabyNum = 0;
this.addMsg.OldPeopleNum = 0;
this.addMsg.ChirdNoNeedBedNum = 0;
this.addMsg.ChirdNeedBedNum = 0;
this.addMsg.PreferPrice = 0;
this.addMsg.SafeNum = 0;
this.addMsg.VisaNum = 0;
this.addMsg.PredictRoomNum = 0;
this.addMsg.YSeatNum = 0;
}else {
this.HightUnitPrice = '2';
this.addMsg.AirticketNum = 0;
this.addMsg.ManNum = 0;
// this.addMsg.ChirdNum = 0; //?
this.addMsg.BabyNum = 0;
this.addMsg.OldPeopleNum = 0;
this.addMsg.ChirdNoNeedBedNum = 0;
this.addMsg.ChirdNeedBedNum = 0;
this.addMsg.PreferPrice = 0;
this.addMsg.SafeNum = 0;
this.addMsg.VisaNum = 0;
this.addMsg.PredictRoomNum = 0;
this.addMsg.YSeatNum = 0;
};
if (this.addMsg.CustomerType == 1) {
if(this.addMsg.GroupType==4){
this.addMsg.TC_Price = this.addObj.SingleDMCPrice;
}else {
this.addMsg.TC_Price = this.addObj.B2BMemberPrice;
this.addMsg.Unit_Price = this.addObj.B2BMemberPrice;
}
}
if (this.addMsg.CustomerType == 2) {
if(this.addMsg.GroupType==4){
this.addMsg.TC_Price = this.addObj.SingleDMCPrice;
}else {
this.addMsg.TC_Price = this.addObj.B2BPrice
this.addMsg.Unit_Price = this.addObj.B2BPrice;
}
}
if (this.addMsg.CustomerType == 3) {
if(this.addMsg.GroupType==4){
this.addMsg.TC_Price = this.addObj.SingleDMCPrice;
}else {
this.addMsg.TC_Price = this.addObj.B2CMemberPrice
this.addMsg.Unit_Price = this.addObj.B2CMemberPrice;
}
this.addMsg.CustomerId = '0'
this.addMsg.CommissionShareMoney = '0'
}
if (this.addMsg.CustomerType == 4) {
if(this.addMsg.GroupType==4){
this.addMsg.TC_Price = this.addObj.SingleDMCPrice;
}else {
this.addMsg.TC_Price = this.addObj.B2CPrice
this.addMsg.Unit_Price = this.addObj.B2CPrice;
}
this.addMsg.CustomerId = '0'
this.addMsg.CommissionShareMoney = '0'
}
},
getTypePrice2() {
let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum) )
this.Unit_PriceList = [];
console.log(this.Unit_PriceList)
this.apipost('sellorder_post_GetLessPrice', {
"TCID": this.addMsg.TCID,
"MaxPeopleNum": maxPeopleNum
}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney) > 0) {
for (var i = 0; i <= parseInt(this.LessMoney) / 10; i++) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.TC_Price - i * 10;
obj.LessMoney = this.addMsg.TC_Price - i * 10;
this.Unit_PriceList.push(obj);
}
if (this.Unit_PriceList.findIndex(markers => markers.ID == this.addMsg.Unit_Price) < 0) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
} else {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
}, err => {})
},
},
mounted() {
let userInfo = this.getLocalStorage();
......
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