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

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -87,8 +87,11 @@
           SafeMoneyCurrencyId: 0, //保险费币种
           LeaderTripMoneyCurrencyId: 0, //领队小费币种
           DriverGuideMoneyCurrencyId: 0, //司机小费币种
+          LeaderGuideDriveZhuSu:0,//领队导游住宿费
           GuideMoneyCurrencyId:0,//导游小费币种
           GuideMoney:0,//导游小费
+          InternationalAirTicket:0,//国际段机票
+          InternationalAirTicketCurrency:0,//国际段机票币种
         },
         CostCurrencyList: [], //选择的币种
         CostNumberList: [], //人数
@@ -122,7 +125,7 @@
           BackSafeMoney: 0, //退保险费
           ContractUrl: "", //合同地址
           PriceRemark: "", //定价备注
-          LeaderGuideDriveZhuSu:0,//领队导游住宿费
+        
         },
         LineList: [], //线路列表
         loading: false
@@ -232,6 +235,7 @@
                 0) {
                 this.dayCostPriceList = tempData.dayCostPriceList;
               }
+            
               if (tempData.otherPrice) {
                 this.otherPrice = tempData.otherPrice;
               }

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -267,7 +267,7 @@
               <td width="50%"><input id="IsShowTripPrice" type="checkbox" v-model="downLoadMsg.IsShowTripPrice" /><label
                   for="IsShowTripPrice">行程报价<br />(房、餐、车、门票)</label></td>
               <td width="50%"><input id="IsShowTraffic" type="checkbox" v-model="downLoadMsg.IsShowTraffic" /><label
-                  for="IsShowTraffic">内陆段交通部分</label></td>
+                  for="IsShowTraffic">交通部分</label></td>
             </tr>
             <tr height="36">
               <td><input id="IsShowZaZhi" type="checkbox" v-model="downLoadMsg.IsShowZaZhi" /><label