Commit 82b62c58 authored by 黄奎's avatar 黄奎

页面修改

parent c48df1a3
......@@ -176,7 +176,7 @@
</div>
</div>
<br />
<table class="CostNewTable" style="width:1250px;table-layout:fixed">
<table class="CostNewTable" style="width:1250px;">
<thead>
<tr>
<td colspan="14" class="CP_ComTitle2 CostcomCenter">报价信息</td>
......@@ -259,7 +259,6 @@
{{subItem.DayNum}}
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
<el-input type="textarea" resize="none" class="w250" v-model="subItem.Title"></el-input>
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
......@@ -298,7 +297,7 @@
</el-input>
</td>
<td>
{{childItem.PeopleNumber}}
{{childItem.PeopleNumber}}
</td>
<td>
{{((Number(subItem.BusCostPrice)+Number(subItem.PassFee))/Number(childItem.PeopleNumber)).toFixed(0)}}
......@@ -366,7 +365,7 @@
{{getDayXiaoJi(6,1)}}
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(8,1)}}
</td>
</tr>
</template>
......@@ -404,7 +403,7 @@
{{getDayXiaoJi(6,2)}}
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(8,2)}}
</td>
</tr>
</template>
......@@ -414,7 +413,7 @@
<td align="center">
{{subItem.DayNum}}
</td>
<td>
<td colspan="2">
<el-input type="textarea" resize="none" class="w250" v-model="subItem.Title"></el-input>
</td>
<td>
......@@ -483,9 +482,13 @@
v-model='subItem.DinnerCostPrice' class="w60"
@keyup.native="checkPrice(subItem,'DinnerCostPrice'),getchange()"></el-input>
</td>
<td style="border:1px solid red">
<el-input type="text" v-model='subItem.RebatePrice' class="w60"
@keyup.native="checkPrice(subItem,'RebatePrice'),getchange()"></el-input>
</td>
</tr>
<tr>
<td colspan="3" class="CP_ComTitle2 CostcomCenter">
<td colspan="4" class="CP_ComTitle2 CostcomCenter">
外币小计
</td>
<td>
......@@ -519,9 +522,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>
......@@ -555,19 +561,22 @@
<td>
{{getDayXiaoJi(6,2)}}
</td>
<td>
{{getDayXiaoJi(8,2)}}
</td>
</tr>
</template>
<tr>
<td colspan="12"></td>
<td colspan="14"></td>
</tr>
<tr>
<td class="CP_ComTitle2" colspan="5">交通部分</td>
<td class="CP_ComTitle2" colspan="7">交通部分</td>
<td class="CP_ComTitle2" colspan="7">杂支部分</td>
</tr>
<tr>
<td class="CP_ComTitle2 CostcomCenter">1</td>
<td class="CP_ComTitle2">内陆段机位(每人)</td>
<td>
<td colspan="2">
<el-form-item>
<el-select v-model='OtherPrice.InlandAirTicketCurrency' class="w70">
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
......@@ -577,15 +586,15 @@
</el-select>
</el-form-item>
</td>
<td colspan="2">
<td colspan="3">
<el-form-item>
<el-input type='text' class="w100" v-model="OtherPrice.InlandAirTicketMoney"
@keyup.native="checkPrice(OtherPrice,'InlandAirTicketMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td class="CP_ComTitle2 CostcomCenter">1</td>
<td colspan="2" class="CP_ComTitle2">签证费(每人)</td>
<td>
<td class="CP_ComTitle2">签证费(每人)</td>
<td colspan="2">
<el-form-item>
<el-select v-model='OtherPrice.VisaMoneyCurrencyId' class="w70">
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
......@@ -605,7 +614,7 @@
<tr>
<td class="CP_ComTitle2 CostcomCenter">2</td>
<td class="CP_ComTitle2">内陆段船票(每人)</td>
<td>
<td colspan="2">
<el-form-item>
<el-select v-model='OtherPrice.InlandShipTicketCurrency' class="w70">
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
......@@ -615,15 +624,15 @@
</el-select>
</el-form-item>
</td>
<td colspan="2">
<td colspan="3">
<el-form-item>
<el-input type='text' class="w100" v-model="OtherPrice.InlandShipTicketMoney"
@keyup.native="checkPrice(OtherPrice,'InlandShipTicketMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td class="CP_ComTitle2 CostcomCenter">2</td>
<td colspan="2" class="CP_ComTitle2">保险费(每人)</td>
<td>
<td class="CP_ComTitle2">保险费(每人)</td>
<td colspan="2">
<el-form-item>
<el-select v-model='OtherPrice.SafeMoneyCurrencyId' class="w70">
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
......@@ -643,7 +652,7 @@
<tr>
<td class="CP_ComTitle2 CostcomCenter">3</td>
<td class="CP_ComTitle2">内陆段火车票(每人)</td>
<td>
<td colspan="2">
<el-form-item>
<el-select v-model='OtherPrice.InlandTrainTicketCurrency' class="w70">
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
......@@ -653,15 +662,15 @@
</el-select>
</el-form-item>
</td>
<td colspan="2">
<td colspan="3">
<el-form-item>
<el-input type='text' class="w100" v-model="OtherPrice.InlandTrainTicketMoney"
@keyup.native="checkPrice(OtherPrice,'InlandTrainTicketMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td class="CP_ComTitle2 CostcomCenter">3</td>
<td colspan="2" class="CP_ComTitle2">领队小费</td>
<td>
<td class="CP_ComTitle2">领队小费</td>
<td colspan="2">
<el-form-item>
<el-select v-model='OtherPrice.LeaderTripMoneyCurrencyId' class="w70">
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
......@@ -681,7 +690,7 @@
<tr>
<td class="CP_ComTitle2 CostcomCenter">4</td>
<td class="CP_ComTitle2">国际段机票(每人)</td>
<td>
<td colspan="2">
<el-form-item>
<el-select v-model='OtherPrice.InternationalAirTicketCurrency' class="w70">
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
......@@ -691,15 +700,15 @@
</el-select>
</el-form-item>
</td>
<td colspan="2">
<td colspan="3">
<el-form-item>
<el-input type='text' class="w100" v-model="OtherPrice.InternationalAirTicket"
@keyup.native="checkPrice(OtherPrice,'InternationalAirTicket'),getchange()"></el-input>
</el-form-item>
</td>
<td class="CP_ComTitle2 CostcomCenter">4</td>
<td colspan="2" class="CP_ComTitle2">司机小费</td>
<td>
<td class="CP_ComTitle2">司机小费</td>
<td colspan="2">
<el-form-item>
<el-select v-model='OtherPrice.DriverGuideMoneyCurrencyId' class="w70">
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
......@@ -717,10 +726,10 @@
</td>
</tr>
<tr>
<td colspan="5"></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">
<el-form-item>
<el-select v-model='OtherPrice.GuideMoneyCurrencyId' class="w70">
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
......@@ -741,7 +750,7 @@
<td class="CP_ComTitle2">
外币小计
</td>
<td colspan="4">
<td colspan="6">
{{trafficXiaoJi(2)}}
</td>
<td class="CP_ComTitle2">
......@@ -755,7 +764,7 @@
<td class="CP_ComTitle2">
人民币小计
</td>
<td colspan="4">
<td colspan="6">
{{ trafficXiaoJi(1) }}
</td>
<td class="CP_ComTitle2">
......@@ -766,24 +775,24 @@
</td>
</tr>
<tr>
<td colspan="12"></td>
<td colspan="14"></td>
</tr>
<tr>
<td class="CP_ComTitle2" colspan="2">其他支出</td>
<td class="CP_ComTitle2" colspan="4">其他支出</td>
<td class="CP_ComTitle2" colspan="5">收入</td>
<td class="CP_ComTitle2" colspan="5">团负费</td>
</tr>
<tr>
<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="3">金额(人民币)</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="2">摘要</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="3">金额(人民币)</td>
</tr>
<tr>
<td class="CP_ComTitle2">销售提成1%</td>
<td>
<td class="CP_ComTitle2" colspan="2">销售提成1%</td>
<td colspan="2">
<el-form-item>
<el-input type='text' class="w120" v-model="OtherPrice.SalesCommissionMoney"
@keyup.native="checkPrice(OtherPrice,'SalesCommissionMoney'),getchange()"></el-input>
......@@ -805,14 +814,13 @@
</td>
</tr>
<tr>
<td class="CP_ComTitle2">作业处提成</td>
<td>
<td class="CP_ComTitle2" colspan="2">作业处提成</td>
<td colspan="2">
<el-form-item>
<el-input type='text' class="w120" v-model="OtherPrice.OfficeCommissionMoney"
@keyup.native="checkPrice(OtherPrice,'OfficeCommissionMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td class="CP_ComTitle2" colspan="2">导游人头费</td>
<td colspan="3">
<el-form-item>
......@@ -823,10 +831,10 @@
<td colspan="5"></td>
</tr>
<tr>
<td class="CP_ComTitle2">
<td class="CP_ComTitle2" colspan="2">
人民币小计
</td>
<td>
<td colspan="2">
{{Number(OtherPrice.SalesCommissionMoney)+Number(OtherPrice.OfficeCommissionMoney)}}
</td>
<td class="CP_ComTitle2" colspan="2">
......@@ -843,10 +851,10 @@
</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">领队分摊部分
<span style="color:red;padding-left:5px;">
领队导游分摊,请直接输入人民币
</span>
......@@ -854,8 +862,8 @@
</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" colspan="2">机票</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="2">门票</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="2">领队导游司机住宿</td>
<td class="CP_ComTitle2 CostcomCenter">单房差</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="2">内陆段交通</td>
......@@ -864,13 +872,13 @@
</tr>
<tr>
<td></td>
<td>
<td colspan="2">
<el-form-item>
<el-input type='text' class="w120" v-model="OtherPrice.AirTicketShareMoney"
@keyup.native="checkPrice(OtherPrice,'AirTicketShareMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td>
<td colspan="2">
<el-form-item>
<el-input type='text' class="w70" v-model="OtherPrice.TicketShareMoney"
@keyup.native="checkPrice(OtherPrice,'TicketShareMoney'),getchange()"></el-input>
......@@ -904,8 +912,8 @@
</tr>
<tr v-for="item in CostNumberList" :key="item.subCode">
<td>{{item.PeopleNumber}}+1</td>
<td>{{item.AirTicketMoney}}</td>
<td>{{item.TicketMoney}}</td>
<td colspan="2">{{item.AirTicketMoney}}</td>
<td colspan="2">{{item.TicketMoney}}</td>
<td colspan="2">{{item.LeaderGuideDriveZhuSu}}</td>
<td>{{item.SingleRoomMoney}}</td>
<td colspan="2">{{item.InlandTrafficMoney}}</td>
......@@ -913,10 +921,10 @@
<td colspan="2">{{item.SubtotalMoney}}</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">成本回扣
<span style="color:red;padding-left:5px;">
成本回扣,请直接输入人民币
</span>
......@@ -924,7 +932,7 @@
</tr>
<tr>
<td>导游回补</td>
<td colspan="11">
<td colspan="13">
<el-form-item>
<el-input type='text' class="w70" v-model="OtherPrice.GuideComplement"
@keyup.native="checkPrice(OtherPrice,'GuideComplement'),getchange()">></el-input>
......@@ -933,7 +941,7 @@
</tr>
<tr>
<td>小费回补</td>
<td colspan="11">
<td colspan="13">
<el-form-item>
<el-input type='text' class="w70" v-model="OtherPrice.TipComplement"
@keyup.native="checkPrice(OtherPrice,'TipComplement'),getchange()"></el-input>
......@@ -941,10 +949,10 @@
</td>
</tr>
<tr>
<td colspan="12"></td>
<td colspan="14"></td>
</tr>
<tr>
<td colspan="12" class="CP_ComTitle2">成本统计(以下报价为每人费用)<br />
<td colspan="14" class="CP_ComTitle2">成本统计(以下报价为每人费用)<br />
计算规则: (房+餐+车+景点)*汇率+内陆段交通*汇率+杂支部分*汇率+其他资产+机票票+收入-团负费+领队分摊+地接报价*汇率-导游回补-小费回补
</td>
</tr>
......@@ -955,7 +963,7 @@
<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>
......@@ -973,12 +981,12 @@
<el-input type='text' class="w70" v-model="item.ShouPeiFee"
@keyup.native="checkPrice(item,'ShouPeiFee',true)" maxlength="8"></el-input>
</td>
<td colspan="8">
<td colspan="5">
<el-input type="textarea" v-model="item.CostRemark"></el-input>
</td>
</tr>
<tr>
<td colspan="12"></td>
<td colspan="14"></td>
</tr>
<tr>
<td class="CP_ComTitle2">
......@@ -999,10 +1007,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>
</tr>
......@@ -1037,12 +1045,12 @@
@keyup.native="checkInteger(teamPrice,'OldManChargePrice')" class="w70">
</el-input>
</td>
<td>
<td colspan="2">
<el-input placeholder="" v-model="teamPrice.VisaPrice" @keyup.native="checkPrice(teamPrice,'VisaPrice')"
class="w70">
</el-input>
</td>
<td>
<td colspan="2">
<el-input placeholder="" v-model="teamPrice.SingleRoomPrice"
@keyup.native="checkPrice(teamPrice,'SingleRoomPrice')" class="w70">
</el-input>
......@@ -1065,7 +1073,7 @@
</tr>
<tr>
<td class="CP_ComTitle2">附件</td>
<td colspan="11">
<td colspan="13">
<el-upload class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;"
:http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
<el-button size="small" type="primary">报价单附件</el-button>
......@@ -1073,7 +1081,7 @@
<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>
:download="subItem.Name">{{subItem.Name}}</a>
</template>
</template>
</td>
......@@ -1301,6 +1309,10 @@
if (type == 7) {
xiaoJi += Number(item.PassFee) * Number(currencyRate);
}
//回佣
if (type == 8) {
xiaoJi += Number(item.RebatePrice) * Number(currencyRate);
}
});
return xiaoJi.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