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

src/components/SalesModule/productQuery2.vue

@@ -84,11 +84,10 @@
   .superSearchLayer>div>span {
     margin: 0 15px 0 5px;
   }
-  
+
   .productQuerybottomLayer {
     overflow: auto;
     position: fixed;
-    /* max-height: 300px; */
     z-index: 50;
     bottom: 0;
     left: 0;
@@ -238,7 +237,8 @@
       <ul>
         <li>
           <span><em>{{ $t("scen.sc_cp") }}</em>
-            <el-select class="w150" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')">
+            <!--台湾印象只能看自公司的 不能切换 HK 2023-10-26 添加-->
+            <el-select class="w150" v-model="msg.BranchId" filterable :disabled="CurrentUserInfo.RB_Branch_id==1220" :placeholder="$t('pub.pleaseSel')">
               <el-option v-for="item in companyList" :label="item.BName" :value="item.Id" :key="item.Id">
               </el-option>
             </el-select>
@@ -446,11 +446,12 @@
       layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
     </el-pagination>
     <!-- 产品列表 -->
-    <productOrderList :loading="loading" :list="list" @success="reSearchPage" :pagesTitle="pagesTitle" :PBranchId="msg.BranchId"></productOrderList>
+    <productOrderList :loading="loading" :list="list" @success="reSearchPage" :pagesTitle="pagesTitle"
+      :PBranchId="msg.BranchId"></productOrderList>
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
       layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
     </el-pagination>
-    
+
   </div>
 </template>
 
@@ -673,7 +674,7 @@
     },
     mounted() {
       this.userInfo = this.getLocalStorage();
-      this.CurrentUserInfo = this.userInfo ;
+      this.CurrentUserInfo = this.userInfo;
       this.userId = this.userInfo.EmployeeId;
       this.msg.BranchId = this.userInfo.RB_Branch_id.toString();
       if (this.$route.query.id) {
@@ -687,13 +688,13 @@
         let nowDay = this.FormartDate(new Date());
         this.msg.StartTime = nowDay;
       }
-      this.getCompanyList();//公司
-      this.getList();//产品列表
-      this.getLineList();//线路
-      this.getSalePlace();//销售平台
-      this.getAirlineList();//获取航空公司
-      this.getStartList();//出发城市
-      this.getStartList1();//目的地
+      this.getCompanyList(); //公司
+      this.getList(); //产品列表
+      this.getLineList(); //线路
+      this.getSalePlace(); //销售平台
+      this.getAirlineList(); //获取航空公司
+      this.getStartList(); //出发城市
+      this.getStartList1(); //目的地
     },
   };
 

src/components/SalesModule/productQueryOne2.vue

@@ -237,7 +237,9 @@
     <div class="productQuerySearch" v-if="!TCIDList">
       <ul>
         <li><span><em>{{$t('scen.sc_cp')}}</em>
-            <el-select class='w150' v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')">
+            <!--台湾印象只能看自公司的 不能切换 HK 2023-10-26 添加-->
+            <el-select class='w150' v-model="msg.BranchId" :disabled="CurrentUserInfo.RB_Branch_id==1220" filterable
+              :placeholder="$t('pub.pleaseSel')">
               <el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'>
               </el-option>
             </el-select>
@@ -1286,7 +1288,7 @@
             Number(this.addMsg.BabyNum)) -
           (Number(this.addMsg.ESeatNum) + Number(this.addMsg.FSeatNum));
         this.TotalNumber = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg
-          .ChirdNum) +
+            .ChirdNum) +
           Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum))
         this.addMsg.YSeatNum = SeatNum < 0 ? 0 : SeatNum;
         this.autoRemarks("VisaNum", "不要签证数量")
@@ -1480,7 +1482,7 @@
           qzf: '',
         }
       },
-      saveOrder() {  
+      saveOrder() {
         if ((Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this
             .addMsg.OldPeopleNum) + Number(this.addMsg.BabyNum)) < Number(this.addMsg.SafeNum)) {
           this.$message.warning('保险数量不能大于人数总和！')

src/components/index.vue

@@ -1872,12 +1872,7 @@
         }
       }
 
-      // 两小时请求一次改价提醒
-      setInterval(()=>{
-        if(!this.ChangeThePriceVisible){
-          this.GetChangeThePrice()
-        }
-      },7200000)
+
       // 获取改价提醒
       if(!localStorage.getItem("ChangeThePriceDataTime")||
       (localStorage.getItem("ChangeThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))){
@@ -1887,6 +1882,14 @@
         //   this.ChangeThePriceData = JSON.parse(localStorage.getItem("ChangeThePriceData"))
         // }
       }
+      // 两小时请求一次改价提醒
+      setInterval(()=>{
+        if(!this.ChangeThePriceVisible){
+          this.GetChangeThePrice()
+        }else{
+          clearInterval()
+        }
+      },7200000)
 
     },
     created() {