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

src/components/Hotel/singleProduct/HotelQueryList.vue

@@ -54,9 +54,9 @@
             </span>
           </li>
           <li>
-            <input v-if="HOTEL_memorandum" type="button" class="normalBtn" value="备忘录"
+            <input v-if="HOTEL_memorandum&&!pagesTitle" type="button" class="normalBtn" value="备忘录"
             @click="goUrl('memorandumList')" />
-          <input type="button" class="normalBtn" value="温馨提示"
+          <input v-if="!pagesTitle" type="button" class="normalBtn" value="温馨提示"
             @click="showNotice=true" />
             <button style="position: relative;" class="hollowFixedBtn"  type="primary" @click="rightCarOpen=true">
               <i class="el-icon-goods"></i>
@@ -102,12 +102,14 @@
         <WarmReminder @close="showNotice= false"></WarmReminder>
       </div>
       <!-- 默认弹窗信息 -->
-      <el-dialog custom-class="w800" title="信息" :visible.sync="showHQinfo" center>
-        <HotelTipTableList></HotelTipTableList>
-        <div slot="footer" class="dialog-footer">
-          <button class="hollowFixedBtn" @click="showHQinfo = false">关闭</button>
-        </div>
-      </el-dialog>
+      <template v-if="!pagesTitle">
+        <el-dialog custom-class="w800" title="信息" :visible.sync="showHQinfo" center>
+          <HotelTipTableList></HotelTipTableList>
+          <div slot="footer" class="dialog-footer">
+            <button class="hollowFixedBtn" @click="showHQinfo = false">关闭</button>
+          </div>
+        </el-dialog>
+      </template>
       <!-- 暂存购物车 -->
       <el-dialog custom-class="w800" title="酒店信息" :visible.sync="showOrderPreview" center @close="removeEditor">
         <TableOperation :editorType="editorType" :HotelRow="orderSubmitObj" 
@@ -131,6 +133,7 @@
     import WarmReminder from './components/WarmReminder'
     import HotelTipTableList from './components/HotelTipTableList'
     export default {
+      props:['pagesTitle'],
       components: { SamplePriceList,
         TableOperation,ListCar,
         hotelDetails,hotelTableList,
@@ -156,8 +159,8 @@
             pageSize: 10,
             //酒店选择数组
             HotelChooseArray: [],
-            StartDate: this.getBeforeDate(-20,new Date().Format("yyyy-MM-dd")),
-            EndDate: this.getBeforeDate(-30,this.getBeforeDate(-20,new Date().Format("yyyy-MM-dd"))),
+            StartDate: this.getBeforeDate(0,new Date().Format("yyyy-MM-dd")),
+            EndDate: this.getBeforeDate(-30,this.getBeforeDate(0,new Date().Format("yyyy-MM-dd"))),
             //只查询日本
             Country: "651",
             Province: 0,
@@ -247,7 +250,8 @@
               ]
             }
           },
-          HOTEL_memorandum: false
+          HOTEL_memorandum: false,
+          crmOrderObj: null
         };
       },
       watch: {
@@ -398,6 +402,10 @@
         },
       },
       mounted() {
+        // crm自动登陆传过来的参数
+        if(this.$route.query.crmOrderObj){
+           this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
+       }
         this.HotelLength = localStorage.getItem("HotelLength")?localStorage.getItem("HotelLength"):0
 
         let userinfo = this.getLocalStorage();

src/components/Hotel/singleProduct/components/ListCar.vue

@@ -22,7 +22,8 @@
                         <div class="list-content-box" v-for="(y,i) in x.Hotels">
                             <div class="list-operation">
                                 <div>
-                                    <button v-if="x.Date>OptionalTime" class="hollowFixedBtn" type="primary" @click="setEditorHandler(y)">
+                                    
+                                    <button v-if="x.Date>=OptionalTime" class="hollowFixedBtn" type="primary" @click="setEditorHandler(y)">
                                         <i class="el-icon-edit"></i>
                                     </button>
                                     <button class="normalBtn" type="primary" @click="removeHotelHandler(xi,i)">
@@ -142,7 +143,7 @@
       },
       data() {
         return {
-            OptionalTime: this.getBeforeDate(-2,new Date().Format('yyyy-MM-dd')),//可编辑时间
+            OptionalTime: this.getBeforeDate(0,new Date().Format('yyyy-MM-dd')),//可编辑时间
             cars: [],
             HotelLength: 0,
             addNum: 1,

src/components/SalesModule/productQuery.vue

@@ -3367,6 +3367,10 @@
           (res) => {
             if (res.data.resultCode == 1) {
               this.ctlxList = res.data.data;
+              // 屏蔽订车订房订门票
+              this.ctlxList.splice(-1)
+              this.ctlxList.splice(-1)
+              this.ctlxList.splice(-1)
             }
           },
           (err) => {}

src/components/SalesModule/productQueryOne.vue

@@ -2290,6 +2290,10 @@
         this.apipost('sellorder_get_GetOrderJoinEnumList', {}, res => {
           if (res.data.resultCode == 1) {
             this.ctlxList = res.data.data
+            // 屏蔽订车订房订门票
+            this.ctlxList.splice(-1)
+            this.ctlxList.splice(-1)
+            this.ctlxList.splice(-1)
           }
         }, err => {})
       },

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -1956,6 +1956,8 @@
         this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => {
             if (res.data.resultCode == 1) {
               this.TeamListArr = res.data.data;
+              // 屏蔽单项服务
+              this.TeamListArr.splice(-1)
             } else {
               this.Error(res.data.message);
             }