页面修改

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -655,7 +655,7 @@
                     <span class="TCL-greenType">{{item.SaleClearOrderHour}}{{$t('salesModule.Hour')}}</span>
                   </p>
                   <p
-                    v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
+                    v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
                     <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
                       <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
                         :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -458,7 +458,20 @@
                     <a style="corsor:pointer;"
                       :href="domainManager().ViittoFileUrl+item.WordPath">{{$t('visa.v_salecompany')}}下载WORD行程</a>
                   </p>
-
+                  <p
+                    v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
+                    <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
+                      <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
+                        :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
+                        @SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
+                      <div slot="reference">
+                        <span class="price"
+                          style="cursor:pointer;text-decoration:underline;">{{$t('salesModule.HotelOrder')}}</span>
+                        <span
+                          style="color: #e95252">op{{item.OpSureHouse==2 ? '已确认' : '未确认'}}{{$t('op.Fenfang')}}</span>
+                      </div>
+                    </el-popover>
+                  </p>
                 </div>
               </div>
               <div class="el-col" style="width:190px;">
@@ -735,16 +748,17 @@
                 <div class="TCL_Content">{{item.OPInnerRemark}}</div>
               </div>
               <div class="clearfix TCL-redType"
-                v-if="item.DmcRemarkLast ||  item.HotelDiningBus.HotelChangeState>0 || item.HotelDiningBus.DiningChangeState>0 || item.HotelDiningBus.ResultBusTypeStr!='' ">
+                v-if="item.DmcRemarkLast ||  (item.HotelDiningBus &&item.HotelDiningBus.HotelChangeState>0) || (item.HotelDiningBus &&item.HotelDiningBus.DiningChangeState>0) || (item.HotelDiningBus &&item.HotelDiningBus.ResultBusTypeStr!='') ">
                 <div class="TCL_remarkTitle">{{$t('Operation.Op_dijieRemark')}}：</div>
                 <div class="TCL_Content">{{item.DmcRemarkLast!=null? item.DmcRemarkLast.DMCRemark:''}}
-                  <a v-if="item.HotelDiningBus.HotelChangeState>0" @click="goHotelDiningBus(item,item.HotelDiningBus,1)"
+                  <a v-if="item.HotelDiningBus &&item.HotelDiningBus.HotelChangeState>0"
+                    @click="goHotelDiningBus(item,item.HotelDiningBus,1)"
                     style="color:blue;cursor:pointer">{{$t('Operation.Op_HotelChange')}}</a>
-                  <a v-if="item.HotelDiningBus.DiningChangeState>0"
+                  <a v-if="item.HotelDiningBus &&item.HotelDiningBus.DiningChangeState>0"
                     @click="goHotelDiningBus(item,item.HotelDiningBus,2)"
                     style="color:blue;cursor:pointer">{{$t('sm.cantingbiangeng')}}</a>
                   <a
-                    v-if="item.HotelDiningBus.ResultBusTypeStr!=''">{{$t('Operation.Op_carType')}}:{{item.HotelDiningBus.ResultBusTypeStr}}</a>
+                    v-if="item.HotelDiningBus && item.HotelDiningBus.ResultBusTypeStr!=''">{{$t('Operation.Op_carType')}}:{{item.HotelDiningBus.ResultBusTypeStr}}</a>
                 </div>
               </div>
             </div>
@@ -830,9 +844,11 @@
 </template>
 <script>
   import priceDialog from '../TravelNewQuotation/priceDialog.vue';
+  import commonHotelInfo from "../../commonPage/commonHotelInfo.vue";
   export default {
     components: {
-      priceDialog
+      priceDialog,
+      commonHotelInfo
     },
     data() {
       return {
@@ -993,6 +1009,17 @@
             Checked: false
           }
         ],
+        showHotelObj: {
+          showPrice: true, //是否显示价格
+          showPay: false, //是否显示支付方式
+          showZhan: true, //占房时间
+          showBtnList: false, //是否下载、确认按钮
+          ShowTaxType: false, //显示税入税别
+          ShowRebateRatio: false, //显示返佣比列
+          ShowSupplier: true, //是否显示供应商
+          showCaozuoTime: true, //操作时间
+          colspanLength: 5 //跨行
+        },
         //当前登录用户信息
         CurrentUserInfo: {},
         pickerBeginDateBefore: {

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue

@@ -110,7 +110,9 @@
         homeBg3: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg3.jpg",
         homeBg1: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg1.jpg",
         homeBgOz1: "https://imgfile.oytour.com/Static/NewTripFeature/homebgoz.jpg", //欧洲线默认图
-        homeBgNy:"https://imgfile.oytour.com/Static/NewTripFeature/homebgny.jpg", //南亚线默认图
+        homeBgNy: "https://imgfile.oytour.com/Static/NewTripFeature/homebgny.jpg", //南亚线默认图
+        homeBgGn: "https://imgfile.oytour.com/Static/NewTripFeature/homebggn.jpg", //国内线
+
         homeBg2: "http://imgfile.oytour.com/Static/NewTripFeature/homeBg2.jpg",
         dinner1: "http://imgfile.oytour.com/Static/NewTripFeature/dinner1.jpg",
         dinner2: "http://imgfile.oytour.com/Static/NewTripFeature/dinner2.jpg",
@@ -312,6 +314,13 @@
           newObj.SubName = '『印象兰卡』斯里兰卡品质游代名词';
           newObj.MainDesc =
             "坚持以高端旅游服务广大客户群体！我们坚信旅游是美好的体验！带您领略“宝石王国”的绚丽美景！出海观鲸、看大象、历史遗迹、高跷立钓、海上小火车，感受斯里兰卡独有的人文景观......印象兰卡不断思索旅游本质，坚持旅游质量，对于旅游的专业与服务有着深刻体认！我们的用心，您一定会看的见！选择印象兰卡，会是你前往兰卡最好的选择，您一定会认同并期待您的参与，这也是我们由衷的期盼！“旅遊”不是舟車勞頓的代名詞~提供高档旅游产品，印象之旅有其独到的见解与坚持，这就是各位选择旅游的真正定义!来吧~如果你还在犹豫不知道该选择什么样的兰卡产品，相信印象之旅对是你最棒的选择！最后并祝各位有个舒心愉快的旅程!"
+        } else if (this.FeatureData && this.FeatureData.LineShortName && this.FeatureData.LineShortName.indexOf('国内') >
+          -1) {
+          imgObj.url = this.homeBgGn;
+          newObj.MainName = "星空九寨";
+          newObj.SubName = '『星空九寨』高端定制的九寨之旅';
+          newObj.MainDesc =
+            "我们坚持以高端旅游服务广大客户群体！坚信旅游是美好的体验！带您体验九寨的四季之美，赏山.赏水.赏云并且享受藏式餐饮，宿悬崖酒店，遨游九寨的秀丽山海美景！星空九寨不断思索旅游本质，坚持旅游质量，对于旅游的专业与服务有着深刻体认！我们的用心，您一定会看的见！选择星空九寨，会是你前往九寨之旅最好的选择，您一定会认同并期待您的参与，这也是我们由衷的期盼！”旅游“不是舟车劳顿的代名词~提供高档旅游产品，我们有着独到的见解与坚持，这就是各位选择旅游的真正定义!来吧~如果你还在犹豫不知道该选择什么样的旅游产品，相信星空九寨是对你最棒的选择！最后并祝各位有个愉快的旅游假期！"
         } else {
           newObj.MainName = "日本旅行专家";
           newObj.SubName = "『印象日本』日本豪华游代名词";

src/components/orderCommon/productOrderList.vue

@@ -574,7 +574,7 @@
               </div>
             </div>
           </div>
-          <div class="d3" v-if="pagesTitle=='跟团游产品'">
+          <div class="d3" v-if="pagesTitle=='跟团游产品'||pagesTitle=='当地游产品'">
             <p>
               <i class="iconfont icon-tuandui"></i>{{ $t("visa.v_teaminfo")
                 }}<em>{{ item.DayNum }}{{ $t("hotel.hotel_day") }}{{ item.NightNum
@@ -607,7 +607,7 @@
             </p>
             <!--日本线和欧洲线显示酒店预定情况-->
             <p
-              v-if="(item.LineID == 14||item.LineID==168) && item.HotelOrderListReports && item.HotelOrderListReports.length > 0">
+              v-if="(item.LineID == 14||item.LineID==168||item.LineID==118) && item.HotelOrderListReports && item.HotelOrderListReports.length > 0">
               <el-popover width="600" trigger="click" popper-class="PQ_HotelPop">
                 <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj">
                 </commonHotelInfo>