Commit e6bb6d93 authored by 黄奎's avatar 黄奎

页面修改

parent 99084eea
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
return _load return _load
}, },
set: function set(v) { set: function set(v) {
//console.log(v.toString()),
eval("_load = " + v.toString().replace("maps.google.cn", "www.google.cn")) eval("_load = " + v.toString().replace("maps.google.cn", "www.google.cn"))
} }
}); });
......
...@@ -198,7 +198,6 @@ ...@@ -198,7 +198,6 @@
crmOrderObj: { crmOrderObj: {
handler: function (val, oldVal) { handler: function (val, oldVal) {
this.crmOrderObj = val this.crmOrderObj = val
console.log(this.crmOrderObj)
if(this.crmOrderObj){ if(this.crmOrderObj){
this.parameters.LureEmpId = val.LureEmpId//引流id this.parameters.LureEmpId = val.LureEmpId//引流id
this.parameters.CRMGuestId = val.CRMGuestId //客人ID this.parameters.CRMGuestId = val.CRMGuestId //客人ID
......
...@@ -712,8 +712,6 @@ ...@@ -712,8 +712,6 @@
}, err => {}) }, err => {})
}, },
saveVisa() { // 保存 saveVisa() { // 保存
console.log(this.addMsg,'===')
// return
this.$refs['addMsg'].validate((valid) => { this.$refs['addMsg'].validate((valid) => {
if (valid) { if (valid) {
this.apipost('dmc_get_visa_SetVisaOrder', this.addMsg, res => { this.apipost('dmc_get_visa_SetVisaOrder', this.addMsg, res => {
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<td width="80" class="txtRightCost">线路</td> <td width="80" class="txtRightCost">线路</td>
<td> <td>
<el-select style="width:100%" v-model="postConfig.LineId" :placeholder="$t('pub.pleaseSel')" <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 :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 v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option> </el-option>
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
<tr> <tr>
<td width="80" class="txtRightCost">出团公司</td> <td width="80" class="txtRightCost">出团公司</td>
<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 v-for='item in companyList' :key="item.id" :label="item.bName" :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
</td> </td>
<td width="80" class="txtRightCost">出团类型</td> <td width="80" class="txtRightCost">出团类型</td>
<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 v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
...@@ -1113,8 +1113,9 @@ ...@@ -1113,8 +1113,9 @@
<tr> <tr>
<td class="CP_ComTitle2">附件</td> <td class="CP_ComTitle2">附件</td>
<td colspan="13"> <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;" <el-upload v-if="!teamPrice.ContractArray || !teamPrice.ContractArray.length" class="upload-demo"
:http-request="uploadFileBtn" :show-file-list="false" action=""> 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-button size="small" type="primary">报价单附件</el-button>
</el-upload> </el-upload>
<template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0"> <template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0">
...@@ -1475,6 +1476,18 @@ ...@@ -1475,6 +1476,18 @@
// this.getConvertMoney(this.OtherPrice.AirTicketMoeny) + // this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
return totalMoney; 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) { getLineTeamList(lineId, isClear) {
if (isClear && isClear == 1) { if (isClear && isClear == 1) {
......
...@@ -423,7 +423,6 @@ ...@@ -423,7 +423,6 @@
//根据当前员工所在部门获取该部门及子部门员工信息 //根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() { getEmployeeList() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
// console.log('userInfo', userInfo)
this.queryData.CreateBy = userInfo.EmployeeId this.queryData.CreateBy = userInfo.EmployeeId
let msg = { let msg = {
GroupId: userInfo.RB_Group_id, GroupId: userInfo.RB_Group_id,
......
...@@ -728,9 +728,7 @@ ...@@ -728,9 +728,7 @@
that.selectFilghtList.push(x); that.selectFilghtList.push(x);
}); });
that.selectFilghtList.forEach(y => { that.selectFilghtList.forEach(y => {
if (y.AirticketId == that.editForm.TicketId) { if (y.AirticketId == that.editForm.TicketId) {
console.log("1111");
y.IsSelected = true; y.IsSelected = true;
y.BindNum = that.editForm.TicketNum; y.BindNum = that.editForm.TicketNum;
that.TicketMsg = y.AlName + "/" + y.FlightDate; that.TicketMsg = y.AlName + "/" + y.FlightDate;
...@@ -832,7 +830,6 @@ ...@@ -832,7 +830,6 @@
if (tempObj.TravelTeamPartnerList && tempObj.TravelTeamPartnerList.length > 0) { if (tempObj.TravelTeamPartnerList && tempObj.TravelTeamPartnerList.length > 0) {
this.friendList = tempObj.TravelTeamPartnerList; this.friendList = tempObj.TravelTeamPartnerList;
} }
console.log('flightList>>>', this.addMsg.flightList)
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
...@@ -165,7 +165,6 @@ ...@@ -165,7 +165,6 @@
}, },
}, },
mounted() { mounted() {
console.log('mounted', this.$route)
this.queryMsg.TCID = this.$route.query.id this.queryMsg.TCID = this.$route.query.id
this.getTravelTeamList(); this.getTravelTeamList();
}, },
......
...@@ -353,7 +353,6 @@ ...@@ -353,7 +353,6 @@
}, },
//保存航班信息 //保存航班信息
savePriceFlight(item) { 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)) { 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') this.$message.error('起飞时间格式不对, 格式如02:06, 23:00')
return return
......
This diff is collapsed.
...@@ -363,14 +363,10 @@ ...@@ -363,14 +363,10 @@
this.addMsg.menutype = updateList.MenuType?updateList.MenuType:1 this.addMsg.menutype = updateList.MenuType?updateList.MenuType:1
this.addMsg.MenuStatus = updateList.MenuStatus.toString() this.addMsg.MenuStatus = updateList.MenuStatus.toString()
let style = JSON.parse(updateList.MenuStyle) let style = JSON.parse(updateList.MenuStyle)
// this.addMsg.MenuStyleIcon = style.icon
console.log(updateList.MenuType,'----')
this.addMsg.MenuStyleIcon = style.icon this.addMsg.MenuStyleIcon = style.icon
this.addMsg.MenuStyleColor = style.color this.addMsg.MenuStyleColor = style.color
this.currentUpdateIndex = index this.currentUpdateIndex = index
}, err => {}) }, err => {})
this.getChildMenu(); this.getChildMenu();
if (this.addMsg.MenuStyle && this.addMsg.MenuStyle != "") { if (this.addMsg.MenuStyle && this.addMsg.MenuStyle != "") {
let style = JSON.parse(this.DataList[index].MenuStyle) let style = JSON.parse(this.DataList[index].MenuStyle)
......
...@@ -786,7 +786,7 @@ export default { ...@@ -786,7 +786,7 @@ export default {
} }
}, },
e=>{ e=>{
console.log(e.message)
} }
); );
}, },
......
...@@ -1374,7 +1374,6 @@ ...@@ -1374,7 +1374,6 @@
}, },
// 计算价格 // 计算价格
getTotalPrice(t) { getTotalPrice(t) {
console.log('getTotalPrice', this.addObj)
if (t === 3) { if (t === 3) {
if (parseFloat(this.addMsg.Unit_Price).toString() === "NaN") { if (parseFloat(this.addMsg.Unit_Price).toString() === "NaN") {
this.$message.error("请输入正确的价格!"); this.$message.error("请输入正确的价格!");
...@@ -1525,18 +1524,6 @@ ...@@ -1525,18 +1524,6 @@
dandijie = dandijie =
this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum); 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 = this.addMsg.PreferPrice =
dandijie + dandijie +
lianyun + lianyun +
...@@ -1689,12 +1676,10 @@ ...@@ -1689,12 +1676,10 @@
}, },
saveOrder() { saveOrder() {
this.addMsg.TCID = this.addObj.TCID this.addMsg.TCID = this.addObj.TCID
console.log('saveOrder', this.addMsg)
this.$emit('change', this.addMsg) this.$emit('change', this.addMsg)
}, },
// todo 购买的产品信息,需要从外部传入 // todo 购买的产品信息,需要从外部传入
goBuy(obj) { goBuy(obj) {
console.log('goBuy', obj)
if(!obj) return if(!obj) return
this.isUpdateSharePeople = false; this.isUpdateSharePeople = false;
this.isShowLayer = true; 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