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

src/components/confirmationOrderDownLoad.vue

@@ -8,7 +8,7 @@
   <div class="travelControlTrip detail-box">
     <div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
     <input type="button" class="travelControlTripBtn" value="下载PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
-    <input style="display:none;" type="button" class="travelControlTripBtn" value="下载WORD" @click="ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
+    <input  type="button" class="travelControlTripBtn" value="下载WORD" @click="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">

src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue

@@ -1354,7 +1354,7 @@
         let deleteDataList = JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete));
         this.deleteArray = deleteDataList==="" ? this.deleteArray : deleteDataList;
         console.log("dataList",dataList,!this.$route.query.configId,dataList.switch4or5)
-        if (!this.$route.query.configId || (this.$route.query.configId && dataList.switch4or5) ){
+        if (!this.$route.query.configId || (this.$route.query.configId && dataList.switch4or5) || (this.FeatureData.FeatureType !== 4 || this.FeatureData.FeatureType !== 5) ){
           for (let i = 0; i < dataList.DayList.length; i++) {  //组装数据
             let restaurantObj = travelFeatureTwo.DinnerInit(i, dataList.DayList) // 餐饮
             let hotelObj = travelFeatureTwo.HotelInit(i, dataList.DayList)  // 酒店