页面修改

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -66,7 +66,7 @@
 
 <template>
   <div>
-    <div class="CostNewPrice clearfix CP_Div" style="width:1250px;">
+    <div class="CostNewPrice clearfix CP_Div" style="width:1350px;">
       <el-form>
         <div class="QuotationFirstDiv1">
           <table style="font-size:14px;">
@@ -132,14 +132,14 @@
         <table class="CostPriceTable CostNewTable">
           <thead>
             <tr>
-              <td colspan="14" class="CP_ComTitle2 CostcomCenter">成本预算信息</td>
+              <td colspan="12" class="CP_ComTitle2 CostcomCenter">成本预算信息</td>
             </tr>
             <tr>
               <td width="170" class="CP_ComTitle2 CostcomCenter">币种</td>
               <td v-for='(item,index) in CostCurrencyList'>
                 {{item.CurrencyName}}
               </td>
-              <td :colspan="14-2-CostCurrencyList.length+1">
+              <td :colspan="12-2-CostCurrencyList.length+1">
               </td>
             </tr>
             <tr>
@@ -147,7 +147,7 @@
               <td v-for='item in CostCurrencyList'>
                 {{item.ExchangeRate}}
               </td>
-              <td :colspan="14-2-CostCurrencyList.length+1">
+              <td :colspan="12-2-CostCurrencyList.length+1">
               </td>
             </tr>
             <tr>
@@ -155,27 +155,27 @@
               <td v-for="(item,index) in CostNumberList" :key='item.subCode'>
                 {{item.PeopleNumber}}
               </td>
-              <td width="150" :colspan="14-2-CostNumberList.length+1">
+              <td width="150" :colspan="12-2-CostNumberList.length+1">
               </td>
             </tr>
           </thead>
           <tr>
-            <td colspan="14"></td>
+            <td colspan="12"></td>
           </tr>
           <tr>
             <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='100' class="CP_ComTitle2 CostcomCenter">酒店</td>
-            <td colspan="4" width='80' class="CP_ComTitle2 CostcomCenter">车</td>
+            <td rowspan="2" style="width:200px;" class="CP_ComTitle2 CostcomCenter">酒店</td>
+            <td colspan="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 rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">回佣</td>
             <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td>
           </tr>
           <tr>
-            <td width="40" colspan="2" class="CP_ComTitle2 CostcomCenter">车资</td>
-            <td width="40" colspan="2" class="CP_ComTitle2 CostcomCenter">过路费</td>
+            <td width="40" class="CP_ComTitle2 CostcomCenter">车资</td>
+            <td width="40" 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>
@@ -193,18 +193,18 @@
                   <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                     {{getCurrencyName(subItem.CurrencyId)}}
                   </td>
-                  <td v-if="childIndex==0" :rowspan="CostNumberList.length">
-                    {{subItem.HotelName}}<br />
+                  <td v-if="childIndex==0" :rowspan="CostNumberList.length" style="width:200px;">
+                    酒店名称: {{subItem.HotelName}}<br />
                     <template v-if="subItem.ContainDinnerType==1">含早餐</template>
                     <template v-if="subItem.ContainDinnerType==2">含晚餐</template>
                     <template v-if="subItem.ContainDinnerType==3">含晚餐</template>
                     <br />
-                    {{subItem.HotelCostPrice}}
+                    价格: {{subItem.HotelCostPrice}}
                   </td>
-                  <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
+                  <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                     {{subItem.BusCostPrice}}
                   </td>
-                  <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
+                  <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                     {{subItem.PassFee}}
                   </td>
                   <td v-if="childIndex==0" :rowspan="CostNumberList.length">
@@ -237,10 +237,10 @@
                 <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                   {{getDayXiaoJi(1,1)}}
                 </td>
-                <td v-if="childIndex==0" :rowspan="CostNumberList.length" class="2">
+                <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                   {{getDayXiaoJi(2,1)}}
                 </td>
-                <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
+                <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                   {{getDayXiaoJi(7,1)}}
                 </td>
                 <td v-if="childIndex==0" :rowspan="CostNumberList.length">
@@ -272,10 +272,10 @@
                 <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                   {{getDayXiaoJi(1,2)}}
                 </td>
-                <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
+                <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                   {{getDayXiaoJi(2,2)}}
                 </td>
-                <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
+                <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                   {{getDayXiaoJi(7,2)}}
                 </td>
                 <td v-if="childIndex==0" :rowspan="CostNumberList.length">
@@ -310,19 +310,19 @@
               <td>
                 {{getCurrencyName(subItem.CurrencyId)}}
               </td>
-              <td>
-                {{subItem.HotelName}}<br />
+              <td style="width:200px;">
+                酒店名称:{{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}}
+                价格:{{subItem.HotelCostPrice}}
               </td>
-              <td colspan="2">
+              <td>
                 {{subItem.BusCostPrice}}
               </td>
-              <td colspan="2">
+              <td>
                 {{subItem.PassFee}}
               </td>
               <td>
@@ -351,10 +351,10 @@
               <td>
                 {{getDayXiaoJi(1,1)}}
               </td>
-              <td colspan="2">
+              <td>
                 {{getDayXiaoJi(2,1)}}
               </td>
-              <td colspan="2">
+              <td>
                 {{getDayXiaoJi(7,1)}}
               </td>
               <td>
@@ -383,10 +383,10 @@
               <td>
                 {{getDayXiaoJi(1,2)}}
               </td>
-              <td colspan="2">
+              <td>
                 {{getDayXiaoJi(2,2)}}
               </td>
-              <td colspan="2">
+              <td>
                 {{getDayXiaoJi(7,2)}}
               </td>
               <td>
@@ -410,11 +410,11 @@
             </tr>
           </template>
           <tr>
-            <td colspan="14"></td>
+            <td colspan="12"></td>
           </tr>
           <tr>
-            <td class="CP_ComTitle2" colspan="7">内陆段交通部分</td>
-            <td class="CP_ComTitle2" colspan="7">杂支部分</td>
+            <td class="CP_ComTitle2" colspan="6">内陆段交通部分</td>
+            <td class="CP_ComTitle2" colspan="6">杂支部分</td>
           </tr>
           <tr>
             <td class="CP_ComTitle2 CostcomCenter">1</td>
@@ -422,7 +422,7 @@
             <td colspan="2">
               {{getCurrencyName(OtherPrice.InlandAirTicketCurrency)}}
             </td>
-            <td colspan="3">
+            <td colspan="2">
               {{OtherPrice.InlandAirTicketMoney}}
             </td>
             <td class="CP_ComTitle2 CostcomCenter">1</td>
@@ -430,7 +430,7 @@
             <td colspan="2">
               {{getCurrencyName(OtherPrice.VisaMoneyCurrencyId)}}
             </td>
-            <td colspan="3">
+            <td colspan="2">
               {{OtherPrice.VisaMoney}}
             </td>
           </tr>
@@ -440,7 +440,7 @@
             <td colspan="2">
               {{getCurrencyName(OtherPrice.InlandShipTicketCurrency)}}
             </td>
-            <td colspan="3">
+            <td colspan="2">
               {{OtherPrice.InlandShipTicketMoney}}
             </td>
             <td class="CP_ComTitle2 CostcomCenter">2</td>
@@ -448,7 +448,7 @@
             <td colspan="2">
               {{getCurrencyName(OtherPrice.SafeMoneyCurrencyId)}}
             </td>
-            <td colspan="3">
+            <td colspan="2">
               {{OtherPrice.SafeMoney}}
             </td>
           </tr>
@@ -458,7 +458,7 @@
             <td colspan="2">
               {{getCurrencyName(OtherPrice.InlandTrainTicketCurrency)}}
             </td>
-            <td colspan="3">
+            <td colspan="2">
               {{OtherPrice.InlandTrainTicketMoney}}
             </td>
             <td class="CP_ComTitle2 CostcomCenter">3</td>
@@ -466,7 +466,7 @@
             <td colspan="2">
               {{getCurrencyName(OtherPrice.LeaderTripMoneyCurrencyId)}}
             </td>
-            <td colspan="3">
+            <td colspan="2">
               {{OtherPrice.LeaderTripMoney}}
             </td>
           </tr>
@@ -476,7 +476,7 @@
             <td colspan="2">
               {{getCurrencyName(OtherPrice.InternationalAirTicketCurrency)}}
             </td>
-            <td colspan="3">
+            <td colspan="2">
               {{OtherPrice.InternationalAirTicket}}
             </td>
             <td class="CP_ComTitle2 CostcomCenter">4</td>
@@ -484,18 +484,18 @@
             <td colspan="2">
               {{getCurrencyName(OtherPrice.DriverGuideMoneyCurrencyId)}}
             </td>
-            <td colspan="3">
+            <td colspan="2">
               {{OtherPrice.DriverGuideMoney}}
             </td>
           </tr>
           <tr>
-            <td colspan="7"></td>
+            <td colspan="6"></td>
             <td class="CP_ComTitle2 CostcomCenter">5</td>
             <td class="CP_ComTitle2">导游小费(每人)</td>
             <td colspan="2">
               {{getCurrencyName(OtherPrice.GuideMoneyCurrencyId)}}
             </td>
-            <td colspan="3">
+            <td colspan="2">
               {{OtherPrice.GuideMoney}}
             </td>
           </tr>
@@ -503,13 +503,13 @@
             <td class="CP_ComTitle2">
               外币小计
             </td>
-            <td colspan="6">
+            <td colspan="5">
               {{trafficXiaoJi(2)}}
             </td>
             <td class="CP_ComTitle2">
               外币小计
             </td>
-            <td colspan="6">
+            <td colspan="5">
               {{zazhiXiaoJi(2)}}
             </td>
           </tr>
@@ -517,34 +517,31 @@
             <td class="CP_ComTitle2">
               人民币小计
             </td>
-            <td colspan="6">
+            <td colspan="5">
               {{ trafficXiaoJi(1) }}
             </td>
             <td class="CP_ComTitle2">
               人民币小计
             </td>
-            <td colspan="6">
+            <td colspan="5">
               {{zazhiXiaoJi(1)}}
             </td>
           </tr>
           <tr>
-            <td colspan="14"></td>
+            <td colspan="12"></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="5">收入</td>
-            <td class="CP_ComTitle2" colspan="5">团负费</td>
+            <td class="CP_ComTitle2" colspan="4">收入</td>
+            <td class="CP_ComTitle2" colspan="4">团负费</td>
           </tr>
           <tr>
             <td class="CP_ComTitle2 CostcomCenter" colspan="2">摘要</td>
             <td class="CP_ComTitle2 CostcomCenter" colspan="2">金额<br />(人民币)</td>
-            <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="3">金额<br />(人民币)</td>
+            <td class="CP_ComTitle2 CostcomCenter" colspan="2">金额<br />(人民币)</td>
             <td class="CP_ComTitle2 CostcomCenter" colspan="2">摘要</td>
-            <td class="CP_ComTitle2 CostcomCenter" colspan="3">金额<br />(人民币)</td>
+            <td class="CP_ComTitle2 CostcomCenter" colspan="2">金额<br />(人民币)</td>
           </tr>
           <tr>
             <td style="white-space:nowrap; " class="CP_ComTitle2" colspan="2">销售提成1%</td>
@@ -556,11 +553,11 @@
               {{OtherPrice.AirTicketMoeny}}
             </td>
             <td class="CP_ComTitle2" colspan="2">客人小费收入</td>
-            <td colspan="3">
+            <td colspan="2">
               {{OtherPrice.TripMoney}}
             </td>
             <td class="CP_ComTitle2" colspan="2">KB</td>
-            <td colspan="3">
+            <td colspan="2">
               {{OtherPrice.KBMoney}}
             </td>
           </tr>
@@ -569,12 +566,12 @@
             <td colspan="2">
               {{OtherPrice.OfficeCommissionMoney}}
             </td>
-            <td colspan="3" style="display:none;"></td>
+            <td colspan="2" style="display:none;"></td>
             <td class="CP_ComTitle2" colspan="2">导游人头费</td>
-            <td colspan="3">
+            <td colspan="2">
               {{OtherPrice.GuidePeopleMoney}}
             </td>
-            <td colspan="5"></td>
+            <td colspan="4"></td>
           </tr>
           <tr>
             <td class="CP_ComTitle2" colspan="2">
@@ -583,38 +580,33 @@
             <td colspan="2">
               {{Number(OtherPrice.SalesCommissionMoney)+Number(OtherPrice.OfficeCommissionMoney)}}
             </td>
-            <td class="CP_ComTitle2" style="display:none;">
-              人民币小计
-            </td>
-            <td colspan="2" style="display:none;">
-              {{Number(OtherPrice.AirTicketMoeny)}}
-            </td>
+
             <td class="CP_ComTitle2" colspan="2">
               人民币小计
             </td>
-            <td colspan="3">
+            <td colspan="2">
               {{Number(OtherPrice.TripMoney)+Number(OtherPrice.GuidePeopleMoney)}}
             </td>
             <td class="CP_ComTitle2" colspan="2">
               人民币小计
             </td>
-            <td colspan="3">
+            <td colspan="2">
               {{Number(OtherPrice.KBMoney)}}
             </td>
           </tr>
           <tr>
-            <td colspan="14"></td>
+            <td colspan="12"></td>
           </tr>
           <tr>
-            <td colspan="14" class="CP_ComTitle2">领队分摊部分
+            <td colspan="12" 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" colspan="2">领队导游司机住宿</td>
-            <td class="CP_ComTitle2 CostcomCenter" colspan="2">单房差</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="3">小计</td>
@@ -627,10 +619,10 @@
             <td>
               {{OtherPrice.TicketShareMoney}}
             </td>
-            <td colspan="2">
+            <td>
               {{OtherPrice.LeaderGuideDriveZhuSu}}
             </td>
-            <td colspan="2">
+            <td>
               {{OtherPrice.SingleRoomShareMoney}}
             </td>
             <td colspan="2">
@@ -645,56 +637,56 @@
             <td>{{item.PeopleNumber}}+1</td>
             <td>{{item.AirTicketMoney}}</td>
             <td>{{item.TicketMoney}}</td>
-            <td colspan="2">{{item.LeaderGuideDriveZhuSu}}</td>
-            <td colspan="2">{{item.SingleRoomMoney}}</td>
+            <td>{{item.LeaderGuideDriveZhuSu}}</td>
+            <td>{{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="14"></td>
+            <td colspan="12"></td>
           </tr>
           <tr>
-            <td colspan="14" class="CP_ComTitle2">成本回扣  </td>
+            <td colspan="12" class="CP_ComTitle2">成本回扣  </td>
           </tr>
           <tr>
             <td>导游回补</td>
-            <td colspan="13"> {{OtherPrice.GuideComplement}} </td>
+            <td colspan="11"> {{OtherPrice.GuideComplement}} </td>
           </tr>
           <tr>
             <td>小费回补</td>
-            <td colspan="13"> {{OtherPrice.TipComplement}}</td>
+            <td colspan="11"> {{OtherPrice.TipComplement}}</td>
           </tr>
           <tr>
-            <td colspan="14"></td>
+            <td colspan="12"></td>
           </tr>
           <tr>
-            <td colspan="14" class="CP_ComTitle2">成本统计（以下报价为每人费用）<br />
+            <td colspan="12" class="CP_ComTitle2">成本统计（以下报价为每人费用）<br />
               计算规则: (房+餐+车+景点)*汇率+内陆段交通*汇率+杂支部分*汇率+其他资产+机票票+收入-团负费+领队分摊+地接报价*汇率-导游回补-小费回补
             </td>
           </tr>
           <tr>
             <td class="CP_ComTitle2">人数统计 </td>
             <td class="CP_ComTitle2">成本价(人民币)</td>
-            <td class="CP_ComTitle2"><template v-if="postConfig.LineId==14">成本价(日元)</template></td>
-            <td class="CP_ComTitle2"><template v-if="postConfig.LineId==14">成本总价(日元)</template></td>
+            <td class="CP_ComTitle2"><template v-if="postConfig.LineId==14">成本价(日元)</template></td>
+            <td class="CP_ComTitle2"><template v-if="postConfig.LineId==14">成本总价(日元)</template></td>
             <td class="CP_ComTitle2">销售价格(人民币)</td>
-            <td class="CP_ComTitle2"><template v-if="postConfig.LineId==14">销售价格(日元)</template></td>
+            <td class="CP_ComTitle2"><template v-if="postConfig.LineId==14">销售价格(日元)</template></td>
             <td class="CP_ComTitle2">销售付款方式</td>
             <td class="CP_ComTitle2">手配费</td>
             <td class="CP_ComTitle2">手配费付款方式</td>
-            <td colspan="5" class="CP_ComTitle2">备注</td>
+            <td colspan="3" class="CP_ComTitle2">备注</td>
           </tr>
           <tr v-for="item in CostNumberList" :key="item.subCode">
             <td>{{item.PeopleNumber}}+1</td>
             <td>{{item.TotalMoney}}</td>
-            <td><template v-if="postConfig.LineId==14">{{item.JPYTotalMoney}}</template></td>
-            <td><template v-if="postConfig.LineId==14">{{item.JPYTotalMoney*item.PeopleNumber}}</template></td>
+            <td><template v-if="postConfig.LineId==14">{{item.JPYTotalMoney}}</template></td>
+            <td><template v-if="postConfig.LineId==14">{{item.JPYTotalMoney*item.PeopleNumber}}</template></td>
             <td>
               {{item.SalePrice}}
             </td>
             <td>
-              <template v-if="postConfig.LineId==14">{{item.JPYSalePrice}}</template>
+              <template v-if="postConfig.LineId==14">{{item.JPYSalePrice}}</template>
             </td>
             <td>
               <template v-if="postConfig.SaleOfferPayType==1">
@@ -721,21 +713,21 @@
                 外站自理
               </template>
             </td>
-            <td colspan="5">
+            <td colspan="3">
               {{item.CostRemark}}
             </td>
           </tr>
           <tr>
-            <td colspan="14"></td>
+            <td colspan="12"></td>
           </tr>
           <tr>
             <td class="CP_ComTitle2">
               婴儿
             </td>
-            <td class="CP_ComTitle2" colspan="2">
+            <td class="CP_ComTitle2" >
               单地接
             </td>
-            <td class="CP_ComTitle2" colspan="2">
+            <td class="CP_ComTitle2" >
               儿童占床
             </td>
             <td class="CP_ComTitle2" colspan="2">
@@ -758,10 +750,10 @@
             <td>
               {{teamPrice.BabyPrice}}
             </td>
-            <td colspan="2">
+            <td >
               {{teamPrice.SingleDMCPrice}}
             </td>
-            <td colspan="2">
+            <td >
               {{teamPrice.ChildNeedPrice}}
             </td>
             <td colspan="2">
@@ -782,7 +774,7 @@
           </tr>
           <tr>
             <td class="CP_ComTitle2">附件</td>
-            <td colspan="13">
+            <td colspan="12">
               <template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0">
                 <template v-for="(subItem,subIndex) in teamPrice.ContractArray">
                   <a style="margin-left:20px;color:blue;cursor:pointer;" target="_blank" :key="subIndex"
@@ -793,7 +785,7 @@
           </tr>
           <tr>
             <td class="CP_ComTitle2">审核备注</td>
-            <td colspan="7">
+            <td colspan="5">
               <el-input type="textarea" v-model="postConfig.AuditContent"></el-input>
             </td>
             <td colspan="2">
@@ -814,7 +806,7 @@
             </td>
           </tr>
           <tr v-if="IsEdit==2">
-            <td colspan="14" style="text-align:center;">
+            <td colspan="12" style="text-align:center;">
               <input type="button" class="normalBtn" value="同意" @click="SubSaveType(3)" />
               <input type="button" class="normalBtn" value="拒绝" @click="SubSaveType(4)" />
             </td>