Browse Source

1. 优化

MONSTER-ygh 8 tháng trước cách đây
mục cha
commit
db15ebafb8

+ 1 - 1
src/views/finance/refundMr/index.vue

@@ -90,7 +90,7 @@
       <el-table-column label="支付单号" align="center" prop="transactionId" />
       <el-table-column label="支付单号" align="center" prop="transactionId" />
       <el-table-column label="退款金额" align="center" prop="type">
       <el-table-column label="退款金额" align="center" prop="type">
         <template slot-scope="scope">
         <template slot-scope="scope">
-          <span>{{ scope.row.refundAmount && scope.row.refundAmount != 0 ? ( '¥-' + scope.row.refundAmount) : '' }}</span>
+          <span>{{ scope.row.refundAmount === 0 ? ( '¥' + scope.row.refundAmount) : ('¥-' + scope.row.refundAmount) }}</span>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
       <el-table-column label="申请原因" align="center" prop="refundReason" />
       <el-table-column label="申请原因" align="center" prop="refundReason" />

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1042 - 0
src/views/officesale/ticketingSales copy.vue


+ 51 - 5
src/views/officesale/ticketingSales.vue

@@ -121,18 +121,25 @@
                             v-for="(item1, index1) in seatMapListKey" 
                             v-for="(item1, index1) in seatMapListKey" 
                             :key="item1.key"
                             :key="item1.key"
                             >
                             >
+                                <div class="seat-item-class seat-box-class-row" style="">{{ index1 != 0 ?((index1) + '排') :'' }}</div>
+                                
                                 <div 
                                 <div 
-                                class="seat-item-class" 
-                                :class="item.occupyStatus==0?item.occupyOrderId?'order-occupy-status':item.occupyStatus==0&&item.isSelect?'occupy-status-select occupy-status':'occupy-status': item.occupyStatus==1?'occupy-status-no':item.isDisabled || item.status != 1 ? 'disabled-class' : item.isSelect ? 'select-class' : ''"
+                                :class="[
+                                    'seat-item-class',
+                                    item1.key == 'my_column'?'seat-item-class-column':
+                                    item.occupyStatus==0?item.occupyOrderId?'order-occupy-status':item.occupyStatus==0&&item.isSelect?'occupy-status-select occupy-status':'occupy-status': item.occupyStatus==1?'occupy-status-no':item.isDisabled || item.status != 1 ? 'disabled-class' : item.isSelect ? 'select-class' : ''
+                                ]" 
                                 v-for="(item, index) in seatMapList[item1.key]" 
                                 v-for="(item, index) in seatMapList[item1.key]" 
-                                :style="{backgroundColor: item.color ? item.color : 'none'}"
+                                :style="{backgroundColor: item.color && !(item.isDisabled || item.status != 1) ? item.color : 'none'}"
                                 @click.stop="seatClick(item)" 
                                 @click.stop="seatClick(item)" 
                                 :dragSelectId="item.id"
                                 :dragSelectId="item.id"
                                 :index="item1.key +'_'+ index"
                                 :index="item1.key +'_'+ index"
                                 :key="index">
                                 :key="index">
                                     <p 
                                     <p 
+                                    v-if="item1.key != 'my_column'"
                                     class="text-class"
                                     class="text-class"
                                     >{{ item.status != 1 ? '不可售':(item.name ? item.name : '暂未命名') }}</p>
                                     >{{ item.status != 1 ? '不可售':(item.name ? item.name : '暂未命名') }}</p>
+                                    <p v-else>{{ (index+1) + '号' }}</p>
                                 </div>
                                 </div>
                             </div>
                             </div>
                     </div>
                     </div>
@@ -208,7 +215,7 @@
  import { pageList as getSeatType } from '@/api/seatTypeMr/seatTypeMr'
  import { pageList as getSeatType } from '@/api/seatTypeMr/seatTypeMr'
  import selectListMixin from "./mixins/selectList"
  import selectListMixin from "./mixins/selectList"
  export default {
  export default {
-    name: "OfficesaleticketingSales1",
+    name: "TicketingSales1",
     components: {
     components: {
         increaseViewers
         increaseViewers
     },
     },
@@ -461,6 +468,21 @@
                 })
                 })
                 
                 
                 console.log("list====",listCopy)
                 console.log("list====",listCopy)
+                
+                let columnList = []
+                listCopy[seatMapListKey[0].key].forEach((item,index)=>{
+                    columnList.push({
+                        ...item,
+                        occupyStatus: 2,
+                        isDisabled: true,
+                        status: 0
+                    })
+                })
+                this.seatMapListKey.unshift({
+                    key: "my_column",
+                    sort: -99
+                })
+                listCopy['my_column'] = columnList
                 this.seatMapList = JSON.parse(JSON.stringify(listCopy))
                 this.seatMapList = JSON.parse(JSON.stringify(listCopy))
             }
             }
         },
         },
@@ -914,10 +936,14 @@
       transform: scale(var(--scaleNum));
       transform: scale(var(--scaleNum));
       box-sizing: border-box;
       box-sizing: border-box;
       .disabled-class{
       .disabled-class{
-        background-color: #aaabad;
+        background-color: #ffffff;
+        border: none !important;
         user-select: none;
         user-select: none;
         // pointer-events: none;
         // pointer-events: none;
         cursor: not-allowed !important;
         cursor: not-allowed !important;
+        .text-class {
+            color: #fff !important;
+        }
       }
       }
       .select-class{
       .select-class{
         //background-color: #e85353 !important;
         //background-color: #e85353 !important;
@@ -1029,6 +1055,26 @@
         }
         }
       }
       }
     }
     }
+
+    .seat-box-class-row {
+        display: flex !important;
+        align-items: center;
+        user-select: none;
+        cursor: not-allowed !important;
+        border: none !important;
+        font-weight: 600;
+        font-size: 24px;
+    }
+    .seat-item-class-column {
+        display: flex !important;
+        align-items: center;
+        justify-content: center;
+        user-select: none;
+        cursor: not-allowed !important;
+        border: none !important;
+        font-weight: 600;
+        font-size: 24px;
+    }
   }
   }
 
 
   #moveSelected{
   #moveSelected{

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 2012 - 0
src/views/venue/performanceHallMr/model/seatManagementTable copy 3.vue


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1043 - 0
src/views/windowTicketSales/ticketingSales copy.vue


+ 50 - 4
src/views/windowTicketSales/ticketingSales.vue

@@ -121,18 +121,25 @@
                             v-for="(item1, index1) in seatMapListKey" 
                             v-for="(item1, index1) in seatMapListKey" 
                             :key="item1.key"
                             :key="item1.key"
                             >
                             >
+                                <div class="seat-item-class seat-box-class-row" style="">{{ index1 != 0 ?((index1) + '排') :'' }}</div>
+                                
                                 <div 
                                 <div 
-                                class="seat-item-class" 
-                                :class="item.occupyStatus==0?item.occupyOrderId?'order-occupy-status':item.occupyStatus==0&&item.isSelect?'occupy-status-select occupy-status':'occupy-status': item.occupyStatus==1?'occupy-status-no':item.isDisabled || item.status != 1 ? 'disabled-class' : item.isSelect ? 'select-class' : ''"
+                                :class="[
+                                    'seat-item-class',
+                                    item1.key == 'my_column'?'seat-item-class-column':
+                                    item.occupyStatus==0?item.occupyOrderId?'order-occupy-status':item.occupyStatus==0&&item.isSelect?'occupy-status-select occupy-status':'occupy-status': item.occupyStatus==1?'occupy-status-no':item.isDisabled || item.status != 1 ? 'disabled-class' : item.isSelect ? 'select-class' : ''
+                                ]" 
                                 v-for="(item, index) in seatMapList[item1.key]" 
                                 v-for="(item, index) in seatMapList[item1.key]" 
-                                :style="{backgroundColor: item.color ? item.color : 'none'}"
+                                :style="{backgroundColor: item.color && !(item.isDisabled || item.status != 1) ? item.color : 'none'}"
                                 @click.stop="seatClick(item)" 
                                 @click.stop="seatClick(item)" 
                                 :dragSelectId="item.id"
                                 :dragSelectId="item.id"
                                 :index="item1.key +'_'+ index"
                                 :index="item1.key +'_'+ index"
                                 :key="index">
                                 :key="index">
                                     <p 
                                     <p 
+                                    v-if="item1.key != 'my_column'"
                                     class="text-class"
                                     class="text-class"
                                     >{{ item.status != 1 ? '不可售':(item.name ? item.name : '暂未命名') }}</p>
                                     >{{ item.status != 1 ? '不可售':(item.name ? item.name : '暂未命名') }}</p>
+                                    <p v-else>{{ (index+1) + '号' }}</p>
                                 </div>
                                 </div>
                             </div>
                             </div>
                     </div>
                     </div>
@@ -462,6 +469,21 @@
                 })
                 })
                 
                 
                 console.log("list====",listCopy)
                 console.log("list====",listCopy)
+                
+                let columnList = []
+                listCopy[seatMapListKey[0].key].forEach((item,index)=>{
+                    columnList.push({
+                        ...item,
+                        occupyStatus: 2,
+                        isDisabled: true,
+                        status: 0
+                    })
+                })
+                this.seatMapListKey.unshift({
+                    key: "my_column",
+                    sort: -99
+                })
+                listCopy['my_column'] = columnList
                 this.seatMapList = JSON.parse(JSON.stringify(listCopy))
                 this.seatMapList = JSON.parse(JSON.stringify(listCopy))
             }
             }
         },
         },
@@ -915,10 +937,14 @@
       transform: scale(var(--scaleNum));
       transform: scale(var(--scaleNum));
       box-sizing: border-box;
       box-sizing: border-box;
       .disabled-class{
       .disabled-class{
-        background-color: #aaabad;
+        background-color: #ffffff;
+        border: none !important;
         user-select: none;
         user-select: none;
         // pointer-events: none;
         // pointer-events: none;
         cursor: not-allowed !important;
         cursor: not-allowed !important;
+        .text-class {
+            color: #fff !important;
+        }
       }
       }
       .select-class{
       .select-class{
         //background-color: #e85353 !important;
         //background-color: #e85353 !important;
@@ -1030,6 +1056,26 @@
         }
         }
       }
       }
     }
     }
+
+    .seat-box-class-row {
+        display: flex !important;
+        align-items: center;
+        user-select: none;
+        cursor: not-allowed !important;
+        border: none !important;
+        font-weight: 600;
+        font-size: 24px;
+    }
+    .seat-item-class-column {
+        display: flex !important;
+        align-items: center;
+        justify-content: center;
+        user-select: none;
+        cursor: not-allowed !important;
+        border: none !important;
+        font-weight: 600;
+        font-size: 24px;
+    }
   }
   }
 
 
   #moveSelected{
   #moveSelected{

+ 1 - 1
vue.config.js

@@ -37,7 +37,7 @@ module.exports = {
     proxy: {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://greatadmin.dev.gztjy.top/scenicstage-api`,
+        target: `http://greatadmin.dev.dazesoft.cn/scenicstage-api`,
         changeOrigin: true,
         changeOrigin: true,
         pathRewrite: {
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
           ['^' + process.env.VUE_APP_BASE_API]: ''