修改

src/api/ticketType.js

@@ -63,6 +63,11 @@ export function delScenic (data) {
   return http.post('/admin/scenic/delete', { data: { idList: [data.id] } })
 }
 
+// 批量更新场次
+export function batchUpdateTicketBatch (ticketTypeId, params) {
+  return http.post(`/admin/batchConfig/saveOrUpdate/${ticketTypeId}`, { data: params })
+}
+
 // 新增场次
 export function addTicketBatch (ticketTypeId, params) {
   return http.post(`/admin/batchConfig/add/${ticketTypeId}`, { data: params })

src/components/GlobalComponents/OrderDetail.vue

@@ -17,7 +17,7 @@
       <el-form-item label="创建时间">
         {{ orderData.createTime | formatTime }}
       </el-form-item>
-      <el-form-item label="第三方订单号">
+      <el-form-item label="合作方订单号">
         {{ orderData.partnerOrderNo }}
       </el-form-item>
       <el-form-item label="订单类型">
@@ -250,7 +250,7 @@
               </el-table-column>
               <el-table-column prop="fee" label="支付金额">
               </el-table-column>
-              <el-table-column prop="outOrderNo" label="第三方订单号">
+              <el-table-column prop="outOrderNo" label="合作方订单号">
               </el-table-column>
               <el-table-column prop="errMsg" label="支付错误信息">
               </el-table-column>

src/config/env.js

@@ -12,11 +12,13 @@ export default () => {
 
   switch (process.env.NODE_ENV) {
     case 'development': // 开发测试
-      env.baseUrl = 'http://114.104.160.233:28001/'
+      // env.baseUrl = 'http://114.104.160.233:28001/'
+      env.baseUrl = 'http://114.104.160.118:18003/'
       break
 
     default:
-      env.baseUrl = 'http://114.104.160.233:28001/'
+      // env.baseUrl = 'http://114.104.160.233:28001/'
+      env.baseUrl = 'http://114.104.160.118:18003/'
       break
   }
 

src/main.js

@@ -33,7 +33,7 @@ import '@/icons' // icon
 import App from './App'
 import router from './router'
 import store from './store'
-
+import { localStore } from '@/utils'
 import * as filters from './filters' // global filters
 import '@/permission' // permission control
 
@@ -82,8 +82,6 @@ const log = require('electron-log')
 log.transports.console.level = 'silly'
 log.transports.file.maxSize = 15 * 1024 * 1024
 
-const Store = require('electron-store')
-const localStore = new Store()
 // 避免在配置页无法打开配置文件
 localStore.set('init', true)
 

src/pages/checkerManage/deviceManage.vue

@@ -440,7 +440,7 @@ export default {
         status: value,
         name: item.name,
         url: item.url || '',
-        scenicIdList: item.scenicList
+        scenicIdList: (item.scenicList || []).map(i => i.scenicId)
       }
 
       updateDevice(newItem).then(res => {

src/pages/checkerManage/termManage/index.vue

@@ -175,7 +175,7 @@ export default {
         pageSize: 10,
         name: '',
         ip: '',
-        status: 1
+        status: ''
       },
       accountList: [],
       tableData: [],

src/pages/config/index.vue

@@ -541,13 +541,15 @@ export default {
       this.$message.success('配置完成，请等待刷新')
 
       setTimeout(() => {
+        window.location.reload()
         this.$router.push('/')
       }, 2000)
     },
     handleBack () {
-      if (!this.$localStore.get('serverUrl') && !this.$localStore.get('updateUrl')) {
+      if (!this.$localStore.get('serverUrl')) {
         this.$message.error('请完成地址配置。')
       }
+      window.location.reload()
       this.$router.push('/')
     },
     handlePreview () {

src/pages/queryReport/salesQuery.vue

@@ -50,13 +50,21 @@
         ></ReaderInput>
       </el-form-item>
       <el-form-item
-        label="第三方订单号"
+        label="合作方订单号"
         prop="partnerOrderNo"
       >
         <el-input
           v-model="form.partnerOrderNo"
           clearable></el-input>
       </el-form-item>
+      <el-form-item
+        label="票号"
+        prop="ticketNo"
+      >
+        <el-input
+          v-model="form.ticketNo"
+          clearable></el-input>
+      </el-form-item>
       <el-form-item
         label="支付方式"
         prop="payChannelList">
@@ -233,7 +241,7 @@
         v-loading="loading"
         :data="tableData">
         <el-table-column
-          width="180"
+          width="220"
           prop="orderNo"
           label="订单号"
           fixed="left"
@@ -242,7 +250,7 @@
         <el-table-column
           width="300"
           prop="partnerOrderNo"
-          label="第三方订单号"
+          label="合作方订单号"
         >
         </el-table-column>
         <el-table-column
@@ -256,7 +264,7 @@
         </el-table-column>
         <el-table-column
           prop="firstTicketTypeName"
-          width="150"
+          width="180"
           label="票种">
         </el-table-column>
         <el-table-column
@@ -1490,6 +1498,7 @@ export default {
       form: {
         searchKeywords: '', // 搜索关键字
         partnerOrderNo: '', // OTA订单号
+        ticketNo: '', // 票号
         otaOrderNo: '', // 渠道订单号
         orderNo: '', // 订单号
         createTime: [new Date(moment().subtract(7, 'day').format('YYYY-MM-DD')), new Date(moment().format('YYYY-MM-DD'))], // 下单时间

src/pages/sellManage/retail/FormInfo.vue

@@ -443,12 +443,14 @@ export default {
           return this.$message.error('请选场次')
         }
 
-        if (this.currentBatch.leftNums <= 0) {
-          return this.$message.error('当前场次已售罄')
-        }
+        if (this.currentBatch.leftNums !== -1) {
+          if (this.currentBatch.leftNums === 0) {
+            return this.$message.error('当前场次已售罄')
+          }
 
-        if (this.currentBatch.leftNums < this.form.count) {
-          return this.$message.error('当前场次剩余票数不足')
+          if (this.currentBatch.leftNums < this.form.count) {
+            return this.$message.error('当前场次剩余票数不足')
+          }
         }
       }
 

src/pages/ticketSetting/ticket/Dialog.vue

@@ -478,9 +478,9 @@
           <el-form-item
             verify
             label="票种绑定的销售渠道"
-            prop="ticketTypeSourceList"
+            prop="source"
           >
-            <el-checkbox-group v-model="form.ticketTypeSourceList">
+            <el-checkbox-group v-model="form.source">
               <el-checkbox
                 label="window">
                 窗口
@@ -918,7 +918,7 @@
 </template>
 
 <script>
-import { addTicket, updateTicket, queueList, addTicketBatch, updateTicketBatch, delTicketBatch } from '@/api/ticketType'
+import { addTicket, updateTicket, queueList, batchUpdateTicketBatch, delTicketBatch } from '@/api/ticketType'
 import { getLabelName } from '@/utils'
 import { cloneDeep } from 'lodash'
 import moment from 'moment'
@@ -962,7 +962,7 @@ const defaultForm = {
   groupScenicList: [], // 包含项目-组合景点数组 二维数组结构
   batchConfigList: [], // 批次配置数组
   ticketTypeScenicList: [], // 票种绑定的景点数组
-  ticketTypeSourceList: ['window', 'term'], // 票种绑定的销售渠道 窗口:window ; 自助机:term,示例值([window])
+  source: ['window', 'term'], // 票种绑定的销售渠道 窗口:window ; 自助机:term,示例值([window])
   useDateType: 1 // 使用日期类型 1日历票 2期票 默认为1
 }
 export default {
@@ -1066,13 +1066,13 @@ export default {
       this.dialogType = type
       if (ticketItem) {
         this.form = cloneDeep(ticketItem)
-        this.form.ticketTypeSourceList = ticketItem.ticketTypeSourceList || ticketItem.source || []
+        this.form.source = ticketItem.source || []
         this.form.useDayOfWeek = this.form.useDayOfWeek.split(',')
         this.form.checkType = this.form.checkType.split(',')
         this.form.checkRule = this.form.checkRule.split(',')
 
-        if (!this.form.ticketTypeSourceList) {
-          this.form.ticketTypeSourceList = []
+        if (!this.form.source) {
+          this.form.source = []
         }
 
         if (!this.form.ticketTypeScenicList) {
@@ -1276,17 +1276,13 @@ export default {
     },
     async saveAllBatchConfig () {
       const ticketTypeId = this.form.id
-      const updateBatchList = this.form.batchConfigList.map(item => {
-        if (item.id) {
-          return updateTicketBatch(item)
-        } else {
-          return addTicketBatch(ticketTypeId, item)
-        }
-      })
+      if (!ticketTypeId) {
+        return
+      }
 
-      return Promise.all(updateBatchList).then(res => {
-        if (res.some(item => item.code !== '200')) {
-          this.$message.error('时间场次保存失败')
+      batchUpdateTicketBatch(ticketTypeId, this.form.batchConfigList).then(res => {
+        if (res.code !== '200') {
+          this.$message.error('场次保存失败')
         }
       })
     },
@@ -1324,7 +1320,7 @@ export default {
         } = this.form
 
         if (valid) {
-          if (!price || isNaN(Number(price)) || price <= 0) {
+          if (isNaN(Number(price)) || price < 0) {
             this.$message.error('请填写销售价格')
             return
           }

src/utils/request.js

@@ -5,10 +5,9 @@ import { getToken } from '@/utils/auth'
 import router from '@/router'
 import { Message } from 'element-ui'
 import { resetServerTime } from './index'
+import { localStore } from '@/utils'
 /* eslint-disable-next-line */
 
-const Store = require('electron-store')
-const localStore = new Store()
 const log = require('electron-log')
 
 // 创建axios实例