1. 优化

src/api/ticketMr/schedulingConfiguration.js

@@ -122,4 +122,12 @@ export const insertOrUpdateApi = (data) => {
     method: 'post',
     data
   })
+}
+
+export const insertOrUpdateNewApi = (data) => {
+  return request({
+    url: '/merchant/merchantPerformTime/edit',
+    method: 'post',
+    data: data
+  })
 }

src/components/seatBox/index.vue

@@ -456,7 +456,7 @@
                     if(item.channelType && item.channelType != this.channelType){
                         this.isLcokShow = true
                         this.lockObj = {
-                            remark: `该座位仅限${ this.setChanneltype(row.channelType) }渠道购买!!!`,
+                            remark: `该座位仅限${ this.setChanneltype(item.channelType) }渠道购买!!!`,
                             auth: ''
                         }
                         this.lockStyle = {

src/views/officesale/ticketingSales.vue

@@ -223,6 +223,7 @@
   querySeatListNew
  } from '@/api/windowTicketSales/ticketingSales'
  import increaseViewers from "./model/increaseViewers"
+ //import increaseViewers from "./model/increaseViewersNew"
  import moment from "moment"
  import { pageList as getSeatType } from '@/api/seatTypeMr/seatTypeMr'
  import selectListMixin from "./mixins/selectList"
@@ -769,7 +770,7 @@ import LockSeat from './model/lockSeat.vue'
                     oneMany: this.oneMany,   // 证件要求: 1一证一票，2一证多票
                     personnelNum: this.personnelNum,   // 人员要求:0-表示不限制 其他数字表示限制人数
                     seatTypeId: this.seatSelectList[0].seatTypeId,
-                    seatTypeName: this.seatSelectList[0].seatTypeId,
+                    seatTypeName: this.seatSelectList[0].seatLabel,
                     salePrice: this.salePrice
                 })
             }else {
@@ -846,8 +847,24 @@ import LockSeat from './model/lockSeat.vue'
                     clearTimeout(this.lckTime)
                 }
                 if(item.occupyStatus !== 0) {
-                    this.isLcokShow = false
-                    return
+                    if(item.channelType && item.channelType != 'window'){
+                        this.isLcokShow = true
+                        this.lockObj = {
+                            remark: `该座位仅限${ this.setChanneltype(item.channelType) }渠道购买!!!`,
+                            auth: ''
+                        }
+                        this.lockStyle = {
+                            position: "fixed",
+                            top: (e.y + 10) + 'px',
+                            left: (e.x + 10)+ 'px',
+                            zIndex: 999999
+                        }
+                        console.log('dsfdsff====',this.lockObj,this.lockStyle)
+                        return
+                    }else {
+                        this.isLcokShow = false
+                        return
+                    }
                 }
                 if(item.id == this.seatId){ return }
                 this.seatId = item.id
@@ -871,11 +888,11 @@ import LockSeat from './model/lockSeat.vue'
                             zIndex: 999999
                         }
                     } else {
-                        this.handleClose()
+                        //this.handleClose()
                     }
                 },500)
             } catch (error) {
-                this.handleClose()
+                //this.handleClose()
             }
         },
         lockOrUnLockDeatilFun1() {

src/views/ticket/schedulingConfiguration/dialog/PerFormEdit.vue

@@ -128,7 +128,7 @@
   </template>
   
   <script>
-  import { insertOrUpdateApi, goodsPageListNew, getPerformTimeById } from "@/api/ticketMr/schedulingConfiguration";
+  import { insertOrUpdateNewApi, goodsPageListNew, getPerformTimeById } from "@/api/ticketMr/schedulingConfiguration";
   import { goodsPageList } from '@/api/programmeMr/programmeMr'
   import { merchantPageList } from '@/api/performanceHallMr/performanceHallMr'
   import { pageList as getInventoryTemplateApi } from '@/api/ticketMr/InventoryTemplate'
@@ -302,7 +302,7 @@
               postEdit.goodsIds = postEdit.goodsIds.join(',')
               delete postEdit.performDate
               this.loading = true;
-              const { code } = await insertOrUpdateApi({ ...postEdit });
+              const { code } = await insertOrUpdateNewApi({ ...postEdit });
               if (code === 200) {
                 this.$message.success("操作成功!");
                 this.$emit("getList");

src/views/ticket/schedulingConfiguration/index.vue

@@ -18,7 +18,7 @@
             <div class="calendar_box-date" @click.stop="return ''">
               <span>
                 {{ data.day.split('-').slice(1).join('-')  }}
-                ({{ data.day == moment().format("YYYY-MM-DD") ? '今天':''  }})
+                {{ data.day == moment().format("YYYY-MM-DD") ? '(今天)':''  }}
               </span>
               <span style="color: #BEBEBE;" @click.stop="handlePerFormList('ADD',data)" v-if="getPerFormList(data).length>0">详情</span>
             </div>

src/views/ticket/ticketMr/index.vue

@@ -365,17 +365,35 @@ export default {
     async handleCopy(row) {
       try {
         let res = await getSelectById(row.id)
+        let goodsPerform = {
+          ...res.data.goodsPerform,
+          id: null
+        }
+        let performRefundRule = {
+          ...res.data.performRefundRule,
+          id: null
+        }
+        let seatTypeList = []
+        res.data.seatTypeList.forEach((item,index)=>{
+          seatTypeList.push({
+            ...item,
+            id: null
+          })
+        })
         this.formCopy = {
           ...res.data,
           id: null,
-          channelType: null
+          channelType: null,
+          seatTypeList,
+          goodsPerform,
+          performRefundRule
         }
         this.dialogVisible = true
         this.$nextTick(() => {
           this.$refs["formCopy"].clearValidate();
         });
       } catch (error) {
-        
+        console.error(error)
       }
     },
     /** 详情按钮操作 */

src/views/windowTicketSales/ticketingSales.vue

@@ -436,7 +436,8 @@ import LockSeat from './model/lockSeat.vue'
                 this.seatMapList = {}
                 this.seatList = []
                 let res = await querySeatListNew({
-                    ...this.queryParams
+                    ...this.queryParams,
+                    channelType: 'window'
                 })
                 if(res.code == 200){
                     this.querySeatListS = res.data;
@@ -770,7 +771,7 @@ import LockSeat from './model/lockSeat.vue'
                     oneMany: this.oneMany,   // 证件要求: 1一证一票，2一证多票
                     personnelNum: this.personnelNum,   // 人员要求:0-表示不限制 其他数字表示限制人数
                     seatTypeId: this.seatSelectList[0].seatTypeId,
-                    seatTypeName: this.seatSelectList[0].seatTypeId,
+                    seatTypeName: this.seatSelectList[0].seatLabel,
                     salePrice: this.salePrice
                 })
             }else {
@@ -850,7 +851,7 @@ import LockSeat from './model/lockSeat.vue'
                     if(item.channelType && item.channelType != 'window'){
                         this.isLcokShow = true
                         this.lockObj = {
-                            remark: `该座位仅限${ this.setChanneltype(row.channelType) }渠道购买!!!`,
+                            remark: `该座位仅限${ this.setChanneltype(item.channelType) }渠道购买!!!`,
                             auth: ''
                         }
                         this.lockStyle = {
@@ -859,6 +860,7 @@ import LockSeat from './model/lockSeat.vue'
                             left: (e.x + 10)+ 'px',
                             zIndex: 999999
                         }
+                        console.log('dsfdsff====',this.lockObj,this.lockStyle)
                         return
                     }else {
                         this.isLcokShow = false