1. 优化

src/views/officesale/ticketingSales.vue

@@ -13,7 +13,7 @@
             placeholder="演出厅"
             clearable
             style="width: 100%"
-            @change="changeTime"
+            @change="changeTime($event)"
           >
             <el-option
               v-for="dict in merchantTheatreAuditoriumListS"
@@ -28,7 +28,7 @@
             type="date" 
             placeholder="选择演出时间" 
             v-model="queryParams.performDate"
-            @change="changeTime"
+            @change="changeTime($event)"
             value-format="yyyy-MM-dd"
             ></el-date-picker>
         </el-form-item>
@@ -38,7 +38,7 @@
             placeholder="场次"
             clearable
             style="width: 100%"
-            @change="changeTime"
+            @change="changeTime($event,true)"
           >
             <el-option
               v-for="dict in merchantPerformTimeListS"
@@ -54,7 +54,7 @@
             placeholder="票务类型"
             clearable
             style="width: 100%"
-            @change="changeTime"
+            @change="changeTime($event,true)"
           >
             <el-option
               v-for="dict in goodsPageListS"
@@ -79,9 +79,9 @@
       </div>
       <div class="seat-box" :style="{'--scaleNum': scaleNum/100}">
         <!-- 选择座位  -->
-        <div class="seat-list-box">
+        <div class="seat-list-box" v-loading="loading">
             <!--  座位排版  -->
-            <div v-loading="loading" id="seatbox-me" @scroll="scroll" ref="seatbox" class="dialog">
+            <div  id="seatbox-me" @scroll="scroll" ref="seatbox" class="dialog">
                 <div class="dialog-box" :style="{width: width + 'px', margin: justifyContent ? 'auto' : 'unset'}">
                     <div 
                     style="width: 100%;position: absolute;"
@@ -152,7 +152,7 @@
         loading: false,
         // 查询参数
         queryParams: {
-            timeId: null,
+            timeId: '',
             performDate: null,
             auditoriumId: null,
             goodsId: null,
@@ -364,11 +364,19 @@
             return flog
         },
         /**  选择演出时间  */
-        changeTime(value){
-            if(this.queryParam && this.queryParam.timeId) {
-                this.$set(this.queryParam,'timeId',null)
+        changeTime(value,type){
+            console.log("fsdfsdf----",value,type)
+            this.changeTimeCheck(value,type)
+        },
+        /**  选择演出时间  */
+        changeTimeCheck(value,type){
+            console.log("fsdfsdf")
+            if(this.queryParams && this.queryParams.timeId && !type) {
+                console.log('sdfsdfsdf',this.queryParams)
+                this.$set(this.queryParams,'timeId','')
             }
             if(this.queryParams.auditoriumId&&this.queryParams.performDate){
+                //  获取场次
                 this.merchantPerformTimeListFun()
             }
             this.performId = ''
@@ -587,7 +595,7 @@
       }
       .select-class{
         //background-color: #e85353 !important;
-        border: 2px solid #1890ff !important;
+        border: 5px solid #1890ff !important;
        // color: #eceaea !important;
        position: relative;
       }

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

@@ -100,7 +100,7 @@
           <el-table ref="tables" :data="form.viewersOrderList" border>
             <el-table-column label="序号" align="center" type="index" width="60"></el-table-column>
             <el-table-column label="姓名" align="center" prop="name" />
-            <el-table-column label="身份证号码" align="center" prop="cardId" />
+            <el-table-column label="身份证号码" align="center" prop="idCard" />
             <el-table-column label="核销状态" align="center">
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.qrcodeStatus == 0">未使用</el-tag>

src/views/order/groupBuyingMr/index.vue

@@ -126,6 +126,7 @@
             v-hasPermi="['groupBuyingMr:groupBuyingMr:details']"
           >对公转账</el-button>
           <el-button
+              v-if="scope.row.status == 3 || scope.row.status == 7"
               size="mini"
               type="text"
               @click="handleOpen([scope.row])"

src/views/order/orderMr/index.vue

@@ -147,7 +147,7 @@
       <el-table-column label="购票人手机号" align="center" prop="memberMobile" />
       <el-table-column label="剧目名称" align="center" prop="performName" />
       <el-table-column label="票务名称" align="center" prop="goodsName" />
-      <el-table-column label="票务类型" align="center" prop="seatTypeName" />
+      <el-table-column label="座位类型" align="center" prop="seatTypeName" />
       <el-table-column label="购票渠道" align="center" prop="source">
         <template slot-scope="scope">
           <!-- <span>{{ sourceList[scope.row.source] }}</span> -->
@@ -155,7 +155,11 @@
         </template>
       </el-table-column>
       <el-table-column label="场次时间" align="center" prop="performDate" />
-      <el-table-column label="场次" align="center" prop="timeSnapshot" />
+      <el-table-column label="场次" width="120" align="center" prop="timeSnapshot">
+        <template slot-scope="scope">
+          <span>{{ scope.row.timeSnapshot }} <br /> ({{ scope.row.performTimeStart + '-' + scope.row.performTimeEnd }})</span>
+        </template>
+      </el-table-column>
       <el-table-column label="下单时间" align="center" prop="createTime" />
       <el-table-column label="购票数量" align="center" prop="quantity" />
       <el-table-column label="支付总额" align="center" prop="orderPrice">
@@ -194,6 +198,7 @@
             v-hasPermi="['orderMr:orderMr:details']"
           >详情</el-button>
           <el-button
+              v-if="scope.row.status == 3 || scope.row.status == 7"
               size="mini"
               type="text"
               @click="handleOpen([scope.row])"

src/views/order/writeOffMr/index.vue

@@ -57,6 +57,7 @@
       <el-table-column label="序号" align="center" type="index" width="60"></el-table-column>
       <el-table-column label="订单号" align="center" prop="orderId" />
       <el-table-column label="用户身份证信息" align="center" prop="idCard" />
+      <el-table-column label="观影人姓名" align="center" prop="idCard1" />
       <el-table-column label="核销剧目" align="center" prop="performName" />
       <el-table-column label="票务名称" align="center" prop="goodsName" />
       <el-table-column label="座位类型" align="center" prop="seatTypeName" />

src/views/team/applicationMr/index.vue

@@ -75,7 +75,7 @@
       </el-table-column>
       <el-table-column label="预约时间" align="center" width="160">
         <template slot-scope="scope">
-          <span>{{ scope.row.performDate }}日 {{ scope.row.performTimeStart }}-{{ scope.row.performTimeEnd }}</span>
+          <span>{{ scope.row.performDate }}日 <br /> {{ scope.row.performTimeStart }}-{{ scope.row.performTimeEnd }}</span>
         </template>
       </el-table-column>
       <el-table-column label="观影人数" align="center" prop="viewerNum" />
@@ -90,6 +90,7 @@
           <el-tag type="info" v-if="scope.row.status == 0">待审核</el-tag>
           <el-tag type="success" v-if="scope.row.status == 1">审核成功</el-tag>
           <el-tag type="danger" v-if="scope.row.status == 2">审核失败</el-tag>
+          <el-tag type="info" v-if="scope.row.status == 3">关闭</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="审核时间" align="center" prop="createTime" width="160">

src/views/windowTicketSales/ticketingSales.vue

@@ -13,7 +13,7 @@
             placeholder="演出厅"
             clearable
             style="width: 100%"
-            @change="changeTime"
+            @change="changeTime($event)"
           >
             <el-option
               v-for="dict in merchantTheatreAuditoriumListS"
@@ -28,7 +28,7 @@
             type="date" 
             placeholder="选择演出时间" 
             v-model="queryParams.performDate"
-            @change="changeTime"
+            @change="changeTime($event)"
             value-format="yyyy-MM-dd"
             ></el-date-picker>
         </el-form-item>
@@ -38,7 +38,7 @@
             placeholder="场次"
             clearable
             style="width: 100%"
-            @change="changeTime"
+            @change="changeTime($event,true)"
           >
             <el-option
               v-for="dict in merchantPerformTimeListS"
@@ -54,7 +54,7 @@
             placeholder="票务类型"
             clearable
             style="width: 100%"
-            @change="changeTime"
+            @change="changeTime($event,true)"
           >
             <el-option
               v-for="dict in goodsPageListS"
@@ -79,9 +79,9 @@
       </div>
       <div class="seat-box" :style="{'--scaleNum': scaleNum/100}">
         <!-- 选择座位  -->
-        <div class="seat-list-box">
+        <div class="seat-list-box" v-loading="loading">
             <!--  座位排版  -->
-            <div v-loading="loading" id="seatbox-me" @scroll="scroll" ref="seatbox" class="dialog">
+            <div  id="seatbox-me" @scroll="scroll" ref="seatbox" class="dialog">
                 <div class="dialog-box" :style="{width: width + 'px', margin: justifyContent ? 'auto' : 'unset'}">
                     <div 
                     style="width: 100%;position: absolute;"
@@ -152,7 +152,7 @@
         loading: false,
         // 查询参数
         queryParams: {
-            timeId: null,
+            timeId: '',
             performDate: null,
             auditoriumId: null,
             goodsId: null,
@@ -364,11 +364,19 @@
             return flog
         },
         /**  选择演出时间  */
-        changeTime(value){
-            if(this.queryParam && this.queryParam.timeId) {
-                this.$set(this.queryParam,'timeId',null)
+        changeTime(value,type){
+            console.log("fsdfsdf----",value,type)
+            this.changeTimeCheck(value,type)
+        },
+        /**  选择演出时间  */
+        changeTimeCheck(value,type){
+            console.log("fsdfsdf")
+            if(this.queryParams && this.queryParams.timeId && !type) {
+                console.log('sdfsdfsdf',this.queryParams)
+                this.$set(this.queryParams,'timeId','')
             }
             if(this.queryParams.auditoriumId&&this.queryParams.performDate){
+                //  获取场次
                 this.merchantPerformTimeListFun()
             }
             this.performId = ''
@@ -587,7 +595,7 @@
       }
       .select-class{
         //background-color: #e85353 !important;
-        border: 2px solid #1890ff !important;
+        border: 5px solid #1890ff !important;
        // color: #eceaea !important;
        position: relative;
       }