新增其它费用

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -234,13 +234,14 @@
           </tr>
           <tr>
             <td rowspan="2" style="width:100px" class="CP_ComTitle2 CostcomCenter">Day</td>
-            <td rowspan="2" colspan="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">币种</td>
             <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">酒店</td>
             <td colspan="4" class="CP_ComTitle2 CostcomCenter">车</td>
             <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">门票</td>
             <td colspan="3" 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="80" class="CP_ComTitle2 CostcomCenter">总车资</td>
@@ -323,17 +324,21 @@
                       v-model='subItem.DinnerCostPrice' class="w60"
                       @keyup.native="checkPrice(subItem,'DinnerCostPrice'),getchange()"></el-input>
                   </td>
-                  <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2" style="border:1px solid red">
+                  <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                     <el-input type="text" v-model='subItem.RebatePrice' class="w60"
                       @keyup.native="checkPrice(subItem,'RebatePrice'),getchange()"></el-input>
                   </td>
+                  <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+                    <el-input type="text" v-model='subItem.OtherPrice' class="w60"
+                      @keyup.native="checkPrice(subItem,'OtherPrice'),getchange()"></el-input>
+                  </td>
                 </tr>
               </template>
             </template>
 
             <template v-for="(childItem,childIndex) in CostNumberList">
               <tr>
-                <td colspan="4" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0"
+                <td colspan="3" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0"
                   :rowspan="CostNumberList.length">
                   外币小计
                 </td>
@@ -367,11 +372,14 @@
                 <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                   {{getDayXiaoJi(8,1)}}
                 </td>
+                <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+                  {{getDayXiaoJi(9,1)}}
+                </td>
               </tr>
             </template>
             <template v-for="(childItem,childIndex) in CostNumberList">
               <tr>
-                <td colspan="4" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0"
+                <td colspan="3" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0"
                   :rowspan="CostNumberList.length">
                   人民币小计
                 </td>
@@ -405,6 +413,9 @@
                 <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                   {{getDayXiaoJi(8,2)}}
                 </td>
+                <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+                  {{getDayXiaoJi(9,2)}}
+                </td>
               </tr>
             </template>
           </template>
@@ -413,7 +424,7 @@
               <td align="center">
                 {{subItem.DayNum}}
               </td>
-              <td colspan="2">
+              <td>
                 <el-input type="textarea" resize="none" class="w250" v-model="subItem.Title"></el-input>
               </td>
               <td>
@@ -482,13 +493,17 @@
                   v-model='subItem.DinnerCostPrice' class="w60"
                   @keyup.native="checkPrice(subItem,'DinnerCostPrice'),getchange()"></el-input>
               </td>
-              <td style="border:1px solid red">
+              <td>
                 <el-input type="text" v-model='subItem.RebatePrice' class="w60"
                   @keyup.native="checkPrice(subItem,'RebatePrice'),getchange()"></el-input>
               </td>
+              <td>
+                <el-input type="text" v-model='subItem.OtherPrice' class="w60"
+                  @keyup.native="checkPrice(subItem,'OtherPrice'),getchange()"></el-input>
+              </td>
             </tr>
             <tr>
-              <td colspan="4" class="CP_ComTitle2 CostcomCenter">
+              <td colspan="3" class="CP_ComTitle2 CostcomCenter">
                 外币小计
               </td>
               <td>
@@ -525,9 +540,12 @@
               <td>
                 {{getDayXiaoJi(8,1)}}
               </td>
+              <td>
+                {{getDayXiaoJi(9,1)}}
+              </td>
             </tr>
             <tr>
-              <td colspan="4" class="CP_ComTitle2 CostcomCenter">
+              <td colspan="3" class="CP_ComTitle2 CostcomCenter">
                 人民币小计
               </td>
               <td>
@@ -564,6 +582,9 @@
               <td>
                 {{getDayXiaoJi(8,2)}}
               </td>
+              <td>
+                {{getDayXiaoJi(9,2)}}
+              </td>
             </tr>
           </template>
           <tr>
@@ -1337,6 +1358,10 @@
           if (type == 8) {
             xiaoJi += Number(item.RebatePrice) * Number(currencyRate);
           }
+          //杂费
+          if (type == 9) {
+            xiaoJi += Number(item.OtherPrice) * Number(currencyRate);
+          }
         });
         return xiaoJi.toFixed(0);
       },
@@ -1471,6 +1496,7 @@
               PassFee: 0, //过路费
               HotelName: "", //酒店名称
               RebatePrice: 0, //回佣
+              OtherPrice: 0, //其它费用(保险、司导杂费等)
             };
             this.dayCostPrice.push(dayItem);
           }
@@ -1661,28 +1687,39 @@
       //获取地接项目报价
       getLocalTotalMoney(PeopleNumber) {
         let totalMoney = 0.0;
-        totalMoney = Number(this.getDayXiaoJi(1, 2)) +
-          Number(this.getDayXiaoJi(3, 2)) +
-          Number(this.getDayXiaoJi(4, 2)) +
-          Number(this.getDayXiaoJi(5, 2)) +
-          Number(this.getDayXiaoJi(6, 2)) +
-          Number(this.getDayXiaoJi(2, 2)) +
-          Number(this.getDayXiaoJi(7, 2));
+        var hotelPrice = Number(this.getDayXiaoJi(1, 2)); //酒店费用
+        var sencePrice = Number(this.getDayXiaoJi(3, 2)); //景点费用
+        var zaoPrice = Number(this.getDayXiaoJi(4, 2)); //早餐
+        var wuPrice = Number(this.getDayXiaoJi(5, 2)); //午餐
+        var wanPrice = Number(this.getDayXiaoJi(6, 2)); //晚餐
+        var otherPrice = Number(this.getDayXiaoJi(9, 2)); //其它费用
+        //每人车费
+        var perBusFee = 0;
+        if (PeopleNumber > 0) {
+          perBusFee = (Number(this.getDayXiaoJi(2, 2)) + Number(this.getDayXiaoJi(7, 2))) / Number(PeopleNumber)
+            .toFixed(0);
+        }
+        totalMoney = perBusFee + hotelPrice + sencePrice + zaoPrice + wuPrice + wanPrice + otherPrice;
         return totalMoney.toFixed(0);
       },
       //获取地接项目报价
       getLocalJpyTotalMoney(PeopleNumber) {
         let totalMoney = 0.0;
-        totalMoney = Number(this.getDayXiaoJi(1, 1)) +
-          Number(this.getDayXiaoJi(3, 1)) +
-          Number(this.getDayXiaoJi(4, 1)) +
-          Number(this.getDayXiaoJi(5, 1)) +
-          Number(this.getDayXiaoJi(6, 1)) +
-          Number(this.getDayXiaoJi(2, 1)) +
-          Number(this.getDayXiaoJi(7, 1));
+        //每人车费
+        var perBusFee = 0;
+        if (PeopleNumber > 0) {
+          perBusFee = (Number(this.getDayXiaoJi(2, 1)) + Number(this.getDayXiaoJi(7, 1))) / Number(PeopleNumber)
+            .toFixed(0);
+        }
+        var hotelPrice = Number(this.getDayXiaoJi(1, 1)); //酒店费用
+        var sencePrice = Number(this.getDayXiaoJi(3, 1)); //景点费用
+        var zaoPrice = Number(this.getDayXiaoJi(4, 1)); //早餐
+        var wuPrice = Number(this.getDayXiaoJi(5, 1)); //午餐
+        var wanPrice = Number(this.getDayXiaoJi(6, 1)); //晚餐
+        var otherPrice = Number(this.getDayXiaoJi(9, 1)); //其它费用
+        totalMoney = perBusFee + hotelPrice + sencePrice + zaoPrice + wuPrice + wanPrice + otherPrice;
         return totalMoney.toFixed(0);
       },
-
       //计算领队分摊
       getLeaderShare() {
         let that = this;

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -150,13 +150,14 @@
           </tr>
           <tr>
             <td rowspan="2" width='180' class="CP_ComTitle2 CostcomCenter">Day</td>
-            <td rowspan="2" colspan="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='60' class="CP_ComTitle2 CostcomCenter">酒店</td>
             <td colspan="4" width='100' 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>
@@ -216,6 +217,9 @@
                   <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                     {{subItem.RebatePrice}}
                   </td>
+                  <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+                    {{subItem.OtherPrice}}
+                  </td>
                 </tr>
               </template>
             </template>
@@ -296,7 +300,7 @@
               <td align="center">
                 <div style="width:100px;">{{subItem.DayNum}}</div>
               </td>
-              <td colspan="2">
+              <td>
                 {{subItem.Title}}
               </td>
               <td>
@@ -342,9 +346,12 @@
               <td>
                 {{subItem.RebatePrice}}
               </td>
+              <td>
+                {{subItem.OtherPrice}}
+              </td>
             </tr>
             <tr>
-              <td colspan="4" class="CP_ComTitle2 CostcomCenter">
+              <td colspan="3" class="CP_ComTitle2 CostcomCenter">
                 外币小计
               </td>
               <td>
@@ -381,9 +388,12 @@
               <td>
                 {{getDayXiaoJi(8,1)}}
               </td>
+              <td>
+                {{getDayXiaoJi(9,1)}}
+              </td>
             </tr>
             <tr>
-              <td colspan="4" class="CP_ComTitle2 CostcomCenter">
+              <td colspan="3" class="CP_ComTitle2 CostcomCenter">
                 人民币小计
               </td>
               <td>
@@ -420,6 +430,9 @@
               <td>
                 {{getDayXiaoJi(8,2)}}
               </td>
+              <td>
+                {{getDayXiaoJi(9,2)}}
+              </td>
             </tr>
           </template>
           <tr>
@@ -996,6 +1009,10 @@
           if (type == 8) {
             xiaoJi += Number(item.RebatePrice) * Number(currencyRate);
           }
+          // 其它费用(保险、司导杂费等)
+          if (type == 9) {
+            xiaoJi += Number(item.OtherPrice) * Number(currencyRate);
+          }
         });
         return xiaoJi.toFixed(0);
       },
@@ -1061,18 +1078,7 @@
         }
         return parseFloat(value);
       },
-      //获取地接项目报价
-      getLocalTotalMoney(PeopleNumber) {
-        let totalMoney = 0.0;
-        totalMoney = Number(this.getDayXiaoJi(1, 2)) +
-          Number(this.getDayXiaoJi(3, 2)) +
-          Number(this.getDayXiaoJi(4, 2)) +
-          Number(this.getDayXiaoJi(5, 2)) +
-          Number(this.getDayXiaoJi(6, 2)) +
-          Number(this.getDayXiaoJi(2, 2)) / Number(PeopleNumber) +
-          Number(this.getDayXiaoJi(7, 2)) / Number(PeopleNumber);
-        return totalMoney.toFixed(0);
-      },
+
       //计算领队分摊
       getLeaderShare() {
         let that = this;