Преглед на файлове

订单管理和退款功能开发

zhongzhao преди 1 година
родител
ревизия
d594c495b8

+ 1 - 1
.env.development

@@ -10,7 +10,7 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_APP_SERVER_ID=0
 
 # 开发环境文件上传
-VUE_APP_UPLOAD_FILE_API = 'http://fileupload.hw.hongweisoft.com'
+VUE_APP_UPLOAD_FILE_API = 'https://fileupload.hw.hongweisoft.com'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

+ 1 - 1
.env.staging

@@ -10,4 +10,4 @@ ENV = 'staging'
 VUE_APP_BASE_API = '/scenicstage-api'
 
 # 开发环境文件上传
-VUE_APP_UPLOAD_FILE_API = 'http://fileupload.hw.hongweisoft.com'
+VUE_APP_UPLOAD_FILE_API = 'https://fileupload.hw.hongweisoft.com'

+ 20 - 0
src/api/financeMr/flowingWaterMr.js

@@ -0,0 +1,20 @@
+import request from '@/utils/request'
+
+// 分页查询
+export const pageList = (query) => {
+  return request({
+    url: '/order/orderRefund/pageList',
+    method: 'get',
+    params: query
+  })
+}
+
+//  导出
+export function downOrderListXls(params) {
+  return request({
+    url: '/order/order/downOrderListXls',
+    method: 'get',
+    responseType: 'blob',
+    params
+  });
+}

+ 19 - 0
src/api/order/orderMr.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 分页查询
+export const pageList = (query) => {
+  return request({
+    url: '/order/orderInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// id获取详情
+export function getSelectById(id) {
+  return request({
+    url: '/order/orderInfo/detail?id=' + id,
+    method: 'get'
+  })
+}

+ 10 - 2
src/api/performMr/performMr.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 分页查询资讯
+// 分页查询
 export const pageList = (query) => {
   return request({
     url: '/goods/performSponsor/pageList',
@@ -9,7 +9,7 @@ export const pageList = (query) => {
   })
 }
 
-// 新增修改资讯
+// 新增修改
 export const saveAndEdit = (data) => {
   return request({
     url: '/goods/performSponsor/insertOrUpdate',
@@ -26,3 +26,11 @@ export const deleteById = (id) => {
     params: {id:id}
   })
 }
+
+// id获取详情
+export function getSelectById(id) {
+  return request({
+    url: '/goods/performSponsor/selectById?id=' + id,
+    method: 'get'
+  })
+}

+ 217 - 0
src/views/finance/flowingWaterMr/index.vue

@@ -0,0 +1,217 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="订单号">
+        <el-input
+          v-model="queryParams.refundTransactionId"
+          placeholder="请输入订单号"
+          clearable
+          style="width: 240px;"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="收支类型">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="收支类型"
+          clearable
+          style="width: 100%"
+        >
+          <el-option
+            v-for="dict in statusList"
+            :key="dict.id"
+            :label="dict.name"
+            :value="dict.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="业务类型">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="业务类型"
+          clearable
+          style="width: 100%"
+        >
+          <el-option
+            v-for="dict in statusList"
+            :key="dict.id"
+            :label="dict.name"
+            :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>
+      </el-form-item>
+    </el-form>
+    <el-button
+      type="success"
+      icon="el-icon-download"
+      :disabled="tableData.length === 0"
+      v-hasPermi="['flowingWaterMr:flowingWaterMr:downloadExcel']"
+      @click="handleExport"
+      v-loading.fullscreen.lock="handleExportLoading"
+      element-loading-text="正在拼命生成数据中..."
+      element-loading-spinner="el-icon-loading"
+      element-loading-background="rgba(0, 0, 0, 0.5)"
+    >导出excel</el-button>
+    <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="refundTransactionId" />
+      <el-table-column label="金额(元)" align="center" prop="orderId" />
+      <el-table-column label="收支类型" align="center" prop="refundMobile" />
+      <el-table-column label="业务类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <span>¥{{ scope.row.refundAmount }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="产生渠道" align="center" prop="refundTime" width="160" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.refundTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="产生时间" align="center" prop="refundTime" width="160" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.refundTime) }}</span>
+        </template>
+      </el-table-column>
+
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+  </div>
+</template>
+
+<script>
+
+import { pageList } from '@/api/financeMr/flowingWaterMr'
+
+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},
+      ],
+      visibleStatus: false,
+      newObj: {},
+      visibleType: '',
+      handleExportLoading: false
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      pageList(this.addDateRange(this.queryParams, this.dateRange))
+      .then(response => {
+          this.dataList = response.data.rows;
+          this.total = response.data.total;
+          this.loading = false;
+        }
+      );
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.$set(this.queryParams, 'refundTransactionId', '');
+      this.$set(this.queryParams, 'orderId', '');
+      this.$set(this.queryParams, 'refundMobile', '');
+      this.$set(this.queryParams, 'status', '');
+      this.queryParams.pageNum = 1;
+      this.handleQuery();
+    },
+    /** 详情按钮操作 */
+    openDetails(row, type) {
+      this.$refs["detailsDia"].openDialog("详情", row, type);
+    },
+    /**
+     * 导出报表
+     * @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' && key != 'orderStatus'){
+              postMap[key] = this.queryParams[key]
+            }
+          }
+          downOrderListXls(postMap)
+            .then((res) => {
+              exportExcel(res, '酒业订单', '.xlsx');
+              this.handleExportLoading = false;
+            })
+            .catch(() => {
+              this.handleExportLoading = false;
+            });
+        })
+        .catch(() => {
+          this.$message.info('您已取消导出!');
+        });
+    },
+  }
+};
+</script>

+ 4 - 4
src/views/finance/refundMr/index.vue

@@ -202,10 +202,10 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = [];
-      this.queryParams.refundTransactionId = "";
-      this.queryParams.orderId = "";
-      this.queryParams.refundMobile = "";
-      this.queryParams.status = "";
+      this.$set(this.queryParams, 'refundTransactionId', '');
+      this.$set(this.queryParams, 'orderId', '');
+      this.$set(this.queryParams, 'refundMobile', '');
+      this.$set(this.queryParams, 'status', '');
       this.queryParams.pageNum = 1;
       this.handleQuery();
     },

+ 6 - 5
src/views/information/informationMr/dialog/addAndEdit.vue

@@ -52,7 +52,7 @@
           </el-upload>
         </el-form-item>
         <el-form-item label="文章内容:" prop="centent">
-          <editor v-model="form.centent" :fileSize="20" :min-height="200" />
+          <editor ref="editor" v-model="form.centent" :fileSize="20" :min-height="200" />
         </el-form-item>
       </el-form>
     </div>
@@ -123,13 +123,14 @@ export default {
      */
     openDialog(title, obj) {
       this.open = true;
+      this.form = {};
       if (obj){
         this.title = "编辑资讯";
         this.$nextTick(() => {
-          this.form.id = obj.id;
-          this.form.title = obj.title;
-          this.form.mainImg = obj.mainImg;
-          this.form.content = obj.centent;
+          this.$set(this.form, 'id', obj.id);
+          this.$set(this.form, 'title', obj.title);
+          this.$set(this.form, 'mainImg', obj.mainImg);
+          this.$set(this.form, 'centent', obj.centent);
         });
       }else{
         this.title = "添加资讯";

+ 4 - 4
src/views/information/informationMr/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="标题">
+      <el-form-item label="标题" label-width="40px">
         <el-input
           v-model="queryParams.title"
           placeholder="请输入标题"
@@ -227,9 +227,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = [];
-      this.queryParams.title = "";
-      this.queryParams.status = "";
-      this.queryParams.createBy = "";
+      this.$set(this.queryParams, 'title', '');
+      this.$set(this.queryParams, 'status', '');
+      this.$set(this.queryParams, 'createBy', '');
       this.queryParams.pageNum = 1;
       this.handleQuery();
     },

+ 211 - 0
src/views/order/orderMr/dialog/details.vue

@@ -0,0 +1,211 @@
+<!--
+ * @Description: 详情弹框
+ * @Author: Sugar.
+ * @Date: 2023-11-24 13:55:00
+ * @LastEditors: Sugar.
+ * @LastEditTime: 2023-11-24 13:55:00
+ * @FilePath: \cattle_webui\src\views\performMr\dialog\AddOrEditDialog.vue
+ * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
+-->
+<template>
+  <el-dialog
+    title="订单详情"
+    :visible.sync="open"
+    width="800px"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="dialog" v-if="form">
+      <!--   基础信息   -->
+      <div class="title-class" style="margin-top: 0">基础信息</div>
+      <el-row>
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class">票务名称: <span>{{ form.goodsName || ''}}</span></div>
+        </el-col>
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class">订单号: <span>{{ form.orderNum || '' }}</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>{{ payList[form.payStatus] || '' }}</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="身份证号码" width="180" align="center" prop="idcard" />
+            <el-table-column label="核销状态" align="center">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.status == 1">未使用</el-tag>
+                <el-tag v-if="scope.row.status == 1" type="success">已使用</el-tag>
+                <el-tag v-if="scope.row.status == 0" 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: '支付退款',
+      },
+      sourceList: {
+        1: '小程序',
+        2: '美团',
+        3: '携程',
+      },
+      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>

+ 278 - 0
src/views/order/orderMr/index.vue

@@ -0,0 +1,278 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="订单号">
+        <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="订单状态">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="订单状态"
+          clearable
+          style="width: 100%"
+        >
+          <el-option
+            v-for="dict in statusMapList"
+            :key="dict.value"
+            :label="dict.name"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="购票渠道">
+        <el-select
+          v-model="queryParams.source"
+          placeholder="购票渠道"
+          clearable
+          style="width: 100%"
+        >
+          <el-option
+            v-for="dict in sourceMapList"
+            :key="dict.value"
+            :label="dict.name"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="支付时间">
+<!--        <el-date-picker-->
+<!--          v-model="queryParams.payBeginTime"-->
+<!--          type="date"-->
+<!--          value-format="yyyy-MM-dd"-->
+<!--          placeholder="选择日期">-->
+<!--        </el-date-picker>-->
+        <el-date-picker
+          v-model="queryParams.time"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <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="type">
+        <template slot-scope="scope">
+          <span>{{ sourceList[scope.row.source] }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="购票数量" align="center" prop="quantity" />
+      <el-table-column label="支付总额" align="center" prop="orderPrice">
+        <template slot-scope="scope">
+          <span>¥{{ scope.row.orderPrice }}</span>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="优惠信息" align="center" prop="refundReason" />-->
+      <el-table-column label="支付方式" align="center" prop="type">
+        <template slot-scope="scope">
+          <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>
+        </template>
+      </el-table-column>
+      <el-table-column label="订单状态" align="center" prop="type">
+        <template slot-scope="scope">
+          <span>{{statusList[scope.row.status]}}</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
+            size="mini"
+            type="text"
+            @click="openDetails(scope.row)"
+            v-hasPermi="['orderMr:orderMr:details']"
+          >详情</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"
+    />
+
+    <!-- 详情 -->
+    <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,
+      },
+      statusList: {
+        0: '待支付',
+        2: '超时取消',
+        3: '支付完成,待使用',
+        4: '退款中',
+        5: '己退款',
+        6: '退款失败',
+        7: '己使用',
+        8: '己超期',
+        9: '关闭',
+      },
+      statusMapList: [
+        {id: 1, name: '待支付', value: 0},
+        {id: 2, name: '超时取消', value: 2},
+        {id: 3, name: '支付完成,待使用', value: 3},
+        {id: 4, name: '退款中', value: 4},
+        {id: 5, name: '己退款', value: 5},
+        {id: 6, name: '退款失败', value: 6},
+        {id: 7, name: '己使用', value: 7},
+        {id: 8, name: '己超期', value: 8},
+        {id: 9, name: '关闭', value: 9},
+      ],
+      payList: {
+        0: '未支付',
+        1: '已支付',
+        2: '支付中',
+        3: '支付失败',
+        4: '支付退款',
+      },
+      payWayList: {
+        'cahsh': '现金',
+        'wecaht.applet': '微信小程序支付',
+        'alipay': '支付宝',
+      },
+      sourceList: {
+        1: '小程序',
+        2: '美团',
+        3: '携程',
+      },
+      sourceMapList: [
+        {id: 1, name: '小程序', value: 1},
+        {id: 2, name: '美团', value: 2},
+        {id: 3, name: '携程', value: 3},
+      ],
+      visibleStatus: false,
+      newObj: {},
+      visibleType: ''
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      pageList(this.addDateRange(this.queryParams, this.dateRange))
+      .then(response => {
+          this.dataList = response.data.rows;
+          this.total = response.data.total;
+          this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.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>

+ 30 - 9
src/views/perform/performMr/dialog/addAndEdit.vue

@@ -70,7 +70,7 @@
 </template>
 
 <script>
-import { saveAndEdit } from "@/api/performMr/performMr";
+import { saveAndEdit, getSelectById } from "@/api/performMr/performMr";
 import Editor from "@/components/Editor";
 import { getToken } from "@/utils/auth";
 export default {
@@ -85,6 +85,18 @@ export default {
     Editor,
   },
   data() {
+    var isPhone = (rule, value, callback) => {
+      let reg = /^1[23456789]\d{9}$/;
+      let reg1 = /^(?:(?:\d{3}-)?\d{8}|^(?:\d{4}-)?\d{7,8})(?:-\d+)?$/;
+      if (!reg.test(value)) {
+        if(reg1.test(value)){
+          callback();
+        }
+        callback(new Error('请输入正确开票电话'));
+      } else {
+        callback();
+      }
+    };
     return {
       title: "编辑",
       model: "EDIT",
@@ -97,7 +109,10 @@ export default {
         name: [{ required: true, message: "请输入主办方名你", trigger: "blur" }],
         corporationName: [{ required: true, message: "请输入法人名你", trigger: "blur" }],
         contactName: [{ required: true, message: "请输入负责人名你", trigger: "blur" }],
-        contactMobile: [{ required: true, message: "请输入负责人联系电话", trigger: "blur" }],
+        contactMobile: [
+          { required: true, message: "请输入负责人联系电话", trigger: "blur" },
+          { validator: isPhone, trigger: 'blur' }
+        ],
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",
@@ -116,13 +131,7 @@ export default {
       this.open = true;
       if (obj){
         this.title = "编辑";
-        this.$nextTick(() => {
-          this.$set(this.form, 'id', obj.id);
-          this.$set(this.form, 'name', obj.name);
-          this.$set(this.form, 'corporationName', obj.corporationName);
-          this.$set(this.form, 'contactName', obj.contactName);
-          this.$set(this.form, 'contactMobile', obj.contactMobile);
-        });
+        this.getSelectByIdApi(obj);
       }else{
         this.title = "新增";
         this.$nextTick(() => {
@@ -130,6 +139,18 @@ export default {
         });
       }
     },
+    /** 获取详情 */
+    getSelectByIdApi(row) {
+      const id = row.id
+      getSelectById(id).then(response => {
+        let obj = response.data;
+        this.$set(this.form, 'id', obj.id);
+        this.$set(this.form, 'name', obj.name);
+        this.$set(this.form, 'corporationName', obj.corporationName);
+        this.$set(this.form, 'contactName', obj.contactName);
+        this.$set(this.form, 'contactMobile', obj.contactMobile);
+      });
+    },
     /**
      * 保存
      * @date 2023-11-22

+ 1 - 1
src/views/perform/performMr/index.vue

@@ -176,7 +176,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = [];
-      this.queryParams.name = "";
+      this.$set(this.queryParams, 'name', '');
       this.queryParams.pageNum = 1;
       this.handleQuery();
     },

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

@@ -31,7 +31,7 @@
             <el-form-item label="主办方" prop="sponsorId">
               <el-select
                 v-model="form.sponsorId"
-                placeholder="状态"
+                placeholder="主办方"
                 clearable
                 style="width: 240px"
                 @change="changePerform"
@@ -234,7 +234,7 @@
               <el-button
                 size="mini"
                 type="text"
-                @click="handleDelete(scope.row,scope.index)"
+                @click="handleDelete(scope.row,scope.$index)"
               >删除</el-button>
             </template>
           </el-table-column>

+ 4 - 4
src/views/perform/programmeMr/index.vue

@@ -42,7 +42,7 @@
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd"
-              v-hasPermi="['perform:perform:add']"
+              v-hasPermi="['programmeMr:programmeMr:add']"
             >新增</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -233,9 +233,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = [];
-      this.queryParams.id = "";
-      this.queryParams.name = "";
-      this.queryParams.sponsorName = "";
+      this.$set(this.queryParams, 'id', '');
+      this.$set(this.queryParams, 'name', '');
+      this.$set(this.queryParams, 'sponsorName', '');
       this.queryParams.pageNum = 1;
       this.handleQuery();
     },

+ 1 - 1
src/views/schedulingMr/index.vue

@@ -176,7 +176,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = [];
-      this.queryParams.name = "";
+      this.$set(this.queryParams, 'name', '');
       this.queryParams.pageNum = 1;
       this.handleQuery();
     },

+ 1 - 1
src/views/ticket/priceMr/index.vue

@@ -189,7 +189,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = [];
-      this.queryParams.theatreName = "";
+      this.$set(this.queryParams, 'theatreName', '');
       this.queryParams.pageNum = 1;
       this.handleQuery();
     },

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

@@ -195,7 +195,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = [];
-      this.queryParams.goodsName = "";
+      this.$set(this.queryParams, 'goodsName', '');
       this.queryParams.pageNum = 1;
       this.handleQuery();
     },

+ 2 - 0
src/views/userMr/index.vue

@@ -74,12 +74,14 @@
           <el-button
             size="mini"
             type="text"
+            v-hasPermi="['userMr:userMr:authentication']"
             v-if="scope.row.isAuth == 1"
             @click="updateAuthStatusEven(scope.row)"
           >取消实名认证</el-button>
           <el-button
             size="mini"
             type="text"
+            v-hasPermi="['userMr:userMr:blacklist']"
             v-if="scope.row.isBlackList == 0"
             @click="addBlackListEven(scope.row)"
           >加入黑名单</el-button>

+ 9 - 9
src/views/venue/performanceHallMr/index.vue

@@ -61,12 +61,12 @@
             @click="handleSeat(scope.row)"
             v-hasPermi="['performanceHallMr:performanceHallMr:edit']"
           >座位管理</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleMr(scope.row)"
-            v-hasPermi="['performanceHallMr:performanceHallMr:edit']"
-          >剧目管理</el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            @click="handleMr(scope.row)"-->
+<!--            v-hasPermi="['performanceHallMr:performanceHallMr:edit']"-->
+<!--          >剧目管理</el-button>-->
           <el-button
             size="mini"
             type="text"
@@ -204,9 +204,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = [];
-      this.queryParams.title = "";
-      this.queryParams.status = "";
-      this.queryParams.createBy = "";
+      this.$set(this.queryParams, 'title', '');
+      this.$set(this.queryParams, 'status', '');
+      this.$set(this.queryParams, 'createBy', '');
       this.queryParams.pageNum = 1;
       this.handleQuery();
     },

+ 4 - 4
src/views/venue/schedulingMr/index.vue

@@ -51,7 +51,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd('batch')"
-          v-hasPermi="['schedulingMr:schedulingMr:add']"
+          v-hasPermi="['schedulingMr:schedulingMr:batch']"
         >批量添加</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -208,9 +208,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = [];
-      this.queryParams.theatreName = "";
-      this.queryParams.performDate = "";
-      this.queryParams.performName = "";
+      this.$set(this.queryParams, 'theatreName', '');
+      this.$set(this.queryParams, 'performDate', '');
+      this.$set(this.queryParams, 'performName', '');
       this.queryParams.pageNum = 1;
       this.handleQuery();
     },

+ 2 - 4
src/views/venue/seatTypeMr/index.vue

@@ -3,7 +3,7 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="类型名称">
         <el-input
-          v-model="queryParams.title"
+          v-model="queryParams.name"
           placeholder="请输入类型名称"
           clearable
           style="width: 140px;"
@@ -176,9 +176,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = [];
-      this.queryParams.title = "";
-      this.queryParams.status = "";
-      this.queryParams.createBy = "";
+      this.$set(this.queryParams, 'name', '');
       this.queryParams.pageNum = 1;
       this.handleQuery();
     },

+ 21 - 2
src/views/venue/venueMr/dialog/addAndEdit.vue

@@ -127,6 +127,18 @@ export default {
     Editor,
   },
   data() {
+    var isPhone = (rule, value, callback) => {
+      let reg = /^1[23456789]\d{9}$/;
+      let reg1 = /^(?:(?:\d{3}-)?\d{8}|^(?:\d{4}-)?\d{7,8})(?:-\d+)?$/;
+      if (!reg.test(value)) {
+        if(reg1.test(value)){
+          callback();
+        }
+        callback(new Error('请输入正确的电话'));
+      } else {
+        callback();
+      }
+    };
     return {
       amapVisible: false,
       title: "编辑",
@@ -142,8 +154,14 @@ export default {
         name: [{ required: true, message: "请输入场馆名称", trigger: "blur" }],
         showImg: [{ required: true, message: "请上传场馆图片", trigger: "blur" }],
         contactName: [{ required: true, message: "请输入负责人名称", trigger: "blur" }],
-        contactMobile: [{ required: true, message: "请输入负责人联系电话", trigger: "blur" }],
-        customerServiceMobile: [{ required: true, message: "请输入客服电话", trigger: "blur" }],
+        contactMobile: [
+          { required: true, message: "请输入负责人联系电话", trigger: "blur" },
+          { validator: isPhone, trigger: 'blur' }
+        ],
+        customerServiceMobile: [
+          { required: true, message: "请输入客服电话", trigger: "blur" },
+          { validator: isPhone, trigger: 'blur' }
+        ],
         address: [{ required: true, message: "请选择场馆位置", trigger: "blur" }],
       },
       uploadObj: {
@@ -176,6 +194,7 @@ export default {
     openDialog(title, obj) {
       this.open = true;
       this.openType = "add"
+      this.form = {}
       if (obj){
         if(title == '查看数据'){
           this.title = "场馆管理";

+ 2 - 2
src/views/venue/venueMr/index.vue

@@ -181,7 +181,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = [];
-      this.queryParams.name = '';
+      this.$set(this.queryParams, 'name', '');
       this.queryParams.pageNum = 1;
       this.handleQuery();
     },
@@ -206,7 +206,7 @@ export default {
 
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除数据标题为"' + row.title + '"的数据项?').then(function() {
+      this.$modal.confirm('是否确认删除数据标题为"' + row.name + '"的数据项?').then(function() {
         return deleteById(row.id);
       }).then(() => {
         this.getList();