Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -1213,10 +1213,10 @@
       getDayXiaoJi(type, currencyType) {
         var xiaoJi = 0;
         if (this.dayCostPrice && this.dayCostPrice.length > 0) {
-          this.dayCostPrice.forEach(item => {
+          this.dayCostPrice.forEach((item,index) => {
             var currencyRate = 1;
             if (currencyType == 2) {
-              currencyRate = this.getCurrencyMoney(item.CurrencyId);
+              currencyRate = this.getCurrencyMoney(item.CurrencyId);  
             }
             //酒店
             if (type == 1) {

src/components/TravelManager/TravelTeam/travelTeamList.vue

@@ -233,12 +233,11 @@
                     </span>
                   </div>
                   <div class="mb bold"><span class="item-title">{{$t('leader.leader_registraNum')}}:</span><span>
-                      {{item.OrderGuestNum}} </span></div>
-                  <div class="mb bold"><span class="item-title">{{$t('ground.lddaoyou')}}:</span><span>
-                      {{item.LeaderNum}} </span></div>
+                      {{item.OrderGuestNum}} </span>
+                    <span class="TCL-redType" v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>
+                  </div>
                   <div class="mb bold" v-if="item.BindNum > 0 && item.TicketList&&item.TicketList.length>0"><span
                       class="item-title">{{$t('Operation.Op_bindNum')}}:</span><span>
-
                       <el-popover width="550" trigger="click">
                         <table width="100%" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
                           <tr>

src/components/commonPage/commonTeamInfo.vue

@@ -58,7 +58,7 @@
       GetDayStr(dateStr, dayNum) {
         return this.$commonUtils.AddDay(dateStr, dayNum);
       },
-      GetTrip(id, TCID) {
+      GetTrip(id, TCID,type) {
         this.tripList = [];
         this.startDate = '';
         var nTCID = 0;
@@ -68,7 +68,7 @@
         var msg = {
           configId: id,
           tcid: nTCID,
-          isClick: 1 //不算统计
+          isClick: type==2?0:1 //不算统计
         };
         if (id !== undefined) {
           //根据ID 获取行程内容

src/components/orderCommon/productOrderList.vue

@@ -1198,8 +1198,11 @@
       getJourney(id, TCID, title) {
         var that = this;
         this.tripTitle = title;
+        console.log("id",id);
+         console.log("TCID",TCID);
+        
         this.$nextTick(() => {
-          that.$refs.comTeam.GetTrip(id, TCID);
+          that.$refs.comTeam.GetTrip(id, TCID,2);
         });
         that.outerVisible = true;
       },

src/router/config.js

@@ -2200,6 +2200,14 @@ export default {
                 title: '日本车行预订统计表'
               },
             },
+            {
+              path: '/HPTripPlan', //和平用车
+              name: 'HPTripPlan',
+              component: resolve => require(['@/components/busManagement/HPTripPlan'], resolve),
+              meta: {
+                title: '日本车行预订统计表'
+              },
+            },
             {
               path: '/JapanBusMonthFStatistics', //用車單統計(財務單據)
               name: 'JapanBusMonthFStatistics',