Skip to content

S
SuperMan
Commit fdde7687 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 085aff9d 29215b09
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 591 additions and 210 deletions
src/assets/css/cssReset.css
View file @ fdde7687
......@@ -335,6 +335,10 @@ input:-webkit-autofill {
width: 50px!important;
}
.w54 {
width: 54px!important;
}
.w60 {
width: 60px!important;
}
......
src/assets/utils/tripUtils.js
View file @ fdde7687
......@@ -291,6 +291,7 @@ var tripUtils = {
JPYSalePrice:0.00,//日元销售价格
JPYTotalMoney:0.00,//日元成本价
B2CSalePrice:0,//同业售价
SaleList:[],//印象票务的,平台价格
}
},
//团控列表下拉菜单
......
src/components/Hotel/roomReservationsDetails.vue
View file @ fdde7687
......@@ -1070,7 +1070,6 @@
}
}
this.apipost('dmcstatistics_get_GetHotelStaticsDetail_V2', msg, res => {
console.log("dmcstatistics_get_GetHotelStaticsDetail_V2", res.data);
if (res.data.resultCode == 1) {
this.IsOperation = res.data.data.IsOperation;
if (this.IsEditHotel == 0) {
......
src/components/Hotel/roomReservationsDetailsNew.vue
View file @ fdde7687
......@@ -766,7 +766,6 @@
}
}
this.apipost('dmcstatistics_get_GetHotelStaticsDetail_V2', msg, res => {
console.log("dmcstatistics_get_GetHotelStaticsDetail_V2", res.data);
if (res.data.resultCode == 1) {
this.IsOperation = res.data.data.IsOperation;
if (this.IsEditHotel == 0) {
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ fdde7687
......@@ -1435,7 +1435,6 @@
},
//删除
editorOtherExpenses(item, index) {
console.log("item", item);
this.$confirm(this.$t('objFill.ydscbkhf'), this.$t("tips.tips"), {
confirmButtonText: this.$t("pub.sureBtn"),
cancelButtonText: this.$t("pub.cancelBtn"),
......@@ -2539,7 +2538,6 @@
this.msg,
res => {
this.loading = false;
console.log("getList", res.data);
if (res.data.resultCode == 1) {
let data = res.data.data
let arrList = function (arr) {
......
src/components/SalesModule/Returnratio.vue
View file @ fdde7687
......@@ -262,7 +262,6 @@ import YearLimit from '../public/YearLimit.vue';
this.Msg.Year=this.year;
this.ruleForm.Year=this.year;
}
console.log("this.ruleForm.Year",this.ruleForm.Year);
},
mounted() {
......
src/components/SalesModule/enrollTotal.vue
View file @ fdde7687
......@@ -414,6 +414,9 @@
</div>
</td>
<td>
<p class="over_ellipsis" v-if="item.customerType==3||item.customerType==4">
{{item.clientSourceName}}
</p>
<p class="over_ellipsis" style="width: 150px" :title="item.contactName">
{{ item.contactName }}
</p>
......
src/components/SalesModule/groupTourOrder.vue
View file @ fdde7687
......@@ -1794,6 +1794,9 @@
</div>
</td>
<td>
<p class="fz12" v-if="item.customerType==3||item.customerType==4">
{{item.clientSourceName}}
</p>
<p class="fz12 over_ellipsis" style="width: 120px" :title="item.contactName">
{{ item.contactName }}
</p>
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ fdde7687
......@@ -1894,6 +1894,9 @@
</div>
</td>
<td>
<p v-if="item.customerType==3||item.customerType==4">
{{item.clientSourceName}}
</p>
<p v-if="
item.isOwn == 1 ||
IsSupperOrderEdit ||
......
src/components/SalesModule/groupTourOrderByTuanOne.vue
View file @ fdde7687
......@@ -1262,14 +1262,10 @@
</el-col>
</el-row>
<el-row :gutter="20">
</el-row>
<el-row :gutter="20">
</el-row>
<el-row :gutter="20">
</el-row>
<el-row :gutter="20" style="margin-bottom: 20px;">
<el-col :span="24">
......@@ -1513,8 +1509,6 @@
<span style="font-weight: 100;text-decoration:underline;cursor:pointer;color: #e95252;"
v-if="item.scoreNum >= 0"
@click='goInvetig("investigationList", item.tcid, item.orderId)'>({{$t('salesModule.ScoreNUM')}}{{item.scoreNum}})</span>
<!-- <span style="font-weight: 100;" v-if="item.scoreNum >= 0">({{$t('salesModule.ScoreNUM')}}{{item.scoreNum}})</span> -->
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top"
v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu"
style="font-size:22px;color:red;"></i></el-tooltip>
......@@ -1533,12 +1527,12 @@
</template>
</td>
<td>
<p v-if="item.customerType==3||item.customerType==4"> {{item.clientSourceName}}</p>
<p v-if='item.isOwn==1||IsSupperOrderEdit||IsLookOrder || isUpdateOrder' class="fz12 over_ellipsis"
style="width: 120px;" :title="item.contactName">{{item.contactName}}</p>
<p v-if='item.isOwn==1||IsSupperOrderEdit||IsLookOrder || isUpdateOrder' class="fz12">
{{item.contactMobile}}</p>
<p v-if='item.isOwn==2&&!IsSupperOrderEdit&&!IsLookOrder&&isUpdateOrder==false'>*****</p>
</td>
<td>
<span v-if='item.guestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference"
......
src/components/SalesModule/productQueryOne2.vue
View file @ fdde7687
......@@ -230,6 +230,7 @@
.productQuerybottomLayer .el-upload-list {
width: 200px;
}
</style>
<template>
<div class="flexOne">
......@@ -279,8 +280,6 @@
</span>
</li>
<li><span><em>{{$t('hotel.hotel_StarDate')}}</em>
<!-- <el-date-picker v-model='msg.StartTime' @change="dataDui()" class='w135' value-format="yyyy-MM-dd"
type="date"></el-date-picker> -->
<DateLimit :clearable="false" :StartGroupDate="msg.StartTime" :EndGroupDate="msg.EndTime"
@change="(date)=> {msg.StartTime = date,dataDui()}"></DateLimit>
-
......@@ -1890,4 +1889,5 @@
}
}
</script>
\ No newline at end of file
</script>
src/components/SalesVisa/VisaProductOrder.vue
View file @ fdde7687
......@@ -1350,8 +1350,6 @@
this.$refs.multipleTable.clearSelection()
},
selectable(row, index){/// SwitchStatus 0 完结 1制单,2批量修改进馆时间，3-批量修改出签时间
console.log("SwitchStatus 0 完结 1制单,2批量修改进馆时间，3-批量修改出签时间",this.SwitchStatus);
if(this.SwitchStatus==0){
if (this.dataList[index].IsFinish!=1&&this.dataList[index].Income>0&&this.dataList[index].DueInMoney==0) {
return true;
......@@ -1383,7 +1381,6 @@
return
}
this.EnterTimeOrSignOutTimeMsg.Id=ids.join(',');
console.log("this.multipleSelection",this.EnterTimeOrSignOutTimeMsg.Id);
this.EnterTimeOrSignOutTimeMsg.batch=2;
this.EnterTimeOrSignOutTimeMsg.type=type;
this.showEnterTimeOrSignOutTime=true;
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ fdde7687
......@@ -1672,7 +1672,9 @@
<el-row :gutter="20">
<el-col :span="4">
<el-form-item :label="$t('salesModule.CustomFrom')" prop="ClientSource">
<el-select v-model="addMsg.ClientSource" :disabled="true" filterable :placeholder="$t('pub.pleaseSel')">
<!--票务修改平台 -->
<el-select v-model="addMsg.ClientSource" filterable :placeholder="$t('pub.pleaseSel')"
@change="getTotalPrice()" :disabled="addMsg.OutBranchId&&addMsg.OutBranchId!=1245" >
<el-option v-for="item in ddlyList" :label="item.Name" :value="item.Id" :key="item.Id">
</el-option>
</el-select>
......@@ -2388,6 +2390,9 @@
</div>
</td>
<td>
<p class="fz12 over_ellipsis" v-if="childItem.CustomerType==3||childItem.CustomerType==4">
{{childItem.ClientSourceName}}
</p>
<p v-if="childItem.IsOwn == 1 || IsSupperOrderEdit" class="fz12 over_ellipsis"
:title="childItem.ContactName">
{{ childItem.ContactName }}
......@@ -3826,7 +3831,7 @@
</button>
</div>
</el-dialog>
<!-- 申请优惠-->
<!--申请优惠-->
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="SpecialOffer"
style="height: 150px; min-height: 200px">
<p>
......@@ -3856,10 +3861,6 @@
background-color: #e5e5e5;
vertical-align: top;
" class="w150">{{ SOMsg.OrderUnitPrice }}</em>
<!-- <em style="margin-left: 100px;font-size: 12px !important;color: #606266;">{{$t('sm.youhuijine')}}</em>
<el-input v-model='SOMsg.ApplyPrice' type='text' maxlength='20' class='w150'></el-input> -->
<em style="
margin-left: 100px;
font-size: 12px !important;
......@@ -4926,7 +4927,6 @@
},
(err) => {}
);
this.isShowLayerRemarks = false;
this.showSetLeader = false;
this.apipost(
......@@ -4955,7 +4955,6 @@
(err) => {}
);
},
// 获取订单收损详情
OrderLossInfo(childItem) {
this.OrderLossMsg.OrderId = childItem.OrderId;
......@@ -5513,18 +5512,30 @@
this.addMsg.Unit_Price = this.addMsg.TC_Price;
return;
}
if (
this.addMsg.Unit_Price < this.addMsg.TC_Price &&
this.addMsg.GroupType != 4
) {
if (this.addMsg.Unit_Price < this.addMsg.TC_Price && this.addMsg.GroupType != 4) {
this.$message.error(this.$t('objFill.chengjiaojxdydybtdj'));
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.addMsg.OutBranchId&&this.addMsg.OutBranchId == 1245) {
if (this.addMsg.CustomerType == 3 || this.addMsg.CustomerType == 4) {
if (this.addMsg.PlatformPriceList && this
.addMsg.PlatformPriceList.length > 0) {
var platFormObj = this.addMsg.PlatformPriceList.find(qitem => {
return qitem.ItemId == this.addMsg.ClientSource
});
if (platFormObj) {
this.addMsg.TC_Price = platFormObj.ItemPrice;
this.addMsg.Unit_Price = platFormObj.ItemPrice;
}
}
}
}
this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1;
if (this.addObj.IsBirdDiscount == 1) {
//早鸟优惠
//this.addMsg.Unit_Price //成交单价
......@@ -6158,7 +6169,6 @@
(err) => {}
);
},
getDdlyList(id) {
this.apipost(
"sellorder_get_GetSellClientSourceEnumList", {
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @ fdde7687
......@@ -191,7 +191,7 @@
{{$t('objFill.guolufei')}}<br />{{$t('objFill.v101.tingcheft')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:110px">{{$t('restaurant.res_resName')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">{{$t('objFill.v101.jiagecan')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:150px">{{$t('visaT.jdname')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:180px">{{$t('visaT.jdname')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">{{$t('objFill.v101.jiageren')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">{{$t('system.query_airName')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">{{$t('Operation.Op_price')}}</td>
......@@ -573,7 +573,6 @@
{{OtherPrice.InlandTrainTicketMoney}}
</el-form-item>
</td>
<td colspan="2">
<el-form-item :label="$t('salesModule.Union')">
{{teamPrice.UnionPrice}}
......@@ -878,7 +877,6 @@
</template>
</font>
=<font style="color:red">
{{Number(getLocalTotalMoney(subItem.PeopleNumber))+Number(getLocalChangeTotalMoney(subItem.PeopleNumber))}}
</font>
</template>
......@@ -924,6 +922,14 @@
</td>
<td>
{{subItem.B2CSalePrice}}
<!--印象票务-->
<template v-if="postConfig.OutBranchId==1245">
<template v-if="subItem.SaleList&&subItem.SaleList.length>0">
<template v-for="(tItem,tIndex) in subItem.SaleList">
<br /> <font :key="`s_`+subIndex+`t_`+tIndex" style="color:blue;">{{tItem.ItemName}}：{{tItem.ItemPrice}}</font>
</template>
</template>
</template>
</td>
<td>
<!--台湾印象和日本印象-->
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
View file @ fdde7687
......@@ -698,6 +698,23 @@
<td>
<el-input type='text' class="w120" v-model="subItem.B2CSalePrice"
@keyup.native="checkPrice(subItem,'B2CSalePrice')" maxlength="8"></el-input>
<!--印象票务-->
<template v-if="postConfig.OutBranchId==1245">
<el-select v-model="changePlat" @change="getChangePlat(subItem)">
<el-option v-for="(pItem,pIndex) in platformList" :key="pIndex" :value="pItem.Id"
:label="pItem.Name"></el-option>
</el-select>
<template v-if="subItem.SaleList&&subItem.SaleList.length>0">
<template v-for="(tItem,tIndex) in subItem.SaleList">
<el-form-item :label="tItem.ItemName" :key="`s_`+subIndex+`t_`+tIndex">
<el-input type='text' v-model="tItem.ItemPrice" class="w54"
@keyup.native="checkPrice(tItem,'ItemPrice')" maxlength="8">
</el-input>
<a @click="deletePlat(subItem,tIndex)" style="cursor:pointer;color:red;">X</a>
</el-form-item>
</template>
</template>
</template>
</td>
<td>
<!--台湾印象和日本印象-->
......@@ -748,6 +765,7 @@
},
data() {
return {
changePlat: "", //选择平台
dayCostPriceList: [],
otherPrice: {},
teamPrice: {},
......@@ -791,12 +809,43 @@
isShowDiningDig: false, //是否显示选择餐弹窗
breakFirstList: [], //午餐、晚餐默认类型
otherDinner: [], //早餐默认类型
platformList: [], //平台列表
}
},
components: {
travelDinner: travelDinner,
},
methods: {
deletePlat(subItem, index) {
subItem.SaleList.splice(index, 1);
},
getChangePlat(subItem) {
var sObj = {
ItemId: 0,
ItemName: "",
ItemPrice: 0
};
if (!subItem.SaleList) {
subItem.SaleList = [];
}
if (this.changePlat) {
var choosePlat = this.platformList.find(qItem => {
return qItem.Id == this.changePlat;
});
if (choosePlat) {
sObj.ItemId = choosePlat.Id;
sObj.ItemName = choosePlat.Name;
}
}
var tempSObj = subItem.SaleList.find(qitem => {
return qitem.ItemId == sObj.ItemId
})
if (!tempSObj) {
subItem.SaleList.push(sObj);
} else {
this.Error("已存在【" + tempSObj.ItemName + "】,请重新选择!");
}
},
//获取选中的日期
getOfferItemObj(type) {
var selectOfferObj = {};
......@@ -1397,7 +1446,17 @@
},
err => {}
);
}
},
//获取平台
getOrderPlat() {
this.apipost("sellorder_get_GetSellClientSourceEnumList", {
typeId: "3"
}, res => {
if (res.data.resultCode == 1) {
this.platformList = res.data.data;
}
});
},
},
mounted() {
this.getHotelInit();
......@@ -1407,6 +1466,7 @@
this.getEmployeeList();
this.getConfigDinnerList();
this.getOfferItemObj(0);
this.getOrderPlat();
}
};
......
src/components/TravelManager/TravelNewQuotation/quotationEdit.vue
View file @ fdde7687
......@@ -635,7 +635,6 @@
this.apipost(
"travel_get_PriceOfferInfo", msg,
res => {
console.log("travel_get_PriceOfferInfo", res);
this.loading = false;
if (res.data.resultCode == 1) {
var tempData = res.data.data;
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ fdde7687
......@@ -527,8 +527,53 @@
<el-form-item prop="B2CPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2CPrice"
@keyup.native="checkPrice(priceData,'B2CPrice')" :disabled="priceData.TCID>0">
<template slot="prepend">{{$t('Operation.Op_direct')}}</template>
<template slot="prepend">
{{$t('Operation.Op_direct')}}
</template>
</el-input>
<!--印象票务-->
<template v-if="priceData.OutBranchId==1245">
<el-popover placement="right" width="350" trigger="click">
<table>
<thead>
<tr>
<th>
请选择平台:
</th>
<th>
<el-select v-model="changePlat" @change="getChangePlat(priceData.ExtPriceInfo)"
class="w150">
<el-option v-for="(pItem,pIndex) in platformList" :key="pIndex" :value="pItem.Id"
:label="pItem.Name"></el-option>
</el-select>
</th>
<th>
</th>
</tr>
</thead>
<tbody v-for="(pItem,pIndex) in priceData.ExtPriceInfo.PlatformPriceList"
:key="`t_`+priceData.TCID+`d_`+pIndex">
<tr>
<td>
{{pItem.ItemName}}：
</td>
<td>
<el-input :placeholder="$t('pub.pleaseImport')" class="w150 ComSeat"
v-model="pItem.ItemPrice" @keyup.native="checkPrice(pItem,'ItemPrice')">
</el-input>
</td>
<td>
&nbsp;
<a style="cursor:pointer;color:blue;"
@click="deletePlat(priceData.ExtPriceInfo,pIndex)">删除</a>
</td>
</tr>
</tbody>
</table>
<el-button slot="reference" type="text" style="color:blue;padding-top:-3px !important;"
size="small">其他平台</el-button>
</el-popover>
</template>
</el-form-item>
<el-form-item prop="BabyPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.BabyPrice"
......@@ -644,7 +689,6 @@
<template slot="prepend">{{$t('Operation.Op_visafeeBack')}}</template>
</el-input>
</el-form-item>
<el-form-item style="display:none;">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.RebatePrice"
@keyup.native="checkPrice(priceData,'RebatePrice')">
......@@ -1183,6 +1227,8 @@
props: ["priceList", "PostConfig", "modifyTcid", "CurrentUserInfo", "IsDirect"],
data() {
return {
changePlat: "",//选择的平台
platformList: [],//平台列表
outerVisible: false,
currentDay: 1,
currentMonth: 1,
......@@ -1299,6 +1345,38 @@
};
},
methods: {
//删除平台价格
deletePlat(subItem, index) {
subItem.PlatformPriceList.splice(index, 1);
},
//添加平台价格
getChangePlat(subItem) {
var sObj = {
ItemId: 0,
ItemName: "",
ItemPrice: 0
};
if (!subItem.PlatformPriceList) {
subItem.PlatformPriceList = [];
}
if (this.changePlat) {
var choosePlat = this.platformList.find(qItem => {
return qItem.Id == this.changePlat;
});
if (choosePlat) {
sObj.ItemId = choosePlat.Id;
sObj.ItemName = choosePlat.Name;
}
}
var tempSObj = subItem.PlatformPriceList.find(qitem => {
return qitem.ItemId == sObj.ItemId
})
if (!tempSObj) {
subItem.PlatformPriceList.push(sObj);
} else {
this.Error("已存在【" + tempSObj.ItemName + "】,请重新选择!");
}
},
IsNeedAirportShuttleChange() {
if (!this.priceData.IsNeedAirportShuttle) {
this.priceData.SendPersion = ''
......@@ -1465,6 +1543,12 @@
IsGuideDaiTuan: 1, //导游带团/不带团
IsNewArrival: 0, //是否新品
TeamId: 0, //团队分组编号
ExtPriceInfo: {
ExtId: 0,
TCID: 0,
PlatformPriceJson: "",
PlatformPriceList: [],
}, //团队基础扩展信息
};
}
this.returnPriceList.push(objItem);
......@@ -2091,7 +2175,17 @@
this.Error(res.data.message);
}
});
}
},
//获取平台
getOrderPlat() {
this.apipost("sellorder_get_GetSellClientSourceEnumList", {
typeId: "3"
}, res => {
if (res.data.resultCode == 1) {
this.platformList = res.data.data;
}
});
},
},
mounted() {
var dateObj = this.$calendarUtils.getCurrentDate();
......@@ -2102,6 +2196,7 @@
this.getTravelSupplier();
this.getTeamList();
this.getBusList();
this.getOrderPlat();
},
watch: {
priceList: {
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ fdde7687
......@@ -416,7 +416,7 @@
<span class="TPNotice">（{{$t('sm.tipscompanyyuj')}}）</span>
<span class="TPLine"></span>
</div>
<div class="TP_rightDate">
<div class="TP_rightDate">
<div class="TP_dateContent">
<el-row v-if="modifyTcid>0">
<el-col>
......@@ -527,6 +527,49 @@
@keyup.native="checkPrice(priceData,'B2CPrice')" :disabled="priceData.TCID>0">
<template slot="prepend">{{$t('Operation.Op_direct')}}</template>
</el-input>
<!--印象票务-->
<template v-if="priceData.OutBranchId==1245">
<el-popover placement="right" width="350" trigger="click">
<table>
<thead>
<tr>
<th>
请选择平台:
</th>
<th>
<el-select v-model="changePlat" @change="getChangePlat(priceData.ExtPriceInfo)"
class="w150">
<el-option v-for="(pItem,pIndex) in platformList" :key="pIndex" :value="pItem.Id"
:label="pItem.Name"></el-option>
</el-select>
</th>
<th>
</th>
</tr>
</thead>
<tbody v-for="(pItem,pIndex) in priceData.ExtPriceInfo.PlatformPriceList"
:key="`t_`+priceData.TCID+`d_`+pIndex">
<tr>
<td>
{{pItem.ItemName}}：
</td>
<td>
<el-input :placeholder="$t('pub.pleaseImport')" class="w150 ComSeat"
v-model="pItem.ItemPrice" @keyup.native="checkPrice(pItem,'ItemPrice')">
</el-input>
</td>
<td>
&nbsp;
<a style="cursor:pointer;color:blue;"
@click="deletePlat(priceData.ExtPriceInfo,pIndex)">删除</a>
</td>
</tr>
</tbody>
</table>
<el-button slot="reference" type="text" style="color:blue;padding-top:-3px !important;"
size="small">其他平台</el-button>
</el-popover>
</template>
</el-form-item>
<el-form-item prop="BabyPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.BabyPrice"
......@@ -1170,6 +1213,8 @@
],
data() {
return {
changePlat: "", //选择的平台
platformList: [], //平台列表
outerVisible: false,
currentDay: 1,
currentMonth: 1,
......@@ -1286,6 +1331,38 @@
};
},
methods: {
//删除平台价格
deletePlat(subItem, index) {
subItem.PlatformPriceList.splice(index, 1);
},
//添加平台价格
getChangePlat(subItem) {
var sObj = {
ItemId: 0,
ItemName: "",
ItemPrice: 0
};
if (!subItem.PlatformPriceList) {
subItem.PlatformPriceList = [];
}
if (this.changePlat) {
var choosePlat = this.platformList.find(qItem => {
return qItem.Id == this.changePlat;
});
if (choosePlat) {
sObj.ItemId = choosePlat.Id;
sObj.ItemName = choosePlat.Name;
}
}
var tempSObj = subItem.PlatformPriceList.find(qitem => {
return qitem.ItemId == sObj.ItemId
})
if (!tempSObj) {
subItem.PlatformPriceList.push(sObj);
} else {
this.Error("已存在【" + tempSObj.ItemName + "】,请重新选择!");
}
},
IsNeedAirportShuttleChange() {
if (!this.priceData.IsNeedAirportShuttle) {
this.priceData.SendPersion = ''
......@@ -1453,6 +1530,12 @@
IsLeaderDaiTuan: 1, //领队带团/不带团
IsNewArrival: 0, //是否新品
TeamId: 0, //团队分组编号
ExtPriceInfo: {
ExtId: 0,
TCID: 0,
PlatformPriceJson: "",
PlatformPriceList: [],
}, //团队基础扩展信息
};
}
this.returnPriceList.push(objItem);
......@@ -2095,7 +2178,17 @@
},
err => {}
);
}
},
//获取平台
getOrderPlat() {
this.apipost("sellorder_get_GetSellClientSourceEnumList", {
typeId: "3"
}, res => {
if (res.data.resultCode == 1) {
this.platformList = res.data.data;
}
});
},
},
mounted() {
var dateObj = this.$calendarUtils.getCurrentDate();
......@@ -2106,6 +2199,7 @@
this.getTravelSupplier();
this.getTeamList();
this.getBusList();
this.getOrderPlat();
},
watch: {
priceList: {
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @ fdde7687
......@@ -488,6 +488,49 @@
@keyup.native="checkPrice(priceData,'B2CPrice')" :disabled="priceData.TCID>0">
<template slot="prepend">{{$t('Operation.Op_direct')}}</template>
</el-input>
<!--印象票务-->
<template v-if="priceData.OutBranchId==1245">
<el-popover placement="right" width="350" trigger="click">
<table>
<thead>
<tr>
<th>
请选择平台:
</th>
<th>
<el-select v-model="changePlat" @change="getChangePlat(priceData.ExtPriceInfo)"
class="w150">
<el-option v-for="(pItem,pIndex) in platformList" :key="pIndex" :value="pItem.Id"
:label="pItem.Name"></el-option>
</el-select>
</th>
<th>
</th>
</tr>
</thead>
<tbody v-for="(pItem,pIndex) in priceData.ExtPriceInfo.PlatformPriceList"
:key="`t_`+priceData.TCID+`d_`+pIndex">
<tr>
<td>
{{pItem.ItemName}}：
</td>
<td>
<el-input :placeholder="$t('pub.pleaseImport')" class="w150 ComSeat"
v-model="pItem.ItemPrice" @keyup.native="checkPrice(pItem,'ItemPrice')">
</el-input>
</td>
<td>
&nbsp;
<a style="cursor:pointer;color:blue;"
@click="deletePlat(priceData.ExtPriceInfo,pIndex)">删除</a>
</td>
</tr>
</tbody>
</table>
<el-button slot="reference" type="text" style="color:blue;padding-top:-3px !important;"
size="small">其他平台</el-button>
</el-popover>
</template>
</el-form-item>
<el-form-item prop="BabyPrice" style="display:none;">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.BabyPrice"
......@@ -962,6 +1005,8 @@
props: ["priceList", "PostConfig", "modifyTcid", "CurrentUserInfo", "IsDirect"],
data() {
return {
changePlat: "", //选择的平台
platformList: [], //平台列表
outerVisible: false,
isCheckAll: false,
currentDay: 1,
......@@ -1061,6 +1106,38 @@
};
},
methods: {
//删除平台价格
deletePlat(subItem, index) {
subItem.PlatformPriceList.splice(index, 1);
},
//添加平台价格
getChangePlat(subItem) {
var sObj = {
ItemId: 0,
ItemName: "",
ItemPrice: 0
};
if (!subItem.PlatformPriceList) {
subItem.PlatformPriceList = [];
}
if (this.changePlat) {
var choosePlat = this.platformList.find(qItem => {
return qItem.Id == this.changePlat;
});
if (choosePlat) {
sObj.ItemId = choosePlat.Id;
sObj.ItemName = choosePlat.Name;
}
}
var tempSObj = subItem.PlatformPriceList.find(qitem => {
return qitem.ItemId == sObj.ItemId
})
if (!tempSObj) {
subItem.PlatformPriceList.push(sObj);
} else {
this.Error("已存在【" + tempSObj.ItemName + "】,请重新选择!");
}
},
//获取团队类型
getTeamList() {
this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => {
......@@ -1206,6 +1283,12 @@
GuideNum: 0, //导游人数
IsNewArrival: 0, //是否新品
TeamId: 0, //团队分组编号
ExtPriceInfo: {
ExtId: 0,
TCID: 0,
PlatformPriceJson: "",
PlatformPriceList: [],
}, //团队基础扩展信息
};
}
this.returnPriceList.push(objItem);
......@@ -1822,7 +1905,17 @@
date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]);
return "日一二三四五六".charAt(date.getDay());
}
}
},
//获取平台
getOrderPlat() {
this.apipost("sellorder_get_GetSellClientSourceEnumList", {
typeId: "3"
}, res => {
if (res.data.resultCode == 1) {
this.platformList = res.data.data;
}
});
},
},
mounted() {
var dateObj = this.$calendarUtils.getCurrentDate();
......@@ -1831,6 +1924,7 @@
this.initCalendar();
this.getCompanyList();
this.getTeamList();
this.getOrderPlat();
},
watch: {
priceList: {
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice4.vue
View file @ fdde7687
......@@ -1285,7 +1285,13 @@
IsNeedAirportShuttle: 0, //是否需要接送服务
GuideNum: 0, //导游人数
IsNewArrival: 0, //是否新品
TeamId:0,//团队分组编号
TeamId: 0, //团队分组编号
ExtPriceInfo: {
ExtId: 0,
TCID: 0,
PlatformPriceJson: "",
PlatformPriceList: [],
}, //团队基础扩展信息
};
}
this.returnPriceList.push(objItem);
......
src/components/orderCommon/PriceDetail.vue
View file @ fdde7687
......@@ -212,7 +212,7 @@
}
return x1 + x2;
},
},
data() {
......@@ -301,13 +301,13 @@
if (childItem.OldPeopleNum > 0 && childItem.Unit_Price > 0) {
if (childItem.DiscountPrice > 0) {
String4 =
`+(${OrderPrice.Unit_Price} + ${OrderPrice.OldManChargePrice} - ${childItem.DiscountPrice}) * ${childItem.OldPeopleNum}`
`+(${childItem.Unit_Price} + ${OrderPrice.OldManChargePrice} - ${childItem.DiscountPrice}) * ${childItem.OldPeopleNum}`;
Price4 = (childItem.Unit_Price + OrderPrice.OldManChargePrice - childItem.DiscountPrice) * childItem
.OldPeopleNum
} else {
String4 = `+(${OrderPrice.Unit_Price} + ${OrderPrice.OldManChargePrice} ) * ${childItem.OldPeopleNum}`
String4 = `+(${childItem.Unit_Price} + ${OrderPrice.OldManChargePrice} ) * ${childItem.OldPeopleNum}`;
Price4 = (childItem.Unit_Price + OrderPrice.OldManChargePrice) * childItem.OldPeopleNum
}
Price4 = (OrderPrice.Unit_Price + OrderPrice.OldManChargePrice - childItem.DiscountPrice) * childItem
.OldPeopleNum
}
if (TotalPNum > 0 && OrderPrice.OtherPrice > 0) {
String5 = `+(${OrderPrice.OtherPrice } * ${TotalPNum})`
......@@ -318,7 +318,7 @@
Price6 = OrderPrice.VisaPrice * TotalPNum
}
if (((TotalPNum + childItem.BabyNum) != childItem.VisaNum) && OrderPrice.BackVisaPrice != 0) {
String7 = `+(${OrderPrice.BackVisaPrice } * (${TotalPNum} + ${childItem.BabyNum} - ${childItem.VisaNum}))`
String7 = `-(${OrderPrice.BackVisaPrice } * (${TotalPNum} + ${childItem.BabyNum} - ${childItem.VisaNum}))`
Price7 = OrderPrice.BackVisaPrice * (TotalPNum + childItem.BabyNum - childItem.VisaNum)
}
if (childItem.SingleRoomNum > 0 && OrderPrice.SingleRoomPrice > 0) {
......@@ -356,7 +356,8 @@
}
datas =
`${String1}${String2}${String3}${String4}${String5}${String6}${String7}${String8}${String9}${String10}${String11}${String12}${String13}`
Total = Price1 + Price2 + Price3 + Price4 + Price5 + Price6 + Price7 + Price8 + Price9 + Price10 + Price11 + Price12 - Price13
Total = Price1 + Price2 + Price3 + Price4 + Price5 + Price6 - Price7 + Price8 + Price9 + Price10 + Price11 +
Price12 - Price13
return {
datas,
Total
......
src/components/orderCommon/order-form2.vue
View file @ fdde7687
This diff is collapsed.
src/components/scenicSpot/scenicSpotSalesBoard.vue
View file @ fdde7687
......@@ -403,7 +403,6 @@
if (this.userInfo.RB_Group_id == 2) {
postMsg.QCountrys = "651";
}
console.log("getSecnicData", postMsg);
this.apipost(
"ticketcoupons_post_GetList", postMsg,
res => {
......
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