1. 升级

src/api/windowTicketSales/rebook.js

@@ -9,7 +9,7 @@ export const reSubmitPageList = (query) => {
   })
 }
 
-// 时段列表
+// 时段列表  场次信息
 export const getDateTimeAll = (query) => {
     return request({
       url: '/merchant/merchantPerformTime/getDateTimeAll',
@@ -26,4 +26,22 @@ export const rebookApi = (data) => {
     method: 'post',
     data: data
   })
+}
+
+// 获取票档
+export const getTimeSeatTypeAllApi = (query) => {
+  return request({
+    url: '/merchant/merchantPerformTime/getTimeSeatTypeAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取改签/升舱信息
+export const resubmitInfoApi = (query) => {
+  return request({
+    url: '/order/orderResubmit/resubmitInfo',
+    method: 'get',
+    params: query
+  })
 }

src/views/ticket/schedulingConfiguration/dialog/perFormListBox.vue

@@ -204,7 +204,7 @@ export default {
         },
         /** 警用和启用 */
         ionlineFun(row) {
-            this.$confirm("您确认要" + (row.priceStatus == 1 ? '禁用该场次吗？' : '启用该场次吗？'), '提示', {
+            this.$confirm("您确认要" + (row.status == 1 ? '禁用该场次吗？' : '启用该场次吗？'), '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning'

src/views/ticket/schedulingConfiguration/index.vue

@@ -12,18 +12,17 @@
           slot-scope="{date, data}">
           <div 
           :class="['calendar_box', selectTime(data)]" 
-          @click.stop="()=>''"
+          @mouseover="mouseoverFun(data)" 
+          @click.stop="clickTimeFun(data)"
           >
-            <div class="calendar_box-date">
+            <div class="calendar_box-date" @click.stop="return ''">
               <span>{{ data.day.split('-').slice(1).join('-') }}</span>
-              <span style="color: #BEBEBE;" @click.stop="handlePerFormList('ADD',data)">详情</span>
+              <span style="color: #BEBEBE;" @click.stop="handlePerFormList('ADD',data)" v-if="getPerFormList(data).length>0">详情</span>
             </div>
-            
             <div 
             class="calendar_box-select"
-            style="width: 100%; display: flex;flex-wrap: wrap;"
-            @mouseover="mouseoverFun(data)" 
-            @click.stop="clickTimeFun(data)"
+            :style="{width: '100%', display: 'flex',flexWrap: 'wrap',height: height + 'px'}"
+            
              >
               <div 
               :key="index"
@@ -85,7 +84,8 @@ export default {
 
       perFormList: [],
       showCalendar: false,
-      today: moment().format("YYYY-MM-DD")
+      today: moment().format("YYYY-MM-DD"),
+      height: 86,
     };
   },
   created() {
@@ -104,7 +104,15 @@ export default {
       calendarList(this.addDateRange({...params}, this.dateRange))
       .then(response => {
           console.log(response)
-          this.perFormList = response.data.rows
+          let list = response.data.rows || []
+          let l = 1
+          list.forEach((item,index)=>{
+            if(item.list && item.list.length>l) {
+              l = item.list.length
+            }
+          })
+          this.height = (Math.floor(l/2) * 30 < 90) ? 90 : (Math.floor(l/2) * 30)
+          this.perFormList = list
           this.showCalendar = true
           this.loading = false;
         }
@@ -161,6 +169,11 @@ export default {
               srt = 'is-select_time_hover'
             }
           }
+        }else if(this.timeValueObj.prev) {
+          let minTime = moment(this.timeValueObj.prev).valueOf()
+          if(newTime == minTime) {
+            return 'is-select_time_self'
+          }
         }
       }
       return srt
@@ -312,7 +325,7 @@ export default {
           if(res.code == 200) {
             this.openPrice = false
             this.$modal.msgSuccess(res.msg);
-            this.getCalendarPrice()
+            this.getList()
           }
         }else {
           this.$message.error("请选择时间区间!!!");
@@ -336,13 +349,19 @@ export default {
 .is-selected {
   color: #1989FA;
 }
-.app-calendar-container ::v-deep .el-calendar-table .el-calendar-day {
-    height: auto;
-    min-height: 86px;
+.app-calendar-container ::v-deep .el-calendar-day {
+  padding-bottom: 0px !important;
+  padding-left: 0px !important;
+  padding-right: 0px !important;
+  padding-top: 0px !important;
+  height: auto;
+    //min-height: 86px;
 }
 .app-calendar-container ::v-deep .is-today {
   background-color: rgba(255, 240, 24, 0);
-  border: 1px solid #0F40F5;
+  .calendar_box {
+    border: 1px solid #0F40F5;
+  }
 }
 .app-calendar-container ::v-deep .prev {
   background-color: rgba(223, 230, 236,0.5) !important;
@@ -364,19 +383,22 @@ export default {
   }
 }
 
-.calendar_box {
+.calendar_box{
   width: 100%;
   min-height: 86px;
+  padding: 8px;
   .calendar_box-date {
     display: flex;
     width: 100% ;
     justify-content: space-between;
+    
 
   }
 }
 
 .disable_time {
   .calendar_box-select {
+    padding-top: 10px;
     user-select: none;
     cursor: not-allowed;
   }
@@ -391,7 +413,7 @@ export default {
 }
 
 .is-select_time_hover {
-  background-color: #C2D4FF;
+  background-color: #E4ECFF;
 }
 </style>
 <style lang="scss">

src/views/windowTicketSales/mixins/pay.js

@@ -0,0 +1,567 @@
+import { 
+    orderInfoSubmit,
+    gotoMicroPay,
+    gotoCashPay,
+    gotoCorporatePay,
+    gotoBalancePay,
+    gotoQuotaPay,
+    payQuery,
+    selectRegion,
+    orderInfoCancel,
+    factorAuth,
+    selectMarketTeamBySourceApi,
+   } from '@/api/windowTicketSales/ticketingSales'
+   import { pageList as getPrintListApi } from "@/api/device/pda";
+   import { printApi } from '@/api/windowTicketSales/ticketingCollection'
+   import { rebookApi } from '@/api/windowTicketSales/rebook'
+   const mathM = require('mathjs')
+   const https = require('https');
+   const axios = require('axios');
+export default {
+    data(){
+        return {}
+    },
+    methods: {
+        /**  取消订单   */
+        async orderInfoCancelFun(type){
+            // let payStatus = this.payStatus
+            // this.payStatus = null
+            try {
+                this.loading = true
+                this.loadingText = "取消订单中..."
+                orderInfoCancel({
+                    orderId: this.orderId
+                }).then((res)=>{
+                    if(res.code==200) {
+                        if(type){ // 关闭弹窗
+                            if(this.codeTime) {
+                                clearInterval(this.codeTime)
+                            }
+                            this.orderId = null
+                            this.payStatus = null
+                            this.$emit('clearDialogVisible')
+                            this.rebookDialog = false
+                        }else {
+                            this.payStatus = 9
+                            this.loading = false
+                        }
+                        
+                    }else {
+                        
+                    }
+                }).catch(()=>{
+                    this.$message.error('订单关闭失败!!!');
+                })
+            } catch (error) {
+                
+            }
+        },
+        /**  生成订单  */
+        async orderInfoSubmitFun(){
+            this.loading = true
+            try {
+                this.orderId = null
+                this.loadingText = "生成订单中..."
+                let res = await rebookApi({
+                    ...this.rebookForm
+                })
+                if(res.code == 200){
+                    this.orderId = res.data.orderId
+                    if(this.ruleForm.paymentType == 2) { // 现金支付
+                        this.gotoCashPayFun(this.orderId)
+                    }else if(this.ruleForm.paymentType == 3) { // 对公支付
+                        this.gotoCorporatePayFun(this.orderId)
+                    }else if(this.ruleForm.paymentType == 4){ // 账户余额
+                        this.gotoBalancePayFun(this.orderId)
+                    }else if(this.ruleForm.paymentType == 5){ // 授信余额
+                        this.gotoQuotaPayFun(this.orderId)
+                    }else {
+                        // 扫码支付
+                        this.loading = false
+                        this.payStatus = 2
+                    }
+                }else{
+                    this.$message.error('生成订单失败!!!');
+                    this.loading = false
+                    this.payStatus = 1
+                }
+            } catch (error) {
+                this.$message.error('生成订单失败!!!');
+                this.loading = false
+                this.payStatus = 1
+            }
+        },
+         /** 调取 订单支付码支付  */
+         async gotoMicroPayFun(orderId,code){
+            this.loading = true
+            try {
+                this.loadingText = "订单支付中..."
+                this.payStatus = ''
+                let res = await gotoMicroPay({
+                    "orderId": orderId, // 订单编号-提交订单返回
+                    "authCode": code // 微信扫码支付-支付码
+                })
+                if(res.code == 200){
+                    this.payTimeNum = 0
+                    this.websocketClear()
+                    if(this.payTime){
+                        clearInterval(this.payTime)
+                    }
+                    this.payTime = setInterval(()=>{
+                        this.payQueryFun(this.orderId)
+                    },1500)
+                }else{
+                    this.$message.error('支付失败!!!');
+                    this.payStatus = ''
+                    this.loading = false
+                    this.payStatus = 6
+                }
+            } catch (error) {
+                this.$message.error('支付失败!!!');
+                this.loading = false
+                this.payStatus = 6
+            }
+        },
+        /**  对公支付  */
+        async gotoCorporatePayFun(orderId) {
+            this.loading = true
+            try {
+                this.loadingText = "订单入库中..."
+                let res = await gotoCorporatePay({
+                    "orderId": orderId, // 订单编号-提交订单返回
+                    "payAmount": this.ruleForm.realPrice
+                })
+                if(res.code == 200){
+                    if(this.payTime){
+                        clearInterval(this.payTime)
+                    }
+                    this.payTimeNum = 0
+                    this.payTime = setInterval(()=>{
+                        this.payQueryFun(this.orderId)
+                    },1000)
+                }else{
+                    this.$message.error('订单入库中失败!!!');
+                    this.loading = false
+                    this.payStatus = 3
+                }
+            } catch (error) {
+                this.$message.error('订单入库中失败!!!');
+                this.loading = false
+                this.payStatus = 3
+            }
+        },
+        /**  授信额度支付  */
+        async gotoQuotaPayFun(orderId) {
+            this.loading = true
+            try {
+                this.loadingText = "订单入库中..."
+                let res = await gotoQuotaPay({
+                    "orderId": orderId, // 订单编号-提交订单返回
+                })
+                if(res.code == 200){
+                    if(this.payTime){
+                        clearInterval(this.payTime)
+                    }
+                    this.payTimeNum = 0
+                    this.payTime = setInterval(()=>{
+                        this.payQueryFun(this.orderId)
+                    },1000)
+                }else{
+                    this.$message.error('订单入库中失败!!!');
+                    this.loading = false
+                    this.payStatus = 3
+                }
+            } catch (error) {
+                this.$message.error('订单入库中失败!!!');
+                this.loading = false
+                this.payStatus = 3
+            }
+        },
+        /**  余额支付  */
+        async gotoBalancePayFun(orderId) {
+            this.loading = true
+            try {
+                this.loadingText = "订单入库中..."
+                let res = await gotoBalancePay({
+                    "orderId": orderId, // 订单编号-提交订单返回
+                })
+                if(res.code == 200){
+                    if(this.payTime){
+                        clearInterval(this.payTime)
+                    }
+                    this.payTimeNum = 0
+                    this.payTime = setInterval(()=>{
+                        this.payQueryFun(this.orderId)
+                    },1000)
+                }else{
+                    this.$message.error('订单入库中失败!!!');
+                    this.loading = false
+                    this.payStatus = 3
+                }
+            } catch (error) {
+                this.$message.error('订单入库中失败!!!');
+                this.loading = false
+                this.payStatus = 3
+            }
+        },
+         /**  订单现金支付  */
+         async gotoCashPayFun(orderId){
+            this.loading = true
+            try {
+                this.loadingText = "订单入库中..."
+                let res = await gotoCashPay({
+                    "orderId": orderId, // 订单编号-提交订单返回
+                    "payAmount": this.ruleForm.realPrice
+                })
+                if(res.code == 200){
+                    if(this.payTime){
+                        clearInterval(this.payTime)
+                    }
+                    this.payTimeNum = 0
+                    this.payTime = setInterval(()=>{
+                        this.payQueryFun(this.orderId)
+                    },1000)
+                }else{
+                    this.$message.error('订单入库中失败!!!');
+                    this.loading = false
+                    this.payStatus = 3
+                }
+            } catch (error) {
+                this.$message.error('订单入库中失败!!!');
+                this.loading = false
+                this.payStatus = 3
+            }
+        },
+        // 跳转取票界面
+        goTicketingCollections(){
+            this.$router.push({
+                path:"/windowTicketSales/ticketingCollections",
+                query:{
+                    orderId: this.orderId
+                }
+            })
+        },
+         /**  查看支付 状态  */
+         async payQueryFun(orderId){
+            this.loading = true
+            
+            try {
+                this.payTimeNum = this.payTimeNum + 1
+                if(this.payTimeNum==15){
+                    if(this.payTime){
+                        clearInterval(this.payTime)
+                    }
+                    this.orderInfoCancelFun()
+                    return
+                }
+                if(this.ruleForm.paymentType == 2){
+                    this.loadingText = "订单入库中..."
+                }else {
+                    this.loadingText = "订单支付中..."
+                }
+                this.payStatus = ''
+                let res = await payQuery({
+                    orderId: orderId
+                })
+                if(res.code == 200){
+                    if(res.data) {
+                        if(res.data.payStatus == 0) {
+                            if(this.payTime){
+                                clearInterval(this.payTime)
+                            }
+                            if(this.ruleForm.paymentType == 2){
+                                this.$message.error('"订单入库中失败"');
+                                this.loading = false
+                                this.payStatus = 3
+                            }else {
+                                if(res.data.orderStatus == 9 || res.data.orderStatus == 4 || res.data.orderStatus == 5){
+                                    this.$message.error('订单已关闭，请重新选择座位，再购买!!!');
+                                    this.loading = false
+                                    this.payStatus = 10
+                                }else {
+                                    this.$message.error('用户未支付!!!');
+                                    this.loading = false
+                                    this.payStatus = 7
+                                }
+                            }
+                            
+                        }else if(res.data.payStatus == 1) {
+                            if(this.payTime){
+                                clearInterval(this.payTime)
+                            }
+                            if(this.ruleForm.paymentType == 2){
+                                this.$message({
+                                    message: '订单入库成功',
+                                    type: 'success'
+                                });
+                                this.loading = false
+                                // this.payStatus = 8
+                                // this.getPrintListApi()
+                                this.goTicketingCollections()
+                                
+                            }else {
+                                this.$message({
+                                    message: '用户已支付成功,请打印门票',
+                                    type: 'success'
+                                });
+                                // 开始 打印
+                                this.loading = false
+                                // this.payStatus = 8
+                                // this.getPrintListApi()
+                                this.goTicketingCollections()
+                            }
+                            
+                            
+                        }else if(res.data.payStatus == 2) {
+
+                        }else if(res.data.payStatus == 3) {
+                            if(this.payTime){
+                                clearInterval(this.payTime)
+                            }
+                            if(this.ruleForm.paymentType == 2){
+                                this.$message.error('"订单入库中失败"');
+                                this.loading = false
+                                this.payStatus = 3
+                            }else {
+                                if(res.data.orderStatus == 9 || res.data.orderStatus == 4 || res.data.orderStatus == 5){
+                                    this.$message.error('订单已关闭，请重新选择座位，再购买!!!');
+                                    this.loading = false
+                                    this.payStatus = 10
+                                }else {
+                                    this.$message.error('用户支付失败!!!');
+                                    this.loading = false
+                                    this.payStatus = 7
+                                }
+                            }
+                        }else if(res.data.payStatus == 4) {
+                            if(this.payTime){
+                                clearInterval(this.payTime)
+                            }
+                            
+                            if(this.ruleForm.paymentType == 2){
+                                this.$message.error('"订单入库中失败"');
+                                this.loading = false
+                                this.payStatus = 3
+                            }else {
+                                if(res.data.orderStatus == 9 || res.data.orderStatus == 4 || res.data.orderStatus == 5){
+                                    this.$message.error('订单已关闭，请重新选择座位，再购买!!!');
+                                    this.loading = false
+                                    this.payStatus = 10
+                                }else {
+                                    this.$message.error('支付退款!!!');
+                                    this.loading = false
+                                    this.payStatus = 7
+                                }
+                            }
+                            
+                        }
+                    }
+                    
+                }else{
+                    this.$message.error('支付失败!!!');
+                    this.loading = false
+                    this.payStatus = 7
+                }
+                
+            } catch (error) {
+                this.$message.error('支付失败!!!');
+                this.loading = false
+                this.payStatus = 7
+            }
+        },
+
+        /**  连接VBarServer  */
+        vbar_open() {
+            this.loading = true
+            this.loadingText = "连接扫码盒子中!!!"
+            this.payStatus =  null
+            this.code = ''
+            this.websocketClear()
+            this.payStatus = 5 // 连接成功
+            document.addEventListener('keydown',this.keydownAdd);
+            this.loading = false
+        },  
+        /**  连接结果 */
+        websocket_open_state(message){
+            console.log("连接结果 ===== ",message)
+            this.codeTime = setInterval(()=>{
+                console.log("检测是否连接")
+                if(this.websocketData.readyState != WebSocket.OPEN) {
+                    this.payStatus = 6
+                }
+            },3000)
+            //document.getElementById('wsocket').value = "已连接";
+        },
+        // 拼接字符串
+        keydownAdd(e){
+            console.log("e=====",e)
+            console.log("this.code=====",this.code)
+            if( this.payStatus == 5 && e.key != 'Enter') {
+                this.code = this.code + e.key
+            }
+
+            if( e.key == 'Enter') {
+                document.removeEventListener('keydown',this.keydownAdd);
+                let codeCopy = this.code
+                this.payStatus == 5.5
+                this.code = ''
+                this.gotoMicroPayFun(this.orderId,codeCopy)
+            }
+        },
+        //接收扫码完整结果处理
+        websocket_decode(code){
+            console.log("orderId=========",this.orderId )
+            console.log("code=========",code)
+            if(this.orderId && this.payStatus == 5.5 &&  regex.test(code) ) {
+                this.payStatus = 5.6 // 支付中
+                let codeCopy = code.replace("%%%", "").replace("%%%", "")
+                this.gotoMicroPayFun(this.orderId,codeCopy)
+            }else if(!code){
+                this.payStatus = 5
+                this.code = ''
+            }
+        },
+        /** 关闭通讯 */
+        websocketClear(){
+            document.removeEventListener('keydown',this.keydownAdd);
+        },
+        /**  读取身份证 */
+        readCert(){
+            this.idcardLoading = true
+            var result = "";
+            try {
+                let xmlHttp = new XMLHttpRequest();
+                let Protocol = window.location.protocol.split(':')[0];
+                //获取当前协议，并且分割字符串，得到http或者https
+                if (Protocol === 'https'){
+                    //创建请求 第一个参数是代表以post方式发送；第二个是请求端口和地址；第三个表示是否异步
+                    xmlHttp.open("POST", "http://127.0.0.1:18889/api/readCert?ReadSN=" + 0, false);	  //readCert读卡，生成正反面仿复印件	
+                }else {
+                    //创建请求 第一个参数是代表以post方式发送；第二个是请求端口和地址；第三个表示是否异步
+                    xmlHttp.open("POST", "http://127.0.0.1:18889/api/readCert?ReadSN=" + 0, false);	  //readCert读卡，生成正反面仿复印件	
+                }
+                //发送请求
+                xmlHttp.send();
+                if (xmlHttp.readyState == 4 && xmlHttp.status == 200) {
+                    result = xmlHttp.responseText;
+                    xmlHttp.readyState = 1;
+                }
+            } catch (e) {
+                console.error("e====",e)
+            }
+            let obj = JSON.parse(result)
+            if(obj.resultContent && obj.resultContent.certNumber){
+                this.$set(this.tableForm,"idcard",obj.resultContent.certNumber)
+                this.$set(this.tableForm,"name",obj.resultContent.partyName)
+            }else {
+                this.$message.error('读取失败!!!');
+            }
+            
+            this.idcardLoading = false
+            //return result;
+             console.log(result,obj)
+        },
+        /** 查询打印机列表 */
+        getPrintListApi() {
+          getPrintListApi({deviceType:5,pageNum: 1,
+          pageSize: 999,})
+          .then(response => {
+              this.printList = response.data.rows;
+          }).catch((error)=>{
+            console.log("error===",error)
+          }
+          );
+        },
+        // 打印 
+        async print(list = []){
+            if(!this.printListId) {
+                this.$message.error('请选择打印机!!');
+                return
+            }
+            this.loading = true
+              this.loadingText = '打印中...'
+              this.payStatus = ''
+              try {
+                let res = await printApi({
+                  orderId: this.orderId,
+                  source: 2,
+                  deviceId: this.printListId
+                })
+                if(res.code == 200) {
+                  let url = res.data.linkIp
+                  let printInfo = res.data.printInfo
+                  this.connectPrint(url,printInfo)
+                }else {
+                  throw new Error(res)
+                }
+              } catch (error) {
+                this.loading = false
+                 this.payStatus = 8
+                console.error("error=====",error)
+              }
+          
+        },
+        /**  连接打印机  */
+        connectPrint(url,data){
+          // 创建忽略 SSL 的 axios 实例
+          const ignoreSSL = axios.create({
+            httpsAgent: new https.Agent({  
+              rejectUnauthorized: false
+            }),
+            withCredentials: true, // 跨域请求时发送Cookie
+            timeout: 60000, // 请求超时
+            headers: {
+              "Content-Type": "application/json; charset=UTF-8;"
+            }
+          });
+          ignoreSSL.post(url, 
+            { ...data }
+            ).then(()=>{
+            this.rebookDialog = false
+            this.loading = false
+          }).catch(()=>{
+            this.loading = false
+            this.payStatus = 8
+            // this.rebookDialog = false
+            // this.loading = false
+          })
+          // 在 axios 请求时，选择性忽略 SSL
+          // const agent = new https.Agent({  
+          //   rejectUnauthorized: false
+          // });
+          // axios.post(
+          //   url, 
+          //   { httpsAgent: agent,...data }
+          //   ).then(()=>{
+          //   this.rebookDialog = false
+          //   this.loading = false
+          // })
+          // .catch(()=>{
+          //   this.rebookDialog = false
+          //   this.loading = false
+          // })
+        },
+        /** 获取授信余额和账户余额  */
+        async selectMarketTeamBySourceFun(value) {
+            console.log("value===",value)
+            try {
+                if(!['10','11','13','14','18','19'].includes(value)) return
+                let res = await selectMarketTeamBySourceApi({
+                    source: value
+                })
+                this.balance = res.data.balance
+                if(res.data.grantQuota && res.data.grantUsed) {
+                    this.grantQuota = res.data.grantQuota - res.data.grantUsed
+                }else if(res.data.grantQuota) {
+                    this.grantQuota = res.data.grantQuota
+                }else {
+                    this.grantQuota = 0
+                }
+                
+            } catch (error) {
+                this.balance = null
+                this.grantQuota = null
+            }
+        },
+    },
+}

src/views/windowTicketSales/model/rebookBox.vue

@@ -42,7 +42,7 @@
                                 v-model="rebookForm.performTimeId"
                                 placeholder="选择场次"
                                 style="width: 100%"
-                                @change="querySeatListFun"
+                                @change="resubmitInfoFun()"
                                 >
                                     <el-option
                                     v-for="item in intervalList"
@@ -52,15 +52,32 @@
                                     />
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="支付方式 :" prop="paymentType">
+                        <el-form-item label="订单总额：">
+                            <span>{{ rebookForm.realPrice }}元</span>
+                        </el-form-item>
+                        <el-form-item v-if="rebookForm.diffPrice < 0" label="改签费用：">
+                            <span>退款{{ Math.abs(rebookForm.diffPrice) }}元</span>
+                        </el-form-item>
+                        <el-form-item v-if="rebookForm.diffPrice > 0" label="改签费用：">
+                            <span>补差价{{ Math.abs(rebookForm.diffPrice) }}元</span>
+                        </el-form-item>
+                        <el-form-item v-if="rebookForm.diffPrice > 0" label="支付方式 :" prop="paymentType">
                             <el-radio-group v-model="rebookForm.paymentType">
                             <el-radio label="1">扫码支付</el-radio>
                             <el-radio label="2">现金支付</el-radio>
-                            <!-- <el-radio v-if="['10','11','13','14','18','19'].includes(ruleForm.source)" label="3">对公支付</el-radio> -->
-                            <!-- <el-radio v-if="['10','11','13','14','18','19'].includes(ruleForm.source)" label="4">账户余额({{ balance }})</el-radio>
-                            <el-radio v-if="['10','11','13','14','18','19'].includes(ruleForm.source)" label="5">授信余额({{ grantQuota }})</el-radio> -->
+                            <el-radio label="3">对公支付</el-radio>
+                            <el-radio label="4">账户余额</el-radio>
+                            <el-radio label="5">授信余额</el-radio>
                             </el-radio-group>
                         </el-form-item>
+                        <el-form-item label="备注：">
+                            <el-input
+                                v-model="rebookForm.resubmitRemark"
+                                placeholder="请输入备注"
+                                clearable
+                                type="textarea"
+                                />
+                        </el-form-item>
                     </el-form>
                     <div class="tip-box">
                         <p>温馨提示：每张票仅限改签一次，改签成功后原订单费用将原路返回退还给客户，请知悉。</p>
@@ -150,34 +167,18 @@
     </el-dialog>
 </template>
 <script>
-import {  getDateTimeAll } from '@/api/windowTicketSales/rebook'
+import {  getDateTimeAll,resubmitInfoApi } from '@/api/windowTicketSales/rebook'
 import { 
-  orderInfoSubmit,
-  gotoMicroPay,
-  gotoCashPay,
-  gotoCorporatePay,
-  gotoBalancePay,
-  gotoQuotaPay,
-  payQuery,
-  selectRegion,
-  orderInfoCancel,
-  factorAuth,
-  selectMarketTeamBySourceApi,
   querySeatListNew,
-  querySeatList,
- } from '@/api/windowTicketSales/ticketingSales'
- import { pageList as getPrintListApi } from "@/api/device/pda";
- import { printApi } from '@/api/windowTicketSales/ticketingCollection'
- import { rebookApi } from '@/api/windowTicketSales/rebook'
- import { countBySeatTyp } from '@/api/ticketMr/InventoryTemplate'
- import { pageList as getSeatType } from '@/api/seatTypeMr/seatTypeMr'
- import seatBox from '@/components/seatBox/index.vue';
- const mathM = require('mathjs')
- const https = require('https');
- const axios = require('axios');
+} from '@/api/windowTicketSales/ticketingSales'
+import { countBySeatTyp } from '@/api/ticketMr/InventoryTemplate'
+import { pageList as getSeatType } from '@/api/seatTypeMr/seatTypeMr'
+import seatBox from '@/components/seatBox/index.vue';
+import payJs from "../mixins/pay"
 export default {
     name: "RebookBox",
     components: { seatBox },
+    mixins: [payJs],
     data() {
         return {
             // 改签对话框
@@ -227,6 +228,8 @@ export default {
             this.rebookDialog = true
             this.payStatus = null
             this.rebookForm = {
+                resubmitType: 2,  // 改签类型: 1-改签 2-升舱 不传默认为改签
+                goodsDiffAmount: undefined,
                 performName: row.performName,
                 goodsName: row.goodsName,
                 seatTypeName: row.seatTypeName,
@@ -251,6 +254,7 @@ export default {
             this.rebookForm.performDate = this.formatDate(today)
             this.handleDateChange()
         },
+       
         /** 获取场次  */
         handleDateChange() {
             this.intervalListLoading = true
@@ -319,548 +323,32 @@ export default {
                 })
                 .catch(_ => {});
         },
-        /**  取消订单   */
-        async orderInfoCancelFun(type){
-            // let payStatus = this.payStatus
-            // this.payStatus = null
-            try {
-                this.loading = true
-                this.loadingText = "取消订单中..."
-                orderInfoCancel({
-                    orderId: this.orderId
-                }).then((res)=>{
-                    if(res.code==200) {
-                        if(type){ // 关闭弹窗
-                            if(this.codeTime) {
-                                clearInterval(this.codeTime)
-                            }
-                            this.orderId = null
-                            this.payStatus = null
-                            this.$emit('clearDialogVisible')
-                            this.rebookDialog = false
-                        }else {
-                            this.payStatus = 9
-                            this.loading = false
-                        }
-                        
-                    }else {
-                        
-                    }
-                }).catch(()=>{
-                    this.$message.error('订单关闭失败!!!');
-                })
-            } catch (error) {
-                
-            }
-        },
-        /**  生成订单  */
-        async orderInfoSubmitFun(){
-            this.loading = true
-            try {
-                this.orderId = null
-                this.loadingText = "生成订单中..."
-                let res = await rebookApi({
-                    ...this.rebookForm
-                })
-                if(res.code == 200){
-                    this.orderId = res.data.orderId
-                    if(this.ruleForm.paymentType == 2) { // 现金支付
-                        this.gotoCashPayFun(this.orderId)
-                    }else if(this.ruleForm.paymentType == 3) { // 对公支付
-                        this.gotoCorporatePayFun(this.orderId)
-                    }else if(this.ruleForm.paymentType == 4){ // 账户余额
-                        this.gotoBalancePayFun(this.orderId)
-                    }else if(this.ruleForm.paymentType == 5){ // 授信余额
-                        this.gotoQuotaPayFun(this.orderId)
-                    }else {
-                        // 扫码支付
-                        this.loading = false
-                        this.payStatus = 2
-                    }
-                }else{
-                    this.$message.error('生成订单失败!!!');
-                    this.loading = false
-                    this.payStatus = 1
-                }
-            } catch (error) {
-                this.$message.error('生成订单失败!!!');
-                this.loading = false
-                this.payStatus = 1
-            }
-        },
-         /** 调取 订单支付码支付  */
-         async gotoMicroPayFun(orderId,code){
-            this.loading = true
-            try {
-                this.loadingText = "订单支付中..."
-                this.payStatus = ''
-                let res = await gotoMicroPay({
-                    "orderId": orderId, // 订单编号-提交订单返回
-                    "authCode": code // 微信扫码支付-支付码
-                })
-                if(res.code == 200){
-                    this.payTimeNum = 0
-                    this.websocketClear()
-                    if(this.payTime){
-                        clearInterval(this.payTime)
-                    }
-                    this.payTime = setInterval(()=>{
-                        this.payQueryFun(this.orderId)
-                    },1500)
-                }else{
-                    this.$message.error('支付失败!!!');
-                    this.payStatus = ''
-                    this.loading = false
-                    this.payStatus = 6
-                }
-            } catch (error) {
-                this.$message.error('支付失败!!!');
-                this.loading = false
-                this.payStatus = 6
-            }
-        },
-        /**  对公支付  */
-        async gotoCorporatePayFun(orderId) {
-            this.loading = true
-            try {
-                this.loadingText = "订单入库中..."
-                let res = await gotoCorporatePay({
-                    "orderId": orderId, // 订单编号-提交订单返回
-                    "payAmount": this.ruleForm.realPrice
-                })
-                if(res.code == 200){
-                    if(this.payTime){
-                        clearInterval(this.payTime)
-                    }
-                    this.payTimeNum = 0
-                    this.payTime = setInterval(()=>{
-                        this.payQueryFun(this.orderId)
-                    },1000)
-                }else{
-                    this.$message.error('订单入库中失败!!!');
-                    this.loading = false
-                    this.payStatus = 3
-                }
-            } catch (error) {
-                this.$message.error('订单入库中失败!!!');
-                this.loading = false
-                this.payStatus = 3
-            }
-        },
-        /**  授信额度支付  */
-        async gotoQuotaPayFun(orderId) {
-            this.loading = true
-            try {
-                this.loadingText = "订单入库中..."
-                let res = await gotoQuotaPay({
-                    "orderId": orderId, // 订单编号-提交订单返回
-                })
-                if(res.code == 200){
-                    if(this.payTime){
-                        clearInterval(this.payTime)
-                    }
-                    this.payTimeNum = 0
-                    this.payTime = setInterval(()=>{
-                        this.payQueryFun(this.orderId)
-                    },1000)
-                }else{
-                    this.$message.error('订单入库中失败!!!');
-                    this.loading = false
-                    this.payStatus = 3
-                }
-            } catch (error) {
-                this.$message.error('订单入库中失败!!!');
-                this.loading = false
-                this.payStatus = 3
-            }
-        },
-        /**  余额支付  */
-        async gotoBalancePayFun(orderId) {
-            this.loading = true
-            try {
-                this.loadingText = "订单入库中..."
-                let res = await gotoBalancePay({
-                    "orderId": orderId, // 订单编号-提交订单返回
-                })
-                if(res.code == 200){
-                    if(this.payTime){
-                        clearInterval(this.payTime)
-                    }
-                    this.payTimeNum = 0
-                    this.payTime = setInterval(()=>{
-                        this.payQueryFun(this.orderId)
-                    },1000)
-                }else{
-                    this.$message.error('订单入库中失败!!!');
-                    this.loading = false
-                    this.payStatus = 3
-                }
-            } catch (error) {
-                this.$message.error('订单入库中失败!!!');
-                this.loading = false
-                this.payStatus = 3
-            }
-        },
-         /**  订单现金支付  */
-         async gotoCashPayFun(orderId){
-            this.loading = true
+        
+         /** 
+         * 
+         *  获取升舱/改签信息
+         * 
+         */
+         async resubmitInfoFun() {
             try {
-                this.loadingText = "订单入库中..."
-                let res = await gotoCashPay({
-                    "orderId": orderId, // 订单编号-提交订单返回
-                    "payAmount": this.ruleForm.realPrice
+                let res = await resubmitInfoApi({
+                    orderId: this.rebookForm.orderId,
+                    timeId: this.rebookForm.performTimeId,
+                    seatTypeId: this.rebookForm.seatTypeId,
+                    //goodsDiffAmount: this.rebookForm.goodsDiffAmount,
                 })
-                if(res.code == 200){
-                    if(this.payTime){
-                        clearInterval(this.payTime)
+                if(res.data.reSubmitInfo) {
+                    this.rebookForm = {
+                        ...this.rebookForm,
+                        realPrice: res.data.reSubmitInfo.realPrice,
+                        diffPrice: res.data.reSubmitInfo.diffPrice
                     }
-                    this.payTimeNum = 0
-                    this.payTime = setInterval(()=>{
-                        this.payQueryFun(this.orderId)
-                    },1000)
-                }else{
-                    this.$message.error('订单入库中失败!!!');
-                    this.loading = false
-                    this.payStatus = 3
                 }
+                this.querySeatListFun()
             } catch (error) {
-                this.$message.error('订单入库中失败!!!');
-                this.loading = false
-                this.payStatus = 3
-            }
-        },
-        // 跳转取票界面
-        goTicketingCollections(){
-            this.$router.push({
-                path:"/windowTicketSales/ticketingCollections",
-                query:{
-                    orderId: this.orderId
-                }
-            })
-        },
-         /**  查看支付 状态  */
-         async payQueryFun(orderId){
-            this.loading = true
-            
-            try {
-                this.payTimeNum = this.payTimeNum + 1
-                if(this.payTimeNum==15){
-                    if(this.payTime){
-                        clearInterval(this.payTime)
-                    }
-                    this.orderInfoCancelFun()
-                    return
-                }
-                if(this.ruleForm.paymentType == 2){
-                    this.loadingText = "订单入库中..."
-                }else {
-                    this.loadingText = "订单支付中..."
-                }
-                this.payStatus = ''
-                let res = await payQuery({
-                    orderId: orderId
-                })
-                if(res.code == 200){
-                    if(res.data) {
-                        if(res.data.payStatus == 0) {
-                            if(this.payTime){
-                                clearInterval(this.payTime)
-                            }
-                            if(this.ruleForm.paymentType == 2){
-                                this.$message.error('"订单入库中失败"');
-                                this.loading = false
-                                this.payStatus = 3
-                            }else {
-                                if(res.data.orderStatus == 9 || res.data.orderStatus == 4 || res.data.orderStatus == 5){
-                                    this.$message.error('订单已关闭，请重新选择座位，再购买!!!');
-                                    this.loading = false
-                                    this.payStatus = 10
-                                }else {
-                                    this.$message.error('用户未支付!!!');
-                                    this.loading = false
-                                    this.payStatus = 7
-                                }
-                            }
-                            
-                        }else if(res.data.payStatus == 1) {
-                            if(this.payTime){
-                                clearInterval(this.payTime)
-                            }
-                            if(this.ruleForm.paymentType == 2){
-                                this.$message({
-                                    message: '订单入库成功',
-                                    type: 'success'
-                                });
-                                this.loading = false
-                                // this.payStatus = 8
-                                // this.getPrintListApi()
-                                this.goTicketingCollections()
-                                
-                            }else {
-                                this.$message({
-                                    message: '用户已支付成功,请打印门票',
-                                    type: 'success'
-                                });
-                                // 开始 打印
-                                this.loading = false
-                                // this.payStatus = 8
-                                // this.getPrintListApi()
-                                this.goTicketingCollections()
-                            }
-                            
-                            
-                        }else if(res.data.payStatus == 2) {
-
-                        }else if(res.data.payStatus == 3) {
-                            if(this.payTime){
-                                clearInterval(this.payTime)
-                            }
-                            if(this.ruleForm.paymentType == 2){
-                                this.$message.error('"订单入库中失败"');
-                                this.loading = false
-                                this.payStatus = 3
-                            }else {
-                                if(res.data.orderStatus == 9 || res.data.orderStatus == 4 || res.data.orderStatus == 5){
-                                    this.$message.error('订单已关闭，请重新选择座位，再购买!!!');
-                                    this.loading = false
-                                    this.payStatus = 10
-                                }else {
-                                    this.$message.error('用户支付失败!!!');
-                                    this.loading = false
-                                    this.payStatus = 7
-                                }
-                            }
-                        }else if(res.data.payStatus == 4) {
-                            if(this.payTime){
-                                clearInterval(this.payTime)
-                            }
-                            
-                            if(this.ruleForm.paymentType == 2){
-                                this.$message.error('"订单入库中失败"');
-                                this.loading = false
-                                this.payStatus = 3
-                            }else {
-                                if(res.data.orderStatus == 9 || res.data.orderStatus == 4 || res.data.orderStatus == 5){
-                                    this.$message.error('订单已关闭，请重新选择座位，再购买!!!');
-                                    this.loading = false
-                                    this.payStatus = 10
-                                }else {
-                                    this.$message.error('支付退款!!!');
-                                    this.loading = false
-                                    this.payStatus = 7
-                                }
-                            }
-                            
-                        }
-                    }
-                    
-                }else{
-                    this.$message.error('支付失败!!!');
-                    this.loading = false
-                    this.payStatus = 7
-                }
                 
-            } catch (error) {
-                this.$message.error('支付失败!!!');
-                this.loading = false
-                this.payStatus = 7
             }
-        },
-
-        /**  连接VBarServer  */
-        vbar_open() {
-            this.loading = true
-            this.loadingText = "连接扫码盒子中!!!"
-            this.payStatus =  null
-            this.code = ''
-            this.websocketClear()
-            this.payStatus = 5 // 连接成功
-            document.addEventListener('keydown',this.keydownAdd);
-            this.loading = false
-        },  
-        /**  连接结果 */
-        websocket_open_state(message){
-            console.log("连接结果 ===== ",message)
-            this.codeTime = setInterval(()=>{
-                console.log("检测是否连接")
-                if(this.websocketData.readyState != WebSocket.OPEN) {
-                    this.payStatus = 6
-                }
-            },3000)
-            //document.getElementById('wsocket').value = "已连接";
-        },
-        // 拼接字符串
-        keydownAdd(e){
-            console.log("e=====",e)
-            console.log("this.code=====",this.code)
-            if( this.payStatus == 5 && e.key != 'Enter') {
-                this.code = this.code + e.key
-            }
-
-            if( e.key == 'Enter') {
-                document.removeEventListener('keydown',this.keydownAdd);
-                let codeCopy = this.code
-                this.payStatus == 5.5
-                this.code = ''
-                this.gotoMicroPayFun(this.orderId,codeCopy)
-            }
-        },
-        //接收扫码完整结果处理
-        websocket_decode(code){
-            console.log("orderId=========",this.orderId )
-            console.log("code=========",code)
-            if(this.orderId && this.payStatus == 5.5 &&  regex.test(code) ) {
-                this.payStatus = 5.6 // 支付中
-                let codeCopy = code.replace("%%%", "").replace("%%%", "")
-                this.gotoMicroPayFun(this.orderId,codeCopy)
-            }else if(!code){
-                this.payStatus = 5
-                this.code = ''
-            }
-        },
-        /** 关闭通讯 */
-        websocketClear(){
-            document.removeEventListener('keydown',this.keydownAdd);
-        },
-        /**  读取身份证 */
-        readCert(){
-            this.idcardLoading = true
-            var result = "";
-            try {
-                let xmlHttp = new XMLHttpRequest();
-                let Protocol = window.location.protocol.split(':')[0];
-                //获取当前协议，并且分割字符串，得到http或者https
-                if (Protocol === 'https'){
-                    //创建请求 第一个参数是代表以post方式发送；第二个是请求端口和地址；第三个表示是否异步
-                    xmlHttp.open("POST", "http://127.0.0.1:18889/api/readCert?ReadSN=" + 0, false);	  //readCert读卡，生成正反面仿复印件	
-                }else {
-                    //创建请求 第一个参数是代表以post方式发送；第二个是请求端口和地址；第三个表示是否异步
-                    xmlHttp.open("POST", "http://127.0.0.1:18889/api/readCert?ReadSN=" + 0, false);	  //readCert读卡，生成正反面仿复印件	
-                }
-                //发送请求
-                xmlHttp.send();
-                if (xmlHttp.readyState == 4 && xmlHttp.status == 200) {
-                    result = xmlHttp.responseText;
-                    xmlHttp.readyState = 1;
-                }
-            } catch (e) {
-                console.error("e====",e)
-            }
-            let obj = JSON.parse(result)
-            if(obj.resultContent && obj.resultContent.certNumber){
-                this.$set(this.tableForm,"idcard",obj.resultContent.certNumber)
-                this.$set(this.tableForm,"name",obj.resultContent.partyName)
-            }else {
-                this.$message.error('读取失败!!!');
-            }
-            
-            this.idcardLoading = false
-            //return result;
-             console.log(result,obj)
-        },
-        /** 查询打印机列表 */
-        getPrintListApi() {
-          getPrintListApi({deviceType:5,pageNum: 1,
-          pageSize: 999,})
-          .then(response => {
-              this.printList = response.data.rows;
-          }).catch((error)=>{
-            console.log("error===",error)
-          }
-          );
-        },
-        // 打印 
-        async print(list = []){
-            if(!this.printListId) {
-                this.$message.error('请选择打印机!!');
-                return
-            }
-            this.loading = true
-              this.loadingText = '打印中...'
-              this.payStatus = ''
-              try {
-                let res = await printApi({
-                  orderId: this.orderId,
-                  source: 2,
-                  deviceId: this.printListId
-                })
-                if(res.code == 200) {
-                  let url = res.data.linkIp
-                  let printInfo = res.data.printInfo
-                  this.connectPrint(url,printInfo)
-                }else {
-                  throw new Error(res)
-                }
-              } catch (error) {
-                this.loading = false
-                 this.payStatus = 8
-                console.error("error=====",error)
-              }
-          
-        },
-        /**  连接打印机  */
-        connectPrint(url,data){
-          // 创建忽略 SSL 的 axios 实例
-          const ignoreSSL = axios.create({
-            httpsAgent: new https.Agent({  
-              rejectUnauthorized: false
-            }),
-            withCredentials: true, // 跨域请求时发送Cookie
-            timeout: 60000, // 请求超时
-            headers: {
-              "Content-Type": "application/json; charset=UTF-8;"
-            }
-          });
-          ignoreSSL.post(url, 
-            { ...data }
-            ).then(()=>{
-            this.rebookDialog = false
-            this.loading = false
-          }).catch(()=>{
-            this.loading = false
-            this.payStatus = 8
-            // this.rebookDialog = false
-            // this.loading = false
-          })
-          // 在 axios 请求时，选择性忽略 SSL
-          // const agent = new https.Agent({  
-          //   rejectUnauthorized: false
-          // });
-          // axios.post(
-          //   url, 
-          //   { httpsAgent: agent,...data }
-          //   ).then(()=>{
-          //   this.rebookDialog = false
-          //   this.loading = false
-          // })
-          // .catch(()=>{
-          //   this.rebookDialog = false
-          //   this.loading = false
-          // })
-        },
-        /** 获取授信余额和账户余额  */
-        async selectMarketTeamBySourceFun(value) {
-            console.log("value===",value)
-            try {
-                if(!['10','11','13','14','18','19'].includes(value)) return
-                let res = await selectMarketTeamBySourceApi({
-                    source: value
-                })
-                this.balance = res.data.balance
-                if(res.data.grantQuota && res.data.grantUsed) {
-                    this.grantQuota = res.data.grantQuota - res.data.grantUsed
-                }else if(res.data.grantQuota) {
-                    this.grantQuota = res.data.grantQuota
-                }else {
-                    this.grantQuota = 0
-                }
-                
-            } catch (error) {
-                this.balance = null
-                this.grantQuota = null
-            }
-        },
-
+         },
         /**  获取座位  */
         async querySeatListFun(type){
             try {

src/views/windowTicketSales/model/upgradeBox.vue

@@ -0,0 +1,490 @@
+<template>
+    <!-- 改签对话框 -->
+    <el-dialog 
+    title="订单改签" 
+    :visible.sync="rebookDialog" 
+    width="95%" 
+    append-to-body 
+    class="rebook1_dialog"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    :modal="false"
+    :before-close="handleClose"
+    center
+    >
+        <div class="rebook1_box" v-loading="loading">
+            <div class="rebook1_from-box">
+                <div class="rebook1_from">
+                    <el-form :model="rebookForm" ref="rebookForm" label-width="100px" :rules="rules">
+                        <el-form-item label="剧目名称：">
+                            <span>{{ rebookForm.performName }}</span>
+                        </el-form-item>    
+                        <el-form-item label="票务名称：">
+                            <span>{{ rebookForm.goodsName }}</span>
+                        </el-form-item>
+                        <el-form-item label="座位类型：">
+                            <span>{{ rebookForm.seatTypeName }}</span>
+                        </el-form-item>
+                        <el-form-item label="订单座位数：">
+                            <span>{{ rebookForm.touristNum }}个</span>
+                        </el-form-item>
+
+                        <el-form-item label="选择日期：" prop="performDate">
+                            <span>{{ rebookForm.performDate }}</span>
+                        </el-form-item>
+                        <el-form-item label="选择场次：" prop="performTimeId">
+                            <span>{{ rebookForm.performTimeStart }} — {{ rebookForm.performTimeEnd }} </span>
+                        </el-form-item>
+                        <el-form-item label="票档：" prop="seatTypeId">
+                            <el-select
+                                v-model="rebookForm.seatTypeId"
+                                placeholder="请选择票档"
+                                style="width: 100%"
+                                @change="querySeatListFun"
+                                >
+                                    <el-option
+                                    v-for="item in intervalList"
+                                    :key="item.seatTypeId"
+                                    :label="item.seatTypeName"
+                                    :value="item.seatTypeId"
+                                    />
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="订单总额：">
+                            <span>{{ rebookForm.realPrice }}元</span>
+                        </el-form-item>
+                        <el-form-item v-if="rebookForm.diffPrice < 0" label="升舱费用：">
+                            <span>退费{{ Math.abs(rebookForm.diffPrice) }}元</span>
+                        </el-form-item>
+                        <el-form-item v-if="rebookForm.diffPrice > 0" label="升舱费用：">
+                            <el-input-number 
+                            v-model="rebookForm.goodsDiffAmount" 
+                            controls-position="right"
+                            :min="0"></el-input-number>
+                        </el-form-item>
+                        <el-form-item v-if="rebookForm.diffPrice > 0" label="支付方式 :" prop="paymentType">
+                            <el-radio-group v-model="rebookForm.paymentType">
+                            <el-radio label="1">扫码支付</el-radio>
+                            <el-radio label="2">现金支付</el-radio>
+                            <!-- <el-radio v-if="['10','11','13','14','18','19'].includes(ruleForm.source)" label="3">对公支付</el-radio> -->
+                            <!-- <el-radio v-if="['10','11','13','14','18','19'].includes(ruleForm.source)" label="4">账户余额({{ balance }})</el-radio>
+                            <el-radio v-if="['10','11','13','14','18','19'].includes(ruleForm.source)" label="5">授信余额({{ grantQuota }})</el-radio> -->
+                            </el-radio-group>
+                        </el-form-item>
+                        <el-form-item label="备注：">
+                            <el-input
+                                v-model="rebookForm.resubmitRemark"
+                                placeholder="请输入备注"
+                                clearable
+                                type="textarea"
+                                />
+                        </el-form-item>
+                    </el-form>
+                    <div class="tip-box">
+                        <p>温馨提示：仅限升舱一次，且升舱后禁止退款，确认要继续升舱吗。</p>
+                    </div>
+                </div>
+                <div class="rebook1_seat" v-loading="seatLoading" :element-loading-text="seatLoadText">
+                    <seatBox 
+                    ref="seatBox" 
+                    :seatTypeLimit="configStockNumObj"
+                    @selectSeat="selectSeat"
+                    height="100%"
+                    />
+                </div>
+            </div>
+            <div style="width: 100%;display: flex;justify-content: center;">
+                <el-button @click="rebookDialog = false">取 消</el-button>
+                <el-button type="primary" @click="submitRebook">确认改签</el-button>
+            </div>
+            <!--  支付过程 控制  -->
+            <div v-if="payStatus" class="increase-viewers-pay-status">
+                <div class="increase-viewers-pay-status-info" v-if="!loading">
+                    <span style="font-weight: 600;font-size: 20px;">提示</span>
+                    <span style="padding: 10px 0;">
+                        {{ payStatus==1 ? '生成订单失败!!!' : 
+                        payStatus==2 ? '生成订单生成成功,请点击调取扫码盒子' : 
+                        payStatus==4 ? '扫码支付失败!!!' :
+                        payStatus==5 ? '请出示付款码!!!' :
+                        payStatus==5.5 ? '扫码成功，支付中...' :
+                        payStatus==5.6 ? '扫码成功，支付中...' :
+                        payStatus==6 ? '连接扫码器失败!!!' :
+                        payStatus==7 ? '用户支付失败或未支付,请重新连接支付!!!' :
+                        payStatus==8 ? '用户支付成功,请点击打印票!!!' :
+                        payStatus==9 ? '支付超时!!!' :
+                        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>
+                        <el-button @click="orderInfoSubmitFun()" style="margin-left: 20px;" type="primary">重新生成订单</el-button>
+                    </div>
+                    <!--  生成订单成功 选择支付方式  -->
+                    <div>
+                        <!-- 扫码支付 2 -->
+                        <el-button v-if="payStatus==2" @click="vbar_open(orderId)" type="success">扫码支付</el-button>
+                        <!-- 扫码支付 4 -->
+                        <el-button v-if="payStatus==4" @click="vbar_open(orderId)" type="success">重新扫码支付</el-button>
+                        <!-- 重新支付 3 -->
+                        <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>
+                    
+                    <!-- 打印 8  -->
+                    <div v-if="payStatus==8">
+                        <el-select v-model="printListId" placeholder="选择打印机">
+                            <el-option 
+                            :label="item.deviceName" 
+                            :key="item.id" 
+                            :value="item.id" 
+                            v-for="(item) in printList"></el-option>
+                        </el-select>
+                        <el-button style="margin-left: 15px" @click="print" type="success">打印门票</el-button>
+                        <el-button style="margin-left: 15px" @click="goTicketingCollections" type="success">跳转取票界面</el-button>
+                    </div>
+                    <!-- 支付超时 9  -->
+                    <div v-if="payStatus==9">
+                        <!-- <el-button @click="print" type="danger">取消支付</el-button> -->
+                        <el-button @click="orderInfoSubmitFun()" type="primary">重新扫码</el-button>
+                    </div>
+                    <!-- 订单被关闭 10  -->
+                    <div v-if="payStatus==10">
+                        <!-- <el-button @click="print" type="danger">取消支付</el-button> -->
+                        <el-button @click="handleClose()" type="primary">关闭</el-button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </el-dialog>
+</template>
+<script>
+import { 
+  querySeatListNew,
+ } from '@/api/windowTicketSales/ticketingSales'
+ import { rebookApi,getTimeSeatTypeAllApi,resubmitInfoApi } from '@/api/windowTicketSales/rebook'
+ import { countBySeatTyp } from '@/api/ticketMr/InventoryTemplate'
+ import { pageList as getSeatType } from '@/api/seatTypeMr/seatTypeMr'
+ import { getSelectById } from '@/api/order/orderMr'
+ import seatBox from '@/components/seatBox/index.vue';
+ import payJs from "../mixins/pay"
+export default {
+    name: "RebookBox",
+    components: { seatBox },
+    mixins: [payJs],
+    data() {
+        return {
+            // 改签对话框
+            rebookDialog: false,
+            loading: false,
+            // 改签表单
+            rebookForm: {
+                orderId: undefined,
+                performDate: undefined,
+                performTimeId: undefined,
+                performInterval: undefined,
+                performId: undefined,
+                auditoriumId: undefined
+            },
+            rules: {
+                seatTypeId: [{ required: true, message: '请选择票档', trigger: ['blur','change'] }]
+            },
+            // 场次列表
+            intervalList: [],
+            intervalListLoading: false,
+            // 支付相关
+            payDialog: false,
+            payStatus: null,
+            code: '',
+            websocketData: null,
+            codeTime: null,
+            // 成功对话框
+            successDialog: false,
+            newOrderId: '',
+            printList: [],
+
+            configStockNumObj: {},
+            countBySeatTypList:[],
+            seatTypeListAll: [],
+
+            seatLoading: false,
+            seatLoadText: '获取座位中...',
+            setList: [],
+        }
+    },
+    created(){
+        this.getSeatTypeAllList()
+    },
+    methods: {
+        async initData(row) {
+            this.rebookDialog = true
+            this.payStatus = null
+            this.rebookForm = {
+                resubmitType: 2,  // 改签类型: 1-改签 2-升舱 不传默认为改签
+                goodsDiffAmount: undefined,
+                performName: row.performName,
+                goodsName: row.goodsName,
+                seatTypeName: row.seatTypeName,
+                seatTypeId: null,
+                goodsId: row.goodsId,
+                orderId: row.orderId,
+                performDate: row.performDate,
+                performTimeId: null,
+                performId: row.performId,
+                auditoriumId: row.auditoriumId,
+                paymentType: "1", // 支付方式'
+                touristNum: row.touristNum,
+                seatList: [],
+                performTimeEnd: row.performTimeEnd,
+                performTimeStart: row.performTimeStart
+            }
+            await this.getSelectByIdApi()
+            await this.handleDateChange()
+            this.$nextTick(()=>{
+                this.$refs.rebookForm.clearValidate()
+            })
+        },
+        /** 获取详情 */
+        async getSelectByIdApi() {
+            try {
+                let res = await getSelectById(this.rebookForm.orderId)
+                this.rebookForm = {
+                    ...this.rebookForm,
+                    performTimeId: res.data.performTimeId,
+                }
+            } catch (error) {
+                
+            }
+
+        },
+        /** 获取票档  */
+        async handleDateChange() {
+            try {
+                this.intervalListLoading = true
+                this.intervalList = []
+                let res = await getTimeSeatTypeAllApi({
+                    orderId: this.rebookForm.orderId,
+                })
+                this.intervalList = res.data.list || []
+                if(this.intervalList.length == 0){
+                    this.$message.error('没有可升舱的票档!!!');
+                }
+                this.intervalListLoading = false
+            } catch (error) {
+                this.intervalListLoading = true
+            }
+        },
+        /**  提交表单 */
+        submitRebook() {
+            this.$refs.rebookForm.validate((valid) => {
+                if (valid) {
+                    if(!this.rebookForm.seatList||this.rebookForm.seatList.length==0) {
+                        this.$message.error('请选择座位!!!');
+                        return
+                    }
+                    if( this.rebookForm.seatList.length < this.rebookForm.touristNum ) {
+                        this.$message.error(`请选择${ this.rebookForm.touristNum }座位!!!`);
+                        return
+                    }
+                    this.orderInfoSubmitFun()
+                } else {
+                    return false;
+                }
+            });
+        },
+        /** 退出窗口 */
+        handleClose(done) {
+            // if(this.payStatus==8) {
+            //     this.$message.error('请daying');
+            //     return
+            // }
+            this.$confirm('确认关闭？')
+                .then(_ => {
+                    if(this.orderId){
+                        document.removeEventListener('keydown',this.keydownAdd);
+                        this.orderInfoCancelFun(true)
+                    }else {
+                        this.$refs.seatBox.querySeatListFun(true,[],[],[])
+                        this.rebookDialog = false
+                    }
+                })
+                .catch(_ => {});
+        },
+        /** 
+         * 
+         *  获取升舱/改签信息
+         * 
+         */
+        async resubmitInfoFun() {
+            try {
+                let res = await resubmitInfoApi({
+                    orderId: this.rebookForm.orderId,
+                    timeId: this.rebookForm.performTimeId,
+                    seatTypeId: this.rebookForm.seatTypeId,
+                    //goodsDiffAmount: this.rebookForm.goodsDiffAmount,
+                })
+                this.rebookForm = {
+                    ...this.rebookForm,
+                    realPrice: res.data.reSubmitInfo.realPrice,
+                    diffPrice: res.data.reSubmitInfo.diffPrice
+                }
+            } catch (error) {
+                
+            }
+         },
+
+        /**  获取座位  */
+        async querySeatListFun(type){
+            try {
+                await this.countBySeatTypFun(this.rebookForm.auditoriumId)
+                await this.resubmitInfoFun()
+                let res = await querySeatListNew({
+                    auditoriumId: this.rebookForm.auditoriumId,
+                    timeId: this.rebookForm.performTimeId,
+                    goodsId: this.rebookForm.goodsId,
+                })
+                if(res.code == 200){
+                    let list1 = []
+                    res.data.forEach((item,index)=>{
+                        list1.push({
+                            ...item,
+                            isSame: this.rebookForm.seatTypeId != item.seatTypeId
+                        })
+                    })
+                    this.setList = list1;
+                    let list = []
+                    let list3 = []
+                    this.countBySeatTypList.forEach((item,index)=>{
+                        list3.push(item.seatTypeId)
+                    })
+                    let list4 = []
+                    this.seatTypeListAll.forEach((item,index)=>{
+                        if(list3.includes(item.id)) {
+                            list4.push({...item})
+                        }
+                    })
+                    this.$nextTick(() =>{
+                        this.$refs.seatBox.querySeatListFun(true,this.setList,list,list4)
+                    })
+                }
+                
+                this.loading = false
+            } catch (error) {
+                this.loading = false
+                console.error("error===",error)
+            }
+        },
+        /** 获取座位类型  */
+        async countBySeatTypFun(value) {
+            try {
+                if(!value) return
+                let res = await countBySeatTyp({auditoriumId: value})
+                this.countBySeatTypList = res.data ? res.data : []
+                let obj = {}
+                this.countBySeatTypList.forEach((item,index)=>{
+                    obj['seatNum_'+item.seatTypeId] = {
+                        stockTotal: item.stock,
+                        stockSelect: item.stock,
+                        stockYes: item.stock,
+                        stockNo: 0,
+                        isNoSelect: true,
+                    }
+                    if(item.seatTypeId == this.rebookForm.seatTypeId){
+                        obj['seatNum_'+item.seatTypeId].stockYes = item.stock-this.rebookForm.touristNum
+                        obj['seatNum_'+item.seatTypeId].isNoSelect = false
+                    }
+                })
+                this.configStockNumObj = obj
+            } catch (error) {
+                console.error("error1====",error)
+            }
+        },
+        /** 获取座位类型 说明 */
+        async getSeatTypeAllList() {
+            try {
+                let res = await getSeatType({
+                    pageNum: 1,
+                    pageSize: 999,
+                })
+                if(res.code == 200) {
+                    this.seatTypeListAll = res.data.rows || [];
+                }
+            } catch (error) {
+                        
+            }   
+        },
+         /** 选择座位  */
+        selectSeat(list) {
+            let list1 = []
+            list.forEach((item)=>{
+                list1.push({
+                    seatId: item.id
+                })
+            })
+            this.rebookForm.seatList = list1
+            console.log("已选择的====",list)
+        },
+    }
+}
+</script>
+<style lang="scss" scoped>
+.rebook1_dialog ::v-deep .el-dialog__body {
+    padding: 0 !important;
+}
+.rebook1_box {
+    width: 100%;
+    height: 100%;
+    padding-bottom: 10px;
+    .rebook1_from-box {
+        display: flex;
+        width: 100%;
+        height: 80vh;
+        box-sizing: border-box;
+        padding: 0 20px 20px;
+    }
+    .rebook1_from {
+        width: 100%;
+        height: 100%;
+        padding: 0 20px 0 0;
+        width: 400px;
+        box-sizing: border-box;
+        .tip-box {
+            >p {
+                color: red;
+            }
+        }
+    }
+    .rebook1_seat {
+        width: calc( 100% - 400px );
+        height: 100%;
+    }
+}
+
+.increase-viewers-pay-status {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    z-index: 999;
+    background-color: rgba(0,0,0,0.3);
+    top: 0;
+    left: 0;
+    .increase-viewers-pay-status-info {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        color: #fff;
+    } 
+} 
+</style>

src/views/windowTicketSales/rebook.vue

@@ -73,10 +73,17 @@
                   <dict-tag :options="dict.type.order_status_type" :value="scope.row.status" />
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <el-button 
                 type="primary" 
+                size="small"
+                @click="handleUpgrade(scope.row)"
+                v-if="hasPermi('windowTicketSales:rebook:rebook') && scope.row.allowReSubmit == 1 && scope.row.status == 3"
+                >升舱</el-button>
+                <el-button 
+                type="primary" 
+                size="small"
                 @click="handleRebook(scope.row)"
                 v-if="hasPermi('windowTicketSales:rebook:rebook') && scope.row.allowReSubmit == 1 && scope.row.status == 3"
                 >改签</el-button>
@@ -97,18 +104,21 @@
       </div>
     </div>
     <!-- 改签 -->
-     <rebookBox ref="rebookBox" @getList="getList" />
+    <rebookBox ref="rebookBox" @getList="getList" />
+    <!-- 改签 -->
+    <upgradeBox ref="upgradeBox" @getList="getList" />
   </div>
 </template>
 
 <script>
 import { reSubmitPageList } from '@/api/windowTicketSales/rebook'
 import rebookBox from './model/rebookBox.vue';
+import upgradeBox from "./model/upgradeBox.vue"
 import auth from '@/plugins/auth'
 export default {
   name: 'Rebook',
   dicts: ['order_status_type', 'channel_type'],
-  components: { rebookBox },
+  components: { rebookBox,upgradeBox },
   data() {
     return {
       loading: false,
@@ -152,11 +162,10 @@ export default {
       this.handleQuery()
     },
     handleRebook(row){
-      if (row.status !== 3) {  // 检查订单状态是否为3
-        this.$modal.msgError('该票禁止改签请知悉')
-        return
-      }
       this.$refs.rebookBox.initData(row)
+    },
+    handleUpgrade(row) {
+      this.$refs.upgradeBox.initData(row)
     }
   }
 }