Skip to content

S
SuperMan
Commit 59a4da6d authored by youjie's avatar youjie
Browse files
Options

no message

parents 3863cfc7 a4e806a7
Hide whitespace changes
Inline Side-by-side
Showing with 214 additions and 48 deletions
src/components/SalesVisa/components/VisaProductOrder.vue
View file @ 59a4da6d
......@@ -306,25 +306,25 @@
<li>
<span>
<em>{{$t('fnc.danhao')}}</em>
<el-input class='w220' v-model='msg.VisaTCNUM' :placeholder="$t('pub.pleaseImport')"></el-input>
<el-input class='w200' v-model='msg.VisaTCNUM' :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>订单ID</em>
<el-input class='w220' v-model='msg.OrderId' placeholder="请输入订单ID"></el-input>
<el-input class='w200' v-model='msg.OrderId' placeholder="请输入订单ID"></el-input>
</span>
</li>
<li>
<span>
<em>{{$t('hotel.product_name')}}</em>
<el-input class='w220' v-model='msg.Name' :placeholder="$t('pub.pleaseImport')"></el-input>
<el-input class='w200' v-model='msg.Name' :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>订单状态</em>
<el-select v-model='msg.VisaOrderStatus'>
<el-select class='w200' v-model='msg.VisaOrderStatus'>
<el-option label="不限" value="0" key='0'></el-option>
<el-option label="正常" value="1" key='1'></el-option>
<el-option label="取消" value="2" key='2'></el-option>
......@@ -334,7 +334,7 @@
<li>
<span>
<em>完结状态</em>
<el-select v-model='msg.IsFinish'>
<el-select class='w200' v-model='msg.IsFinish'>
<el-option label="不限" value="0" key='0'></el-option>
<el-option label="已完结" value="1" key='1'></el-option>
<el-option label="未完结" value="2" key='2'></el-option>
......@@ -343,7 +343,7 @@
<li v-if="pagesTitle!='销售'">
<span>
<em>业务员</em>
<el-select filterable v-model='msg.CreateBy'>
<el-select class='w200' filterable v-model='msg.CreateBy'>
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in EmployeeList' :label='item.EmName' :value='item.EmployeeId'
:key='item.EmployeeId'>
......@@ -354,7 +354,7 @@
<li>
<span>
<em>OP</em>
<el-select filterable v-model='msg.OpEmpId'>
<el-select class='w200' filterable v-model='msg.OpEmpId'>
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in EmployeeList' :label='item.EmName' :value='item.EmployeeId'
:key='item.EmployeeId'>
......@@ -365,7 +365,7 @@
<li v-if="pagesTitle!='销售'">
<span>
<em>公司</em>
<el-select filterable class="w217" v-model="msg.RB_Branch_Id" :placeholder="$t('pub.pleaseSel')">
<el-select class='w200' filterable v-model="msg.RB_Branch_Id" :placeholder="$t('pub.pleaseSel')">
<el-option :value="-1" label="不限"></el-option>
<el-option v-for="item in layerCompanyList" :label="item.BName" :value="item.Id" :key="item.Id">
</el-option>
......@@ -379,6 +379,13 @@
-<el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li>
<li>
<span>
<em>完结日期</em>
<el-date-picker v-model='msg.FinishSDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
-<el-date-picker v-model='msg.FinishEDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li>
<li>
<button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button>
</li>
......@@ -528,6 +535,8 @@
pageSize: 12,
StartDate: '',
EndDate: '',
FinishSDate: '',
FinishEDate: '',
SendStartDate: '',
SendEndDate: '',
Name: '',
......
src/components/SalesVisa/components/visaOrderList.vue
View file @ 59a4da6d
......@@ -823,6 +823,11 @@
v-loading="scope.row.loading">
<span class="c059FF6">完结</span>
</div>
<div v-if="IsSupperOrderEdit&&pagesTitle!='销售'&&scope.row.isFinish==1"
class="row-c cursor-pointer radius5 change py5" @click='setOPEmpId(scope.row)'
v-loading="scope.row.loading">
<span class="c059FF6">修改OP</span>
</div>
<div class="row-c cursor-pointer radius5 change py5"
v-if="IsSupperOrderEdit&&!scope.row.commissionMoney&&!scope.row.opCommission&&pagesTitle!='销售'"
@click="queryObj=scope.row,showTransferOrder=true">
......@@ -960,6 +965,18 @@
<el-button size="mini" type="danger" @click="PerferPrice">确 定</el-button>
</span>
</el-dialog>
<el-dialog title="修改OP" :visible.sync="EditOPVisible" width="400px">
<div>
<el-select v-model="OPEmpId" filterable size=mini>
<el-option v-for="item in OPEmpList" :key="item.EmployeeId" :label="item.EmName" :value="item.EmployeeId">
</el-option>
</el-select>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="mini" @click="EditOPVisible = false">取 消</el-button>
<el-button size="mini" type="danger" @click="sureOPEmp">确 定</el-button>
</span>
</el-dialog>
<offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
<TransferOrder v-if="showTransferOrder" :isShow="showTransferOrder" :obj="queryObj"
@success="showTransferOrder=false,$emit('success')" @close="showTransferOrder=false"></TransferOrder>
......@@ -1067,7 +1084,11 @@
TotalPrice: 0,
PeopleNum: 0
},
IsSupperOrderEdit: false
IsSupperOrderEdit: false,
EditOPVisible: false,
OPEmpId: 0,
OPOrderId: 0,
OPEmpList: []
};
},
watch: {
......@@ -1556,6 +1577,33 @@
this.copyId = 0;
}, 2000);
},
GetOPEmpList() {
let userInfo = this.getLocalStorage();
this.apipost('admin_get_EmployeeGetList', {GroupId: userInfo.RB_Group_id,DepartmentId:232}, res => {
if (res.data.resultCode == 1) {
this.OPEmpList = res.data.data;
}
}, err => {})
},
setOPEmpId(item) {
this.EditOPVisible = true;
this.OPOrderId = item.id;
},
sureOPEmp() {
if(this.OPEmpId <=0){
this.Info('请选择OP！')
return
}
this.apipost('dmc_post_SetVisaOrderFinishEmp', {VisaOrderIds:this.OPOrderId,EmpId:this.OPEmpId}, res => {
if (res.data.resultCode == 1) {
this.EditOPVisible = false;
this.Success(res.data.message)
this.$emit('success');
} else {
this.Error(res.data.message)
}
}, err => {})
},
},
mounted() {
this.qjGroupId = this.QjGroupId();
......@@ -1567,6 +1615,7 @@
if (ActionMenuCode.indexOf('isEditAmount') != -1) {
this.IsSupperOrderEdit = true
}
this.GetOPEmpList()
}
};
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @ 59a4da6d
......@@ -13,15 +13,15 @@
<headerTitle :FeatureItem="item" :TripColor="TripColor"></headerTitle>
<!-- 介绍、宿食景页 -->
<otherJourney :index="index" :FeatureItem="item" :TripColor="TripColor" @toAddPages="AddPages"
@toDeletePages="DeletePages" @setTemplate="setTemplate" v-if="item.pageType!=1&&item.pageType!=3"></otherJourney>
@toDeletePages="DeletePages" @setTemplate="setTemplate" v-if="item.pageType!=1"></otherJourney>
<!-- 食详情页 -->
<UpgradedVersionDetails :index="index" :FeatureData="item" :TripColor="TripColor" @toAddPages="AddPages"
@toDeletePages="DeletePages" v-if="item.pageType==3"></UpgradedVersionDetails>
@toDeletePages="DeletePages" v-if="item.name=='食详情'"></UpgradedVersionDetails>
<!-- otherJourney-footer 食景 食详情 -->
<div v-if="item.pageType!=1" :class="{'otherJourney-footer':item.pageType==5||item.pageType==6||item.pageType==3}">
<div v-if="item.name!='首页'" :class="{'otherJourney-footer':item.name=='食'||item.name=='景'||item.name=='食详情'}">
<div class="otherJourney-introduceFooter absolute z-index1 row-aic"
:style="{'background':item.pageType==5||item.pageType==6||item.pageType==3?TripColor:''}">
<template v-if="item.pageType!==5&&item.pageType!==6&&item.pageType==3">
:style="{'background':item.name=='食'||item.name=='景'||item.name=='食详情'?TripColor:''}">
<template v-if="item.name!=='食'&&item.name!=='景'&&item.name!=='食详情'">
<div class="introduceFooterBJ introduceFooterOne" :style="{'background':TripColor}">&nbsp;</div>
<div class="introduceFooterBJ introduceFootertTwo" :style="{'background':TripColor}">&nbsp;</div>
<div class="introduceFooter-text row-aic">
......@@ -66,41 +66,41 @@
pageTitle: '首页',
pageType: 1,
pageTemplate: 0,
isDeletePage: true,
isDeletePage: false,
dataObj: {},
},
{
pageTitle: '介绍',
pageType: 2,
pageTemplate: 0,
isDeletePage: true,
isDeletePage: false,
dataObj: {},
},
{
pageTitle: '食详情',
pageType: 3,
pageTemplate: 0,
isDeletePage: true,
isDeletePage: false,
dataObj: {},
},
{
pageTitle: '宿',
pageType: 4,
isDeletePage: true,
isDeletePage: false,
pageTemplate: 1,
dataObj: {},
},
{
pageTitle: '食',
pageType: 5,
isDeletePage: true,
isDeletePage: false,
pageTemplate: 2,
dataObj: {},
},
{
pageTitle: '景',
pageType: 6,
isDeletePage: true,
isDeletePage: false,
pageTemplate: 3,
dataObj: {},
}
......@@ -108,9 +108,6 @@
};
},
methods: {
getImgList() {
},
getPageObj() {
var pageObj = {
pageTitle: '首页', //页面名称
......@@ -130,8 +127,8 @@
}
this.pageList.splice(index, 0, this.pageData)
},
DeletePages(index) {
this.pageList.splice(index, 1)
DeletePages(index, FeatureData) {
this.pageList.splice(1, index)
},
setTemplate(index, TemplateType) {
this.pageList[index].Template = TemplateType
......@@ -159,7 +156,8 @@
if (JSON.stringify(oldJson) !== "{}" && oldJson) {
} else {
this.getTripData();
var tripObj = this.getTripData();
console.log("tripObj", tripObj);
this.pageList.forEach(pItem => {
var newObj = this.getDetailsObj();
newObj.LineName = this.FeatureData.LineName;
......@@ -168,16 +166,24 @@
newObj.LineShortName = this.FeatureData.LineShortName;
//首页
if (pItem.pageType == 1) {
newObj.MainName = "大阪 京都 富士山 伊豆 都 H"; //地区1
newObj.SubName = "冲绳 大阪城公园湖 伊豆 H"; //地区2
newObj.DetailsName = "浅草寺 Senso-ji Temple";
newObj.ShadowName = "遇见最美好的自己";
newObj.SubShadowName = "在古老的日本樱花街道";
newObj.ImgList = [{
url: "http://imgfile.oytour.com/Upload/DMC/DsrkBYw5MnQnzk2WzksZ4knrrKFbeP3a.jpg"
}];
newObj.MainDesc =
"东京最著名、最古老的寺庙，也是日本的门脸、浅草的象征。频繁的庙会活动让你零距离感受日本江户风俗。据说寺内有一座在公元628年偶然被当地渔民打捞上来的观音金像，每年都有许多人前来寺庙祈福保平安。院内有雷门、五重塔等著名古迹；还有90余家商铺的仲见世商店街，可以买到当地特产和吉祥物。在浅草寺可以求签问凶吉，如果不走运抽到了“凶”，和当地人一样系在抽签的地方就可以驱散霉运了。";
newObj.MainName = tripObj.cityStr; //地区1
newObj.SubName = tripObj.cityStr2; //地区2
if (tripObj.scenicArray && tripObj.scenicArray.length > 0) {
newObj.DetailsName = tripObj.scenicArray[0].MainName;
newObj.ShadowName = "遇见最美好的自己";
newObj.SubShadowName = "在古老的日本樱花街道";
newObj.ImgList = tripObj.scenicArray[0].ImgList;
newObj.MainDesc = tripObj.scenicArray[0].MainDesc;
} else {
newObj.DetailsName = "浅草寺 Senso-ji Temple";
newObj.ShadowName = "遇见最美好的自己";
newObj.SubShadowName = "在古老的日本樱花街道";
newObj.ImgList = [{
url: "http://imgfile.oytour.com/Upload/DMC/DsrkBYw5MnQnzk2WzksZ4knrrKFbeP3a.jpg"
}];
newObj.MainDesc =
"东京最著名、最古老的寺庙，也是日本的门脸、浅草的象征。频繁的庙会活动让你零距离感受日本江户风俗。据说寺内有一座在公元628年偶然被当地渔民打捞上来的观音金像，每年都有许多人前来寺庙祈福保平安。院内有雷门、五重塔等著名古迹；还有90余家商铺的仲见世商店街，可以买到当地特产和吉祥物。在浅草寺可以求签问凶吉，如果不走运抽到了“凶”，和当地人一样系在抽签的地方就可以驱散霉运了。";
}
}
//介绍页面
else if (pItem.pageType == 2) {
......@@ -189,8 +195,11 @@
newObj.MainDesc =
"印象日本独家使用京 都 车 站旁 的 京都 千 饭店 ~酒店房间 37 平 方公 尺！ 房型 多样 设 计， 京都千饭店外观为京町家的格子风格，非常引人注目。饭店以「Personal Comfort Hotel」为概念所打造，意思就是追求每个人入住时的舒适感。从有着庭院的大厅穿过以京町家的内庭长廊为主题所建的信道，便可看见用玻璃纱创作的艺术装置随风轻柔地飘动着。再往旁边一看，眼前只见充满开放感的挑高空间。有如通往神社寺庙大门般的大型阶梯充满了存在感。在柔和的光线包围下，一瞬间忘了自己是身处在建筑物之中。让人联想到京都传统建筑的内部装潢没有刻意的高调奢华，但连小细节都做得非常精致，散发出古都特有的风情。低調沉穩的寬敞客房。讓入住者可以從陽台或窗邊觀賞庭園的綠色景緻，同時享受頂級的休閒時光。 ";
}
//详情页面
//详情页面
else if (pItem.pageType == 3) {
if (tripObj.dinnerArray && tripObj.dinnerArray.length > 0) {
}
var dinnerObj = {
MainName: "特色餐1",
ImgList: [{
......@@ -198,20 +207,29 @@
}],
MainDesc: "特色餐描述"
};
newObj.SubList.push(dinnerObj);
newObj.SubList.push(dinnerObj);
newObj.SubList.push(dinnerObj);
}
//酒店
//酒店
else if (pItem.pageType == 4) {
newObj.MainName = "富士山花园酒店";
newObj.SubName = "特色酒店";
newObj.ImgList = [{
url: "https://imgfile.oytour.com/Upload/DMC/202305290204327370000000012.jpg"
}];
newObj.MainDesc = "新大谷INN东京位于山手线大崎车站徒步一分钟，离品川，涉谷，原宿，都非常近，方便购物 观光，酒店房间干净 舒适，";
} //餐
if (tripObj.hotelArray && tripObj.hotelArray.length > 0) {
newObj.MainName = tripObj.hotelArray[0].MainName;
newObj.SubName = "特色酒店";
newObj.ImgList = tripObj.hotelArray[0].ImgList;
newObj.MainDesc = tripObj.hotelArray[0].MainDesc;
} else {
newObj.MainName = "富士山花园酒店";
newObj.SubName = "特色酒店";
newObj.ImgList = [{
url: "https://imgfile.oytour.com/Upload/DMC/202305290204327370000000012.jpg"
}];
newObj.MainDesc = "新大谷INN东京位于山手线大崎车站徒步一分钟，离品川，涉谷，原宿，都非常近，方便购物 观光，酒店房间干净 舒适，";
}
} //餐
else if (pItem.pageType == 5) {
newObj.MainName = "箱根湖畔日式料理";
newObj.SubName = "特色餐食";
newObj.ImgList = [{
......@@ -219,7 +237,7 @@
}];
newObj.MainDesc = "箱根湖畔日式料理箱根湖畔日式料理箱根湖畔日式料理箱根湖畔日式料理箱根湖畔日式料理箱根湖畔日式料理箱根湖畔日式料理";
}
//景点
//景点
else if (pItem.pageType == 6) {
newObj.MainName = "东京秋叶原动漫.电器";
newObj.SubName = "特色景点";
......@@ -237,8 +255,12 @@
//获取行程信息
getTripData() {
var cityArray = [];
var scenicArray = [];
var hotelArray = [];
var dinnerArray = [];
if (this.FeatureData && this.FeatureData.DayList && this.FeatureData.DayList.length > 0) {
this.FeatureData.DayList.forEach(dItem => {
//城市
if (dItem.TrafficObj && dItem.TrafficObj.SubTraffic && dItem.TrafficObj.SubTraffic.length > 0) {
dItem.TrafficObj.SubTraffic.forEach(tItem => {
if (tItem.StartCityName && tItem.StartCityName != '' && !cityArray.includes(tItem
......@@ -251,13 +273,99 @@
}
});
}
//景点
if (dItem.ScenicArray && dItem.ScenicArray.length > 0) {
dItem.ScenicArray.forEach(sItem => {
var tempImgList = [];
if (sItem.NewImaArray && sItem.NewImaArray.length > 0) {
sItem.NewImaArray.forEach(iItem => {
tempImgList.push({
url: iItem.Url
});
})
}
var sObj = {
MainName: sItem.CouponsName,
MainDesc: sItem.Description,
ImgList: tempImgList,
SourceType: 6
}
var temoScenic = scenicArray.find(x => x.MainName == sObj.MainName)
if (!temoScenic) {
scenicArray.push(sObj)
}
});
}
if (dItem.HotelArray && dItem.HotelArray.length > 0) {
dItem.HotelArray.forEach(sItem => {
var tempImgList = [];
if (sItem.ImaArray && sItem.ImaArray.length > 0) {
sItem.ImaArray.forEach(iItem => {
tempImgList.push({
url: iItem.Url
});
})
}
var hObj = {
MainName: sItem.HotelName,
MainDesc: sItem.Description,
ImgList: tempImgList,
SourceType: 4
}
var tempHotel = hotelArray.find(x => x.MainName == hObj.MainName)
if (!tempHotel) {
hotelArray.push(hObj);
}
});
}
if (dItem.DinnerArray && dItem.DinnerArray.length > 0) {
dItem.DinnerArray.forEach(sItem => {
if (sItem.DinnerId > 0) {
var tempImgList = [];
if (sItem.ImaArray && sItem.ImaArray.length > 0) {
sItem.ImaArray.forEach(iItem => {
tempImgList.push({
url: iItem.Url
});
})
}
var dObj = {
MainName: sItem.DinnerName,
MainDesc: sItem.Description,
ImgList: tempImgList,
SourceType: 5
};
var tempDinner = dinnerArray.find(x => x.MainName == dObj.MainName)
if (!tempDinner) {
dinnerArray.push(dObj)
}
}
});
}
});
}
var cityStr = "";
var cityStr2 = "";
var cityArray1 = [];
var cityArray2 = [];
if (cityArray && cityArray.length > 0) {
var num = cityArray.length / 2;
console.log("num", num)
for (var i = 0; i < num; i++) {
cityArray1.push(cityArray[i]);
}
cityStr = cityArray1.join(" ");
for (var j = num; j < cityArray.length; j++) {
cityArray2.push(cityArray[j]);
}
cityStr2 = cityArray2.join(" ");
}
return {
cityStr,
cityStr2,
hotelArray,
scenicArray,
dinnerArray,
}
console.log("cityArray,", cityArray);
}
},
computed: {
......
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