Skip to content

S
SuperMan
Commit 82b53ddc authored by 黄奎's avatar 黄奎
Browse files
Options

报价单和国内线酒店修改

parent cb92bf27
Expand all Show whitespace changes
Inline Side-by-side
Showing with 966 additions and 1146 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ 82b53ddc
......@@ -169,11 +169,12 @@
<template v-for="(item,index) in dataList">
<template v-for="(subItem,subIndex) in item.HotelOrderList">
<tr v-for="(childItem,childIndex) in subItem.OrderDetailsList" :key="`h_`+index+subIndex+childIndex">
<td v-if="childIndex==0&&subIndex==0" :rowspan="6*item.HotelOrderList.length">
<td v-if="childIndex==0&&subIndex==0"
:rowspan="subItem.OrderDetailsList.length*item.HotelOrderList.length">
{{item.UseTimeStr}}
</td>
<!-- 酒店名称 -->
<td v-if="childIndex==0" :rowspan="6">
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
<table class="hotelTable">
<tr>
<td colspan="2">
......@@ -223,21 +224,21 @@
</span>
</td>
<!-- 机位总数/(Y/E/F) -->
<td v-if="childIndex==0" :rowspan="6">
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
<p class="link" @click="goUrlT('RegistrationList',subItem.TCID,'报名清单')">
{{flightTotal}}/{{subItem.HouseStatistics.RealityYSeatNum}}/{{subItem.HouseStatistics.RealityESeatNum}}/{{subItem.HouseStatistics.RealityFSeatNum}}
</p>
</td>
<!-- 占床/不占床 -->
<td v-if="childIndex==0" :rowspan="6">
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
<p class="link" @click="goUrlT('passengerHouse',subItem.TCID,'房间分配')">
{{subItem.RealityHouseGuestNum}}/{{subItem.HouseStatistics.NoNeedBed}}</p>
</td>
<!-- 实际用房数 -->
<td v-if="childIndex==0" :rowspan="6">
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
{{subItem.RealityHouseTypeCount}}
</td>
<td v-if="childIndex==0" :rowspan="6">
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
<table class="hotelTable">
<tr>
<td width="70" style="text-align:center;" colspan="2">
......@@ -301,8 +302,8 @@
</td>
<!-- 房间类型 -->
<td>
{{subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeNameExt}}
<template v-if="childIndex==4">
{{getHouseTypeName(subItem,childItem).HouseTypeNameExt}}
<!-- <template v-if="childIndex==4">
<template v-if="subItem.DriverGuideIsRebate==1">
<br /><span style="color:green">{{$t('hotel.hotel_commission')}}</span>
</template>
......@@ -312,7 +313,7 @@
</template>
<template v-if="childIndex==5">
<br /><span style="color:red;">{{$t('ground.bufanyong')}}</span>
</template>
</template> -->
</td>
<!-- 房间数 -->
<td>
......@@ -367,7 +368,7 @@
{{childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)}}
</td>
<!-- 返佣类型 -->
<td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
<td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
<template v-if="subItem.RebateType==1">
<span style="color:green">{{$t('ground.hanshui')}}</span>
</template>
......@@ -415,11 +416,11 @@
</template>
</td>
<!-- 金额总计 -->
<td v-if="childIndex==0" :rowspan="6" style="white-space:nowrap;">
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length" style="white-space:nowrap;">
{{subItem.TotalPrice}}
</td>
<!-- 付款方式 -->
<td v-if="childIndex==0" :rowspan="6">
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
<table class="hotelTable">
<tr>
<td width="70" style="text-align:right;">{{$t('hotel.hotel_Currency')}}：</td>
......@@ -512,7 +513,7 @@
<el-option :label="$t('ground.lingduidydf')" :value='10'></el-option>
<el-option :label="$t('ground.shuaka')" :value='11'></el-option>
<el-option :label="$t('objFill.zhuanzhang')" :value='14'></el-option>
<el-option :label="$t('ground.enterpriseAlipay')"  :value='15'></el-option>
<el-option :label="$t('ground.enterpriseAlipay')" :value='15'></el-option>
</el-select>
</td>
</tr>
......@@ -591,7 +592,7 @@
</table>
</td>
<!-- 操作 -->
<td v-if="childIndex==0" :rowspan="6">
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
<template v-if="subItem.OPState==1">
<span class="Hotel_red">{{$t('salesModule.OPZD')}}</span>
</template>
......@@ -771,6 +772,18 @@
setHotelStock,
},
methods: {
getHouseTypeName(subItem, childItem) {
var obj = {};
if (subItem && subItem.HouseStatistics && subItem.HouseStatistics.HouseTypeList && subItem.HouseStatistics
.HouseTypeList.length > 0) {
subItem.HouseStatistics.HouseTypeList.forEach(hItem => {
if (hItem.HouseType == childItem.HouseType) {
obj = hItem;
}
})
}
return obj;
},
//订房状态切换
changeState(subItem) {
if (subItem.DMCState == 1) {
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 82b53ddc
......@@ -144,9 +144,9 @@
</td>
<td>
<template v-if="LineId==90">
<el-select v-model="subItem.BookStyle" :placeholder="$t('pub.pleaseSel')" class='w135 sel'>
<el-option :value="0" label="按人数预定"></el-option>
<el-option :value="1" label="按桌预定"></el-option>
<el-select v-model="subItem.BookStyle" :placeholder="$t('pub.pleaseSel')" class='sel' style="width:80px;">
<el-option :value="0" label="人数"></el-option>
<el-option :value="1" label="桌数"></el-option>
</el-select>
</template>
<template v-else>
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @ 82b53ddc
......@@ -48,6 +48,12 @@
padding: 0 5px;
}
.offer_select-tag {
background-color: #409eff !important;
color: white !important;
border-color: #409eff !important;
}
</style>
<template>
......@@ -114,12 +120,16 @@
<td width="80" class="txtRightCost">{{$t('hotel.hotel_StarDate')}}</td>
<td colspan="5">
<template v-if="postConfig.OutDateTimeList&&postConfig.OutDateTimeList.length>0">
<el-tag v-for="(item,oIndex) in postConfig.OutDateTimeList" :key="oIndex" style="margin-right:5px;">
{{item}}
<el-tag v-for="(item,oIndex) in postConfig.OutDateTimeList" :key="oIndex"
style="margin-right:5px;cursor:pointer;" @click="switchOffer(item)"
:class="item==selectDate?'offer_select-tag': ''">
<el-tooltip class="item" effect="dark" content="点击切换日期" placement="top-start">
<font> {{item}}</font>
</el-tooltip>
</el-tag>
</template>
<template v-else>
<el-tag style="margin-right:5px;">
<el-tag style="margin-right:5px;" :class="postConfig.OutDateTime==selectDate?'offer_select-tag': ''">
{{postConfig.OutDateTime}}
</el-tag>
</template>
......@@ -612,6 +622,11 @@
{{teamPrice.SingleDMCPrice}}
</el-form-item>
</td>
<td colspan="2">
<el-form-item :label="$t('salesModule.DJNum')">
{{offerDataObj.DMCNum}}
</el-form-item>
</td>
<td colspan="2">
<el-form-item :label="$t('Operation.Op_childNobed')">
{{teamPrice.ChildNoNeedPrice}}
......@@ -627,7 +642,7 @@
{{teamPrice.SingleRoomPrice}}
</el-form-item>
</td>
<td colspan="4">
<td colspan="2">
<el-form-item :label="$t('objFill.dandijjg')">
{{teamPrice.SingleDMCTCPrice}}
</el-form-item>
......@@ -1020,14 +1035,6 @@
{{postConfig.TeamTypeName}}
</template>
</td>
<!-- <td colspan="4">
<el-form-item :label="$t('objFill.v101.gengctleix')">
<el-select class="multiple_input" v-model="postConfig.TeamType">
<el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
</td> -->
</tr>
<!--报价单审核-->
<tr v-if="IsEdit==2">
......@@ -1057,21 +1064,16 @@
import changeOffer from '@/components/commonPage/changeOffer'
export default {
//IsEdit（1-查看，2-审核，3-OP变更，4-变更审核)
props: ["OfferArray", "postConfig", "IsEdit"],
props: ["postConfig", "IsEdit"],
data() {
return {
tabsActive: 0,
orderList: [],
//审核信息
AduitMsg: {
},
AduitMsg: {}, //审核信息
OtherPrice: {},
dayCostPrice: [],
CostCurrencyList: [],
CostNumberList: [],
teamPrice: {},
teamList: [], //团队类型
offerDataObj: {},
//报价单变更参数
changMsg: {
isShowChangeOffer: false,
......@@ -1081,15 +1083,53 @@
checkObj: {}
},
dialogDiningTitle: "行程变更",
selectDate: "", //当前选择时间
}
},
watch: {
postConfig: {
handler: function (val, oldVal) {
if (val != oldVal) {
this.switchOffer();
}
},
deep: true
},
IsEdit: {
handler: function (val, oldVal) {
if (val != oldVal) {
this.switchOffer();
}
},
deep: true
}
},
components: {
changeOffer: changeOffer,
},
methods: {
//获取变更原因
getChangeRemark() {
switchOffer(dateStr) {
if (dateStr) {
this.selectDate = dateStr;
} else {
if (this.postConfig.OfferArray && this.postConfig.OfferArray.length > 0) {
this.selectDate = this.postConfig.OfferArray[0].OutDateTime;
}
}
var that = this;
if (this.postConfig.OfferArray && this.postConfig.OfferArray.length > 0) {
var selectOfferObj = this.postConfig.OfferArray.find((qitem) => {
return qitem.OutDateTime == that.selectDate
})
if (selectOfferObj) {
this.OtherPrice = selectOfferObj.otherPrice;
this.teamPrice = selectOfferObj.teamPrice;
this.CostNumberList = selectOfferObj.CostNumberList;
this.offerDataObj = selectOfferObj;
this.dayCostPrice = selectOfferObj.dayCostPriceList;
this.CostCurrencyList = selectOfferObj.CostCurrencyList;
}
}
},
//关闭弹窗
closeDialog() {
......@@ -1121,8 +1161,8 @@
},
GetDayStr(dayNum) {
var str = "";
if (this.postConfig.OutDateTime && this.postConfig.OutDateTime != '') {
var dateFormat = new Date(this.postConfig.OutDateTime);
if (this.selectDate && this.selectDate != '') {
var dateFormat = new Date(this.selectDate);
dateFormat = dateFormat.setDate(dateFormat.getDate() + dayNum);
dateFormat = new Date(dateFormat);
let y = dateFormat.getFullYear()
......@@ -1132,34 +1172,6 @@
}
return str;
},
getTeamList() {
//出团公司
this.apipost(
"travel_GetTeamTypeEnumList", {},
res => {
if (res.data.resultCode == 1) {
this.teamList = res.data.data;
}
},
err => {}
);
},
selectTag(index) {
this.tabsActive = index
this.changeTabs()
},
changeTabs() {
this.currentData = this.orderList[this.tabsActive]
if (!this.currentData) {
return
}
this.OtherPrice = this.currentData.otherPrice;
this.dayCostPrice = this.currentData.dayCostPriceList;
this.CostCurrencyList = this.currentData.CostCurrencyList;
this.CostNumberList = this.currentData.CostNumberList;
this.queryMsg = this.currentData.queryMsg;
this.teamPrice = this.currentData.teamPrice;
},
//下载文件
downloadFile(fileUrl, fileName) {
const link = document.createElement('a');
......@@ -1176,6 +1188,7 @@
//每天小计
getDayXiaoJi(type, currencyType) {
var xiaoJi = 0;
if (this.dayCostPrice && this.dayCostPrice.length > 0) {
this.dayCostPrice.forEach(item => {
var currencyRate = 1;
if (currencyType == 2) {
......@@ -1199,7 +1212,6 @@
}
})
}
//xiaoJi += Number(item.ScenicCostPrice) * Number(currencyRate);
}
//早餐
if (type == 4) {
......@@ -1216,11 +1228,13 @@
xiaoJi += Number(item.OtherPrice) * Number(currencyRate);
}
});
}
return xiaoJi.toFixed(0);
},
//获取变更合计
getDayChangeXiaoJi(type, currencyType) {
var xiaoJi = 0;
if (this.dayCostPrice && this.dayCostPrice.length > 0) {
this.dayCostPrice.forEach(item => {
var currencyRate = 1;
if (currencyType == 2) {
......@@ -1262,6 +1276,7 @@
}
}
});
}
return xiaoJi.toFixed(0);
},
//其它成本价格
......@@ -1366,11 +1381,10 @@
}
},
mounted() {
this.orderList = this.OfferArray
this.changeTabs()
this.switchOffer();
},
created() {
this.getTeamList();
},
watch: {
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
View file @ 82b53ddc
......@@ -60,6 +60,13 @@
margin-bottom: 0 !important;
}
/* 在你的组件样式中 */
.CostNewPrice .custom-label-color .el-form-item__label {
color: #ff4949 !important;
font-weight: bold !important;
/* 修改为你需要的颜色 */
}
</style>
<template>
......@@ -389,6 +396,8 @@
<tr>
<td colspan="13">{{$t('objFill.qitacbrmb')}}</td>
</tr>
<template>
</template>
<tr>
<td colspan="2">
<el-form-item :label="$t('active.cl_jipiao')" label-position="right">
......@@ -420,7 +429,6 @@
@keyup.native="checkPrice(teamPrice,'UnionPrice'),getchange()"></el-input>
</el-form-item>
</td>
<td colspan="4" rowspan="2">
{{$t('objFill.xiaojijpzdsjly')}}:
<br /> {{getOtherCostMoney()}}
......@@ -476,16 +484,8 @@
</el-form-item>
</td>
<td colspan="2">
<el-form-item :label="$t('Operation.Op_childNobed')">
<el-input placeholder="" v-model="teamPrice.ChildNoNeedPrice"
@keyup.native="checkInteger(teamPrice,'ChildNoNeedPrice')" class="w70">
</el-input>
</el-form-item>
</td>
<td colspan="2">
<el-form-item :label="$t('Operation.Op_childBed')">
<el-input placeholder="" v-model="teamPrice.ChildNeedPrice"
@keyup.native="checkInteger(teamPrice,'ChildNeedPrice')" class="w70">
<el-form-item :label="$t('salesModule.DJNum')" class="custom-label-color">
<el-input placeholder="" v-model="offerDataObj.DMCNum" class="w150">
</el-input>
</el-form-item>
</td>
......@@ -496,13 +496,27 @@
</el-input>
</el-form-item>
</td>
<td colspan="4">
<td colspan="2">
<el-form-item :label="$t('objFill.dandijjg')">
<el-input placeholder="" v-model="teamPrice.SingleDMCTCPrice"
@keyup.native="checkPrice(teamPrice,'SingleDMCTCPrice')" class="w70">
</el-input>
</el-form-item>
</td>
<td colspan="2">
<el-form-item :label="$t('Operation.Op_childNobed')">
<el-input placeholder="" v-model="teamPrice.ChildNoNeedPrice"
@keyup.native="checkInteger(teamPrice,'ChildNoNeedPrice')" class="w70">
</el-input>
</el-form-item>
</td>
<td colspan="2">
<el-form-item :label="$t('Operation.Op_childBed')">
<el-input placeholder="" v-model="teamPrice.ChildNeedPrice"
@keyup.native="checkInteger(teamPrice,'ChildNeedPrice')" class="w70">
</el-input>
</el-form-item>
</td>
</tr>
<tr>
<td colspan="2">
......@@ -577,7 +591,6 @@
</td>
<td>
{{$t('objFill.tongyexsjg')}}
<br />
<!--台湾印象和日本印象-->
<template v-if="postConfig.OutBranchId==1218||postConfig.OutBranchId==1220">
......@@ -684,25 +697,40 @@
<travelDinner v-if="isShowDiningDig" :qMsg="qMsg" @chooseDinner="chooseDinner" @closeDinner="closeDialog"
:otherDinner="otherDinner" :breakFirstList="breakFirstList"></travelDinner>
</el-dialog>
</div>
</template>
<script>
import travelDinner from '@/components/commonPage/travelDinner'
export default {
props: ["postConfig", "AllCurrencyList"],
props: ["postConfig", "AllCurrencyList", "offerSelectDate"],
watch: {
postConfig: {
handler: function (val, oldVal) {
if (val != oldVal) {
this.getOfferItemObj(1);
}
},
deep: true
},
offerSelectDate: {
handler: function (val, oldVal) {
if (val != oldVal) {
this.getOfferItemObj(2);
}
},
deep: true
}
},
data() {
return {
dayCostPriceList: this.postConfig.OfferArray[0].dayCostPriceList,
otherPrice: this.postConfig.OfferArray[0].otherPrice,
teamPrice: this.postConfig.OfferArray[0].teamPrice,
CostNumberList: this.postConfig.OfferArray[0].CostNumberList,
dayCostPriceList: this.postConfig.dayCostPriceList,
otherPrice: {},
teamPrice: {},
CostNumberList: [],
CurrencyNumberListExt: this.postConfig.OfferArray[0].CurrencyNumberListExt,
CostCurrencyList: this.postConfig.OfferArray[0].CostCurrencyList,
offerDataObj: {},
//下拉框默认值
defaultSelect: 0,
//币种下拉
......@@ -745,6 +773,24 @@
travelDinner: travelDinner,
},
methods: {
//获取选中的日期
getOfferItemObj(type) {
var selectOfferObj = {};
if (this.postConfig && this.postConfig.OfferArray && this.postConfig.OfferArray.length > 0) {
selectOfferObj = this.postConfig.OfferArray.find((qitem) => {
return qitem.OutDateTime == this.offerSelectDate
})
}
if (selectOfferObj) {
this.otherPrice = selectOfferObj.otherPrice;
this.teamPrice = selectOfferObj.teamPrice;
this.CostNumberList = selectOfferObj.CostNumberList;
this.offerDataObj = selectOfferObj;
}
this.getchange()
this.getSubMoney();
return selectOfferObj;
},
changeTicket(subItem) {
if (subItem.TicketSourceList && subItem.TicketSourceList.length > 0) {
var changeObj = subItem.TicketSourceList.find(qitem => qitem.TicketId == subItem.TicketId);
......@@ -817,8 +863,8 @@
},
GetDayStr(dayNum) {
var str = "";
if (this.postConfig.OutDateTime && this.postConfig.OutDateTime != '') {
var dateFormat = new Date(this.postConfig.OutDateTime);
if (this.offerSelectDate && this.offerSelectDate != '') {
var dateFormat = new Date(this.offerSelectDate);
dateFormat = dateFormat.setDate(dateFormat.getDate() + dayNum);
dateFormat = new Date(dateFormat);
let y = dateFormat.getFullYear()
......@@ -843,7 +889,6 @@
this.initHotel(query, subItem)
} else {
subItem.HotelList = []
}
},
//景点搜索
......@@ -989,7 +1034,6 @@
}
})
}
//xiaoJi += Number(item.ScenicCostPrice) * Number(currencyRate);
}
//餐合计
if (type == 4) {
......@@ -1138,6 +1182,7 @@
},
//添加人数费用
addPeoNunber() {
var that = this;
var PeopleNumber = this.priceObj.priceNum;
if (PeopleNumber == "") {
this.Info(this.$t('objFill.v101.SalesModule.col2.t4'));
......@@ -1156,6 +1201,13 @@
var CostNumberObj = this.$tripUtils.CostNumber();
CostNumberObj.PeopleNumber = PeopleNumber;
this.CostNumberList.push(CostNumberObj);
if (this.postConfig && this.postConfig.OfferArray && this.postConfig.OfferArray.length > 0) {
this.postConfig.OfferArray.forEach(rItem => {
if (rItem.OutDateTime != this.offerSelectDate) {
rItem.CostNumberList = JSON.parse(JSON.stringify(that.CostNumberList))
}
})
}
this.CurrencyNumberListExt.forEach(x => {
var CurrencyNumberObj = this.$tripUtils.CurrencyNumber();
CurrencyNumberObj.CurrencyId = x.Key;
......@@ -1173,7 +1225,13 @@
},
//删除人数
DeletePNumber(index) {
var that = this;
this.CostNumberList.splice(index, 1);
if (this.postConfig && this.postConfig.OfferArray && this.postConfig.OfferArray.length > 0) {
this.postConfig.OfferArray.forEach(rItem => {
rItem.CostNumberList = JSON.parse(JSON.stringify(that.CostNumberList));
})
}
},
//人数排序
shortPeopleNumber() {
......@@ -1259,8 +1317,9 @@
tempPrice = Number(that.getLocalMoney(x.PeopleNumber));
});
}
if (this.teamPrice.SingleDMCPrice <= 0 || (type && type == 1)) {
this.teamPrice.SingleDMCPrice = tempPrice.toFixed(0);
if (this.teamPrice.SingleDMCPrice <= 0 || (type && type == 1)) {
//this.teamPrice.SingleDMCPrice = tempPrice.toFixed(0);
}
this.getSubMoney();
},
......@@ -1304,6 +1363,7 @@
created() {
this.getEmployeeList();
this.getConfigDinnerList();
this.getOfferItemObj(0);
}
};
......
src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue
View file @ 82b53ddc
......@@ -12,8 +12,7 @@
<template>
<div class="DirectQuotation clearfix" v-loading="loading">
<div class="singlePrice clearfix">
<CostNewPriceAudit v-if="haveData" ref="CostNewPrice" :postConfig="postData" :OfferArray="OfferArray"
:IsEdit="IsEdit"></CostNewPriceAudit>
<CostNewPriceAudit v-if="haveData" ref="CostNewPrice" :postConfig="postData" :IsEdit="IsEdit"></CostNewPriceAudit>
</div>
</div>
</template>
......@@ -23,9 +22,6 @@
data() {
return {
haveData: false,
OfferArray: [],
ConfigID: 0,
IsShow: false,
//基本配置
postData: {
ID: 0,
......@@ -87,8 +83,8 @@
OpAuditDate: "", //印尼团 OP审核时间
OpAuditContent: "", //印尼团OP审核备注
OpAuditStatus: "", //印尼团OP审核状态
OfferArray: [],
},
isSubmit: true,
loading: false,
IsEdit: 0,
};
......@@ -131,6 +127,7 @@
});
},
getPostData() {
this.haveData = false;
let BatchNum = "";
let offerid = 0;
if (this.$route.query.BatchNum) {
......@@ -145,10 +142,11 @@
};
this.loading = true;
this.apipost(
"travel_get_GetMyTravelInfo_V5",
"travel_get_PriceOfferInfo",
msg,
res => {
this.loading = false;
console.log("travel_get_PriceOfferInfo",res.data);
if (res.data.resultCode == 1) {
var tempData = res.data.data;
if (tempData.ID && tempData.ID > 0) {
......@@ -160,18 +158,7 @@
if (tempData.LineteamId && tempData.LineteamId > 0) {
this.postData.LineteamId = tempData.LineteamId;
}
if (tempData.CSeat && tempData.CSeat > 0) {
this.postData.CSeat = tempData.CSeat;
}
if (tempData.FSeat && tempData.FSeat > 0) {
this.postData.FSeat = tempData.FSeat;
}
if (tempData.YSeat && tempData.YSeat > 0) {
this.postData.YSeat = tempData.YSeat;
}
if (tempData.LowNum && tempData.LowNum > 0) {
this.postData.LowNum = tempData.LowNum;
}
if (tempData.Title && tempData.Title != '') {
this.postData.Title = tempData.Title;
}
......@@ -267,9 +254,8 @@
this.postData.PriceTeamTypeName = tempData.PriceTeamTypeName;
this.postData.PriceTeamType = tempData.PriceTeamType;
if (tempData.OfferArray) {
tempData.OfferArray.forEach(item => {
this.OfferArray.push(item)
})
this.postData.OfferArray = tempData.OfferArray;
}
this.haveData = true;
} else {
......
src/components/TravelManager/TravelNewQuotation/priceDialog.vue
View file @ 82b53ddc
......@@ -8,7 +8,7 @@
<div class="switchDiv clearfix" style="width:98%;">
<div class="DirectPriceCenter">
<div class="singlePrice clearfix" v-loading="loading">
<CostNewPriceAudit v-if="haveData" ref="CostNewPrice" :postConfig="postData" :OfferArray="OfferArray"
<CostNewPriceAudit v-if="haveData" ref="CostNewPrice" :postConfig="postData"
:IsEdit="0">
</CostNewPriceAudit>
</div>
......@@ -24,7 +24,6 @@
data() {
return {
haveData: false,
OfferArray: [],
//基本配置
postData: {
ID: 0,
......@@ -74,6 +73,7 @@
AssistantList: [], //助理OP
PriceTeamType: 0, //团队类型,
PriceTeamTypeName: "", //团队类型,
OfferArray: [],
},
loading: false
};
......@@ -91,7 +91,7 @@
this.haveData = false;
this.loading = true;
this.apipost(
"travel_get_GetMyTravelInfo_V4",
"travel_get_PriceOfferInfo",
msg,
res => {
this.loading = false;
......@@ -106,18 +106,7 @@
if (tempData.LineteamId && tempData.LineteamId > 0) {
this.postData.LineteamId = tempData.LineteamId;
}
if (tempData.CSeat && tempData.CSeat > 0) {
this.postData.CSeat = tempData.CSeat;
}
if (tempData.FSeat && tempData.FSeat > 0) {
this.postData.FSeat = tempData.FSeat;
}
if (tempData.YSeat && tempData.YSeat > 0) {
this.postData.YSeat = tempData.YSeat;
}
if (tempData.LowNum && tempData.LowNum > 0) {
this.postData.LowNum = tempData.LowNum;
}
if (tempData.Title && tempData.Title != '') {
this.postData.Title = tempData.Title;
}
......@@ -183,9 +172,7 @@
this.postData.PriceTeamTypeName = tempData.PriceTeamTypeName;
this.postData.PriceTeamType = tempData.PriceTeamType;
if (tempData.OfferArray) {
tempData.OfferArray.forEach(item => {
this.OfferArray.push(item)
})
this.postData.OfferArray = tempData.OfferArray;
}
this.haveData = true;
} else {
......
src/components/TravelManager/TravelNewQuotation/quotationEdit.vue
View file @ 82b53ddc
......@@ -195,13 +195,11 @@
<td width="80" class="txtRightCost">{{$t('hotel.hotel_choostDate')}}</td>
<td colspan="5">
<template v-if="postData.OutDateTimeList&&postData.OutDateTimeList.length>0">
<el-tooltip class="item" effect="dark" content="点击切换" placement="top">
<el-tag v-for="(item,oIndex) in postData.OutDateTimeList" :key="item" closable
style="margin-right:5px;cursor:pointer;" @close="handleClose(item,oIndex)"
:class="item==selectDate?'offer_select-tag': ''" @click="switchOffer(item)">
{{item}}
</el-tag>
</el-tooltip>
</template>
</td>
</tr>
......@@ -303,7 +301,10 @@
changeDate() {
var that = this;
if (this.postData.OutDateTimeList && this.postData.OutDateTimeList.length > 0) {
var rootObj = this.postData.OfferArray[0];
var rootObj = null;
if (this.postData.OfferArray && this.postData.OfferArray.length > 0) {
rootObj = this.postData.OfferArray[0]
}
this.postData.OutDateTimeList.forEach(subItem => {
var tempObj = that.getOfferObj();
tempObj.OutDateTime = subItem;
......@@ -312,12 +313,21 @@
})
//第一个报价在添加日期的
if (!existsObj) {
if (rootObj) {
tempObj = JSON.parse(JSON.stringify(rootObj));
}
tempObj.OutDateTime = subItem;
that.postData.OfferArray.push(tempObj);
}
this.switchOffer(tempObj.OutDateTime);
});
if (this.postData && this.postData.OfferArray && this.postData.OfferArray.length > 0) {
if (this.postData.BatchNum == '') {
that.switchOffer(this.postData.OfferArray[0].OutDateTime)
} else {
var lastItem = this.postData.OfferArray[this.postData.OfferArray.length - 1];
that.switchOffer(lastItem.OutDateTime)
}
}
}
},
//获取报价单对象
......@@ -418,9 +428,7 @@
this.apipost(
"travel_post_RemoveTravelOffer", postMsg,
res => {
if (res.data.resultCode == 1) {
}
if (res.data.resultCode == 1) {}
});
this.postData.OutDateTimeList.splice(index, 1);
} else {
......@@ -607,7 +615,6 @@
this.getPostData();
},
getPostData() {
this.haveData = false;
let offerId = 0;
if (this.$route.query.offerid) {
offerId = this.$route.query.offerid;
......@@ -677,9 +684,8 @@
this.postData.AssistantList.push(aItem.Id);
})
}
this.selectDate = tempData.OfferArray[0].OutDateTime;
this.switchOffer(tempData.OfferArray[0].OutDateTime);
}
this.haveData = true;
} else {
this.Error(res.data.message);
}
......
src/components/TravelManager/TravelNewQuotation/quotationEditDetails.vue
View file @ 82b53ddc
......@@ -422,7 +422,6 @@
@keyup.native="checkPrice(teamPrice,'UnionPrice'),getchange()"></el-input>
</el-form-item>
</td>
<td colspan="4" rowspan="2">
{{$t('objFill.xiaojijpzdsjly')}}:
<br /> {{getOtherCostMoney()}}
......@@ -512,7 +511,6 @@
</el-form-item>
</td>
</tr>
<tr>
<td colspan="2">
<el-form-item :label="$t('Operation.Op_zhu')+`OP`">
......@@ -770,19 +768,17 @@
methods: {
//获取选中的日期
getOfferItemObj(type) {
console.log("getOfferItemObj_" + type, this.postConfig);
var selectOfferObj = {};
if (this.postConfig && this.postConfig.OfferArray && this.postConfig.OfferArray.length > 0) {
selectOfferObj = this.postConfig.OfferArray.find((qitem) => {
return qitem.OutDateTime == this.offerSelectDate
})
}
console.log("selectOfferObj_" + type, selectOfferObj);
if (selectOfferObj) {
this.otherPrice = selectOfferObj.otherPrice;
this.teamPrice = selectOfferObj.teamPrice;
this.CostNumberList = selectOfferObj.CostNumberList;
this.offerDataObj=selectOfferObj;
this.offerDataObj = selectOfferObj;
}
return selectOfferObj;
},
......@@ -1177,6 +1173,7 @@
},
//添加人数费用
addPeoNunber() {
var that = this;
var PeopleNumber = this.priceObj.priceNum;
if (PeopleNumber == "") {
this.Info(this.$t('objFill.v101.SalesModule.col2.t4'));
......@@ -1195,7 +1192,13 @@
var CostNumberObj = this.$tripUtils.CostNumber();
CostNumberObj.PeopleNumber = PeopleNumber;
this.CostNumberList.push(CostNumberObj);
if (this.postConfig && this.postConfig.OfferArray && this.postConfig.OfferArray.length > 0) {
this.postConfig.OfferArray.forEach(rItem => {
if (rItem.OutDateTime != this.offerSelectDate) {
rItem.CostNumberList = JSON.parse(JSON.stringify(that.CostNumberList))
}
})
}
this.CurrencyNumberListExt.forEach(x => {
var CurrencyNumberObj = this.$tripUtils.CurrencyNumber();
CurrencyNumberObj.CurrencyId = x.Key;
......@@ -1213,7 +1216,13 @@
},
//删除人数
DeletePNumber(index) {
var that = this;
this.CostNumberList.splice(index, 1);
if (this.postConfig && this.postConfig.OfferArray && this.postConfig.OfferArray.length > 0) {
this.postConfig.OfferArray.forEach(rItem => {
rItem.CostNumberList = JSON.parse(JSON.stringify(that.CostNumberList));
})
}
},
//人数排序
shortPeopleNumber() {
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 82b53ddc
......@@ -348,12 +348,12 @@
</td>
<td>
<div class="fz16 fbold linkspan"
@click="goUrl([131,14, 90,118].includes(item.LineId) ? 'roomReservationsDetails' : 'roomReservationsDetailsNew',item,outItem,'订房详情')">
@click="goUrl([131,14,118].includes(item.LineId) ? 'roomReservationsDetails' : 'roomReservationsDetailsNew',item,outItem,'订房详情')">
<span style="color: #4BCA81;" v-if="item.HotelResult==1">√</span>
<span class="colorE95252" v-else>{{item.HotelResult=='-1'?"x":"O"}}</span>
</div>
<p
v-if="(item.LineId==14||item.LineId==118) && item.PriceHotelResult && item.PriceHotelResult.length>0">
v-if="(item.LineId==14||item.LineId==118||item.LineId==90) && item.PriceHotelResult && item.PriceHotelResult.length>0">
<el-popover width="1100" trigger="click" popper-class="DMC_HotelPop">
<commonHotelInfo :HotelObj="item.PriceHotelResult" :showHotelObj="showHotelObj" :TCID="item.TCID"
:DMCNum="item.DMCNum" :TCNUM="item.TCNUMS"
......
src/components/newTravelmanager/travelLineTrip/components/travelDaysHV.vue
View file @ 82b53ddc
......@@ -369,6 +369,8 @@
</div>
</div>
</div>
<div class="travelDaysHVdetails" :style="{'margin-top':(item.TitleObj.ShowTripType==2&&
(item.ScenicArray.length==1||item.ScenicArray.length==0))
||((item.TitleObj.ShowTripType==1||item.TitleObj.ShowTripType==0)&&
......
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