Commit 7917aebb authored by 黄奎's avatar 黄奎

页面修改

parent 34a69b3c
......@@ -407,7 +407,7 @@
<td colspan="2">
地接成本<br />(人民币)
</td>
<td colspan="4">
<td colspan="2">
成本<br />[地接成本(人民币)+机票+税金+联运+过夜+签证+保险]
</td>
<td colspan="2">
......@@ -420,6 +420,10 @@
<br />(日币)
</template>
</td>
<td colspan="2">
备注
</td>
</tr>
<!--已填写人数-->
<template v-if="CostNumberList&&CostNumberList.length>0">
......@@ -450,7 +454,7 @@
{{subItem.SubtotalMoney}}
</template>
</td>
<td colspan="4">
<td colspan="2">
{{subItem.TotalMoney}}
</td>
<td colspan="2">
......@@ -461,10 +465,12 @@
{{subItem.JPYSalePrice}}
</template>
</td>
<td colspan="2">
{{subItem.CostRemark}}
</td>
</tr>
</template>
</template>
<tr>
<td colspan="13"></td>
</tr>
......
......@@ -313,7 +313,7 @@
<td colspan="2">
地接成本<br />(人民币)
</td>
<td colspan="4">
<td colspan="2">
成本<br />[地接成本(人民币)+机票+税金+联运+过夜+签证+保险]
</td>
<td colspan="2">
......@@ -326,6 +326,9 @@
<br />(日币)
</template>
</td>
<td colspan="2">
备注
</td>
</tr>
<!--已填写人数-->
<template v-if="CostNumberList&&CostNumberList.length>0">
......@@ -346,9 +349,17 @@
{{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
</td>
<td colspan="2">
{{getLocalTotalMoney(subItem.PeopleNumber)}}
<template v-if="postConfig.LineId==14">
{{getLocalTotalMoney(subItem.PeopleNumber)}}
</template>
<template v-else-if="postConfig.LineId==168">
{{getLocalTotalMoney(subItem.PeopleNumber)}}
</template>
<template v-else>
{{subItem.SubtotalMoney}}
</template>
</td>
<td colspan="4">
<td colspan="2">
{{subItem.TotalMoney}}
</td>
<td colspan="2">
......@@ -359,6 +370,9 @@
{{subItem.JPYSalePrice}}
</template>
</td>
<td colspan="2">
{{subItem.CostRemark}}
</td>
</tr>
</template>
</template>
......
......@@ -423,7 +423,7 @@
<td>
地接成本<br />(人民币)
</td>
<td colspan="4">
<td colspan="2">
成本<br />[地接成本(人民币)+机票+税金+联运+过夜+签证+保险+领队导游分摊]
</td>
<td colspan="2">
......@@ -436,6 +436,9 @@
<br />(日币)
</template>
</td>
<td colspan="2">
备注
</td>
</tr>
<!--已填写人数-->
<template v-if="CostNumberList&&CostNumberList.length>0">
......@@ -448,6 +451,7 @@
{{subItem.PeopleNumber}}
</td>
<td colspan="2">
{{getDayXiaoJi(1,1)}}(酒)+
{{ (getDayXiaoJi(2,1)/subItem.PeopleNumber).toFixed(2)}}(车=总车资/人数)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)
+{{(getDayXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}(杂支=总杂支/人数)
......@@ -468,7 +472,7 @@
</el-input>
</template>
</td>
<td colspan="4">
<td colspan="2">
{{subItem.TotalMoney}}
</td>
<td colspan="2">
......@@ -479,6 +483,9 @@
<el-input v-if="postConfig.LineId==14" type='text' class="w70" v-model="subItem.JPYSalePrice"
@keyup.native="checkPrice(subItem,'JPYSalePrice')" maxlength="8"></el-input>
</td>
<td colspan="2">
<el-input type="textarea" v-model="subItem.CostRemark"></el-input>
</td>
</tr>
</template>
</template>
......
......@@ -181,8 +181,8 @@
<th width="60">{{$t('ground.canshi')}}</th>
<th width="60">{{$t('MarketingActi.car')}}</th>
<th width="60">{{$t('leader.leader_Leader')}}<br />{{$t('ground.baozhang')}}</th>
<th width="60">{{$t('ground.htff')}}</th>
<th width="60">{{$t('ground.bjd')}}</th>
<th width="60">{{$t('ground.htff')}}</th>
<th width="60">{{$t('ground.ldrtf')}}</th>
<th width="120">{{$t('system.table_operation')}}</th>
</tr>
......@@ -382,6 +382,9 @@
<span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span>
</div>
</td>
<td>
<span @click="showDialog(0, item.OfferId)" style="cursor:pointer" v-if="item.OfferId">报价详情</span>
</td>
<td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0'>
<div class="fz16 fbold linkspan"
@click="goUrlLeaderIsApply('TravelPassengerList3',item,outItem,'合团分房表')"
......@@ -390,9 +393,6 @@
<span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span>
</div>
</td>
<td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0'>
<span @click="showDialog(0, item.OfferId)" style="cursor: pointer" v-if="item.OfferId">报价单</span>
</td>
<td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0' style="width: 150px;">
<el-popover width="100" trigger="click" popper-class="DMC_HotelPop">
<table style="width: 100%;" border="0" cellspacing="1" class="dmcTotalTable">
......@@ -519,7 +519,7 @@
</td>
</tr>
<tr :key="index+100">
<td colspan="23" style="text-align: left!important;padding:0 20px;">
<td colspan="24" style="text-align: left!important;padding:0 20px;">
<div class="link">
<p @click="getJourney(item)" style="padding-top:4px;">{{item.Title}}</p>
<div class="colorE95252" style="padding-top:5px;padding-bottom:4px;font-size:13px;">
......
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