Skip to content

S
SuperMan
Commit cf57d685 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents 8ee419aa 5afe2f26
Show whitespace changes
Inline Side-by-side
Showing with 121 additions and 74 deletions
src/components/TravelManager/TravelList/OpTripList.vue
View file @ cf57d685
......@@ -22,9 +22,11 @@
<li>
<span>
<em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
<el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
<el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')"
@change="getLineTeamList()">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID" :key="item.LtID"></el-option>
<el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID"
:key="item.LtID"></el-option>
</el-select>
</span>
</li>
......@@ -57,6 +59,13 @@
</el-select>
</span>
</li>
<li>
<span>
<em>关键字</em>
<el-input maxlength="50" v-model="queryMsg.KeyWords" class="permiss-input w150"
:placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>{{$t('scen.sc_ftTime')}}</em>
......@@ -177,12 +186,13 @@
pageSize: 10,
LineId: 0,
LineteamId: 0,
PlaceID:0,
PlaceID: 0,
CreateBy: 0,
TeamType: 0,
TCNUMS: "",
StartGroupDate: "",
EndGroupDate: "",
KeyWords: "", //关键字
},
//当前登录人员信息
CurrentUserInfo: {},
......@@ -254,8 +264,7 @@
//获取线路列表
getLineList() {
this.apipost(
"line_post_GetList",
{
"line_post_GetList", {
LineDirection: 2
},
res => {
......@@ -404,7 +413,7 @@
vshowL: false,
vshowM: false,
vshowTCNUM: true,
isClick:1,//不计算点击
isClick: 1, //不计算点击
}
})
window.open(routeData.href, '_blank')
......
src/components/TravelManager/TravelList/SaleTripList.vue
View file @ cf57d685
......@@ -43,6 +43,13 @@
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>关键字</em>
<el-input maxlength="50" v-model="queryMsg.KeyWords" class="permiss-input w150"
:placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<button class="hollowFixedBtn" @click="getControlList(),resetPageIndex()">{{$t('pub.searchBtn')}}</button>
......@@ -144,7 +151,8 @@
LineteamId: 0,
CreateBy: 0,
TeamType: 1,
TCNUMS:""
TCNUMS:"",
KeyWords:"",//关键字
},
//当前用户id
CurrentUserId: 0,
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ cf57d685
......@@ -2333,7 +2333,8 @@
if (
this.CurrentUserInfo.RB_Branch_id == 0 ||
this.CurrentUserInfo.RB_Branch_id == 1216 ||
this.CurrentUserInfo.RB_Branch_id == 49
this.CurrentUserInfo.RB_Branch_id == 49||
this.CurrentUserInfo.RB_Branch_id== 1218
) {
this.IsModifyTravelControl = 1;
} else {
......
src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
View file @ cf57d685
......@@ -264,6 +264,14 @@
</el-form-item>
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
<el-select v-model='subItem.ContainDinnerType' class="w100" placeholder="含餐类型"
@change="DinnerTypeChange(subItem)">
<el-option label="含餐类型" :value='0'></el-option>
<el-option label="含早餐" :value='1'></el-option>
<el-option label="含晚餐" :value='2'></el-option>
<el-option label="含早晚餐" :value='3'></el-option>
</el-select>
<br />
<el-input type='text' v-model="subItem.HotelCostPrice" class="w70"
@keyup.native="checkPrice(subItem,'HotelCostPrice')"></el-input>
</td>
......@@ -283,7 +291,9 @@
@keyup.native="checkPrice(subItem,'ScenicCostPrice'),getchange()"></el-input>
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
<el-input type="text" v-model='subItem.BreakfastCostPrice' class="w70"
<el-input type="text"
:disabled="(subItem.ContainDinnerType==1||subItem.ContainDinnerType==3)?true:false"
v-model='subItem.BreakfastCostPrice' class="w70"
@keyup.native="checkPrice(subItem,'BreakfastCostPrice'),getchange()">
</el-input>
</td>
......@@ -292,7 +302,9 @@
@keyup.native="checkPrice(subItem,'LunchCostPrice'),getchange()"></el-input>
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
<el-input type="text" v-model='subItem.DinnerCostPrice' class="w70"
<el-input type="text"
:disabled="(subItem.ContainDinnerType==2||subItem.ContainDinnerType==3)?true:false"
v-model='subItem.DinnerCostPrice' class="w70"
@keyup.native="checkPrice(subItem,'DinnerCostPrice'),getchange()"></el-input>
</td>
</tr>
......@@ -383,6 +395,14 @@
</el-form-item>
</td>
<td>
<el-select v-model='subItem.ContainDinnerType' class="w100" placeholder="含餐类型"
@change="DinnerTypeChange(subItem)">
<el-option label="含餐类型" :value='0'></el-option>
<el-option label="含早餐" :value='1'></el-option>
<el-option label="含晚餐" :value='2'></el-option>
<el-option label="含早晚餐" :value='3'></el-option>
</el-select>
<br />
<el-input type='text' v-model="subItem.HotelCostPrice" class="w70"
@keyup.native="checkPrice(subItem,'HotelCostPrice')"></el-input>
</td>
......@@ -406,7 +426,9 @@
@keyup.native="checkPrice(subItem,'ScenicCostPrice'),getchange()"></el-input>
</td>
<td>
<el-input type="text" v-model='subItem.BreakfastCostPrice' class="w70"
<el-input type="text"
:disabled="(subItem.ContainDinnerType==1||subItem.ContainDinnerType==3)?true:false"
v-model='subItem.BreakfastCostPrice' class="w70"
@keyup.native="checkPrice(subItem,'BreakfastCostPrice'),getchange()">
</el-input>
</td>
......@@ -415,7 +437,9 @@
@keyup.native="checkPrice(subItem,'LunchCostPrice'),getchange()"></el-input>
</td>
<td>
<el-input type="text" v-model='subItem.DinnerCostPrice' class="w70"
<el-input type="text"
:disabled="(subItem.ContainDinnerType==2||subItem.ContainDinnerType==3)?true:false"
v-model='subItem.DinnerCostPrice' class="w70"
@keyup.native="checkPrice(subItem,'DinnerCostPrice'),getchange()"></el-input>
</td>
</tr>
......@@ -751,7 +775,11 @@
<td colspan="12"></td>
</tr>
<tr>
<td colspan="12" class="CP_ComTitle2">领队分摊部分</td>
<td colspan="12" class="CP_ComTitle2">领队分摊部分
<span style="color:red;padding-left:5px;">
领队导游分摊，请直接输入人民币
</span>
</td>
</tr>
<tr>
<td class="CP_ComTitle2 CostcomCenter">人数</td>
......@@ -938,6 +966,23 @@
}
},
methods: {
//含餐类型切换
DinnerTypeChange(subItem) {
switch (subItem.ContainDinnerType) {
//含早餐
case 1:
subItem.BreakfastCostPrice = 0;
break;
//含晚餐
case 2:
subItem.DinnerCostPrice = 0;
break;
case 3:
subItem.BreakfastCostPrice = 0;
subItem.DinnerCostPrice = 0;
break;
}
},
//交通部分小计
trafficXiaoJi(currencyType) {
var trafficTotal = 0;
......@@ -1174,6 +1219,7 @@
BreakfastCostPrice: 0, //早餐报价
LunchCostPrice: 0, //午餐报价
DinnerCostPrice: 0, //晚餐报价
ContainDinnerType: 0, //含餐类型(1-含早餐,2-含晚餐,3-含早晚)
};
this.dayCostPrice.push(dayItem);
}
......@@ -1189,7 +1235,6 @@
getCurrencyNumberList(CurrencyId) {
let currencyNumberList = [];
let flag = false;
this.CurrencyNumberListExt.forEach(item => {
if (!flag && item.Key == CurrencyId) {
flag = true;
......@@ -1293,7 +1338,6 @@
DeletePNumber(index) {
this.CostNumberList.splice(index, 1);
},
//人数排序
shortPeopleNumber() {
this.CurrencyNumberListExt.forEach(x => {
......@@ -1309,7 +1353,7 @@
getRate(ID) {
this.currencyTypeArr.forEach(x => {
if (x.ID == ID) {
this.queryMsg.RateInput = x.Rate;
this.queryMsg.RateInput = x.CurrentRate;
}
});
},
......@@ -1365,21 +1409,6 @@
totalMoney = Number(this.getDayXiaoJi(1, 2)) + Number(this.getDayXiaoJi(2, 2)) / Number(PeopleNumber) +
Number(this.getDayXiaoJi(3, 2)) + Number(this.getDayXiaoJi(4, 2)) + Number(this.getDayXiaoJi(5, 2)) +
Number(this.getDayXiaoJi(6, 2));
// this.dayCostPrice.forEach(x => {
// let subTotalMoney = 0.0;
// subTotalMoney =
// (this.getConvertMoney(x.HotelCostPrice) +
// this.getConvertMoney(x.ScenicCostPrice) +
// this.getConvertMoney(x.BreakfastCostPrice) +
// this.getConvertMoney(x.LunchCostPrice) +
// this.getConvertMoney(x.DinnerCostPrice)) *
// this.getCurrencyMoney(x.CurrencyId)
// +(this.getConvertMoney(x.BusCostPrice)*this.getCurrencyMoney(x.CurrencyId)/PeopleNumber)
// ;
// totalMoney += subTotalMoney;
// });
console.log("totalMoney", totalMoney.toFixed(0))
return totalMoney.toFixed(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