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

src/components/FinancialModule/invoicesManagerDetail.vue

@@ -518,6 +518,8 @@
   export default {
     data() {
       return {
+        crmOrderObj:null,
+        InvoiceApplyType: 0,
         detail: {},
         orderList: {},
         loading: true,
@@ -652,13 +654,13 @@
           blank: 'y',
           tab: ''
         }
-        if(this.$route.query.InvoiceApplyType){
-          if(this.$route.query.InvoiceApplyType == 1) query2.OrderType = 2 // 团队
-          if(this.$route.query.InvoiceApplyType == 2) query2.OrderType = 6 // 签证
-          if(this.$route.query.InvoiceApplyType == 4) query2.OrderType = 1 // 机票
-          if(this.$route.query.InvoiceApplyType == 5) query2.OrderType = 5 // 车
-          if(this.$route.query.InvoiceApplyType == 6) query2.OrderType = 3 // 酒店
-          if(this.$route.query.InvoiceApplyType == 7) query2.OrderType = 4 // 门票
+        if(this.InvoiceApplyType){
+          if(this.InvoiceApplyType == 1) query2.OrderType = 2 // 团队
+          if(this.InvoiceApplyType == 2) query2.OrderType = 6 // 签证
+          if(this.InvoiceApplyType == 4) query2.OrderType = 1 // 机票
+          if(this.InvoiceApplyType == 5) query2.OrderType = 5 // 车
+          if(this.InvoiceApplyType == 6) query2.OrderType = 3 // 酒店
+          if(this.InvoiceApplyType == 7) query2.OrderType = 4 // 门票
         }else{
           query2.OrderType = 2
         }
@@ -673,7 +675,7 @@
           blank: 'y',
           tab: '报名统计'
         }
-        if(this.$route.query.InvoiceApplyType&&this.$route.query.InvoiceApplyType == 4){
+        if(this.InvoiceApplyType&&this.InvoiceApplyType == 4){
             query.tab = '单机票详情'
             this.$router.push({
               name: 'CRMTicketOrderOP',
@@ -697,7 +699,7 @@
         })
       },
       goSaleFinacial: function () { // 跳转销售财务单据
-        if (this.$route.query.InvoiceApplyType && this.$route.query.InvoiceApplyType == 4) {
+        if (this.InvoiceApplyType && this.InvoiceApplyType == 4) {
           this.$router.push({
             name: 'CRMTicketOrderOP',
             query: {
@@ -750,7 +752,7 @@
         }, null)
       },
       getDetail: function (id) { // 获取详情
-        let InvoiceApplyType = this.$route.query.InvoiceApplyType ? this.$route.query.InvoiceApplyType : 1
+        let InvoiceApplyType = this.InvoiceApplyType ? this.InvoiceApplyType : 1
         this.apipost('InvoiceApply_get_GetDetails', {
           ID: id,
           InvoiceApplyType: InvoiceApplyType
@@ -775,15 +777,15 @@
         done();
       },
       getOrderDetail: function () { // 获取交易信息详情
-        // let OrderResource = this.$route.query.InvoiceApplyType ? 10 : 8
+        // let OrderResource = this.InvoiceApplyType ? 10 : 8
         let OrderResource = 8 //团队订
-        if(this.$route.query.InvoiceApplyType){
-          if(this.$route.query.InvoiceApplyType == 1) OrderResource = 8 // 团队
-          if(this.$route.query.InvoiceApplyType == 2) OrderResource = 10 // 签证
-          if(this.$route.query.InvoiceApplyType == 4) OrderResource = 12 // 机票
-          if(this.$route.query.InvoiceApplyType == 5) OrderResource = 5 // 车
-          if(this.$route.query.InvoiceApplyType == 6) OrderResource = 1 // 酒店
-          if(this.$route.query.InvoiceApplyType == 7) OrderResource = 3 // 门票
+        if(this.InvoiceApplyType){
+          if(this.InvoiceApplyType == 1) OrderResource = 8 // 团队
+          if(this.InvoiceApplyType == 2) OrderResource = 10 // 签证
+          if(this.InvoiceApplyType == 4) OrderResource = 12 // 机票
+          if(this.InvoiceApplyType == 5) OrderResource = 5 // 车
+          if(this.InvoiceApplyType == 6) OrderResource = 1 // 酒店
+          if(this.InvoiceApplyType == 7) OrderResource = 3 // 门票
         }
         this.apipost(
           'InvoiceApply_get_GetOrderFinanceList', {
@@ -817,7 +819,18 @@
     mounted() {
       let userInfo = this.getLocalStorage();
       this.EmployeeId = userInfo.EmployeeId;
-      let id = this.$route.query.id
+      let id
+      if(this.$route.query.id){
+        id = this.$route.query.id
+      }
+      if(this.$route.query.InvoiceApplyType){
+        this.InvoiceApplyType = this.InvoiceApplyType
+      }
+      if(this.$route.query.crmOrderObj){
+        this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
+        this.InvoiceApplyType = this.crmOrderObj.InvoiceApplyType
+        id = this.crmOrderObj.id
+      }
       //是否显示审核按钮
       this.noDetail = this.$route.query.noDetail ? true : false
       this.msg.ID = id

src/components/Hotel/reservation/HotelOrderList.vue

@@ -340,7 +340,7 @@
                     DueInMoney:item.DueInMoney,
                     ...item
                   }
-                  item.list.push(datas)
+                  item.list.push(JSON.parse(JSON.stringify(datas)))
                 })
                 this.total = res.data.data.count;
               }else {

src/components/Hotel/reservation/correlationOP.vue

@@ -85,7 +85,7 @@
         },
     },
     mounted() {
-        this.msg.OrderId = this.CorrelationObj.OrderId
+        this.msg.OrderId = this.CorrelationObj.OrderId?this.CorrelationObj.OrderId:0
         this.msg.OpEmpId = this.CorrelationObj.OpEmpId?this.CorrelationObj.OpEmpId:null
         if(this.CorrelationObj.TypeNum==4 || this.CorrelationObj.TypeNum==5 || this.CorrelationObj.TypeNum==6){
             this.msg.Money = this.CorrelationObj.Money

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>
@@ -1177,7 +1178,7 @@
       <div class="tsContent">
         <div style="width:100%;height:372px;position:relative">
           <p style="text-align:center;font-size:14px;z-index:100;">投诉案例</p>
-          <img @click="CloseTs" class="tsClose" style="width:11px;height:11px;pointer" src="../assets/img/tsclose.png"
+          <img @click="CloseTs" class="tsClose" style="width:11px;height:11px;cursor: pointer;" src="../assets/img/tsclose.png"
             alt="">
           <img class="tsbg" style="width:100%;height:100%" src="../assets/img/ts.png" alt="">
         </div>
@@ -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,31 @@
       commissionDetail,
       Voting,
       unbundlingMessage,
-      ChangeThePriceMessage
+      ChangeThePriceMessage,
     },
     data() {
       return {
+        ExamineThePriceMsg:{
+          Q_IsCollect: '2',//收款状态
+          DepartSTime: '', //出发时间
+          DepartETime: '',
+          EnterId: 0,//销售
+          RB_Branch_Id: '-1',//公司
+          OrderId:"",
+          TicketStatus:"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 +1896,7 @@
       }
 
 
-      // 获取改价提醒  每月1到10号提示
+      // 获取改价及审核提醒  每月1到10号提示
       let DateTime = new Date();
       let Year = DateTime.getFullYear()
       let Month = DateTime.getMonth()+1
@@ -1888,21 +1910,37 @@
         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"))))){
           this.GetChangeThePrice()
         }
-        // 两小时请求一次改价提醒
+        if((!localStorage.getItem("ExamineThePriceDataTime")||
+        (localStorage.getItem("ExamineThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))))){
+          this.GetExaminePriceOrderPageList()
+        }
+        // 两小时请求一次改价、审核改价提醒
         setInterval(()=>{
           if(!this.ChangeThePriceVisible){
             this.GetChangeThePrice()
           }else{
             clearInterval()
           }
+          if(!this.ExamineThePriceVisible){
+            this.GetExaminePriceOrderPageList()
+          }else{
+            clearInterval()
+          }
         },7200000)
       }
     },
     created() {
+      let DateTime = new Date();
+      let Year = DateTime.getFullYear()
+      let Month = DateTime.getMonth()
+      let Months = Month>9?Month:'0'+Month
+      let day = new Date(Year, Month, 0).getDate()
+      let DepartETime = Year+'-'+Months+'-'+day
+      this.ExamineThePriceMsg.DepartETime = DepartETime
       if (!localStorage.getItem("tsNumber") || localStorage.getItem("tsNumber") != this.tsNumber) {
         this.tsState = true;
       }
@@ -1935,17 +1973,34 @@
       }
     },
     methods: {
+      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{
+                  this.ExamineThePriceVisible = false
+                  if(type==1){
+                    // this.$message.info('暂无订单审核数据')
+                  }
+                  // localStorage.removeItem("ExamineThePriceData");
+                  localStorage.removeItem("ExamineThePriceDataTime");
+                }
+              }
+            }
+          );
+      },
       // 获取改价提醒的数据
       GetChangeThePrice(type){
-        let DateTime = new Date();
-        let Year = DateTime.getFullYear()
-        let Month = DateTime.getMonth()
-        let Months = Month>9?Month:'0'+Month
-        let day = new Date(Year, Month, 0).getDate()
-        let DepartETime = Year+'-'+Months+'-'+day
         let msg = {
           pageIndex:1,
-          pagesize:15,
+          pagesize:5,
           OrderId:0,
           GuestId:0,
           EnterId:0,
@@ -1954,7 +2009,7 @@
           FinishsTime:"",
           FinishETime:"",
           DepartSTime:"",
-          DepartETime:DepartETime,
+          DepartETime: this.ExamineThePriceMsg.DepartETime,
           TCNUM:"",
           ProductName: "",
           CustomerWame:"",
@@ -1974,15 +2029,17 @@
             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{
+                  this.ChangeThePriceVisible = false
                   if(type==1){
-                    this.$message.info('暂无订单改价数据')
+                    // this.$message.info('暂无订单改价数据')
                   }
-                  localStorage.removeItem("ChangeThePriceData");
+                  // localStorage.removeItem("ChangeThePriceData");
                   localStorage.removeItem("ChangeThePriceDataTime");
                 }
               }

src/components/scenicSpot/reservation/ReservationOrder.vue

@@ -448,7 +448,7 @@ export default {
                 let DaiShou
                 DaiShou = Number(item.Money-item.Income-item.PlatformTax-item.PlatformMoney+item.Refund)
                 item.DaiShou = DaiShou.toFixed(2)==='-0.00'?'0.00':DaiShou.toFixed(2)
-                item.list.push(datas)
+                item.list.push(JSON.parse(JSON.stringify(datas)))
               })
             this.total = res.data.data.count;
           } else {