Commit 1745ea32 authored by 黄奎's avatar 黄奎

页面修改

parent 30f61d6f
...@@ -264,6 +264,14 @@ ...@@ -264,6 +264,14 @@
</el-form-item> </el-form-item>
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
<el-select v-model='subItem.ContainDinnerType' class="w70" 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" <el-input type='text' v-model="subItem.HotelCostPrice" class="w70"
@keyup.native="checkPrice(subItem,'HotelCostPrice')"></el-input> @keyup.native="checkPrice(subItem,'HotelCostPrice')"></el-input>
</td> </td>
...@@ -283,7 +291,9 @@ ...@@ -283,7 +291,9 @@
@keyup.native="checkPrice(subItem,'ScenicCostPrice'),getchange()"></el-input> @keyup.native="checkPrice(subItem,'ScenicCostPrice'),getchange()"></el-input>
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <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()"> @keyup.native="checkPrice(subItem,'BreakfastCostPrice'),getchange()">
</el-input> </el-input>
</td> </td>
...@@ -292,7 +302,9 @@ ...@@ -292,7 +302,9 @@
@keyup.native="checkPrice(subItem,'LunchCostPrice'),getchange()"></el-input> @keyup.native="checkPrice(subItem,'LunchCostPrice'),getchange()"></el-input>
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <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> @keyup.native="checkPrice(subItem,'DinnerCostPrice'),getchange()"></el-input>
</td> </td>
</tr> </tr>
...@@ -383,6 +395,14 @@ ...@@ -383,6 +395,14 @@
</el-form-item> </el-form-item>
</td> </td>
<td> <td>
<el-select v-model='subItem.ContainDinnerType' class="w70" 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" <el-input type='text' v-model="subItem.HotelCostPrice" class="w70"
@keyup.native="checkPrice(subItem,'HotelCostPrice')"></el-input> @keyup.native="checkPrice(subItem,'HotelCostPrice')"></el-input>
</td> </td>
...@@ -406,7 +426,9 @@ ...@@ -406,7 +426,9 @@
@keyup.native="checkPrice(subItem,'ScenicCostPrice'),getchange()"></el-input> @keyup.native="checkPrice(subItem,'ScenicCostPrice'),getchange()"></el-input>
</td> </td>
<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()"> @keyup.native="checkPrice(subItem,'BreakfastCostPrice'),getchange()">
</el-input> </el-input>
</td> </td>
...@@ -415,7 +437,9 @@ ...@@ -415,7 +437,9 @@
@keyup.native="checkPrice(subItem,'LunchCostPrice'),getchange()"></el-input> @keyup.native="checkPrice(subItem,'LunchCostPrice'),getchange()"></el-input>
</td> </td>
<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> @keyup.native="checkPrice(subItem,'DinnerCostPrice'),getchange()"></el-input>
</td> </td>
</tr> </tr>
...@@ -942,6 +966,23 @@ ...@@ -942,6 +966,23 @@
} }
}, },
methods: { 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) { trafficXiaoJi(currencyType) {
var trafficTotal = 0; var trafficTotal = 0;
...@@ -1178,6 +1219,7 @@ ...@@ -1178,6 +1219,7 @@
BreakfastCostPrice: 0, //早餐报价 BreakfastCostPrice: 0, //早餐报价
LunchCostPrice: 0, //午餐报价 LunchCostPrice: 0, //午餐报价
DinnerCostPrice: 0, //晚餐报价 DinnerCostPrice: 0, //晚餐报价
ContainDinnerType: 0, //含餐类型(1-含早餐,2-含晚餐,3-含早晚)
}; };
this.dayCostPrice.push(dayItem); this.dayCostPrice.push(dayItem);
} }
...@@ -1193,7 +1235,6 @@ ...@@ -1193,7 +1235,6 @@
getCurrencyNumberList(CurrencyId) { getCurrencyNumberList(CurrencyId) {
let currencyNumberList = []; let currencyNumberList = [];
let flag = false; let flag = false;
this.CurrencyNumberListExt.forEach(item => { this.CurrencyNumberListExt.forEach(item => {
if (!flag && item.Key == CurrencyId) { if (!flag && item.Key == CurrencyId) {
flag = true; flag = true;
...@@ -1297,7 +1338,6 @@ ...@@ -1297,7 +1338,6 @@
DeletePNumber(index) { DeletePNumber(index) {
this.CostNumberList.splice(index, 1); this.CostNumberList.splice(index, 1);
}, },
//人数排序 //人数排序
shortPeopleNumber() { shortPeopleNumber() {
this.CurrencyNumberListExt.forEach(x => { this.CurrencyNumberListExt.forEach(x => {
...@@ -1369,21 +1409,6 @@ ...@@ -1369,21 +1409,6 @@
totalMoney = Number(this.getDayXiaoJi(1, 2)) + Number(this.getDayXiaoJi(2, 2)) / Number(PeopleNumber) + 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(3, 2)) + Number(this.getDayXiaoJi(4, 2)) + Number(this.getDayXiaoJi(5, 2)) +
Number(this.getDayXiaoJi(6, 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); 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