1. 新增和调整

src/api/device/gateMr.js

@@ -1,11 +1,26 @@
 import request from '@/utils/request'
 
-//
-export const performTimeCount = (query) => {
+/**    基础表单接口  开始    */
+
+// 表单模板列表
+export const pageList = (query) => {
   return request({
-    url: '/merchant/merchantPerformTime/performTimeCount',
+    url: '/system/gates/pageList',
     method: 'get',
     params: query
   })
 }
 
+
+
+
+/**    基础表单接口  结束    */
+
+// 闸机开/关
+export const openOrClose = (data) => {
+  return request({
+    url: '/system/gates/openOrClose',
+    method: 'get',
+    params: data
+  })
+}

src/api/device/pda.js

@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+
+/**    基础表单接口  开始    */
+
+// 表单模板列表
+export const pageList = (query) => {
+  return request({
+    url: '/system/agreementInfo/pageList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增
+export const saveAndAdd = (data) => {
+  return request({
+    url: '/system/agreementInfo/insertOrUpdate',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改/更新  保存 
+export const saveAndEdit = (data) => {
+  return request({
+    url: '/system/agreementInfo/insertOrUpdate',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获取详情
+export const getDetails = (data) => {
+  return request({
+    url: '/system/agreementInfo/selectById',
+    method: 'get',
+    params: data
+  })
+}
+
+// 删除模板
+export const deleteById = (id) => {
+  return request({
+    url: '/system/agreementInfo/deleteById',
+    method: 'delete',
+    params: {id:id}
+  })
+}
+
+
+/**    基础表单接口  结束    */

src/api/monitor/logininfor.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询登录日志列表
 export function list(query) {
   return request({
-    url: '/admin/logininfor/list',
+    url: '/system/logininfor/list',
     method: 'get',
     params: query
   })
@@ -12,15 +12,15 @@ export function list(query) {
 // 删除登录日志
 export function delLogininfor(infoId) {
   return request({
-    url: '/admin/logininfor/' + infoId,
-    method: 'delete'
+    url: '/system/logininfor/' + infoId,
+    method: 'delete'  
   })
 }
 
 // 解锁用户登录状态
 export function unlockLogininfor(userName) {
   return request({
-    url: '/admin/logininfor/unlock/' + userName,
+    url: '/system/logininfor/unlock/' + userName,
     method: 'get'
   })
 }
@@ -28,7 +28,7 @@ export function unlockLogininfor(userName) {
 // 清空登录日志
 export function cleanLogininfor() {
   return request({
-    url: '/admin/logininfor/clean',
+    url: '/system/logininfor/clean',
     method: 'delete'
   })
 }

src/api/monitor/operlog.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询操作日志列表
 export function list(query) {
   return request({
-    url: '/admin/operlog/list',
+    url: '/system/operlog/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function list(query) {
 // 删除操作日志
 export function delOperlog(operId) {
   return request({
-    url: '/admin/operlog/' + operId,
+    url: '/system/operlog/' + operId,
     method: 'delete'
   })
 }
@@ -20,7 +20,7 @@ export function delOperlog(operId) {
 // 清空操作日志
 export function cleanOperlog() {
   return request({
-    url: '/admin/operlog/clean',
+    url: '/system/operlog/clean',
     method: 'delete'
   })
 }

src/api/order/orderMr.js

@@ -17,3 +17,13 @@ export function getSelectById(id) {
     method: 'get'
   })
 }
+
+//  导出
+export function downOrderListXls(params) {
+  return request({
+    url: '/order/orderInfo/listExport',
+    method: 'get',
+    responseType: 'blob',
+    params
+  });
+}

src/api/system/selfServeAdvertis.js

@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+
+/**    基础表单接口  开始    */
+
+// 表单模板列表
+export const pageList = (query) => {
+  return request({
+    url: '/system/advListSelf/pageList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增
+export const saveAndAdd = (data) => {
+  return request({
+    url: '/system/advListSelf/insertOrUpdate',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改/更新  保存 
+export const saveAndEdit = (data) => {
+  return request({
+    url: '/system/advListSelf/insertOrUpdate',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获取详情
+export const getDetails = (data) => {
+  return request({
+    url: '/system/advListSelf/selectById',
+    method: 'get',
+    params: data
+  })
+}
+
+// 删除模板
+export const deleteById = (id) => {
+  return request({
+    url: '/system/advListSelf/deleteById',
+    method: 'delete',
+    params: {id:id}
+  })
+}
+
+
+/**    基础表单接口  结束    */

src/views/device/gateMr/index.vue

@@ -6,7 +6,7 @@
         plain
         icon="el-icon-plus"
         size="mini"
-        @click="synchronousEven"
+        @click="getList"
         v-hasPermi="['gateMr:gateMr:synchronous']"
       >同步</el-button>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -14,12 +14,20 @@
 
     <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="" />
-      <el-table-column label="设备型号" align="center" prop="" />
-      <el-table-column label="验票站点" align="center" prop="" />
-      <el-table-column label="出口\入口" align="center" prop="" />
-      <el-table-column label="设备编码" align="center" prop="" />
-      <el-table-column label="在线状态" align="center" prop="" />
+      <el-table-column label="设备名称" align="center" prop="deviceName" />
+      <el-table-column label="设备型号" align="center" prop="deviceCode" />
+      <el-table-column label="验票站点" align="center" prop="deviceAddress" />
+      <el-table-column label="出口\入口" align="center" prop="isExit">
+        <template slot-scope="scope">
+          <span>{{ !scope.row.isExit&&scope.row.isExit!=0?'': scope.row.isExit==0?'入口': '出口'}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备编码" align="center" prop="deviceNo" />
+      <el-table-column label="在线状态" align="center" prop="onlineStatus">
+        <template slot-scope="scope">
+          <span>{{ !scope.row.onlineStatus&&scope.row.onlineStatus!=0?'': scope.row.onlineStatus==0?'离线': '在线'}}</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>
@@ -30,13 +38,13 @@
           <el-button
             size="mini"
             type="text"
-            @click="handleOpen(scope.row)"
+            @click="openOrCloseFun(scope.row,true)"
             v-hasPermi="['gateMr:gateMr:open']"
           >开闸</el-button>
           <el-button
             size="mini"
             type="text"
-            @click="handleClose(scope.row,scope.index)"
+            @click="openOrCloseFun(scope.row,false)"
             v-hasPermi="['gateMr:gateMr:close']"
           >关闸</el-button>
         </template>
@@ -56,11 +64,9 @@
 
 <script>
 
-import { pageList, downOrderListXls } from '@/api/financeMr/flowingWaterMr'
-import { exportExcel } from '@/utils/exportexcel'
+import { pageList,openOrClose } from '@/api/device/gateMr'
 export default {
-  name: "agreement",
-  dicts: ['agreement_type'],
+  name: "gateMr",
   data() {
     return {
       // 遮罩层
@@ -87,29 +93,8 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 9999,
       },
-      statusList: [
-        {id: 1, name: '申请中', value: 0},
-        {id: 2, name: '退款成功', value: 1},
-        {id: 3, name: '退款失败', value: 2},
-        {id: 4, name: '退款中', value: 3},
-      ],
-      sourceMap: {
-        1: '小程序',
-        2: '美团',
-        3: '携程',
-        4: '公众号',
-        5: '支付宝',
-      },
-      incomeExpensesList: [
-        {id: 1, name: '收入', value: '收入'},
-        {id: 2, name: '支出', value: '支出'},
-      ],
-      businessTypeList: [
-        {id: 1, name: '购买演出票', value: '购买演出票'},
-        {id: 2, name: '票务退款', value: '票务退款'},
-      ],
       visibleStatus: false,
       newObj: {},
       visibleType: '',
@@ -132,28 +117,7 @@ export default {
         }
       );
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.$set(this.queryParams, 'id', '');
-      this.$set(this.queryParams, 'businessType', '');
-      this.$set(this.queryParams, 'incomeExpenses', '');
-      this.queryParams.pageNum = 1;
-      this.handleQuery();
-    },
-    /** 详情按钮操作 */
-    openDetails(row, type) {
-      this.$refs["detailsDia"].openDialog("详情", row, type);
-    },
+    
     /**
      * 同步
      * @date 2022-10-24
@@ -162,14 +126,24 @@ export default {
     synchronousEven() {
 
     },
-    // 开闸
-    handleOpen() {
-
-    },
-    // 关闸
-    handleClose() {
+    /**
+     *  开闸 或 关闸
+     *  type=ture 开闸 
+     */ 
+    openOrCloseFun(row,type) {
+      this.$confirm(`确定${type?'开闸':'关闸'}吗？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(async () => {
+          let { code,data } = await openOrClose({id: row.id,status:type?1:2})
+          this.$message.success("操作成功!");
+        }).catch((error) => {
+          console.error("error===",error)   
+         // this.$message.error("操作失败!");      
+        });
+    }
 
-    },
   }
 };
 </script>

src/views/device/pda/dialog/dataBox.vue

@@ -0,0 +1,191 @@
+<!--
+ * @Description: 新增/编辑弹框
+ * @Author: 空白格
+ * @Date: 2023-07-04 13:55:00
+ * @LastEditors: 空白格
+ * @LastEditTime: 2023-07-06 09:08:39
+ * @FilePath: \cattle_webui\src\views\system\noticeMgr\Dialog\AddOrEditDialog.vue
+ * @Copyright: Copyright (c) 2016~2023 by 空白格, All Rights Reserved.
+-->
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="700px"
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="dialog"
+    >
+      <el-form 
+      v-loading="loading"
+      :model="form" 
+      ref="form" 
+      :rules="rules" 
+      label-width="120px">
+        <el-form-item label="设备名称：" prop="name">
+          <el-input v-model="form.name" placeholder="请输入设备名称" disabled />
+        </el-form-item>
+        <el-form-item label="设备编号：" prop="name">
+          <el-input v-model="form.name" placeholder="请输入设备编号" disabled />
+        </el-form-item>
+        <el-form-item label="协议类型" prop="type">
+          <el-select
+            disabled
+            v-model="form.type"
+            placeholder="请选择协议类型"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="(item, index) in dict.type.device_sys_type"
+              :key="index"
+              :value="Number(item.value)"
+              :label="item.label"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="支付终端号：" prop="name">
+          <el-input v-model="form.name" placeholder="请输入支付终端号" disabled />
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="cancel">取消</el-button>
+      <el-button
+        type="primary"
+        @click="submitForm"
+        :loading="loading"
+        element-loading-text="提交中..."
+      >
+      保存
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { 
+  saveAndAdd,
+  saveAndEdit, 
+  getDetails } from "@/api/device/pda";
+export default {
+  name: "addAndEdit",
+  dicts: ['device_sys_type'],
+  data() {
+    return {
+      title: "编辑",
+      model: "EDIT",
+      open: false,
+      loading: false,
+      form: {
+        id: undefined,
+        type: "",
+        content: "",
+      },
+      rules: {
+        type: [{ required: true, message: "协议类型", trigger: "blur" }],
+        content: [
+          { required: true, message: "请输入内容详情", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  methods: {
+    /**
+     * 打开弹框
+     * @date 2022-09-20
+     * @param {any} obj
+     * @returns {any}
+     */
+    openDialog(title, obj) {
+      this.title = title;
+      this.open = true;
+      if (obj){
+        this.$nextTick(() => {
+          this.form.id = obj.id;
+          this.form.name = obj.name;
+          this.form.type = obj.type;
+          this.form.content = obj.content;
+        });
+        this.getDetailsFun(obj)
+      }else{
+        this.$nextTick(() => {
+          this.$refs["form"].clearValidate();
+        });
+      }
+    },
+    /** 
+     * 获取详情
+     */
+    async getDetailsFun(data) {
+      try {
+        this.loading = true;
+        const { res, code } = await getDetails({ ...data });
+      } catch (error) { 
+        console.error("error===",error)
+      } finally {
+        this.loading = false;
+      }
+    },
+    /**
+     * 保存
+     * @date 2022-09-20
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(async (valid) => {
+        if (valid) {
+          try {
+            this.loading = true;
+            if(this.form.id) {
+              const { code } = await saveAndEdit({ ...this.form });
+              if (code === 200) {
+                this.$message.success("操作成功!");
+                this.$emit("getList");
+                this.cancel();
+              }
+            }else {
+              const { code } = await saveAndAdd ({ ...this.form });
+              if (code === 200) {
+                this.$message.success("操作成功!");
+                this.$emit("getList");
+                this.cancel();
+              }
+            }
+            
+          } catch (error) {
+          } finally {
+            this.loading = false;
+          }
+        }
+      });
+    },
+    /**
+     * 重置
+     * @date 2022-09-20
+     * @returns {any}
+     */
+    reset() {
+      this.$refs["form"].resetFields();
+      this.form.id = undefined;
+    },
+    /**
+     * 关闭弹框
+     * @date 2022-09-20
+     * @returns {any}
+     */
+    cancel() {
+      this.reset();
+      this.open = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.dialog {
+  padding: 0 30px;
+  max-height: 65vh;
+  overflow-y: auto;
+}
+</style>

src/views/device/pda/index.vue

@@ -0,0 +1,188 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8"  style="margin-left: 0; margin-top: 10px">
+      <el-button
+        type="primary"
+        plain
+        icon="el-icon-plus"
+        size="mini"
+        @click="handleAdd"
+        v-hasPermi="['device:pda:add']"
+      >新增</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="" />
+      <el-table-column label="设备编码" align="center" prop="" />
+      <el-table-column label="支付终端码" align="center" prop="" />
+      <el-table-column label="在线状态" align="center" prop="" />
+      <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-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="openDetails(scope.row)"
+            v-hasPermi="['device:pda:details']"
+          >详情</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-if="scope.row.status != 0"
+            v-hasPermi="['device:pda:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDelete(scope.row,scope.index)"
+            v-hasPermi="['device:pda:delete']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <!-- 详情 -->
+    <!-- 新增/编辑弹框 -->
+    <data-box
+      ref="addAndEdit"
+      @getList="getList"
+    />
+  </div>
+</template>
+
+<script>
+import { pageList,deleteById } from "@/api/device/pda";
+import { exportExcel } from '@/utils/exportexcel'
+import dataBox from "./dialog/dataBox.vue";
+export default {
+  name: "agreement",
+  dicts: ['agreement_type'],
+  components: { dataBox },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      dataList: null,
+      // 弹出层标题
+      title: "",
+
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      statusList: [
+        {id: 1, name: '申请中', value: 0},
+        {id: 2, name: '退款成功', value: 1},
+        {id: 3, name: '退款失败', value: 2},
+        {id: 4, name: '退款中', value: 3},
+      ],
+      sourceMap: {
+        1: '小程序',
+        2: '美团',
+        3: '携程',
+        4: '公众号',
+        5: '支付宝',
+      },
+      incomeExpensesList: [
+        {id: 1, name: '收入', value: '收入'},
+        {id: 2, name: '支出', value: '支出'},
+      ],
+      businessTypeList: [
+        {id: 1, name: '购买演出票', value: '购买演出票'},
+        {id: 2, name: '票务退款', value: '票务退款'},
+      ],
+      visibleStatus: false,
+      newObj: {},
+      visibleType: '',
+      handleExportLoading: false,
+      tableData: {}
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      pageList(this.queryParams)
+      .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, 'id', '');
+      this.$set(this.queryParams, 'businessType', '');
+      this.$set(this.queryParams, 'incomeExpenses', '');
+      this.queryParams.pageNum = 1;
+      this.handleQuery();
+    },
+    /** 详情按钮操作 */
+    openDetails(row, type) {
+      this.$refs["addAndEdit"].openDialog("详情", row);
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.$refs["addAndEdit"].openDialog("新增数据", null);
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.$refs["addAndEdit"].openDialog("修改数据", row);
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const dataIds = row.id || this.ids;
+      this.$modal.confirm('是否确认删除数据编号为"' + dataIds + '"的数据项？').then(function() {
+        return deleteById(userIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>

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

@@ -214,7 +214,7 @@ export default {
     /** 票务列表查询 */
     ticketListApi(performId) {
       this.ticketList = []
-      seatPricePageList(this.addDateRange({pageNum: 1, pageSize: 100,  performId: performId}))
+      seatPricePageList(this.addDateRange({pageNum: 1, pageSize: 100,  performId: performId,goodsStatus: 0}))
         .then(response => {
           let ticketList = []
           response.data.rows.forEach(item => {

src/views/order/groupBuyingMr/index.vue

@@ -80,7 +80,8 @@
       </el-table-column>
       <el-table-column label="联系电话" align="center" prop="teamMobile" />
       <el-table-column label="负责人" align="center" prop="teamContact" />
-      <el-table-column label="剧目名称" align="center" prop="goodsName" />
+      <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="quantity" />
       <el-table-column label="支付总额" align="center" prop="orderPrice">

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

@@ -45,7 +45,7 @@
           <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>
+          <div style="display: flex;" class="grid-content bg-purple item-class">购票渠道: <span style="display: block;margin-left: 5px;"><dict-tag :options="dict.type.order_form_type" :value="form.source"/></span></div>
         </el-col>
         <el-col :span="12">
           <div class="grid-content bg-purple item-class">购票数量: <span>{{ form.viewerNum || '' }}</span></div>
@@ -104,6 +104,7 @@
 import { getSelectById } from '@/api/order/orderMr'
 export default {
   name: "detailsDia",
+  dicts: ['order_form_type'],
   data() {
     return {
       title: "编辑",

src/views/order/orderMr/index.vue

@@ -28,6 +28,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="票务名称">
+        <el-input
+          v-model="queryParams.goodsName"
+          placeholder="请输入票务名称"
+          clearable
+          style="width: 240px;"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="订单状态">
         <el-select
           v-model="queryParams.status"
@@ -50,16 +59,23 @@
           clearable
           style="width: 100%"
         >
-          <el-option
+          <!-- <el-option
             v-for="dict in sourceMapList"
             :key="dict.value"
             :label="dict.name"
             :value="dict.value"
+          /> -->
+          <el-option
+            v-for="dict in dict.type.order_form_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
       <el-form-item label="支付时间">
         <el-date-picker
+          style="width: 230px;"
           v-model="queryParams.time"
           type="daterange"
           value-format="yyyy-MM-dd"
@@ -68,6 +84,42 @@
           end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="下单时间">
+        <el-date-picker
+          style="width: 230px;"
+          v-model="queryParams.createTime"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </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"
+            :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>
@@ -75,6 +127,17 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+      <el-button
+        type="primary"
+        size="mini"
+        icon="el-icon-download"
+        v-hasPermi="['order:orderMr: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>
 
@@ -87,9 +150,13 @@
       <el-table-column label="票务类型" align="center" prop="seatTypeName" />
       <el-table-column label="购票渠道" align="center" prop="type">
         <template slot-scope="scope">
-          <span>{{ sourceList[scope.row.source] }}</span>
+          <!-- <span>{{ sourceList[scope.row.source] }}</span> -->
+          <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="timeSnapshot" />
+      <el-table-column label="下单时间" align="center" prop="createTime" />
       <el-table-column label="购票数量" align="center" prop="quantity" />
       <el-table-column label="支付总额" align="center" prop="orderPrice">
         <template slot-scope="scope">
@@ -102,6 +169,7 @@
           <span>{{ payWayList[scope.row.payWay] }}</span>
         </template>
       </el-table-column>
+      
       <el-table-column label="支付时间" align="center" prop="payTime" width="160" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.payTime) }}</span>
@@ -112,6 +180,11 @@
           <span>{{statusList[scope.row.status]}}</span>
         </template>
       </el-table-column>
+      <el-table-column label="已核销票数" align="center" prop="type">
+        <template slot-scope="scope">
+          <span>{{ scope.row.usedTotal }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -140,12 +213,13 @@
 
 <script>
 
-import { pageList } from '@/api/order/orderMr'
+import { pageList,downOrderListXls } from '@/api/order/orderMr'
 import detailsDia from "./dialog/details.vue";
-
+import { pagePerformTimeList } from "@/api/schedulingMr/schedulingMr"
+import { exportExcel } from '@/utils/exportexcel'
 export default {
   name: "agreement",
-  dicts: ['agreement_type'],
+  dicts: ['order_form_type'],
   components: { detailsDia },
   data() {
     return {
@@ -211,23 +285,13 @@ export default {
         'wecaht.h5': '微信公众号支付',
         'meituan': '美团支付',
       },
-      sourceList: {
-        1: '小程序',
-        2: '公众号',
-        3: '美团',
-        4: '携程',
-        5: '团购',
-      },
-      sourceMapList: [
-        {id: 1, name: '小程序', value: 1},
-        {id: 2, name: '公众号', value: 2},
-        {id: 3, name: '美团', value: 3},
-        {id: 4, name: '携程', value: 4},
-        {id: 5, name: '团购', value: 5},
-      ],
       visibleStatus: false,
       newObj: {},
-      visibleType: ''
+      visibleType: '',
+
+      pagePerformTimeList: [], // 场次列表
+
+      handleExportLoading: false,
     };
   },
   created() {
@@ -255,6 +319,10 @@ export default {
         this.queryParams.payBeginTime = this.queryParams.time[0];
         this.queryParams.payEndTime = this.queryParams.time[1];
       }
+      if(this.queryParams.createTime&&this.queryParams.createTime.length>0){
+        this.queryParams.createBeginTime = this.queryParams.createTime[0];
+        this.queryParams.createEndTime = this.queryParams.createTime[1];
+      }
       this.getList();
     },
     /** 重置按钮操作 */
@@ -268,6 +336,12 @@ export default {
       this.$set(this.queryParams, 'payBeginTime', '');
       this.$set(this.queryParams, 'payEndTime', '');
       this.$set(this.queryParams, 'time', '');
+      this.$set(this.queryParams, 'createTime', '');
+      this.$set(this.queryParams, 'createBeginTime', '');
+      this.$set(this.queryParams, 'createEndTime', '');
+      this.$set(this.queryParams, 'goodsName', '');
+      this.$set(this.queryParams, 'performDate', '');
+      this.$set(this.queryParams, 'timeSnapshot', '');
       this.queryParams.pageNum = 1;
       this.handleQuery();
     },
@@ -275,6 +349,58 @@ export default {
     openDetails(row, type) {
       this.$refs["detailsDia"].openDialog("详情", row, type);
     },
+    async pagePerformTimeListFun(value) {
+      try {
+        this.pagePerformTimeList = []
+        this.$set(this.queryParams,'timeSnapshot',null)
+        if(!value){
+
+        return
+        }
+        let { data,code } = await pagePerformTimeList({
+          performDate: value,
+          pageNum: 1,
+          pageSize: 999
+        })
+        this.pagePerformTimeList = [].concat(data.rows)
+      } catch (error) {
+        
+      }
+    },
+    /**
+     * 导出报表
+     * @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]
+            }
+          }
+          downOrderListXls(postMap)
+            .then((res) => {
+              exportExcel(res, '订单管理', '.xlsx');
+              this.handleExportLoading = false;
+            })
+            .catch((error) => {
+              console.log("error===",error)
+              this.handleExportLoading = false;
+            });
+        })
+        .catch(() => {
+          this.$message.info('您已取消导出！');
+        });
+    },
   }
 };
 </script>

src/views/statisticalReport/session.vue

@@ -53,7 +53,7 @@
         size="mini"
         icon="el-icon-download"
         :disabled="tableData.length === 0"
-        v-hasPermi="['flowingWaterMr:flowingWaterMr:downloadExcel']"
+        v-hasPermi="['session:session:downloadExcel']"
         @click="handleExport"
         v-loading.fullscreen.lock="handleExportLoading"
         element-loading-text="正在拼命生成数据中..."

src/views/system/selfServeAdvertis/dialog/dataBox.vue

@@ -0,0 +1,217 @@
+<!--
+ * @Description: 新增/编辑弹框
+ * @Author: 空白格
+ * @Date: 2023-07-04 13:55:00
+ * @LastEditors: 空白格
+ * @LastEditTime: 2023-07-06 09:08:39
+ * @FilePath: \cattle_webui\src\views\system\noticeMgr\Dialog\AddOrEditDialog.vue
+ * @Copyright: Copyright (c) 2016~2023 by 空白格, All Rights Reserved.
+-->
+<template>
+  <el-dialog :title="title" :visible.sync="open" width="700px" :close-on-click-modal="false" @close="cancel">
+    <div class="dialog">
+      <el-form v-loading="loading" :model="form" ref="form" :rules="rules" label-width="120px">
+        <el-form-item label="标题名称" prop="name">
+          <el-input v-if="model != 3" v-model="form.name" placeholder="标题名称" clearable style="width: 100%;" />
+          <span v-else>{{ form.name }}</span>
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-radio v-model="form.type" label="1">图文</el-radio>
+        </el-form-item>
+        <el-form-item label="banner图" prop="sliderImg">
+          <el-upload :disabled="model==3" ref="upload" class="avatar-uploader" :action="uploadObj.url" :headers="uploadObj.headers"
+            :show-file-list="false" accept=".jpg,.png" :on-success="handleAvatarSuccess"
+            :before-upload="beforeAvatarUpload">
+            <div class="avatar" v-if="form.sliderImg">
+              <el-image style="width: 100px; height: 100px" :src="form.sliderImg" fit="cover" />
+            </div>
+            <div class="upload-btn" v-else>
+              <i class="el-icon-plus"></i>
+              <div class="upload-btn-text">上传图片</div>
+            </div>
+            <div class="el-upload__tip" slot="tip">只能上传.jpg或.png格式</div>
+          </el-upload>
+        </el-form-item>
+        <el-form-item :label="form.type == 1 ? '内容详情：' : '链接地址：'" prop="detail">
+          <editor v-if="form.type == 1" v-model="form.detail" :fileSize="20" :min-height="200" />
+          <el-input v-else v-model="form.detail" placeholder="请输入链接地址" clearable style="width: 100%;" />
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="cancel">关闭</el-button>
+      <el-button v-if="model!=3" type="primary" @click="submitForm" :loading="loading" element-loading-text="提交中...">
+        保存
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import {
+  saveAndAdd,
+  saveAndEdit,
+  getDetails
+} from "@/api/system/selfServeAdvertis";
+import Editor from "@/components/Editor";
+import { getToken } from "@/utils/auth";
+export default {
+  name: "DataBox",
+  components: {
+    Editor,
+  },
+  data() {
+    return {
+      title: "编辑",
+      model: "1", // 1 新增  2 编辑  3 详情
+      open: false,
+      loading: false,
+      form: {
+        name: null,
+        type: null,
+        sliderImg: null,
+        detail: null,
+      },
+      rules: {
+        name: [{ required: true, message: "请输入标题", trigger: "blur" }],
+        type: [{ required: true, message: "请选择类型", trigger: "blur" }],
+        sliderImg: [{ required: true, message: "请上传banner图", trigger: "blur" }],
+        detail: [
+          { required: true, message: "请输入内容", trigger: "blur" },
+        ],
+      },
+      uploadObj: {
+        url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",
+        Headers: { Authorization: "Bearer " + getToken() },
+      },
+    };
+  },
+  methods: {
+    /**
+     * 打开弹框
+     * @date 2022-09-20
+     * @param {any} obj
+     * @returns {any}
+     */
+    openDialog(title, obj,type) {
+      this.title = title;
+      this.model = type
+      this.open = true;
+      if (obj) {
+        this.$nextTick(() => {
+          this.$set(this.form, 'id', obj.id);
+          this.$set(this.form, 'name', obj.name);
+          this.$set(this.form, 'sliderImg', obj.sliderImg);
+          this.$set(this.form, 'detail', obj.detail);
+          this.$set(this.form, 'type', (obj.type == 2 ? '1' : obj.type.toString()));
+        });
+      }
+      this.$nextTick(() => {
+        this.$refs["form"].clearValidate();
+      });
+    },
+    /** 
+     * 获取详情
+     */
+    async getDetailsFun(param) {
+      try {
+        this.loading = true;
+        const { data, code } = await getDetails({ id: param.id });
+        if (code == 200) {
+          this.$set(this, 'form', data)
+        } else {
+          this.cancel()
+        }
+      } catch (error) {
+        console.error("error===", error)
+      } finally {
+        this.loading = false;
+      }
+    },
+    /**
+     * 保存
+     * @date 2022-09-20
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(async (valid) => {
+        if (valid) {
+          try {
+            this.loading = true;
+            if (this.form.id) {
+              const { code } = await saveAndEdit({ ...this.form });
+              if (code === 200) {
+                this.$message.success("操作成功!");
+                this.$emit("getList");
+                this.cancel();
+              }
+            } else {
+              const { code } = await saveAndAdd({ ...this.form });
+              if (code === 200) {
+                this.$message.success("操作成功!");
+                this.$emit("getList");
+                this.cancel();
+              }
+            }
+
+          } catch (error) {
+          } finally {
+            this.loading = false;
+          }
+        }
+      });
+    },
+    /**
+     * 重置
+     * @date 2022-09-20
+     * @returns {any}
+     */
+    reset() {
+      this.$refs["form"].resetFields();
+      this.form.id = undefined;
+    },
+    /**
+     * 关闭弹框
+     * @date 2022-09-20
+     * @returns {any}
+     */
+    cancel() {
+      this.reset();
+      this.open = false;
+    },
+    /**
+     * 上传成功
+     * @date 2023-11-22
+     * @param {any} res
+     * @returns {any}
+     */
+     handleAvatarSuccess(res) {
+      if (res.code === 200) {
+        // this.form.mainImg = res?.data?.url;
+        this.$set(this.form, 'sliderImg', res?.data?.url)
+      }
+    },
+    /**
+     * 上传文件之前之前
+     * @date 2023-11-22
+     * @param {any} file
+     * @returns {any}
+     */
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === "image/jpeg" || "image/png";
+      if (!isJPG) {
+        this.$message.error("上传头像图片只能是jpg或png格式!");
+      }
+      return isJPG;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.dialog {
+  padding: 0 30px;
+  max-height: 65vh;
+  overflow-y: auto;
+}
+</style>

src/views/system/selfServeAdvertis/index.vue

@@ -0,0 +1,193 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8"  style="margin-left: 0; margin-top: 10px">
+      <el-button
+        type="primary"
+        plain
+        icon="el-icon-plus"
+        size="mini"
+        @click="handleAdd"
+        v-hasPermi="['system:selfServeAdvertis:add']"
+      >新增</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="50"></el-table-column>
+      <el-table-column label="标题名称" align="center" prop="name" />
+      <el-table-column label="banner图片" align="center" prop="type">
+        <template slot-scope="scope">
+          <el-image
+            style="width: 100px; height: 50px"
+            :src="scope.row.sliderImg" 
+            :preview-src-list="[scope.row.sliderImg]"
+            @click="vbs(scope.row.staffIcon)"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <span>{{ scope.row.type == 1 ? '图文' : scope.row.type == 2 ? '视频' : '链接' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <el-tag type="success" v-if="scope.row.onlineStatus == '1'">己上线</el-tag>
+          <el-tag type="danger" v-else-if="scope.row.onlineStatus == '0'">未上线</el-tag>
+          <el-tag type="info" v-else>未发布</el-tag>
+        </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-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="ionlineApi(scope.row)"
+            v-hasPermi="['system:selfServeAdvertis:release']"
+          >{{scope.row.onlineStatus == '1' ? '取消发布' : '发布'}}</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="openDetails(scope.row)"
+            v-hasPermi="['system:selfServeAdvertis:details']"
+          >详情</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            v-if="scope.row.onlineStatus != '1'"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:selfServeAdvertis:edit']"
+          >编辑</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            v-if="scope.row.onlineStatus != '1'"
+            @click="handleDelete(scope.row,scope.index)"
+            v-hasPermi="['system:selfServeAdvertis:delete']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <!-- 详情 -->
+    <!-- 新增/编辑弹框 -->
+    <data-box
+      ref="addAndEdit"
+      @getList="getList"
+    />
+  </div>
+</template>
+
+<script>
+import { pageList,deleteById } from "@/api/system/selfServeAdvertis";
+import dataBox from "./dialog/dataBox";
+export default {
+  name: "selfServeAdvertis",
+  components: { dataBox },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      dataList: null,
+      // 弹出层标题
+      title: "",
+
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+
+      srcList: []
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      pageList(this.queryParams)
+      .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, 'id', '');
+      this.$set(this.queryParams, 'businessType', '');
+      this.$set(this.queryParams, 'incomeExpenses', '');
+      this.queryParams.pageNum = 1;
+      this.handleQuery();
+    },
+    /** 详情按钮操作 */
+    openDetails(row, type) {
+      this.$refs["addAndEdit"].openDialog("详情", row,3);
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.$refs["addAndEdit"].openDialog("新增数据", null,1);
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.$refs["addAndEdit"].openDialog("修改数据", row,2);
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const dataIds = row.id || this.ids;
+      this.$modal.confirm('是否确认删除数据编号为"' + dataIds + '"的数据项？').then(function() {
+        return deleteById(userIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 查看按钮操作 */
+    vbs(val) {
+      this.srcList = []
+      this.srcList.push(val)
+    }
+  }
+};
+</script>

src/views/team/applicationMr/index.vue

@@ -97,7 +97,7 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="审核人" align="center" prop="createBy" />
+      <el-table-column label="审核人" align="center" prop="checkorName" />
       <el-table-column label="操作" align="center" fixed="right" width="150" class-name="small-padding fixed-width">
         <template slot-scope="scope">
 <!--          <el-button-->

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

@@ -213,7 +213,7 @@ export default {
     /** 票务列表查询 */
     ticketListApi(performId) {
       this.ticketList = []
-      seatPricePageList(this.addDateRange({pageNum: 1, pageSize: 100,  performId: performId}))
+      seatPricePageList(this.addDateRange({pageNum: 1, pageSize: 100,  performId: performId,goodsStatus: 0}))
         .then(response => {
           let ticketList = []
           response.data.rows.forEach(item => {