页面修改

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -167,7 +167,7 @@
             <td rowspan="2" class="CP_ComTitle2 CostcomCenter" style="width:80px;">币种</td>
             <td rowspan="2" class="CP_ComTitle2 CostcomCenter" style="width:250px;">行程</td>
             <td colspan="2" class="CP_ComTitle2 CostcomCenter">酒店</td>
-            <td colspan="2" class="CP_ComTitle2 CostcomCenter">车</td>
+            <td colspan="2" class="CP_ComTitle2 CostcomCenter">车/天</td>
             <td colspan="2" class="CP_ComTitle2 CostcomCenter">门票</td>
             <td colspan="2" class="CP_ComTitle2 CostcomCenter">餐</td>
             <td colspan="2" class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td>
@@ -175,8 +175,8 @@
           <tr>
             <td class="CP_ComTitle2 CostcomCenter" style="width:150px">酒店名称</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格/间</td>
-            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">总车资</td>
-            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">过路费</td>
+            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">车资/天</td>
+            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">过路费<br />停车费/天</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:110px">餐厅名称</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:90px">价格/餐</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:100px">景点名称</td>
@@ -304,7 +304,7 @@
           <tr>
             <td colspan="2">
               <el-form-item label="机票">
-                {{OtherPrice.AirTicketShareMoney}}
+                {{OtherPrice.AirTicketMoeny}}
               </el-form-item>
             </td>
             <td>
@@ -322,18 +322,24 @@
                 {{teamPrice.NightPrice}}
               </el-form-item>
             </td>
-            <td colspan="2">
+            <td>
               <el-form-item label="签证">
                 {{teamPrice.VisaPrice}}
               </el-form-item>
             </td>
-            <td colspan="2">
+            <td>
               <el-form-item label="保险">
                 {{OtherPrice.SafeMoney}}
               </el-form-item>
             </td>
             <td colspan="2">
-              小计(机票+税金+联运+过夜+签证+保险):{{getCostTotalMoney()}}
+              <el-form-item label="领队导游分摊">
+                {{OtherPrice.AirTicketShareMoney}}
+              </el-form-item>
+            </td>
+            <td colspan="2">
+              小计(机票+税金+联运+过夜+签证+保险+领队导游分摊):
+              <br />{{getCostTotalMoney()}}
             </td>
           </tr>
           <tr>
@@ -588,13 +594,14 @@
       },
       //其它成本价格
       getCostTotalMoney() {
-        //机票+税金+联运+过夜+保险
-        let totalMoney = this.getConvertMoney(this.OtherPrice.AirTicketShareMoney) +
+          //机票+税金+联运+过夜+保险+领队导游分摊
+        let totalMoney = this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
           this.getConvertMoney(this.teamPrice.TaxPrice) +
           this.getConvertMoney(this.teamPrice.UnionPrice) +
           this.getConvertMoney(this.teamPrice.NightPrice) +
           this.getConvertMoney(this.teamPrice.VisaPrice) +
-          this.getConvertMoney(this.teamPrice.SafeMoney)
+          this.getConvertMoney(this.teamPrice.SafeMoney) +
+          this.getConvertMoney(this.OtherPrice.AirTicketShareMoney)
         return totalMoney;
       },
       //获取汇率

src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue

@@ -74,7 +74,7 @@
             <td rowspan="2" class="CP_ComTitle2 CostcomCenter" style="width:80px;">币种</td>
             <td rowspan="2" class="CP_ComTitle2 CostcomCenter" style="width:250px;">行程</td>
             <td colspan="2" class="CP_ComTitle2 CostcomCenter">酒店</td>
-            <td colspan="2" class="CP_ComTitle2 CostcomCenter">车</td>
+            <td colspan="2" class="CP_ComTitle2 CostcomCenter">车/天</td>
             <td colspan="2" class="CP_ComTitle2 CostcomCenter">门票</td>
             <td colspan="2" class="CP_ComTitle2 CostcomCenter">餐</td>
             <td colspan="2" class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td>
@@ -82,8 +82,8 @@
           <tr>
             <td class="CP_ComTitle2 CostcomCenter" style="width:150px">酒店名称</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格/间</td>
-            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">总车资</td>
-            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">过路费</td>
+            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">车资/天</td>
+            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">过路费<br />停车费/天</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:110px">餐厅名称</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:90px">价格/餐</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:100px">景点名称</td>
@@ -229,18 +229,23 @@
                 {{teamPrice.NightPrice}}
               </el-form-item>
             </td>
-            <td colspan="2">
+            <td>
               <el-form-item label="签证">
                 {{teamPrice.VisaPrice}}
               </el-form-item>
             </td>
-            <td colspan="2">
+            <td>
               <el-form-item label="保险">
                 {{OtherPrice.SafeMoney}}
               </el-form-item>
             </td>
             <td colspan="2">
-              小计(机票+税金+联运+过夜+签证+保险):{{getCostTotalMoney()}}
+              <el-form-item label="领队导游分摊">
+                {{OtherPrice.AirTicketShareMoney}}
+              </el-form-item>
+            </td>
+            <td colspan="2">
+              小计(机票+税金+联运+过夜+签证+保险+领队导游分摊):{{getCostTotalMoney()}}
             </td>
           </tr>
           <tr>
@@ -447,13 +452,14 @@
       },
       //其它成本价格
       getCostTotalMoney() {
-        //机票+税金+联运+过夜+保险
-        let totalMoney = this.getConvertMoney(this.OtherPrice.AirTicketShareMoney) +
+        //机票+税金+联运+过夜+保险+领队导游分摊
+        let totalMoney = this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
           this.getConvertMoney(this.teamPrice.TaxPrice) +
           this.getConvertMoney(this.teamPrice.UnionPrice) +
           this.getConvertMoney(this.teamPrice.NightPrice) +
           this.getConvertMoney(this.teamPrice.VisaPrice) +
-          this.getConvertMoney(this.teamPrice.SafeMoney)
+          this.getConvertMoney(this.teamPrice.SafeMoney) +
+          this.getConvertMoney(this.OtherPrice.AirTicketShareMoney)
         return totalMoney;
       },
       //获取汇率

src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue

@@ -136,7 +136,7 @@
             <td rowspan="2" style="width:120px" class="CP_ComTitle2 CostcomCenter">币种</td>
             <td rowspan="2" style="width:180px" class="CP_ComTitle2 CostcomCenter">行程</td>
             <td colspan="2" style="width:220px;" class="CP_ComTitle2 CostcomCenter">酒店</td>
-            <td colspan="2" style="width:120px" class="CP_ComTitle2 CostcomCenter">车</td>
+            <td colspan="2" style="width:120px" class="CP_ComTitle2 CostcomCenter">车/天</td>
             <td colspan="2" style="width:200px" class="CP_ComTitle2 CostcomCenter">餐</td>
             <td colspan="2" style="width:150px" class="CP_ComTitle2 CostcomCenter">门票</td>
             <td colspan="2" style="width:100px" class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td>
@@ -144,8 +144,8 @@
           <tr>
             <td style="width:150px" class="CP_ComTitle2 CostcomCenter">酒店名称</td>
             <td style="width:50px" class="CP_ComTitle2 CostcomCenter">价格/间</td>
-            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">总车资</td>
-            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">过路费<br />停车费</td>
+            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">车资/天</td>
+            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">过路费<br />停车费/天</td>
             <td style="width:110px" class="CP_ComTitle2 CostcomCenter">餐厅名称</td>
             <td style="width:90px" class="CP_ComTitle2 CostcomCenter">价格/餐</td>
             <td style="width:100px" class="CP_ComTitle2 CostcomCenter">景点名称</td>
@@ -299,8 +299,8 @@
           <tr>
             <td colspan="2">
               <el-form-item label="机票">
-                <el-input type="text" v-model='OtherPrice.AirTicketShareMoney' class="w100"
-                  @keyup.native="checkPrice(OtherPrice,'AirTicketShareMoney'),getchange()"></el-input>
+                <el-input type="text" v-model='OtherPrice.AirTicketMoeny' class="w100"
+                  @keyup.native="checkPrice(OtherPrice,'AirTicketMoeny'),getchange()"></el-input>
               </el-form-item>
             </td>
             <td>
@@ -321,20 +321,27 @@
                   @keyup.native="checkPrice(teamPrice,'NightPrice'),getchange()"></el-input>
               </el-form-item>
             </td>
-            <td colspan="2">
+            <td  >
               <el-form-item label="签证">
                 <el-input type="text" v-model='teamPrice.VisaPrice' class="w100"
                   @keyup.native="checkPrice(teamPrice,'VisaPrice'),getchange()"></el-input>
               </el-form-item>
             </td>
-            <td colspan="2">
+            <td>
               <el-form-item label="保险">
                 <el-input type='text' class="w70" v-model="OtherPrice.SafeMoney"
                   @keyup.native="checkPrice(OtherPrice,'SafeMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
             <td colspan="2">
-              小计(机票+税金+联运+过夜+签证+保险):{{getCostTotalMoney()}}
+              <el-form-item label="领队导游分摊">
+                <el-input type='text' class="w120" v-model="OtherPrice.AirTicketShareMoney"
+                  @keyup.native="checkPrice(OtherPrice,'AirTicketShareMoney'),getchange()"></el-input>
+              </el-form-item>
+            </td>
+            <td colspan="2">
+              小计(机票+税金+联运+过夜+签证+保险+领队导游分摊):
+              <br /> {{getCostTotalMoney()}}
             </td>
           </tr>
           <tr>
@@ -417,7 +424,7 @@
                 地接成本<br />(人民币)
               </td>
               <td colspan="4">
-                成本<br />[地接成本(人民币)+机票+税金+联运+过夜+签证+保险]
+                成本<br />[地接成本(人民币)+机票+税金+联运+过夜+签证+保险+领队导游分摊]
               </td>
               <td colspan="2">
                 销售价格
@@ -667,13 +674,14 @@
       },
       //其它成本价格
       getCostTotalMoney() {
-        //机票+税金+联运+过夜+保险
-        let totalMoney = this.getConvertMoney(this.OtherPrice.AirTicketShareMoney) +
+        //机票+税金+联运+过夜+保险+领队导游分摊
+        let totalMoney = this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
           this.getConvertMoney(this.teamPrice.TaxPrice) +
           this.getConvertMoney(this.teamPrice.UnionPrice) +
           this.getConvertMoney(this.teamPrice.NightPrice) +
           this.getConvertMoney(this.teamPrice.VisaPrice) +
-          this.getConvertMoney(this.teamPrice.SafeMoney)
+          this.getConvertMoney(this.teamPrice.SafeMoney) +
+          this.getConvertMoney(this.OtherPrice.AirTicketShareMoney)
         return totalMoney;
       },
       //获取币种对应 的人数报价