Browse Source

切核销记录,闸机,OTA管理优化页面

zhongzhao 1 year ago
parent
commit
09e155a3c6
41 changed files with 928 additions and 79 deletions
  1. 11 0
      src/api/device/gateMr.js
  2. 175 0
      src/views/device/gateMr/index.vue
  3. 2 2
      src/views/distribution/personnelMr/index.vue
  4. 1 1
      src/views/distribution/recordMr/dialog/details.vue
  5. 5 5
      src/views/distribution/recordMr/index.vue
  6. 1 1
      src/views/distribution/ticketMr/dialog/addAndEdit.vue
  7. 1 1
      src/views/distribution/ticketMr/index.vue
  8. 1 1
      src/views/finance/refundMr/dialog/details.vue
  9. 1 1
      src/views/finance/refundMr/dialog/orderDetails.vue
  10. 1 1
      src/views/information/informationMr/dialog/addAndEdit.vue
  11. 2 2
      src/views/order/groupBuyingMr/dialog/details.vue
  12. 3 3
      src/views/order/groupBuyingMr/index.vue
  13. 2 2
      src/views/order/orderMr/dialog/details.vue
  14. 1 1
      src/views/order/orderMr/index.vue
  15. 220 0
      src/views/order/writeOffMr/dialog/details.vue
  16. 166 0
      src/views/order/writeOffMr/index.vue
  17. 19 19
      src/views/otaMr/dialog/addAndEdit.vue
  18. 258 0
      src/views/otaMr/dialog/dataEdit.vue
  19. 31 12
      src/views/otaMr/index.vue
  20. 1 1
      src/views/perform/performMr/dialog/addAndEdit.vue
  21. 1 1
      src/views/perform/programmeMr/dialog/addAndEdit.vue
  22. 1 1
      src/views/perform/programmeMr/dialog/details.vue
  23. 1 1
      src/views/perform/programmeMr/dialog/programmeAddAndEdit.vue
  24. 1 1
      src/views/schedulingMr/dialog/addAndEdit.vue
  25. 2 2
      src/views/statistics/index.vue
  26. 1 1
      src/views/team/applicationMr/dialog/addAndEdit.vue
  27. 1 1
      src/views/team/applicationMr/dialog/applicationDetails.vue
  28. 1 1
      src/views/team/applicationMr/dialog/orderDetails.vue
  29. 4 4
      src/views/team/applicationMr/index.vue
  30. 1 1
      src/views/team/ticketMr/dialog/addAndEdit.vue
  31. 1 1
      src/views/team/ticketMr/dialog/dumplingEdit.vue
  32. 2 2
      src/views/team/ticketMr/index.vue
  33. 1 1
      src/views/ticket/priceMr/dialog/addAndEdit.vue
  34. 1 1
      src/views/ticket/ticketMr/dialog/addAndEdit.vue
  35. 1 1
      src/views/ticket/ticketMr/dialog/details.vue
  36. 1 1
      src/views/venue/performanceHallMr/dialog/addAndEdit.vue
  37. 1 1
      src/views/venue/performanceHallMr/dialog/programmeAddAndEdit.vue
  38. 1 1
      src/views/venue/performanceHallMr/dialog/seatTemplateEdit.vue
  39. 1 1
      src/views/venue/schedulingMr/dialog/addAndEdit.vue
  40. 1 1
      src/views/venue/seatTypeMr/dialog/addAndEdit.vue
  41. 1 1
      src/views/venue/venueMr/dialog/addAndEdit.vue

+ 11 - 0
src/api/device/gateMr.js

@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+//
+export const performTimeCount = (query) => {
+  return request({
+    url: '/merchant/merchantPerformTime/performTimeCount',
+    method: 'get',
+    params: query
+  })
+}
+

+ 175 - 0
src/views/device/gateMr/index.vue

@@ -0,0 +1,175 @@
+<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="synchronousEven"
+        v-hasPermi="['gateMr:gateMr:synchronous']"
+      >同步</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="" />
+      <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="handleOpen(scope.row)"
+            v-hasPermi="['gateMr:gateMr:open']"
+          >开闸</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleClose(scope.row,scope.index)"
+            v-hasPermi="['gateMr:gateMr:close']"
+          >关闸</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"
+    />
+
+  </div>
+</template>
+
+<script>
+
+import { pageList, downOrderListXls } from '@/api/financeMr/flowingWaterMr'
+import { exportExcel } from '@/utils/exportexcel'
+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,
+      },
+      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["detailsDia"].openDialog("详情", row, type);
+    },
+    /**
+     * 同步
+     * @date 2022-10-24
+     * @returns {any}
+     */
+    synchronousEven() {
+
+    },
+    // 开闸
+    handleOpen() {
+
+    },
+    // 关闸
+    handleClose() {
+
+    },
+  }
+};
+</script>

+ 2 - 2
src/views/distribution/personnelMr/index.vue

@@ -59,7 +59,7 @@
           icon="el-icon-s-tools"
           size="mini"
           @click="codeSet"
-          v-hasPermi="['personnelMr:personnelMr:set']"
+          v-hasPermi="['personnelMr:personnelMr:codeSet']"
         >推广码海报设置</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -120,7 +120,7 @@
             size="mini"
             type="text"
             @click="handleCode(scope.row, 'img')"
-            v-hasPermi="['personnelMr:personnelMr:edit']"
+            v-hasPermi="['personnelMr:personnelMr:code']"
           >推广码</el-button>
           <el-button
             size="mini"

+ 1 - 1
src/views/distribution/recordMr/dialog/details.vue

@@ -4,7 +4,7 @@
  * @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
+ * @FilePath: \cattle_webui\src\views\distribution\recordMr\dialog\details.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 5 - 5
src/views/distribution/recordMr/index.vue

@@ -79,11 +79,11 @@
           <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-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

+ 1 - 1
src/views/distribution/ticketMr/dialog/addAndEdit.vue

@@ -4,7 +4,7 @@
  * @Date: 2023-11-24 13:55:00
  * @LastEditors: Sugar.
  * @LastEditTime: 22023-11-24 13:55:00
- * @FilePath: \cattle_webui\src\views\distribution\personnelMr\AddOrEditDialog.vue
+ * @FilePath: \cattle_webui\src\views\distribution\ticketMr\dialog\AddOrEditDialog.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 1 - 1
src/views/distribution/ticketMr/index.vue

@@ -73,7 +73,7 @@
             size="mini"
             type="text"
             @click="ionlineApi(scope.row)"
-            v-hasPermi="['distributionTicketMr:distributionTicketMr:resetting']"
+            v-hasPermi="['distributionTicketMr:distributionTicketMr:online']"
           >{{ scope.row.status == 1 ? '下架' : '上架' }}</el-button>
           <el-button
             size="mini"

+ 1 - 1
src/views/finance/refundMr/dialog/details.vue

@@ -4,7 +4,7 @@
  * @Date: 2023-11-24 13:55:00
  * @LastEditors: Sugar.
  * @LastEditTime: 2023-11-24 13:55:00
- * @FilePath: \cattle_webui\src\views\finance\refundMr\dialog\AddOrEditDialog.vue
+ * @FilePath: \cattle_webui\src\views\finance\refundMr\dialog\details.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 1 - 1
src/views/finance/refundMr/dialog/orderDetails.vue

@@ -4,7 +4,7 @@
  * @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
+ * @FilePath: \cattle_webui\src\views\finance\refundMr\dialog\orderDetails.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 1 - 1
src/views/information/informationMr/dialog/addAndEdit.vue

@@ -4,7 +4,7 @@
  * @Date: 2023-11-24 13:55:00
  * @LastEditors: Sugar.
  * @LastEditTime: 22023-11-24 13:55:00
- * @FilePath: \cattle_webui\src\views\perform\dialog\AddOrEditDialog.vue
+ * @FilePath: \cattle_webui\src\views\information\informationMr\dialog\AddOrEditDialog.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 2 - 2
src/views/order/groupBuyingMr/dialog/details.vue

@@ -4,7 +4,7 @@
  * @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
+ * @FilePath: \cattle_webui\src\views\order\groupBuyingMr\dialog\AddOrEditDialog.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>
@@ -146,7 +146,7 @@ export default {
       payWayList: {
         'cahsh': '现金',
         'wecaht.applet': '微信小程序支付',
-        'alipay': '支付宝',
+        'alipay': '支付宝OTA',
         'wecaht.h5': '微信公众号支付',
         'meituan': '美团支付',
       },

+ 3 - 3
src/views/order/groupBuyingMr/index.vue

@@ -109,7 +109,7 @@
             size="mini"
             type="text"
             @click="openDetails(scope.row)"
-            v-hasPermi="['orderMr:orderMr:details']"
+            v-hasPermi="['groupBuyingMr:groupBuyingMr:details']"
           >详情</el-button>
         </template>
       </el-table-column>
@@ -198,7 +198,7 @@ export default {
       payWayList: {
         'cahsh': '现金',
         'wecaht.applet': '微信小程序支付',
-        'alipay': '支付宝',
+        'alipay': '支付宝OTA',
         'wecaht.h5': '微信公众号支付',
         'meituan': '美团支付',
       },
@@ -228,7 +228,7 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      pageList(this.addDateRange(this.queryParams, this.dateRange))
+      pageList(this.queryParams)
       .then(response => {
           this.dataList = response.data.rows;
           this.total = response.data.total;

+ 2 - 2
src/views/order/orderMr/dialog/details.vue

@@ -4,7 +4,7 @@
  * @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
+ * @FilePath: \cattle_webui\src\views\order\orderMr\dialog\details.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>
@@ -137,7 +137,7 @@ export default {
       payWayList: {
         'cahsh': '现金',
         'wecaht.applet': '微信小程序支付',
-        'alipay': '支付宝',
+        'alipay': '支付宝OTA',
         'wecaht.h5': '微信公众号支付',
         'meituan': '美团支付',
       },

+ 1 - 1
src/views/order/orderMr/index.vue

@@ -207,7 +207,7 @@ export default {
       payWayList: {
         'cahsh': '现金',
         'wecaht.applet': '微信小程序支付',
-        'alipay': '支付宝',
+        'alipay': '支付宝OTA',
         'wecaht.h5': '微信公众号支付',
         'meituan': '美团支付',
       },

+ 220 - 0
src/views/order/writeOffMr/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\order\writeOffMr\dialog\details.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.id
+      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>

+ 166 - 0
src/views/order/writeOffMr/index.vue

@@ -0,0 +1,166 @@
+<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="订单号" label-width="60px">
+        <el-input
+          v-model="queryParams.orderId"
+          placeholder="请输入订单号"
+          clearable
+          style="width: 240px;"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户身份信息" label-width="100px">
+        <el-input
+          v-model="queryParams.memberMobile"
+          placeholder="用户身份信息"
+          clearable
+          style="width: 240px;"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="核销剧目类型">
+        <el-input
+          v-model="queryParams.performName"
+          placeholder="核销剧目类型"
+          clearable
+          style="width: 240px;"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备名称" label-width="70px">
+        <el-input
+          v-model="queryParams.performName"
+          placeholder="设备名称"
+          clearable
+          style="width: 240px;"
+          @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="id" />
+      <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="quantity" />
+      <el-table-column label="设备名称" align="center" prop="refundReason" />
+      <el-table-column label="核销时间" align="center" prop="payTime" width="160" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.payTime) }}</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/order/orderMr'
+import detailsDia from "./dialog/details.vue";
+
+export default {
+  name: "agreement",
+  dicts: ['agreement_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,
+      },
+    };
+  },
+  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;
+      if(this.queryParams.time){
+        this.queryParams.payBeginTime = this.queryParams.time[0];
+        this.queryParams.payEndTime = this.queryParams.time[1];
+      }
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.$set(this.queryParams, 'orderId', '');
+      this.$set(this.queryParams, 'status', '');
+      this.$set(this.queryParams, 'memberMobile', '');
+      this.$set(this.queryParams, 'source', '');
+      this.$set(this.queryParams, 'performName', '');
+      this.$set(this.queryParams, 'payBeginTime', '');
+      this.$set(this.queryParams, 'payEndTime', '');
+      this.$set(this.queryParams, 'time', '');
+      this.queryParams.pageNum = 1;
+      this.handleQuery();
+    },
+    /** 详情按钮操作 */
+    openDetails(row, type) {
+      this.$refs["detailsDia"].openDialog("详情", row, type);
+    },
+  }
+};
+</script>

+ 19 - 19
src/views/otaMr/dialog/addAndEdit.vue

@@ -21,30 +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="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-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"

+ 258 - 0
src/views/otaMr/dialog/dataEdit.vue

@@ -0,0 +1,258 @@
+<!--
+ * @Description: 新增/编辑弹框
+ * @Author: Sugar.
+ * @Date: 2023-11-24 13:55:00
+ * @LastEditors: Sugar.
+ * @LastEditTime: 2023-11-24 13:55:00
+ * @FilePath: \cattle_webui\src\views\otaMr\dialog\dataEdit.vue
+ * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
+-->
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="600px"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="dialog">
+      <el-form :model="form" ref="form" :rules="rules" label-width="80px">
+        <el-form-item label="票务名称:">
+          <el-input
+            disabled
+            type="number"
+            v-model="form.priceAmount"
+            placeholder="票务名称"
+            clearable
+            style="width: 260px;"
+          />
+        </el-form-item>
+        <el-form-item label="座位类型:">
+          <el-input
+            disabled
+            type="number"
+            v-model="form.priceAmount"
+            placeholder="座位类型"
+            clearable
+            style="width: 260px;"
+          />
+        </el-form-item>
+        <el-form-item label="市场价:">
+          <el-input
+            disabled
+            type="number"
+            v-model="form.priceAmount"
+            placeholder=""
+            clearable
+            style="width: 260px;"
+          >
+            <template slot="append">元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="销售价:">
+          <el-input
+            disabled
+            type="number"
+            v-model="form.priceAmount"
+            placeholder=""
+            clearable
+            style="width: 260px;"
+          >
+            <template slot="append">元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="结算价:" prop="priceAmount">
+          <el-input
+            :disabled="isDisabled"
+            type="number"
+            v-model="form.priceAmount"
+            placeholder=""
+            clearable
+            @change="changePriceAmount"
+            style="width: 260px;"
+          >
+            <template slot="append">元</template>
+          </el-input>
+        </el-form-item>
+
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button  @click="cancel">取消</el-button>
+      <el-button
+        type="primary"
+        @click="submitForm"
+        v-loading.fullscreen.lock="loading"
+        element-loading-text="提交中..."
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+      >
+        <span v-if="loading">提交中...</span>
+        <span v-else>保存</span>
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { saveAndEdit } from "@/api/ticketMr/priceMr";
+import Editor from "@/components/Editor";
+import { getToken } from "@/utils/auth";
+export default {
+  name: "dataEdit",
+  props: {
+    dict: {
+      type: Object,
+      default: () => [],
+    },
+  },
+  components: {
+    Editor,
+  },
+  data() {
+    return {
+      title: "编辑",
+      model: "EDIT",
+      open: false,
+      loading: false,
+      tableType: false,
+      isDisabled: false,
+      form: {
+        id: undefined,
+        priceType: '2'
+      },
+      rules: {
+        venueId: [{ required: true, message: "请选择场馆", trigger: "blur" }],
+        auditoriumId: [{ required: true, message: "请选择演出厅", trigger: "blur" }],
+        performId: [{ required: true, message: "请选择剧目", trigger: "blur" }],
+        goodsId: [{ required: true, message: "请选择票务", trigger: "blur" }],
+        seatTypeId: [{ required: true, message: "请选择座位类型", trigger: "blur" }],
+        priceType: [{ required: true, message: "请选择结算方式", trigger: "blur" }],
+        priceAmount: [{ required: true, message: "请输入价格", trigger: "blur" }],
+      },
+      uploadObj: {
+        url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",
+        Headers: { Authorization: "Bearer " + getToken() },
+      },
+      theatreList: [],
+      goodsList: [],
+      merchantList: [],
+      editType: false,
+      ticketList: [],
+      seatList: []
+    };
+  },
+  methods: {
+    /**
+     * 打开弹框
+     * @date 2023-11-22
+     * @param {any} obj
+     * @returns {any}
+     */
+    openDialog(title, obj, type) {
+      this.open = true;
+      if (obj){
+        this.title = "编辑商品信息";
+        this.$nextTick(() => {
+          this.$set(this.form, 'id', obj.id);
+          this.$set(this.form, 'goodsId', obj.goodsId);
+          this.$set(this.form, 'seatTypeId', obj.seatTypeId);
+          this.$set(this.form, 'performId', obj.performId);
+          this.$set(this.form, 'auditoriumId', obj.auditoriumId);
+          this.$set(this.form, 'priceType', obj.priceType.toString());
+          this.$set(this.form, 'priceAmount', obj.priceAmount);
+        });
+      }else{
+        this.title = "新增商品信息";
+        this.$nextTick(() => {
+          this.$refs["form"].clearValidate();
+        });
+      }
+    },
+    /** 价格输入事件 */
+    changePriceAmount(val) {
+      if(val * 1 < 0){
+        this.$message.error("输入需大于或等于0!");
+        this.$set(this.form, 'priceAmount', '');
+        return false
+      }
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(async (valid) => {
+        if (valid) {
+          // try {
+          //   this.loading = true;
+          //   const { code } = await saveAndEdit({ ...this.form });
+          //   if (code === 200) {
+          //     this.$message.success("操作成功!");
+          //     this.$emit("getList");
+          //     this.cancel();
+          //   }
+          // } catch (error) {
+          // } finally {
+          //   this.loading = false;
+          // }
+        }
+      });
+    },
+    /**
+     * 重置
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    reset() {
+      this.$set(this.form, 'id', '');
+      this.$set(this.form, 'goodsId', '');
+      this.$set(this.form, 'venueId', '');
+      this.$set(this.form, 'seatTypeId', '');
+      this.$set(this.form, 'performId', '');
+      this.$set(this.form, 'auditoriumId', '');
+      this.$set(this.form, 'priceType', '2');
+      this.$set(this.form, 'priceAmount', '');
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.reset();
+      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;
+  }
+}
+</style>

+ 31 - 12
src/views/otaMr/index.vue

@@ -35,24 +35,31 @@
     <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="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" 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
+            size="mini"
+            type="text"
+            v-if="scope.row.status != '1'"
+            @click="handleUpdate(scope.row,scope.index)"
+            v-hasPermi="['otaMr:otaMr:edit']"
+          >修改</el-button>
           <el-button
             size="mini"
             type="text"
@@ -79,6 +86,12 @@
       @getList="getList"
     />
 
+    <!-- 编辑商品弹框 -->
+    <data-edit
+      ref="dataEdit"
+      @getList="getList"
+      :dict="dict"></data-edit>
+
 
     <el-dialog
       title="填写密钥"
@@ -137,11 +150,12 @@
 
 import { pageList, deleteById, getOtaConfig, otaSave } from '@/api/otaMr/otaMr'
 import addAndEdit from "./dialog/addAndEdit.vue";
+import dataEdit from "./dialog/dataEdit.vue";
 
 export default {
   name: "agreement",
   dicts: ['agreement_type'],
-  components: { addAndEdit },
+  components: { addAndEdit, dataEdit },
   data() {
     return {
       // 遮罩层
@@ -222,6 +236,11 @@ export default {
       this.$refs["addAndEdit"].openDialog("新增数据", this.queryParams);
     },
 
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.$refs["dataEdit"].openDialog("修改数据", row);
+    },
+
     /** 删除按钮操作 */
     handleDelete(row) {
       this.$modal.confirm('是否确认删除商品名称为"' + row.goodsName + '"的数据项?').then(function() {

+ 1 - 1
src/views/perform/performMr/dialog/addAndEdit.vue

@@ -4,7 +4,7 @@
  * @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
+ * @FilePath: \cattle_webui\src\views\perform\performMr\dialog\AddOrEditDialog.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 1 - 1
src/views/perform/programmeMr/dialog/addAndEdit.vue

@@ -4,7 +4,7 @@
  * @Date: 2023-11-24 13:55:00
  * @LastEditors: Sugar.
  * @LastEditTime: 2023-11-24 13:55:00
- * @FilePath: \cattle_webui\src\views\programmeMr\dialog\AddOrEditDialog.vue
+ * @FilePath: \cattle_webui\src\views\perform\programmeMr\dialog\AddOrEditDialog.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 1 - 1
src/views/perform/programmeMr/dialog/details.vue

@@ -4,7 +4,7 @@
  * @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
+ * @FilePath: \cattle_webui\src\views\perform\programmeMr\dialog\details.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 1 - 1
src/views/perform/programmeMr/dialog/programmeAddAndEdit.vue

@@ -4,7 +4,7 @@
  * @Date: 2023-11-24 13:55:00
  * @LastEditors: Sugar.
  * @LastEditTime: 22023-11-24 13:55:00
- * @FilePath: \cattle_webui\src\views\performanceHallMr\dialog\AddOrEditDialog.vue
+ * @FilePath: \cattle_webui\src\views\perform\programmeMr\dialog\programmeAddAndEdit.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 1 - 1
src/views/schedulingMr/dialog/addAndEdit.vue

@@ -4,7 +4,7 @@
  * @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
+ * @FilePath: \cattle_webui\src\views\schedulingMr\dialog\AddOrEditDialog.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 2 - 2
src/views/statistics/index.vue

@@ -45,8 +45,8 @@ export default {
         type: undefined
       },
       itemList: [
-        {id: 1, name: '总览统计', url: ''},
-        {id: 2, name: '渠道统计', url: ''},
+        // {id: 1, name: '总览统计', url: ''},
+        // {id: 2, name: '渠道统计', url: ''},
         {id: 3, name: '场次统计', url: 'statisticalReport/session'},
       ]
     };

+ 1 - 1
src/views/team/applicationMr/dialog/addAndEdit.vue

@@ -4,7 +4,7 @@
  * @Date: 2023-11-24 13:55:00
  * @LastEditors: Sugar.
  * @LastEditTime: 22023-11-24 13:55:00
- * @FilePath: \cattle_webui\src\views\distribution\personnelMr\AddOrEditDialog.vue
+ * @FilePath: \cattle_webui\src\views\team\applicationMr\addAndEdit.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 1 - 1
src/views/team/applicationMr/dialog/applicationDetails.vue

@@ -4,7 +4,7 @@
  * @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
+ * @FilePath: \cattle_webui\src\views\team\applicationMr\applicationDetails.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 1 - 1
src/views/team/applicationMr/dialog/orderDetails.vue

@@ -4,7 +4,7 @@
  * @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
+ * @FilePath: \cattle_webui\src\views\team\applicationMr\orderDetails.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 4 - 4
src/views/team/applicationMr/index.vue

@@ -54,7 +54,7 @@
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd"
-              v-hasPermi="['teamTicketMr:teamTicketMr:add']"
+              v-hasPermi="['applicationMr:applicationMr:add']"
             >新增报名</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -111,20 +111,20 @@
             type="text"
             v-if="scope.row.status == 0"
             @click="handleDetails(scope.row, 'examine')"
-            v-hasPermi="['teamTicketMr:teamTicketMr:edit']"
+            v-hasPermi="['applicationMr:applicationMr:examine']"
           >审核</el-button>
           <el-button
             size="mini"
             type="text"
             @click="handleDetails(scope.row)"
-            v-hasPermi="['teamTicketMr:teamTicketMr:edit']"
+            v-hasPermi="['applicationMr:applicationMr:details']"
           >详情</el-button>
           <el-button
             size="mini"
             type="text"
             v-if="scope.row.status == 1"
             @click="handleOrderDetails(scope.row)"
-            v-hasPermi="['teamTicketMr:teamTicketMr:edit']"
+            v-hasPermi="['applicationMr:applicationMr:order']"
           >查看订单</el-button>
         </template>
       </el-table-column>

+ 1 - 1
src/views/team/ticketMr/dialog/addAndEdit.vue

@@ -4,7 +4,7 @@
  * @Date: 2023-11-24 13:55:00
  * @LastEditors: Sugar.
  * @LastEditTime: 22023-11-24 13:55:00
- * @FilePath: \cattle_webui\src\views\distribution\personnelMr\AddOrEditDialog.vue
+ * @FilePath: \cattle_webui\src\views\team\ticketMr\dialog\AddOrEditDialog.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 1 - 1
src/views/team/ticketMr/dialog/dumplingEdit.vue

@@ -4,7 +4,7 @@
  * @Date: 2023-11-24 13:55:00
  * @LastEditors: Sugar.
  * @LastEditTime: 2023-11-24 13:55:00
- * @FilePath: \cattle_webui\src\views\otaMr\dialog\AddOrEditDialog.vue
+ * @FilePath: \cattle_webui\src\views\team\ticketMr\dialog\dumplingEdit.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 2 - 2
src/views/team/ticketMr/index.vue

@@ -69,13 +69,13 @@
             size="mini"
             type="text"
             @click="handleTeam(scope.row)"
-            v-hasPermi="['teamTicketMr:teamTicketMr:edit']"
+            v-hasPermi="['teamTicketMr:teamTicketMr:binding']"
           >团队绑定</el-button>
           <el-button
             size="mini"
             type="text"
             @click="ionlineApi(scope.row)"
-            v-hasPermi="['teamTicketMr:teamTicketMr:resetting']"
+            v-hasPermi="['teamTicketMr:teamTicketMr:online']"
           >{{ scope.row.status == 1 ? '下架' : '上架' }}</el-button>
           <el-button
             size="mini"

+ 1 - 1
src/views/ticket/priceMr/dialog/addAndEdit.vue

@@ -4,7 +4,7 @@
  * @Date: 2023-11-24 13:55:00
  * @LastEditors: Sugar.
  * @LastEditTime: 2023-11-24 13:55:00
- * @FilePath: \cattle_webui\src\views\ticket\dialog\AddOrEditDialog.vue
+ * @FilePath: \cattle_webui\src\views\ticket\priceMr\dialog\AddOrEditDialog.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 1 - 1
src/views/ticket/ticketMr/dialog/addAndEdit.vue

@@ -4,7 +4,7 @@
  * @Date: 2023-11-24 13:55:00
  * @LastEditors: Sugar.
  * @LastEditTime: 2023-11-24 13:55:00
- * @FilePath: \cattle_webui\src\views\programmeMr\dialog\AddOrEditDialog.vue
+ * @FilePath: \cattle_webui\src\views\ticket\ticketMr\dialog\AddOrEditDialog.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 1 - 1
src/views/ticket/ticketMr/dialog/details.vue

@@ -4,7 +4,7 @@
  * @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
+ * @FilePath: \cattle_webui\src\views\ticket\ticketMr\dialog\details.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 1 - 1
src/views/venue/performanceHallMr/dialog/addAndEdit.vue

@@ -4,7 +4,7 @@
  * @Date: 2023-11-24 13:55:00
  * @LastEditors: Sugar.
  * @LastEditTime: 22023-11-24 13:55:00
- * @FilePath: \cattle_webui\src\views\performanceHallMr\dialog\AddOrEditDialog.vue
+ * @FilePath: \cattle_webui\src\views\venue\performanceHallMr\dialog\AddOrEditDialog.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 1 - 1
src/views/venue/performanceHallMr/dialog/programmeAddAndEdit.vue

@@ -4,7 +4,7 @@
  * @Date: 2023-11-24 13:55:00
  * @LastEditors: Sugar.
  * @LastEditTime: 22023-11-24 13:55:00
- * @FilePath: \cattle_webui\src\views\performanceHallMr\dialog\AddOrEditDialog.vue
+ * @FilePath: \cattle_webui\src\views\venue\performanceHallMr\dialog\programmeAddAndEdit.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 1 - 1
src/views/venue/performanceHallMr/dialog/seatTemplateEdit.vue

@@ -4,7 +4,7 @@
  * @Date: 2023-11-24 13:55:00
  * @LastEditors: Sugar.
  * @LastEditTime: 22023-11-24 13:55:00
- * @FilePath: \cattle_webui\src\views\performanceHallMr\dialog\seatTemplateEdit.vue
+ * @FilePath: \cattle_webui\src\views\venue\performanceHallMr\dialog\seatTemplateEdit.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 1 - 1
src/views/venue/schedulingMr/dialog/addAndEdit.vue

@@ -4,7 +4,7 @@
  * @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
+ * @FilePath: \cattle_webui\src\views\venue\schedulingMr\dialog\AddOrEditDialog.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 1 - 1
src/views/venue/seatTypeMr/dialog/addAndEdit.vue

@@ -4,7 +4,7 @@
  * @Date: 2023-11-24 13:55:00
  * @LastEditors: Sugar.
  * @LastEditTime: 22023-11-24 13:55:00
- * @FilePath: \cattle_webui\src\views\perform\dialog\AddOrEditDialog.vue
+ * @FilePath: \cattle_webui\src\views\venue\seatTypeMr\dialog\AddOrEditDialog.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>

+ 1 - 1
src/views/venue/venueMr/dialog/addAndEdit.vue

@@ -4,7 +4,7 @@
  * @Date: 2023-11-24 13:55:00
  * @LastEditors: Sugar.
  * @LastEditTime: 2023-11-24 13:55:00
- * @FilePath: \cattle_webui\src\views\venueMr\dialog\AddOrEditDialog.vue
+ * @FilePath: \cattle_webui\src\views\seatTypeMr\venueMr\dialog\AddOrEditDialog.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>