Skip to content

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

页面修改

parent 82b62c58
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 77 deletions
src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
View file @ 28e639d2
......@@ -1080,8 +1080,8 @@
</el-upload>
<template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0">
<template v-for="(subItem,subIndex) in teamPrice.ContractArray">
<a style="margin-left:20px;color:blue;" :href="subItem.Url" target="_blank" :key="subIndex"
:download="subItem.Name">{{subItem.Name}}</a>
<a style="margin-left:20px;color:blue;cursor:pointer;" :key="subIndex"
@click="downloadFile(subItem.Url,subItem.Name)">{{subItem.Name}}</a>
</template>
</template>
</td>
......@@ -1126,6 +1126,14 @@
}
},
methods: {
//下载文件
downloadFile(fileUrl, fileName) {
const link = document.createElement('a');
link.href = fileUrl;
link.download = fileName;
document.body.appendChild(link);
link.click();
},
uploadFileBtn(file) { //上传
let newArr = [];
newArr.push(file.file)
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @ 28e639d2
......@@ -66,7 +66,7 @@
<template>
<div>
<div class="CostNewPrice clearfix CP_Div" style="width:980px;">
<div class="CostNewPrice clearfix CP_Div" style="width:1250px;">
<el-form>
<div class="QuotationFirstDiv1">
<table style="font-size:14px;">
......@@ -125,7 +125,7 @@
<td v-for='(item,index) in CostCurrencyList'>
{{item.CurrencyName}}
</td>
<td :colspan="13-2-CostCurrencyList.length+1">
<td :colspan="14-2-CostCurrencyList.length+1">
</td>
</tr>
<tr>
......@@ -133,7 +133,7 @@
<td v-for='item in CostCurrencyList'>
{{item.ExchangeRate}}
</td>
<td :colspan="13-2-CostCurrencyList.length+1">
<td :colspan="14-2-CostCurrencyList.length+1">
</td>
</tr>
<tr>
......@@ -141,7 +141,7 @@
<td v-for="(item,index) in CostNumberList" :key='item.subCode'>
{{item.PeopleNumber}}
</td>
<td width="150" :colspan="13-2-CostNumberList.length+1">
<td width="150" :colspan="14-2-CostNumberList.length+1">
</td>
</tr>
</thead>
......@@ -213,7 +213,7 @@
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{subItem.DinnerCostPrice}}
</td>
<td :rowspan="CostNumberList.length">
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{subItem.RebatePrice}}
</td>
</tr>
......@@ -296,7 +296,7 @@
<td align="center">
<div style="width:100px;">{{subItem.DayNum}}</div>
</td>
<td>
<td colspan="2">
{{subItem.Title}}
</td>
<td>
......@@ -339,9 +339,12 @@
<td>
{{subItem.DinnerCostPrice}}
</td>
<td>
{{subItem.RebatePrice}}
</td>
</tr>
<tr>
<td colspan="3" class="CP_ComTitle2 CostcomCenter">
<td colspan="4" class="CP_ComTitle2 CostcomCenter">
外币小计
</td>
<td>
......@@ -375,9 +378,12 @@
<td>
{{getDayXiaoJi(6,1)}}
</td>
<td>
{{getDayXiaoJi(8,1)}}
</td>
</tr>
<tr>
<td colspan="3" class="CP_ComTitle2 CostcomCenter">
<td colspan="4" class="CP_ComTitle2 CostcomCenter">
人民币小计
</td>
<td>
......@@ -411,14 +417,17 @@
<td>
{{getDayXiaoJi(6,2)}}
</td>
<td>
{{getDayXiaoJi(8,2)}}
</td>
</tr>
</template>
<tr>
<td colspan="13"></td>
<td colspan="14"></td>
</tr>
<tr>
<td class="CP_ComTitle2" colspan="6">内陆段交通部分</td>
<td class="CP_ComTitle2" colspan="6">杂支部分</td>
<td class="CP_ComTitle2" colspan="7">内陆段交通部分</td>
<td class="CP_ComTitle2" colspan="7">杂支部分</td>
</tr>
<tr>
<td class="CP_ComTitle2 CostcomCenter">1</td>
......@@ -426,15 +435,15 @@
<td colspan="2">
{{getCurrencyName(OtherPrice.InlandAirTicketCurrency)}}
</td>
<td colspan="2">
<td colspan="3">
{{OtherPrice.InlandAirTicketMoney}}
</td>
<td class="CP_ComTitle2 CostcomCenter">1</td>
<td colspan="2" class="CP_ComTitle2">签证费(每人)</td>
<td>
<td class="CP_ComTitle2">签证费(每人)</td>
<td colspan="2">
{{getCurrencyName(OtherPrice.VisaMoneyCurrencyId)}}
</td>
<td colspan="2">
<td colspan="3">
{{OtherPrice.VisaMoney}}
</td>
</tr>
......@@ -444,15 +453,15 @@
<td colspan="2">
{{getCurrencyName(OtherPrice.InlandShipTicketCurrency)}}
</td>
<td colspan="2">
<td colspan="3">
{{OtherPrice.InlandShipTicketMoney}}
</td>
<td class="CP_ComTitle2 CostcomCenter">2</td>
<td colspan="2" class="CP_ComTitle2">保险费(每人)</td>
<td>
<td class="CP_ComTitle2">保险费(每人)</td>
<td colspan="2">
{{getCurrencyName(OtherPrice.SafeMoneyCurrencyId)}}
</td>
<td colspan="2">
<td colspan="3">
{{OtherPrice.SafeMoney}}
</td>
</tr>
......@@ -462,15 +471,15 @@
<td colspan="2">
{{getCurrencyName(OtherPrice.InlandTrainTicketCurrency)}}
</td>
<td colspan="2">
<td colspan="3">
{{OtherPrice.InlandTrainTicketMoney}}
</td>
<td class="CP_ComTitle2 CostcomCenter">3</td>
<td colspan="2" class="CP_ComTitle2">领队小费</td>
<td>
<td class="CP_ComTitle2">领队小费</td>
<td colspan="2">
{{getCurrencyName(OtherPrice.LeaderTripMoneyCurrencyId)}}
</td>
<td colspan="2">
<td colspan="3">
{{OtherPrice.LeaderTripMoney}}
</td>
</tr>
......@@ -480,26 +489,26 @@
<td colspan="2">
{{getCurrencyName(OtherPrice.InternationalAirTicketCurrency)}}
</td>
<td colspan="2">
<td colspan="3">
{{OtherPrice.InternationalAirTicket}}
</td>
<td class="CP_ComTitle2 CostcomCenter">4</td>
<td colspan="2" class="CP_ComTitle2">司机、导游小费</td>
<td>
<td class="CP_ComTitle2">司机、导游小费</td>
<td colspan="2">
{{getCurrencyName(OtherPrice.DriverGuideMoneyCurrencyId)}}
</td>
<td colspan="2">
<td colspan="3">
{{OtherPrice.DriverGuideMoney}}
</td>
</tr>
<tr>
<td colspan="6"></td>
<td colspan="7"></td>
<td class="CP_ComTitle2 CostcomCenter">5</td>
<td colspan="2" class="CP_ComTitle2">导游小费</td>
<td>
<td class="CP_ComTitle2">导游小费</td>
<td colspan="2">
{{getCurrencyName(OtherPrice.GuideMoneyCurrencyId)}}
</td>
<td colspan="2">
<td colspan="3">
{{OtherPrice.GuideMoney}}
</td>
</tr>
......@@ -507,13 +516,13 @@
<td class="CP_ComTitle2">
外币小计
</td>
<td colspan="5">
<td colspan="6">
{{trafficXiaoJi(2)}}
</td>
<td class="CP_ComTitle2">
外币小计
</td>
<td colspan="5">
<td colspan="6">
{{zazhiXiaoJi(2)}}
</td>
</tr>
......@@ -521,23 +530,23 @@
<td class="CP_ComTitle2">
人民币小计
</td>
<td colspan="5">
<td colspan="6">
{{ trafficXiaoJi(1) }}
</td>
<td class="CP_ComTitle2">
人民币小计
</td>
<td colspan="5">
<td colspan="6">
{{zazhiXiaoJi(1)}}
</td>
</tr>
<tr>
<td colspan="13"></td>
<td colspan="14"></td>
</tr>
<tr>
<td class="CP_ComTitle2" colspan="4">其他支出</td>
<td class="CP_ComTitle2" colspan="3" style="display:none;">机票</td>
<td class="CP_ComTitle2" colspan="4">收入</td>
<td class="CP_ComTitle2" colspan="5">收入</td>
<td class="CP_ComTitle2" colspan="5">团负费</td>
</tr>
<tr>
......@@ -546,7 +555,7 @@
<td class="CP_ComTitle2 CostcomCenter" colspan="2" style="display:none;">摘要</td>
<td class="CP_ComTitle2 CostcomCenter" style="display:none;">金额<br />(人民币)</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="2">摘要</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="2">金额<br />(人民币)</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="3">金额<br />(人民币)</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="2">摘要</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="3">金额<br />(人民币)</td>
</tr>
......@@ -560,7 +569,7 @@
{{OtherPrice.AirTicketMoeny}}
</td>
<td class="CP_ComTitle2" colspan="2">客人小费收入</td>
<td colspan="2">
<td colspan="3">
{{OtherPrice.TripMoney}}
</td>
<td class="CP_ComTitle2" colspan="2">KB</td>
......@@ -575,7 +584,7 @@
</td>
<td colspan="3" style="display:none;"></td>
<td class="CP_ComTitle2" colspan="2">导游人头费</td>
<td colspan="2">
<td colspan="3">
{{OtherPrice.GuidePeopleMoney}}
</td>
<td colspan="5"></td>
......@@ -596,29 +605,29 @@
<td class="CP_ComTitle2" colspan="2">
人民币小计
</td>
<td colspan="2">
<td colspan="3">
{{Number(OtherPrice.TripMoney)+Number(OtherPrice.GuidePeopleMoney)}}
</td>
<td class="CP_ComTitle2" colspan="2">
人民币小计
</td>
<td colspan="5">
<td colspan="3">
{{Number(OtherPrice.KBMoney)}}
</td>
</tr>
<tr>
<td colspan="12"></td>
<td colspan="14"></td>
</tr>
<tr>
<td colspan="12" class="CP_ComTitle2">领队分摊部分
<td colspan="14" class="CP_ComTitle2">领队分摊部分
</td>
</tr>
<tr>
<td class="CP_ComTitle2 CostcomCenter">人数</td>
<td class="CP_ComTitle2 CostcomCenter">机票</td>
<td class="CP_ComTitle2 CostcomCenter">门票</td>
<td class="CP_ComTitle2 CostcomCenter">领队导游司机住宿</td>
<td class="CP_ComTitle2 CostcomCenter">单房差</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="2">领队导游司机住宿</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="2">单房差</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="2">内陆段交通</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="2">杂费</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="3">小计</td>
......@@ -631,13 +640,12 @@
<td>
{{OtherPrice.TicketShareMoney}}
</td>
<td>
<td colspan="2">
{{OtherPrice.LeaderGuideDriveZhuSu}}
</td>
<td>
<td colspan="2">
{{OtherPrice.SingleRoomShareMoney}}
</td>
<td colspan="2">
{{OtherPrice.InlandTrafficShareMoney}}
</td>
......@@ -650,43 +658,42 @@
<td>{{item.PeopleNumber}}+1</td>
<td>{{item.AirTicketMoney}}</td>
<td>{{item.TicketMoney}}</td>
<td>{{item.LeaderGuideDriveZhuSu}}</td>
<td>{{item.SingleRoomMoney}}</td>
<td colspan="2">{{item.LeaderGuideDriveZhuSu}}</td>
<td colspan="2">{{item.SingleRoomMoney}}</td>
<td colspan="2">{{item.InlandTrafficMoney}}</td>
<td colspan="2">{{item.OtherMoney}}</td>
<td colspan="3">{{item.SubtotalMoney}}</td>
</tr>
<tr>
<td colspan="13"></td>
<td colspan="14"></td>
</tr>
  <tr>
  <td colspan="13" class="CP_ComTitle2">成本回扣  </td>
  <td colspan="14" class="CP_ComTitle2">成本回扣  </td>
</tr>
  <tr> 
<td>导游回补</td>
<td colspan="12"> {{OtherPrice.GuideComplement}} </td>         
<td colspan="13"> {{OtherPrice.GuideComplement}} </td>         
</tr>          
 <tr>   
<td>小费回补</td>
<td colspan="12"> {{OtherPrice.TipComplement}}</td>
<td colspan="13"> {{OtherPrice.TipComplement}}</td>
</tr>           
<tr>      
  <td colspan="13"></td>
  <td colspan="14"></td>
</tr>
<tr>
<td colspan="13" class="CP_ComTitle2">成本统计（以下报价为每人费用）<br />
<td colspan="14" class="CP_ComTitle2">成本统计（以下报价为每人费用）<br />
计算规则: (房+餐+车+景点)*汇率+内陆段交通*汇率+杂支部分*汇率+其他资产+机票票+收入-团负费+领队分摊+地接报价*汇率-导游回补-小费回补
</td>
</tr>
<tr>
<td class="CP_ComTitle2">人数统计
</td>
<td class="CP_ComTitle2">人数统计 </td>
<td class="CP_ComTitle2">成本价(人民币)</td>
<td class="CP_ComTitle2">成本价(日元)</td>
<td class="CP_ComTitle2" colspan="2">销售价格(人民币)</td>
<td class="CP_ComTitle2" colspan="2">销售价格(日元)</td>
<td class="CP_ComTitle2" colspan="2">手配费</td>
<td colspan="6" class="CP_ComTitle2">备注</td>
<td colspan="5" class="CP_ComTitle2">备注</td>
</tr>
<tr v-for="item in CostNumberList" :key="item.subCode">
<td>{{item.PeopleNumber}}+1</td>
......@@ -701,12 +708,12 @@
<td colspan="2">
{{item.ShouPeiFee}}
</td>
<td colspan="6">
<td colspan="5">
{{item.CostRemark}}
</td>
</tr>
<tr>
<td colspan="13"></td>
<td colspan="14"></td>
</tr>
<tr>
<td class="CP_ComTitle2">
......@@ -721,10 +728,10 @@
<td class="CP_ComTitle2" colspan="2">
儿童不占床
</td>
<td class="CP_ComTitle2">
<td class="CP_ComTitle2" colspan="2">
儿童附加费
</td>
<td class="CP_ComTitle2">
<td class="CP_ComTitle2" colspan="2">
老人附加费
</td>
<td class="CP_ComTitle2">
......@@ -747,10 +754,10 @@
<td colspan="2">
{{teamPrice.ChildNoNeedPrice}}
</td>
<td>
<td colspan="2">
{{teamPrice.BabyChargePrice}}
</td>
<td>
<td colspan="2">
{{teamPrice.OldManChargePrice}}
</td>
<td>
......@@ -762,17 +769,17 @@
</tr>
<tr>
<td class="CP_ComTitle2">备注</td>
<td colspan="12">
<td colspan="13">
{{OtherPrice.OtherRemark}}
</td>
</tr>
<tr>
<td class="CP_ComTitle2">附件</td>
<td colspan="11">
<td colspan="13">
<template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0">
<template v-for="(subItem,subIndex) in teamPrice.ContractArray">
<a style="margin-left:20px;color:blue;" :href="subItem.Url" target="_blank" :key="subIndex"
:download="subItem.Name">{{subItem.Name}}</a>
<a style="margin-left:20px;color:blue;cursor:pointer;" target="_blank" :key="subIndex"
@click="downloadFile(subItem.Url,subItem.Name)">{{subItem.Name}}</a>
</template>
</template>
</td>
......@@ -796,7 +803,7 @@
</td>
</tr>
<tr v-if="IsEdit==2">
<td colspan="13" style="text-align:center;">
<td colspan="14" style="text-align:center;">
<input type="button" class="normalBtn" value="同意" @click="SubSaveType(3)" />
<input type="button" class="normalBtn" value="拒绝" @click="SubSaveType(4)" />
</td>
......@@ -822,6 +829,14 @@
}
},
methods: {
//下载文件
downloadFile(fileUrl, fileName) {
const link = document.createElement('a');
link.href = fileUrl;
link.download = fileName;
document.body.appendChild(link);
link.click();
},
//调用父组件方法
SubSaveType(type) {
this.$parent.SaveData(type);
......@@ -965,6 +980,10 @@
if (type == 7) {
xiaoJi += Number(item.PassFee) * Number(currencyRate);
}
//回佣
if (type == 8) {
xiaoJi += Number(item.RebatePrice) * Number(currencyRate);
}
});
return xiaoJi.toFixed(0);
},
......
src/components/TravelManager/TravelNewQuotation/DirectNewQuotation.vue
View file @ 28e639d2
......@@ -144,12 +144,8 @@
:false-label="UnCheckedVaule">不支持儿童出游
</el-checkbox>
<el-form-item label="成本人数" style="margin-left:70px;">
<el-select class='w120' v-model='teamPrice.PeopleNumber'>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<!-- <el-option v-for="item in currentOffer.OfferCostPrice.CostNumberList" :label='item.PeopleNumber'
:value='item.PeopleNumber' :key='item.PeopleNumber'>
</el-option> -->
</el-select>
</el-form-item>
</div>
......
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