页面修改

src/assets/css/sale_pdf.css

@@ -520,8 +520,8 @@
     background: #fff;
 }
 .detail-box .timeline .timeline-item span.medium{
-    font-size: 28px;
-    line-height: 56px;
+    font-size: 20px;
+    line-height: 25px;
     display: flex;
 }
 .detail-box .timeline .timeline-item span.medium i.iconfont{

src/components/SalesconfirmationOrder.vue

@@ -7,32 +7,37 @@
   .travelControlTrip .hangban-info tr th {
     padding-left: 0 !important;
   }
-  .travelControlTrip .playTime i{
+
+  .travelControlTrip .playTime i {
     position: relative;
-    top:-3px;
+    top: -3px;
   }
-  .travelControlTrip .commonTimeStr{
-    margin-bottom:5px;
-    color:#999;
-    font-size:12px;
+
+  .travelControlTrip .commonTimeStr {
+    margin-bottom: 5px;
+    color: #999;
+    font-size: 12px;
   }
-  .timeline-item .Arrayleft{
-      width: 74px;
-      height: 25px;
-      background-color: #fff;
-      margin-right: 20px;
-      text-align: center;
-      font-size: 12px;
-      padding: 5px 0;
-      position: absolute;
-      left:-16px;
-      z-index:999;
+
+  .timeline-item .Arrayleft {
+    width: 74px;
+    height: 25px;
+    background-color: #fff;
+    margin-right: 20px;
+    text-align: center;
+    font-size: 12px;
+    padding: 5px 0;
+    position: absolute;
+    left: -16px;
+    z-index: 999;
   }
-  .timeline-item .Arrayleft i{
+
+  .timeline-item .Arrayleft i {
     position: relative;
-    left:1px;
-    top:-4px;
+    left: 1px;
+    top: -4px;
   }
+
 </style>
 
 <template>
@@ -40,11 +45,11 @@
     <div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
     <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF"
       @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
- 
+
     <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>
- 
+
     <!--&&isopOperation HK 注释 可以让销售修改基本信息-->
     <input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
     <div id="pdfNode">
@@ -282,7 +287,7 @@
                   <span class="big" style="font-size: 20px;">行程</span>
                 </div>
                 <div class="new_right">
-                  <span class="medium">
+                  <span class="medium" style=" font-size: 20px;line-height: 25px;">
                     <div v-for="(dn,i) in item.dayArray" :key="i">
                       {{dn.childItem.title}}
                     </div>
@@ -294,15 +299,16 @@
                   <div class="timeline-item">
                     <template v-for="(dd,Subindex) in son.childItem.subTraffic">
                       <div class="Arrayleft" v-if="dd.startTime!=''||dd.endTime!=''">
-                          <span v-if="son.type==1" v-for="(dns,o) in son.childItem.subTraffic" :key="o">
-                              <span v-if="dns.startTime!=''">{{getStartTime(dns.startTime)}}</span><span v-if="dns.endTime!=''">-{{getStartTime(dns.endTime)}}</span>
-                          </span>
+                        <span v-if="son.type==1" v-for="(dns,o) in son.childItem.subTraffic" :key="o">
+                          <span v-if="dns.startTime!=''">{{getStartTime(dns.startTime)}}</span><span
+                            v-if="dns.endTime!=''">-{{getStartTime(dns.endTime)}}</span>
+                        </span>
                       </div>
                     </template>
                     <div class="new_right">
                       <span class="time" v-if="dataList.trafficList[0].airportPickUp==1">接早</span>
                       <span class="time" v-if="dataList.trafficList[0].airportPickUp==2">送机</span>
-          
+
                       <span class="title">
                         <span v-if="son.type==1" v-for="(dns,o) in son.childItem.subTraffic" :key="o">
                           {{dns.startCityName}}
@@ -326,13 +332,15 @@
                       </template>
                     </div>
                     <div class="new_right">
-       
+
                       <span class="title">
                         {{son.childItem.couponsName}}
                       </span>
                       <div class="playTime"> <i class="iconfont icon-shijian"></i> 游玩时间：
-                        <span v-if="son.childItem.playTimeHour!=null&&son.childItem.playTimeHour!=''">{{son.childItem.playTimeHour+'小时'}}</span>
-                        <span v-if="son.childItem.playTimeMinutes!=null&&son.childItem.playTimeMinutes!=''">{{son.childItem.playTimeMinutes+'分钟'}}</span>
+                        <span
+                          v-if="son.childItem.playTimeHour!=null&&son.childItem.playTimeHour!=''">{{son.childItem.playTimeHour+'小时'}}</span>
+                        <span
+                          v-if="son.childItem.playTimeMinutes!=null&&son.childItem.playTimeMinutes!=''">{{son.childItem.playTimeMinutes+'分钟'}}</span>
                       </div>
                       <div class="content" v-html="son.childItem.description"></div>
                       <div class="Newimg-list clearfix" v-if="son.childItem.imaArray.length">
@@ -350,7 +358,7 @@
                       <i class="iconfont icon-jiudian"></i>
                     </div>
                     <div class="new_right">
-                       
+
                       <div class="title">
                         {{son.childItem.hotelName+son.childItem.hotelProductName}}
                       </div>
@@ -367,17 +375,18 @@
                   <div class="timeline-item">
                     <div class="Arrayleft" v-if="son.childItem.timeStr!=''">
                       <span v-if="son.childItem.timeStr!=''">
-                          {{getStartTime(son.childItem.timeStr)}}
+                        {{getStartTime(son.childItem.timeStr)}}
                       </span>
                     </div>
                     <div class="new_right">
-           
+
                       <span class="title">
                         {{son.childItem.dinnerName+son.childItem.mealName}}
                       </span>
                       <div class="playTime"> <i class="iconfont icon-shijian"></i> 用餐时长：<span
                           v-if="son.childItem.useTimeHour!=null&&son.childItem.useTimeHour!=''">{{son.childItem.useTimeHour+'小时'}}</span><span
-                          v-if="son.childItem.useTimeMinutes!=null&&son.childItem.useTimeMinutes!=''">{{son.childItem.useTimeMinutes+'分钟'}}</span></div>
+                          v-if="son.childItem.useTimeMinutes!=null&&son.childItem.useTimeMinutes!=''">{{son.childItem.useTimeMinutes+'分钟'}}</span>
+                      </div>
                       <div class="content" v-html="son.childItem.description"></div>
                       <div class="Newimg-list clearfix" v-if="son.childItem.imaArray.length">
                         <div class="item" v-for="(img,i) in son.childItem.imaArray" :key="i">
@@ -393,7 +402,7 @@
                       <i class="iconfont icon-huodong"></i>
                     </div>
                     <div class="new_right">
-        
+
                       <span class="content" v-html="son.childItem.description"></span>
                     </div>
                   </div>
@@ -428,7 +437,8 @@
               <div v-html="feature.feeNonInclude"></div>
             </div>
           </div>
-          <div class="expense" style="margin-top:30px;" v-if='dataList.selfpayingList && dataList.selfpayingList.length>0&&vshowE'>
+          <div class="expense" style="margin-top:30px;"
+            v-if='dataList.selfpayingList && dataList.selfpayingList.length>0&&vshowE'>
             <div class="left">自理费用</div>
             <div class="right">
               <table class="expense-table" cellspacing=0 cellpadding=0>
@@ -449,7 +459,7 @@
               </table>
             </div>
           </div>
-          <div v-if='vshowF' class="module-title">
+          <div v-if="vshowF&&feature&&feature.shopRemark!=''" class="module-title">
             <h2>购物说明</h2>
             <div class="short-line"></div>
             <div class="english-title">Expense</div>
@@ -483,7 +493,7 @@
           </div>
           <div style="width: 100%;height:1px;"></div>
         </div>
-        <div id="pdf_5">
+        <div id="pdf_5" v-if="(feature&&feature.warmTip!='')||(feature&&feature.importantTip!='')">
           <div v-if='vshowG' class="module-title">
             <h2>订单须知</h2>
             <div class="short-line"></div>
@@ -503,7 +513,8 @@
           </div>
           <div style="width: 100%;height:1px;"></div>
         </div>
-        <div id="pdf_6">
+        <div id="pdf_6"
+          v-if="(vshowH&&feature.visaRemark!='')||(vshowI&&feature.b2BRemark!='')||(vshowM&&orderMsg&&orderMsg.guestList&&orderMsg.guestList.length>0)">
           <div v-if='vshowH' class="module-title">
             <h2>签证</h2>
             <div class="short-line"></div>
@@ -995,9 +1006,9 @@
           //模板参数
           templateId: this.showType,
           //用户Id
-          UId:this.getLocalStorage().EmployeeId,
+          UId: this.getLocalStorage().EmployeeId,
           //团队类型(一日游)
-          TeamType:2,
+          TeamType: 2,
         };
         this.$http({
           headers: {
@@ -1010,12 +1021,12 @@
           }
         }).then(res => {
           if (res.data.resultCode === 1) {
-             let sign = title+"V2"
-              const a = document.createElement('a');
-              a.setAttribute('download', '');
-              a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
-                '.pdf&&fPath=' + res.data.data);
-              a.click();
+            let sign = title + "V2"
+            const a = document.createElement('a');
+            a.setAttribute('download', '');
+            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
+              '.pdf&&fPath=' + res.data.data);
+            a.click();
           } else {
             this.$message.error('PDF获取失败');
           }
@@ -1084,7 +1095,7 @@
           cityId: this.$route.query.cityId,
           tcid: this.$route.query.tcid,
           orderId: this.$route.query.orderId,
-          isClick:1//不算统计
+          isClick: 1 //不算统计
         }, res => {
           if (res.data.resultCode == 1) {
             let data = (res.data.data);
@@ -1255,8 +1266,8 @@
                 playTimeHour: null,
                 playTimeMinutes: null,
                 url: '',
-                startTime:y.childItem.startTime,
-                endTime:y.childItem.endTime
+                startTime: y.childItem.startTime,
+                endTime: y.childItem.endTime
               }
               jiao.push(obj)
             } else if (y.type == 2 && y.childItem.couponsName != '' && y.childItem.imaArray.length > 0) {
@@ -1430,16 +1441,16 @@
           }
         }
       },
-      getStartTime(startTime){
-        var n = Number(startTime); 
-        if (!isNaN(n)&&startTime.indexOf(':')==-1) { 
-            var strSep=":";
-            var str1=startTime.substring(0,2);
-            var str0=startTime.substring(2,startTime.length);
-            var strNew=str1+strSep+str0;
-            return strNew;
-        }else{
-          return startTime.replace('：',':')
+      getStartTime(startTime) {
+        var n = Number(startTime);
+        if (!isNaN(n) && startTime.indexOf(':') == -1) {
+          var strSep = ":";
+          var str1 = startTime.substring(0, 2);
+          var str0 = startTime.substring(2, startTime.length);
+          var strNew = str1 + strSep + str0;
+          return strNew;
+        } else {
+          return startTime.replace('：', ':')
         }
       }
     },