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

src/components/index.vue

@@ -222,7 +222,8 @@
                   机票未绑团查看
                   <i class="iconfont icon-right1"></i>
                 </el-dropdown-item>
-                <el-dropdown-item v-if="ChangeThePriceList.length>0" class="clearfix _dropdown_other" @click.native="GetChangeThePrice(1)">
+                <el-dropdown-item v-if="ChangeThePriceList.length>0" class="clearfix _dropdown_other"
+                  @click.native="GetChangeThePrice(1),GetExaminePriceOrderPageList(1)">
                   <i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
                   订单改价查看
                   <i class="iconfont icon-right1"></i>
@@ -1204,9 +1205,12 @@
     <unbundlingMessage v-if="unbundlingVisible"
     :UnboundDate="UnboundDate" @unbundlingVisible="unbundlingVisible=false"></unbundlingMessage>
 
-    <!-- 改价提醒 -->
-    <ChangeThePriceMessage v-if="ChangeThePriceVisible" :ChangeThePriceData="ChangeThePriceData"
-    @ChangeThePriceVisible="ChangeThePriceVisible=false"></ChangeThePriceMessage>
+    <!-- 改价提醒/审核改价提醒 -->
+    <ChangeThePriceMessage v-if="ChangeThePriceVisible||ExamineThePriceVisible"
+    :type="1"
+    :msg="ExamineThePriceMsg"
+    :ChangeThePriceObj="ChangeThePriceObj"
+    @ChangeThePriceVisible="ChangeThePriceVisible=false,ExamineThePriceVisible=false"></ChangeThePriceMessage>
   </div>
 </template>
 
@@ -1243,13 +1247,26 @@
       commissionDetail,
       Voting,
       unbundlingMessage,
-      ChangeThePriceMessage
+      ChangeThePriceMessage,
     },
     data() {
       return {
+        ExamineThePriceMsg:{
+          OrderId:"",
+          OrderState:"1",
+          OrderType:"0",
+          pageIndex:1,
+          pageSize:5,
+          total: 0,
+          total2: 0,
+        },
+        ExamineThePriceVisible: false,//审核改价提醒
         ChangeThePriceList: [],
-        ChangeThePriceData:[],
         ChangeThePriceVisible: false,//改价提醒
+        ChangeThePriceObj:{
+          ExamineThePriceData:[],
+          ChangeThePriceData:[],
+        },
         UnboundDate: {},
         unbundlingVisible: false,//未绑团提醒
         b2bDomain: "",
@@ -1874,7 +1891,7 @@
       }
 
 
-      // 获取改价提醒  每月1到10号提示
+      // 获取改价及审核提醒  每月1到10号提示
       let DateTime = new Date();
       let Year = DateTime.getFullYear()
       let Month = DateTime.getMonth()+1
@@ -1888,14 +1905,18 @@
         return x==this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
       })
       if(this.ChangeThePriceList.length>0){
-        if(!localStorage.getItem("ChangeThePriceDataTime")||
-        (localStorage.getItem("ChangeThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))){
+        if((!localStorage.getItem("ChangeThePriceDataTime")||
+        (localStorage.getItem("ChangeThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))))
+        ||(!localStorage.getItem("ExamineThePriceDataTime")||
+        (localStorage.getItem("ExamineThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))))){
           this.GetChangeThePrice()
+          this.GetExaminePriceOrderPageList()
         }
-        // 两小时请求一次改价提醒
+        // 两小时请求一次改价、审核改价提醒
         setInterval(()=>{
           if(!this.ChangeThePriceVisible){
             this.GetChangeThePrice()
+            this.GetExaminePriceOrderPageList()
           }else{
             clearInterval()
           }
@@ -1935,6 +1956,33 @@
       }
     },
     methods: {
+      //获取改价需审核提醒的数据
+      GetList(val){
+        this.ExamineThePriceMsg.pageIndex = val
+        this.GetExaminePriceOrderPageList()
+      },
+      GetExaminePriceOrderPageList(type){
+        this.apipost(
+            "CarSingle_post_GetExaminePriceOrderPageList",this.ExamineThePriceMsg,
+            res => {
+              if(res.data.resultCode==1){
+                if(res.data.data&&res.data.data.count>0&&res.data.data.pageData.length>0){
+                  if(!this.ExamineThePriceMsg.total) this.ExamineThePriceMsg.total = res.data.data.count
+                  // localStorage.setItem("ExamineThePriceData", JSON.stringify(res.data.data.pageData));
+                  localStorage.setItem("ExamineThePriceDataTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")));
+                  this.ChangeThePriceObj.ExamineThePriceData = res.data.data.pageData
+                  this.ExamineThePriceVisible = true
+                }else{
+                  if(type==1){
+                    // this.$message.info('暂无订单审核数据')
+                  }
+                  // localStorage.removeItem("ExamineThePriceData");
+                  localStorage.removeItem("ExamineThePriceDataTime");
+                }
+              }
+            }
+          );
+      },
       // 获取改价提醒的数据
       GetChangeThePrice(type){
         let DateTime = new Date();
@@ -1945,7 +1993,7 @@
         let DepartETime = Year+'-'+Months+'-'+day
         let msg = {
           pageIndex:1,
-          pagesize:15,
+          pagesize:5,
           OrderId:0,
           GuestId:0,
           EnterId:0,
@@ -1974,15 +2022,16 @@
             res => {
               if(res.data.resultCode==1){
                 if(res.data.data&&res.data.data.count>0&&res.data.data.pageData.length>0){
-                  localStorage.setItem("ChangeThePriceData", JSON.stringify(res.data.data.pageData));
+                  if(!this.ExamineThePriceMsg.total2) this.ExamineThePriceMsg.total2 = res.data.data.count
+                  // localStorage.setItem("ChangeThePriceData", JSON.stringify(res.data.data.pageData));
                   localStorage.setItem("ChangeThePriceDataTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")));
-                  this.ChangeThePriceData = res.data.data.pageData
+                  this.ChangeThePriceObj.ChangeThePriceData = res.data.data.pageData
                   this.ChangeThePriceVisible = true
                 }else{
                   if(type==1){
-                    this.$message.info('暂无订单改价数据')
+                    // this.$message.info('暂无订单改价数据')
                   }
-                  localStorage.removeItem("ChangeThePriceData");
+                  // localStorage.removeItem("ChangeThePriceData");
                   localStorage.removeItem("ChangeThePriceDataTime");
                 }
               }

src/components/myOrdersAllType/components/OrderList.vue

@@ -949,14 +949,20 @@ export default {
     },
     OrderList: {
       handler(val, oldVal) {
-        if(this.pagesTitle=='申请'&&this.msgObj.OrderId!=0&&this.$route.query.OrderId
+        if((this.pagesTitle=='申请'||this.pagesTitle=='审核')&&this.msgObj.OrderId!=0&&this.$route.query.OrderId
         &&this.$route.query.OrderType
         &&this.$route.query.DepartSTime
         &&this.$route.query.DepartSTime
         &&val&&val.length==1){
-          this.ckChangePrice(val[0])
+          if(this.pagesTitle=='审核'){
+            this.ckChangePrice(val[0],2)
+          }else{
+            this.ckChangePrice(val[0])
+          }
         }
-      }
+      },
+      deep: true,
+      immediate: true
     }
   },
   methods: {
@@ -1026,7 +1032,6 @@ export default {
       if (type == 2) this.titlePrice = "应收总金额改价审核";
       if (type == 3) this.titlePrice = "改价详情";
       this.changePriceObj = item
-      console.log(this.changePriceObj.ApplyForState,'======')
       this.changePriceMsg.ID = type ? item.OrderChangePriceId : 0;
       this.changePriceMsg.OrderId = item.OrderId;
       this.changePriceMsg.OrderType = item.OrderType;

src/components/myOrdersAllType/components/allList.vue

@@ -371,8 +371,8 @@
               OrderId: '',
               OrderState: '1',
               OrderType: '0',
-              papageIndex: 1,
-              pagesize: 15
+              pageIndex: 1,
+              pageSize: 15
             },
             CommissionTypeList:[
               {Name: '不限',Id:'-1'},
@@ -498,6 +498,8 @@
             handler(val, oldVal) {
               this.msg.OrderType = val.tab
               this.msg.OrderId = val.OrderId
+              this.msg2.OrderType = val.tab
+              this.msg2.OrderId = val.OrderId
               if(val.DepartSTime&&val.DepartSTime){
                 this.msg.DepartSTime = val.DepartSTime;
                 this.msg.DepartETime = val.DepartSTime;
@@ -512,7 +514,9 @@
           search(){
             this.changePriceOuterVisible = false
             if(this.dataObj&&this.dataObj.OrderId){
-              this.msg.OrderId=0
+              this.msg.OrderId = 0
+              this.msg2.OrderId = 0
+              this.msg2.OrderType = '0'
             }
             this.msg.pageIndex=1,
             this.currentPage=1,