ota功能实现和bug修改

src/api/otaMr/otaMr.js

@@ -0,0 +1,55 @@
+import request from '@/utils/request'
+
+// 分页查询
+export const pageList = (query) => {
+  return request({
+    url: '/thirdapi/otaGoods/pageList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 分页查询
+export const goodsList = (query) => {
+  return request({
+    url: '/thirdapi/otaGoods/goodsList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取OTA配置
+export const getOtaConfig = (query) => {
+  return request({
+    url: '/thirdapi/otaConfig/getInfo',
+    method: 'get',
+    params: query
+  })
+}
+
+// 保存OTA
+export const otaSave = (data) => {
+  return request({
+    url: '/thirdapi/otaConfig/save',
+    method: 'post',
+    data: data
+  })
+}
+
+// 新增/修改
+export const saveAndEdit = (data) => {
+  return request({
+    url: '/thirdapi/otaGoods/save',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除模板
+export const deleteById = (id) => {
+  return request({
+    url: '/thirdapi/otaGoods/deleteById',
+    method: 'delete',
+    params: {id:id}
+  })
+}

src/api/ticketMr/ticketMr.js

@@ -29,7 +29,7 @@ export const saveAndEdit = (data) => {
 // 删除模板
 export const deleteById = (id) => {
   return request({
-    url: '/scenicgoods/goods/deleteById',
+    url: '/goods/goods/deleteById',
     method: 'delete',
     params: {id:id}
   })

src/components/Editor/index.vue

@@ -60,7 +60,7 @@ export default {
   },
   data() {
     return {
-      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+      uploadUrl: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio", // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken()
       },
@@ -176,7 +176,7 @@ export default {
         // 获取光标所在位置
         let length = quill.getSelection().index;
         // 插入图片  res.url为服务器返回的图片地址
-        quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName);
+        quill.insertEmbed(length, "image", res.data.url);
         // 调整光标到最后
         quill.setSelection(length + 1);
       } else {

src/main.js

@@ -42,7 +42,7 @@ import DictData from '@/components/DictData'
 import designer from '@/components/formDesigner';
 
 import axios from 'axios';
-
+import '@/utils/directives'; // 弹窗拖拽
 
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts

src/utils/directives.js

@@ -0,0 +1,54 @@
+import Vue from 'vue';
+
+Vue.directive('drag', (el) => {
+  const oDiv = el // 当前元素
+  const minTop = oDiv.getAttribute('drag-min-top')
+  const ifMoveSizeArea = 20
+  oDiv.onmousedown = e => {
+    let target = oDiv
+    while (window.getComputedStyle(target).position !== 'absolute' && target !== document.body) {
+      target = target.parentElement
+    }
+
+    document.onselectstart = () => {
+      return false
+    }
+    if (!target.getAttribute('init_x')) {
+      target.setAttribute('init_x', target.offsetLeft)
+      target.setAttribute('init_y', target.offsetTop)
+    }
+    const initX = parseInt(target.getAttribute('init_x'))
+    const initY = parseInt(target.getAttribute('init_y'))
+
+    // 鼠标按下，计算当前元素距离可视区的距离
+    const disX = e.clientX - target.offsetLeft
+    const disY = e.clientY - target.offsetTop
+    document.onmousemove = e => {
+      if(e.preventDefault){
+        e.preventDefault()
+      } else {
+        e.returnValue = false
+      }
+      // 通过事件委托，计算移动的距离
+      // 因为浏览器里并不能直接取到并且使用clientX、clientY,所以使用事件委托在内部做完赋值
+      const l = e.clientX - disX
+      const t = e.clientY - disY
+      const { marginTop: mt, marginLeft: ml } = window.getComputedStyle(target)
+      // 计算移动当前元素的位置，并且给该元素样式中的left和top值赋值
+      target.style.left = l - parseInt(ml) + 'px'
+      target.style.top = t + 'px'
+      if (Math.abs(l - initX) > ifMoveSizeArea || Math.abs(t - initY) > ifMoveSizeArea) {
+        target.setAttribute('dragged', '')
+      } else {
+        target.removeAttribute('dragged')
+      }
+    }
+    document.onmouseup = e => {
+      document.onmousemove = null
+      document.onmouseup = null
+      document.onselectstart = null
+    }
+    // return false不加的话可能导致黏连，拖到一个地方时div粘在鼠标上不下来，相当于onmouseup失效
+    return false
+  }
+})

src/utils/request.js

@@ -17,7 +17,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 20000
 })
 
 // request拦截器

src/views/agreement/dialog/addAndEdit.vue

@@ -23,6 +23,7 @@
         </el-form-item> -->
         <el-form-item label="协议类型" prop="type">
           <el-select
+            disabled
             v-model="form.type"
             placeholder="请选择协议类型"
             style="width: 100%"
@@ -126,7 +127,7 @@ export default {
             this.loading = true;
             const { code } = await saveAndEdit({ ...this.form });
             if (code === 200) {
-              this.$message.success("修改成功!");
+              this.$message.success("操作成功!");
               this.$emit("getList");
               this.cancel();
             }

src/views/agreement/index.vue

@@ -44,16 +44,16 @@
     </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="['system:user:add']"
-            >新增</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--              type="primary"-->
+<!--              plain-->
+<!--              icon="el-icon-plus"-->
+<!--              size="mini"-->
+<!--              @click="handleAdd"-->
+<!--              v-hasPermi="['system:user:add']"-->
+<!--            >新增</el-button>-->
+<!--      </el-col>-->
       <!-- <el-col :span="1.5">
         <el-button
           type="danger"
@@ -77,20 +77,18 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table ref="tables" v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="50" align="center" />
-      <el-table-column label="数据编号" align="center" prop="id" />
+    <el-table ref="tables" v-loading="loading" :data="dataList" border>
       <el-table-column label="协议类型" align="center" prop="type">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.agreement_type" :value="scope.row.type"/>
         </template>
       </el-table-column>
-      <el-table-column label="协议内容" align="center" prop="content" width="160" sortable="custom" >
+      <el-table-column label="协议内容" align="center" prop="content" width="160">
         <template slot-scope="scope">
           <el-button type="text" @click="seeCenter(scope.row, 'html')">查看</el-button>
         </template>
       </el-table-column>
-      <el-table-column label="添加时间" align="center" prop="createTime" width="160" sortable="custom" >
+      <el-table-column label="添加时间" align="center" prop="createTime" width="160" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>

src/views/appletMr/dialog/addAndEdit.vue

@@ -135,6 +135,7 @@ export default {
      */
     openDialog(title, obj) {
       this.open = true;
+      this.reset();
       if (obj){
         this.title = "编辑";
         this.$nextTick(() => {
@@ -163,7 +164,7 @@ export default {
             this.loading = true;
             const { code } = await saveAndEdit({ ...this.form });
             if (code === 200) {
-              this.$message.success("修改成功!");
+              this.$message.success("操作成功!");
               this.$emit("getList");
               this.cancel();
             }
@@ -180,8 +181,11 @@ export default {
      * @returns {any}
      */
     reset() {
-      this.$refs["form"].resetFields();
-      this.form.id = undefined;
+      this.$set(this.form, 'id', '');
+      this.$set(this.form, 'name', '');
+      this.$set(this.form, 'sliderImg', '');
+      this.$set(this.form, 'detail', '');
+      this.$set(this.form, 'type', '1');
     },
     /**
      * 关闭弹框

src/views/finance/refundMr/dialog/details.vue

@@ -4,7 +4,7 @@
  * @Date: 2023-11-24 13:55:00
  * @LastEditors: Sugar.
  * @LastEditTime: 2023-11-24 13:55:00
- * @FilePath: \cattle_webui\src\views\performMr\dialog\AddOrEditDialog.vue
+ * @FilePath: \cattle_webui\src\views\finance\refundMr\dialog\AddOrEditDialog.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
 <template>
@@ -44,28 +44,28 @@
     </span>
 
     <span slot="footer" class="dialog-footer" v-if="refund">
-      <el-button @click="cancel">取消</el-button>
+<!--      <el-button @click="cancel">取消</el-button>-->
       <el-button
         type="danger"
-        @click="submitForm(1)"
+        @click="submitForm(2)"
         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>
+        <span v-else>驳回退款</span>
       </el-button>
       <el-button
         type="primary"
-        @click="submitForm(2)"
+        @click="submitForm(1)"
         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>
+        <span v-else>同意退款</span>
       </el-button>
     </span>
 
@@ -76,6 +76,7 @@
 import { pageList, refundAudit } from '@/api/financeMr/refundMr'
 import Editor from "@/components/Editor";
 import { saveAndEdit } from '@/api/ticketMr/priceMr'
+import isEmpty from 'voca/is_empty'
 export default {
   name: "detailsDia",
   components: {
@@ -117,23 +118,41 @@ export default {
         this.refund = false
       }
     },
+    inputValidatorEn(value) {
+      if(isEmpty(value)) {
+        return false
+      } else {
+        return true
+      }
+    },
     /**
      * 保存
      * @date 2023-11-22
      * @returns {any}
      */
     submitForm(status) {
-      this.$confirm('是否继续确定退款?', '提示', {
+      this.$confirm('是否' + ( status == 1 ? '确定' : '驳回' ) + '退款?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.refundAuditApi(status);
+        if(status == 2){
+          this.$prompt('驳回理由', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            inputValidator: this.inputValidatorEn,
+            inputErrorMessage: '请输入驳回理由'
+          }).then(({ value }) => {
+            this.refundAuditApi(status, value);
+          }).catch(() => {});
+        } else {
+          this.refundAuditApi(status, '');
+        }
       }).catch(() => {});
     },
-    refundAuditApi(status) {
+    refundAuditApi(status, value) {
       this.loading = true;
-      refundAudit({ refundId: this.form.id, status: status})
+      refundAudit({ refundId: this.form.id, status: status, errReason: value})
         .then(response => {
             this.$message.success("操作成功!");
             this.$emit("getList");

src/views/finance/refundMr/index.vue

@@ -48,7 +48,7 @@
             v-for="dict in statusList"
             :key="dict.id"
             :label="dict.name"
-            :value="dict.id"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>

src/views/information/informationMr/dialog/addAndEdit.vue

@@ -26,6 +26,16 @@
             style="width: 100%;"
           />
         </el-form-item>
+        <el-form-item label="排序">
+          <el-input
+            type="number"
+            v-model="form.sort"
+            placeholder="排序"
+            @change="changePriceAmount('peopleNum')"
+            clearable
+            style="width: 240px;margin-right: 10px"
+          />
+        </el-form-item>
         <el-form-item label="封面图" prop="mainImg">
           <el-upload
             ref="upload"
@@ -123,12 +133,13 @@ export default {
      */
     openDialog(title, obj) {
       this.open = true;
-      this.form = {};
+      this.reset();
       if (obj){
         this.title = "编辑资讯";
         this.$nextTick(() => {
           this.$set(this.form, 'id', obj.id);
           this.$set(this.form, 'title', obj.title);
+          this.$set(this.form, 'sort', obj.sort);
           this.$set(this.form, 'mainImg', obj.mainImg);
           this.$set(this.form, 'centent', obj.centent);
         });
@@ -139,6 +150,13 @@ export default {
         });
       }
     },
+    changePriceAmount(key) {
+      if(this.form[key] * 1 < 0){
+        this.$message.error("输入需大于或等于0!");
+        this.$set(this.form, key, '');
+        return false
+      }
+    },
     /**
      * 保存
      * @date 2023-11-22
@@ -151,7 +169,7 @@ export default {
             this.loading = true;
             const { code } = await saveAndEdit({ ...this.form });
             if (code === 200) {
-              this.$message.success("修改成功!");
+              this.$message.success("操作成功!");
               this.$emit("getList");
               this.cancel();
             }
@@ -168,8 +186,11 @@ export default {
      * @returns {any}
      */
     reset() {
-      this.$refs["form"].resetFields();
-      this.form.id = undefined;
+      this.$set(this.form, 'id', '');
+      this.$set(this.form, 'title', '');
+      this.$set(this.form, 'sort', '');
+      this.$set(this.form, 'mainImg', '');
+      this.$set(this.form, 'centent', '');
     },
     /**
      * 关闭弹框

src/views/information/informationMr/index.vue

@@ -85,6 +85,7 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="排序" align="center" prop="sort" />
       <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -94,12 +95,12 @@
             @click="ionlineApi(scope.row)"
             v-hasPermi="['informationMr:informationMr:release']"
           >{{scope.row.status == '1' ? '取消发布' : '发布'}}</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="toppingApi(scope.row)"
-            v-hasPermi="['informationMr:informationMr:release']"
-          >{{scope.row.status == '1' ? '取消置顶' : '置顶'}}</el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            @click="toppingApi(scope.row)"-->
+<!--            v-hasPermi="['informationMr:informationMr:release']"-->
+<!--          >{{scope.row.status == '1' ? '取消置顶' : '置顶'}}</el-button>-->
           <el-button
             size="mini"
             type="text"

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

@@ -24,7 +24,7 @@
           <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>
+          <div class="grid-content bg-purple item-class">订单号: <span>{{ form.id || '' }}</span></div>
         </el-col>
         <el-col :span="12">
           <div class="grid-content bg-purple item-class">购票人姓名: <span>{{ form.memberName || '' }}</span></div>
@@ -81,9 +81,9 @@
             <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 == 0">未使用</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>
+                <el-tag v-if="scope.row.status == 2" type="info">过期</el-tag>
               </template>
             </el-table-column>
             <el-table-column label="核销时间" align="center" prop="qrcodeUseTime" />

src/views/order/orderMr/index.vue

@@ -184,7 +184,7 @@ export default {
       statusList: {
         0: '待支付',
         2: '超时取消',
-        3: '支付完成，待使用',
+        3: '待使用',
         4: '退款中',
         5: '己退款',
         6: '退款失败',
@@ -195,7 +195,7 @@ export default {
       statusMapList: [
         {id: 1, name: '待支付', value: 0},
         {id: 2, name: '超时取消', value: 2},
-        {id: 3, name: '支付完成，待使用', value: 3},
+        {id: 3, name: '待使用', value: 3},
         {id: 4, name: '退款中', value: 4},
         {id: 5, name: '己退款', value: 5},
         {id: 6, name: '退款失败', value: 6},
@@ -251,8 +251,10 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
-      this.queryParams.payBeginTime = this.queryParams.time[0];
-      this.queryParams.payEndTime = this.queryParams.time[1];
+      if(this.queryParams.time){
+        this.queryParams.payBeginTime = this.queryParams.time[0];
+        this.queryParams.payEndTime = this.queryParams.time[1];
+      }
       this.getList();
     },
     /** 重置按钮操作 */

src/views/otaMr/dialog/addAndEdit.vue

@@ -0,0 +1,197 @@
+<!--
+ * @Description: 新增/编辑弹框
+ * @Author: Sugar.
+ * @Date: 2023-11-24 13:55:00
+ * @LastEditors: Sugar.
+ * @LastEditTime: 2023-11-24 13:55:00
+ * @FilePath: \cattle_webui\src\views\otaMr\dialog\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" style="padding: 0">
+      <el-table ref="tables" v-loading="tabLoading" :data="dataList" border @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="50" align="center" />
+        <el-table-column label="序号" align="center" type="index" width="50"></el-table-column>
+        <el-table-column label="票务名称" align="center" prop="goodsName" />
+        <el-table-column label="销售价" align="center" prop="salePrice" width="160">
+          <template slot-scope="scope">
+            <span>￥{{ scope.row.salePrice }}</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>
+    <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 { goodsList, saveAndEdit } from '@/api/otaMr/otaMr'
+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,
+      tabLoading: false,
+      dataList: [],
+      total: 0,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        ota: '1'
+      },
+      selectList: []
+    };
+  },
+  methods: {
+    /**
+     * 打开弹框
+     * @date 2023-11-22
+     * @param {any} obj
+     * @returns {any}
+     */
+    openDialog(title, obj) {
+      this.open = true;
+      this.title = "票务信息";
+      this.getList(obj);
+    },
+    /** 查询列表 */
+    getList(obj) {
+      this.tabLoading = true;
+      this.queryParams.ota = obj.ota;
+      goodsList(this.queryParams)
+        .then(response => {
+            // this.dataList = response.data.rows;
+            // this.total = response.data.total;
+            // this.tabLoading = false;
+          this.dataList = response.data;
+          this.tabLoading = false;
+          }
+        ).catch(() => {
+        this.tabLoading = false;
+      });
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.selectList = selection;
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    async submitForm() {
+      try {
+        if(this.selectList.length <= 0) {
+          this.$message.error("请勾选商品!");
+          return false
+        }
+        let postList = [];
+        this.selectList.forEach(item => {
+          postList.push({
+            "ota": this.queryParams.ota,
+            "goodsId": item.id,
+            "otaPrice": item.salePrice
+          })
+        })
+        this.loading = true;
+        const { code } = await saveAndEdit(postList);
+        if (code === 200) {
+          this.$message.success("操作成功!");
+          this.$emit("getList");
+          this.cancel();
+        }
+      } catch (error) {
+      } finally {
+        this.loading = false;
+      }
+    },
+    /**
+     * 重置
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    reset() {
+
+    },
+    /**
+     * 关闭弹框
+     * @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;
+  }
+}
+</style>

src/views/otaMr/index.vue

@@ -0,0 +1,273 @@
+<template>
+  <div class="app-container">
+
+    <div class="top-taber" style="margin-top: 10px">
+      <el-radio-group v-model="otaType" size="small" @change="handleQuery">
+        <el-radio-button label="1">美团</el-radio-button>
+        <el-radio-button label="2">携程</el-radio-button>
+      </el-radio-group>
+    </div>
+
+    <el-row :gutter="10" class="mb8" style="margin-top: 30px">
+      <el-col :span="1.5">
+        <el-button
+              type="primary"
+              plain
+              icon="el-icon-key"
+              size="mini"
+              @click="handleKey"
+              v-hasPermi="['otaMr:otaMr:key']"
+            >填写密钥</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['otaMr:otaMr:add']"
+        >添加商品</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" :search="false" @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="goodsName" />
+      <el-table-column label="销售价格" align="center" prop="otaPrice">
+        <template slot-scope="scope">
+          <span>￥{{ scope.row.otaPrice }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            v-if="scope.row.status != '1'"
+            @click="handleDelete(scope.row,scope.index)"
+            v-hasPermi="['otaMr:otaMr: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 class="dialog">
+        <el-form :model="otaForm" ref="otaForm" :rules="otaRules" label-width="120px">
+          <el-form-item label="供应商id" prop="name">
+            <el-input
+              v-model="otaForm.name"
+              placeholder=""
+              clearable
+              style="width: 100%;"
+            />
+          </el-form-item>
+          <el-form-item label="client id" prop="otaKey">
+            <el-input
+              v-model="otaForm.otaKey"
+              placeholder=""
+              clearable
+              style="width: 100%;"
+            />
+          </el-form-item>
+          <el-form-item label="client secret" prop="otaValue">
+            <el-input
+              v-model="otaForm.otaValue"
+              placeholder=""
+              clearable
+              style="width: 100%;"
+            />
+          </el-form-item>
+        </el-form>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="visibleStatus = false">取消</el-button>
+        <el-button
+          type="primary"
+          @click="submitForm"
+          v-loading.fullscreen.lock="otaLoading"
+          element-loading-text="提交中..."
+          element-loading-spinner="el-icon-loading"
+          element-loading-background="rgba(0, 0, 0, 0.8)"
+        >
+          <span v-if="otaLoading">提交中...</span>
+          <span v-else>保存</span>
+        </el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+import { pageList, deleteById, getOtaConfig, otaSave } from '@/api/otaMr/otaMr'
+import addAndEdit from "./dialog/addAndEdit.vue";
+
+export default {
+  name: "agreement",
+  dicts: ['agreement_type'],
+  components: { addAndEdit },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      otaLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      dataList: null,
+      // 弹出层标题
+      title: "",
+
+      otaType: '1',
+
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        ota: '1'
+      },
+      visibleStatus: false,
+      newObj: {},
+      visibleType: '',
+      otaForm: {},
+      otaRules: {
+        name: [{ required: true, message: "请输入供应商id", trigger: "blur" }],
+        otaKey: [{ required: true, message: "请输入client id", trigger: "blur" }],
+        otaValue: [{ required: true, message: "请输入client secret", trigger: "blur" }]
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.ota = this.otaType
+      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.dataList = [];
+      this.queryParams.pageNum = 1;
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.$refs["addAndEdit"].openDialog("新增数据", this.queryParams);
+    },
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除商品名称为"' + row.goodsName + '"的数据项？').then(function() {
+        return deleteById(row.id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 查看按钮操作 */
+    handleKey(obj, type) {
+      this.visibleStatus = true
+      this.visibleType = type;
+      this.otaForm = {};
+      this.getOtaConfigApi();
+    },
+    /** 查询列表 */
+    getOtaConfigApi() {
+      getOtaConfig({ota: this.otaType})
+        .then(response => {
+          let dataList = response.data;
+          dataList.forEach(item => {
+            this.$set(this.otaForm, item.otaKey, item.otaValue);
+          })
+        });
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["otaForm"].validate(async (valid) => {
+        if (valid) {
+          try {
+            let postList = [];
+            for (const key in this.otaForm) {
+              postList.push({
+                ota: this.otaType,
+                otaKey: key,
+                otaValue: this.otaForm[key]
+              })
+            }
+            this.otaLoading = true;
+            const { code } = await otaSave(postList);
+            if (code === 200) {
+              this.$message.success("操作成功!");
+              this.getList();
+              this.visibleStatus = false;
+            }
+          } catch (error) {
+          } finally {
+            this.otaLoading = false;
+          }
+        }
+      });
+    },
+  }
+};
+</script>

src/views/perform/performMr/dialog/addAndEdit.vue

@@ -126,6 +126,7 @@ export default {
      */
     openDialog(title, obj) {
       this.open = true;
+      this.reset();
       if (obj){
         this.title = "编辑";
         this.getSelectByIdApi(obj);
@@ -160,7 +161,7 @@ export default {
             this.loading = true;
             const { code } = await saveAndEdit({ ...this.form });
             if (code === 200) {
-              this.$message.success("修改成功!");
+              this.$message.success("操作成功!");
               this.$emit("getList");
               this.cancel();
             }
@@ -177,8 +178,11 @@ export default {
      * @returns {any}
      */
     reset() {
-      this.$refs["form"].resetFields();
-      this.form.id = undefined;
+      this.$set(this.form, 'id', '');
+      this.$set(this.form, 'name', '');
+      this.$set(this.form, 'corporationName', '');
+      this.$set(this.form, 'contactName', '');
+      this.$set(this.form, 'contactMobile', '');
     },
     /**
      * 关闭弹框

src/views/perform/programmeMr/dialog/addAndEdit.vue

@@ -125,10 +125,10 @@
                 :on-success="handleAvatarSuccess"
                 :before-upload="beforeAvatarUpload"
               >
-                <div class="avatar" v-if="form.showImg">
+                <div class="avatar" v-if="form.posterImg">
                   <el-image
                     style="width: 100px; height: 100px"
-                    :src="form.showImg"
+                    :src="form.posterImg"
                     fit="cover"
                   />
                 </div>
@@ -364,7 +364,7 @@ export default {
      */
     openDialog(title, obj) {
       this.open = true;
-      this.form = {};
+      this.reset();
       this.activeName = '01';
       if (obj){
         this.title = "编辑剧目管理";
@@ -398,7 +398,7 @@ export default {
           this.$set(this.form, 'releaseDate', obj.releaseDate);
           this.$set(this.form, 'showDuration', obj.showDuration);
           this.$set(this.form, 'peopleNum', obj.peopleNum);
-          this.$set(this.form, 'showImg', obj.showImg);
+          this.$set(this.form, 'posterImg', obj.posterImg);
           this.$set(this.form, 'performSnapshot', obj.performSnapshot);
           this.performerList = obj.performerList || [];
           obj.photoList.forEach(item => {
@@ -419,10 +419,13 @@ export default {
     submitForm() {
       this.$refs["form"].validate(async (valid) => {
         if (valid) {
-          if(this.form.photoList && this.form.photoList.length < 3) {
+          if(this.form.photoList && this.form.photoList.length > 0 && this.form.photoList.length < 3) {
             this.$message.error("上传的宣传图不能少于三张!");
             return false
           }
+          if(this.form.photoList && this.form.photoList.length > 2) {
+            this.form.showImg =  this.form.photoList[0].url
+          }
           try {
             this.loading = true;
             const { code } = await saveAndEdit({ ...this.form });
@@ -454,8 +457,25 @@ export default {
      * @returns {any}
      */
     reset() {
-      this.$refs["form"].resetFields();
-      this.form.id = undefined;
+      this.$set(this.form, 'id', '');
+      // 基础信息
+      this.$set(this.form, 'name', '');
+      this.$set(this.form, 'sponsorId', '');
+      this.$set(this.form, 'sponsorName', '');
+      let goodsIdList = []
+      this.$set(this.form, 'goodsIdList', []);
+      this.$set(this.form, 'status', '');
+
+      // 演出信息
+      this.$set(this.form, 'releaseDate', '');
+      this.$set(this.form, 'showDuration', '');
+      this.$set(this.form, 'peopleNum', '');
+      this.$set(this.form, 'posterImg', '');
+      this.$set(this.form, 'performSnapshot', '');
+      this.$set(this.form, 'photoList', []);
+
+      // 观影须知
+      this.$set(this.form, 'performNotice', '');
     },
     /**
      * 关闭弹框
@@ -475,7 +495,7 @@ export default {
     handleAvatarSuccess(res) {
       if (res.code === 200) {
         // this.form.mainImg = res?.data?.url;
-        this.$set(this.form, 'showImg', res?.data?.url)
+        this.$set(this.form, 'posterImg', res?.data?.url)
       }
       console.log(this.form.photoList)
     },

src/views/schedulingMr/dialog/addAndEdit.vue

@@ -142,7 +142,7 @@ export default {
             this.loading = true;
             const { code } = await saveAndEdit({ ...this.form });
             if (code === 200) {
-              this.$message.success("修改成功!");
+              this.$message.success("操作成功!");
               this.$emit("getList");
               this.cancel();
             }

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

@@ -99,10 +99,10 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="结算方式:" prop="priceType">
-          <el-radio :disabled="isDisabled" v-model="form.priceType" label="1">基于票务类型打折</el-radio>
-          <el-radio :disabled="isDisabled" v-model="form.priceType" label="2">固定值</el-radio>
-        </el-form-item>
+<!--        <el-form-item label="结算方式:" prop="priceType">-->
+<!--          <el-radio :disabled="isDisabled" v-model="form.priceType" label="1">基于票务类型打折</el-radio>-->
+<!--          <el-radio :disabled="isDisabled" v-model="form.priceType" label="2">固定值</el-radio>-->
+<!--        </el-form-item>-->
         <el-form-item label="价格:" prop="priceAmount">
           <el-input
             :disabled="isDisabled"
@@ -113,7 +113,8 @@
             @change="changePriceAmount"
             style="width: 160px;"
           >
-            <template slot="append">{{ form.priceType == 1 ? '%' : '元' }}</template>
+<!--            <template slot="append">{{ form.priceType == 1 ? '%' : '元' }}</template>-->
+            <template slot="append">元</template>
           </el-input>
         </el-form-item>
 
@@ -168,7 +169,7 @@ export default {
       isDisabled: false,
       form: {
         id: undefined,
-        priceType: '1'
+        priceType: '2'
       },
       rules: {
         venueId: [{ required: true, message: "请选择场馆", trigger: "blur" }],
@@ -202,6 +203,7 @@ export default {
       this.open = true;
       this.editType = false;
       this.isDisabled = false
+      this.reset();
       this.getList();
       this.goodsPageList();
       this.ticketListApi();
@@ -227,10 +229,6 @@ export default {
         });
       }else{
         this.title = "新增座位价格";
-        this.form = {
-            id: undefined,
-            priceType: '1'
-        };
         this.$nextTick(() => {
           this.$refs["form"].clearValidate();
         });
@@ -319,8 +317,14 @@ export default {
      * @returns {any}
      */
     reset() {
-      this.$refs["form"].resetFields();
-      this.form.id = undefined;
+      this.$set(this.form, 'id', '');
+      this.$set(this.form, 'goodsId', '');
+      this.$set(this.form, 'venueId', '');
+      this.$set(this.form, 'seatTypeId', '');
+      this.$set(this.form, 'performId', '');
+      this.$set(this.form, 'auditoriumId', '');
+      this.$set(this.form, 'priceType', '2');
+      this.$set(this.form, 'priceAmount', '');
     },
     /**
      * 关闭弹框

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

@@ -221,18 +221,13 @@ export default {
      */
     openDialog(title, obj) {
       this.open = true;
-      this.form = {};
+      this.reset();
       this.activeName = '01';
       if (obj){
         this.title = "编辑票务管理";
         this.getSelectByIdApi(obj)
       }else{
         this.title = "添加票务管理";
-        this.form = {
-            isAuth: '1',
-            backTime: '1',
-            goodsPerform: {}
-        };
         this.$nextTick(() => {
           this.$refs["form"].clearValidate();
         });
@@ -338,8 +333,23 @@ export default {
      * @returns {any}
      */
     reset() {
-      this.$refs["form"].resetFields();
-      this.form.id = undefined;
+      this.$set(this.form, 'id', '');
+      this.$set(this.form, 'goodsName', '');
+      this.$set(this.form, 'isAuth', '1');
+      this.$set(this.form, 'verificationSpeaker', '');
+      this.$set(this.form, 'detail', '');
+      this.$set(this.form, 'goodsPerform', {});
+      this.$set(this.form, 'salePrice', '');
+      this.$set(this.form, 'buyAstrictType', '1');
+      this.$set(this.form, 'buyAstrict', '');
+      this.$set(this.form, 'channelWx', '');
+      this.$set(this.form, 'channelWindow', '');
+
+      this.$set(this.form, 'backStatus', '');
+      this.$set(this.form, 'backTime', '1');
+      this.$set(this.form, 'backStatus', '');
+      this.$set(this.form, 'days', '');
+      this.$set(this.form, 'hour', '');
     },
     /**
      * 关闭弹框

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

@@ -126,6 +126,7 @@ export default {
      */
     openDialog(title, obj) {
       this.open = true;
+      this.reset();
       this.getList();
       if (obj){
         this.title = "编辑演出厅";
@@ -163,7 +164,7 @@ export default {
             this.loading = true;
             const { code } = await saveAndEdit({ ...this.form });
             if (code === 200) {
-              this.$message.success("修改成功!");
+              this.$message.success("操作成功!");
               this.$emit("getList");
               this.cancel();
             }
@@ -180,8 +181,10 @@ export default {
      * @returns {any}
      */
     reset() {
-      this.$refs["form"].resetFields();
-      this.form.id = undefined;
+      this.$set(this.form, 'id', '')
+      this.$set(this.form, 'name', '')
+      this.$set(this.form, 'seatImg', '')
+      this.$set(this.form, 'theatreId', '')
     },
     /**
      * 关闭弹框

src/views/venue/performanceHallMr/dialog/programmeAddAndEdit.vue

@@ -218,7 +218,7 @@ export default {
             this.loading = true;
             const { code } = await saveAndEdit({ ...this.form });
             if (code === 200) {
-              this.$message.success("修改成功!");
+              this.$message.success("操作成功!");
               this.$emit("getList");
               this.cancel();
             }

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

@@ -18,7 +18,7 @@
   >
     <div class="dialog">
       <el-row>
-        <el-col :span="16" style="padding-right: 15px">
+        <el-col :span="18" style="padding-right: 15px">
           <div class="title-class">
             <el-row>
               <el-col :span="8" style="padding-right: 15px">
@@ -36,26 +36,43 @@
               </el-col>
             </el-row>
           </div>
-          <div class="box-class">
-            <div class="box-top-class">
-              <div class="stage-class">舞台</div>
-            </div>
-            <div class="box-bottom-class" ref="seatBox" v-if="seatType">
-              <div v-for="row in seatMap.row" :key="row">
-                <div class="seat-tag"
-                     @click="setSeatTemplateMap(row, col)"
-                     v-for="col in seatMap.col"
-                     :key="col"
-                     :style="{
-                       width: seatWidth,
-                       height: seatWidth,
+          <div class="box-top-class" style="position:relative;">
+            <div class="stage-class">舞台</div>
+            <el-button :type="!dragStatus ? 'danger' : 'primary'" size="mini" @click="dragEven" style="position: absolute; bottom: 0; right: 0" icon="el-icon-rank">{{dragStatus ? '开始设置' : '关闭设置'}}</el-button>
+          </div>
+          <div class="box-class scroll-container-class"
+               v-if="seatType"
+               @wheel.prevent="wheelHandle"
+               @mousedown.stop="mousedownEven"
+               ref="scrollContainer"
+               style="position: relative; overflow: hidden"
+               >
+            <div style="position: absolute; width: 100%; height: 100%">
+              <div class="box-bottom-class scroll-container" v-drag :style="{ width: boxWidth ? boxWidth + 'px' : '100%', height: boxWidth ? boxWidth + 'px' : '100%'}" ref="seatBox" v-if="seatType">
+                <div v-for="row in seatMap.row" :key="row" style="display: inline-block">
+                  <div class="seat-tag"
+                       @click.stop="setSeatTemplateMap(row, col)"
+                       v-for="col in seatMap.col"
+                       :key="col"
+                       :style="{
+                       width: seatWidth + 'px',
+                       height: seatWidth + 'px',
                        backgroundColor: colSeatMap[row+'_'+col] && colSeatMap[row+'_'+col].color ? colSeatMap[row+'_'+col].color : ''}"
-                ></div>
+                  >
+                    <div v-if="seatWidth > 160" :style="{paddingTop: (seatWidth / 4) + 'px', width: seatWidth + 'px', height: seatWidth + 'px'}" class="seat-p-class">
+                      <p style="font-size: 16px !important;"><span v-if="colSeatMap[row+'_'+col].name">{{colSeatMap[row+'_'+col].name}}</span><span style="font-size: 14px !important;" v-if="colSeatMap[row+'_'+col].seatLabel">({{colSeatMap[row+'_'+col].seatLabel}})</span></p>
+                      <p style="font-size: 14px !important;" v-if="colSeatMap[row+'_'+col].priority">自动分配优先级 <span>({{colSeatMap[row+'_'+col].priority}})</span></p>
+                    </div>
+                  </div>
+                </div>
               </div>
             </div>
           </div>
+          <div style="margin-top: 5px">
+            总座位数：{{ seatMap.row * seatMap.col || 0}}； 可售数量：<span style="color: #67c23a">{{ canNum.length }}</span>； 不可售数量：<span style="color: #f56c6c">{{ unCanNum.length }}</span>
+          </div>
         </el-col>
-        <el-col :span="8" style="padding-left: 15px">
+        <el-col :span="6" style="padding-left: 15px">
           <div class="title-class">座位设置</div>
           <div class="box-class">
             <el-form :model="form" ref="form" label-width="100px" label-position="top">
@@ -152,9 +169,43 @@ export default {
       },
       seatList: [],
       auditoriumId: '',
+      zoom: 10,
+      boxWidth: '',
+      initWidth: '',
+      moveStatus: false,
+      mouseMap: {},
+      mousemoveMap: {},
+      scrollTop: 0,
+      scrollLeft: 0,
+      scrollEvenTop: 0,
+      scrollEvenLeft: 0,
+      dragStatus: true,
+      canNum: [],
+      unCanNum: [],
     };
   },
   methods: {
+    // 鼠标滚动
+    wheelHandle(e) {
+      if(e.wheelDelta > 0){
+        this.seatWidth = Math.trunc(this.seatWidth + 10);
+      } else {
+        if(this.initWidth > this.seatWidth + 5){
+          // this.seatWidth = this.initWidth;
+        } else {
+          this.seatWidth = Math.trunc(this.seatWidth -10)
+        }
+      }
+      this.boxWidth = this.seatWidth * this.seatMap.col + 100;
+      // this.seatWidth = (this.seatWidth + this.zoom);
+      this.$forceUpdate();
+    },
+    mousedownEven() {
+
+    },
+    dragEven(){
+      this.dragStatus = !this.dragStatus;
+    },
     /**
      * 打开弹框
      * @date 2023-11-22
@@ -166,6 +217,8 @@ export default {
       this.seatType = false;
       this.getSeatTypeList();
       this.colSeatMap = {};
+      this.boxWidth = 0;
+      this.dragStatus = true;
       this.form = {
         status: '1'
       }
@@ -200,8 +253,11 @@ export default {
           })
           this.seatType = true;
           this.$nextTick(() =>{
-            this.seatWidth = ((this.$refs.seatBox.offsetWidth - 10 - (this.seatMap.col * 2))/this.seatMap.col)  + 'px';
+            this.boxWidth = this.$refs.seatBox.offsetWidth;
+            this.seatWidth = ((this.$refs.seatBox.offsetWidth - 10 - (this.seatMap.col * 2))/this.seatMap.col);
+            this.initWidth = Math.trunc((this.$refs.seatBox.offsetWidth - 10 - (this.seatMap.col * 2))/this.seatMap.col);
           })
+          this.countNum();
         })
       });
     },
@@ -243,8 +299,11 @@ export default {
             }
           }
           this.$nextTick(() =>{
-            this.seatWidth = ((this.$refs.seatBox.offsetWidth - 10 - (this.seatMap.col * 2))/this.seatMap.col)  + 'px';
+            this.boxWidth = this.$refs.seatBox.offsetWidth;
+            this.seatWidth = ((this.$refs.seatBox.offsetWidth - 10 - (this.seatMap.col * 2))/this.seatMap.col);
+            this.initWidth = Math.trunc((this.$refs.seatBox.offsetWidth - 10 - (this.seatMap.col * 2))/this.seatMap.col);
           })
+          this.countNum();
         }).catch(() => {
 
         });
@@ -285,8 +344,29 @@ export default {
       }
     },
 
+    // 计算可售和不可售数量
+    countNum() {
+      this.canNum = [];
+      this.unCanNum = [];
+      if(this.colSeatMap) {
+        for (const key in this.colSeatMap) {
+          if(this.colSeatMap[key].status == 2 || !this.colSeatMap[key].status){
+            this.unCanNum.push(key)
+          } else if (this.colSeatMap[key].status == 1) {
+            this.canNum.push(key)
+          }
+        }
+      }
+    },
+
     // 点击座位放置参数
     setSeatTemplateMap(row, col) {
+      if(this.dragStatus){
+        return false
+      }
+      if(!this.seatSetMap.status){
+        this.seatSetMap.color = '#7d7d7e';
+      }
       let map = this.colSeatMap[row + '_' +col];
       map.status = this.seatSetMap.status;
       map.color = this.seatSetMap.color;
@@ -295,6 +375,7 @@ export default {
       map.name = this.seatSetMap.name;
       map.priority = this.seatSetMap.priority;
       this.$set(this.colSeatMap, row + '_' +col, map);
+      this.countNum();
       this.$forceUpdate()
     },
     /**
@@ -320,7 +401,7 @@ export default {
               }
               const { code } = await seatSaveAndEdit(postList);
               if (code === 200) {
-                that.$message.success("修改成功!");
+                that.$message.success("操作成功!");
                 that.$emit("getList");
                 that.cancel();
               }
@@ -382,7 +463,7 @@ export default {
 <style lang="scss" scoped>
 .dialog {
   padding: 0 30px;
-  max-height: 65vh;
+  max-height: 75vh;
   overflow-y: auto;
 }
 .dialog {
@@ -393,23 +474,26 @@ export default {
     color: #6e6e6e;
     margin: 10px auto;
   }
+  .box-top-class{
+    .stage-class{
+      margin: 10px auto;
+      width: 160px;
+      height: 80px;
+      border: 2px solid #7d7d7e;
+      text-align: center;
+      line-height: 80px;
+    }
+  }
+  .box-class ::-webkit-scrollbar{ /*滚动条基本样式，高度*/
+    width:10px;height:10px;
+  }
   .box-class{
     width: 100%;
-    height: 100%;
+    height: 500px;
     border: 2px solid #7d7d7e;
     border-radius: 4px;
     padding: 10px;
 
-    .box-top-class{
-      .stage-class{
-        margin: 10px auto;
-        width: 160px;
-        height: 80px;
-        border: 2px solid #7d7d7e;
-        text-align: center;
-        line-height: 80px;
-      }
-    }
     .box-bottom-class{
       //border: 2px solid #5656c2;
       margin-top: 15px;
@@ -422,11 +506,21 @@ export default {
         cursor: pointer;
         background: url("../../../../assets/images/seat-icon.png") no-repeat;
         background-size: 100% 100%;
+        position: relative;
 
         &:hover{
           opacity: 0.8;
         }
       }
+      .seat-p-class{
+        position: absolute;
+        left: 0;
+        top: 0;
+        text-align: center;
+        font-size: 18px;
+        display: inline-block;
+        color: white;
+      }
     }
   }
 

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

@@ -12,6 +12,7 @@
     :title="title"
     :visible.sync="open"
     width="900px"
+    class="text-dia-log-class"
     append-to-body
     :close-on-click-modal="false"
     @close="cancel"
@@ -210,15 +211,12 @@ export default {
     openDialog(title, obj, type) {
       this.open = true;
       this.editType = false;
+      this.reset();
       this.getList();
       this.goodsPageList();
       // this.merchantPageList();
       if (obj){
         this.title = "编辑排期";
-        this.form = {
-          id: undefined,
-          timeList: []
-        };
         this.$set(this.form, 'insertType', '1');
         this.editType = true;
         this.$nextTick(() => {
@@ -243,9 +241,9 @@ export default {
             timeList: []
         };
         if(type){
-          this.form.insertType = '2';
+          this.$set(this.form, 'insertType', '2');
         } else {
-          this.form.insertType = '1';
+          this.$set(this.form, 'insertType', '1');
         }
         this.$nextTick(() => {
           this.$refs["form"].clearValidate();
@@ -344,9 +342,11 @@ export default {
             postEdit.performId = this.form.performId
             postEdit.auditoriumId = this.form.auditoriumId
             postEdit.performDate = this.form.performDate
+            postEdit.timeList = this.form.timeList
 
             this.loading = true;
-            const { code } = this.form.insertType == '2' ? await addSave({ ...this.form }) : await saveAndEdit({ ...postEdit });
+            // const { code } = this.form.insertType == '2' ? await addSave({ ...this.form }) : this.form.id ? await saveAndEdit({ ...postEdit }) : await addSave({ ...this.form });
+            const { code } = this.form.insertType == '2' ? await addSave({ ...this.form }) :  await saveAndEdit({ ...postEdit });
             if (code === 200) {
               this.$message.success("操作成功!");
               this.$emit("getList");
@@ -365,8 +365,12 @@ export default {
      * @returns {any}
      */
     reset() {
-      this.$refs["form"].resetFields();
-      this.form.id = undefined;
+      this.$set(this.form, 'id', '');
+      this.$set(this.form, 'performId', '');
+      this.$set(this.form, 'performDate', '');
+      this.$set(this.form, 'auditoriumId', '');
+      this.$set(this.form, 'theatreName', '');
+      this.$set(this.form, 'timeList', []);
     },
     /**
      * 关闭弹框
@@ -409,6 +413,10 @@ export default {
         this.$message.error("请选择剧目!");
         return false;
       }
+      if(this.form.insertType == '1' && this.form.timeList && this.form.timeList.length >= 1) {
+        this.$message.error("只能添加单场次!");
+        return false;
+      }
       let map = {
         name: '',
         performTimeStart: '',
@@ -489,7 +497,7 @@ export default {
         this.$message.error("只剩一场次， 不能删除!");
         return false;
       }
-      this.$confirm('是否确认删除数据场次名你为"' + row.name + '"的数据项？', '提示', {
+      this.$confirm('是否确认删除数据场次名称为"' + row.name + '"的数据项？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/venue/schedulingMr/index.vue

@@ -263,8 +263,7 @@ export default {
           .then(response => {
               this.getList();
               this.$modal.msgSuccess("删除成功");
-            }
-          ).catch(() => {
+          }).catch(() => {
         });
       }).catch(() => {});
     },

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

@@ -91,6 +91,7 @@ export default {
      */
     openDialog(title, obj) {
       this.open = true;
+      this.reset();
       if (obj){
         this.title = "编辑座位类型";
         this.$nextTick(() => {
@@ -100,6 +101,7 @@ export default {
         });
       }else{
         this.title = "添加座位类型";
+        this.form = {};
         this.$nextTick(() => {
           this.$refs["form"].clearValidate();
         });
@@ -117,7 +119,7 @@ export default {
             this.loading = true;
             const { code } = await saveAndEdit({ ...this.form });
             if (code === 200) {
-              this.$message.success("修改成功!");
+              this.$message.success("操作成功!");
               this.$emit("getList");
               this.cancel();
             }
@@ -134,8 +136,9 @@ export default {
      * @returns {any}
      */
     reset() {
-      this.$refs["form"].resetFields();
-      this.form.id = undefined;
+      this.$set(this.form, 'id', "");
+      this.$set(this.form, 'name', "");
+      this.$set(this.form, 'color', "");
     },
     /**
      * 关闭弹框

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

@@ -206,7 +206,7 @@ export default {
     openDialog(title, obj) {
       this.open = true;
       this.openType = "add"
-      this.form = {}
+      this.reset();
       if (obj){
         if(title == '查看数据'){
           this.title = "场馆管理";
@@ -257,26 +257,26 @@ export default {
                 isContactMobile = true;
               }
             }
-            if(this.form.customerServiceMobile && this.form.customerServiceMobile != ''){
-              if (reg.test(this.form.customerServiceMobile)) {
-                isCustomerServiceMobile = false;
-              } else {
-                isCustomerServiceMobile = true;
-              }
-            }
+            // if(this.form.customerServiceMobile && this.form.customerServiceMobile != ''){
+            //   if (reg.test(this.form.customerServiceMobile)) {
+            //     isCustomerServiceMobile = false;
+            //   } else {
+            //     isCustomerServiceMobile = true;
+            //   }
+            // }
             if(isContactMobile){
               this.$message.error("负责人联系电话验证失败");
               return false
             }
-            if(isCustomerServiceMobile){
-              this.$message.error("客服电话验证失败");
-              return false
-            }
+            // if(isCustomerServiceMobile){
+            //   this.$message.error("客服电话验证失败");
+            //   return false
+            // }
 
             this.loading = true;
             const { code } = await saveAndEdit({ ...this.form });
             if (code === 200) {
-              this.$message.success("修改成功!");
+              this.$message.success("操作成功!");
               this.$emit("getList");
               this.cancel();
             }
@@ -293,8 +293,13 @@ export default {
      * @returns {any}
      */
     reset() {
-      this.$refs["form"].resetFields();
-      this.form.id = undefined;
+      this.$set(this.form, 'id', "");
+      this.$set(this.form, 'name', "");
+      this.$set(this.form, 'showImg', "");
+      this.$set(this.form, 'contactName', "");
+      this.$set(this.form, 'contactMobile', "");
+      this.$set(this.form, 'customerServiceMobile', "");
+      this.$set(this.form, 'address', "");
     },
     /**
      * 关闭弹框

src/views/venue/venueMr/index.vue

@@ -206,7 +206,7 @@ export default {
 
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除数据标题为"' + row.name + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除场馆名称为"' + row.name + '"的数据项？').then(function() {
         return deleteById(row.id);
       }).then(() => {
         this.getList();