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

src/components/confirmationOrderDownLoadNew.vue

@@ -82,7 +82,8 @@
         <OrderNotice :vshowG="vshowG" :feature="feature"></OrderNotice>
 
         <!-- 签证信息 -->
-        <VisaInformation :vshowG="vshowG" :vshowM="vshowM" :vshowJ="vshowJ" :vshowI="vshowI" :feature="feature" :orderMsg="orderMsg">
+        <VisaInformation :vshowG="vshowG" :vshowM="vshowM" :vshowJ="vshowJ" :vshowI="vshowI" :feature="feature"
+          :orderMsg="orderMsg">
         </VisaInformation>
       </div>
     </div>
@@ -594,20 +595,12 @@
             this.SourceData.Id = 0;
             if (this.$route.query.orderId > 0) {
               this.SourceData.orderId = this.$route.query.orderId;
-              var str = "";
-              if (this.orderMsg.leaderName) {
-                str = this.orderMsg.leaderName;
-              }
-              if (this.orderMsg.leaderMobile) {
-                str += "/" + this.orderMsg.leaderMobile;
-              }
-              this.SourceData.leaderInfo = str;
-              this.SourceData.gatheringTime = this.orderMsg.gatheringTime;
-              this.SourceData.airportService = this.orderMsg.airportServicePerson + "/" + this.orderMsg
-                .airportServicePhone;
-              this.SourceData.gatherIdent = this.orderMsg.bName;
-              this.SourceData.emergencyContact = this.orderMsg.sellName + "/" + this.orderMsg.sellTel;
-              this.SourceData.gatheringAddress = this.orderMsg.gatheringAddress;
+              this.SourceData.leaderInfo = this.orderMsg.leaderInfo;
+              this.SourceData.gatheringTime = this.orderMsg.gatheringTimeInfo;
+              this.SourceData.airportService = this.orderMsg.airportServiceInfo;
+              this.SourceData.gatherIdent = this.orderMsg.gatherIdentInfo;
+              this.SourceData.emergencyContact = this.orderMsg.emergencyContactInfo;
+              this.SourceData.gatheringAddress = this.orderMsg.gatheringAddressInfo;
               if (data.priceList != null && data.priceList.length > 0) {
                 var array = JSON.parse(JSON.stringify(data.priceList[0].priceFlight));
                 this.SourceData.travelOrderFlightList = [];
@@ -657,7 +650,7 @@
           })
         }, err => {})
       },
-            //上移下移(IsUp:0上移，1下移)
+      //上移下移(IsUp:0上移，1下移)
       MoveItem(item, subIndex, IsUp) {
         var currentItem = this.editForm.travelOrderFlightList[subIndex];
         //上移