Skip to content

S
SuperMan
Commit 52022bb4 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents ad0ec7ba 4b9236b7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 260 additions and 957 deletions
src/assets/utils/tripUtils.js
View file @ 52022bb4
......@@ -331,7 +331,6 @@ var tripUtils = {
//行程-【交通对象】
trafficObj: function () {
console.log(ViittoFileUrl)
return {
ID: 0,
ConfigId: 0,
......
src/components/Details.vue
View file @ 52022bb4
......@@ -820,6 +820,7 @@ export default {
filterRouter(){
let that=this
this.$router.beforeEach((to, from, next) => {
document.title = to.meta.title ? to.meta.title+'-四川和平国际旅行社' : '四川和平国际旅行社'
// console.log("to.query.blank && to.query.blank=='y'",to.query,"666")
if(to.path=="/ModifyVisaProduct"){
this.reloadpage();
......
src/components/FinancialModule/BasicDocuments.vue
View file @ 52022bb4
......@@ -285,7 +285,7 @@
<td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('SettlementOrder',GetDetail.SourceID,2)"> <span class="_jump_page _font_bold">国内票务</span> </td>
<td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail.SourceID,3)"> <span class="_jump_page _font_bold">签证收支</span> </td>
<td v-else-if="OrderSource==4&&GetDetail.SourceID>0"@click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td>
<td v-if="GetDetail.TemplateId === 43" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
<td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
</tr>
</table>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-else-if="OrderSource==10">
......
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ 52022bb4
......@@ -32,7 +32,7 @@
<li :class="active==3?'_active':''" v-else>挂账单</li>
</ul>
<ul class="_conten">
<li v-for="(item,index) in GetList" v-if="item.IsShow === 1 || item.showYes">
<li v-for="(item,index) in GetList" v-if="(item.IsShow === 1 || item.showYes) && item.bigShow">
<div class="_left">
<span class="_Icon">{{item.Name.substring(0,1)}}</span>
<div>
......@@ -86,6 +86,7 @@
orderObj:null,
showTab:0,
templateID: null,
DepartID: null,
}
},methods:{
goUrl(path,id,Name,Type,IsUploadPic) {
......@@ -159,6 +160,17 @@
}else if (x.Type==7){
this.GZList.push(x);
}
// 5-5 仅茈、而巳。 14:32:06
// 部门id = 242 或者 240 就展示出 templeteId=33 的流程， 流程名字叫做 公司佣金收款
if (x.Id === 33) {
if (this.DepartID === 242 || this.DepartID === 240) {
x.bigShow = true
} else {
x.bigShow = false
}
} else {
x.bigShow = true
}
});
}
this.GetList = this.collectList;
......@@ -174,6 +186,8 @@
},err=>{})
},
},mounted(){
let userInfo = this.getLocalStorage();
this.DepartID = userInfo.RB_Department_Id;
this.templateID = this.$route.query.templateID ? JSON.parse(this.$route.query.templateID) : null
this.Financial_post_GetList();
this.showTab = this.$route.query.Type?this.$route.query.Type:0;
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 52022bb4
......@@ -377,7 +377,7 @@
<td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,2)"> <span class="_jump_page _font_bold">国内票务</span> </td>
<td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,3)"> <span class="_jump_page _font_bold">签证收支</span> </td>
<td v-else-if="OrderSource==4&&GetDetail.SourceID>0"@click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td>
<td v-if="GetDetail.TemplateId === 43" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
<td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
</tr>
</table>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-else-if="OrderSource==10">
......
src/components/SalesModule/groupTourOrder.vue
View file @ 52022bb4
......@@ -1713,7 +1713,8 @@
icon="iconfont icon-bianji-smal" @click='getDetail(item)'></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="修改备注" placement="top-start">
<el-button v-if="item.Status=='1'&&item.isHaveFinance=='1'||item.orderState=='1'" type="primary"
<!-- v-if="item.Status=='1'&&item.isHaveFinance=='1'||item.orderState=='1'" -->
<el-button type="primary"
style='background:green; border-color:green' icon="iconfont icon-bianji-smal"
@click='getRemarks(item)'></el-button>
</el-tooltip>
......@@ -1910,6 +1911,7 @@
</template>
<script>
import moment from "moment";
import payURL from '../commonPage/payURL.vue'
import payURL1 from '../commonPage/payURL1.vue'
import tripDownLoadCommon from '../commonPage/TripDownLoadCommon.vue'
......@@ -2616,14 +2618,36 @@
this.showID = data
},
getRemarks (obj) {
this.isShowLayerRemarks = true
this.isShowLayer = false
this.$refs['addMsg'].resetFields()
this.clearMsg()
this.remarksMsg.OrderId = obj.orderId
this.remarksMsg.Remarks = obj.remarks
this.remarksMsg.OldRemarks = obj.remarks
this.remarksMsg.isOrder = obj.isOrder
// 华国豪5-5新增
if (moment().format("YYYY-MM-DD") >= obj.startDate){
this.$confirm("该团目前已是结团状态，不能随意修改备注信息，若强行修改备注，将会计入个人考核，是否确定修改备注信息？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.isShowLayerRemarks = true
this.isShowLayer = false
this.$refs['addMsg'].resetFields()
this.clearMsg()
this.remarksMsg.OrderId = obj.orderId
this.remarksMsg.Remarks = obj.remarks
this.remarksMsg.OldRemarks = obj.remarks
this.remarksMsg.isOrder = obj.isOrder
})
.catch(() => {
this.$message.info("已取消！");
});
} else {
this.isShowLayerRemarks = true
this.isShowLayer = false
this.$refs['addMsg'].resetFields()
this.clearMsg()
this.remarksMsg.OrderId = obj.orderId
this.remarksMsg.Remarks = obj.remarks
this.remarksMsg.OldRemarks = obj.remarks
this.remarksMsg.isOrder = obj.isOrder
}
},
getDetail (obj) {
this.Ysze=false;
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 52022bb4
......@@ -995,7 +995,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="80px">
<el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="90px">
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="客户类型" prop="CustomerType">
......@@ -1093,13 +1093,26 @@
<!-- <el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()" ></el-input>
</el-form-item> -->
<el-form-item label="成交单价" prop="Unit_Price">
<!-- <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-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> -->
</el-form-item> -->
<template>
<el-form-item label="成交单价" prop="Unit_Price" v-if="HightUnitPrice === '2'">
<el-select v-model='addMsg.Unit_Price' filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice(2)">
<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="高于本团单价">
<el-switch v-model="HightUnitPrice" active-value="1" inactive-value="2"></el-switch>
</el-form-item>
<el-form-item>
<p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
......@@ -2215,6 +2228,7 @@
</template>
<script>
import moment from "moment";
import payURL from "../commonPage/payURL.vue";
import payURL1 from "../commonPage/payURL1.vue";
import tripDownLoadCommon from "../commonPage/TripDownLoadCommon.vue";
......@@ -2409,6 +2423,7 @@ export default {
{ required: true, message: "请输入备注信息", trigger: "blur" }
]
},
HightUnitPrice: '2',
msg: {
pageIndex: 1,
pageSize: 10,
......@@ -3220,15 +3235,39 @@ submitYSZEForm(){
);
},
getRemarks(obj) {
this.isShowLayerRemarks = true;
this.isShowLayer = false;
this.isShowLayer2 = false;
this.$refs["addMsg"].resetFields();
this.clearMsg();
// 华国豪5-5新增
if (moment().format("YYYY-MM-DD") >= obj.startDate){
this.$confirm("该团目前已是结团状态，不能随意修改备注信息，若强行修改备注，将会计入个人考核，是否确定修改备注信息？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.isShowLayerRemarks = true;
this.isShowLayer = false;
this.isShowLayer2 = false;
this.$refs["addMsg"].resetFields();
this.clearMsg();
this.remarksMsg.OrderId = obj.orderId;
this.remarksMsg.Remarks = obj.remarks;
this.remarksMsg.OldRemarks = obj.remarks;
this.remarksMsg.OrderId = obj.orderId;
this.remarksMsg.Remarks = obj.remarks;
this.remarksMsg.OldRemarks = obj.remarks;
})
.catch(() => {
this.$message.info("已取消！");
});
} else {
this.isShowLayerRemarks = true;
this.isShowLayer = false;
this.isShowLayer2 = false;
this.$refs["addMsg"].resetFields();
this.clearMsg();
this.remarksMsg.OrderId = obj.orderId;
this.remarksMsg.Remarks = obj.remarks;
this.remarksMsg.OldRemarks = obj.remarks;
}
//HK 新加
if(this.userId==1 || this.userId==5|| this.positionId==168)
{
......@@ -3354,7 +3393,14 @@ submitYSZEForm(){
(Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum));
this.addMsg.YSeatNum = SeatNum<0?0:SeatNum;
},
getTotalPrice() {
getTotalPrice(t) {
if (t === 3) {
if (this.addMsg.Unit_Price < this.addMsg.TC_Price) {
this.$message.error('成交单价必须大于等于本团单价！')
this.addMsg.Unit_Price = this.addMsg.TC_Price
return
}
}
if (this.addMsg.GroupType !=5) {
this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum*1 + this.addMsg.ChirdNeedBedNum*1
if (this.addObj.IsBirdDiscount&&this.addObj.IsBirdDiscount == 1) {
......
src/components/SalesModule/productQuery.vue
View file @ 52022bb4
......@@ -155,7 +155,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="80px">
<el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="90px">
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="客户类型" prop="CustomerType">
......@@ -237,13 +237,19 @@
<!-- <el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
</el-form-item> -->
<el-form-item label="成交单价" prop="Unit_Price">
<template>
<el-form-item label="成交单价" prop="Unit_Price" v-if="HightUnitPrice === '2'">
<el-select v-model='addMsg.Unit_Price' filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice(2)">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
<!-- <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> -->
</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="高于本团单价">
<el-switch v-model="HightUnitPrice" active-value="1" inactive-value="2"></el-switch>
</el-form-item>
<el-form-item>
<p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
......@@ -892,6 +898,7 @@
},
travelControlTripLayerShow: false,
wxLoading: false,
HightUnitPrice: '2',
userId: '',
customerId: '',
createByInfo: '',
......@@ -1604,6 +1611,13 @@
this.autoRemarks("VisaNum", "不要签证数量")
},
getTotalPrice(t) {
if (t === 3) {
if (this.addMsg.Unit_Price < this.addMsg.TC_Price) {
this.$message.error('成交单价必须大于等于本团单价！')
this.addMsg.Unit_Price = this.addMsg.TC_Price
return
}
}
this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1
//
//console.log(this.addObj)
......
src/components/newTravelmanager/oldTravelGroupControl/TravelDaysTrip_Direct.vue
View file @ 52022bb4
......@@ -67,9 +67,7 @@
<el-tooltip class="item" effect="dark" content="删除" placement="top-start">
<i class="iconfont icon-xingzhuang" @click="removeDaysTrip(index)"></i>
</el-tooltip>
<!-- <el-tooltip class="item" effect="dark" content="编辑" placement="top-start">
<i class="iconfont icon-bianji" @click=""></i>
</el-tooltip> -->
<el-tooltip class="item" effect="dark" content="添加" placement="top-start">
<i class="iconfont icon-mui-icon-add" @click="addDaysTrip(index)"></i>
</el-tooltip>
......@@ -83,7 +81,7 @@
<div class="d">第{{index+1}}天</div>
<div class="title-box">
<div class="t">
{{item.TitleObj.Title}}
{{item.dayArray[0].childItem.Title}}
</div>
</div>
</div>
......@@ -95,7 +93,7 @@
<div class="daycnt">
<div class="d">第{{index+1}}天</div>
<div class="title-box">
<titleTrip :isOpenGroup="isOpenGroup" v-bind:subItemObj="subConfig.DayList[0].TitleObj.Title" >
<titleTrip :isOpenGroup="isOpenGroup" v-bind:subItemObj="item.dayArray[0]" >
</titleTrip>
</div>
</div>
......@@ -114,9 +112,7 @@
v-bind:subTotalIndex="item.dayArray.length"></hotelTrip>
</span>
<span v-else>
<hotelTripdisDirect v-bind:subItemObj="subItem" v-bind:DefaultList="hotelSameList"
v-bind:subIndex="subIndex" v-bind:DinnerList="DinnerList" v-bind:index="index" :isOpenGroup="isOpenGroup"
v-bind:subTotalIndex="item.dayArray.length"></hotelTripdisDirect>
</span>
</div>
<div v-if="subItem.Type==$tripUtils.TypeKey.scenic">
......@@ -124,10 +120,7 @@
<scienTrip v-bind:subItemObj="subItem" v-bind:DefaultList="scenicSameList" v-bind:subIndex="subIndex"
v-bind:index="index" :isOpenGroup="isOpenGroup" v-bind:subTotalIndex="item.dayArray.length"></scienTrip>
</span>
<span v-else>
<scienTripdisDirect v-bind:subItemObj="subItem" v-bind:DefaultList="scenicSameList"
v-bind:subIndex="subIndex" v-bind:index="index" :isOpenGroup="isOpenGroup" v-bind:subTotalIndex="item.dayArray.length"></scienTripdisDirect>
</span>
</div>
<div v-if="subItem.Type==$tripUtils.TypeKey.dinner">
<span v-if="IsDirect==1">
......@@ -136,9 +129,7 @@
v-bind:subTotalIndex="item.dayArray.length"></dinnerTrip>
</span>
<span v-else>
<dinnerTripdisDirect v-bind:subItemObj="subItem" v-bind:DefaultList="dinnerSameList"
v-bind:subIndex="subIndex" v-bind:HotelList="HotelList" v-bind:index="index" :isOpenGroup="isOpenGroup"
v-bind:subTotalIndex="item.dayArray.length"></dinnerTripdisDirect>
</span>
</div>
<div v-if="subItem.Type==$tripUtils.TypeKey.freedom">
......@@ -171,15 +162,14 @@
<script>
import trifficTrip from "../oldTravelGroupControl/trifficTrip";
import scienTrip from "../oldTravelGroupControl/scienTrip_Direct";
import scienTripdisDirect from "../oldTravelGroupControl/scienTrip_disDirect";
import hotelTrip from "../oldTravelGroupControl/hotelTrip_Direct";
import hotelTripdisDirect from "../oldTravelGroupControl/hotelTrip_disDirect";
import dinnerTrip from "../oldTravelGroupControl/dinnerTrip_Direct";
import dinnerTripdisDirect from "../oldTravelGroupControl/dinnerTrip_disDirect";
import freedomTrip from "../oldTravelGroupControl/freedomTrip";
import warmtipTrip from "../oldTravelGroupControl/warmtipTrip";
......@@ -289,13 +279,13 @@ export default {
trifficTrip: trifficTrip,
scienTrip: scienTrip,
scienTripdisDirect: scienTripdisDirect,
hotelTrip: hotelTrip,
hotelTripdisDirect: hotelTripdisDirect,
dinnerTrip: dinnerTrip,
dinnerTripdisDirect: dinnerTripdisDirect,
freedomTrip: freedomTrip,
warmtipTrip: warmtipTrip,
......@@ -358,6 +348,7 @@ export default {
}
this.subConfig.DayList.length = this.subConfig.DayNum;
}
},
//点击往后追加
......@@ -706,43 +697,41 @@ export default {
var FreedomList = [];
var WarmTipList = [];
var TitleList = [];
// this.subConfig.DayList.forEach((item, dayIndex) => {
// var rank = 1;
// if (item.dayArray != null && item.dayArray.length > 0) {
// item.dayArray.forEach(subItem => {
// subItem.childItem.Rank = rank;
// subItem.childItem.dayNum = item.dayNum;
// subItem.Type = subItem.Type.toString();
// switch (subItem.Type) {
// case this.$tripUtils.TypeKey.traffic:
// TrafficList.push(subItem.childItem);
// break;
// case this.$tripUtils.TypeKey.scenic:
// ScenicList.push(subItem.childItem);
// break;
// case this.$tripUtils.TypeKey.hotel:
// HotelList.push(subItem.childItem);
// break;
// case this.$tripUtils.TypeKey.dinner:
// DinnerList.push(subItem.childItem);
// break;
// case this.$tripUtils.TypeKey.freedom:
// FreedomList.push(subItem.childItem);
// break;
// case this.$tripUtils.TypeKey.warmtip:
// WarmTipList.push(subItem.childItem);
// break;
// case this.$tripUtils.TypeKey.title:
// TitleList.push(subItem.childItem);
// break;
// }
// rank++;
// });
// }
// });
this.subConfig.DayList.forEach((item,dayIndex)=>{
})
this.subConfig.DayList.forEach((item, dayIndex) => {
var rank = 1;
if (item.dayArray != null && item.dayArray.length > 0) {
item.dayArray.forEach(subItem => {
subItem.childItem.Rank = rank;
subItem.childItem.dayNum = item.dayNum;
subItem.Type = subItem.Type.toString();
switch (subItem.Type) {
case this.$tripUtils.TypeKey.traffic:
TrafficList.push(subItem.childItem);
break;
case this.$tripUtils.TypeKey.scenic:
ScenicList.push(subItem.childItem);
break;
case this.$tripUtils.TypeKey.hotel:
HotelList.push(subItem.childItem);
break;
case this.$tripUtils.TypeKey.dinner:
DinnerList.push(subItem.childItem);
break;
case this.$tripUtils.TypeKey.freedom:
FreedomList.push(subItem.childItem);
break;
case this.$tripUtils.TypeKey.warmtip:
WarmTipList.push(subItem.childItem);
break;
case this.$tripUtils.TypeKey.title:
TitleList.push(subItem.childItem);
break;
}
rank++;
});
}
});
var obj = {
RemoveChild: this.subConfig.RemoveChild,
RemoveImg: this.subConfig.RemoveImg,
......@@ -767,9 +756,6 @@ export default {
//防止首次初始化数据失败
// this.emitData();
this.typeArrayList.push(this.$tripUtils.TypeArray[this.$tripUtils.TypeArray.length-1]);
// this.getSameJourney();
console.log(this.subConfig,'subConfigOld');
},
created() {
if (this.isOpenGroup == undefined) {
......@@ -781,10 +767,6 @@ export default {
getDayNum() {
return this.subConfig.DayNum;
},
//获取目的地
// getCountryId() {
// return this.subArray.CountryID;
// },
getDayList() {
return this.subConfig.DayList;
}
......@@ -794,16 +776,12 @@ export default {
getDayNum(newValue, oldValue) {
this.createLineTrip();
},
//监听目的地国家是否改变
// getCountryId(newValue, oldValue) {
// this.createLineTrip();
// },
// subConfig: {
// handler: function(newValue, oldValue) {
// this.emitData();
// },
// deep: true
// }
subConfig: {
handler: function(newValue, oldValue) {
this.emitData();
},
deep: true
}
}
};
</script>
\ No newline at end of file
src/components/newTravelmanager/oldTravelGroupControl/TravelManager5.vue
View file @ 52022bb4
......@@ -40,7 +40,7 @@
<TravelNotice ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" :subArray="NoticeParameters"
:NoticeData="NoticeData" v-bind:PostConfig="PostConfig" v-bind:AllCityList="AllCityList" v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
<TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip" v-if="TeamType==1"
<TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
:priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :TeamType="TeamType"></TravelPrice2>
<div class="btnFixedDiv">
<div class="toTop" @click="backTop">
......@@ -211,7 +211,6 @@
) {
//to do something
} else {
//this.$set(this.FeatureData, "DayList", data);
this.$refs.TravelFeature.setNewDate(data);
}
},
......@@ -247,6 +246,7 @@
//行程回调
getDaysTrip(tripObj) {
this.PostDaysTrip = tripObj;
console.log("this.PostDaysTrip",this.PostDaysTrip);
},
/*获取行程特色内容对象*/
getFeature(featureObj) {
......@@ -267,21 +267,11 @@
if (this.PostConfig.fileList.length <= 5) {
this.PostConfig.fileList.push(fileObj);
}
this.FeatureData.fileList.push(fileObj);
}
},
//提交验证
submitForm(SaveType) {
// let travelConfigVal = this.$refs["TravelConfig"].validateForm();
// let travelDaysTripVal = this.$refs["TravelDaysTrip"].validateForm();
// if (!travelConfigVal) {
// this.Error("请完善配置信息");
// }
// if (!travelDaysTripVal) {
// this.Error("请完善行程信息");
// }
//if (travelConfigVal && travelDaysTripVal) {
if (this.isSubmit) {
this.isSubmit = false;
this.SaveData(SaveType);
......@@ -311,7 +301,7 @@
basicData.RemoveChild = this.PostConfig.RemoveChild;
basicData.TeamType = this.PostConfig.TeamType;
basicData.DayNum = (this.PostDaysTrip && this.PostDaysTrip.DayNum != "") ? this.PostDaysTrip.DayNum : 0;
basicData.NightNum = (this.PostDaysTrip && this.PostDaysTrip.NightNum != "") ? this.PostDaysTrip.NightNum : 0;
basicData.StartCityId = (this.PostDaysTrip && this.PostDaysTrip.StartCityId != "") ? this.PostDaysTrip.StartCityId :
......@@ -561,15 +551,7 @@
},
firstLoadConfigInfo() {
var routeName = this.$route.name;
if(routeName=='TravelManager2'){
this.TeamType=0;
}
if(routeName=='TravelManager3'){
this.TeamType=1;
}
if(routeName=='TravelManager4'){
this.TeamType=2;
}
this.TeamType=1;
let configId = this.$route.query.configId;
this.modifyTcid = this.$route.query.tcid;
this.TCNUM = this.$route.query.TCNUM;
......
src/components/newTravelmanager/oldTravelGroupControl/dinnerTrip_Direct.vue
View file @ 52022bb4
......@@ -32,7 +32,7 @@
</el-select>
</el-form-item>
</span>
<span class="comTravelLeft">套餐</span>
<!-- <span class="comTravelLeft">套餐</span>
<span>
<el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable v-model="subItemObj.childItem.MealId"
@visible-change="getDinnerMealList($event)" @change="changeDinnerMealList()">
......@@ -40,18 +40,18 @@
<el-option v-for="item in QDinnerMealList" :label='item.MealName' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</span>
</span> -->
</div>
<div class="TDmealTime">
<label class="TDhotelDiner">用餐时段</label>
<el-checkbox-group v-model="Diner.UseDinerCked">
<el-checkbox v-for="item in Diner.UseDinnerType" :disabled="isOpenGroup||!varCanChecked(item)" :label="item.Id"
<el-checkbox v-for="item in Diner.UseDinnerType" style="margin-left:5px;" :disabled="isOpenGroup||!varCanChecked(item)" :label="item.Id"
:key='item.Id'>{{item.Name}}</el-checkbox>
</el-checkbox-group>
<span class="comTravelLeft">用餐时间</span>
<el-input :disabled="isOpenGroup" type="text" class="w120" v-model="subItemObj.childItem.UseTimeHour"
<el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.UseTimeHour"
@keyup.native="checkInteger(subItemObj.childItem,'UseTimeHour')"></el-input>&nbsp;&nbsp;小时
<el-input :disabled="isOpenGroup" type="text" class="w120" v-model="subItemObj.childItem.UseTimeMinutes"
<el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.UseTimeMinutes"
@keyup.native="checkInteger(subItemObj.childItem,'UseTimeMinutes')"></el-input>&nbsp;&nbsp;分钟
</div>
</div>
......@@ -186,7 +186,7 @@ export default {
narrative: true //叙述,
},
//是否显示编辑框
isShowEdit: false,
isShowEdit: true,
dspNone: false,
initialIndex: 0,
//text框placeholder
......
src/components/newTravelmanager/oldTravelGroupControl/freedomTrip.vue
View file @ 52022bb4
......@@ -119,7 +119,7 @@
narrative: true //叙述,
},
//是否显示编辑框
isShowEdit:false,
isShowEdit:true,
dspNone:false,
initialIndex:0,
//text框placeholder
......
src/components/newTravelmanager/oldTravelGroupControl/hotelTrip_Direct.vue
View file @ 52022bb4
......@@ -199,7 +199,7 @@ export default {
//不选中
UnCheckedVaule: 0,
//是否显示编辑框
isShowEdit: false,
isShowEdit: true,
//text框placeholder
placeholder: "请输入酒店信息",
//酒店含餐
......
src/components/newTravelmanager/oldTravelGroupControl/scienTrip_Direct.vue
View file @ 52022bb4
......@@ -40,7 +40,7 @@
</el-select>
</el-form-item>
</span>
<span class="comTravelLeft">门票</span>
<!-- <span class="comTravelLeft">门票</span>
<span>
<el-select :disabled="isOpenGroup" class='w160' filterable :placeholder="$t('pub.pleaseSel')" v-model="subItemObj.childItem.CouponsTicketId"
@visible-change="getTicketList($event)" @change="changeTicketList()">
......@@ -48,13 +48,13 @@
<el-option v-for="item in QTicketList" :label='item.TicketName' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</span>
</span> -->
</div>
<div class="TDRightPlan">
<label class="comTravelLeft">游玩时间</label>
<el-input :disabled="isOpenGroup" type="text" class="w120" v-model="subItemObj.childItem.PlayTimeHour"
<el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeHour"
@keyup.native="checkInteger(subItemObj.childItem,'PlayTimeHour')" maxlength="2"></el-input>&nbsp;&nbsp;小时
<el-input :disabled="isOpenGroup" type="text" class="w120" v-model="subItemObj.childItem.PlayTimeMinutes"
<el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeMinutes"
@keyup.native="checkInteger(subItemObj.childItem,'PlayTimeMinutes')" maxlength="2"></el-input>&nbsp;&nbsp;分钟
</div>
</div>
......@@ -185,7 +185,7 @@
QTicketList: [],
DefaultSelectValue: 0,
//是否显示编辑框
isShowEdit: false,
isShowEdit: true,
dspNone: false,
initialIndex: 0,
//text框placeholder
......
src/components/newTravelmanager/oldTravelGroupControl/titleTrip.vue
View file @ 52022bb4
......@@ -3,9 +3,7 @@
<div class="TCtraffic clearfix">
<div>
<span class="datePickContent" style="background-color:transparent">
<!-- <span v-if="isOpenGroup">
{{subItemObj.childItem.Title}}
</span> -->
<el-form-item>
<el-input v-model="subItemObj.childItem.Title" class="" placeholder="行程大点"></el-input>
</el-form-item>
......@@ -26,7 +24,7 @@
narrative: true //叙述,
},
//是否显示编辑框
isShowEdit:false,
isShowEdit:true,
//text框placeholder
placeholder:'请输入行程大点信息'
};
......
src/components/newTravelmanager/oldTravelGroupControl/trifficTrip.vue
View file @ 52022bb4
......@@ -230,7 +230,7 @@ export default {
//不用车
UnCheckedVaule: 0,
//是否显示编辑框
isShowEdit: false,
isShowEdit: true,
//text框placeholder
placeholder: "请输入交通信息",
//交通验证
......
src/components/newTravelmanager/oldTravelGroupControl/warmtipTrip.vue
View file @ 52022bb4
......@@ -47,7 +47,7 @@ export default {
narrative: true //叙述,
},
//是否显示编辑框
isShowEdit:false,
isShowEdit:true,
//text框placeholder
placeholder:'请输入提示信息',
};
......
src/router/config.js
View file @ 52022bb4
......@@ -23,21 +23,33 @@ export default {
path: '/VisaPersonalForm',
name: 'VisaPersonalForm',
component: resolve => require(['@/components/VisaPersonalForm'], resolve),
meta: {
title: '签证个人申请表信息'
},
},
{ //团签个人申请表信息
path: '/VisaPersonalFormTuan',
name: 'VisaPersonalFormTuan',
component: resolve => require(['@/components/VisaPersonalFormTuan'], resolve),
meta: {
title: '团签个人申请表信息'
},
},
{ //签证个人申请表信息
path: '/VisaPersonalFormSell',
name: 'VisaPersonalFormSell',
component: resolve => require(['@/components/VisaPersonalFormSell'], resolve),
meta: {
title: '签证个人申请表信息'
},
},
{ //财务打印页面
path: '/PrintPage',
name: 'PrintPage',
component: resolve => require(['@/components/PrintPage'], resolve),
meta: {
title: '财务打印页面'
},
},
{
path: '/confirmationOrder',
......@@ -51,9 +63,9 @@ export default {
path: '/confirmationOrderDownLoad',
name: 'confirmationOrderDownLoad',
component: resolve => require(['@/components/confirmationOrderDownLoad'], resolve),
// meta: {
// keepAlive:true
// }
meta: {
title: '出团通知书下载'
},
},
{
path: '/TravelControlTrip',
......@@ -84,31 +96,49 @@ export default {
path: '/platformManagement',
name: 'platformManagement',
component: resolve => require(['@/components/platformModule/platformManagement'], resolve),
meta: {
title: '平台管理'
}
},
{
path: '/dmc',
name: 'dmc',
component: resolve => require(['@/components/temp/dmc'], resolve),
meta: {
title: '地接首页'
}
},
{ // 营销活动
path: '/activity',
name: 'activity',
component: resolve => require(['@/components/temp/activity'], resolve),
meta: {
title: '营销活动'
}
},
{
path: '/operation',
name: 'operation',
component: resolve => require(['@/components/temp/operation'], resolve),
meta: {
title: '操作'
}
},
{
path: '/finance',
name: 'finance',
component: resolve => require(['@/components/temp/finance'], resolve),
meta: {
title: '财务'
}
},
{
path: '/VisaModel',
name: 'VisaModel',
component: resolve => require(['@/components/temp/VisaModel'], resolve),
meta: {
title: '签证'
}
},
{
path: '/TravelControlTrip',
......@@ -119,16 +149,25 @@ export default {
path: '/administration',
name: 'administration',
component: resolve => require(['@/components/temp/administration'], resolve),
meta: {
title: '行政'
}
},
{
path: '/DomesticTicketing',
name: 'DomesticTicketing',
component: resolve => require(['@/components/temp/DomesticTicketing'], resolve),
meta: {
title: '机票'
}
},
{
path: '/systemManagement',
name: 'systemManagement',
component: resolve => require(['@/components/temp/systemManagement'], resolve),
meta: {
title: '系统'
}
},
{
path: '/Details',
......@@ -422,6 +461,9 @@ export default {
path: '/forMyApproval',
name: 'forMyApproval',
component: resolve => require(['@/components/administrative/forMyApproval'], resolve),
meta: {
title: '我审批的'
}
},
{
path: '/leaveApproval', //请假审批
......@@ -2689,7 +2731,10 @@ export default {
}, { // 签证 签证产品
path: '/VisaProduct',
name: 'VisaProduct',
component: resolve => require(['@/components/SalesVisa/VisaProduct'], resolve)
component: resolve => require(['@/components/SalesVisa/VisaProduct'], resolve),
meta: {
title: '签证产品'
},
}, { // 签证 常用航班
path: '/regularFlights',
name: 'regularFlights',
......@@ -2847,11 +2892,17 @@ export default {
path: '/WorkEntrustmentMy',
name: 'WorkEntrustmentMy',
component: resolve => require(['@/components/administrative/WorkEntrustmentMy'], resolve),
meta: {
title: '工作委托'
},
},
{
path: '/WorkEntrustment',
name: 'WorkEntrustment',
component: resolve => require(['@/components/administrative/WorkEntrustment'], resolve),
meta: {
title: '工作委托'
},
},
{
path: '/OrderToday', // 国内票务
......@@ -3192,6 +3243,9 @@ export default {
path: '/leaderPay2', //领队报账
name: 'leaderPay2',
component: resolve => require(['@/components/leaderPay2'], resolve),
meta: {
title: '领队报账'
}
}
]
}
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