From f999f6186eb204cbee680d77508d2c396af61a1c Mon Sep 17 00:00:00 2001
From: "HK\\Administrator" <461671400@qq.com>
Date: Thu, 11 May 2023 17:30:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../TravelNewQuotation/CostNewPriceAudit.vue | 104 +++++-------------
.../TravelNewQuotation/CostNewPriceForm.vue | 81 ++++----------
2 files changed, 46 insertions(+), 139 deletions(-)
diff --git a/src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue b/src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
index 7a5ba1d45..d788c9e88 100644
--- a/src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
+++ b/src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
@@ -161,23 +161,21 @@
<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="100" class="CP_ComTitle2 CostcomCenter">å¸ç§</td>
- <td rowspan="2" width='60' class="CP_ComTitle2 CostcomCenter">酒店</td>
- <td colspan="4" width='100' class="CP_ComTitle2 CostcomCenter">车</td>
+ <td rowspan="2" 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 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">其它费用<br />(ä¿é™©ã€å¸å¯¼æ‚è´¹ç‰)</td>
</tr>
<tr>
- <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" style="white-space:nowrap; ">æ¯äººè½¦èµ„</td>
+ <td width="40" colspan="2" 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="100" class="CP_ComTitle2 CostcomCenter">ä¸</td>
<td width="100" class="CP_ComTitle2 CostcomCenter">晚</td>
</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="(childItem,childIndex) in CostNumberList">
<tr>
@@ -191,26 +189,18 @@
{{getCurrencyName(subItem.CurrencyId)}}
</td>
<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==2">å«æ™šé¤</template>
<template v-if="subItem.ContainDinnerType==3">å«æ™šé¤</template>
<br />
{{subItem.HotelCostPrice}}
</td>
- <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+ <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
{{subItem.BusCostPrice}}
</td>
- <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+ <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
{{subItem.PassFee}}
</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">
{{subItem.ScenicCostPrice}}
</td>
@@ -242,18 +232,12 @@
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(1,1)}}
</td>
- <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+ <td v-if="childIndex==0" :rowspan="CostNumberList.length" class="2">
{{getDayXiaoJi(2,1)}}
</td>
- <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+ <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
{{getDayXiaoJi(7,1)}}
</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">
{{getDayXiaoJi(3,1)}}
</td>
@@ -283,18 +267,12 @@
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(1,2)}}
</td>
- <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+ <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
{{getDayXiaoJi(2,2)}}
</td>
- <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+ <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
{{getDayXiaoJi(7,2)}}
</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">
{{getDayXiaoJi(3,2)}}
</td>
@@ -336,22 +314,12 @@
<br />
{{subItem.HotelCostPrice}}
</td>
- <td>
+ <td colspan="2">
{{subItem.BusCostPrice}}
</td>
- <td>
+ <td colspan="2">
{{subItem.PassFee}}
</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>
{{subItem.ScenicCostPrice}}
</td>
@@ -378,22 +346,12 @@
<td>
{{getDayXiaoJi(1,1)}}
</td>
- <td>
+ <td colspan="2">
{{getDayXiaoJi(2,1)}}
</td>
- <td>
+ <td colspan="2">
{{getDayXiaoJi(7,1)}}
</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>
{{getDayXiaoJi(3,1)}}
</td>
@@ -420,22 +378,12 @@
<td>
{{getDayXiaoJi(1,2)}}
</td>
- <td>
+ <td colspan="2">
{{getDayXiaoJi(2,2)}}
</td>
- <td>
+ <td colspan="2">
{{getDayXiaoJi(7,2)}}
</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>
{{getDayXiaoJi(3,2)}}
</td>
@@ -701,19 +649,19 @@
<tr>
<td colspan="14"></td>
</tr>
- Â <tr>
-  <td colspan="14" class="CP_ComTitle2">æˆæœ¬å›žæ‰£Â </td>
+ <tr>
+ <td colspan="14" class="CP_ComTitle2">æˆæœ¬å›žæ‰£Â </td>
</tr>
- Â <tr>Â
+ <tr>
<td>导游回补</td>
- <td colspan="13"> {{OtherPrice.GuideComplement}} </td>Â Â Â Â Â
- </tr> Â Â Â Â Â
- Â <tr>Â Â
+ <td colspan="13"> {{OtherPrice.GuideComplement}} </td>
+ </tr>
+ <tr>
<td>å°è´¹å›žè¡¥</td>
<td colspan="13"> {{OtherPrice.TipComplement}}</td>
- </tr>Â Â Â Â Â Â
- <tr> Â Â Â
- Â <td colspan="14"></td>
+ </tr>
+ <tr>
+ <td colspan="14"></td>
</tr>
<tr>
<td colspan="14" class="CP_ComTitle2">æˆæœ¬ç»Ÿè®¡ï¼ˆä»¥ä¸‹æŠ¥ä»·ä¸ºæ¯äººè´¹ç”¨ï¼‰<br />
diff --git a/src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue b/src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
index 0ca0d7fd6..0fc176d46 100644
--- a/src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
+++ b/src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
@@ -144,15 +144,13 @@
<td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">其它费用<br />(ä¿é™©ã€å¸å¯¼æ‚è´¹ç‰)</td>
</tr>
<tr>
- <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">æ¯äºº<br />车资</td>
+ <td width="80" colspan="2" 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">ä¸</td>
<td width="80" class="CP_ComTitle2 CostcomCenter">晚</td>
</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="(childItem,childIndex) in CostNumberList">
<tr>
@@ -185,22 +183,17 @@
@keyup.native="checkPrice(subItem,'HotelCostPrice')" placeholder="é…’åº—ä»·æ ¼"></el-input>
<br />
</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"
@keyup.native="checkPrice(subItem,'BusCostPrice'),getchange()">
</el-input>
</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"
@keyup.native="checkPrice(subItem,'PassFee'),getchange()">
</el-input>
</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">
<el-input type='text' v-model="subItem.ScenicCostPrice" class="w60"
@keyup.native="checkPrice(subItem,'ScenicCostPrice'),getchange()"></el-input>
@@ -242,18 +235,13 @@
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(1,1)}}
</td>
- <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+ <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
{{getDayXiaoJi(2,1)}}
</td>
- <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+ <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
{{getDayXiaoJi(7,1)}}
</td>
- <td>
- {{childItem.PeopleNumber}} 人
- </td>
- <td>
- </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(3,1)}}
</td>
@@ -283,18 +271,13 @@
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(1,2)}}
</td>
- <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+ <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
{{getDayXiaoJi(2,2)}}
</td>
- <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+ <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
{{getDayXiaoJi(7,2)}}
</td>
- <td>
- {{childItem.PeopleNumber}} 人
- </td>
- <td>
-
- </td>
+
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(3,2)}}
</td>
@@ -347,26 +330,17 @@
@keyup.native="checkPrice(subItem,'HotelCostPrice'),getchange()" placeholder="é…’åº—ä»·æ ¼"></el-input>
<br />
</td>
- <td>
+ <td colspan="2">
<el-input type='text' v-model="subItem.BusCostPrice" class="w60"
@keyup.native="checkPrice(subItem,'BusCostPrice'),getchange()">
</el-input>
</td>
- <td>
- <el-input type='text' v-model="subItem.PassFee" class="w60"
+ <td colspan="2">
+ <el-input type='text' v-model="subItem.PassFee" class="w60"
@keyup.native="checkPrice(subItem,'PassFee'),getchange()">
</el-input>
</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>
<el-input type='text' v-model="subItem.ScenicCostPrice" class="w60"
@keyup.native="checkPrice(subItem,'ScenicCostPrice'),getchange()"></el-input>
@@ -404,19 +378,11 @@
<td>
{{getDayXiaoJi(1,1)}}
</td>
- <td>
+ <td colspan="2">
{{getDayXiaoJi(2,1)}}
</td>
- <td>
+ <td colspan="2">
{{getDayXiaoJi(7,1)}}
- </td>
- <td>
- <template v-if="CostNumberList&&CostNumberList.length>0">
- {{CostNumberList[0].PeopleNumber}} 人
- </template>
- </td>
- <td>
-
</td>
<td>
{{getDayXiaoJi(3,1)}}
@@ -444,20 +410,13 @@
<td>
{{getDayXiaoJi(1,2)}}
</td>
- <td>
+ <td colspan="2">
{{getDayXiaoJi(2,2)}}
</td>
- <td>
+ <td colspan="2">
{{getDayXiaoJi(7,2)}}
</td>
- <td>
- <template v-if="CostNumberList&&CostNumberList.length>0">
- {{CostNumberList[0].PeopleNumber}} 人
- </template>
- </td>
- <td>
-
- </td>
+
<td>
{{getDayXiaoJi(3,2)}}
</td>
--
2.18.1