Skip to content

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

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

parents 6d9eb05c 767eeca0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 481 additions and 456 deletions
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ af3375d1
......@@ -2168,8 +2168,6 @@
Id: this.ID,
InvoiceVoucherList: this.InvoiceVoucherList
};
console.log("this.InvoiceVoucherList",this.InvoiceVoucherList);
this.apipost('Financial_post_UpdateInvoiceVoucher', msg, res => {
if (res.data.resultCode === 1) {
this.$message.success('上传成功');
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ af3375d1
......@@ -2290,7 +2290,6 @@
TempId: tempId,
TCIDList: (this.orderObj && this.orderObj.TCIDList) ? this.orderObj.TCIDList : []
}, res => {
console.log("Financial_post_Get",res.data.data);
if (res.data.resultCode == 1) {
let data = res.data.data;
......@@ -2463,8 +2462,6 @@
this.saveMsg.push(x);
})
}
console.log("InvoiceVoucherInfo",data.InvoiceVoucherInfo);
if (data.InvoiceVoucherInfo) {
data.InvoiceVoucherInfo.forEach(x => {
x.Url = x.Content;
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ af3375d1
......@@ -1754,7 +1754,6 @@
};
this.TotalNav.planPriceList.forEach(item => {
if (item.CurrencyId == id) {
console.log("ceeeeee",item);
obj.money += item.PlanTotalPrice;
obj.CurrencyId = item.CurrencyId;
}
......
src/components/Ticketing/PassengerList.vue
View file @ af3375d1
......@@ -547,14 +547,12 @@
})
fileName = fileName + TempfileName
fileName = fileName + this.$route.query.alcode
console.log("QueryMsg",this.QueryMsg);
//厦航的用csv
if (this.QueryMsg.TempCode == "MF") {
fileName = fileName + ".csv";
} else {
fileName = fileName + ".xls";
}
// fileName = fileName + ".xls";
this.GetLocalFile("travel_get_GetAirTicketGuestExport", msg, fileName);
},
handleCurrentChange(val) {
......
src/components/activity/CouponDetail.vue
View file @ af3375d1
......@@ -103,7 +103,6 @@
this.msg,
res => {
this.loading = false;
console.log("coupon_post_GetCouponAllotPage", res.data);
if (res.data.resultCode === 1) {
this.total = res.data.data.count;
this.DataList = res.data.data.pageData;
......
src/components/activity/CouponList.vue
View file @ af3375d1
......@@ -513,7 +513,7 @@
<el-checkbox @change="getSelect(fitem)" v-model="fitem.ischecked"></el-checkbox>
</td>
<td>
{{fitem.customerName}}- {{fitem.contact}}
{{fitem.customerName}}- {{fitem.contact}}
</td>
<td>
{{fitem.contactNumber}}
......@@ -700,7 +700,7 @@
CouponPlatformEnumList: [],
companyList: [],
customerList: [],
checkedCustomerList: [],//选择的人员信息
checkedCustomerList: [], //选择的人员信息
layerDepartMentList: [],
departMentList: [],
PostList: [],
......@@ -747,7 +747,7 @@
},
methods: {
getcouponPriceList() {
this.addMsg.couponPriceList = []
this.addMsg.couponPriceLists.forEach(item => {
......@@ -808,14 +808,16 @@
//发放优惠券
AutoGrantCounItem(item) {
this.grantCouponMsg = Object.assign({}, item);
this.customerList=[];
this.checkedCustomerList=[];
console.log("grantCouponMsg", this.grantCouponMsg);
this.customerList = [];
this.checkedCustomerList = [];
},
//发放优惠券确认
AdminGrantCoupon() {
this.apipost("coupon_post_AdminGrantCoupon", {Id:this.grantCouponMsg.id,CustomerList:this.checkedCustomerList}, res => {
//发放优惠券确认
AdminGrantCoupon() {
this.apipost("coupon_post_AdminGrantCoupon", {
Id: this.grantCouponMsg.id,
CustomerList: this.checkedCustomerList
}, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.autoCouponDialog = false;
......@@ -851,20 +853,21 @@ AdminGrantCoupon() {
}
);
},
//删除客户标签
deleteTag(item) {
let result = this.customerList.find(temp => temp.customerId ===item.customerId);
if(result){ result.ischecked=false;
}
let index = this.checkedCustomerList.indexOf(item);
if (index !== -1) {
this.checkedCustomerList.splice(index, 1);
}
//删除客户标签
deleteTag(item) {
let result = this.customerList.find(temp => temp.customerId === item.customerId);
if (result) {
result.ischecked = false;
}
let index = this.checkedCustomerList.indexOf(item);
if (index !== -1) {
this.checkedCustomerList.splice(index, 1);
}
},
getSelect(item) {
if(item.ischecked){
if (item.ischecked) {
this.checkedCustomerList.push(item);
}else{
} else {
let index = this.checkedCustomerList.indexOf(item.customerId);
this.checkedCustomerList.splice(index, 1);
}
......@@ -873,10 +876,9 @@ AdminGrantCoupon() {
getCustomerBrandByKeyWord() {
this.xuanzeCustomerLoading = true;
this.customerList = [];
console.log("this.grantCouponMsg.customerType",this.grantCouponMsg.customerType);
let cmdStr="app_post_GetCustomerBrandByKeyWord";
if(this.grantCouponMsg.customerType==1){
cmdStr="Sell_Post_GetDirectCustomerListByKey";
let cmdStr = "app_post_GetCustomerBrandByKeyWord";
if (this.grantCouponMsg.customerType == 1) {
cmdStr = "Sell_Post_GetDirectCustomerListByKey";
}
this.apipost(
cmdStr,
......@@ -887,10 +889,10 @@ AdminGrantCoupon() {
var tempData = res.data.data;
if (tempData && tempData.length > 0) {
tempData.forEach(item => {
let result = this.checkedCustomerList.find(temp => temp.customerId ===item.customerId);
if(result){ item.ischecked=true;
}
else{
let result = this.checkedCustomerList.find(temp => temp.customerId === item.customerId);
if (result) {
item.ischecked = true;
} else {
item.ischecked = false;
}
})
......
src/components/confirmationOrderDownLoadNew.vue
View file @ af3375d1
......@@ -554,7 +554,6 @@
} else {
title += this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游';
}
console.log("title", title);
var fileName = title + ".pdf";
that.pdfDownLoad(fileName, msg);
// if (this.orderId && this.orderId > 0) {
......@@ -569,7 +568,6 @@
// objFileKey += "/" + msg.configId + "_" + msg.tcid;
// objFileKey += "/" + msg.configId + "_" + msg.tcid + ".pdf";
// that.downloadChengDuFileRename(objFileKey, fileName, res => {
// console.log("ali_doanload", res)
// if (res.resultCode == 0) {
// } else {
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ af3375d1
......@@ -302,18 +302,35 @@
console.log(event.data,'-----------event.data')
if(event.data&&event.data.data&&!event.data.data) return
if(this.isPostMessage) return
if(event.data&&event.data=='行程数据保存成功'){
// this.dialogPptistVisible = false
this.$emit('ConfigInfo')
if(document.all.myIframe){
document.all.myIframe.src = this.myIframeUrl
// if(event.data&&event.data=='行程数据保存成功'){
// // this.dialogPptistVisible = false
// this.$emit('ConfigInfo')
// if(document.all.myIframe){
// document.all.myIframe.src = this.myIframeUrl
// }
// }else if(event.data&&event.data.indexOf('行程特色高')!=-1){
// this.PostMessageText = ''
// let datas = event.data.split('-')
// this.myIframeHeigth = datas[1]
// }else if(event.data&&event.data=='暂无行程数据'){
// this.PostMessageText = event.data
// }
if (event && event.data) {
if (event.data == '行程数据保存成功') {
this.$emit('ConfigInfo')
if (document.all.myIframe) {
document.all.myIframe.src = this.myIframeUrl
}
} else if (event.data == '暂无行程数据') {
this.PostMessageText = event.data
} else {
//行程特色高
this.PostMessageText = '';
if (event.data && typeof(event.data)=='string') {
let datas = event.data.split('-')
this.myIframeHeigth = datas[1];
}
}
}else if(event.data&&event.data.indexOf('行程特色高')!=-1){
this.PostMessageText = ''
let datas = event.data.split('-')
this.myIframeHeigth = datas[1]
}else if(event.data&&event.data=='暂无行程数据'){
this.PostMessageText = event.data
}
this.isPostMessage = true
this.iframeLoading = false
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @ af3375d1
......@@ -72,7 +72,25 @@
data() {
return {
canEdit: true,
pageList: [{
pageList: [],
homeBg3: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg3.jpg",
homeBg1: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg1.jpg",
homeBgOz1: "https://imgfile.oytour.com/Static/NewTripFeature/homebgoz.jpg", //欧洲线默认图
homeBgNy: "https://imgfile.oytour.com/Static/NewTripFeature/homebgny.jpg", //南亚线默认图
homeBgGn: "https://imgfile.oytour.com/Static/NewTripFeature/homebggn.jpg", //国内线
homeBghg: "https://imgfile.oytour.com/Static/NewTripFeature/homebghg.jpg", //韩国
homeBg2: "http://imgfile.oytour.com/Static/NewTripFeature/homeBg2.jpg",
dinner1: "http://imgfile.oytour.com/Static/NewTripFeature/dinner1.jpg",
dinner2: "http://imgfile.oytour.com/Static/NewTripFeature/dinner2.jpg",
dinner3: "http://imgfile.oytour.com/Static/NewTripFeature/dinner3.jpg",
dinner4: "https://imgfile.oytour.com/Static/NewTripFeature/dinner4.jpg",
RenderingOk: false,
DataArray: [], //房、餐、景点数组
};
},
methods: {
getConfigData() {
var configArray = [{
pageTitle: '介绍',
pageType: 1,
pageTemplate: 0,
......@@ -121,26 +139,12 @@
pageTemplate: 3,
dataObj: {},
},
],
homeBg3: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg3.jpg",
homeBg1: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg1.jpg",
homeBgOz1: "https://imgfile.oytour.com/Static/NewTripFeature/homebgoz.jpg", //欧洲线默认图
homeBgNy: "https://imgfile.oytour.com/Static/NewTripFeature/homebgny.jpg", //南亚线默认图
homeBgGn: "https://imgfile.oytour.com/Static/NewTripFeature/homebggn.jpg", //国内线
homeBghg: "https://imgfile.oytour.com/Static/NewTripFeature/homebghg.jpg", //韩国
homeBg2: "http://imgfile.oytour.com/Static/NewTripFeature/homeBg2.jpg",
dinner1: "http://imgfile.oytour.com/Static/NewTripFeature/dinner1.jpg",
dinner2: "http://imgfile.oytour.com/Static/NewTripFeature/dinner2.jpg",
dinner3: "http://imgfile.oytour.com/Static/NewTripFeature/dinner3.jpg",
dinner4: "https://imgfile.oytour.com/Static/NewTripFeature/dinner4.jpg",
RenderingOk: false,
DataArray: [], //房、餐、景点数组
};
},
methods: {
]
return configArray;
},
UploadImg(pageType, index, url) {
if (pageType == 1) {
this.pageList[index].dataObj.ImgList[0].url = url
this.pageList[index].dataObj.ImgList[0].url = url;
}
},
getPageObj() {
......@@ -195,8 +199,9 @@
//首页2
else if (featureDataObj.pageType == 7) {
pageData.pageTitle = "首页2";
if(pageData.dataObj&&pageData.dataObj.ImgList&&pageData.dataObj.ImgList.length>0) pageData.dataObj.ImgList[0].x = 0
this.getHomeData(tripObj, newObj,1);
if (pageData.dataObj && pageData.dataObj.ImgList && pageData.dataObj.ImgList.length > 0) pageData.dataObj
.ImgList[0].x = 0
this.getHomeData(tripObj, newObj, 1);
}
pageData.dataObj = newObj;
this.pageList.splice(index, 0, pageData);
......@@ -220,7 +225,6 @@
this.$set(this.pageList, index, downItem);
}
}
},
//删除页面
DeletePages(index) {
......@@ -267,6 +271,7 @@
this.pageList = oldJson;
this.RenderingOk = true;
} else {
this.pageList=this.getConfigData();
this.pageList.forEach(pItem => {
var newObj = this.getDetailsObj();
newObj.LineName = this.FeatureData.LineName;
......@@ -298,7 +303,7 @@
}
//首页2
else if (pItem.pageType == 7) {
this.getHomeData(tripObj, newObj);
this.getHomeData(tripObj, newObj, 1);
}
pItem.dataObj = newObj;
});
......@@ -306,7 +311,7 @@
}
},
//首页数据渲染
getHomeData(tripObj, newObj,type) {
getHomeData(tripObj, newObj, type) {
if (tripObj.cityStr && tripObj.cityStr != '') {
newObj.MainName = tripObj.cityStr; //地区1
} else {
......@@ -343,23 +348,24 @@
newObj.MainDesc = "景点描述";
}
// 新版首页2023/11/20
if(type){
if(!newObj.SceneDesc){
if (type) {
if (!newObj.SceneDesc) {
newObj.maskPosition = false
newObj.Meal = '餐食'
newObj.MealName = tripObj.dinnerArray.length>0?tripObj.dinnerArray[0].MainName:'餐食名称'
newObj.MealName2 = tripObj.dinnerArray.length>1?tripObj.dinnerArray[1].MainName:'餐食名称'
newObj.Meal = '餐食'
newObj.MealName = tripObj.dinnerArray.length > 0 ? tripObj.dinnerArray[0].MainName : '餐食名称'
newObj.MealName2 = tripObj.dinnerArray.length > 1 ? tripObj.dinnerArray[1].MainName : '餐食名称'
newObj.Host = '住宿'
newObj.HostName = tripObj.hotelArray.length>0?tripObj.hotelArray[0].MainName:'酒店名称'
newObj.HostName2 = tripObj.hotelArray.length>1?tripObj.hotelArray[1].MainName:'酒店名称'
newObj.HostName = tripObj.hotelArray.length > 0 ? tripObj.hotelArray[0].MainName : '酒店名称'
newObj.HostName2 = tripObj.hotelArray.length > 1 ? tripObj.hotelArray[1].MainName : '酒店名称'
newObj.Scene = '风景'
newObj.SceneDesc = tripObj.scenicArray.length>0?tripObj.scenicArray[0].MainName+'：'+tripObj.scenicArray[0].MainDesc:'景点描述信息'
newObj.SceneTitle2 = tripObj.scenicArray.length>1?tripObj.scenicArray[1].MainName:'景点名称'
newObj.SceneDesc2 = tripObj.scenicArray.length>1?tripObj.scenicArray[1].MainDesc:'景点描述信息'
newObj.HostTitle = tripObj.hotelArray.length>1?tripObj.hotelArray[1].MainName:'酒店名称'
newObj.HostDesc = tripObj.hotelArray.length>1?tripObj.hotelArray[1].MainDesc:'酒店描述信息'
newObj.SceneTitle3 = tripObj.scenicArray.length>2?tripObj.scenicArray[2].MainName:'景点名称'
newObj.SceneDesc3 = tripObj.scenicArray.length>2?tripObj.scenicArray[2].MainDesc:'景点描述信息'
newObj.SceneDesc = tripObj.scenicArray.length > 0 ? tripObj.scenicArray[0].MainName + '：' + tripObj
.scenicArray[0].MainDesc : '景点描述信息'
newObj.SceneTitle2 = tripObj.scenicArray.length > 1 ? tripObj.scenicArray[1].MainName : '景点名称'
newObj.SceneDesc2 = tripObj.scenicArray.length > 1 ? tripObj.scenicArray[1].MainDesc : '景点描述信息'
newObj.HostTitle = tripObj.hotelArray.length > 1 ? tripObj.hotelArray[1].MainName : '酒店名称'
newObj.HostDesc = tripObj.hotelArray.length > 1 ? tripObj.hotelArray[1].MainDesc : '酒店描述信息'
newObj.SceneTitle3 = tripObj.scenicArray.length > 2 ? tripObj.scenicArray[2].MainName : '景点名称'
newObj.SceneDesc3 = tripObj.scenicArray.length > 2 ? tripObj.scenicArray[2].MainDesc : '景点描述信息'
}
}
},
......@@ -817,8 +823,7 @@
},
watch: {
FeatureData: {
handler(val, oldVal) {
},
handler(val, oldVal) {},
deep: true,
immediate: true
},
......
src/plug/index.js
View file @ af3375d1
......@@ -1162,7 +1162,6 @@ export default {
if (xhr.status === 200) {
resolve(xhr.response);
} else if (xhr.status === 404) {
console.log("downloadChengDuFileRename_404", objectKey);
if (callBack) {
callBack(resultJson)
}
......@@ -1195,7 +1194,6 @@ export default {
});
} catch (err) {
resultJson.resultCode = 0;
console.log("downloadChengDuFileRename", err);
if (callBack) {
callBack(resultJson)
}
......
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