Skip to content

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

页面修改

parent 84101e6e
Hide whitespace changes
Inline Side-by-side
Showing with 384 additions and 149 deletions
src/components/TravelManager/TravelNewQuotation/QuotationPrice_SWT.vue
View file @ dfd09728
...@@ -356,6 +356,26 @@ ...@@ -356,6 +356,26 @@
<td colspan="2"> <td colspan="2">
</td> </td>
</tr> </tr>
<tr>
<td colspan="3" class="ComTitle">
建議售價
</td>
<td>
<el-input v-model="postData.SalePrice" @keyup.native="checkPrice(postData,'SalePrice')" placeholder="建議售價"
maxlength="10" class="w180"></el-input>
</td>
<td class="ComTitle">
單房差
</td>
<td colspan="2">
<el-input v-model="postData.SingleRoomPrice" @keyup.native="checkPrice(postData,'SingleRoomPrice')"
placeholder="單房差" maxlength="10" class="w180"></el-input>
</td>
<td class="ComTitle">
</td>
<td colspan="2">
</td>
</tr>
</tbody> </tbody>
<tbody> <tbody>
<tr> <tr>
...@@ -643,7 +663,7 @@ ...@@ -643,7 +663,7 @@
</td> </td>
</tr> </tr>
<template v-for="(subItem,subIndex) in postData.SWTTicketList"> <template v-for="(subItem,subIndex) in postData.SWTTicketList">
<tr v-for="(childItem,childIndex) in subItem.SubTicketList"> <tr v-for="(childItem,childIndex) in subItem.SubTicketList" :key="subIndex*10+childIndex*1">
<td v-if="childIndex==0" :rowspan="subItem.SubTicketList.length" colspan="2"> <td v-if="childIndex==0" :rowspan="subItem.SubTicketList.length" colspan="2">
D{{subItem.DayNum}} D{{subItem.DayNum}}
</td> </td>
...@@ -762,7 +782,7 @@ ...@@ -762,7 +782,7 @@
</td> </td>
</tr> </tr>
<template v-for="(subItem,subIndex) in postData.SWTBusList"> <template v-for="(subItem,subIndex) in postData.SWTBusList">
<tr v-for="(childItem,childIndex) in subItem.SubBusList"> <tr v-for="(childItem,childIndex) in subItem.SubBusList" :key="subIndex*100+childIndex*1">
<td v-if="childIndex==0" :rowspan="subItem.SubBusList.length" colspan="2"> <td v-if="childIndex==0" :rowspan="subItem.SubBusList.length" colspan="2">
D{{subItem.DayNum}} D{{subItem.DayNum}}
</td> </td>
...@@ -788,7 +808,7 @@ ...@@ -788,7 +808,7 @@
</td> </td>
<td> <td>
<el-input v-model="childItem.VNDPrice" maxlength="10" <el-input v-model="childItem.VNDPrice" maxlength="10"
@keyup.native="checkPrice(childItem,'VNDPrice'),CalcFeeTotal()" placeholder="越盾" class="w150"> @keyup.native="checkPrice(childItem,'VNDPrice'),CalcFeeTotal()" placeholder="車資" class="w150">
</el-input> </el-input>
</td> </td>
<td> <td>
...@@ -797,13 +817,58 @@ ...@@ -797,13 +817,58 @@
</td> </td>
<td> <td>
<el-input v-model="childItem.Price" @keyup.native="checkPrice(childItem,'Price'),CalcFeeTotal()" <el-input v-model="childItem.Price" @keyup.native="checkPrice(childItem,'Price'),CalcFeeTotal()"
placeholder="次/N數" maxlength="10" class="w150"></el-input> placeholder="單價" maxlength="10" class="w150"></el-input>
</td>
<td>
{{childItem.PriceSubTotal}}
</td>
<td>
{{childItem.VNDSubTotal}}
</td>
</tr>
</template>
<template v-for="(subItem,subIndex) in postData.SWTBusOtherList">
<tr v-for="(childItem,childIndex) in subItem.SubBusList" :key="subIndex*1000+(childIndex+1)*1">
<td colspan="2">
</td> </td>
<td colspan="2"> <td colspan="2">
<el-select v-model="childItem.BusConfigId" class='w200' filterable :placeholder="$t('pub.pleaseSel')"
@visible-change="GetBusConfigList($event,subItem,childItem)"
@change="GetBusItem(childItem),CalcFeeTotal()">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="(qitem,qindex) in childItem.BusList" :value="qitem.Id" :label="qitem.Trip"
:key="qindex"></el-option>
</el-select>
</td>
<td>
<el-input v-model="childItem.Kilometre" maxlength="10"
@keyup.native="checkInteger(childItem,'Kilometre'),CalcFeeTotal()" placeholder="公里數" class="w150">
</el-input>
</td>
<td>
<el-input v-model="childItem.VNDPrice" maxlength="10"
@keyup.native="checkPrice(childItem,'VNDPrice'),CalcFeeTotal()" placeholder="車資" class="w150">
</el-input>
</td>
<td>
<el-input v-model="childItem.Times" @keyup.native="checkInteger(childItem,'Times'),CalcFeeTotal()"
placeholder="次/N數" maxlength="10" class="w150"></el-input>
</td>
<td>
<el-input v-model="childItem.Price" @keyup.native="checkPrice(childItem,'Price'),CalcFeeTotal()"
placeholder="單價" maxlength="10" class="w150"></el-input>
</td>
<td>
{{childItem.PriceSubTotal}}
</td>
<td>
{{childItem.VNDSubTotal}} {{childItem.VNDSubTotal}}
</td> </td>
</tr> </tr>
</template> </template>
</tbody> </tbody>
<tbody title="车资合计"> <tbody title="车资合计">
<tr> <tr>
...@@ -815,12 +880,16 @@ ...@@ -815,12 +880,16 @@
{{BusSum.TotalKM}} {{BusSum.TotalKM}}
</td> </td>
<td> <td>
{{BusSum.TotalVNDPrice}}
</td> </td>
<td> <td>
</td> </td>
<td> <td>
</td> </td>
<td colspan="2"> <td>
{{BusSum.PriceSum}}
</td>
<td>
{{BusSum.VNDTotalSum}} {{BusSum.VNDTotalSum}}
</td> </td>
</tr> </tr>
...@@ -1028,7 +1097,10 @@ ...@@ -1028,7 +1097,10 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="ComTitle tdCenter" colspan="4"> <td class="ComTitle tdCenter" colspan="2">
料目
</td>
<td class="ComTitle tdCenter" colspan="2">
名称 名称
</td> </td>
<td class="ComTitle tdCenter"> <td class="ComTitle tdCenter">
...@@ -1048,8 +1120,12 @@ ...@@ -1048,8 +1120,12 @@
</td> </td>
</tr> </tr>
<template v-for="(childItem,childIndex) in postData.SWTSelfFeeList"> <template v-for="(childItem,childIndex) in postData.SWTSelfFeeList">
<tr :key="childIndex"> <tr :key="childIndex">
<td colspan="4"> <td colspan="2">
{{childItem.BaoJiaTypeName}}
</td>
<td colspan="2">
<a class="link" @click="DeleteBaoJiaConfigItem(2,childIndex)">删除</a> <a class="link" @click="DeleteBaoJiaConfigItem(2,childIndex)">删除</a>
<el-select v-model="childItem.BaoJiaConfigId" class='w220' filterable :placeholder="$t('pub.pleaseSel')" <el-select v-model="childItem.BaoJiaConfigId" class='w220' filterable :placeholder="$t('pub.pleaseSel')"
@change="GetConfigItem(childItem,2),CalcFeeTotal()"> @change="GetConfigItem(childItem,2),CalcFeeTotal()">
...@@ -1305,12 +1381,12 @@ ...@@ -1305,12 +1381,12 @@
<td> <td>
</td> </td>
<td> <td>
{{(BusSum.VNDTotalSum/getPeopleNum.totalNum).toFixed(2)}} {{ (( Number(BusSum.VNDTotalSum)+Number(BusSum.PriceSum)) /getPeopleNum.totalNum).toFixed(2)}}
</td> </td>
<td> <td>
</td> </td>
<td> <td>
{{BusSum.VNDTotalSum}} {{(Number(BusSum.VNDTotalSum)+Number(BusSum.PriceSum)).toFixed(2)}}
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -1413,6 +1489,9 @@ ...@@ -1413,6 +1489,9 @@
SWTSelfFeeList: [], //自费明细 SWTSelfFeeList: [], //自费明细
SWTTipFeeList: [], //小费明细 SWTTipFeeList: [], //小费明细
AuditStatus: -1, //审核状态 AuditStatus: -1, //审核状态
SalePrice: 0, //建议售价
SingleRoomPrice: 0, //单房差
SWTBusOtherList: [], //车资其它JSON列表
}, },
BusTypeList: [], //车辆类型 BusTypeList: [], //车辆类型
//酒店统计 //酒店统计
...@@ -1438,8 +1517,10 @@ ...@@ -1438,8 +1517,10 @@
}, },
//车资统计 //车资统计
BusSum: { BusSum: {
TotalKM: 0, //美金单价统计 TotalKM: 0, //公里数合计
VNDTotalSum: 0, //越盾合计 TotalVNDPrice: 0, //车资合计
PriceSum: 0, //车资合计
VNDTotalSum: 0, //公里合计
}, },
ZaZhiList: [], //杂支列表 ZaZhiList: [], //杂支列表
ShipList: [], //船列表 ShipList: [], //船列表
...@@ -1501,7 +1582,7 @@ ...@@ -1501,7 +1582,7 @@
total_vnd_price = Number(this.HotelSum.VNDTotalSum) + Number(this.DinnerSum.VNDTotalSum) + Number(this.TicketSum total_vnd_price = Number(this.HotelSum.VNDTotalSum) + Number(this.DinnerSum.VNDTotalSum) + Number(this.TicketSum
.VNDTotalSum) + .VNDTotalSum) +
Number(this.ZaZhiSum.VNDTotalSum) + Number(this.ShipSum.USTotalSum) + Number(this.SelfFeeSum.USTotalSum) + Number(this.ZaZhiSum.VNDTotalSum) + Number(this.ShipSum.USTotalSum) + Number(this.SelfFeeSum.USTotalSum) +
Number(this.BusSum.VNDTotalSum); Number(this.BusSum.VNDTotalSum) + Number(this.BusSum.PriceSum);
return { return {
single_us_price: single_us_price.toFixed(2), single_us_price: single_us_price.toFixed(2),
single_vnd_price: single_vnd_price.toFixed(2), single_vnd_price: single_vnd_price.toFixed(2),
...@@ -1590,6 +1671,8 @@ ...@@ -1590,6 +1671,8 @@
this.postData.OutTeamName = jsonData.OutTeamName; this.postData.OutTeamName = jsonData.OutTeamName;
this.postData.AGTTeamName = jsonData.AGTTeamName; this.postData.AGTTeamName = jsonData.AGTTeamName;
this.postData.SURCHARGE = jsonData.SURCHARGE; this.postData.SURCHARGE = jsonData.SURCHARGE;
this.postData.SingleRoomPrice = jsonData.SingleRoomPrice;
this.postData.SalePrice = jsonData.SalePrice;
//航班信息 //航班信息
if (jsonData.SWTFlightList) { if (jsonData.SWTFlightList) {
this.postData.SWTFlightList = jsonData.SWTFlightList; this.postData.SWTFlightList = jsonData.SWTFlightList;
...@@ -1667,6 +1750,18 @@ ...@@ -1667,6 +1750,18 @@
tempJson.FOCNum = this.getPeopleNum.focNum; tempJson.FOCNum = this.getPeopleNum.focNum;
this.postData.SWTTipFeeList.push(this.GetBaoJiaConfigItemJson()); this.postData.SWTTipFeeList.push(this.GetBaoJiaConfigItemJson());
} }
//车资其他项
if (jsonData.SWTBusOtherList) {
this.postData.SWTBusOtherList = jsonData.SWTBusOtherList;
} else {
//车资其它
var busOtherItem = {
DayNum: 0,
SubBusList: []
};
busOtherItem.SubBusList.push(this.getBusJson());
this.postData.SWTBusOtherList.push(busOtherItem);
}
//计算费用合计 //计算费用合计
this.CalcFeeTotal(); this.CalcFeeTotal();
} }
...@@ -2088,10 +2183,13 @@ ...@@ -2088,10 +2183,13 @@
this.TicketSum.VNDTotalSum = totalVNDPrice.toFixed(2); this.TicketSum.VNDTotalSum = totalVNDPrice.toFixed(2);
} }
var subKMs = 0;
var totalVNDsum = 0;
var busPriceSum = 0;
var busVNDTotalSum = 0;
//车资计算 //车资计算
if (this.postData.SWTBusList && this.postData.SWTBusList.length > 0) { if (this.postData.SWTBusList && this.postData.SWTBusList.length > 0) {
var subKMs = 0;
var totalVNDPrice = 0;
this.postData.SWTBusList.forEach(rootItem => { this.postData.SWTBusList.forEach(rootItem => {
rootItem.SubBusList.forEach(item => { rootItem.SubBusList.forEach(item => {
var c_Kilometre = 0; var c_Kilometre = 0;
...@@ -2107,15 +2205,56 @@ ...@@ -2107,15 +2205,56 @@
if (item.Price) { if (item.Price) {
c_price = item.Price; c_price = item.Price;
} }
var c_vndprice = 0;
if (item.VNDPrice) {
c_vndprice = item.VNDPrice;
}
totalVNDsum += c_vndprice;
busPriceSum += c_vndprice;
item.PriceSubTotal = c_vndprice;
item.VNDSubTotal = (parseFloat(c_Kilometre) * parseFloat(c_times) * parseFloat(c_price)) item.VNDSubTotal = (parseFloat(c_Kilometre) * parseFloat(c_times) * parseFloat(c_price))
.toFixed(2); .toFixed(2);
totalVNDPrice += parseFloat(item.VNDSubTotal); busVNDTotalSum += parseFloat(item.VNDSubTotal);
}) })
}); });
this.BusSum.TotalKM = subKMs.toFixed(2);
this.BusSum.VNDTotalSum = totalVNDPrice.toFixed(2);
} }
//车资其他项计算
if (this.postData.SWTBusOtherList && this.postData.SWTBusOtherList.length > 0) {
this.postData.SWTBusOtherList.forEach(rootItem => {
rootItem.SubBusList.forEach(item => {
var c_Kilometre = 0;
if (item.Kilometre) {
c_Kilometre = item.Kilometre
}
subKMs += Number(c_Kilometre)
var c_times = 0;
if (item.Times) {
c_times = item.Times;
}
var c_price = 0;
if (item.Price) {
c_price = item.Price;
}
var c_vndprice = 0;
if (item.VNDPrice) {
c_vndprice = item.VNDPrice;
}
totalVNDsum += c_vndprice;
busPriceSum += c_vndprice;
item.PriceSubTotal = c_vndprice;
item.VNDSubTotal = (parseFloat(c_Kilometre) * parseFloat(c_times) * parseFloat(c_price))
.toFixed(2);
busVNDTotalSum += parseFloat(item.VNDSubTotal);
})
});
}
this.BusSum.TotalKM = subKMs.toFixed(2);
this.BusSum.TotalVNDPrice = totalVNDsum.toFixed(2);
this.BusSum.PriceSum = busPriceSum.toFixed(2);
this.BusSum.VNDTotalSum = busVNDTotalSum.toFixed(2);
//船 //船
if (this.postData.SWTShipList && this.postData.SWTShipList.length > 0) { if (this.postData.SWTShipList && this.postData.SWTShipList.length > 0) {
var subUSPrice = 0; var subUSPrice = 0;
...@@ -2390,6 +2529,8 @@ ...@@ -2390,6 +2529,8 @@
//报价费用配置 //报价费用配置
GetBaoJiaConfigItemJson() { GetBaoJiaConfigItemJson() {
var obj = { var obj = {
CType: 0, //报价费用类型Id
BaoJiaTypeName: "", //费用类型名称
BaoJiaConfigId: 0, //费用配置编号 BaoJiaConfigId: 0, //费用配置编号
BaoJiaConfigName: '', //费用配置名称 BaoJiaConfigName: '', //费用配置名称
USPrice: 0, //美元 USPrice: 0, //美元
...@@ -2462,6 +2603,16 @@ ...@@ -2462,6 +2603,16 @@
return item.Id === currentItem.BaoJiaConfigId; return item.Id === currentItem.BaoJiaConfigId;
}); });
break; break;
case 5: //自费SHOPPING
obj = this.SelfFeeList.find(item => {
return item.Id === currentItem.BaoJiaConfigId;
});
break;
case 6: //自费車購
obj = this.SelfFeeList.find(item => {
return item.Id === currentItem.BaoJiaConfigId;
});
break;
case 3: //小费 case 3: //小费
obj = this.TipFeeList.find(item => { obj = this.TipFeeList.find(item => {
return item.Id === currentItem.BaoJiaConfigId; return item.Id === currentItem.BaoJiaConfigId;
...@@ -2472,6 +2623,8 @@ ...@@ -2472,6 +2623,8 @@
currentItem.VNDPrice = obj.VNDPrice; currentItem.VNDPrice = obj.VNDPrice;
currentItem.USPrice = obj.USPrice; currentItem.USPrice = obj.USPrice;
currentItem.BaoJiaConfigName = obj.CName; currentItem.BaoJiaConfigName = obj.CName;
currentItem.BaoJiaTypeName = obj.CTypeStr
currentItem.CType = obj.CType;
} }
} }
}, },
...@@ -2502,8 +2655,10 @@ ...@@ -2502,8 +2655,10 @@
TotalNum: this.getPeopleNum.totalNum, //总人数 TotalNum: this.getPeopleNum.totalNum, //总人数
Times: 1, //次数 Times: 1, //次数
Price: 0, //单价 Price: 0, //单价
VNDSubTotal: 0, //越南盾小计 PriceSubTotal: 0, //车资小计
VNDSubTotal: 0, //公里数小计
BusList: [], //车下拉列表[前台使用] BusList: [], //车下拉列表[前台使用]
CalcFeeType: 0, //计费方式(1-公里计价,2-总车资计价)
} }
return obj; return obj;
}, },
...@@ -2526,7 +2681,18 @@ ...@@ -2526,7 +2681,18 @@
} }
this.apipost("buspriceconfig_post_GetBusPriceConfigListService", qmsg, res => { this.apipost("buspriceconfig_post_GetBusPriceConfigListService", qmsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
subitem.BusList = res.data.data; var tempArray = res.data.data;
if (tempArray && tempArray.length > 0) {
tempArray.forEach(sItem => {
if (sItem.CalcFeeType == 1) {
sItem.Trip = sItem.Trip + "【公里计价】"
}
if (sItem.CalcFeeType == 2) {
sItem.Trip = sItem.Trip + "【车资计价】"
}
})
subitem.BusList = tempArray;
}
} }
}); });
} }
...@@ -2544,16 +2710,23 @@ ...@@ -2544,16 +2710,23 @@
currentItem.VNDPrice = 0; currentItem.VNDPrice = 0;
currentItem.Price = 0; currentItem.Price = 0;
currentItem.Kilometre = 0; currentItem.Kilometre = 0;
if (obj.KMPrice) {
currentItem.KMPrice = obj.KMPrice;
}
if (obj.AllDayPrice) {
currentItem.Price = obj.AllDayPrice;
}
if (obj.Kilometre) {
currentItem.Kilometre = obj.Kilometre;
}
currentItem.Trip = obj.Trip; currentItem.Trip = obj.Trip;
currentItem.CalcFeeType = obj.CalcFeeType;
switch (obj.CalcFeeType) {
//公里计费
case 1:
if (obj.KMPrice) {
currentItem.Price = obj.KMPrice;
}
if (obj.Kilometre) {
currentItem.Kilometre = obj.Kilometre;
}
break;
//车资计费
case 2:
currentItem.VNDPrice = obj.VNDPrice;
break;
}
} }
} }
}, },
...@@ -2642,8 +2815,12 @@ ...@@ -2642,8 +2815,12 @@
this.ZaZhiList = item.SubList; this.ZaZhiList = item.SubList;
} }
//自费 //自费
if (item.CType == 2) { if (item.CType == 2 || item.CType == 5 || item.CType == 6) {
this.SelfFeeList = item.SubList; if (item.SubList && item.SubList.length > 0) {
item.SubList.forEach(childItem => {
this.SelfFeeList.push(childItem);
})
}
} }
//小费 //小费
if (item.CType == 3) { if (item.CType == 3) {
......
src/components/TravelManager/TravelNewQuotation/newQuotation_SWT.vue
View file @ dfd09728
...@@ -13,11 +13,13 @@ ...@@ -13,11 +13,13 @@
line-height: 15px; line-height: 15px;
color: white; color: white;
border: 1px solid #e95252; border: 1px solid #e95252;
cursor: pointer;
} }
.BilldownLoadCommon input[type="checkbox"]:checked+label::before { .BilldownLoadCommon input[type="checkbox"]:checked+label::before {
content: "\2713"; content: "\2713";
background-color: #e95252; background-color: #e95252;
cursor: pointer;
} }
.BilldownLoadCommon input[type="checkbox"] { .BilldownLoadCommon input[type="checkbox"] {
...@@ -27,12 +29,14 @@ ...@@ -27,12 +29,14 @@
.BilldownLoadCommon input[type="checkbox"]:focus+label::before { .BilldownLoadCommon input[type="checkbox"]:focus+label::before {
box-shadow: none; box-shadow: none;
cursor: pointer;
} }
.BilldownLoadCommon input[type="checkbox"]:disabled+label::before { .BilldownLoadCommon input[type="checkbox"]:disabled+label::before {
background-color: gray; background-color: gray;
box-shadow: none; box-shadow: none;
color: #555; color: #555;
cursor: pointer;
} }
.BilldownLoadCommon table td { .BilldownLoadCommon table td {
...@@ -59,8 +63,9 @@ ...@@ -59,8 +63,9 @@
text-align: center; text-align: center;
font-size: 14px; font-size: 14px;
} }
.wstRedType{
color:red; .wstRedType {
color: red;
cursor: pointer; cursor: pointer;
} }
...@@ -156,7 +161,8 @@ ...@@ -156,7 +161,8 @@
</template> </template>
</div> </div>
<span slot="reference"><span class="teamName"></span> <span slot="reference"><span class="teamName"></span>
审核状态: <span style="cursor:pointer" :class="{'wstRedType':item.AuditStatus==2}" title="点击查看">{{item.AuditStatusStr}}</span> 审核状态: <span style="cursor:pointer" :class="{'wstRedType':item.AuditStatus==2}"
title="点击查看">{{item.AuditStatusStr}}</span>
</span> </span>
</el-popover> </el-popover>
</div> </div>
...@@ -172,19 +178,17 @@ ...@@ -172,19 +178,17 @@
</div> </div>
<div style="width:134px;"> <div style="width:134px;">
<span class="bianji newAopbdd" @click="goMakeQuo('QuotationPrice_SWT',item.Id)"> <span class="bianji newAopbdd" @click="goMakeQuo('QuotationPrice_SWT',item.Id)">
<el-tooltip class="item" effect="dark" content="修改" placement="top-start" <el-tooltip class="item" effect="dark" content="修改" placement="top-start" popper-class="max-w250">
popper-class="max-w250">
<i class="iconfont icon-bianji-smal"></i> <i class="iconfont icon-bianji-smal"></i>
</el-tooltip> </el-tooltip>
</span> </span>
<span class="newAopbdd" style="background-color:#67c23a;" @click="delQuotation(item.Id)"> <span class="newAopbdd" style="background-color:#67c23a;" @click="delQuotation(item.Id)">
<el-tooltip class="item" effect="dark" content="详情" placement="top-start" <el-tooltip class="item" effect="dark" content="详情" placement="top-start" popper-class="max-w250">
popper-class="max-w250">
<i class="iconfont icon-biaoge"></i> <i class="iconfont icon-biaoge"></i>
</el-tooltip> </el-tooltip>
</span> </span>
<span style="background:#85ce61; " class="newAopbdd" @click="SwtDownLoadFile(item)"> <span style="background:#85ce61; " class="newAopbdd" @click="showDownLoad(item)">
<el-tooltip class="item" effect="dark" content="下载" placement="top-start" popper-class="max-w250"> <el-tooltip class="item" effect="dark" content="下载" placement="top-start" popper-class="max-w250">
<i class="iconfont icon-bb-xiazai"></i> <i class="iconfont icon-bb-xiazai"></i>
</el-tooltip> </el-tooltip>
...@@ -211,38 +215,41 @@ ...@@ -211,38 +215,41 @@
</tr> </tr>
<tbody> <tbody>
<tr height="36"> <tr height="36">
<td width="50%"><input id="IsShowTripPrice" type="checkbox" v-model="downLoadMsg.IsShowTripPrice" /><label <td width="50%"><input id="IsShowBaseInfo" type="checkbox" v-model="downLoadMsg.IsShowBaseInfo" /><label
for="IsShowTripPrice">行程报价<br />(房、餐、车、门票)</label></td> for="IsShowBaseInfo">基础信息</label></td>
<td width="50%"><input id="IsShowTraffic" type="checkbox" v-model="downLoadMsg.IsShowTraffic" /><label <td width="50%"><input id="IsShowSalePrice" type="checkbox" v-model="downLoadMsg.IsShowSalePrice" /><label
for="IsShowTraffic">交通部分</label></td> for="IsShowSalePrice">建議售價</label></td>
</tr> </tr>
<tr height="36"> <tr height="36">
<td><input id="IsShowZaZhi" type="checkbox" v-model="downLoadMsg.IsShowZaZhi" /><label <td><input id="IsShowSingleRoomPrice" type="checkbox" v-model="downLoadMsg.IsShowSingleRoomPrice" /><label
for="IsShowZaZhi">杂支部分</label></td> for="IsShowSingleRoomPrice">單房差</label></td>
<td><input id="IsShowOtherZhichu" type="checkbox" v-model="downLoadMsg.IsShowOtherZhichu" /><label <td><input id="IsShowHotel" type="checkbox" v-model="downLoadMsg.IsShowHotel" /><label
for="IsShowOtherZhichu">其他支出</label></td> for="IsShowHotel">飯店</label></td>
</tr> </tr>
<tr height="36"> <tr height="36">
<td><input id="IsShowShouRu" type="checkbox" v-model="downLoadMsg.IsShowShouRu" /><label <td><input id="IsShowDinner" type="checkbox" v-model="downLoadMsg.IsShowDinner" /><label
for="IsShowShouRu">收入</label></td> for="IsShowDinner">餐食</label></td>
<td><input id="IsShowTuanFuFee" type="checkbox" v-model="downLoadMsg.IsShowTuanFuFee" /><label <td><input id="IsShowBus" type="checkbox" v-model="downLoadMsg.IsShowBus" /><label
for="IsShowTuanFuFee">团负费</label></td> for="IsShowBus">車資</label></td>
</tr> </tr>
<tr height="36"> <tr height="36">
<td><input id="IsShowLeaderFenTan" type="checkbox" v-model="downLoadMsg.IsShowLeaderFenTan" /><label <td><input id="IsShowSelfFeeTrip" type="checkbox" v-model="downLoadMsg.IsShowSelfFeeTrip" /><label
for="IsShowLeaderFenTan">领队分摊</label></td> for="IsShowSelfFeeTrip">自費行程</label></td>
<td><input id="IsShowCost" type="checkbox" v-model="downLoadMsg.IsShowCost" /><label <td><input id="IsShowShopping" type="checkbox" v-model="downLoadMsg.IsShowShopping" /><label
for="IsShowCost">成本统计</label></td> for="IsShowShopping">SHOPPING</label></td>
</tr> </tr>
<tr height="36"> <tr height="36">
<td><input id="IsShowOtherPrice" type="checkbox" v-model="downLoadMsg.IsShowOtherPrice" /><label <td><input id="IsShowBusShop" type="checkbox" v-model="downLoadMsg.IsShowBusShop" /><label
for="IsShowOtherPrice">其他定价</label></td> for="IsShowBusShop">車購</label></td>
<td style="display:none;"><input id="IsShowScenic" type="checkbox"
v-model="downLoadMsg.IsShowScenic" /><label for="IsShowScenic">景點門票</label></td>
</tr> </tr>
</tbody> </tbody>
<tr height="66"> <tr height="66">
<td colspan="2" style="text-align:center;"> <td colspan="2" style="text-align:center;">
<input type="button" class="normalBtn" style="margin-left:-70px;" :value="$t('pub.sureBtn')" <input type="button" class="normalBtn" style="margin-left:-70px;" :value="$t('pub.sureBtn')"
@click="DownLoadFile()" /> @click="SwtDownLoadFile()" />
</td> </td>
</tr> </tr>
</table> </table>
...@@ -265,7 +272,7 @@ ...@@ -265,7 +272,7 @@
currentPage: 1, currentPage: 1,
Title: "", Title: "",
AuditStatus: -1, AuditStatus: -1,
IsQAuditStatus:0,//所有的数据 IsQAuditStatus: 0, //所有的数据
}, },
loading: true, loading: true,
//线路列表 //线路列表
...@@ -278,17 +285,18 @@ ...@@ -278,17 +285,18 @@
downloadBill: false, downloadBill: false,
//下载参数 //下载参数
downLoadMsg: { downLoadMsg: {
ID: 0, Id: 0,
FileName: "", FileName: "",
IsShowTripPrice: true, //行程报价 IsShowBaseInfo: true, //基础信息
IsShowTraffic: false, //交通价格 IsShowSalePrice: false, //是否显示建议售价
IsShowZaZhi: false, //杂支部分 IsShowSingleRoomPrice: false, //是否显示单房差
IsShowOtherZhichu: false, //其他支出 IsShowHotel: false, //是否显示酒店
IsShowShouRu: false, //收入部分 IsShowDinner: false, //是否显示餐食
IsShowTuanFuFee: false, //团负费 IsShowScenic: false, //是否显示景点门票
IsShowLeaderFenTan: false, //领队分摊 IsShowBus: false, //是否显示车资
IsShowCost: false, //成本统计 IsShowSelfFeeTrip: false, //是否显示自费行程
IsShowOtherPrice: false, //其他定价 IsShowShopping: false, //是否显示自费购物
IsShowBusShop: false, //是否显示车购
}, },
}; };
}, },
...@@ -400,7 +408,7 @@ ...@@ -400,7 +408,7 @@
}, },
//显示下载弹窗 //显示下载弹窗
showDownLoad(item) { showDownLoad(item) {
this.downLoadMsg.ID = item.ID; this.downLoadMsg.Id = item.Id;
var fileName = ""; var fileName = "";
if (item.CustomerName) { if (item.CustomerName) {
fileName += "【" + item.CustomerName + "】"; fileName += "【" + item.CustomerName + "】";
...@@ -414,30 +422,10 @@ ...@@ -414,30 +422,10 @@
this.downloadBill = true; this.downloadBill = true;
}, },
//报价单下载 //报价单下载
DownLoadFile() { SwtDownLoadFile() {
this.downloadBill = false;
this.loading = true;
this.GetLocalFile("quotation_get_DownLoadQuotation", this.downLoadMsg, this.downLoadMsg.FileName, res => {
this.loading = false;
});
},
//报价单下载
SwtDownLoadFile(item) {
this.downloadBill = false; this.downloadBill = false;
this.loading = true; this.loading = true;
var swtMsg = { this.GetLocalFile("quotation_get_SwtDownLoadQuotation", this.downLoadMsg, this.downLoadMsg.FileName, res => {
Id: item.Id
};
var fileName = "";
if (item.CustomerName) {
fileName += "【" + item.CustomerName + "】";
} else if (item.LtName) {
fileName += "【" + item.LtName + "】";
} else if (item.LineName) {
fileName += "【" + item.LineName + "】";
}
fileName += "成本下载.xls";
this.GetLocalFile("quotation_get_SwtDownLoadQuotation", swtMsg, fileName, res => {
this.loading = false; this.loading = false;
}); });
}, },
......
src/components/busManagement/busPriceConfig.vue
View file @ dfd09728
...@@ -185,13 +185,13 @@ ...@@ -185,13 +185,13 @@
<div class="flexOne busPriceConfig"> <div class="flexOne busPriceConfig">
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <li>
<span> <span>
<em>地区</em> <em>地区</em>
<el-select filterable :placeholder="$t('pub.pleaseSel')" v-model="msg.AreaTypeId"> <el-select filterable :placeholder="$t('pub.pleaseSel')" v-model="msg.AreaTypeId">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in AreaList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option> <el-option v-for="item in AreaList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
<th> <th>
编号 编号
</th> </th>
<th> <th>
地区 地区
</th> </th>
<th> <th>
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
越文行程 越文行程
</th> </th>
<th> <th>
公里数 计费方式
</th> </th>
<th> <th>
详细 详细
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
<td> <td>
{{item.Id}} {{item.Id}}
</td> </td>
<td> <td>
{{item.AreaTypeIdStr}} {{item.AreaTypeIdStr}}
</td> </td>
<td> <td>
...@@ -254,56 +254,57 @@ ...@@ -254,56 +254,57 @@
{{item.VietnamTrip}} {{item.VietnamTrip}}
</td> </td>
<td> <td>
{{item.Kilometre}} <template v-if="item.CalcFeeType==1">
<span style="color:blue">公里计费</span>
</template>
<template v-if="item.CalcFeeType==2">
<span style="color:red">车资计费</span>
</template>
</td> </td>
<td> <td>
<el-popover width="590" trigger="click"> <template v-if="item.CalcFeeType==1">
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <el-popover width="300" trigger="click">
<tr style="text-align:center;"> <table width="100%" border="0" cellspacing="0" cellpadding="0">
<th width="80">车型</th> <tr style="text-align:center;">
<th width="80">{{$t('ground.jsPrice')}}</th> <th width="100">车型</th>
<th width="80">{{$t('ground.AllDayPrice')}}</th> <th width="100">公里价格</th>
<th width="80">{{$t('ground.btbj')}}</th> </tr>
<th width="80">公里价格</th> <tr v-for="(fItem,fIndex) in item.PriceList" :key="fIndex" style="text-align:center;">
<th width="80">{{$t('ground.qtgs')}}</th> <td>
<th width="80">{{$t('ground.jsgs')}}</th> {{fItem.BusTypeStr}}
<th width="80">{{$t('ground.qtchadai')}}</th> </td>
<th width="80">{{$t('ground.jschadai')}}</th> <td>
</tr> {{fItem.KMPrice}}
<tr v-for="(fItem,fIndex) in item.PriceList" :key="fIndex" style="text-align:center;"> </td>
<td> </tr>
{{fItem.BusTypeStr}} </table>
</td> <span slot="reference" style="cursor:pointer;color:blue;" title="点击查看详情">
<td> {{item.Kilometre}} 公里
{{fItem.ReceivePrice}} <i class="iconfont icon-xiaotuziCduan_1"></i>
</td> </span>
<td> </el-popover>
{{fItem.AllDayPrice}} </template>
</td> <template v-if="item.CalcFeeType==2">
<td> <el-popover width="300" trigger="click">
{{fItem.HalfDayPrice}} <table width="100%" border="0" cellspacing="0" cellpadding="0">
</td> <tr style="text-align:center;">
<td> <th width="100">车型</th>
{{fItem.KMPrice}} <th width="100">价格</th>
</td> </tr>
<td> <tr v-for="(fItem,fIndex) in item.ConfigDetailsList" :key="fIndex" style="text-align:center;">
{{fItem.AllDayHighSpeedFee}} <td>
</td> {{fItem.BusTypeName}}
<td> </td>
{{fItem.PickUpHighSpeedFee}} <td>
</td> {{fItem.BusPrice}}
<td> </td>
{{fItem.AllDayChaDaiFee}} </tr>
</td> </table>
<td> <span slot="reference" style="cursor:pointer;color:red" title="点击查看详情">车资
{{fItem.PickUpChaDaiFee}} <i class="iconfont icon-xiaotuziCduan_1"></i>
</td> </span>
</tr> </el-popover>
</table> </template>
<span slot="reference" style="cursor:pointer;">{{$t('fnc.xiangqing')}}
<i class="iconfont icon-xiaotuziCduan_1"></i>
</span>
</el-popover>
</td> </td>
<td>{{item.UpdateByName}}</td> <td>{{item.UpdateByName}}</td>
<td>{{item.UpdateDateStr}}</td> <td>{{item.UpdateDateStr}}</td>
...@@ -364,10 +365,25 @@ ...@@ -364,10 +365,25 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="计费方式">
<el-select filterable :placeholder="$t('pub.pleaseSel')" v-model="addMsg.CalcFeeType">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option label="公里计费" :value="1"></el-option>
<el-option label="车资计费" :value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5" v-if="addMsg.CalcFeeType==1">
<el-form-item label="公里数"> <el-form-item label="公里数">
<el-input v-model="addMsg.Kilometre" @keyup.native="checkInteger(addMsg,'Kilometre')"></el-input> <el-input v-model="addMsg.Kilometre" @keyup.native="checkInteger(addMsg,'Kilometre')"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5" v-if="addMsg.CalcFeeType==2" v-for="(subItem,subIndex) in AreaTypeList" :key="subIndex">
<el-form-item :label="subItem.BusTypeName" >
<el-input v-model="subItem.BusPrice" @keyup.native="checkInteger(subItem,'BusPrice')" maxlength="10">
</el-input>
</el-form-item>
</el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="排序"> <el-form-item label="排序">
<el-input v-model="addMsg.SortNum" @keyup.native="checkInteger(addMsg,'SortNum')"></el-input> <el-input v-model="addMsg.SortNum" @keyup.native="checkInteger(addMsg,'SortNum')"></el-input>
...@@ -392,7 +408,7 @@ ...@@ -392,7 +408,7 @@
currentPage: 1, currentPage: 1,
loading: false, loading: false,
Trip: "", Trip: "",
AreaTypeId:0,//地区编号 AreaTypeId: 0, //地区编号
}, },
//表单json //表单json
addMsg: { addMsg: {
...@@ -402,10 +418,38 @@ ...@@ -402,10 +418,38 @@
Kilometre: 0, //公里数 Kilometre: 0, //公里数
SortNum: 0, //排序 SortNum: 0, //排序
AreaTypeId: 0, //地区编号 AreaTypeId: 0, //地区编号
CalcFeeType: 0, //计费方式(1-公里计价,2-总车资计价)
ConfigDetailsList: [], //报价详情
}, },
AreaTypeList: [],
}; };
}, },
methods: { methods: {
//获取车辆类型
getAreaTypeList() {
this.apipost(
"bus_get_GetBusAreaTypeListService", {
Type: 2
},
res => {
this.msg.loading = false;
if (res.data.resultCode == 1) {
var tempArray = res.data.data;
if (tempArray && tempArray.length > 0) {
tempArray.forEach(item => {
var obj = {
BusType: item.Id,
BusTypeName: item.Name,
BusPrice: 0,
}
this.AreaTypeList.push(obj);
});
}
}
},
null
);
},
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.initData(); this.initData();
...@@ -430,12 +474,14 @@ ...@@ -430,12 +474,14 @@
); );
}, },
saveInfo() { saveInfo() {
this.addMsg.ConfigDetailsList = this.AreaTypeList;
this.apipost( this.apipost(
"buspriceconfig_post_SetBusPriceConfig", "buspriceconfig_post_SetBusPriceConfig",
this.addMsg, this.addMsg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.initData(); this.initData();
this.clearInfo();
this.Success("保存成功"); this.Success("保存成功");
this.isShow = false; this.isShow = false;
this.resetForm("addMsg"); this.resetForm("addMsg");
...@@ -457,7 +503,23 @@ ...@@ -457,7 +503,23 @@
"buspriceconfig_get_GetBusPriceConfig", "buspriceconfig_get_GetBusPriceConfig",
msg, msg,
res => { res => {
this.addMsg = res.data.data; var tempData = res.data.data;
this.addMsg.Id = tempData.Id;
this.addMsg.Trip = tempData.Trip;
this.addMsg.VietnamTrip = tempData.VietnamTrip;
this.addMsg.Kilometre = tempData.Kilometre;
this.addMsg.SortNum = tempData.SortNum;
this.addMsg.AreaTypeId = tempData.AreaTypeId;
this.addMsg.CalcFeeType = tempData.CalcFeeType;
if (tempData.ConfigDetailsList && tempData.ConfigDetailsList.length > 0) {
tempData.ConfigDetailsList.forEach(subItem => {
this.AreaTypeList.forEach(childItem => {
if (subItem.BusType == childItem.BusType) {
childItem.BusPrice = subItem.BusPrice;
}
})
});
}
}, },
null null
); );
...@@ -479,6 +541,13 @@ ...@@ -479,6 +541,13 @@
this.addMsg.VietnamTrip = ""; this.addMsg.VietnamTrip = "";
this.addMsg.Kilometre = 0; this.addMsg.Kilometre = 0;
this.addMsg.SortNum = 0; this.addMsg.SortNum = 0;
this.addMsg.CalcFeeType = 0;
this.addMsg.ConfigDetailsList = [];
if (this.AreaTypeList && this.AreaTypeList.length > 0) {
this.AreaTypeList.forEach(item => {
item.BusPrice = 0;
})
}
}, },
submitForm(addMsg) { submitForm(addMsg) {
//提交创建、修改表单 //提交创建、修改表单
...@@ -528,6 +597,7 @@ ...@@ -528,6 +597,7 @@
}, },
}, },
mounted() { mounted() {
this.getAreaTypeList();
this.getAreaList(); this.getAreaList();
this.initData(); this.initData();
}, },
......
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