1. 优化

src/views/order/orderMr/dialog/details.vue

@@ -330,6 +330,7 @@ export default {
         this.loading_seta =  false//  加载表单
         this.loading = false
       } catch (error) {
+        console.error(error)
         this.loading = false
         this.loading_form = false//  加载表单
         this.loading_seta = false //  加载座位

src/views/otaMr/ctrip/dialog/dataEdit.vue

@@ -120,7 +120,7 @@
       <div v-loading="priceLoading">
         <el-form :model="formPrice" ref="formPrice" size="small" :rules="rulesPrice" label-width="100px">
           <el-form-item label="日期区间">
-            {{ this.timeValueObj.prev +" - "+ this.timeValueObj.next }}
+            {{ showDate() }}
           </el-form-item>
           <el-form-item label="市场价" prop="originalAmount">
             <el-input-number v-model="formPrice.originalAmount" controls-position="right" :min="0"></el-input-number>
@@ -655,6 +655,21 @@ export default {
         this.timeValueObj.hover = moment(data.day).format("YYYY-MM-DD")
         this.timeValue = new Date(this.timeValueObj.hover)
       }
+    },
+    showDate(){
+      let srt = ''
+      let minTime = moment(this.timeValueObj.prev).valueOf()
+      let maxTime = moment(this.timeValueObj.next).valueOf()
+      let startDate = null
+      let endDate = null
+      if (minTime > maxTime) {
+        startDate = this.timeValueObj.next
+        endDate = this.timeValueObj.prev
+      } else {
+        startDate = this.timeValueObj.prev
+        endDate = this.timeValueObj.next
+      }
+      return startDate + "至" + endDate
     }
   },
   watch:{

src/views/otaMr/meituan/dialog/dataEdit.vue

@@ -143,7 +143,7 @@
       <div v-loading="priceLoading">
         <el-form :model="formPrice" ref="formPrice" size="small" :rules="rulesPrice" label-width="100px">
           <el-form-item label="日期区间">
-            {{ this.timeValueObj.prev +" - "+ this.timeValueObj.next }}
+            {{ showDate() }}
           </el-form-item>
           <el-form-item label="市场价" prop="originalAmount">
             <el-input-number v-model="formPrice.originalAmount" controls-position="right" :min="0"></el-input-number>
@@ -471,7 +471,7 @@ export default {
     openCalendarFun(row){
       this.seatTypeId = row.seatTypeId
       this.calendarId = row.id
-      his.$set(this,'timeValue',new Date())
+      this.$set(this,'timeValue',new Date())
       this.getCalendarPrice()
       
     },
@@ -624,6 +624,21 @@ export default {
         this.timeValueObj.hover = moment(data.day).format("YYYY-MM-DD")
         this.timeValue = new Date(this.timeValueObj.hover)
       }
+    },
+    showDate(){
+      let srt = ''
+      let minTime = moment(this.timeValueObj.prev).valueOf()
+      let maxTime = moment(this.timeValueObj.next).valueOf()
+      let startDate = null
+      let endDate = null
+      if (minTime > maxTime) {
+        startDate = this.timeValueObj.next
+        endDate = this.timeValueObj.prev
+      } else {
+        startDate = this.timeValueObj.prev
+        endDate = this.timeValueObj.next
+      }
+      return startDate + "至" + endDate
     }
   },
 };

src/views/otaMr/tiktok/dialog/dataEdit.vue

@@ -159,7 +159,7 @@
       <div v-loading="priceLoading">
         <el-form :model="formPrice" ref="formPrice" size="small" :rules="rulesPrice" label-width="100px">
           <el-form-item label="日期区间">
-            {{ this.timeValueObj.prev +" - "+ this.timeValueObj.next }}
+            {{ showDate() }}
           </el-form-item>
           <el-form-item label="划线价" prop="originalAmount">
             <el-input-number v-model="formPrice.originalAmount" controls-position="right" :min="0"></el-input-number>
@@ -491,7 +491,7 @@ export default {
     openCalendarFun(row){
       this.seatTypeId = row.seatTypeId
       this.calendarId = row.id
-      his.$set(this,'timeValue',new Date())
+      this.$set(this,'timeValue',new Date())
       this.getCalendarPrice()
       
     },
@@ -644,6 +644,21 @@ export default {
         this.timeValueObj.hover = moment(data.day).format("YYYY-MM-DD")
         this.timeValue = new Date(this.timeValueObj.hover)
       }
+    },
+    showDate(){
+      let srt = ''
+      let minTime = moment(this.timeValueObj.prev).valueOf()
+      let maxTime = moment(this.timeValueObj.next).valueOf()
+      let startDate = null
+      let endDate = null
+      if (minTime > maxTime) {
+        startDate = this.timeValueObj.next
+        endDate = this.timeValueObj.prev
+      } else {
+        startDate = this.timeValueObj.prev
+        endDate = this.timeValueObj.next
+      }
+      return startDate + "至" + endDate
     }
   },
 };

src/views/team/applicationMr/dialog/applicationDetails.vue

@@ -148,6 +148,7 @@
 import { getSelectById, teamApplyAudit, querySeatList } from '@/api/team/applicationMr'
 import { 
   querySeatListNew,
+  querySeatList as querySeatListNew1
  } from '@/api/windowTicketSales/ticketingSales'
 import { countBySeatTyp } from '@/api/ticketMr/InventoryTemplate'
 import { pageList as getSeatType } from '@/api/seatTypeMr/seatTypeMr'
@@ -307,6 +308,7 @@ export default {
             auditoriumId: this.applyMap.auditoriumId,
             timeId: this.applyMap.performTimeId,
             goodsId: this.applyMap.goodsId,
+            channelType: 'group'
           })
           let list1 = []
           res1.data.forEach((item,index)=>{

src/views/ticket/schedulingConfiguration/index.vue

@@ -214,8 +214,18 @@ export default {
       if( this.timeValueObj.prev && this.timeValueObj.next ) {
         this.openPrice = true
         this.formPrice = {}
+        let obj = {}
+        let minTime = moment(this.timeValueObj.prev).valueOf()
+        let maxTime = moment(this.timeValueObj.hover).valueOf()
+        if(minTime > maxTime){
+          obj['next'] = this.timeValueObj.prev
+          obj['prev'] = this.timeValueObj.next
+        }else {
+          obj['prev'] = this.timeValueObj.prev
+          obj['next'] = this.timeValueObj.next
+        }
         this.$nextTick(()=>{
-          this.$refs["addAndEdit"].openDialog("配置排期", this.timeValueObj, type);
+          this.$refs["addAndEdit"].openDialog("配置排期", obj, type);
         })
       }else {
         this.$message.error("请选择时间区间!!!");

src/views/windowTicketSales/mixins/pay.js

@@ -67,13 +67,13 @@ export default {
                 })
                 if(res.code == 200){
                     this.orderId = res.data.orderId
-                    if(this.ruleForm.paymentType == 2) { // 现金支付
+                    if(this.rebookForm.paymentType == 2) { // 现金支付
                         this.gotoCashPayFun(this.orderId)
-                    }else if(this.ruleForm.paymentType == 3) { // 对公支付
+                    }else if(this.rebookForm.paymentType == 3) { // 对公支付
                         this.gotoCorporatePayFun(this.orderId)
-                    }else if(this.ruleForm.paymentType == 4){ // 账户余额
+                    }else if(this.rebookForm.paymentType == 4){ // 账户余额
                         this.gotoBalancePayFun(this.orderId)
-                    }else if(this.ruleForm.paymentType == 5){ // 授信余额
+                    }else if(this.rebookForm.paymentType == 5){ // 授信余额
                         this.gotoQuotaPayFun(this.orderId)
                     }else {
                         // 扫码支付
@@ -86,6 +86,7 @@ export default {
                     this.payStatus = 1
                 }
             } catch (error) {
+                console.error(error)
                 this.$message.error('生成订单失败!!!');
                 this.loading = false
                 this.payStatus = 1
@@ -129,7 +130,7 @@ export default {
                 this.loadingText = "订单入库中..."
                 let res = await gotoCorporatePay({
                     "orderId": orderId, // 订单编号-提交订单返回
-                    "payAmount": this.ruleForm.realPrice
+                    "payAmount": this.rebookForm.realPrice
                 })
                 if(res.code == 200){
                     if(this.payTime){
@@ -211,7 +212,7 @@ export default {
                 this.loadingText = "订单入库中..."
                 let res = await gotoCashPay({
                     "orderId": orderId, // 订单编号-提交订单返回
-                    "payAmount": this.ruleForm.realPrice
+                    "payAmount": this.rebookForm.realPrice
                 })
                 if(res.code == 200){
                     if(this.payTime){
@@ -254,7 +255,7 @@ export default {
                     this.orderInfoCancelFun()
                     return
                 }
-                if(this.ruleForm.paymentType == 2){
+                if(this.rebookForm.paymentType == 2){
                     this.loadingText = "订单入库中..."
                 }else {
                     this.loadingText = "订单支付中..."
@@ -269,7 +270,7 @@ export default {
                             if(this.payTime){
                                 clearInterval(this.payTime)
                             }
-                            if(this.ruleForm.paymentType == 2){
+                            if(this.rebookForm.paymentType == 2){
                                 this.$message.error('"订单入库中失败"');
                                 this.loading = false
                                 this.payStatus = 3
@@ -289,7 +290,7 @@ export default {
                             if(this.payTime){
                                 clearInterval(this.payTime)
                             }
-                            if(this.ruleForm.paymentType == 2){
+                            if(this.rebookForm.paymentType == 2){
                                 this.$message({
                                     message: '订单入库成功',
                                     type: 'success'
@@ -318,7 +319,7 @@ export default {
                             if(this.payTime){
                                 clearInterval(this.payTime)
                             }
-                            if(this.ruleForm.paymentType == 2){
+                            if(this.rebookForm.paymentType == 2){
                                 this.$message.error('"订单入库中失败"');
                                 this.loading = false
                                 this.payStatus = 3
@@ -338,7 +339,7 @@ export default {
                                 clearInterval(this.payTime)
                             }
                             
-                            if(this.ruleForm.paymentType == 2){
+                            if(this.rebookForm.paymentType == 2){
                                 this.$message.error('"订单入库中失败"');
                                 this.loading = false
                                 this.payStatus = 3

src/views/windowTicketSales/model/rebookBox.vue

@@ -114,7 +114,6 @@
                         payStatus==10 ? '订单已关闭，请重新选择座位，再购买!!!' :
                         payStatus==3 ? '现金支付记录入库失败,请重新提交' : '未知状态' }}
                     </span>
-                    <span v-if="payStatus==2">需支付{{ rebookForm.payAmount }}元</span>
                     <!-- 重新生成订单 1  -->
                     <div v-if="payStatus==1" style="display: flex;">
                         <el-button @click="payStatus = null" type="success">修改信息</el-button>
@@ -130,12 +129,6 @@
                         <el-button v-if="payStatus==3" @click="gotoCashPayFun(orderId)" type="success">重新提交入库</el-button>
                         <!-- 重新支付 6  7 -->
                         <el-button v-if="payStatus==6 || payStatus==7" @click="vbar_open(orderId)" type="success">重新连接扫码支付</el-button>
-                    
-                        <!--   现金支付  -->
-                        <el-button v-if="payStatus==2" @click="vbar_open(orderId)" type="success">扫码支付</el-button>
-                        
-                        <!--   现金支付  -->
-                        <el-button v-if="payStatus==2" @click="vbar_open(orderId)" type="success">扫码支付</el-button>
 
                     </div>
                     
@@ -462,6 +455,8 @@ export default {
         padding: 0 20px 0 0;
         width: 400px;
         box-sizing: border-box;
+        overflow: hidden;
+        overflow-y: auto;
         .tip-box {
             >p {
                 color: red;