页面修改

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -284,6 +284,29 @@
                 @keyup.native="checkPrice(subItem,'DinnerCostPrice'),getchange()"></el-input>
             </td>
           </tr>
+          <tr>
+            <td colspan="3" class="CP_ComTitle2 CostcomCenter">
+              小计
+            </td>
+            <td>
+              {{getDayXiaoJi(1)}}
+            </td>
+            <td>
+              {{getDayXiaoJi(2)}}
+            </td>
+            <td>
+              {{getDayXiaoJi(3)}}
+            </td>
+            <td>
+              {{getDayXiaoJi(4)}}
+            </td>
+            <td>
+              {{getDayXiaoJi(5)}}
+            </td>
+            <td>
+              {{getDayXiaoJi(6)}}
+            </td>
+          </tr>
           <tr>
             <td colspan="9"></td>
           </tr>
@@ -386,6 +409,20 @@
               </el-form-item>
             </td>
           </tr>
+          <tr>
+            <td class="CP_ComTitle2">
+              小计
+            </td>
+            <td colspan="3">
+              {{Number(OtherPrice.InlandAirTicketMoney)+Number(OtherPrice.InlandShipTicketMoney)+Number(OtherPrice.InlandTrainTicketMoney)}}
+            </td>
+            <td class="CP_ComTitle2">
+              小计
+            </td>
+            <td colspan="4">
+              {{Number(OtherPrice.VisaMoney)+Number(OtherPrice.SafeMoney)+Number(OtherPrice.LeaderTripMoney)+Number(OtherPrice.DriverGuideMoney)}}
+            </td>
+          </tr>
           <tr>
             <td colspan="9"></td>
           </tr>
@@ -452,6 +489,32 @@
               </el-form-item>
             </td>
             <td colspan="3"></td>
+          </tr>
+            <tr>
+            <td class="CP_ComTitle2" >
+              小计
+            </td>
+            <td >
+               {{Number(OtherPrice.SalesCommissionMoney)+Number(OtherPrice.OfficeCommissionMoney)}}
+            </td>
+            <td class="CP_ComTitle2"  >
+             小计
+            </td>
+            <td >
+              {{Number(OtherPrice.AirTicketMoeny)}}
+            </td>
+             <td class="CP_ComTitle2"  >
+             小计
+            </td>
+            <td>
+              {{Number(OtherPrice.TripMoney)+Number(OtherPrice.GuidePeopleMoney)}}
+            </td>
+              <td class="CP_ComTitle2"  >
+             小计
+            </td>
+            <td colspan="2">
+              {{Number(OtherPrice.KBMoney)}}
+            </td>
           </tr>
           <tr>
             <td colspan="9"></td>
@@ -519,7 +582,7 @@
           </tr>
           <tr>
             <td class="CP_ComTitle2">人数统计</td>
-            <td colspan="8"></td>
+            <td colspan="8">计算规则: (房+餐+车+景点)*汇率+内陆段交通+杂支部分+其他资产+机票票+收入+团负费+领队分摊+地接报价*汇率</td>
           </tr>
           <tr v-for="item in CostNumberList" :key="item.subCode">
             <td>{{item.PeopleNumber}}+1</td>
@@ -561,10 +624,40 @@
 
     },
     methods: {
+      getDayXiaoJi(type) {
+        var xiaoJi = 0;
+        this.dayCostPrice.forEach(item => {
+          //酒店
+          if (type == 1) {
+            xiaoJi += Number(item.HotelCostPrice);
+          }
+          //车
+          if (type == 2) {
+            xiaoJi += Number(item.BusCostPrice);
+          }
+          //景点
+          if (type == 3) {
+            xiaoJi += Number(item.ScenicCostPrice);
+          }
+          //早餐
+          if (type == 4) {
+            xiaoJi += Number(item.BreakfastCostPrice);
+          }
+          //午餐
+          if (type == 5) {
+            xiaoJi += Number(item.LunchCostPrice);
+          }
+          //午餐
+          if (type == 6) {
+            xiaoJi += Number(item.DinnerCostPrice);
+          }
+        });
+        return xiaoJi;
+      },
       ReCalc() {},
       //获取汇率
       getCurrencyMoney(currencyId) {
-        let currency = 0.0;
+        let currency =1;
         this.CostCurrencyList.forEach(x => {
           if (x.CurrencyId == currencyId) {
             currency = x.ExchangeRate;
@@ -825,7 +918,6 @@
             this.getConvertMoney(x.InlandTrafficMoney) +
             this.getConvertMoney(x.OtherMoney)
           ).toFixed(2);
-
           x.TotalMoney = (
             that.getLocalTotalMoney() +
             that.getCostTotalMoney() +

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -242,9 +242,14 @@
                     Key: item.CurrencyId,
                     currencyNumberList: []
                   };
-                  this.CurrencyNumberListExt.push(currencyNumberItem);
+                  if(this.CurrencyNumberListExt.length==0)
+                  {
+this.CurrencyNumberListExt.push(currencyNumberItem);
+                  }
+                  
                 });
               }
+              console.log("tempData.CurrencyNumberListExt",tempData.CurrencyNumberListExt);
             } else {
               this.Error(res.data.message);
             }