LaveyD 2 miesięcy temu
rodzic
commit
b05f292f4b

+ 1 - 0
src/pages/queryReport/OrderStatistic.vue

@@ -380,6 +380,7 @@ const groupKeys = [
   { value: 'otaSourceName', label: '销售渠道' },
   { value: 'team', label: '团体' },
   { value: 'guide', label: '导游' },
+  { value: 'batch', label: '场次' },
   { value: 'orderDateDay', label: '统计日期' },
   { value: 'orderDateMonth', label: '统计月份' },
   { value: 'orderDateYear', label: '统计年份' }

+ 8 - 0
src/pages/queryReport/salesQuery.vue

@@ -2226,6 +2226,14 @@ export default {
 
       this.editOrderInfo.ticketCheckScenicUpdateRequestList = []
 
+      if (this.editOrderInfo.playDateBegin) {
+        this.editOrderInfo.playDateBegin = moment(this.editOrderInfo.playDateBegin).format('YYYY-MM-DD')
+      }
+
+      if (this.editOrderInfo.playDateEnd) {
+        this.editOrderInfo.playDateEnd = moment(this.editOrderInfo.playDateEnd).format('YYYY-MM-DD')
+      }
+
       if (this.editOrderInfo.updateType === 'updateScenicTimes') {
         this.editOrderInfo.ticketIds = this.editOrderInfo.ticketList.map(item => item.id)
         this.editOrderInfo.ticketList.forEach(item => {

+ 2 - 0
src/pages/sellManage/common/confirmMixin.js

@@ -288,6 +288,8 @@ export default {
         ticket.face = {
           faceImg: ticket.face
         }
+
+        ticket.batchConfigId = params.batchConfigId || ticket.batchConfigId || ''
       })
 
       params.discountDescription = params.tickets.map((item) => item.discountDescription).filter(i => i).join(',')

+ 18 - 0
src/pages/ticketSetting/ticket.vue

@@ -51,6 +51,23 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item
+        label="景点"
+        prop="scenicId"
+      >
+        <el-select v-model="form.scenicId">
+          <el-option
+            value=""
+            label="全部"
+          ></el-option>
+          <el-option
+            v-for="item in scenicList"
+            :key="item.id"
+            :value="item.id"
+            :label="item.name">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <div class="btn-wrap">
         <el-button
           @click="reset"
@@ -269,6 +286,7 @@ export default {
     return {
       form: {
         ticketTypeName: '',
+        scenicId: '',
         category: '',
         isSale: '',
         pageNum: 1,

+ 4 - 0
src/pages/ticketSetting/ticket/Dialog.vue

@@ -1328,6 +1328,10 @@ export default {
       this.dialogType = type
       if (ticketItem) {
         this.form = cloneDeep(ticketItem)
+        // 编辑时 batch 当做 ticket 处理
+        if (this.dialogType === 'edit' && this.form.category === 'batch') {
+          this.form.category = 'ticket'
+        }
         this.form.source = ticketItem.source || []
         this.form.useDayOfWeek = this.form.useDayOfWeek.split(',')
         this.form.checkType = this.form.checkType.split(',')

+ 4 - 4
src/store/modules/app.js

@@ -57,10 +57,10 @@ const app = {
       {
         id: 'member',
         name: '年卡次卡'
-      },
-      {
-        id: 'batch',
-        name: '场次售票'
+      // },
+      // {
+      //   id: 'batch',
+      //   name: '场次售票'
       }
     ],
     ticketTypeList: [],