MONSTER-ygh 2 mesi fa
parent
commit
a3a4ebe95d

+ 5 - 3
src/views/order/orderMr/dialog/details.vue

@@ -295,16 +295,18 @@ export default {
         let list = []
         res.data.viewersList.forEach((item,index)=>{
           let list1 = item.seatIds.split(',')
-          let nameList = item.seatName.split(',')
+          let seatNameList = item.seatName.split(',')
+          let nameList = item.nameList.split(',')
           let idcardList = item.idcardList.split(',')
           let mobileList = item.mobileList.split(',')
           list1.forEach((item1,index1)=>{
             list.push({
               ...item,
               mobile: mobileList[index1],
-              seatName: nameList[index1],
+              seatName: seatNameList[index1],
               idcard: idcardList[index1],
-              seatIds: item1
+              seatIds: item1,
+              name: nameList[index1]
             })
           })
         })

+ 1 - 0
src/views/otaMr/ctrip/dialog/dataEdit.vue

@@ -502,6 +502,7 @@ export default {
     openCalendarFun(row){
       this.seatTypeId = row.seatTypeId
       this.calendarId = row.id
+      this.$set(this,'timeValue',new Date())
       this.getCalendarPrice()
       
     },

+ 1 - 0
src/views/otaMr/meituan/dialog/dataEdit.vue

@@ -471,6 +471,7 @@ export default {
     openCalendarFun(row){
       this.seatTypeId = row.seatTypeId
       this.calendarId = row.id
+      his.$set(this,'timeValue',new Date())
       this.getCalendarPrice()
       
     },

+ 1 - 0
src/views/otaMr/tiktok/dialog/dataEdit.vue

@@ -491,6 +491,7 @@ export default {
     openCalendarFun(row){
       this.seatTypeId = row.seatTypeId
       this.calendarId = row.id
+      his.$set(this,'timeValue',new Date())
       this.getCalendarPrice()
       
     },

+ 5 - 4
src/views/ticket/schedulingConfiguration/dialog/PerFormEdit.vue

@@ -192,10 +192,7 @@
         this.editType = false;
         if (obj && type == "EDIT"){
           this.title = "编辑排期";
-          if(obj.performId) {
-            await this.goodsPageListFun(obj.performId);
-          }
-          await this.getInventoryTemplate(obj.auditoriumId)
+          
           this.form = {
             "id": obj.id,
             "performId": obj.performId,
@@ -208,6 +205,10 @@
             "stockTmpId": obj.stockTmpId,  
             goodsIds: obj.goodsIds ? obj.goodsIds.split(','):[],
           }
+          if(obj.performId) {
+            await this.goodsPageListFun(obj.performId);
+          }
+          await this.getInventoryTemplate(obj.auditoriumId)
         }else{
           this.title = "新增排期";
           this.form = {};

+ 5 - 2
src/views/ticket/schedulingConfiguration/index.vue

@@ -16,7 +16,10 @@
           @click.stop="clickTimeFun(data)"
           >
             <div class="calendar_box-date" @click.stop="return ''">
-              <span>{{ data.day.split('-').slice(1).join('-') }}</span>
+              <span>
+                {{ data.day.split('-').slice(1).join('-')  }}
+                ({{ 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>
             <div 
@@ -97,6 +100,7 @@ export default {
     this.getList();
   },
   methods: {
+    moment,
     /** 查询列表 */
     getList() {
       this.loading = true;
@@ -124,7 +128,6 @@ export default {
       let list = []
       this.perFormList.forEach((item,index)=>{
         if(item.performDate == data.day) {
-          console.log("dsfsdfdsfdsf")
           list = item.list
         }
       })

+ 18 - 7
src/views/ticket/ticketMr/dialog/addAndEdit.vue

@@ -29,11 +29,16 @@
               />
             </el-form-item>
             <el-form-item label="纸质票票务名称:" prop="printName" style="margin-top: 20px">
-              <el-input
-                v-model="form.printName"
-                placeholder="纸质票票务名称"
-                clearable
-              />
+              <div style="display: flex;">
+                <el-input
+                  v-model="form.printName"
+                  placeholder="纸质票票务名称"
+                  clearable
+                  :maxlength="6"
+                  show-word-limit
+                />
+                <span style="color: #ccc;white-space: nowrap;padding-left: 20px;">禁止录入特殊符号</span>
+              </div>
             </el-form-item>
             <el-form-item label="票档类型:" prop="seatType">
               <el-select 
@@ -380,7 +385,10 @@ export default {
       },
       rules: {
         goodsName: [{ required: true, message: "请输入票务名称", trigger: ["change","blur"] }],
-        printName: [{ required: true, message: "请输入纸质票票务名称", trigger: ["change","blur"] }],
+        printName: [
+          { required: true, message: "请输入纸质票票务名称", trigger: ["change","blur"] },
+          { pattern: /^[\u4E00-\u9FA5]+$/, message: '只能输入文字', trigger: ["change","blur"] }
+        ],
         stopSaleTime: [
           { required: true, message: "请输入停止售卖时间", trigger: ["change","blur"] },
           // { validator: validateNumber, trigger: ["blur","change"]},
@@ -410,7 +418,10 @@ export default {
           { required: true, message: "请选择是否允许改签", trigger: ["change","blur"] }
         ],
         reSubmitTime: [{required: true, message: "请输入禁止改签时间", trigger: ["change","blur"]}],
-        talkName: [{required: true, message: "请输入票务闸机播报名称", trigger: ["change","blur"]}],
+        talkName: [
+          {required: true, message: "请输入票务闸机播报名称", trigger: ["change","blur"]},
+          { pattern: /^[\u4E00-\u9FA5]+$/, message: '只能输入文字', trigger: ["change","blur"] }
+        ],
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",

+ 1 - 1
src/views/windowTicketSales/rebook.vue

@@ -58,7 +58,7 @@
             <el-table-column label="剧目名称" align="center" prop="performName" />
             <el-table-column label="票务名称" align="center" prop="goodsName" />
             <el-table-column label="票档" align="center" prop="seatTypeName" />
-            <!-- <el-table-column label="座位信息" align="center" prop="seatTypeName1" /> -->
+            <el-table-column label="座位信息" align="center" prop="seatNames" />
             <el-table-column label="日期" align="center" prop="performDate" />
             <el-table-column label="场次" align="center" prop="performInterval" />
             <el-table-column label="下单时间" align="center" prop="createTime" />