Commit e6bb6d93 authored by 黄奎's avatar 黄奎

页面修改

parent 99084eea
......@@ -25,7 +25,6 @@
return _load
},
set: function set(v) {
//console.log(v.toString()),
eval("_load = " + v.toString().replace("maps.google.cn", "www.google.cn"))
}
});
......
......@@ -198,7 +198,6 @@
crmOrderObj: {
handler: function (val, oldVal) {
this.crmOrderObj = val
console.log(this.crmOrderObj)
if(this.crmOrderObj){
this.parameters.LureEmpId = val.LureEmpId//引流id
this.parameters.CRMGuestId = val.CRMGuestId //客人ID
......
......@@ -712,8 +712,6 @@
}, err => {})
},
saveVisa() { // 保存
console.log(this.addMsg,'===')
// return
this.$refs['addMsg'].validate((valid) => {
if (valid) {
this.apipost('dmc_get_visa_SetVisaOrder', this.addMsg, res => {
......
......@@ -75,7 +75,7 @@
<td width="80" class="txtRightCost">线路</td>
<td>
<el-select style="width:100%" v-model="postConfig.LineId" :placeholder="$t('pub.pleaseSel')"
@change="getLineTeamList(postConfig.LineId,1)" filterable>
@change="changeLine()" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option>
......@@ -124,7 +124,7 @@
<tr>
<td width="80" class="txtRightCost">出团公司</td>
<td>
<el-select class=" multiple_input" v-model="postConfig.OutBranchId" filterable>
<el-select class="multiple_input" v-model="postConfig.OutBranchId" filterable>
<el-option v-for='item in companyList' :key="item.id" :label="item.bName" :value="item.id">
</el-option>
</el-select>
......@@ -136,7 +136,7 @@
</td>
<td width="80" class="txtRightCost">出团类型</td>
<td>
<el-select class=" multiple_input" v-model="postConfig.TeamType" filterable>
<el-select class="multiple_input" v-model="postConfig.TeamType" filterable>
<el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
......@@ -1113,8 +1113,9 @@
<tr>
<td class="CP_ComTitle2">附件</td>
<td colspan="13">
<el-upload v-if="!teamPrice.ContractArray || !teamPrice.ContractArray.length" class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;"
:http-request="uploadFileBtn" :show-file-list="false" action="">
<el-upload v-if="!teamPrice.ContractArray || !teamPrice.ContractArray.length" class="upload-demo"
style="display:inline-block;position:relative;top:-1px;left:3px;" :http-request="uploadFileBtn"
:show-file-list="false" action="">
<el-button size="small" type="primary">报价单附件</el-button>
</el-upload>
<template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0">
......@@ -1475,6 +1476,18 @@
// this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
return totalMoney;
},
//线路切换
changeLine() {
this.getLineTeamList(this.postConfig.LineId, 1);
//欧洲线(2)和韩国线(5)默认小包团(1)
if (this.postConfig.LineId == 2 || this.postConfig.LineId == 5) {
this.postConfig.TeamType = 1;
}
else
{
this.postConfig.TeamType=0;
}
},
//获取系列列表
getLineTeamList(lineId, isClear) {
if (isClear && isClear == 1) {
......
......@@ -423,7 +423,6 @@
//根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() {
let userInfo = this.getLocalStorage();
// console.log('userInfo', userInfo)
this.queryData.CreateBy = userInfo.EmployeeId
let msg = {
GroupId: userInfo.RB_Group_id,
......
......@@ -728,9 +728,7 @@
that.selectFilghtList.push(x);
});
that.selectFilghtList.forEach(y => {
if (y.AirticketId == that.editForm.TicketId) {
console.log("1111");
y.IsSelected = true;
y.BindNum = that.editForm.TicketNum;
that.TicketMsg = y.AlName + "/" + y.FlightDate;
......@@ -832,7 +830,6 @@
if (tempObj.TravelTeamPartnerList && tempObj.TravelTeamPartnerList.length > 0) {
this.friendList = tempObj.TravelTeamPartnerList;
}
console.log('flightList>>>', this.addMsg.flightList)
} else {
this.Error(res.data.message);
}
......
......@@ -165,7 +165,6 @@
},
},
mounted() {
console.log('mounted', this.$route)
this.queryMsg.TCID = this.$route.query.id
this.getTravelTeamList();
},
......
......@@ -353,7 +353,6 @@
},
//保存航班信息
savePriceFlight(item) {
console.log('保存航班信息', item)
if(!/([0|1][0-9])|(2[0|1|2|3]):[0|1|2|3|4|5][0-9]/.test(item.DepartureTime)) {
this.$message.error('起飞时间格式不对, 格式如02:06, 23:00')
return
......
......@@ -10,9 +10,11 @@
border-top: 3px solid #38425d;
background-color: #ffffff;
padding: 10px 10px 0;
width: 100%;padding:20px 20px 10px 80px;
width: 100%;
padding: 20px 20px 10px 80px;
}
.title {
.title {
border-left: 3px solid #e95252;
text-indent: 15px;
height: 16px;
......@@ -21,7 +23,8 @@
margin-bottom: 20px;
line-height: 14px;
color: #000;
}
}
</style>
<template>
<div class="commonOrderForm">
......@@ -160,8 +163,7 @@
</el-col>
<el-col :span="4">
<el-form-item :label="$t('salesModule.TeamPrice')" prop="TC_Price">
<el-input v-if="addMsg.GroupType != 4" v-model="addMsg.TC_Price"
:disabled="pagesTitle=='跟团游产品'?false:true"
<el-input v-if="addMsg.GroupType != 4" v-model="addMsg.TC_Price" :disabled="pagesTitle=='跟团游产品'?false:true"
@input="getTotalPrice()">
</el-input>
<el-input v-else v-model="SingleDMCPricex" :disabled="true" @input="getTotalPrice()"></el-input>
......@@ -262,10 +264,15 @@
</template>
<template v-if="pagesTitle=='当地游产品'">
<el-col :span="4">
<p v-if='priceObj.IsSupportChildren==2' style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">{{$t('salesModule.NoSupplier')}}!</p>
<el-form-item v-if='priceObj.IsSupportChildren==1' v-show="addMsg.GroupType !== '4'" :label="$t('salesModule.ChildNum')" prop="ChirdNoNeedBedNum">
<el-input v-model='addMsg.ChirdNum' :disabled="addMsg.GroupType==='4'" @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
@input='getNumber();getHouseNo();getTotalPrice();autoRemarks("ChirdNoNeedBedNum","儿童人数");' @change="getNumGuest"></el-input>
<p v-if='priceObj.IsSupportChildren==2'
style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">
{{$t('salesModule.NoSupplier')}}!</p>
<el-form-item v-if='priceObj.IsSupportChildren==1' v-show="addMsg.GroupType !== '4'"
:label="$t('salesModule.ChildNum')" prop="ChirdNoNeedBedNum">
<el-input v-model='addMsg.ChirdNum' :disabled="addMsg.GroupType==='4'"
@keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
@input='getNumber();getHouseNo();getTotalPrice();autoRemarks("ChirdNoNeedBedNum","儿童人数");'
@change="getNumGuest"></el-input>
</el-form-item>
</el-col>
</template>
......@@ -407,7 +414,8 @@
<el-form-item :label="$t('salesModule.ScenicRefund')">
<el-select filterable multiple class="multiple_input" v-model="addMsg.ScenicRefundArr"
:placeholder="$t('pub.pleaseSel')" @change="ScenicRefundMethods">
<el-option v-for="(item,index) in ScenicRefundList" :label="item.ScenicName" :value="item.Id" :key="index">
<el-option v-for="(item,index) in ScenicRefundList" :label="item.ScenicName" :value="item.Id"
:key="index">
</el-option>
</el-select>
</el-form-item>
......@@ -496,8 +504,8 @@
//团期编号,订单编号(新增传0),下单人选择的公司
props: [
'showCity',
'PTCID',//团期编号(必须传),
'POrderId',//订单编号(新增传0)
'PTCID', //团期编号(必须传),
'POrderId', //订单编号(新增传0)
'PBranchId', //销售公司/联运公司
'PProductType', //产品类型(1-常规团,2-包机团)
'productObj',
......@@ -1048,7 +1056,7 @@
},
(res) => {
if (res.data.resultCode == 1) {
this.minPrice = res.data.data&&res.data.data.LowDeposit;
this.minPrice = res.data.data && res.data.data.LowDeposit;
}
},
);
......@@ -1068,7 +1076,7 @@
},
//计算少价金额
getTypePrice() {
if(this.pagesTitle=='当地游产品'){
if (this.pagesTitle == '当地游产品') {
this.addMsg.ContactName = ''
this.addMsg.ContactMobile = ''
}
......@@ -1405,7 +1413,7 @@
qz: "",
qzf: "",
}
if(this.pagesTitle=='当地游产品'){
if (this.pagesTitle == '当地游产品') {
this.addMsg.GroupType = "1"
}
this.clientSourceList = [];
......@@ -1518,9 +1526,9 @@
this.addMsg.IsChildrenTour = this.priceObj.IsSupportChildren;
this.addMsg.IsBirdDiscount = this.priceObj.IsBirdDiscount;
let url
if(this.PProductType==1){
if (this.PProductType == 1) {
url = 'sellorder_post_SetOrderInfo_02'
}else if(this.PProductType==2){
} else if (this.PProductType == 2) {
url = 'sellorder_post_SetTravelTeamOrderForB2B' //团下单接口sellorder_post_SetOrderInfoForB2B
}
this.apipost(url,
......@@ -1675,11 +1683,10 @@
"sellorder_get_GetSellClientTypeEnumList", {},
(res) => {
if (res.data.resultCode == 1) {
if(this.showCity) {
if (this.showCity) {
this.customerTypeList = res.data.data;
} else {
this.customerTypeList = res.data.data.filter(item => item.Id < 3);
console.log('this.customerTypeList', this.customerTypeList)
}
}
},
......@@ -1807,8 +1814,8 @@
this.getTradeWay();
},
watch: {
productObj:{
handler(oldValue, newVal){
productObj: {
handler(oldValue, newVal) {
this.clearMsg();
this.getTravelPirceInfo()
this.addMsg.DepartureCityId = oldValue.StartCityID
......@@ -1816,7 +1823,7 @@
this.addMsg.GoCityTime = this.starTime = oldValue.StartCityTime;
this.addMsg.BackCityTime = this.endTime = oldValue.BackCityTime;
this.priceObj = JSON.parse(JSON.stringify(oldValue))
if(this.pagesTitle=='当地游产品'){
if (this.pagesTitle == '当地游产品') {
let str = ''
if (oldValue.OtherPrice > 0) {
str += '杂费' + oldValue.OtherPrice + '/人;'
......@@ -1844,4 +1851,5 @@
}
}
};
</script>
......@@ -363,14 +363,10 @@
this.addMsg.menutype = updateList.MenuType?updateList.MenuType:1
this.addMsg.MenuStatus = updateList.MenuStatus.toString()
let style = JSON.parse(updateList.MenuStyle)
// this.addMsg.MenuStyleIcon = style.icon
console.log(updateList.MenuType,'----')
this.addMsg.MenuStyleIcon = style.icon
this.addMsg.MenuStyleColor = style.color
this.currentUpdateIndex = index
}, err => {})
this.getChildMenu();
if (this.addMsg.MenuStyle && this.addMsg.MenuStyle != "") {
let style = JSON.parse(this.DataList[index].MenuStyle)
......
......@@ -786,7 +786,7 @@ export default {
}
},
e=>{
console.log(e.message)
}
);
},
......
......@@ -1374,7 +1374,6 @@
},
// 计算价格
getTotalPrice(t) {
console.log('getTotalPrice', this.addObj)
if (t === 3) {
if (parseFloat(this.addMsg.Unit_Price).toString() === "NaN") {
this.$message.error("请输入正确的价格!");
......@@ -1525,18 +1524,6 @@
dandijie =
this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
}
console.log('this.addObj.OtherPrice', this.addObj.OtherPrice, (Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum)),this.addObj.VisaPrice,(Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum)),(Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.BabyNum) +
Number(this.addMsg.OldPeopleNum) -
Number(this.addMsg.VisaNum)))
this.addMsg.PreferPrice =
dandijie +
lianyun +
......@@ -1689,12 +1676,10 @@
},
saveOrder() {
this.addMsg.TCID = this.addObj.TCID
console.log('saveOrder', this.addMsg)
this.$emit('change', this.addMsg)
},
// todo 购买的产品信息,需要从外部传入
goBuy(obj) {
console.log('goBuy', obj)
if(!obj) return
this.isUpdateSharePeople = false;
this.isShowLayer = true;
......
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