Skip to content

S
SuperMan
Commit 2c3ee94d authored by 吴春's avatar 吴春
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 8bc84eac b6918424
Show whitespace changes
Inline Side-by-side
Showing with 171 additions and 160 deletions
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 2c3ee94d
......@@ -5486,13 +5486,6 @@
this.addMsg.CommissionShareMoney = "0";
},
saveOrder() {
// 判断单团类型
if (this.addMsg.GroupType == 2) {
// if (this.addMsg.QuotationUrl == "") {
// this.Error(this.$t('objFill.v101.FinancialModule.qingscfj'));
// return;
// }
}
// 选择联运，联运备注必填
if (this.addMsg.IsIntermodal == 1 || this.addMsg.IsReturnIntermodal == 1) {
if (!this.addMsg.UnionRemark) {
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 2c3ee94d
......@@ -1252,7 +1252,7 @@
</template>
</table>
<font style="color:red;font-weight:bold;cursor:pointer;" slot="reference">
{{subItem.ChangeNum>0?'+':'-'}}{{subItem.ChangeNum}}</font>
{{subItem.ChangeNum>0?'+':''}}{{subItem.ChangeNum}}</font>
</el-popover>
</template>
</td>
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 2c3ee94d
......@@ -858,7 +858,7 @@
</template>
</table>
<font style="color:red;font-weight:bold;cursor:pointer;" slot="reference">
{{subItem.ChangeNum>0?'+':'-'}}{{subItem.ChangeNum}}</font>
{{subItem.ChangeNum>0?'+':''}}{{subItem.ChangeNum}}</font>
</el-popover>
</template>
</td>
......
src/components/orderCommon/order-form2.vue
View file @ 2c3ee94d
......@@ -56,6 +56,7 @@
.el-input-group__prepend {
padding: 0 5px !important;
}
/deep/.SimulateDrop-box {
width: 176px;
min-height: 34px;
......@@ -64,7 +65,8 @@
float: left;
/* margin: 4px 0 0 10px; */
border: 1px solid #d1d1d1;
}
}
.SD_flight {
display: inline-block;
height: 24px;
......@@ -73,12 +75,14 @@
line-height: 22px;
background-color: #f0f2f5;
}
.SimulaDrop {
position: absolute;
top: 3px;
right: 10px;
color: #c0c4cc;
}
._TravelPricePopover .jiDiv {
width: 750px;
max-height: 400px;
......@@ -118,6 +122,7 @@
._TravelPricePopover table td._d_name {
background-color: #ededed;
}
</style>
<!--下单表单-->
<template>
......@@ -207,8 +212,8 @@
<!--同行联系人Id-->
<el-form-item :label="$t('hotel.suplier_contact')" prop="CustomerChildrenId">
<el-select v-model="addMsg.CustomerChildrenId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="(item, index) in customerChildrenList" :label="item.contactName +'-'+item.contactPhone+ '/' + item.contactDuty"
:value="item.id" :key="index">
<el-option v-for="(item, index) in customerChildrenList"
:label="item.contactName +'-'+item.contactPhone+ '/' + item.contactDuty" :value="item.id" :key="index">
</el-option>
</el-select>
</el-form-item>
......@@ -628,7 +633,8 @@
-￥{{item.RefundMoney}}
</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>
......@@ -637,7 +643,8 @@
</div>
</div>
<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>
</div>
</el-popover>
......@@ -896,7 +903,7 @@
ContactName: "",
ContactMobile: "",
CustomerId: "",
CustomerChildrenId:"",
CustomerChildrenId: "",
DepartureCityId: "0",
ReturnArriveCityId: "",
IsIntermodal: "2",
......@@ -935,7 +942,7 @@
SafeNum: "0",
AirticketNum: "0",
ScenicRefundArr: [],
ScenicList:[],//可退景点人数
ScenicList: [], //可退景点人数
GoCityTime: "",
BackCityTime: "",
CommissionSharePeople: "0",
......@@ -965,7 +972,7 @@
}, ],
CustomerChildrenId: [{
required: true,
message: this.$t('objFill.qingxzkhmd')+this.$t('hotel.suplier_contact'),
message: this.$t('objFill.qingxzkhmd') + this.$t('hotel.suplier_contact'),
trigger: "change",
}, ],
ManNum: [{
......@@ -1150,19 +1157,16 @@
//初始化景点
initScenic() {
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 => {
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);
}
else{
x.Number=0;
} else {
x.Number = 0;
}
})
this.getTotalPrice();
this.getTicheng();
console.log("this.ScenicList",this.addMsg.ScenicList);
},
// 获取已选优惠券
getDiscountAmount() {
......@@ -1296,7 +1300,6 @@
this.addMsg.ManNum = 0;
this.addMsg.BabyNum = 0;
this.addMsg.OldPeopleNum = 0;
this.addMsg.PreferPrice = 0;
this.addMsg.LessPrice = 0;
this.addMsg.LessAvgPrice = 0;
......@@ -1310,7 +1313,6 @@
this.addMsg.ManNum = 0;
this.addMsg.BabyNum = 0;
this.addMsg.OldPeopleNum = 0;
this.addMsg.PreferPrice = 0;
this.addMsg.LessPrice = 0;
this.addMsg.LessAvgPrice = 0;
......@@ -1752,8 +1754,8 @@
resetSelect() {
if (this.addMsg.CustomerType == 1 || this.addMsg.CustomerType == 2) {
this.addMsg.CustomerId = "";
this.addMsg.CustomerChildrenId ="";
this.customerChildrenList=[];
this.addMsg.CustomerChildrenId = "";
this.customerChildrenList = [];
}
},
//清空联系人和联系电话
......@@ -1905,8 +1907,10 @@
Number(this.addMsg.ChirdNoNeedBedNum) :
0;
}
// this.addMsg.PredictRoomNum = (Number(this.addMsg.AirticketNum) + (Number(this.addMsg.ManNum) +Number(this.addMsg.ChirdNeedBedNum) -Number(etbzc) +Number(this.addMsg.OldPeopleNum)) -Number(this.addMsg.TripleRoomNum) * 3 -Number(this.addMsg.SingleRoomNum)) /2 +Number(this.addMsg.SingleRoomNum) +Number(this.addMsg.TripleRoomNum);
this.addMsg.PredictRoomNum = (Number(this.addMsg.AirticketNum) + (Number(this.addMsg.ManNum) +Number(this.addMsg.ChirdNeedBedNum) -Number(etbzc) +Number(this.addMsg.OldPeopleNum)) -Number(this.addMsg.TripleRoomNum) * 3 -Number(this.addMsg.SingleRoomNum)) /2 +Number(this.addMsg.SingleRoomNum) +Number(this.addMsg.TripleRoomNum);
this.addMsg.PredictRoomNum = (Number(this.addMsg.AirticketNum) + (Number(this.addMsg.ManNum) + Number(this
.addMsg.ChirdNeedBedNum) - Number(etbzc) + Number(this.addMsg.OldPeopleNum)) - Number(this.addMsg
.TripleRoomNum) * 3 - Number(this.addMsg.SingleRoomNum)) / 2 + Number(this.addMsg.SingleRoomNum) + Number(
this.addMsg.TripleRoomNum);
},
getNumber() {
if (
......@@ -2023,7 +2027,8 @@
let danfang = Number(this.addMsg.SingleRoomNum) * this.priceObj.SingleRoomPrice;
//儿童占床、不占床价格
let ertongbed = this.priceObj.ChildNeedPrice * Number(this.addMsg.ChirdNeedBedNum) - this.priceObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNum) - Number(this.addMsg.ChirdNeedBedNum));
let ertongbed = this.priceObj.ChildNeedPrice * Number(this.addMsg.ChirdNeedBedNum) - this.priceObj
.ChildNoNeedPrice * (Number(this.addMsg.ChirdNum) - Number(this.addMsg.ChirdNeedBedNum));
//联运 (单价已包含联运价格了，所以不需要联运价格)
let lianyun = 0;
......@@ -2033,16 +2038,17 @@
// (Number(this.stratPrice) + Number(this.returnPrice));
//退景点费用
var refundScenicPrice =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 refundScenicPrice = 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))
this.addMsg.ScenicList.forEach(item => {
if(totalGuest>=item.Number){
refundScenicPrice+=item.Number*item.RefundMoney;}
if (totalGuest >= item.Number) {
refundScenicPrice += item.Number * item.RefundMoney;
}
});
}
// var refundScenicPrice = this.ScenicRefundMoney * (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
// Number(this.addMsg.OldPeopleNum));
//单地接
let dandijie = 0;
if (this.addMsg.GroupType == 4) {
......@@ -2066,9 +2072,22 @@
dandijie = this.priceObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
}
//总应收价格
this.addMsg.PreferPrice = Number(dandijie) + Number(lianyun) + Number(chengren) + Number(ertong) + Number(yinger) + Number(laoren) + Number(zafeiqianzhen) + Number(danfang) + Number(ertongbed) - Number(refundScenicPrice)
console.log(dandijie +'--',lianyun +'--',chengren +'--',ertong +'--',yinger +'--',laoren +'--',zafeiqianzhen +'--',danfang +'--',ertongbed +'--',refundScenicPrice)
if (this.priceObj.IsLessPrice == 1 && this.addMsg.GroupType == 1 && (this.addMsg.CustomerType == '1' || this.addMsg.CustomerType == '2') && this.priceObj.LineID > 0 && this.LessRule && this.LessRule.length > 0) {
this.addMsg.PreferPrice = Number(dandijie) + Number(lianyun) + Number(chengren) + Number(ertong) + Number(
yinger) + Number(laoren) + Number(zafeiqianzhen) + Number(danfang) + Number(ertongbed) - Number(
refundScenicPrice)
var logStr = "单地接:" + dandijie;
logStr += ",联运:" + lianyun;
logStr += ",成人:" + chengren;
logStr += ",儿童:" + ertong;
logStr += ",婴儿:" + yinger;
logStr += ",老人:" + laoren;
logStr += ",杂费签证:" + zafeiqianzhen;
logStr += ",单房:" + danfang;
logStr += ",儿童不占床:" + ertongbed;
logStr += ",退景点:" + refundScenicPrice;
console.log(logStr);
if (this.priceObj.IsLessPrice == 1 && this.addMsg.GroupType == 1 && (this.addMsg.CustomerType == '1' || this
.addMsg.CustomerType == '2') && this.priceObj.LineID > 0 && this.LessRule && this.LessRule.length > 0) {
let LessNum = (Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum));
......@@ -2126,10 +2145,10 @@
},
//清空表单信息
clearMsg() {
this.DiscountAmountId = null,
this.DiscountAmountObj = {},
this.ScenicRefundList=[],
this.addMsg.ScenicList=[];
this.DiscountAmountId = null;
this.DiscountAmountObj = {};
this.ScenicRefundList = [];
this.addMsg.ScenicList = [];
this.addMsg = {
price: "0",
GroupTypeNeedHouse: "0",
......@@ -2181,7 +2200,7 @@
SafeNum: "0",
AirticketNum: "0",
ScenicRefundArr: [],
ScenicList:[],
ScenicList: [],
GoCityTime: "",
BackCityTime: "",
CommissionSharePeople: "-1",
......@@ -2352,12 +2371,9 @@
this.DiscountAmountId = null
this.DiscountAmountObj = {}
this.Success(res.data.message);
this.cancelSubmit();
this.$refs["addMsg"].resetFields();
this.clearMsg();
//调用父组件方法
this.$emit("success");
} else {
this.Error(res.data.message);
}
......@@ -2520,13 +2536,15 @@
(err) => {}
);
},
getCustomerChildrenList(){
getCustomerChildrenList() {
this.apipost(
"app_today_visit_GerOrderCustomerChildrenList", {CustomerId: this.addMsg.CustomerId},
"app_today_visit_GerOrderCustomerChildrenList", {
CustomerId: this.addMsg.CustomerId
},
(res) => {
if (res.data.resultCode == 1) {
this.customerChildrenList = res.data.data;
if(this.customerChildrenList && this.customerChildrenList.length>0){
if (this.customerChildrenList && this.customerChildrenList.length > 0) {
this.addMsg.CustomerChildrenId = this.customerChildrenList[0].id;
}
}
......
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