1. 优化显示问题

src/views/distribution/recordMr/index.vue

@@ -43,6 +43,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="场次时间">
+        <el-date-picker style="width: 230px;" v-model="queryParams.performDate" @change="pagePerformTimeListFun"
+          type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="场次">
+        <el-select v-model="queryParams.performTimeId" placeholder="场次" clearable style="width: 100%">
+          <el-option v-for="dict in pagePerformTimeList" :key="dict.id" :label="dict.timeSnapshot+'('+dict.performTimeStart+'-'+dict.performTimeEnd+')'" :value="dict.id" />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -78,6 +88,12 @@
           <el-button type="text" @click="openDetails(scope.row)">{{ scope.row.orderId }}</el-button>
         </template>
       </el-table-column>
+      <el-table-column label="场次时间" align="center" prop="performDate" />
+      <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="memberMobile" />
       <el-table-column label="购买数量(张)" align="center" prop="retailNum" />
       <el-table-column label="佣金单价(元)" align="center" prop="brokeragePrice">
@@ -117,6 +133,7 @@
 import { pageList , downTimeCountListXls } from '@/api/distribution/recordMr'
 import detailsDia from "./dialog/details.vue";
 import { exportExcel } from '@/utils/exportexcel'
+import { pagePerformTimeList } from "@/api/schedulingMr/schedulingMr"
 export default {
   name: "agreement",
   dicts: ['agreement_type', 'distribution_type'],
@@ -153,6 +170,7 @@ export default {
       newObj: {},
       visibleType: '',
       handleExportLoading: false,
+      pagePerformTimeList: [], // 场次列表
     };
   },
   created() {
@@ -225,6 +243,24 @@ export default {
           this.$message.info('您已取消导出！');
         });
     },
+    async pagePerformTimeListFun(value) {
+      try {
+        this.pagePerformTimeList = []
+        this.$set(this.queryParams, 'performTimeId', null)
+        if (!value) {
+
+          return
+        }
+        let { data, code } = await pagePerformTimeList({
+          performDate: value,
+          pageNum: 1,
+          pageSize: 999
+        })
+        this.pagePerformTimeList = [].concat(data.rows)
+      } catch (error) {
+
+      }
+    },
   }
 };
 </script>

src/views/officesale/ticketingSales.vue

@@ -23,10 +23,10 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="演出时间" prop="performDate">
+        <el-form-item label="场次时间" prop="performDate">
             <el-date-picker 
             type="date" 
-            placeholder="选择演出时间" 
+            placeholder="选择场次时间" 
             v-model="queryParams.performDate"
             @change="changeTime($event,'performDate')"
             value-format="yyyy-MM-dd"
@@ -259,6 +259,10 @@
                 })
                 if(res.code == 200){
                     this.merchantTheatreAuditoriumListS = res.data.rows
+                    if(this.merchantTheatreAuditoriumListS.length>0){
+                        this.$set(this.queryParams,'auditoriumId',this.merchantTheatreAuditoriumListS[0].id)
+                        this.changeTime(this.queryParams.auditoriumId,'auditoriumId')
+                    }
                 }
             } catch (error) {
                 
@@ -404,7 +408,7 @@
             })
             return flog
         },
-        /**  选择演出时间  */
+        /**  选择场次时间  */
         changeTime(value,type){
             console.log("fsdfsdf----",value,type)
             if(type == 'timeId') {
@@ -442,7 +446,7 @@
             this.changeTimeCheck(value,type)
 
         },
-        /**  选择演出时间  */
+        /**  选择场次时间  */
         changeTimeCheck(value,type){
             console.log("fsdfsdf")
             if(this.queryParams && this.queryParams.timeId && type != 'timeId' && type != 'goodsId') {

src/views/order/groupBuyingMr/index.vue

@@ -79,7 +79,7 @@
           <el-option
             v-for="dict in pagePerformTimeList"
             :key="dict.id"
-            :label="dict.timeSnapshot"
+            :label="dict.timeSnapshot+'('+dict.performTimeStart+'-'+dict.performTimeEnd+')'"
             :value="dict.id"
           />
         </el-select>

src/views/order/orderMr/index.vue

@@ -130,7 +130,7 @@
           <el-option
             v-for="dict in pagePerformTimeList"
             :key="dict.id"
-            :label="dict.timeSnapshot"
+            :label="dict.timeSnapshot+'('+dict.performTimeStart+'-'+dict.performTimeEnd+')'"
             :value="dict.id"
           />
         </el-select>

src/views/order/viewers/index.vue

@@ -35,14 +35,18 @@
           end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="演出时间">
+      <el-form-item label="场次时间">
         <el-date-picker style="width: 230px;" v-model="queryParams.performDate" @change="pagePerformTimeListFun"
           type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="场次">
         <el-select v-model="queryParams.performTimeId" placeholder="场次" clearable style="width: 100%">
-          <el-option v-for="dict in pagePerformTimeList" :key="dict.id" :label="dict.timeSnapshot" :value="dict.id" />
+          <el-option 
+          v-for="dict in pagePerformTimeList" 
+          :key="dict.id" 
+          :label="dict.timeSnapshot+'('+dict.performTimeStart+'-'+dict.performTimeEnd+')'" 
+          :value="dict.id" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -79,7 +83,7 @@
           <dict-tag :options="dict.type.order_form_type" :value="scope.row.source" />
         </template>
       </el-table-column>
-      <el-table-column label="演出日期" align="center" prop="performDate" />
+      <el-table-column label="场次时间" align="center" prop="performDate" />
       <el-table-column label="场次" width="120" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.performTimeStart + '-' + scope.row.performTimeEnd }}</span>
@@ -284,6 +288,7 @@ import { pageList as getSeatTypeList } from '@/api/seatTypeMr/seatTypeMr'
 const https = require('https');
 const axios = require('axios');
 const mathM = require('mathjs')
+import moment from "moment"
 export default {
   name: "agreement",
   dicts: ['order_form_type', 'order_status_type', 'pay_way_type', 'personnel_type'],
@@ -303,7 +308,7 @@ export default {
       // 总条数
       total: 0,
       // 用户表格数据
-      dataList: null,
+      dataList: [],
       // 弹出层标题
       title: "",
 
@@ -363,6 +368,7 @@ export default {
     };
   },
   created() {
+    //this.$set(this.queryParams,'performDate',[moment().format("yyyy-MM-DD"),moment().format("yyyy-MM-DD")])
     this.getSeatTypeListFun()
     this.getList();
   },

src/views/order/writeOffMr/index.vue

@@ -103,7 +103,7 @@
 
 import { pageList } from '@/api/order/writeOffMr'
 import detailsDia from "./dialog/details.vue";
-
+import moment from "moment"
 export default {
   name: "agreement",
   dicts: ['device_sys_type'],
@@ -139,13 +139,21 @@ export default {
     };
   },
   created() {
+    this.$set(this.queryParams,'writeoffTime',[moment().format("yyyy-MM-DD"),moment().format("yyyy-MM-DD")])
     this.getList();
   },
   methods: {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      pageList(this.addDateRange(this.queryParams, this.dateRange))
+      if(this.queryParams.writeoffTime){
+        this.queryParams.createTimeBegin = this.queryParams.writeoffTime[0];
+        this.queryParams.createTimeEnd = this.queryParams.writeoffTime[1];
+      }else{
+        this.queryParams.createTimeBegin = null
+        this.queryParams.createTimeEnd = null
+      }
+      pageList(this.addDateRange(this.queryParams))
       .then(response => {
           this.dataList = response.data.rows;
           this.total = response.data.total;

src/views/windowTicketSales/ticketingSales.vue

@@ -23,10 +23,10 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="演出时间" prop="performDate">
+        <el-form-item label="场次时间" prop="performDate">
             <el-date-picker 
             type="date" 
-            placeholder="选择演出时间" 
+            placeholder="选择场次时间" 
             v-model="queryParams.performDate"
             @change="changeTime($event,'performDate')"
             value-format="yyyy-MM-dd"
@@ -259,6 +259,10 @@
                 })
                 if(res.code == 200){
                     this.merchantTheatreAuditoriumListS = res.data.rows
+                    if(this.merchantTheatreAuditoriumListS.length>0){
+                        this.$set(this.queryParams,'auditoriumId',this.merchantTheatreAuditoriumListS[0].id)
+                        this.changeTime(this.queryParams.auditoriumId,'auditoriumId')
+                    }
                 }
             } catch (error) {
                 
@@ -404,7 +408,7 @@
             })
             return flog
         },
-        /**  选择演出时间  */
+        /**  选择场次时间  */
         changeTime(value,type){
             console.log("fsdfsdf----",value,type)
             if(type == 'timeId') {
@@ -442,7 +446,7 @@
             this.changeTimeCheck(value,type)
 
         },
-        /**  选择演出时间  */
+        /**  选择场次时间  */
         changeTimeCheck(value,type){
             console.log("fsdfsdf")
             if(this.queryParams && this.queryParams.timeId && type != 'timeId' && type != 'goodsId') {