Browse Source

1. 优化

MONSTER-ygh 1 month ago
parent
commit
d733d561c7

+ 3 - 2
src/App.vue

@@ -66,9 +66,10 @@ export default {
         flex: auto !important;
         flex: auto !important;
         display: flex;
         display: flex;
         flex-direction: column;
         flex-direction: column;
+        flex-shrink: 1;
         .app-container_table_main {
         .app-container_table_main {
-          //height: calc( 100% - 40px ) !important;
-          flex: auto;
+          height: calc( 100% - 40px ) !important;
+          //flex: auto; 
         }
         }
       }
       }
       .app-container_table_page {
       .app-container_table_page {

+ 6 - 3
src/components/seatBox/index.vue

@@ -185,7 +185,8 @@
         lockObj: {
         lockObj: {
             auth: '',
             auth: '',
             remark: ''
             remark: ''
-        }
+        },
+        stockType: null,
       };
       };
     },
     },
     created() {
     created() {
@@ -523,10 +524,12 @@
                     item.isDisabled || item.status != 1 ? 'disabled-class' :
                     item.isDisabled || item.status != 1 ? 'disabled-class' :
                     item.isSelect ? 'select-class' : ''
                     item.isSelect ? 'select-class' : ''
             if(!str) {
             if(!str) {
-                if(item.isSame || item.isUse == 2) { // 是否为可选的座位类型
+                // if(item.isSame || item.isUse == 2) { // 是否为可选的座位类型
+                //     str = 'seat_is_same'
+                // }
+                if(item.isSame) { // 是否为可选的座位类型
                     str = 'seat_is_same'
                     str = 'seat_is_same'
                 }
                 }
-
                 if(item.channelType && item.channelType != this.channelType) { // 是否属于窗口售卖座位
                 if(item.channelType && item.channelType != this.channelType) { // 是否属于窗口售卖座位
                     str = 'seat_channel_type'
                     str = 'seat_channel_type'
                 }
                 }

+ 6 - 2
src/views/finance/refundMr/index.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="app-container app-container-scheduling">
   <div class="app-container app-container-scheduling">
     <div class="app-container_flex_auto">
     <div class="app-container_flex_auto">
-      <div class="app-container_form"  v-show="showSearch">
+      <div class="app-container_form app-container-queryform"  v-show="showSearch">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
           <el-form-item v-if="queryShow.refundId" label="退款单号">
           <el-form-item v-if="queryShow.refundId" label="退款单号">
             <el-input
             <el-input
@@ -86,7 +86,7 @@
           </el-form-item>
           </el-form-item>
         </el-form>
         </el-form>
       </div>
       </div>
-      <div class="app-container_table">
+      <div class="app-container_table app-container-main">
         <el-row :gutter="10" class="mb8">
         <el-row :gutter="10" class="mb8">
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
         </el-row>
@@ -231,11 +231,15 @@ export default {
         thirdOrderNo: true,
         thirdOrderNo: true,
         status: true
         status: true
       },
       },
+      show1: false
     };
     };
   },
   },
   created() {
   created() {
     this.getList();
     this.getList();
   },
   },
+  activated(){
+    //this.getList();
+  },
   methods: {
   methods: {
     /** 查询列表 */
     /** 查询列表 */
     getList() {
     getList() {

+ 2 - 2
src/views/windowTicketSales/rebook.vue

@@ -75,7 +75,7 @@
             </el-table-column>
             </el-table-column>
             <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
             <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
               <template slot-scope="scope">
               <template slot-scope="scope">
-                <el-button 
+                <!-- <el-button 
                 type="primary" 
                 type="primary" 
                 size="small"
                 size="small"
                 @click="handleUpgrade(scope.row)"
                 @click="handleUpgrade(scope.row)"
@@ -86,7 +86,7 @@
                 size="small"
                 size="small"
                 @click="handleRebook(scope.row)"
                 @click="handleRebook(scope.row)"
                 v-if="hasPermi('windowTicketSales:rebook:rebook') && scope.row.allowReSubmit == 1 && scope.row.status == 3"
                 v-if="hasPermi('windowTicketSales:rebook:rebook') && scope.row.allowReSubmit == 1 && scope.row.status == 3"
-                >改签</el-button>
+                >改签</el-button> -->
               </template>
               </template>
             </el-table-column>
             </el-table-column>
           </el-table>
           </el-table>