文件移动和剧目排期功能开发

.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 伟大转折点后台管理系统
+VUE_APP_TITLE = 伟大转折点后台管理系统(开发)
 
 # 开发环境配置
 ENV = 'development'

.env.staging

@@ -1,7 +1,7 @@
 # 页面标题
-VUE_APP_TITLE =伟大转折点后台管理系统
+VUE_APP_TITLE =伟大转折点后台管理系统(测试)
 
-NODE_ENV = production
+NODE_ENV = staging
 
 # 测试环境配置
 ENV = 'staging'

src/api/performanceHallMr/performanceHallMr.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 // 分页查询
-export const pageList = (query) => {
+export const merchantPageList = (query) => {
   return request({
     url: '/merchant/merchantTheatreAuditorium/list',
     method: 'get',

src/api/programmeMr/programmeMr.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 // 分页查询资讯
-export const pageList = (query) => {
+export const goodsPageList = (query) => {
   return request({
     url: '/goods/performInfo/pageList',
     method: 'get',

src/api/schedulingMr/schedulingMr.js

@@ -0,0 +1,38 @@
+import request from '@/utils/request'
+
+// 分页查询剧院
+export const pageList = (query) => {
+  return request({
+    url: '/merchant/merchantPerformTime/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增/修改
+export const saveAndEdit = (data) => {
+  return request({
+    url: '/merchant/merchantPerformTime/insertOrUpdate',
+    method: 'post',
+    data: data
+  })
+}
+
+// 批量添加排期
+export const addSave = (data) => {
+  return request({
+    url: '/merchant/merchantPerformTime/save',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 删除模板
+export const deleteById = (id) => {
+  return request({
+    url: '/merchant/merchantPerformTime/deleteById',
+    method: 'delete',
+    params: {id:id}
+  })
+}

src/api/ticketMr/ticketMr.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 分页查询
 export const pageList = (query) => {
   return request({
-    url: '/scenicgoods/goods/list',
+    url: '/goods/goods/pageList',
     method: 'get',
     params: query
   })

src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: process.env.VUE_APP_TITLE,
+      title: process.env.VUE_APP_TITLE.length < 11 ? process.env.VUE_APP_TITLE : process.env.VUE_APP_TITLE.slice(0, 11),
       logo: logoImg
     }
   }
@@ -60,6 +60,7 @@ export default {
   background: #2b2f3a;
   text-align: center;
   overflow: hidden;
+  word-break: break-all;
 
   & .sidebar-logo-link {
     height: 100%;
@@ -81,6 +82,9 @@ export default {
       font-size: 14px;
       font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
       vertical-align: middle;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 

src/views/perform/index.vue → src/views/information/informationMr/index.vue

@@ -48,7 +48,7 @@
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd"
-              v-hasPermi="['perform:perform:add']"
+              v-hasPermi="['informationMr:informationMr:add']"
             >添加资讯</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -92,21 +92,21 @@
             size="mini"
             type="text"
             @click="ionlineApi(scope.row)"
-            v-hasPermi="['perform:perform:release']"
+            v-hasPermi="['informationMr:informationMr:release']"
           >{{scope.row.status == '1' ? '取消发布' : '发布'}}</el-button>
           <el-button
             size="mini"
             type="text"
             v-if="scope.row.status != '1'"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['perform:perform:edit']"
+            v-hasPermi="['informationMr:informationMr:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             v-if="scope.row.status != '1'"
             @click="handleDelete(scope.row,scope.index)"
-            v-hasPermi="['perform:perform:delete']"
+            v-hasPermi="['informationMr:informationMr:delete']"
           >删除</el-button>
         </template>
       </el-table-column>

src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
-  <div class="login">
+  <div class="login" :class="processClass">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">伟大转折点后台管理系统</h3>
+      <h3 class="title"> {{loginTitle}}</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -71,6 +71,7 @@ export default {
   data() {
     return {
       codeUrl: "",
+      loginTitle: '',
       loginForm: {
         username: "admin",
         password: "admin123",
@@ -92,7 +93,8 @@ export default {
       captchaEnabled: true,
       // 注册开关
       register: false,
-      redirect: undefined
+      redirect: undefined,
+      processClass: ''
     };
   },
   watch: {
@@ -106,6 +108,16 @@ export default {
   created() {
     this.getCode();
     this.getCookie();
+
+    // 根据环境切换名称和背景图
+    this.loginTitle = process.env.VUE_APP_TITLE;
+    if(process.env.NODE_ENV == 'development') { // 开发环境
+      this.processClass = 'login-dev';
+    } else if (process.env.NODE_ENV == 'staging') { // 测试环境
+      this.processClass = 'login-stage';
+    } else if (process.env.NODE_ENV == 'production') { // 生产环境
+      this.processClass = 'login-prod';
+    }
   },
   methods: {
     getCode() {
@@ -163,9 +175,17 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
   background-size: cover;
 }
+.login-prod{
+  background-image: url("../assets/images/login-background.jpg") !important;
+}
+.login-stage{
+  background-image: url("../assets/images/login-bg-img.png") !important;
+}
+.login-dev{
+  background-image: url("../assets/images/login-background.jpg") !important;
+}
 .title {
   margin: 0px auto 30px auto;
   text-align: center;

src/views/programmeMr/index.vue → src/views/perform/programmeMr/index.vue

@@ -158,7 +158,7 @@
 
 <script>
 
-import { pageList, deleteById, online } from '@/api/programmeMr/programmeMr'
+import { goodsPageList, deleteById, online } from '@/api/programmeMr/programmeMr'
 import addAndEdit from "./dialog/addAndEdit.vue";
 import detailsDia from "./dialog/details.vue";
 import programmeAddAndEdit from "./dialog/programmeAddAndEdit.vue";
@@ -213,7 +213,7 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      pageList(this.addDateRange(this.queryParams, this.dateRange))
+      goodsPageList(this.addDateRange(this.queryParams, this.dateRange))
       .then(response => {
           this.dataList = response.data.rows;
           this.total = response.data.total;

src/views/schedulingMr/dialog/addAndEdit.vue

@@ -0,0 +1,229 @@
+<!--
+ * @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="title"
+    :visible.sync="open"
+    width="700px"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="dialog">
+      <el-form :model="form" ref="form" :rules="rules" label-width="120px">
+        <el-form-item label="主办方名你" prop="name">
+          <el-input
+            v-model="form.name"
+            placeholder="主办方名你"
+            clearable
+            style="width: 100%;"
+          />
+        </el-form-item>
+        <el-form-item label="法人" prop="corporationName">
+          <el-input
+            v-model="form.corporationName"
+            placeholder="法人"
+            clearable
+            style="width: 100%;"
+          />
+        </el-form-item>
+        <el-form-item label="负责人" prop="contactName">
+          <el-input
+            v-model="form.contactName"
+            placeholder="负责人"
+            clearable
+            style="width: 100%;"
+          />
+        </el-form-item>
+        <el-form-item label="负责人联系电话" prop="contactMobile">
+          <el-input
+            v-model="form.contactMobile"
+            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
+        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/performMr/performMr";
+import Editor from "@/components/Editor";
+import { getToken } from "@/utils/auth";
+export default {
+  name: "addAndEdit",
+  props: {
+    dict: {
+      type: Object,
+      default: () => [],
+    },
+  },
+  components: {
+    Editor,
+  },
+  data() {
+    return {
+      title: "编辑",
+      model: "EDIT",
+      open: false,
+      loading: false,
+      form: {
+        id: undefined,
+      },
+      rules: {
+        name: [{ required: true, message: "请输入主办方名你", trigger: "blur" }],
+        corporationName: [{ required: true, message: "请输入法人名你", trigger: "blur" }],
+        contactName: [{ required: true, message: "请输入负责人名你", trigger: "blur" }],
+        contactMobile: [{ required: true, message: "请输入负责人联系电话", trigger: "blur" }],
+      },
+      uploadObj: {
+        url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",
+        Headers: { Authorization: "Bearer " + getToken() },
+      },
+    };
+  },
+  methods: {
+    /**
+     * 打开弹框
+     * @date 2023-11-22
+     * @param {any} obj
+     * @returns {any}
+     */
+    openDialog(title, obj) {
+      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);
+        });
+      }else{
+        this.title = "新增";
+        this.$nextTick(() => {
+          this.$refs["form"].clearValidate();
+        });
+      }
+    },
+    /**
+     * 保存
+     * @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.$refs["form"].resetFields();
+      this.form.id = undefined;
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @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, 'mainImg', 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;
+}
+.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>

src/views/schedulingMr/index.vue

@@ -0,0 +1,215 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="主办方名称">
+        <el-input
+          v-model="queryParams.name"
+          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">
+      <el-col :span="1.5">
+        <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['performMr:performMr:add']"
+            >新增</el-button>
+      </el-col>
+      <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="法人" align="center" prop="corporationName" />
+      <el-table-column label="主办方负责人" align="center" prop="contactName" />
+      <el-table-column label="负责人联系电话" align="center" prop="contactMobile" />
+      <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"
+            v-if="scope.row.status != '1'"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['performMr:performMr:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            v-if="scope.row.status != '1'"
+            @click="handleDelete(scope.row,scope.index)"
+            v-hasPermi="['performMr:performMr: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"
+    />
+
+    <!-- 新增/编辑弹框 -->
+    <add-and-edit
+      ref="addAndEdit"
+      :dict="dict"
+      @getList="getList"
+    />
+
+
+    <el-dialog
+      title="查看"
+      :visible.sync="visibleStatus"
+      width="600px"
+      :destroy-on-close="true"
+      :close-on-click-modal="false"
+    >
+      <div v-if="visibleType == 'img'">
+        <el-image
+          style="width: 400px; height: 100%"
+          :src="newObj.mainImg"
+          fit="cover"
+        />
+      </div>
+      <div v-if="visibleType == 'html'">
+        <div v-html="newObj.centent"></div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="visibleStatus = false">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+import { pageList, deleteById } from '@/api/performMr/performMr'
+import addAndEdit from "./dialog/addAndEdit.vue";
+
+export default {
+  name: "agreement",
+  dicts: ['agreement_type'],
+  components: { addAndEdit },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      dataList: null,
+      // 弹出层标题
+      title: "",
+
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type: undefined
+      },
+      statusList: [
+        {id: 1, name: '未发布', value: 0},
+        {id: 2, name: '发布', value: 1},
+        {id: 3, name: '下架', value: 2},
+      ],
+      visibleStatus: false,
+      newObj: {},
+      visibleType: ''
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      pageList(this.addDateRange(this.queryParams, this.dateRange))
+      .then(response => {
+          this.dataList = response.data.rows;
+          this.total = response.data.total;
+          this.loading = false;
+        }
+      );
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.queryParams.name = "";
+      this.queryParams.pageNum = 1;
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.userId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.$refs["addAndEdit"].openDialog("新增数据", null);
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.$refs["addAndEdit"].openDialog("修改数据", row);
+    },
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除数据主办方名你为"' + row.name + '"的数据项？').then(function() {
+        return deleteById(row.id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 查看按钮操作 */
+    seeCenter(obj, type) {
+      this.visibleStatus = true
+      this.visibleType = type;
+      this.newObj = obj;
+    }
+  }
+};
+</script>

src/views/ticket/priceMr/dialog/addAndEdit.vue

@@ -0,0 +1,347 @@
+<!--
+ * @Description: 新增/编辑弹框
+ * @Author: Sugar.
+ * @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
+ * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
+-->
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="900px"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="dialog">
+      <el-form :model="form" ref="form" :rules="rules" label-width="120px">
+        <el-form-item label="票务选择:" prop="venueId">
+          <el-select
+            v-model="form.venueId"
+            placeholder="选择票务"
+            clearable
+            @change="changeTheatre"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in theatreList"
+              :key="dict.id"
+              :label="dict.name"
+              :value="dict.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="选择场馆:" prop="venueId">
+          <el-select
+            v-model="form.venueId"
+            placeholder="选择场馆"
+            clearable
+            @change="changeTheatre"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in theatreList"
+              :key="dict.id"
+              :label="dict.name"
+              :value="dict.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="选择演出厅:" prop="auditoriumId">
+          <el-select
+            v-model="form.auditoriumId"
+            placeholder="选择演出厅"
+            clearable
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in merchantList"
+              :key="dict.id"
+              :label="dict.name"
+              :value="dict.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="选择剧目:" prop="performId">
+          <el-select
+            v-model="form.performId"
+            placeholder="选择剧目"
+            clearable
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in goodsList"
+              :key="dict.id"
+              :label="dict.name"
+              :value="dict.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="选择座位类型:" prop="performId">
+          <el-select
+            v-model="form.performId"
+            placeholder="座位类型"
+            clearable
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in goodsList"
+              :key="dict.id"
+              :label="dict.name"
+              :value="dict.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="结算方式:" prop="performDate">
+          <el-radio v-model="form.type" label="1">基于票务类型打折</el-radio>
+          <el-radio v-model="form.type" label="2">固定值</el-radio>
+        </el-form-item>
+        <el-form-item label="价格:">
+          <el-input
+            v-model="form.name"
+            placeholder=""
+            clearable
+            style="width: 160px;"
+          >
+            <template slot="append">{{ form.type == 1 ? '%' : '元' }}</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, addSave } from "@/api/schedulingMr/schedulingMr";
+import { pageList } from "@/api/venueMr/venueMr";
+import { goodsPageList } from '@/api/programmeMr/programmeMr'
+import { merchantPageList } from '@/api/performanceHallMr/performanceHallMr'
+import Editor from "@/components/Editor";
+import { getToken } from "@/utils/auth";
+export default {
+  name: "addAndEdit",
+  props: {
+    dict: {
+      type: Object,
+      default: () => [],
+    },
+  },
+  components: {
+    Editor,
+  },
+  data() {
+    return {
+      title: "编辑",
+      model: "EDIT",
+      open: false,
+      loading: false,
+      tableType: false,
+      form: {
+        id: undefined,
+        timeList: [],
+        insertType: '1'
+      },
+      rules: {
+        venueId: [{ required: true, message: "请选择场馆", trigger: "blur" }],
+        auditoriumId: [{ required: true, message: "请选择演出厅", trigger: "blur" }],
+        performId: [{ required: true, message: "请选择剧目", trigger: "blur" }],
+        performDate: [{ required: true, message: "请选择日期", trigger: "blur" }],
+        timeList: [{ 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,
+    };
+  },
+  methods: {
+    /**
+     * 打开弹框
+     * @date 2023-11-22
+     * @param {any} obj
+     * @returns {any}
+     */
+    openDialog(title, obj, type) {
+      this.open = true;
+      this.editType = false;
+      this.getList();
+      this.goodsPageList();
+      // this.merchantPageList();
+      if (obj){
+        this.title = "编辑票务价格";
+        this.form.insertType = '1';
+        this.editType = true;
+        this.$nextTick(() => {
+          this.$set(this.form, 'id', obj.id);
+          this.$set(this.form, 'performDate', obj.performDate);
+          this.$set(this.form, 'performId', obj.performId);
+          this.$set(this.form, 'auditoriumId', obj.auditoriumId);
+          this.$set(this.form, 'theatreName', obj.theatreName);
+          this.getList(obj.theatreName);
+          let map = {
+            name: obj.timeSnapshot,
+            performTimeStart: obj.performTimeStart,
+            performTimeEnd: obj.performTimeEnd,
+          }
+          this.form.timeList = []
+          this.$set(this.form.timeList, 0, map);
+        });
+      }else{
+        this.title = "新增票务价格";
+        this.form = {
+            id: undefined,
+            timeList: []
+        };
+        if(type){
+          this.form.insertType = '2';
+        } else {
+          this.form.insertType = '1';
+        }
+        this.$nextTick(() => {
+          this.$refs["form"].clearValidate();
+        });
+      }
+    },
+    /** 场馆列表查询 */
+    getList(name) {
+      pageList(this.addDateRange({pageNum: 1, pageSize: 100}))
+        .then(response => {
+            this.theatreList = response.data.rows;
+            if(name){
+              this.theatreList.forEach(item => {
+                this.$set(this.form, 'venueId', item.id)
+              })
+            }
+            this.merchantPageList(this.form.venueId)
+          }
+        );
+    },
+    /** 场馆选择 */
+    changeTheatre(id) {
+      this.merchantPageList(id)
+    },
+    /** 剧目列表查询 */
+    goodsPageList() {
+      goodsPageList(this.addDateRange({pageNum: 1, pageSize: 100}))
+        .then(response => {
+            this.goodsList = response.data.rows;
+          }
+        );
+    },
+    /** 演出厅列表查询 */
+    merchantPageList(id) {
+      merchantPageList(this.addDateRange({theatreId: id, pageNum: 1, pageSize: 100}))
+        .then(response => {
+            this.merchantList = response.data.rows;
+          }
+        );
+    },
+
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(async (valid) => {
+        if (valid) {
+          try {
+            if(this.form.insertType == '2') {
+              this.form.performStartDate = this.form.performDate[0];
+              this.form.performEndDate = this.form.performDate[1];
+            }
+            let postEdit = {}
+            if(this.editType) {
+              postEdit.performTimeStart = this.form.timeList[0].performTimeStart
+              postEdit.performTimeEnd = this.form.timeList[0].performTimeEnd
+              postEdit.timeSnapshot = this.form.timeList[0].name
+              postEdit.performId = this.form.performId
+              postEdit.auditoriumId = this.form.auditoriumId
+              postEdit.performDate = this.form.performDate
+              postEdit.id = this.form.id
+            }
+            this.loading = true;
+            const { code } = this.form.insertType == '2' ? await addSave({ ...this.form }) : await saveAndEdit({ ...postEdit });
+            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.$refs["form"].resetFields();
+      this.form.id = undefined;
+    },
+    /**
+     * 关闭弹框
+     * @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>

src/views/ticket/priceMr/index.vue

@@ -0,0 +1,222 @@
+<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="70px">
+        <el-input
+          v-model="queryParams.theatreName"
+          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">
+      <el-col :span="1.5">
+        <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd(null)"
+              v-hasPermi="['priceMr:priceMr:add']"
+            >添加</el-button>
+      </el-col>
+      <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="票务ID" align="center" prop="theatreName" />
+      <el-table-column label="票务名称" align="center" prop="auditoriumName" />
+      <el-table-column label="场馆名称" align="center" prop="performName" />
+      <el-table-column label="演出厅名称" align="center" prop="performName" />
+      <el-table-column label="剧目名称" align="center" prop="performName" />
+      <el-table-column label="座位类型" align="center" prop="performDate" />
+      <el-table-column label="销售价" align="center" prop="performTimeStart" width="160">
+        <template slot-scope="scope">
+          <span>{{ scope.row.performTimeStart }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="添加时间" align="center" prop="performTimeEnd" width="160">
+        <template slot-scope="scope">
+          <span>{{ scope.row.performTimeEnd }}</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="handleUpdate(scope.row)"
+            v-hasPermi="['priceMr:priceMr:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDelete(scope.row,scope.index)"
+            v-hasPermi="['priceMr:priceMr: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"
+    />
+
+    <!-- 新增/编辑弹框 -->
+    <add-and-edit
+      ref="addAndEdit"
+      :dict="dict"
+      @getList="getList"
+    />
+
+
+    <el-dialog
+      title="查看"
+      :visible.sync="visibleStatus"
+      width="600px"
+      :destroy-on-close="true"
+      :close-on-click-modal="false"
+    >
+      <div v-if="visibleType == 'img'">
+        <el-image
+          style="width: 400px; height: 100%"
+          :src="newObj.mainImg"
+          fit="cover"
+        />
+      </div>
+      <div v-if="visibleType == 'html'">
+        <div v-html="newObj.centent"></div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="visibleStatus = false">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+import { pageList, deleteById } from '@/api/schedulingMr/schedulingMr'
+import addAndEdit from "./dialog/addAndEdit.vue";
+
+export default {
+  name: "agreement",
+  dicts: ['agreement_type'],
+  components: { addAndEdit },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      dataList: null,
+      // 弹出层标题
+      title: "",
+
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type: undefined
+      },
+      statusList: [
+        {id: 1, name: '未发布', value: 0},
+        {id: 2, name: '发布', value: 1},
+        {id: 3, name: '下架', value: 2},
+      ],
+      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;
+        }
+      ).catch(() => {
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.queryParams.theatreName = "";
+      this.queryParams.pageNum = 1;
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.userId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd(type) {
+      this.$refs["addAndEdit"].openDialog("新增数据", null, type);
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.$refs["addAndEdit"].openDialog("修改数据", row);
+    },
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除该数据？').then(function() {
+        return deleteById(row.id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 查看按钮操作 */
+    seeCenter(obj, type) {
+      this.visibleStatus = true
+      this.visibleType = type;
+      this.newObj = obj;
+    }
+  }
+};
+</script>

src/views/ticketMr/dialog/addAndEdit.vue → src/views/ticket/ticketMr/dialog/addAndEdit.vue

@@ -28,14 +28,13 @@
                 clearable
               />
             </el-form-item>
-            <el-form-item label="使用年龄:" prop="sponsorId">
-              <el-radio v-model="form.type" label="1">不限制</el-radio>
-              <el-radio v-model="form.type" label="2">限制</el-radio>
-            </el-form-item>
-            <el-form-item label="实名信息:" prop="status">
+            <el-form-item label="实名信息:" prop="sponsorId">
               <el-radio v-model="form.type" label="1">全部观影人员均实名</el-radio>
-              <el-radio v-model="form.type" label="2">1位观影人员实名即可</el-radio>
             </el-form-item>
+<!--            <el-form-item label="实名信息:" prop="status">-->
+<!--              <el-radio v-model="form.type" label="1">全部观影人员均实名</el-radio>-->
+<!--              <el-radio v-model="form.type" label="2">1位观影人员实名即可</el-radio>-->
+<!--            </el-form-item>-->
             <el-form-item label="核销播报次数:" prop="name">
               <el-input
                 v-model="form.name"
@@ -46,11 +45,29 @@
                 <template slot="append">次</template>
               </el-input>
             </el-form-item>
+            <el-form-item label="票务说明:" prop="sponsorId">
+              <el-input
+                type="textarea"
+                :rows="2"
+                placeholder="请输入内容"
+                v-model="form.textarea">
+              </el-input>
+            </el-form-item>
           </el-tab-pane>
 
           <!--    销售信息     -->
           <el-tab-pane label="销售信息" name="02">
-            <el-form-item label="原价:" label-width="100px" style="margin-top: 20px">
+<!--            <el-form-item label="原价:" label-width="100px" style="margin-top: 20px">-->
+<!--              <el-input-->
+<!--                v-model="form.name"-->
+<!--                placeholder="原价"-->
+<!--                clearable-->
+<!--                style="width: 100%;"-->
+<!--              >-->
+<!--                <template slot="append">元</template>-->
+<!--              </el-input>-->
+<!--            </el-form-item>-->
+            <el-form-item label="销售价:" label-width="100px">
               <el-input
                 v-model="form.name"
                 placeholder="原价"
@@ -60,42 +77,45 @@
                 <template slot="append">元</template>
               </el-input>
             </el-form-item>
-            <el-form-item label="销售价:" label-width="100px">
+            <el-form-item label="每日限售:" prop="status" label-width="100px">
               <el-input
                 v-model="form.name"
-                placeholder="原价"
+                placeholder="每日限售"
                 clearable
                 style="width: 100%;"
               >
                 <template slot="append">元</template>
               </el-input>
             </el-form-item>
-            <el-form-item label="每日限售:" prop="status" label-width="100px">
-              <el-radio v-model="form.type" label="1">不限</el-radio>
-              <el-radio v-model="form.type" label="2">限制</el-radio>
-            </el-form-item>
-            <el-form-item label="每日限售:" prop="status" label-width="100px">
-              <el-radio v-model="form.type" label="1">不限</el-radio>
-              <el-radio v-model="form.type" label="2">限制</el-radio>
-            </el-form-item>
-            <el-form-item label="是否限购:" prop="status" label-width="100px">
+            <el-form-item label="是否限购:" prop="status" label-width="100px" style="margin-bottom: 10px">
               <el-radio v-model="form.type" label="1">是</el-radio>
               <el-radio v-model="form.type" label="2">否</el-radio>
             </el-form-item>
-            <el-form-item label="售票时间:" prop="status" label-width="100px">
-              <el-radio v-model="form.ticketing" label="1">不限</el-radio>
-              <el-radio v-model="form.ticketing" label="2">限制</el-radio>
-            </el-form-item>
-            <el-form-item label="限制时间段:" v-if="form.ticketing == 2" label-width="100px">
-              <el-date-picker
-                v-model="form.value1"
-                type="datetimerange"
-                value-format="yyyy-MM-dd  HH:mm:ss"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期">
-              </el-date-picker>
+            <el-form-item label="" prop="status" label-width="100px">
+              <span><span style="color: red">*</span>每个账号在每个场次限购</span>
+              <el-input
+                v-model.number="form.name"
+                placeholder=""
+                clearable
+                style="width: 140px;margin-left: 5px"
+              >
+                <template slot="append">张</template>
+              </el-input>
             </el-form-item>
+<!--            <el-form-item label="售票时间:" prop="status" label-width="100px">-->
+<!--              <el-radio v-model="form.ticketing" label="1">不限</el-radio>-->
+<!--              <el-radio v-model="form.ticketing" label="2">限制</el-radio>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="限制时间段:" v-if="form.ticketing == 2" label-width="100px">-->
+<!--              <el-date-picker-->
+<!--                v-model="form.value1"-->
+<!--                type="datetimerange"-->
+<!--                value-format="yyyy-MM-dd  HH:mm:ss"-->
+<!--                range-separator="至"-->
+<!--                start-placeholder="开始日期"-->
+<!--                end-placeholder="结束日期">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
             <el-form-item label="售票渠道:" prop="status" label-width="100px">
               <el-checkbox v-model="form.xcx">小程序</el-checkbox>
               <el-checkbox v-model="form.ck">窗口</el-checkbox>
@@ -104,46 +124,65 @@
 
           <!--    退票信息     -->
           <el-tab-pane label="退票信息" name="03">
-            <el-form-item label="是否支持退票:" prop="status" label-width="180px">
+            <el-form-item label="是否支持退票:" prop="status" label-width="120px">
               <el-radio v-model="form.type" label="1">是</el-radio>
               <el-radio v-model="form.type" label="2">否</el-radio>
             </el-form-item>
-            <el-form-item label="是否支持退票:" prop="status" label-width="180px">
-              <el-radio v-model="form.type" label="1">百分比</el-radio>
-              <el-radio v-model="form.type" label="2">固定值</el-radio>
+            <el-form-item label="退票时间:" prop="status" label-width="120px" style="margin-bottom: 10px">
+              <el-radio v-model="form.type" label="1">按购买日期结算</el-radio>
             </el-form-item>
-            <el-form-item label="手续费类型与扣费规则:" prop="status" label-width="180px">
-              <div>
-                <div style="margin-bottom: 10px">
-                  <span style="padding-right: 5px">演出开始前</span>
-                  <el-input v-model="form.name" placeholder="票务名称" style="width: 120px" clearable />
-                  <span style="padding-left: 5px">分钟以上，  </span>
-                  <span style="padding-right: 5px">收取</span>
-                  <el-input v-model="form.name" placeholder="票务名称" style="width: 120px" clearable />
-                  <span style="padding-left: 5px">元</span>
-                  <el-button style="padding-left: 15px" type="text">添加</el-button>
-                </div>
-              </div>
-              <div>
-                <span style="padding-right: 5px">演出开始前</span>
-                <el-input v-model="form.name" placeholder="票务名称" style="width: 120px" clearable />
-                <span style="padding-left: 5px">分钟以上，  </span>
-                <span>不允许退票</span>
-              </div>
+            <el-form-item label="" prop="status" label-width="120px">
+              <span>提前</span>
+              <el-input
+                v-model.number="form.name"
+                placeholder=""
+                clearable
+                style="width: 140px;margin-left: 5px"
+              />
+              <span style="padding: 0 10px">天</span>
+              <el-time-select
+                v-model="form.value"
+                :picker-options="{ start: '08:30', step: '00:15', end: '18:30'}"
+                placeholder="选择时间">
+              </el-time-select>
+              <span style="padding-left: 10px">可退</span>
             </el-form-item>
+<!--            <el-form-item label="是否支持退票:" prop="status" label-width="180px">-->
+<!--              <el-radio v-model="form.type" label="1">百分比</el-radio>-->
+<!--              <el-radio v-model="form.type" label="2">固定值</el-radio>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="手续费类型与扣费规则:" prop="status" label-width="180px">-->
+<!--              <div>-->
+<!--                <div style="margin-bottom: 10px">-->
+<!--                  <span style="padding-right: 5px">演出开始前</span>-->
+<!--                  <el-input v-model="form.name" placeholder="票务名称" style="width: 120px" clearable />-->
+<!--                  <span style="padding-left: 5px">分钟以上，  </span>-->
+<!--                  <span style="padding-right: 5px">收取</span>-->
+<!--                  <el-input v-model="form.name" placeholder="票务名称" style="width: 120px" clearable />-->
+<!--                  <span style="padding-left: 5px">元</span>-->
+<!--                  <el-button style="padding-left: 15px" type="text">添加</el-button>-->
+<!--                </div>-->
+<!--              </div>-->
+<!--              <div>-->
+<!--                <span style="padding-right: 5px">演出开始前</span>-->
+<!--                <el-input v-model="form.name" placeholder="票务名称" style="width: 120px" clearable />-->
+<!--                <span style="padding-left: 5px">分钟以上，  </span>-->
+<!--                <span>不允许退票</span>-->
+<!--              </div>-->
+<!--            </el-form-item>-->
           </el-tab-pane>
 
           <!--    选座信息     -->
-          <el-tab-pane label="选座信息" name="04">
-            <el-form-item label="是否支持选座:" prop="status">
-              <el-radio v-model="form.type" label="1">是</el-radio>
-              <el-radio v-model="form.type" label="2">否</el-radio>
-            </el-form-item>
-            <el-form-item label="选座渠道:" prop="status">
-              <el-checkbox v-model="form.xcx">小程序</el-checkbox>
-              <el-checkbox v-model="form.ck">窗口</el-checkbox>
-            </el-form-item>
-          </el-tab-pane>
+<!--          <el-tab-pane label="选座信息" name="04">-->
+<!--            <el-form-item label="是否支持选座:" prop="status">-->
+<!--              <el-radio v-model="form.type" label="1">是</el-radio>-->
+<!--              <el-radio v-model="form.type" label="2">否</el-radio>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="选座渠道:" prop="status">-->
+<!--              <el-checkbox v-model="form.xcx">小程序</el-checkbox>-->
+<!--              <el-checkbox v-model="form.ck">窗口</el-checkbox>-->
+<!--            </el-form-item>-->
+<!--          </el-tab-pane>-->
         </el-tabs>
       </el-form>
     </div>

src/views/ticketMr/index.vue → src/views/ticket/ticketMr/index.vue

@@ -41,29 +41,29 @@
 
     <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="票务ID" align="center" prop="name" />
-      <el-table-column label="票务名称" align="center" prop="name" />
+      <el-table-column label="票务ID" align="center" prop="id" />
+      <el-table-column label="票务名称" align="center" prop="goodsName" />
       <el-table-column label="原价" align="center" prop="type">
         <template slot-scope="scope">
-
+          <span>￥{{ scope.row.costPrice }}</span>
         </template>
       </el-table-column>
       <el-table-column label="销售价" align="center" prop="type">
         <template slot-scope="scope">
-
+          <span>￥{{ scope.row.salePrice }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="库存" align="center" prop="name" />
-      <el-table-column label="销售时间段" align="center" prop="name" />
-      <el-table-column label="售票渠道" align="center" prop="name" />
-      <el-table-column label="售票渠道" align="center" prop="type">
-        <template slot-scope="scope">
+      <el-table-column label="库存" align="center" prop="quantity" />
+<!--      <el-table-column label="销售时间段" align="center" prop="name" />-->
+<!--      <el-table-column label="售票渠道" align="center" prop="type">-->
+<!--        <template slot-scope="scope">-->
 
-        </template>
-      </el-table-column>
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="是否可退" align="center" prop="type">
         <template slot-scope="scope">
-
+          <el-tag type="success" v-if="scope.row.goodsPerform.backStatus == 0">可退</el-tag>
+          <el-tag type="danger" v-if="scope.row.goodsPerform.backStatus == 1">不可退</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="type">
@@ -78,9 +78,9 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="添加时间" align="center" prop="onlineTime" width="160" >
+      <el-table-column label="添加时间" align="center" prop="createTime" width="160" >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.onlineTime) }}</span>
+          <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
 
@@ -130,7 +130,7 @@
 
 <script>
 
-import { pageList, deleteById, online } from '@/api/programmeMr/programmeMr'
+import { pageList, deleteById } from '@/api/ticketMr/ticketMr'
 import addAndEdit from "./dialog/addAndEdit.vue";
 import detailsDia from "./dialog/details.vue";
 
@@ -165,7 +165,9 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        type: undefined
+        type: undefined,
+        goodsType: 2,
+        classifyId: 1
       },
       statusList: [
         {id: 1, name: '未发布', value: 0},

src/views/performanceHallMr/dialog/seatTemplateEdit.vue → src/views/venue/performanceHallMr/dialog/seatTemplateEdit.vue

@@ -414,7 +414,7 @@ export default {
         border: 1px solid #7d7d7e;
         margin-right: 2px;
         cursor: pointer;
-        background: url("../../../assets/images/seat-icon.png") no-repeat;
+        background: url("../../../../assets/images/seat-icon.png") no-repeat;
         background-size: 100% 100%;
 
         &:hover{

src/views/performanceHallMr/index.vue → src/views/venue/performanceHallMr/index.vue

@@ -129,7 +129,7 @@
 
 <script>
 
-import { pageList, deleteById } from '@/api/performanceHallMr/performanceHallMr'
+import { merchantPageList, deleteById } from '@/api/performanceHallMr/performanceHallMr'
 import addAndEdit from "./dialog/addAndEdit.vue";
 import seatTemplateEdit from "./dialog/seatTemplateEdit.vue";
 import programmeAddAndEdit from "./dialog/programmeAddAndEdit.vue";
@@ -184,7 +184,7 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      pageList(this.addDateRange(this.queryParams, this.dateRange))
+      merchantPageList(this.addDateRange(this.queryParams, this.dateRange))
       .then(response => {
           this.dataList = response.data.rows;
           this.total = response.data.total;

src/views/venue/schedulingMr/dialog/addAndEdit.vue

@@ -0,0 +1,475 @@
+<!--
+ * @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="title"
+    :visible.sync="open"
+    width="900px"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="dialog">
+      <el-form :model="form" ref="form" :rules="rules" label-width="120px">
+        <el-form-item label="选择场馆" prop="venueId">
+          <el-select
+            v-model="form.venueId"
+            placeholder="选择场馆"
+            clearable
+            @change="changeTheatre"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in theatreList"
+              :key="dict.id"
+              :label="dict.name"
+              :value="dict.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="选择演出厅" prop="auditoriumId">
+          <el-select
+            v-model="form.auditoriumId"
+            placeholder="选择演出厅"
+            clearable
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in merchantList"
+              :key="dict.id"
+              :label="dict.name"
+              :value="dict.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="选择剧目" prop="performId">
+          <el-select
+            v-model="form.performId"
+            placeholder="选择剧目"
+            clearable
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in goodsList"
+              :key="dict.id"
+              :label="dict.name"
+              :value="dict.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="选择日期" v-if="form.insertType == '2'" prop="performDate">
+          <el-date-picker
+            v-model="form.performDate"
+            type="daterange"
+            range-separator="至"
+            value-format="yyyy-MM-dd"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="选择日期" v-if="form.insertType == '1'" prop="performDate">
+          <el-date-picker
+            v-model="form.performDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="场次排期" prop="timeList" v-if="!editType">
+          <el-button type="primary" size="small" @click="addTable">添加</el-button>
+        </el-form-item>
+
+        <el-form-item label="" v-if="form.timeList && form.timeList.length > 0">
+          <el-table ref="tables" v-loading="loading" :data="form.timeList" border>
+            <el-table-column label="序号" align="center" type="index" width="50"></el-table-column>
+            <el-table-column label="场次名称" align="center">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.name" placeholder="请输入内容"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="开始时间" align="center">
+              <template slot-scope="scope">
+                <el-time-select
+                  v-model="scope.row.performTimeStart"
+                  style="width: 100%"
+                  @change="changValue(scope.row, 'start', scope.$index)"
+                  :picker-options="{ start: '08:00', step: '00:15', end: '23:30'}"
+                  placeholder="选择时间">
+                </el-time-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="结束时间" align="center">
+              <template slot-scope="scope">
+                <el-time-select
+                  v-model="scope.row.performTimeEnd"
+                  style="width: 100%"
+                  @change="changValue(scope.row, 'end', scope.$index)"
+                  :picker-options="{ start: '08:00', step: '00:15', end: '23:30'}"
+                  placeholder="选择时间">
+                </el-time-select>
+              </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="handleDelete(scope.row,scope.index)"
+                >删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </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, addSave } from "@/api/schedulingMr/schedulingMr";
+import { pageList } from "@/api/venueMr/venueMr";
+import { goodsPageList } from '@/api/programmeMr/programmeMr'
+import { merchantPageList } from '@/api/performanceHallMr/performanceHallMr'
+import Editor from "@/components/Editor";
+import { getToken } from "@/utils/auth";
+export default {
+  name: "addAndEdit",
+  props: {
+    dict: {
+      type: Object,
+      default: () => [],
+    },
+  },
+  components: {
+    Editor,
+  },
+  data() {
+    return {
+      title: "编辑",
+      model: "EDIT",
+      open: false,
+      loading: false,
+      tableType: false,
+      form: {
+        id: undefined,
+        timeList: [],
+        insertType: '1'
+      },
+      rules: {
+        venueId: [{ required: true, message: "请选择场馆", trigger: "blur" }],
+        auditoriumId: [{ required: true, message: "请选择演出厅", trigger: "blur" }],
+        performId: [{ required: true, message: "请选择剧目", trigger: "blur" }],
+        performDate: [{ required: true, message: "请选择日期", trigger: "blur" }],
+        timeList: [{ 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,
+    };
+  },
+  methods: {
+    /**
+     * 打开弹框
+     * @date 2023-11-22
+     * @param {any} obj
+     * @returns {any}
+     */
+    openDialog(title, obj, type) {
+      this.open = true;
+      this.editType = false;
+      this.getList();
+      this.goodsPageList();
+      // this.merchantPageList();
+      if (obj){
+        this.title = "编辑排期";
+        this.form.insertType = '1';
+        this.editType = true;
+        this.$nextTick(() => {
+          this.$set(this.form, 'id', obj.id);
+          this.$set(this.form, 'performDate', obj.performDate);
+          this.$set(this.form, 'performId', obj.performId);
+          this.$set(this.form, 'auditoriumId', obj.auditoriumId);
+          this.$set(this.form, 'theatreName', obj.theatreName);
+          this.getList(obj.theatreName);
+          let map = {
+            name: obj.timeSnapshot,
+            performTimeStart: obj.performTimeStart,
+            performTimeEnd: obj.performTimeEnd,
+          }
+          this.form.timeList = []
+          this.$set(this.form.timeList, 0, map);
+        });
+      }else{
+        this.title = "新增排期";
+        this.form = {
+            id: undefined,
+            timeList: []
+        };
+        if(type){
+          this.form.insertType = '2';
+        } else {
+          this.form.insertType = '1';
+        }
+        this.$nextTick(() => {
+          this.$refs["form"].clearValidate();
+        });
+      }
+    },
+    /** 场馆列表查询 */
+    getList(name) {
+      pageList(this.addDateRange({pageNum: 1, pageSize: 100}))
+        .then(response => {
+            this.theatreList = response.data.rows;
+            if(name){
+              this.theatreList.forEach(item => {
+                this.$set(this.form, 'venueId', item.id)
+              })
+            }
+            this.merchantPageList(this.form.venueId)
+          }
+        );
+    },
+    /** 场馆选择 */
+    changeTheatre(id) {
+      this.merchantPageList(id)
+    },
+    /** 剧目列表查询 */
+    goodsPageList() {
+      goodsPageList(this.addDateRange({pageNum: 1, pageSize: 100}))
+        .then(response => {
+            this.goodsList = response.data.rows;
+          }
+        );
+    },
+    /** 演出厅列表查询 */
+    merchantPageList(id) {
+      merchantPageList(this.addDateRange({theatreId: id, pageNum: 1, pageSize: 100}))
+        .then(response => {
+            this.merchantList = response.data.rows;
+          }
+        );
+    },
+
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(async (valid) => {
+        if (valid) {
+          try {
+            if(this.form.insertType == '2') {
+              this.form.performStartDate = this.form.performDate[0];
+              this.form.performEndDate = this.form.performDate[1];
+            }
+            let postEdit = {}
+            if(this.editType) {
+              postEdit.performTimeStart = this.form.timeList[0].performTimeStart
+              postEdit.performTimeEnd = this.form.timeList[0].performTimeEnd
+              postEdit.timeSnapshot = this.form.timeList[0].name
+              postEdit.performId = this.form.performId
+              postEdit.auditoriumId = this.form.auditoriumId
+              postEdit.performDate = this.form.performDate
+              postEdit.id = this.form.id
+            }
+            this.loading = true;
+            const { code } = this.form.insertType == '2' ? await addSave({ ...this.form }) : await saveAndEdit({ ...postEdit });
+            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.$refs["form"].resetFields();
+      this.form.id = undefined;
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @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, 'mainImg', 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;
+    },
+
+    /** 点击添加排期 */
+    addTable() {
+      let map = {
+        name: '',
+        performTimeStart: '',
+        startM: '',
+        performTimeEnd: '',
+        endM: '',
+        err: false,
+      }
+      this.form.timeList.push(map)
+    },
+
+    /** 开始时间和结束时间大小判断 */
+    changValue(row, key, $index) {
+      let start = '', startTime = '',  end = '', endTime;
+      if(row.performTimeStart && row.performTimeStart.length > 0) {
+        start = row.performTimeStart.split(":");
+        startTime = (start[0] * 3600) + (start[1] * 60);
+        row.startM = startTime;
+      }
+      if(row.performTimeEnd && row.performTimeEnd.length > 0) {
+        end = row.performTimeEnd.split(":");
+        endTime = (end[0] * 3600) + (end[1] * 60);
+        row.endM = endTime;
+      }
+
+      // 判断场次时间段是否存在冲突
+      let status = false;
+      this.form.timeList.forEach((item, index) => {
+        if($index != index) {
+          if(key == 'start') {
+            if(item.startM <= startTime && startTime <= item.endM) {
+              status = true;
+            }
+          }
+          if (key == 'end') {
+            if(item.startM <= endTime && endTime <= item.endM) {
+              status = true;
+            }
+          }
+        }
+      })
+
+      if(status) {
+        this.$message.error("该场次的时间和其它场次时间段冲突!");
+        if(key == 'start') {
+          row.performTimeStart = ""
+          row.startM = ""
+        } else if (key == 'end') {
+          row.performTimeEnd = ""
+          row.endM = ""
+        }
+        return false;
+      }
+
+      if(key == 'start') {
+        if(endTime && startTime >= endTime) {
+          row.startTime = ""
+          row.startM = ""
+        }
+      } else if (key == 'end') {
+        if(startTime && startTime >= endTime) {
+          row.endTime = ""
+          row.endM = ""
+        }
+      }
+    },
+
+    /** 删除按钮操作 */
+    handleDelete(row, index) {
+      if(this.form.timeList && this.form.timeList.length == 1){
+        this.$message.error("只剩一场次， 不能删除!");
+        return false;
+      }
+      this.$confirm('是否确认删除数据场次名你为"' + row.name + '"的数据项？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.form.timeList.splice(index, 1)
+      }).catch(() => {
+
+      });
+    },
+  },
+};
+</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>

src/views/venue/schedulingMr/index.vue

@@ -0,0 +1,249 @@
+<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="70px">
+        <el-input
+          v-model="queryParams.theatreName"
+          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-date-picker
+          v-model="queryParams.performDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          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">
+      <el-col :span="1.5">
+        <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd(null)"
+              v-hasPermi="['schedulingMr:schedulingMr:add']"
+            >添加</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd('batch')"
+          v-hasPermi="['schedulingMr:schedulingMr:add']"
+        >批量添加</el-button>
+      </el-col>
+      <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="theatreName" />
+      <el-table-column label="演出厅" align="center" prop="auditoriumName" />
+      <el-table-column label="剧目名称" align="center" prop="performName" />
+      <el-table-column label="日期" align="center" prop="performDate" />
+      <el-table-column label="开始时间" align="center" prop="performTimeStart" width="160">
+        <template slot-scope="scope">
+          <span>{{ scope.row.performTimeStart }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="performTimeEnd" width="160">
+        <template slot-scope="scope">
+          <span>{{ scope.row.performTimeEnd }}</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="handleUpdate(scope.row)"
+            v-hasPermi="['schedulingMr:schedulingMr:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDelete(scope.row,scope.index)"
+            v-hasPermi="['schedulingMr:schedulingMr: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"
+    />
+
+    <!-- 新增/编辑弹框 -->
+    <add-and-edit
+      ref="addAndEdit"
+      :dict="dict"
+      @getList="getList"
+    />
+
+
+    <el-dialog
+      title="查看"
+      :visible.sync="visibleStatus"
+      width="600px"
+      :destroy-on-close="true"
+      :close-on-click-modal="false"
+    >
+      <div v-if="visibleType == 'img'">
+        <el-image
+          style="width: 400px; height: 100%"
+          :src="newObj.mainImg"
+          fit="cover"
+        />
+      </div>
+      <div v-if="visibleType == 'html'">
+        <div v-html="newObj.centent"></div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="visibleStatus = false">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+import { pageList, deleteById } from '@/api/schedulingMr/schedulingMr'
+import addAndEdit from "./dialog/addAndEdit.vue";
+
+export default {
+  name: "agreement",
+  dicts: ['agreement_type'],
+  components: { addAndEdit },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      dataList: null,
+      // 弹出层标题
+      title: "",
+
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type: undefined
+      },
+      statusList: [
+        {id: 1, name: '未发布', value: 0},
+        {id: 2, name: '发布', value: 1},
+        {id: 3, name: '下架', value: 2},
+      ],
+      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;
+        }
+      ).catch(() => {
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.queryParams.theatreName = "";
+      this.queryParams.performDate = "";
+      this.queryParams.performName = "";
+      this.queryParams.pageNum = 1;
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.userId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd(type) {
+      this.$refs["addAndEdit"].openDialog("新增数据", null, type);
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.$refs["addAndEdit"].openDialog("修改数据", row);
+    },
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除该数据？').then(function() {
+        return deleteById(row.id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 查看按钮操作 */
+    seeCenter(obj, type) {
+      this.visibleStatus = true
+      this.visibleType = type;
+      this.newObj = obj;
+    }
+  }
+};
+</script>

vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `https://scenicadmin.hw.hongweisoft.com/scenicprod-api`,
+        target: `http://greatadmin.dev.gztjy.top/scenicstage-api`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''