订单改签/升舱处理

src/views/windowTicketSales/model/rebookBox.vue

@@ -168,6 +168,8 @@
                     </div>
                     <!--  生成订单成功 选择支付方式  -->
                     <div>
+                        <!-- 取消支付 -->
+                        <el-button @click="handleClose()" type="primary">取消支付</el-button>
                         <!-- 扫码支付 2 -->
                         <el-button v-if="payStatus==2" @click="vbar_open(orderId)" type="success">扫码支付</el-button>
                         <!-- 扫码支付 4 -->

src/views/windowTicketSales/model/upgradeBox.vue

@@ -9,39 +9,45 @@
                         <el-form-item label="剧目名称：" style="margin-bottom: 0px;">
                             <span>{{ rebookForm.performName }}</span>
                         </el-form-item>
+                        <el-form-item label="选择日期：" prop="performDate" style="margin-bottom: 0px;">
+                            <span>{{ rebookForm.performDate }}</span>
+                        </el-form-item>
+                        <el-form-item label="选择场次：" prop="performTimeId" style="margin-bottom: 0px;">
+                            <span>{{ rebookForm.performTimeStart }} — {{ rebookForm.performTimeEnd }} </span>
+                        </el-form-item>
                         <el-form-item label="票务名称：" style="margin-bottom: 0px;">
                             <span>{{ rebookForm.goodsName }}</span>
                         </el-form-item>
-                        <el-form-item label="座位类型：" style="margin-bottom: 0px;">
+                        <el-form-item label="原票档：" style="margin-bottom: 0px;">
                             <span>{{ rebookForm.seatTypeName }}</span>
                         </el-form-item>
-                        <el-form-item label="订单座位数：" style="margin-bottom: 0px;">
+                        <el-form-item label="观影人数：" style="margin-bottom: 0px;">
                             <span>{{ rebookForm.touristNum }}个</span>
                         </el-form-item>
-                        <el-form-item label="选择日期：" prop="performDate" style="margin-bottom: 0px;">
-                            <span>{{ rebookForm.performDate }}</span>
-                        </el-form-item>
-                        <el-form-item label="选择场次：" prop="performTimeId" style="margin-bottom: 0px;">
-                            <span>{{ rebookForm.performTimeStart }} — {{ rebookForm.performTimeEnd }} </span>
+                        <el-form-item label="原订单总额：">
+                            <span>{{ rebookForm.realPrice || 0 }}元</span>
                         </el-form-item>
-                        <el-form-item label="票档：" prop="seatTypeId">
+                        <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 || 0 }}元</span>
+                        <el-form-item label="票档差价：">
+                            <span>{{ rebookForm.diffPrice }}元</span>
                         </el-form-item>
-                        <el-form-item v-if="rebookForm.diffPrice < 0" label="升舱费用：">
+                        <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="goodsDiffAmount">
+                        <el-form-item v-if="rebookForm.diffPrice > 0" label="升舱补差：" prop="goodsDiffAmount">
                             <el-input v-model="rebookForm.goodsDiffAmount"  type="number" style="width: 200px;" @input="setRealPrice_2"
                                 :min="0"></el-input>
                             <span>元/人</span>
                         </el-form-item>
+                        <el-form-item label="升舱应付金额：">
+                            <span>{{  calTotalPrice(rebookForm.goodsDiffAmount,rebookForm.touristNum) }}元</span>
+                        </el-form-item>
                         <el-form-item v-if="rebookForm.diffPrice > 0 && !rebookForm.channelType != 'group'" label="支付方式 :"
                             prop="paymentType">
                             <el-radio-group v-model="rebookForm.paymentType">

src/views/windowTicketSales/rebook.vue

@@ -52,16 +52,16 @@
           <el-table v-loading="loading" :data="rebookList" height="100%">
             <el-table-column label="序号" type="index" width="50" align="center" />
             <el-table-column label="姓名" align="center" prop="memberName" />
-            <el-table-column label="身份证号码" align="center" prop="idcard" />
-            <el-table-column label="购票人手机号" align="center" prop="mobile" />
-            <el-table-column label="订单号" align="center" prop="orderId" />
-            <el-table-column label="剧目名称" align="center" prop="performName" />
-            <el-table-column label="票务名称" align="center" prop="goodsName" />
+            <el-table-column label="身份证号码" align="center" prop="idcard" width="150" />
+            <el-table-column label="购票人手机号" align="center" prop="mobile" width="150" />
+            <el-table-column label="订单号" align="center" prop="orderId" width="170" />
+            <el-table-column label="剧目名称" align="center" prop="performName" width="150" />
+            <el-table-column label="票务名称" align="center" prop="goodsName" width="150" />
             <el-table-column label="票档" align="center" prop="seatTypeName" />
-            <el-table-column label="座位信息" align="center" prop="seatNames" />
-            <el-table-column label="日期" align="center" prop="performDate" />
-            <el-table-column label="场次" align="center" prop="performInterval" />
-            <el-table-column label="下单时间" align="center" prop="createTime" />
+            <el-table-column label="座位信息" align="center" prop="seatNames" width="160" />
+            <el-table-column label="日期" align="center" prop="performDate" width="140" />
+            <el-table-column label="场次" align="center" prop="performInterval" width="140" />
+            <el-table-column label="下单时间" align="center" prop="createTime" width="180" />
             <el-table-column label="支付方式" align="center" prop="payWay">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.pay_way_type" :value="scope.row.payWay"/>