Skip to content

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

页面修改

parent 3fcceda9
Hide whitespace changes
Inline Side-by-side
Showing with 280 additions and 136 deletions
src/assets/utils/tripUtils.js
View file @ 7fb247e7
...@@ -225,6 +225,8 @@ var tripUtils = { ...@@ -225,6 +225,8 @@ var tripUtils = {
CurrencyId: 0, //币种id CurrencyId: 0, //币种id
Money: 0.0, //费用 Money: 0.0, //费用
PeopleNumber: 0, //人数 PeopleNumber: 0, //人数
SalePrice:0,//销售价格
CostRemark:"",//成本备注
} }
}, },
//地接成本报价币种 //地接成本报价币种
......
src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
View file @ 7fb247e7
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
</el-form-item> </el-form-item>
</td> </td>
</tr> </tr>
<tr v-for="item in CostCurrencyList"> <!-- <tr v-for="item in CostCurrencyList">
<td class="CP_ComTitle2 CostcomCenter">地接报价 <td class="CP_ComTitle2 CostcomCenter">地接报价
<br />({{item.CurrencyName}}) <br />({{item.CurrencyName}})
</td> </td>
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
</td> </td>
<td :colspan="12-2-getCurrencyNumberList(item.CurrencyId).length+1"> <td :colspan="12-2-getCurrencyNumberList(item.CurrencyId).length+1">
</td> </td>
</tr> </tr> -->
</thead> </thead>
<tr> <tr>
<td colspan="12"></td> <td colspan="12"></td>
...@@ -243,129 +243,254 @@ ...@@ -243,129 +243,254 @@
<td width="100" class="CP_ComTitle2 CostcomCenter">中</td> <td width="100" class="CP_ComTitle2 CostcomCenter">中</td>
<td width="100" class="CP_ComTitle2 CostcomCenter">晚</td> <td width="100" class="CP_ComTitle2 CostcomCenter">晚</td>
</tr> </tr>
<tr v-for="subItem in dayCostPrice" :key="subItem.subCode"> <template v-if="CostNumberList&&CostNumberList.length>1">
<td align="center"> <template v-for="(subItem,subIndex) in dayCostPrice">
<div style="width:100px;">{{subItem.DayNum}}</div> <template v-for="(childItem,childIndex) in CostNumberList">
</td> <tr>
<td> <td align="center" v-if="childIndex==0" :rowspan="CostNumberList.length">
<el-input type="textarea" resize="none" class="w250" v-model="subItem.Title"></el-input> <div style="width:100px;">{{subItem.DayNum}}</div>
</td> </td>
<td> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
<el-form-item> <el-input type="textarea" resize="none" class="w250" v-model="subItem.Title"></el-input>
<el-select v-model='subItem.CurrencyId' class="w70"> </td>
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
<el-option v-for="items in CostCurrencyList" :label='items.CurrencyName' :value='items.CurrencyId' <el-form-item>
:key='items.CurrencyId'> <el-select v-model='subItem.CurrencyId' class="w70">
</el-option> <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
</el-select> <el-option v-for="items in CostCurrencyList" :label='items.CurrencyName'
</el-form-item> :value='items.CurrencyId' :key='items.CurrencyId'>
</td> </el-option>
<td> </el-select>
<el-input type='text' v-model="subItem.HotelCostPrice" class="w70" </el-form-item>
@keyup.native="checkPrice(subItem,'HotelCostPrice')"></el-input> </td>
</td> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
<td> <el-input type='text' v-model="subItem.HotelCostPrice" class="w70"
<el-input type='text' v-model="subItem.BusCostPrice" class="w70" @keyup.native="checkPrice(subItem,'HotelCostPrice')"></el-input>
@keyup.native="checkPrice(subItem,'BusCostPrice'),getchange()"> </td>
</el-input> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
</td> <el-input type='text' v-model="subItem.BusCostPrice" class="w70"
<td> @keyup.native="checkPrice(subItem,'BusCostPrice'),getchange()">
<template v-if="CostNumberList&&CostNumberList.length>0"> </el-input>
{{CostNumberList[0].PeopleNumber}} </td>
</template> <td>
</td> {{childItem.PeopleNumber}}
<td> </td>
<template v-if="CostNumberList&&CostNumberList.length>0"> <td>
{{Number(subItem.BusCostPrice)/Number(CostNumberList[0].PeopleNumber)}} {{Number(subItem.BusCostPrice)/Number(childItem.PeopleNumber)}}
</template> </td>
</td> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
<td> <el-input type='text' v-model="subItem.ScenicCostPrice" class="w70"
<el-input type='text' v-model="subItem.ScenicCostPrice" class="w70" @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> <el-input type="text" v-model='subItem.BreakfastCostPrice' class="w70"
<el-input type="text" v-model='subItem.BreakfastCostPrice' class="w70" @keyup.native="checkPrice(subItem,'BreakfastCostPrice'),getchange()">
@keyup.native="checkPrice(subItem,'BreakfastCostPrice'),getchange()"> </el-input>
</el-input> </td>
</td> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
<td> <el-input type="text" v-model='subItem.LunchCostPrice' class="w70"
<el-input type="text" v-model='subItem.LunchCostPrice' class="w70" @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> <el-input type="text" v-model='subItem.DinnerCostPrice' class="w70"
<el-input type="text" 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>
<tr>
<td colspan="3" class="CP_ComTitle2 CostcomCenter">
<template v-if="dayCostPrice&&dayCostPrice.length>0">
<span>{{getCurrencyName(dayCostPrice[0].CurrencyId)}}</span>
</template>
小计
</td>
<td>
{{getDayXiaoJi(1,1)}}
</td>
<td>
{{getDayXiaoJi(2,1)}}
</td>
<td>
<template v-if="CostNumberList&&CostNumberList.length>0">
{{CostNumberList[0].PeopleNumber}}
</template>
</td>
<td>
<template v-if="CostNumberList&&CostNumberList.length>0">
{{(Number(getDayXiaoJi(2,1))/Number(CostNumberList[0].PeopleNumber)).toFixed(2)}}
</template>
</td>
<td>
{{getDayXiaoJi(3,1)}}
</td>
<td>
{{getDayXiaoJi(4,1)}}
</td>
<td>
{{getDayXiaoJi(5,1)}}
</td>
<td>
{{getDayXiaoJi(6,1)}}
</td>
</tr>
<tr>
<td colspan="3" class="CP_ComTitle2 CostcomCenter">
人民币 小计
</td>
<td>
{{getDayXiaoJi(1,2)}}
</td>
<td>
{{getDayXiaoJi(2,2)}}
</td>
<td>
<template v-if="CostNumberList&&CostNumberList.length>0">
{{CostNumberList[0].PeopleNumber}}
</template>
</td>
<td>
<template v-if="CostNumberList&&CostNumberList.length>0">
{{(Number(getDayXiaoJi(2,2))/Number(CostNumberList[0].PeopleNumber)).toFixed(2)}}
</template> </template>
</td> </template>
<td>
{{getDayXiaoJi(3,2)}} <template v-for="(childItem,childIndex) in CostNumberList">
</td> <tr>
<td> <td colspan="3" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0"
{{getDayXiaoJi(4,2)}} :rowspan="CostNumberList.length">
</td> <template v-if="dayCostPrice&&dayCostPrice.length>0">
<td> <span>{{getCurrencyName(dayCostPrice[0].CurrencyId)}}</span>
{{getDayXiaoJi(5,2)}} </template>
</td> 小计
<td> </td>
{{getDayXiaoJi(6,2)}} <td v-if="childIndex==0" :rowspan="CostNumberList.length">
</td> {{getDayXiaoJi(1,1)}}
</tr> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(2,1)}}
</td>
<td>
{{childItem.PeopleNumber}}
</td>
<td>
{{(Number(getDayXiaoJi(2,1))/Number(childItem.PeopleNumber)).toFixed(2)}}
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(3,1)}}
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(4,1)}}
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(5,1)}}
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(6,1)}}
</td>
</tr>
</template>
<template v-for="(childItem,childIndex) in CostNumberList">
<tr>
<td colspan="3" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0" :rowspan="CostNumberList.length">
人民币 小计
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(1,2)}}
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(2,2)}}
</td>
<td>
{{childItem.PeopleNumber}}
</td>
<td>
{{(Number(getDayXiaoJi(2,2))/Number(childItem.PeopleNumber)).toFixed(2)}}
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(3,2)}}
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(4,2)}}
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(5,2)}}
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(6,2)}}
</td>
</tr>
</template>
</template>
<template v-else>
<tr v-for="subItem in dayCostPrice" :key="subItem.subCode">
<td align="center">
<div style="width:100px;">{{subItem.DayNum}}</div>
</td>
<td>
<el-input type="textarea" resize="none" class="w250" v-model="subItem.Title"></el-input>
</td>
<td>
<el-form-item>
<el-select v-model='subItem.CurrencyId' class="w70">
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
<el-option v-for="items in CostCurrencyList" :label='items.CurrencyName' :value='items.CurrencyId'
:key='items.CurrencyId'>
</el-option>
</el-select>
</el-form-item>
</td>
<td>
<el-input type='text' v-model="subItem.HotelCostPrice" class="w70"
@keyup.native="checkPrice(subItem,'HotelCostPrice')"></el-input>
</td>
<td>
<el-input type='text' v-model="subItem.BusCostPrice" class="w70"
@keyup.native="checkPrice(subItem,'BusCostPrice'),getchange()">
</el-input>
</td>
<td>
<template v-if="CostNumberList&&CostNumberList.length>0">
{{CostNumberList[0].PeopleNumber}}
</template>
</td>
<td>
<template v-if="CostNumberList&&CostNumberList.length>0">
{{Number(subItem.BusCostPrice)/Number(CostNumberList[0].PeopleNumber)}}
</template>
</td>
<td>
<el-input type='text' v-model="subItem.ScenicCostPrice" class="w70"
@keyup.native="checkPrice(subItem,'ScenicCostPrice'),getchange()"></el-input>
</td>
<td>
<el-input type="text" v-model='subItem.BreakfastCostPrice' class="w70"
@keyup.native="checkPrice(subItem,'BreakfastCostPrice'),getchange()">
</el-input>
</td>
<td>
<el-input type="text" v-model='subItem.LunchCostPrice' class="w70"
@keyup.native="checkPrice(subItem,'LunchCostPrice'),getchange()"></el-input>
</td>
<td>
<el-input type="text" v-model='subItem.DinnerCostPrice' class="w70"
@keyup.native="checkPrice(subItem,'DinnerCostPrice'),getchange()"></el-input>
</td>
</tr>
<tr>
<td colspan="3" class="CP_ComTitle2 CostcomCenter">
<template v-if="dayCostPrice&&dayCostPrice.length>0">
<span>{{getCurrencyName(dayCostPrice[0].CurrencyId)}}</span>
</template>
小计
</td>
<td>
{{getDayXiaoJi(1,1)}}
</td>
<td>
{{getDayXiaoJi(2,1)}}
</td>
<td>
<template v-if="CostNumberList&&CostNumberList.length>0">
{{CostNumberList[0].PeopleNumber}}
</template>
</td>
<td>
<template v-if="CostNumberList&&CostNumberList.length>0">
{{(Number(getDayXiaoJi(2,1))/Number(CostNumberList[0].PeopleNumber)).toFixed(2)}}
</template>
</td>
<td>
{{getDayXiaoJi(3,1)}}
</td>
<td>
{{getDayXiaoJi(4,1)}}
</td>
<td>
{{getDayXiaoJi(5,1)}}
</td>
<td>
{{getDayXiaoJi(6,1)}}
</td>
</tr>
<tr>
<td colspan="3" class="CP_ComTitle2 CostcomCenter">
人民币 小计
</td>
<td>
{{getDayXiaoJi(1,2)}}
</td>
<td>
{{getDayXiaoJi(2,2)}}
</td>
<td>
<template v-if="CostNumberList&&CostNumberList.length>0">
{{CostNumberList[0].PeopleNumber}}
</template>
</td>
<td>
<template v-if="CostNumberList&&CostNumberList.length>0">
{{(Number(getDayXiaoJi(2,2))/Number(CostNumberList[0].PeopleNumber)).toFixed(2)}}
</template>
</td>
<td>
{{getDayXiaoJi(3,2)}}
</td>
<td>
{{getDayXiaoJi(4,2)}}
</td>
<td>
{{getDayXiaoJi(5,2)}}
</td>
<td>
{{getDayXiaoJi(6,2)}}
</td>
</tr>
</template>
<tr> <tr>
<td colspan="12"></td> <td colspan="12"></td>
</tr> </tr>
...@@ -395,7 +520,7 @@ ...@@ -395,7 +520,7 @@
<td class="CP_ComTitle2 CostcomCenter">1</td> <td class="CP_ComTitle2 CostcomCenter">1</td>
<td colspan="2" class="CP_ComTitle2">签证费(每人)</td> <td colspan="2" class="CP_ComTitle2">签证费(每人)</td>
<el-form-item> <el-form-item>
<el-select v-model='OtherPrice.InlandAirTicketCurrency' class="w70"> <el-select v-model='OtherPrice.VisaMoneyCurrencyId' class="w70">
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
<el-option v-for="items in CostCurrencyList" :label='items.CurrencyName' :value='items.CurrencyId' <el-option v-for="items in CostCurrencyList" :label='items.CurrencyName' :value='items.CurrencyId'
:key='items.CurrencyId'> :key='items.CurrencyId'>
...@@ -432,7 +557,7 @@ ...@@ -432,7 +557,7 @@
<td colspan="2" class="CP_ComTitle2">保险费(每人)</td> <td colspan="2" class="CP_ComTitle2">保险费(每人)</td>
<td> <td>
<el-form-item> <el-form-item>
<el-select v-model='OtherPrice.InlandAirTicketCurrency' class="w70"> <el-select v-model='OtherPrice.SafeMoneyCurrencyId' class="w70">
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
<el-option v-for="items in CostCurrencyList" :label='items.CurrencyName' :value='items.CurrencyId' <el-option v-for="items in CostCurrencyList" :label='items.CurrencyName' :value='items.CurrencyId'
:key='items.CurrencyId'> :key='items.CurrencyId'>
...@@ -470,7 +595,7 @@ ...@@ -470,7 +595,7 @@
<td colspan="2" class="CP_ComTitle2">领队小费</td> <td colspan="2" class="CP_ComTitle2">领队小费</td>
<td> <td>
<el-form-item> <el-form-item>
<el-select v-model='OtherPrice.InlandAirTicketCurrency' class="w70"> <el-select v-model='OtherPrice.LeaderTripMoneyCurrencyId' class="w70">
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
<el-option v-for="items in CostCurrencyList" :label='items.CurrencyName' :value='items.CurrencyId' <el-option v-for="items in CostCurrencyList" :label='items.CurrencyName' :value='items.CurrencyId'
:key='items.CurrencyId'> :key='items.CurrencyId'>
...@@ -491,7 +616,7 @@ ...@@ -491,7 +616,7 @@
<td colspan="2" class="CP_ComTitle2">司机、导游小费</td> <td colspan="2" class="CP_ComTitle2">司机、导游小费</td>
<td> <td>
<el-form-item> <el-form-item>
<el-select v-model='OtherPrice.InlandAirTicketCurrency' class="w70"> <el-select v-model='OtherPrice.DriverGuideMoneyCurrencyId' class="w70">
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
<el-option v-for="items in CostCurrencyList" :label='items.CurrencyName' :value='items.CurrencyId' <el-option v-for="items in CostCurrencyList" :label='items.CurrencyName' :value='items.CurrencyId'
:key='items.CurrencyId'> :key='items.CurrencyId'>
...@@ -525,13 +650,23 @@ ...@@ -525,13 +650,23 @@
人民币 小计 人民币 小计
</td> </td>
<td colspan="4"> <td colspan="4">
{{Number(OtherPrice.InlandAirTicketMoney)+Number(OtherPrice.InlandShipTicketMoney)+Number(OtherPrice.InlandTrainTicketMoney)}} {{
(Number(OtherPrice.InlandAirTicketMoney)*Number(getCurrencyMoney(OtherPrice.InlandAirTicketCurrency))
+Number(OtherPrice.InlandShipTicketMoney)*Number(getCurrencyMoney(OtherPrice.InlandShipTicketCurrency))
+Number(OtherPrice.InlandTrainTicketMoney)*Number(getCurrencyMoney(OtherPrice.InlandTrainTicketCurrency))
).toFixed(2)
}}
</td> </td>
<td class="CP_ComTitle2"> <td class="CP_ComTitle2">
人民币 小计 人民币 小计
</td> </td>
<td colspan="5"> <td colspan="5">
{{Number(OtherPrice.VisaMoney)+Number(OtherPrice.SafeMoney)+Number(OtherPrice.LeaderTripMoney)+Number(OtherPrice.DriverGuideMoney)}} {{ ( Number(OtherPrice.VisaMoney)*Number(getCurrencyMoney(OtherPrice.VisaMoneyCurrencyId))
+Number(OtherPrice.SafeMoney)*Number(getCurrencyMoney(OtherPrice.SafeMoneyCurrencyId))
+Number(OtherPrice.LeaderTripMoney)*Number(getCurrencyMoney(OtherPrice.LeaderTripMoneyCurrencyId))
+Number(OtherPrice.DriverGuideMoney)*Number(getCurrencyMoney(OtherPrice.DriverGuideMoneyCurrencyId))
).toFixed(2)
}}
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -699,15 +834,18 @@ ...@@ -699,15 +834,18 @@
</td> </td>
<td class="CP_ComTitle2">成本价</td> <td class="CP_ComTitle2">成本价</td>
<td class="CP_ComTitle2">销售价格</td> <td class="CP_ComTitle2" colspan="2">销售价格</td>
<td colspan="8" class="CP_ComTitle2">备注</td> <td colspan="7" class="CP_ComTitle2">备注</td>
</tr> </tr>
<tr v-for="item in CostNumberList" :key="item.subCode"> <tr v-for="item in CostNumberList" :key="item.subCode">
<td>{{item.PeopleNumber}}+1</td> <td>{{item.PeopleNumber}}+1</td>
<td>{{item.TotalMoney}}</td> <td>{{item.TotalMoney}}</td>
<td> <el-input type='text' class="w70" ></el-input></td> <td colspan="2">
<td colspan="8"> <el-input type='text' class="w70" v-model="item.SalePrice"
<el-input type="textarea" ></el-input> @keyup.native="checkPrice(item,'SalePrice',true)" maxlength="8"></el-input>
</td>
<td colspan="7">
<el-input type="textarea" v-model="item.CostRemark"></el-input>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -746,6 +884,7 @@ ...@@ -746,6 +884,7 @@
}, },
methods: { methods: {
//每天小计
getDayXiaoJi(type, currencyType) { getDayXiaoJi(type, currencyType) {
var xiaoJi = 0; var xiaoJi = 0;
this.dayCostPrice.forEach(item => { this.dayCostPrice.forEach(item => {
...@@ -780,7 +919,6 @@ ...@@ -780,7 +919,6 @@
}); });
return xiaoJi.toFixed(2); return xiaoJi.toFixed(2);
}, },
ReCalc() {},
//获取汇率 //获取汇率
getCurrencyMoney(currencyId) { getCurrencyMoney(currencyId) {
let currency = 1; let currency = 1;
......
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @ 7fb247e7
...@@ -81,6 +81,10 @@ ...@@ -81,6 +81,10 @@
InlandTrafficShareMoney: 0, //内陆段交通分摊费用 InlandTrafficShareMoney: 0, //内陆段交通分摊费用
OtherShareMoney: 0, //杂费分摊费用 OtherShareMoney: 0, //杂费分摊费用
OtherRemark: "", //其他价格备注 OtherRemark: "", //其他价格备注
VisaMoneyCurrencyId:0,//签证费币种
SafeMoneyCurrencyId:0,//保险费币种
LeaderTripMoneyCurrencyId:0,//领队小费币种
DriverGuideMoneyCurrencyId:0,//司机导游小费币种
}, },
CostCurrencyList: [], //选择的币种 CostCurrencyList: [], //选择的币种
CostNumberList: [], //人数 CostNumberList: [], //人数
......
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