页面修改

src/components/LeaveGroupDownload/index.vue

@@ -167,6 +167,23 @@
                     <td width="100">{{flight.stopoverAirPortName}}</td>
                   </tr>
                 </tbody>
+                <tbody v-else-if="priceList.length>0&&priceList[0].priceFlight&&priceList[0].priceFlight.length>0"
+                  style="padding-top:12px;">
+                  <tr v-for="(flight,ftIndex) in priceList[0].priceFlight" :key="ftIndex">
+                    <td width="140"><span class="nth-day">{{flight.startDate.substring(5)}}</span>&nbsp;<span
+                        class="num">{{flight.departureTime}}</span></td>
+                    <td width="160"><span class="nth-day">{{flight.arriveDate.substring(5)}}</span>&nbsp;<span
+                        class="num">{{flight.arrivalTime}}</span></td>
+                    <td width="160">{{flight.departureAirPortName}}<span class="citycode"></span></td>
+                    <td width="18" class="gap">&nbsp;</td>
+                    <td width="160">{{flight.arrivalAirPortName}}<span class="citycode"></span></td>
+                    <td width="18" class="gap">&nbsp;</td>
+                    <td width="140">{{flight.alName}}</td>
+                    <td width="110">{{flight.flightNumber}}({{(flight.flightState==1)?"OK":"暂定"}})</td>
+                    <td width="18" class="gap">&nbsp;</td>
+                    <td width="100">{{flight.stopoverAirPortName}}</td>
+                  </tr>
+                </tbody>
                 <tbody>
                   <tr>
                     <td colspan="10" align="center" style="color:#333;font-size:14px;">
@@ -202,7 +219,8 @@
       "orderTripdiff",
       "vshowLLR",
       "vshowB",
-      "lineId"
+      "lineId",
+      "priceList"
     ],
     data() {
       return {

src/components/confirmationOrderDownLoadNew.vue

@@ -64,7 +64,7 @@
       <div id="pdfDom">
         <!-- 首页 -->
         <LeaveGroupDownload :dataAll="dataAll" :vshowJ="vshowJ" :vshowL="vshowL" :WeiXinShareImgSrc="WeiXinShareImgSrc"
-          :orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :vshowLLR="vshowLLR" :vshowB="vshowB" :lineId="lineId">
+          :orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :vshowLLR="vshowLLR" :vshowB="vshowB" :lineId="lineId" :priceList="priceList">
         </LeaveGroupDownload>
 
         <!-- 行程特色 -->
@@ -506,6 +506,7 @@
             var ocrUrl ="";
             //urlObj.ocrUrl + "/Home/DownloadFileForPdf?url=" + encodeURIComponent(path);
             ocrUrl= urlObj.ocrUrl + "/Home/DownloadFileForPdf?configId="+msg.configId+"&url=" + encodeURIComponent(path);
+            //ocrUrl="http://192.168.10.128:8300"+"/api/Home/DownloadFileForPdf?configId="+msg.configId+"&url=" + encodeURIComponent(path);
             this.$http({
               headers: {
                 'Content-Type': 'application/json'