Skip to content

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

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

parents 8e8d25d5 dd7196ee
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 61 deletions
src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
View file @ 027cd48f
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
} }
.CostNewPrice .CP_ComTitle2{ color:#106BAF;font-weight: bold;} .CostNewPrice .CP_ComTitle2{ color:#106BAF;font-weight: bold;}
.CostNewTable{ .CostNewTable{
width:74%; width:70%;
} }
.CostNewTable td{ .CostNewTable td{
padding:5px; padding:5px;
...@@ -37,6 +37,9 @@ ...@@ -37,6 +37,9 @@
.w505{ .w505{
width:505px!important; width:505px!important;
} }
.CostcomCenter{
text-align: center;
}
</style> </style>
<template> <template>
...@@ -131,7 +134,7 @@ ...@@ -131,7 +134,7 @@
</div> </div>
<table class="CP_comTable"> <table class="CP_comTable">
<tr> <tr>
<td class="CP_comBack" width="170">币种</td> <td width="170">币种</td>
<td v-for='(item,index) in CostCurrencyList'> <td v-for='(item,index) in CostCurrencyList'>
{{item.CurrencyName}} {{item.CurrencyName}}
<span> <span>
...@@ -148,7 +151,7 @@ ...@@ -148,7 +151,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="CP_comBack">汇率</td> <td>汇率</td>
<td v-for='item in CostCurrencyList'> <td v-for='item in CostCurrencyList'>
<el-input class="w80" v-model='item.ExchangeRate' <el-input class="w80" v-model='item.ExchangeRate'
@keyup.native="checkRate(item,'ExchangeRate'),getchange()"> @keyup.native="checkRate(item,'ExchangeRate'),getchange()">
...@@ -161,7 +164,7 @@ ...@@ -161,7 +164,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="CP_comBack" width="170">人数</td> <td width="170">人数</td>
<td v-for="(item,index) in CostNumberList" :key='item.subCode'> <td v-for="(item,index) in CostNumberList" :key='item.subCode'>
<el-input class="w80" v-model='item.PeopleNumber' @keyup.native="checkInteger(item,'PeopleNumber')"> <el-input class="w80" v-model='item.PeopleNumber' @keyup.native="checkInteger(item,'PeopleNumber')">
</el-input> </el-input>
...@@ -180,7 +183,7 @@ ...@@ -180,7 +183,7 @@
</td> </td>
</tr> </tr>
<tr v-for="item in CostCurrencyList"> <tr v-for="item in CostCurrencyList">
<td class="CP_comBack">地接报价（{{item.CurrencyName}}）</td> <td>地接报价（{{item.CurrencyName}}）</td>
<td v-if="checkExists(item.CurrencyId)" v-for="childItem in getCurrencyNumberList(item.CurrencyId)"> <td v-if="checkExists(item.CurrencyId)" v-for="childItem in getCurrencyNumberList(item.CurrencyId)">
<el-form-item> <el-form-item>
<el-input class="w80" v-model='childItem.Money' <el-input class="w80" v-model='childItem.Money'
...@@ -195,18 +198,18 @@ ...@@ -195,18 +198,18 @@
<table class="CostPriceTable CostNewTable"> <table class="CostPriceTable CostNewTable">
<tr> <tr>
<td rowspan="2" width='180' class="CP_ComTitle2">Day</td> <td rowspan="2" width='180' class="CP_ComTitle2 CostcomCenter">Day</td>
<td rowspan="2" width='200' class="CP_ComTitle2">行程大点</td> <td rowspan="2" width='200' class="CP_ComTitle2 CostcomCenter">行程大点</td>
<td rowspan="2" width="100" class="CP_ComTitle2">币种</td> <td rowspan="2" width="100" class="CP_ComTitle2 CostcomCenter">币种</td>
<td rowspan="2" width='60' class="CP_ComTitle2">酒店</td> <td rowspan="2" width='60' class="CP_ComTitle2 CostcomCenter">酒店</td>
<td rowspan="2" width='100' class="CP_ComTitle2">车</td> <td rowspan="2" width='100' class="CP_ComTitle2 CostcomCenter">车</td>
<td rowspan="2" width='80' class="CP_ComTitle2">门票</td> <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">门票</td>
<td colspan="3" width='100' class="CP_ComTitle2">餐</td> <td colspan="3" width='100' class="CP_ComTitle2 CostcomCenter">餐</td>
</tr> </tr>
<tr> <tr>
<td width="120" class="CP_ComTitle2">早</td> <td width="120" class="CP_ComTitle2 CostcomCenter">早</td>
<td width="100" class="CP_ComTitle2">中</td> <td width="100" class="CP_ComTitle2 CostcomCenter">中</td>
<td width="100" class="CP_ComTitle2">晚</td> <td width="100" class="CP_ComTitle2 CostcomCenter">晚</td>
</tr> </tr>
<tr v-for="subItem in dayCostPrice" :key="subItem.subCode"> <tr v-for="subItem in dayCostPrice" :key="subItem.subCode">
<td align="center"><div style="width:100px;">{{subItem.DayNum}}</div></td> <td align="center"><div style="width:100px;">{{subItem.DayNum}}</div></td>
...@@ -215,7 +218,7 @@ ...@@ -215,7 +218,7 @@
</td> </td>
<td> <td>
<el-form-item> <el-form-item>
<el-select v-model='subItem.CurrencyId'> <el-select v-model='subItem.CurrencyId' class="w100">
<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'>
...@@ -224,16 +227,16 @@ ...@@ -224,16 +227,16 @@
</el-form-item> </el-form-item>
</td> </td>
<td> <td>
<el-input type='text' v-model="subItem.HotelCostPrice" class="w120" <el-input type='text' v-model="subItem.HotelCostPrice" class="w100"
@keyup.native="checkPrice(subItem,'HotelCostPrice')"></el-input> @keyup.native="checkPrice(subItem,'HotelCostPrice')"></el-input>
</td> </td>
<td> <td>
<el-input type='text' v-model="subItem.BusCostPrice" <el-input type='text' v-model="subItem.BusCostPrice" class="w100"
@keyup.native="checkPrice(subItem,'BusCostPrice'),getchange()"> @keyup.native="checkPrice(subItem,'BusCostPrice'),getchange()">
</el-input> </el-input>
</td> </td>
<td> <td>
<el-input type='text' v-model="subItem.ScenicCostPrice" class="w120" <el-input type='text' v-model="subItem.ScenicCostPrice" class="w100"
@keyup.native="checkPrice(subItem,'ScenicCostPrice'),getchange()"></el-input> @keyup.native="checkPrice(subItem,'ScenicCostPrice'),getchange()"></el-input>
</td> </td>
<td> <td>
...@@ -258,11 +261,11 @@ ...@@ -258,11 +261,11 @@
<td class="CP_ComTitle2" colspan="4">杂支部分</td> <td class="CP_ComTitle2" colspan="4">杂支部分</td>
</tr> </tr>
<tr> <tr>
<td>1</td> <td class="CostcomCenter">1</td>
<td>内陆段机位（每人）</td> <td>内陆段机位(每人)</td>
<td> <td>
<el-form-item> <el-form-item>
<el-select v-model='OtherPrice.InlandAirTicketCurrency'> <el-select v-model='OtherPrice.InlandAirTicketCurrency' class="w100">
<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'>
...@@ -270,14 +273,14 @@ ...@@ -270,14 +273,14 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2"> <td class="CostcomCenter" colspan="2">
<el-form-item> <el-form-item>
<el-input type='text' class="w180" v-model="OtherPrice.InlandAirTicketMoney" <el-input type='text' class="w180" v-model="OtherPrice.InlandAirTicketMoney"
@keyup.native="checkPrice(OtherPrice,'InlandAirTicketMoney'),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'InlandAirTicketMoney'),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td>1</td> <td class="CostcomCenter">1</td>
<td>签证费（每人）</td> <td>签证费(每人)</td>
<td colspan="2"> <td colspan="2">
<el-form-item> <el-form-item>
<el-input type='text' class="w160" v-model="OtherPrice.VisaMoney" <el-input type='text' class="w160" v-model="OtherPrice.VisaMoney"
...@@ -286,11 +289,11 @@ ...@@ -286,11 +289,11 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td>2</td> <td class="CostcomCenter">2</td>
<td>内陆段船票（每人）</td> <td>内陆段船票(每人)</td>
<td> <td>
<el-form-item> <el-form-item>
<el-select v-model='OtherPrice.InlandShipTicketCurrency'> <el-select v-model='OtherPrice.InlandShipTicketCurrency' class="w100">
<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'>
...@@ -304,8 +307,8 @@ ...@@ -304,8 +307,8 @@
@keyup.native="checkPrice(OtherPrice,'InlandShipTicketMoney'),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'InlandShipTicketMoney'),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td>2</td> <td class="CostcomCenter">2</td>
<td>保险费（每人）</td> <td>保险费(每人)</td>
<td colspan="2"> <td colspan="2">
<el-form-item> <el-form-item>
<el-input type='text' class="w160" v-model="OtherPrice.SafeMoney" <el-input type='text' class="w160" v-model="OtherPrice.SafeMoney"
...@@ -314,11 +317,11 @@ ...@@ -314,11 +317,11 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td>3</td> <td class="CostcomCenter">3</td>
<td>内陆段火车票（每人）</td> <td>内陆段火车票(每人)</td>
<td> <td>
<el-form-item> <el-form-item>
<el-select v-model='OtherPrice.InlandTrainTicketCurrency'> <el-select v-model='OtherPrice.InlandTrainTicketCurrency' class="w100">
<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'>
...@@ -332,7 +335,7 @@ ...@@ -332,7 +335,7 @@
@keyup.native="checkPrice(OtherPrice,'InlandTrainTicketMoney'),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'InlandTrainTicketMoney'),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td>3</td> <td class="CostcomCenter">3</td>
<td>领队小费</td> <td>领队小费</td>
<td colspan="2"> <td colspan="2">
<el-form-item> <el-form-item>
...@@ -343,7 +346,7 @@ ...@@ -343,7 +346,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="5"></td> <td colspan="5"></td>
<td>4</td> <td class="CostcomCenter">4</td>
<td>司机、导游小费</td> <td>司机、导游小费</td>
<td colspan="2"> <td colspan="2">
<el-form-item> <el-form-item>
...@@ -362,34 +365,34 @@ ...@@ -362,34 +365,34 @@
<td class="CP_ComTitle2" colspan="3">团负费</td> <td class="CP_ComTitle2" colspan="3">团负费</td>
</tr> </tr>
<tr> <tr>
<td class="CP_ComTitle2">摘要</td> <td class="CP_ComTitle2 CostcomCenter">摘要</td>
<td class="CP_ComTitle2">金额（人民币）</td> <td class="CP_ComTitle2 CostcomCenter">金额（人民币）</td>
<td class="CP_ComTitle2">摘要</td> <td class="CP_ComTitle2 CostcomCenter">摘要</td>
<td class="CP_ComTitle2">金额（人民币）</td> <td class="CP_ComTitle2 CostcomCenter">金额（人民币）</td>
<td class="CP_ComTitle2">摘要</td> <td class="CP_ComTitle2 CostcomCenter">摘要</td>
<td class="CP_ComTitle2">金额（人民币）</td> <td class="CP_ComTitle2 CostcomCenter">金额（人民币）</td>
<td class="CP_ComTitle2">摘要</td> <td class="CP_ComTitle2 CostcomCenter">摘要</td>
<td class="CP_ComTitle2" colspan="2">金额（人民币）</td> <td class="CP_ComTitle2 CostcomCenter" colspan="2">金额（人民币）</td>
</tr> </tr>
<tr> <tr>
<td>销售提成1%</td> <td>销售提成1%</td>
<td> <td>
<el-form-item> <el-form-item>
<el-input type='text' class="w150" v-model="OtherPrice.SalesCommissionMoney" <el-input type='text' class="w120" v-model="OtherPrice.SalesCommissionMoney"
@keyup.native="checkPrice(OtherPrice,'SalesCommissionMoney'),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'SalesCommissionMoney'),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td>机票</td> <td>机票</td>
<td> <td>
<el-form-item> <el-form-item>
<el-input type='text' class="w120" v-model="OtherPrice.AirTicketMoeny" <el-input type='text' class="w100" v-model="OtherPrice.AirTicketMoeny"
@keyup.native="checkPrice(OtherPrice,'AirTicketMoeny'),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'AirTicketMoeny'),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td>客人小费收入</td> <td>客人小费收入</td>
<td> <td>
<el-form-item> <el-form-item>
<el-input type='text' class="w120" v-model="OtherPrice.TripMoney" <el-input type='text' class="w100" v-model="OtherPrice.TripMoney"
@keyup.native="checkPrice(OtherPrice,'TripMoney',true),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'TripMoney',true),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
...@@ -405,7 +408,7 @@ ...@@ -405,7 +408,7 @@
<td>作业处提成</td> <td>作业处提成</td>
<td> <td>
<el-form-item> <el-form-item>
<el-input type='text' class="w150" v-model="OtherPrice.OfficeCommissionMoney" <el-input type='text' class="w120" v-model="OtherPrice.OfficeCommissionMoney"
@keyup.native="checkPrice(OtherPrice,'OfficeCommissionMoney'),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'OfficeCommissionMoney'),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
...@@ -413,7 +416,7 @@ ...@@ -413,7 +416,7 @@
<td>导游人头费</td> <td>导游人头费</td>
<td> <td>
<el-form-item> <el-form-item>
<el-input type='text' class="w120" v-model="OtherPrice.GuidePeopleMoney" <el-input type='text' class="w100" v-model="OtherPrice.GuidePeopleMoney"
@keyup.native="checkPrice(OtherPrice,'GuidePeopleMoney'),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'GuidePeopleMoney'),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
...@@ -426,13 +429,13 @@ ...@@ -426,13 +429,13 @@
<td colspan="9" class="CP_ComTitle2">领队分摊部分</td> <td colspan="9" class="CP_ComTitle2">领队分摊部分</td>
</tr> </tr>
<tr> <tr>
<td>人数</td> <td class="CP_ComTitle2 CostcomCenter">人数</td>
<td>机票</td> <td class="CP_ComTitle2 CostcomCenter">机票</td>
<td>门票</td> <td class="CP_ComTitle2 CostcomCenter">门票</td>
<td>单房差</td> <td class="CP_ComTitle2 CostcomCenter">单房差</td>
<td>内陆段交通</td> <td class="CP_ComTitle2 CostcomCenter">内陆段交通</td>
<td>杂费</td> <td class="CP_ComTitle2 CostcomCenter">杂费</td>
<td colspan="3">小计</td> <td class="CP_ComTitle2 CostcomCenter" colspan="3">小计</td>
</tr> </tr>
<tr> <tr>
<td></td> <td></td>
...@@ -444,25 +447,25 @@ ...@@ -444,25 +447,25 @@
</td> </td>
<td> <td>
<el-form-item> <el-form-item>
<el-input type='text' class="w120" v-model="OtherPrice.TicketShareMoney" <el-input type='text' class="w100" v-model="OtherPrice.TicketShareMoney"
@keyup.native="checkPrice(OtherPrice,'TicketShareMoney'),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'TicketShareMoney'),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td> <td>
<el-form-item> <el-form-item>
<el-input type='text' class="w120" v-model="OtherPrice.SingleRoomShareMoney" <el-input type='text' class="w100" v-model="OtherPrice.SingleRoomShareMoney"
@keyup.native="checkPrice(OtherPrice,'SingleRoomShareMoney'),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'SingleRoomShareMoney'),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td> <td>
<el-form-item> <el-form-item>
<el-input type='text' class="w120" v-model="OtherPrice.InlandTrafficShareMoney" <el-input type='text' class="w100" v-model="OtherPrice.InlandTrafficShareMoney"
@keyup.native="checkPrice(OtherPrice,'InlandTrafficShareMoney'),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'InlandTrafficShareMoney'),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td> <td>
<el-form-item> <el-form-item>
<el-input type='text' class="w120" v-model="OtherPrice.OtherShareMoney" <el-input type='text' class="w100" v-model="OtherPrice.OtherShareMoney"
@keyup.native="checkPrice(OtherPrice,'OtherShareMoney'),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'OtherShareMoney'),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
...@@ -820,7 +823,6 @@ ...@@ -820,7 +823,6 @@
var CostNumberObj = this.$tripUtils.CostNumber(); var CostNumberObj = this.$tripUtils.CostNumber();
CostNumberObj.PeopleNumber = PeopleNumber; CostNumberObj.PeopleNumber = PeopleNumber;
this.CostNumberList.push(CostNumberObj); this.CostNumberList.push(CostNumberObj);
console.log(this.CostNumberList,'costnumerblist');
this.CurrencyNumberListExt.forEach(x => { this.CurrencyNumberListExt.forEach(x => {
var CurrencyNumberObj = this.$tripUtils.CurrencyNumber(); var CurrencyNumberObj = this.$tripUtils.CurrencyNumber();
CurrencyNumberObj.CurrencyId = x.Key; CurrencyNumberObj.CurrencyId = x.Key;
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ 027cd48f
...@@ -480,7 +480,7 @@ ...@@ -480,7 +480,7 @@
var newMsg = { var newMsg = {
ID: configId ID: configId
}; };
var fileName = "成本下载" + this.DataObj.TeamNum + ".xls"; var fileName = "成本下载" + configId + ".xls";
this.GetLocalFile("quotation_get_DownLoadQuotation", newMsg, fileName, res => { this.GetLocalFile("quotation_get_DownLoadQuotation", newMsg, fileName, res => {
this.loading=false; this.loading=false;
}); });
......
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