页面修改

src/components/confirmationOrderDownLoad.vue

@@ -13,9 +13,9 @@
 <template>
   <div class="travelControlTrip detail-box">
     <div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
-    <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF"
+    <input type="button" style="width: auto !important; display:none;" class="travelControlTripBtn" value="下载电脑版PDF"
       @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
-    <input type="button" style="width: auto !important;display:none; " class="travelControlTripBtn" value="下载电脑版PDF2"
+    <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF"
       @click="toPDF_V2(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
     <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD"
       @click="gernalFeature(0)" />
@@ -24,7 +24,6 @@
     <a class="travelControlTripBtn" v-if="priceList.length>0&& priceList[0].wordPath!=''" style="display:inline-block;text-decoration:none;
       width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;"
       :href="domainManager().ViittoFileUrl+priceList[0].wordPath">下载WORD行程</a>
-    <!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') -->
     <!--&&isopOperation HK 注释 可以让销售修改基本信息-->
     <input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
     <div id="pdfNode">
@@ -130,10 +129,18 @@
                 <div class="collection-item clearfix">
                   <div><img src="../assets/img/TravelControlTripIcon13.png" />紧急联系人</div>
                   <template>
-                    <span v-if='vshowLLR'> {{orderTripdiff!=null ?
-                      orderTripdiff.emergencyContact : orderMsg.branchManager+"/"+orderMsg.mobilePhone}}</span>
-                    <span v-else>{{orderTripdiff!=null ?
-                      orderTripdiff.emergencyContact : orderMsg.sellName+"/"+orderMsg.sellTel}}</span>
+                    <span v-if='vshowLLR'> 
+                      <template v-if="orderTripdiff!=null&&orderTripdiff.emergencyContact!=''">
+                        {{orderTripdiff.emergencyContact}}
+                      </template>
+                      <template v-else-if="orderMsg.branchManager!=''&&orderMsg.mobilePhone!=''">
+                        {{orderMsg.branchManager+"/"+orderMsg.mobilePhone}}
+                      </template>
+                      <template v-else-if="orderMsg.sellName!=''&&orderMsg.sellTel!=''">
+                        {{orderMsg.sellName+"/"+orderMsg.sellTel}}
+                      </template>
+                      </span>
+                    <span v-else></span>
                   </template>
                 </div>
               </td>
@@ -945,7 +952,7 @@
           }
         }).then(res => {
           if (res.data.resultCode === 1) {
-             let sign = title
+             let sign = title+"V2"
               const a = document.createElement('a');
               a.setAttribute('download', '');
               a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +