Skip to content

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

页面修改

parent 2661ad3e
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 139 deletions
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @ f999f618
...@@ -161,23 +161,21 @@ ...@@ -161,23 +161,21 @@
<td rowspan="2" width='180' class="CP_ComTitle2 CostcomCenter">Day</td> <td rowspan="2" width='180' class="CP_ComTitle2 CostcomCenter">Day</td>
<td rowspan="2" width='200' class="CP_ComTitle2 CostcomCenter">行程大点</td> <td rowspan="2" width='200' class="CP_ComTitle2 CostcomCenter">行程大点</td>
<td rowspan="2" width="100" class="CP_ComTitle2 CostcomCenter">币种</td> <td rowspan="2" width="100" class="CP_ComTitle2 CostcomCenter">币种</td>
<td rowspan="2" width='60' class="CP_ComTitle2 CostcomCenter">酒店</td> <td rowspan="2" width='100' class="CP_ComTitle2 CostcomCenter">酒店</td>
<td colspan="4" width='100' class="CP_ComTitle2 CostcomCenter">车</td> <td colspan="4" width='80' class="CP_ComTitle2 CostcomCenter">车</td>
<td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">门票</td> <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">门票</td>
<td colspan="3" width='100' class="CP_ComTitle2 CostcomCenter">餐</td> <td colspan="3" width='100' class="CP_ComTitle2 CostcomCenter">餐</td>
<td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">回佣</td> <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">回佣</td>
<td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td> <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td>
</tr> </tr>
<tr> <tr>
<td width="120" class="CP_ComTitle2 CostcomCenter">总车资</td> <td width="40" colspan="2" class="CP_ComTitle2 CostcomCenter">车资</td>
<td width="120" class="CP_ComTitle2 CostcomCenter">过路费</td> <td width="40" colspan="2" class="CP_ComTitle2 CostcomCenter">过路费</td>
<td width="100" class="CP_ComTitle2 CostcomCenter">人数</td>
<td width="100" class="CP_ComTitle2 CostcomCenter" style="white-space:nowrap; ">每人车资</td>
<td width="120" class="CP_ComTitle2 CostcomCenter">早</td> <td width="120" 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> <td width="100" class="CP_ComTitle2 CostcomCenter">晚</td>
</tr> </tr>
<template v-if="CostNumberList&&CostNumberList.length>1"> <template v-if="CostNumberList&&CostNumberList.length>1" >
<template v-for="(subItem,subIndex) in dayCostPrice"> <template v-for="(subItem,subIndex) in dayCostPrice">
<template v-for="(childItem,childIndex) in CostNumberList"> <template v-for="(childItem,childIndex) in CostNumberList">
<tr> <tr>
...@@ -191,26 +189,18 @@ ...@@ -191,26 +189,18 @@
{{getCurrencyName(subItem.CurrencyId)}} {{getCurrencyName(subItem.CurrencyId)}}
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{subItem.HotelName}}<br />
<template v-if="subItem.ContainDinnerType==0">含餐类型</template>
<template v-if="subItem.ContainDinnerType==1">含早餐</template> <template v-if="subItem.ContainDinnerType==1">含早餐</template>
<template v-if="subItem.ContainDinnerType==2">含晚餐</template> <template v-if="subItem.ContainDinnerType==2">含晚餐</template>
<template v-if="subItem.ContainDinnerType==3">含晚餐</template> <template v-if="subItem.ContainDinnerType==3">含晚餐</template>
<br /> <br />
{{subItem.HotelCostPrice}} {{subItem.HotelCostPrice}}
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
{{subItem.BusCostPrice}} {{subItem.BusCostPrice}}
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
{{subItem.PassFee}} {{subItem.PassFee}}
</td> </td>
<td>
{{childItem.PeopleNumber}} 人
</td>
<td>
{{((Number(subItem.BusCostPrice)+Number(subItem.PassFee))/Number(childItem.PeopleNumber)).toFixed(0)}}
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{subItem.ScenicCostPrice}} {{subItem.ScenicCostPrice}}
</td> </td>
...@@ -242,18 +232,12 @@ ...@@ -242,18 +232,12 @@
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(1,1)}} {{getDayXiaoJi(1,1)}}
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length" class="2">
{{getDayXiaoJi(2,1)}} {{getDayXiaoJi(2,1)}}
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
{{getDayXiaoJi(7,1)}} {{getDayXiaoJi(7,1)}}
</td> </td>
<td>
{{childItem.PeopleNumber}} 人
</td>
<td>
<!-- {{((Number(getDayXiaoJi(2,1))+Number(getDayXiaoJi(7,1)))/Number(childItem.PeopleNumber)).toFixed(0)}} -->
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(3,1)}} {{getDayXiaoJi(3,1)}}
</td> </td>
...@@ -283,18 +267,12 @@ ...@@ -283,18 +267,12 @@
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(1,2)}} {{getDayXiaoJi(1,2)}}
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
{{getDayXiaoJi(2,2)}} {{getDayXiaoJi(2,2)}}
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
{{getDayXiaoJi(7,2)}} {{getDayXiaoJi(7,2)}}
</td> </td>
<td>
{{childItem.PeopleNumber}} 人
</td>
<td>
<!-- {{((Number(getDayXiaoJi(2,2))+Number(getDayXiaoJi(7,2)))/Number(childItem.PeopleNumber)).toFixed(0)}} -->
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(3,2)}} {{getDayXiaoJi(3,2)}}
</td> </td>
...@@ -336,22 +314,12 @@ ...@@ -336,22 +314,12 @@
<br /> <br />
{{subItem.HotelCostPrice}} {{subItem.HotelCostPrice}}
</td> </td>
<td> <td colspan="2">
{{subItem.BusCostPrice}} {{subItem.BusCostPrice}}
</td> </td>
<td> <td colspan="2">
{{subItem.PassFee}} {{subItem.PassFee}}
</td> </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(subItem.PassFee))/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}}
</template>
</td>
<td> <td>
{{subItem.ScenicCostPrice}} {{subItem.ScenicCostPrice}}
</td> </td>
...@@ -378,22 +346,12 @@ ...@@ -378,22 +346,12 @@
<td> <td>
{{getDayXiaoJi(1,1)}} {{getDayXiaoJi(1,1)}}
</td> </td>
<td> <td colspan="2">
{{getDayXiaoJi(2,1)}} {{getDayXiaoJi(2,1)}}
</td> </td>
<td> <td colspan="2">
{{getDayXiaoJi(7,1)}} {{getDayXiaoJi(7,1)}}
</td> </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(getDayXiaoJi(7,1)))/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}}
</template> -->
</td>
<td> <td>
{{getDayXiaoJi(3,1)}} {{getDayXiaoJi(3,1)}}
</td> </td>
...@@ -420,22 +378,12 @@ ...@@ -420,22 +378,12 @@
<td> <td>
{{getDayXiaoJi(1,2)}} {{getDayXiaoJi(1,2)}}
</td> </td>
<td> <td colspan="2">
{{getDayXiaoJi(2,2)}} {{getDayXiaoJi(2,2)}}
</td> </td>
<td> <td colspan="2">
{{getDayXiaoJi(7,2)}} {{getDayXiaoJi(7,2)}}
</td> </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(getDayXiaoJi(7,2)))/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}}
</template> -->
</td>
<td> <td>
{{getDayXiaoJi(3,2)}} {{getDayXiaoJi(3,2)}}
</td> </td>
...@@ -701,19 +649,19 @@ ...@@ -701,19 +649,19 @@
<tr> <tr>
<td colspan="14"></td> <td colspan="14"></td>
</tr> </tr>
  <tr> <tr>
  <td colspan="14" class="CP_ComTitle2">成本回扣  </td> <td colspan="14" class="CP_ComTitle2">成本回扣  </td>
</tr> </tr>
  <tr>  <tr>
<td>导游回补</td> <td>导游回补</td>
<td colspan="13"> {{OtherPrice.GuideComplement}} </td>          <td colspan="13"> {{OtherPrice.GuideComplement}} </td>
</tr>           </tr>
 <tr>    <tr>
<td>小费回补</td> <td>小费回补</td>
<td colspan="13"> {{OtherPrice.TipComplement}}</td> <td colspan="13"> {{OtherPrice.TipComplement}}</td>
</tr>            </tr>
<tr>       <tr>
  <td colspan="14"></td> <td colspan="14"></td>
</tr> </tr>
<tr> <tr>
<td colspan="14" class="CP_ComTitle2">成本统计（以下报价为每人费用）<br /> <td colspan="14" class="CP_ComTitle2">成本统计（以下报价为每人费用）<br />
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
View file @ f999f618
...@@ -144,15 +144,13 @@ ...@@ -144,15 +144,13 @@
<td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td> <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td>
</tr> </tr>
<tr> <tr>
<td width="80" class="CP_ComTitle2 CostcomCenter">总车资</td> <td width="80" colspan="2" class="CP_ComTitle2 CostcomCenter">总车资</td>
<td width="80" class="CP_ComTitle2 CostcomCenter">过路费</td> <td width="80" colspan="2" class="CP_ComTitle2 CostcomCenter">过路费</td>
<td width="80" class="CP_ComTitle2 CostcomCenter">人数</td>
<td width="80" class="CP_ComTitle2 CostcomCenter">每人<br />车资</td>
<td width="80" class="CP_ComTitle2 CostcomCenter">早</td> <td width="80" class="CP_ComTitle2 CostcomCenter">早</td>
<td width="80" class="CP_ComTitle2 CostcomCenter">中</td> <td width="80" class="CP_ComTitle2 CostcomCenter">中</td>
<td width="80" class="CP_ComTitle2 CostcomCenter">晚</td> <td width="80" class="CP_ComTitle2 CostcomCenter">晚</td>
</tr> </tr>
<template v-if="CostNumberList&&CostNumberList.length>1"> <template v-if="CostNumberList&&CostNumberList.length>1" >
<template v-for="(subItem,subIndex) in dayCostPrice"> <template v-for="(subItem,subIndex) in dayCostPrice">
<template v-for="(childItem,childIndex) in CostNumberList"> <template v-for="(childItem,childIndex) in CostNumberList">
<tr> <tr>
...@@ -185,22 +183,17 @@ ...@@ -185,22 +183,17 @@
@keyup.native="checkPrice(subItem,'HotelCostPrice')" placeholder="酒店价格"></el-input> @keyup.native="checkPrice(subItem,'HotelCostPrice')" placeholder="酒店价格"></el-input>
<br /> <br />
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
<el-input type='text' v-model="subItem.BusCostPrice" class="w60" <el-input type='text' v-model="subItem.BusCostPrice" class="w60"
@keyup.native="checkPrice(subItem,'BusCostPrice'),getchange()"> @keyup.native="checkPrice(subItem,'BusCostPrice'),getchange()">
</el-input> </el-input>
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
<el-input type='text' v-model="subItem.PassFee" class="w60" <el-input type='text' v-model="subItem.PassFee" class="w60"
@keyup.native="checkPrice(subItem,'PassFee'),getchange()"> @keyup.native="checkPrice(subItem,'PassFee'),getchange()">
</el-input> </el-input>
</td> </td>
<td>
{{childItem.PeopleNumber}}
</td>
<td>
{{((Number(subItem.BusCostPrice)+Number(subItem.PassFee))/Number(childItem.PeopleNumber)).toFixed(0)}}
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
<el-input type='text' v-model="subItem.ScenicCostPrice" class="w60" <el-input type='text' v-model="subItem.ScenicCostPrice" class="w60"
@keyup.native="checkPrice(subItem,'ScenicCostPrice'),getchange()"></el-input> @keyup.native="checkPrice(subItem,'ScenicCostPrice'),getchange()"></el-input>
...@@ -242,18 +235,13 @@ ...@@ -242,18 +235,13 @@
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(1,1)}} {{getDayXiaoJi(1,1)}}
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
{{getDayXiaoJi(2,1)}} {{getDayXiaoJi(2,1)}}
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
{{getDayXiaoJi(7,1)}} {{getDayXiaoJi(7,1)}}
</td> </td>
<td>
{{childItem.PeopleNumber}} 人
</td>
<td>
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(3,1)}} {{getDayXiaoJi(3,1)}}
</td> </td>
...@@ -283,18 +271,13 @@ ...@@ -283,18 +271,13 @@
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(1,2)}} {{getDayXiaoJi(1,2)}}
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
{{getDayXiaoJi(2,2)}} {{getDayXiaoJi(2,2)}}
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
{{getDayXiaoJi(7,2)}} {{getDayXiaoJi(7,2)}}
</td> </td>
<td>
{{childItem.PeopleNumber}} 人
</td>
<td>
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(3,2)}} {{getDayXiaoJi(3,2)}}
</td> </td>
...@@ -347,26 +330,17 @@ ...@@ -347,26 +330,17 @@
@keyup.native="checkPrice(subItem,'HotelCostPrice'),getchange()" placeholder="酒店价格"></el-input> @keyup.native="checkPrice(subItem,'HotelCostPrice'),getchange()" placeholder="酒店价格"></el-input>
<br /> <br />
</td> </td>
<td> <td colspan="2">
<el-input type='text' v-model="subItem.BusCostPrice" class="w60" <el-input type='text' v-model="subItem.BusCostPrice" class="w60"
@keyup.native="checkPrice(subItem,'BusCostPrice'),getchange()"> @keyup.native="checkPrice(subItem,'BusCostPrice'),getchange()">
</el-input> </el-input>
</td> </td>
<td> <td colspan="2">
<el-input type='text' v-model="subItem.PassFee" class="w60" <el-input type='text' v-model="subItem.PassFee" class="w60"
@keyup.native="checkPrice(subItem,'PassFee'),getchange()"> @keyup.native="checkPrice(subItem,'PassFee'),getchange()">
</el-input> </el-input>
</td> </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(subItem.PassFee))/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}}
</template>
</td>
<td> <td>
<el-input type='text' v-model="subItem.ScenicCostPrice" class="w60" <el-input type='text' v-model="subItem.ScenicCostPrice" class="w60"
@keyup.native="checkPrice(subItem,'ScenicCostPrice'),getchange()"></el-input> @keyup.native="checkPrice(subItem,'ScenicCostPrice'),getchange()"></el-input>
...@@ -404,19 +378,11 @@ ...@@ -404,19 +378,11 @@
<td> <td>
{{getDayXiaoJi(1,1)}} {{getDayXiaoJi(1,1)}}
</td> </td>
<td> <td colspan="2">
{{getDayXiaoJi(2,1)}} {{getDayXiaoJi(2,1)}}
</td> </td>
<td> <td colspan="2">
{{getDayXiaoJi(7,1)}} {{getDayXiaoJi(7,1)}}
</td>
<td>
<template v-if="CostNumberList&&CostNumberList.length>0">
{{CostNumberList[0].PeopleNumber}} 人
</template>
</td>
<td>
</td> </td>
<td> <td>
{{getDayXiaoJi(3,1)}} {{getDayXiaoJi(3,1)}}
...@@ -444,20 +410,13 @@ ...@@ -444,20 +410,13 @@
<td> <td>
{{getDayXiaoJi(1,2)}} {{getDayXiaoJi(1,2)}}
</td> </td>
<td> <td colspan="2">
{{getDayXiaoJi(2,2)}} {{getDayXiaoJi(2,2)}}
</td> </td>
<td> <td colspan="2">
{{getDayXiaoJi(7,2)}} {{getDayXiaoJi(7,2)}}
</td> </td>
<td>
<template v-if="CostNumberList&&CostNumberList.length>0">
{{CostNumberList[0].PeopleNumber}} 人
</template>
</td>
<td>
</td>
<td> <td>
{{getDayXiaoJi(3,2)}} {{getDayXiaoJi(3,2)}}
</td> </td>
......
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