2 次代碼提交 5fd7e926eb ... f21036e049

作者 SHA1 備註 提交日期
  shipeng f21036e049 团购订单:详情座位支持鼠标拖到选择 4 天之前
  shipeng c16ffcdd5f OTA管理:价格配置,提价按钮点击控制 4 天之前

+ 6 - 6
src/views/order/groupBuyingMr/dialog/addOrder.vue

@@ -2,7 +2,7 @@
  * @Description: 添加子订单弹框
 -->
 <template>
-  <el-dialog :title="title" :visible.sync="open" width="96%" center append-to-body :close-on-click-modal="false"
+  <el-dialog :title="title" :visible.sync="open" width="96%" append-to-body :close-on-click-modal="false"
     @close="cancel">
     <div v-loading="loading" class="dialog dialog-bbb" v-if="form">
       <div v-loading="loading_form" element-loading-text="加载详情中...">
@@ -72,7 +72,7 @@
         </el-row>
       </div>
       <div class="dialog-bbb_2" v-loading="loading_seta" element-loading-text="加载座位图中...">
-        <seatBox ref="seatBox" :seatTypeLimit="configStockNumObj" @selectSeat="selectSeat" height="100%"
+        <seatBox ref="seatBox" :queryParams="form" :seatTypeLimit="configStockNumObj" @selectSeat="selectSeat" height="100%"
           channelType="group" />
       </div>
     </div>
@@ -357,7 +357,7 @@ export default {
         })
       })
       this.seatSelectList = list1
-      console.log("已选择的====", list)
+      // console.log("已选择的====", list)
     },
     // 选择场次时间
     performDateEven() {
@@ -427,7 +427,7 @@ export default {
     },
     // 票务改变事件
     goodsChangeEven(id, type) {
-      console.log("sdfsdf", id, type)
+      // console.log("sdfsdf", id, type)
       let list = []
       this.ticketList.forEach(item => {
         if (item.id == id) {
@@ -440,7 +440,7 @@ export default {
         this.$set(this.form, 'seatTypeId', '');
       }
       this.seatList = [];
-      console.log("ffffffffff=====", list)
+      // console.log("ffffffffff=====", list)
       //let selectMap = {goodsId: this.form.goodsId, performId: this.form.performId}
       //this.getSeatTypeList(selectMap); 获取走位
       this.seatList = [].concat(list)
@@ -598,7 +598,7 @@ export default {
               seatList:this.seatSelectList
             }
             const res = await childOrderSubmitApi({ ...params });
-            console.log(res,'res111');
+            // console.log(res,'res111');
             if (res.code === 200) {
               this.loading = false;
               this.$message.success("操作成功!");

+ 9 - 6
src/views/order/groupBuyingMr/dialog/editBox.vue

@@ -18,7 +18,10 @@
           <el-col :span="12" v-for="(item1, index1) in item" :key="index1">
             <div class="grid-content bg-purple item-class">
               <span>{{ item1.lable }}</span>
-              <span>{{ form[item1.key] }}</span>
+              <span v-if="item1.key === 'teamType'">
+                <dict-tag style="display: inline-block" :options="dict.type.team_type" :value="form.teamType"/>
+              </span>
+              <span v-else>{{ form[item1.key] }}</span>
             </div>
           </el-col>
         </el-row>
@@ -88,7 +91,7 @@
         </el-row>
       </div>
       <div class="dialog-bbb_2" v-loading="loading_seta" element-loading-text="加载座位图中...">
-        <seatBox ref="seatBox" :seatTypeLimit="configStockNumObj" @selectSeat="selectSeat" height="100%"
+        <seatBox ref="seatBox" :seatTypeLimit="configStockNumObj" :queryParams="form" @selectSeat="selectSeat" height="100%"
           channelType="group" />
       </div>
     </div>
@@ -119,7 +122,7 @@ import {
 import { getToken } from "@/utils/auth";
 export default {
   name: "detailsDia",
-  dicts: ['order_form_type', 'order_status_type', 'pay_way_type', 'personnel_type'],
+  dicts: ['order_form_type', 'order_status_type', 'pay_way_type', 'personnel_type', 'team_type'],
   components: {
     seatBox
   },
@@ -361,7 +364,7 @@ export default {
         })
       })
       this.seatSelectList = list1
-      console.log("已选择的====", list)
+      // console.log("已选择的====", list)
     },
     // 选择场次时间
     performDateEven() {
@@ -431,7 +434,7 @@ export default {
     },
     // 票务改变事件
     goodsChangeEven(id, type) {
-      console.log("sdfsdf", id, type)
+      // console.log("sdfsdf", id, type)
       let list = []
       this.ticketList.forEach(item => {
         if (item.id == id) {
@@ -444,7 +447,7 @@ export default {
         this.$set(this.form, 'seatTypeId', '');
       }
       this.seatList = [];
-      console.log("ffffffffff=====", list)
+      // console.log("ffffffffff=====", list)
       //let selectMap = {goodsId: this.form.goodsId, performId: this.form.performId}
       //this.getSeatTypeList(selectMap); 获取走位
       this.seatList = [].concat(list)

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

@@ -142,7 +142,7 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="openPrice = false">返回</el-button>
-        <el-button @click="submitFormPrice('formPrice','calendarPrice')">提交</el-button>
+        <el-button :loading="isLoading" @click="submitFormPrice('formPrice','calendarPrice')">提交</el-button>
       </span>
     </el-dialog>
   </el-dialog>
@@ -193,6 +193,7 @@ export default {
       },
       seatTypeId: null,
       calendarId: null,
+      isLoading: false,
     };
   },
   methods: {
@@ -573,6 +574,7 @@ export default {
     /**  设置价格  */
     async calendarPrice(type){
       try {
+        this.isLoading = true
         if( this.timeValueObj.prev && this.timeValueObj.next ) {
           let minTime = moment(this.timeValueObj.prev).valueOf()
           let maxTime = moment(this.timeValueObj.next).valueOf()
@@ -629,12 +631,15 @@ export default {
           })
           if(res.code == 200) {
             this.openPrice = false
+            this.isLoading = false
             this.getCalendarPrice()
           }
         }else {
           this.$message.error("请选择时间区间!!!");
+          this.isLoading = false
         }
       } catch (error) {
+        this.isLoading = false
         
       }
       

+ 6 - 1
src/views/otaMr/maoyan/dialog/dataEdit.vue

@@ -171,7 +171,7 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="openPrice = false">返回</el-button>
-        <el-button @click="submitFormPrice('formPrice','calendarPrice')">提交</el-button>
+        <el-button :loading="isLoading" @click="submitFormPrice('formPrice','calendarPrice')">提交</el-button>
       </span>
     </el-dialog>
   </el-dialog>
@@ -228,6 +228,7 @@ export default {
 
       cityList: [],
       isFlag: false,
+      isLoading: false,
     };
   },
   created() {
@@ -606,6 +607,7 @@ export default {
     /**  设置价格  */
     async calendarPrice(type){
       try {
+        this.isLoading = true
         if( this.timeValueObj.prev && this.timeValueObj.next ) {
           let minTime = moment(this.timeValueObj.prev).valueOf()
           let maxTime = moment(this.timeValueObj.next).valueOf()
@@ -662,12 +664,15 @@ export default {
           })
           if(res.code == 200) {
             this.openPrice = false
+            this.isLoading = false
             this.getCalendarPrice()
           }
         }else {
+          this.isLoading = false
           this.$message.error("请选择时间区间!!!");
         }
       } catch (error) {
+        this.isLoading = false
         
       }
       

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

@@ -165,7 +165,7 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="openPrice = false">返回</el-button>
-        <el-button @click="submitFormPrice('formPrice','calendarPrice')">提交</el-button>
+        <el-button :loading="isLoading" @click="submitFormPrice('formPrice','calendarPrice')">提交</el-button>
       </span>
     </el-dialog>
   </el-dialog>
@@ -217,6 +217,7 @@ export default {
       },
       seatTypeId: null,
       calendarId: null,
+      isLoading: false,
     };
   },
   methods: {
@@ -544,6 +545,7 @@ export default {
     /**  设置价格  */
     async calendarPrice(type){
       try {
+        this.isLoading = true
         if( this.timeValueObj.prev && this.timeValueObj.next ) {
           let minTime = moment(this.timeValueObj.prev).valueOf()
           let maxTime = moment(this.timeValueObj.next).valueOf()
@@ -600,12 +602,15 @@ export default {
           })
           if(res.code == 200) {
             this.openPrice = false
+            this.isLoading = false
             this.getCalendarPrice()
           }
         }else {
+          this.isLoading = false
           this.$message.error("请选择时间区间!!!");
         }
       } catch (error) {
+        this.isLoading = false
         
       }
       

+ 1 - 1
src/views/windowTicketSales/model/batchLock.vue

@@ -17,7 +17,7 @@
                 @change="handleCheckAllChange">全选</el-checkbox> -->
         <el-checkbox-group v-model="checkedList" @change="handleCheckedChange">
           <el-checkbox v-for="item in performTimeList" :label="item.id" :key="item.id" :value="item.id">
-            <span>{{ item.performDate + '(' +
+            <span>{{ item.performDate + ' (' +
               item.performTimeStart + '-' + item.performTimeEnd + ')' }}</span>
           </el-checkbox>
         </el-checkbox-group>