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

src/components/FinancialModule/invoicesManagerDetail.vue

@@ -586,7 +586,11 @@ export default {
       this.$viewer.show()
     },
     goUrlO: function (OrderId) {
+      if(this.$route.query.InvoiceApplyType&&this.$route.query.InvoiceApplyType==4){
+        this.$router.push({ name: 'CRMTicketOrderOP', query: { OrderId: OrderId, blank: 'y', tab: '单机票详情'} });
+      }else{
         this.$router.push({ name: 'enrollTotal', query: { id: OrderId, blank: 'y', tab: '报名统计'} });
+      }
     },
     goUrlT: function (path, obj, title){  // 跳转团页面
 	 	   this.$router.push({ name:path,query:{"id":obj,blank:'y',tab:title}})

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -315,7 +315,7 @@
                 <template v-if="subItem.ContainDinnerType==0">含餐类型</template>
                 <template v-if="subItem.ContainDinnerType==1">含早餐</template>
                 <template v-if="subItem.ContainDinnerType==2">含晚餐</template>
-                <template v-if="subItem.ContainDinnerType==3">含晚餐</template>
+                <template v-if="subItem.ContainDinnerType==3">含早晚餐</template>
                 <br />
                 {{subItem.HotelCostPrice}}
               </td>