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

src/assets/css/tripIndexNew.css

@@ -191,7 +191,9 @@
   margin-left: 21px;
 }
 .travelDaysTitlle-right-text{
-  padding: 25px 25px 25px 36px;
+  min-height: 124px;
+  /* padding: 25px 25px 25px 36px; */
+  padding: 0 25px 0 36px;
   border-radius: 100px 0px 0px 100px;
   -webkit-border-radius: 100px 0px 0px 100px;
   -moz-border-radius: 100px 0px 0px 100px;
@@ -204,6 +206,9 @@
   overflow: hidden;
 }
 .travelDaysMasterMap img{
+  left: 0;
+  top: 0;
+  right: 0;
   width: 100%;
   height: 100%;
 }
@@ -290,6 +295,19 @@
   padding: 0;
   margin: 0;
 }
+.LeaveGroupDownload-form .travelControlTrip .module-title {
+  text-align: center;
+  font-size: 18px;
+  color: #333;
+  padding-top: 30px;
+  padding-bottom: 30px;
+}
+.LeaveGroupDownload-form .expense{
+  padding: 0 20px;
+}
+.LeaveGroupDownload-form .expense .right {
+  margin-bottom: 20px;
+}
 .UpgradedVersion-box{
   width: 1123px;
   height: 1588px;

src/components/FinancialModule/invoicesManager.vue

@@ -138,6 +138,9 @@
                 <el-option :value="1" label="跟团游"></el-option>
                 <el-option :value="2" label="签证"></el-option>
                 <el-option :value="4" label="单机票"></el-option>
+                <el-option :value="5" label="车"></el-option>
+                <el-option :value="6" label="酒店"></el-option>
+                <el-option :value="7" label="门票"></el-option>
               </el-select>
             </el-form-item>
           </el-col>

src/components/LeaveGroupDownload/components/header.vue

@@ -6,7 +6,7 @@
     </div>
     <div class="UpgradedVersion-header-right">
       <div class="UpgradedVersion-header-title">
-        <span class="edit_div">{{LineShortName}}</span>
+        <span class="edit_div">{{orderMsg.lineName}}</span>
       </div>
     </div>
   </div>
@@ -18,7 +18,7 @@
     },
     props: [
       'TripColor',
-      'FeatureItem'
+      'orderMsg'
     ],
     data() {
       return {
@@ -41,7 +41,7 @@
         deep: false,
         immediate: true
       },
-      FeatureItem: {
+      orderMsg: {
         handler(val,oldVal) {
 
         },

src/components/confirmationOrderDownLoadNew.vue

@@ -202,6 +202,7 @@
     <div id="pdfNode" class="LeaveGroupDownload-form">
       <div id="pdfDom" style="padding:0 20px;">
         <!-- 首页 -->
+        <!--
         <LeaveGroupDownload
         :vshowJ="vshowJ"
         :vshowL="vshowL"
@@ -210,10 +211,27 @@
         :orderTripdiff="orderTripdiff"
         :vshowLLR="vshowLLR"
         :vshowB="vshowB"
-        :lineId="lineId"></LeaveGroupDownload>
+        :lineId="lineId"></LeaveGroupDownload> -->
+
         <!-- 行程特色 -->
-        <ItineraryFeatures :feature="feature"></ItineraryFeatures>
-        <travelDays :TripColor="TripColor"></travelDays>
+        <!-- <ItineraryFeatures :feature="feature"></ItineraryFeatures> -->
+
+        <!-- 行程天数 -->
+        <!-- <travelDays
+        :dataAll="dataAll"
+        :orderMsg="orderMsg"
+        :orderTripdiff="orderTripdiff"
+        :tripList="tripList"
+        :vshowD="vshowD"
+        :vshowK="vshowK"
+        ></travelDays> -->
+
+        <!-- 团队说明 -->
+        <!-- <TourFareDescription
+        :vshowE="vshowE"
+        :vshowF="vshowF"
+        :dataList="dataList"
+        :feature="feature"></TourFareDescription> -->
       </div>
     </div>
 
@@ -230,6 +248,7 @@
   import LeaveGroupDownload from './LeaveGroupDownload/index'
   import ItineraryFeatures from './LeaveGroupDownload/ItineraryFeatures'
   import travelDays from './LeaveGroupDownload/travelDays'
+  import TourFareDescription from './LeaveGroupDownload/TourFareDescription'
   import {
     setTimeout
   } from 'timers';
@@ -245,11 +264,12 @@
       fiveday,
       LeaveGroupDownload,
       ItineraryFeatures,
-      travelDays
+      travelDays,
+      TourFareDescription
     },
     data() {
       return {
-        TripColor: '#CC0066',
+        dataAll: null,
         isShowTime: true,
         CurrentUserInfo: {}, //当前用户信息
         Typevalue: -1,
@@ -961,9 +981,12 @@
         }, res => {
           if (res.data.resultCode == 1) {
             let data = (res.data.data);
+            this.dataAll = data
             this.orderTripdiff = data.orderTripdiff;
             this.lineId = data.lineId;
             this.orderMsg = data.orderMsg;
+            console.log(this.orderTripdiff)
+            console.log(this.orderMsg,'------')
             if (this.orderTripdiff && this.orderTripdiff.flightInfoJson) {
               this.orderTripdiff.travelOrderFlightList = JSON.parse(this.orderTripdiff.flightInfoJson);
               if (this.orderMsg.outNotice == 1) {