分销记录和场次统计

src/api/distribution/recordMr.js

@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+// 分页查询
+export const pageList = (query) => {
+  return request({
+    url: '/order/orderInfo/marketPersonOrderList',
+    method: 'get',
+    params: query
+  })
+}
+

src/api/statistics.js

@@ -0,0 +1,21 @@
+import request from '@/utils/request'
+
+// 场次统计分页查询
+export const performTimeCount = (query) => {
+  return request({
+    url: '/merchant/merchantPerformTime/performTimeCount',
+    method: 'get',
+    params: query
+  })
+}
+
+//  场次统计导出
+export function downTimeCountListXls(params) {
+  return request({
+    url: '/merchant/merchantPerformTime/performTimeCountExport',
+    method: 'get',
+    responseType: 'blob',
+    params
+  });
+}
+

src/views/distribution/personnelMr/dialog/addAndEdit.vue

@@ -116,7 +116,7 @@ export default {
         name: [{ required: true, message: "请输入分销商名称", trigger: "blur" }],
         type: [{ required: true, message: "请选择分销商类型", trigger: "blur" }],
         contact: [{ required: true, message: "请输入负责人", trigger: "blur" }],
-        mobile: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
+        mobile: [{ required: true, message: "请输入账号/联系电话", trigger: "blur" }],
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",

src/views/distribution/personnelMr/index.vue

@@ -75,6 +75,7 @@
       </el-table-column>
       <el-table-column label="负责人" align="center" prop="contact" />
       <el-table-column label="账号/联系电话" align="center" prop="mobile" />
+      <el-table-column label="被扫次数" align="center" prop="scanCounts" />
       <el-table-column label="佣金总额" align="center" prop="brokerageTotal">
         <template slot-scope="scope">
           <span v-if="scope.row.brokerageTotal">￥{{ scope.row.brokerageTotal }}</span>

src/views/distribution/recordMr/dialog/details.vue

@@ -0,0 +1,220 @@
+<!--
+ * @Description: 详情弹框
+ * @Author: Sugar.
+ * @Date: 2023-11-24 13:55:00
+ * @LastEditors: Sugar.
+ * @LastEditTime: 2023-11-24 13:55:00
+ * @FilePath: \cattle_webui\src\views\performMr\dialog\AddOrEditDialog.vue
+ * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
+-->
+<template>
+  <el-dialog
+    title="订单详情"
+    :visible.sync="open"
+    width="800px"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="dialog" v-if="form">
+      <!--   基础信息   -->
+      <div class="title-class" style="margin-top: 0">基础信息</div>
+      <el-row>
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class">票务名称: <span>{{ form.goodsName || ''}}</span></div>
+        </el-col>
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class">订单号: <span>{{ form.id || '' }}</span></div>
+        </el-col>
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class">购票人姓名: <span>{{ form.memberName || '' }}</span></div>
+        </el-col>
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class">购票人手机号: <span>{{ form.memberMobile || '' }}</span></div>
+        </el-col>
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class">购票人身份证号: <span>{{ form.memberCardId || '' }}</span></div>
+        </el-col>
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class">剧名名称: <span>{{ form.performName || '' }}</span></div>
+        </el-col>
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class">票务类型: <span>{{ form.seatTypeName || '' }}</span></div>
+        </el-col>
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class">场次: <span>{{form.performDate}}   {{ form.performTimeStart }} -- {{ form.performTimeEnd }}</span></div>
+        </el-col>
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class">购票渠道: <span>{{ sourceList[form.source] || '' }}</span></div>
+        </el-col>
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class">购票数量: <span>{{ form.viewerNum || '' }}</span></div>
+        </el-col>
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class">支付总额: <span>￥{{ form.orderPrice || '' }}</span></div>
+        </el-col>
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class">下单时间: <span>{{ form.createTime || '' }}</span></div>
+        </el-col>
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class">优惠信息: <span>暂无</span></div>
+        </el-col>
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class">支付时间: <span>{{ form.payTime || '' }}</span></div>
+        </el-col>
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class">支付方式: <span>{{ payWayList[form.payWay] || '' }}</span></div>
+        </el-col>
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class">订单状态: <span>{{ statusList[form.status] || '' }}</span></div>
+        </el-col>
+      </el-row>
+
+
+      <!--   观影人员信息   -->
+      <div class="title-class">观影人员信息</div>
+      <el-row>
+        <el-col :span="24">
+          <el-table ref="tables" :data="form.viewersList" 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="idcard" />
+            <el-table-column label="核销状态" align="center">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.qrcodeStatus == 0">未使用</el-tag>
+                <el-tag v-if="scope.row.qrcodeStatus == 1" type="success">已使用</el-tag>
+                <el-tag v-if="scope.row.qrcodeStatus == 2" type="info">过期</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="核销时间" align="center" prop="qrcodeUseTime" />
+            <el-table-column label="座位信息" align="center" prop="seatName" />
+          </el-table>
+        </el-col>
+      </el-row>
+    </div>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="cancel">确定</el-button>
+    </span>
+
+  </el-dialog>
+</template>
+
+<script>
+import { getSelectById } from '@/api/order/orderMr'
+export default {
+  name: "detailsDia",
+  data() {
+    return {
+      title: "编辑",
+      model: "EDIT",
+      open: false,
+      loading: false,
+      form: {
+        id: undefined,
+      },
+      performerVisible: false,
+      performerList: [],
+      refund: false,
+      statusList: {
+        0: '待支付',
+        2: '超时取消',
+        3: '待使用',
+        4: '退款中',
+        5: '己退款',
+        6: '退款失败',
+        7: '己使用',
+        8: '己超期',
+        9: '关闭',
+      },
+      payList: {
+        0: '未支付',
+        1: '已支付',
+        2: '支付中',
+        3: '支付失败',
+        4: '支付退款',
+      },
+      payWayList: {
+        'cahsh': '现金',
+        'wecaht.applet': '微信小程序支付',
+        'alipay': '支付宝',
+        'wecaht.h5': '微信公众号支付',
+        'meituan': '美团支付',
+      },
+      sourceList: {
+        1: '小程序',
+        2: '公众号',
+        3: '美团',
+        4: '携程',
+        5: '团购',
+      },
+      dataList: []
+    };
+  },
+  methods: {
+    /**
+     * 打开弹框
+     * @date 2023-11-22
+     * @param {any} obj
+     * @returns {any}
+     */
+    openDialog(title, obj, type) {
+      this.open = true;
+      this.getSelectByIdApi(obj);
+    },
+    /** 获取详情 */
+    getSelectByIdApi(row) {
+      const id = row.orderId
+      getSelectById(id).then(response => {
+        this.form = response.data;
+      });
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.open = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.dialog {
+  padding: 0 30px;
+  max-height: 65vh;
+  overflow-y: auto;
+}
+.dialog {
+  padding: 0 30px;
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+  .title-class{
+    font-size: 16px;
+    font-weight: bold;
+    color: black;
+    margin-bottom: 20px;
+    margin-top: 20px;
+  }
+  .item-class{
+    margin-bottom: 20px;
+  }
+}
+</style>

src/views/distribution/recordMr/index.vue

@@ -0,0 +1,184 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="分销商名称">
+        <el-input
+          v-model="queryParams.personName"
+          placeholder="分销商名称"
+          clearable
+          style="width: 240px;"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分销商类型">
+        <el-select
+          v-model="queryParams.personType"
+          placeholder="分销商类型"
+          clearable
+          style="width: 140px"
+        >
+          <el-option
+            v-for="dict in dict.type.distribution_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="订单号">
+        <el-input
+          v-model="queryParams.orderId"
+          placeholder="订单号"
+          clearable
+          style="width: 200px;"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="购买人手机号" label-width="100px">
+        <el-input
+          v-model="queryParams.memberMobile"
+          placeholder="购买人手机号"
+          clearable
+          style="width: 180px;"
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table ref="tables" v-loading="loading" :data="dataList" border>
+      <el-table-column label="序号" align="center" type="index" width="60"></el-table-column>
+      <el-table-column label="分销商名称" align="center" prop="personName" />
+      <el-table-column label="分销商类型" align="center" prop="personType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.distribution_type" :value="scope.row.personType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="订单号" align="center">
+        <template slot-scope="scope">
+          <el-button type="text" @click="openDetails(scope.row)">{{ scope.row.orderId }}</el-button>
+        </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">
+        <template slot-scope="scope">
+          <span v-if="scope.row.brokeragePrice">￥{{ scope.row.brokeragePrice }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="已核销(张)" align="center" prop="usedNum" />
+      <el-table-column label="获得佣金(元)" align="center" prop="brokeragePriceTotal">
+        <template slot-scope="scope">
+          <span v-if="scope.row.brokeragePriceTotal">￥{{ scope.row.brokeragePriceTotal }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="获得时间" align="center" prop="createTime" width="160" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 详情 -->
+    <details-dia ref="detailsDia" @getList="getList"></details-dia>
+
+  </div>
+</template>
+
+<script>
+
+import { pageList } from '@/api/distribution/recordMr'
+import detailsDia from "./dialog/details.vue";
+
+export default {
+  name: "agreement",
+  dicts: ['agreement_type', 'distribution_type'],
+  components: { detailsDia },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      dataList: null,
+      // 弹出层标题
+      title: "",
+
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      visibleStatus: false,
+      newObj: {},
+      visibleType: ''
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      pageList(this.addDateRange(this.queryParams, this.dateRange))
+      .then(response => {
+          this.dataList = response.data.rows;
+          this.total = response.data.total;
+          this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.$set(this.queryParams, 'orderId', '');
+      this.$set(this.queryParams, 'personName', '');
+      this.$set(this.queryParams, 'memberMobile', '');
+      this.$set(this.queryParams, 'personType', '');
+      this.queryParams.pageNum = 1;
+      this.handleQuery();
+    },
+    /** 详情按钮操作 */
+    openDetails(row, type) {
+      this.$refs["detailsDia"].openDialog("详情", row, type);
+    },
+  }
+};
+</script>

src/views/order/orderMr/index.vue

@@ -68,31 +68,6 @@
           end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
-<!--      <el-form-item label="场次时间">-->
-<!--        <el-date-picker-->
-<!--          v-model="queryParams.time"-->
-<!--          type="daterange"-->
-<!--          value-format="yyyy-MM-dd"-->
-<!--          range-separator="至"-->
-<!--          start-placeholder="开始日期"-->
-<!--          end-placeholder="结束日期">-->
-<!--        </el-date-picker>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="预约场次">-->
-<!--        <el-select-->
-<!--          v-model="queryParams.source"-->
-<!--          placeholder="预约场次"-->
-<!--          clearable-->
-<!--          style="width: 100%"-->
-<!--        >-->
-<!--          <el-option-->
-<!--            v-for="dict in sourceMapList"-->
-<!--            :key="dict.value"-->
-<!--            :label="dict.name"-->
-<!--            :value="dict.value"-->
-<!--          />-->
-<!--        </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>

src/views/otaMr/dialog/addAndEdit.vue

@@ -21,11 +21,30 @@
         <el-table-column type="selection" width="50" align="center" />
         <el-table-column label="序号" align="center" type="index" width="50"></el-table-column>
         <el-table-column label="票务名称" align="center" prop="goodsName" />
+<!--        <el-table-column label="座位类型" align="center" prop="goodsName" />-->
+<!--        <el-table-column label="市场价" align="center" prop="salePrice" width="160">-->
+<!--          <template slot-scope="scope">-->
+<!--            <span>￥{{ scope.row.salePrice }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column label="销售价" align="center" prop="salePrice" width="160">
           <template slot-scope="scope">
             <span>￥{{ scope.row.salePrice }}</span>
           </template>
         </el-table-column>
+<!--        <el-table-column label="结算价" align="center" prop="salePrice" width="160">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-input-->
+<!--              type="number"-->
+<!--              v-model="scope.row.salePrice"-->
+<!--              placeholder=""-->
+<!--              clearable-->
+<!--              @change="changePriceAmount('salePrice')"-->
+<!--              style="width: 260px;"-->
+<!--            >-->
+<!--            </el-input>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
       </el-table>
       <pagination
         v-show="total>0"
@@ -97,6 +116,14 @@ export default {
       this.title = "票务信息";
       this.getList(obj);
     },
+    /** 价格输入事件 */
+    changePriceAmount(row) {
+      if(row.salePrice * 1 < 0){
+        this.$message.error("输入需大于或等于0!");
+        row.salePrice = '';
+        return false
+      }
+    },
     /** 查询列表 */
     getList(obj) {
       this.tabLoading = true;

src/views/otaMr/index.vue

@@ -35,11 +35,22 @@
     <el-table ref="tables" v-loading="loading" :data="dataList" border>
       <el-table-column label="序号" align="center" type="index" width="50"></el-table-column>
       <el-table-column label="商品名称" align="center" prop="goodsName" />
+<!--      <el-table-column label="类型" align="center" prop="goodsName" />-->
+<!--      <el-table-column label="市场价" align="center" prop="otaPrice">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>￥{{ scope.row.otaPrice }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="销售价格" align="center" prop="otaPrice">
         <template slot-scope="scope">
           <span>￥{{ scope.row.otaPrice }}</span>
         </template>
       </el-table-column>
+<!--      <el-table-column label="结算价" align="center" prop="otaPrice">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>￥{{ scope.row.otaPrice }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

src/views/statisticalReport/session.vue

@@ -0,0 +1,269 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="票务管理:">
+        <el-select
+          v-model="queryParams.goodsId"
+          placeholder="票务管理"
+          clearable
+          @change="goodsChangeEven"
+          style="width: 100%;"
+        >
+          <el-option
+            v-for="dict in ticketList"
+            :key="dict.id"
+            :label="dict.goodsName"
+            :value="dict.goodsId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="座位类型:">
+        <el-select
+          v-model="queryParams.seatTypeId"
+          placeholder="座位类型"
+          clearable
+          style="width: 100%;"
+        >
+          <el-option
+            v-for="dict in seatList"
+            :key="dict.seatTypeId"
+            :label="dict.seatTypeName"
+            :value="dict.seatTypeId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="场次日期">
+        <el-date-picker
+          v-model="queryParams.time"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </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>
+      </el-form-item>
+    </el-form>
+    <el-row :gutter="10" class="mb8"  style="margin-left: 0; margin-top: 10px">
+      <el-button
+        type="primary"
+        size="mini"
+        icon="el-icon-download"
+        :disabled="tableData.length === 0"
+        v-hasPermi="['flowingWaterMr:flowingWaterMr:downloadExcel']"
+        @click="handleExport"
+        v-loading.fullscreen.lock="handleExportLoading"
+        element-loading-text="正在拼命生成数据中..."
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.5)"
+      >导出excel</el-button>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table ref="tables" v-loading="loading" :data="dataList" border>
+      <el-table-column label="序号" align="center" type="index" width="60"></el-table-column>
+      <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">
+        <template slot-scope="scope">
+          <span>{{ scope.row.performDate }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="场次" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.performTimeStart }} -- {{ scope.row.performTimeEnd }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="总库存" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.total }}张</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="已售数量" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.saleTotal }}张</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="已核销数量" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.usedTotal }}张</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="库存数量" align="center">
+        <template slot-scope="scope">
+          <span>{{ (scope.row.total - scope.row.saleTotal) >= 0 ? (scope.row.total - scope.row.saleTotal) : '' }}张</span>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+  </div>
+</template>
+
+<script>
+
+import { performTimeCount, downTimeCountListXls } from '@/api/statistics'
+import { exportExcel } from '@/utils/exportexcel'
+import { seatPricePageList } from '@/api/distribution/ticketMr'
+export default {
+  name: "agreement",
+  dicts: ['agreement_type'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      dataList: null,
+      // 弹出层标题
+      title: "",
+
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      visibleStatus: false,
+      newObj: {},
+      visibleType: '',
+      handleExportLoading: false,
+      tableData: {},
+      ticketList: [],
+      seatList: [],
+    };
+  },
+  created() {
+    this.getList();
+    this.ticketListApi();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      if(this.queryParams.time){
+        this.queryParams.performStartDate = this.queryParams.time[0];
+        this.queryParams.performEndDate = this.queryParams.time[1];
+      }
+      performTimeCount(this.addDateRange(this.queryParams, this.dateRange))
+      .then(response => {
+          this.dataList = response.data.rows;
+          this.total = response.data.total;
+          this.loading = false;
+        }
+      );
+    },
+    /** 票务列表查询 */
+    ticketListApi() {
+      this.ticketList = []
+      seatPricePageList(this.addDateRange({pageNum: 1, pageSize: 100}))
+        .then(response => {
+          let ticketItemList = []
+          response.data.rows.forEach(item => {
+            if(ticketItemList.indexOf(item.goodsId) == -1){
+              this.ticketList.push(item);
+              ticketItemList.push(item.goodsId);
+            }
+          })
+        });
+    },
+    /** 座位类型列表 */
+    getSeatTypeList(obj) {
+      seatPricePageList(this.addDateRange({pageNum: 1, pageSize: 100, goodsId: obj.goodsId}))
+        .then(response => {
+          let ticketList = []
+          response.data.rows.forEach(item => {
+            if(ticketList.indexOf(item.seatTypeId) == -1){
+              this.seatList.push(item);
+              ticketList.push(item.seatTypeId);
+            }
+          })
+        });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+    },
+    // 票务改变事件
+    goodsChangeEven() {
+      this.seatList = [];
+      this.$set(this.queryParams, 'seatTypeId', '');
+      let selectMap = {goodsId: this.queryParams.goodsId}
+      this.getSeatTypeList(selectMap);
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.seatList = [];
+      this.$set(this.queryParams, 'time', '');
+      this.$set(this.queryParams, 'performStartDate', '');
+      this.$set(this.queryParams, 'performEndDate', '');
+      this.$set(this.queryParams, 'goodsId', '');
+      this.$set(this.queryParams, 'seatTypeId', '');
+      this.queryParams.pageNum = 1;
+      this.handleQuery();
+    },
+    /**
+     * 导出报表
+     * @date 2022-10-24
+     * @returns {any}
+     */
+    handleExport() {
+      this.$confirm('您确定要导出当前查询的数据吗？', '提示', {
+        confirmButtonText: '确定 ',
+        cancelButtonText: '取消 ',
+        type: 'warning'
+      })
+        .then(() => {
+          this.handleExportLoading = true;
+          // const { pageNum, pageSize} = this.params;
+          let postMap = {}
+          for (let key in this.queryParams) {
+            if(key != 'pageNum' && key != 'pageSize'){
+              postMap[key] = this.queryParams[key]
+            }
+          }
+          downTimeCountListXls(postMap)
+            .then((res) => {
+              exportExcel(res, '场次统计', '.xlsx');
+              this.handleExportLoading = false;
+            })
+            .catch(() => {
+              this.handleExportLoading = false;
+            });
+        })
+        .catch(() => {
+          this.$message.info('您已取消导出！');
+        });
+    },
+  }
+};
+</script>

src/views/statistics/index.vue

@@ -0,0 +1,119 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="报表名称">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="报表名称"
+          clearable
+          style="width: 160px;"
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <div class="box-class clearfix">
+      <div class="item-class clearfix" @click="pageLink(item.url)" v-for="item in itemList" :key="item.id">
+        <div class="span-img-class"></div>
+        <div class="span-text-class">{{ item.name }}</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import { pageList } from '@/api/userMr/userMr'
+
+export default {
+  name: "agreement",
+  dicts: ['agreement_type'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type: undefined
+      },
+      itemList: [
+        {id: 1, name: '总览统计', url: ''},
+        {id: 2, name: '渠道统计', url: ''},
+        {id: 3, name: '场次统计', url: 'statisticalReport/session'},
+      ]
+    };
+  },
+  created() {
+    // this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      pageList(this.addDateRange(this.queryParams, this.dateRange))
+      .then(response => {
+          this.dataList = response.data.rows;
+          this.total = response.data.total;
+          this.loading = false;
+        }
+      );
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.$set(this.queryParams, 'name', '');
+      this.handleQuery();
+    },
+    pageLink(url) {
+      if(url){
+        this.$router.push(url);
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+   .box-class{
+     padding: 60px 20px;
+     .item-class:hover{
+       box-shadow: 0 2px 4px rgba(93, 37, 37, 0.12), 0 0 6px rgba(0, 0, 0, .04);
+     }
+     .item-class{
+       box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+       padding: 20px 40px;
+       border-radius: 6px;
+       float: left;
+       cursor: pointer;
+       margin-right: 60px;
+
+       .span-img-class{
+         background: url("../../assets/images/statistics-icon.png") no-repeat;
+         display: inline-block;
+         width: 40px;
+         height: 40px;
+         float: left;
+         background-size: 100% 100%;
+       }
+       .span-text-class{
+         display: inline-block;
+         height: 40px;
+         float: left;
+         margin-left: 20px;
+         line-height: 40px;
+       }
+     }
+   }
+</style>

src/views/team/applicationMr/dialog/orderDetails.vue

@@ -45,7 +45,7 @@
           <div class="grid-content bg-purple item-class">团购单价: <span v-if="form.price">￥{{ form.price || '' }}/人</span></div>
         </el-col>
         <el-col :span="12">
-          <div class="grid-content bg-purple item-class">预约时间: <span>{{ form.performDate || '' }}日 {{ form.performTimeStart || '' }} {{ form.performTimeEnd || '' }}</span></div>
+          <div class="grid-content bg-purple item-class">预约时间: <span>{{ form.performDate || '' }} {{ form.performTimeStart || '' }}--{{ form.performTimeEnd || '' }}</span></div>
         </el-col>
         <el-col :span="12">
           <div class="grid-content bg-purple item-class">报名时间: <span>{{ form.createTime || '' }}</span></div>

src/views/team/teamMr/dialog/addAndEdit.vue

@@ -49,10 +49,10 @@
             style="width: 100%;"
           />
         </el-form-item>
-        <el-form-item label="联系电话:" prop="mobile">
+        <el-form-item label="账号/联系电话:" prop="mobile">
           <el-input
             v-model="form.mobile"
-            placeholder="联系电话"
+            placeholder="账号/联系电话"
             clearable
             style="width: 100%;"
           />
@@ -61,6 +61,7 @@
           <el-input
             show-password
             v-model="form.password"
+            autocomplete="new-password"
             placeholder="密码"
             clearable
             style="width: 100%;"
@@ -131,7 +132,7 @@ export default {
         name: [{ required: true, message: "请输入团队名称", trigger: "blur" }],
         type: [{ required: true, message: "请选择团队类型", trigger: "blur" }],
         contact: [{ required: true, message: "请输入负责人", trigger: "blur" }],
-        mobile: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
+        mobile: [{ required: true, message: "请输入账号/联系电话", trigger: "blur" }],
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",