瀏覽代碼

修改bug

nirvana 4 月之前
父節點
當前提交
4adc1fdb19

+ 1 - 2
src/pages/queryReport/checkStatistic.vue

@@ -152,7 +152,6 @@ export default {
     return {
       groupKeys: [{ value: 'tagName', label: '票种标签' }, { value: 'otaSourceName', label: '分销商' }],
       form: {
-        export: true,
         checkTimeBegin: new Date(moment().startOf('day').subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss')),
         checkTimeEnd: new Date(moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')),
         ticketTypeIdList: [], //
@@ -289,7 +288,7 @@ export default {
       })
     },
     handleExport (params) {
-      getCheckerVerifyStatistics(this.form).then(() => {
+      getCheckerVerifyStatistics(params).then(() => {
         this.$message.success('导出成功。')
         this.goToDownload()
       }, () => {

+ 11 - 18
src/pages/queryReport/freeStatistic.vue

@@ -122,6 +122,7 @@ import { getDeviceList } from '@/api/checker'
 // import ReaderInput from '@/components/ReaderInput'
 import moment from 'moment'
 
+
 export default {
   name: 'freeQuery',
   computed: {
@@ -156,12 +157,6 @@ export default {
         pageNum: 1,
         pageSize: 10
       },
-      ExportForm: {
-        // cancelTimeBegin: new Date(moment().format('YYYY-MM-DD') + ' 00:00:00'),
-        // cancelTimeEnd: new Date(moment().format('YYYY-MM-DD') + ' 23:59:59'),
-        // ticketTypeIdList: [], // 票种
-        // otaSourceNameList: []
-      },
       tableData: [],
       total: 0,
       loading: false,
@@ -183,28 +178,26 @@ export default {
       this.$refs.form.resetFields()
     },
     setTime () {
-      if (this.ExportForm.cancelTimeBegin) {
-        this.ExportForm.cancelTimeBegin = moment(this.ExportForm.cancelTimeBegin).format('YYYY-MM-DD HH:mm:ss')
+      if (this.form.checkTimeBegin) {
+        this.form.checkTimeBegin = moment(this.form.checkTimeBegin).format('YYYY-MM-DD HH:mm:ss')
       } else {
-        this.ExportForm.cancelTimeBegin = ''
+        this.form.checkTimeBegin = ''
       }
 
-      if (this.ExportForm.cancelTimeEnd) {
-        this.ExportForm.cancelTimeEnd = moment(this.ExportForm.cancelTimeEnd).format('YYYY-MM-DD HH:mm:ss')
+      if (this.form.checkTimeEnd) {
+        this.form.checkTimeEnd = moment(this.form.checkTimeEnd).format('YYYY-MM-DD HH:mm:ss')
       } else {
-        this.ExportForm.cancelTimeEnd = ''
+        this.form.checkTimeEnd = ''
       }
     },
     reportExport () {
-      this.ExportForm.export = true
       this.setTime()
-
-      if (!this.ExportForm.ticketTypeIdList) {
-        this.ExportForm.ticketTypeIdList = []
+      if (!this.form.ticketTypeIdList) {
+        this.form.ticketTypeIdList = []
       }
 
-      if (!this.ExportForm.otaSourceNameList) {
-        this.ExportForm.otaSourceNameList = []
+      if (!this.form.otaSourceNameList) {
+        this.form.otaSourceNameList = []
       }
       this.$confirm(`是否要导出明细数据`, '确认提示', {
         confirmButtonText: '是',

+ 1 - 3
src/pages/queryReport/ghSplitRecordStatistic.vue

@@ -150,7 +150,6 @@ import moment from 'moment'
 import { getSaleChannelList } from '@/api/order'
 // import ReaderInput from '@/components/ReaderInput'
 // import draggable from 'vuedraggable'
-// import moment from 'moment'
 
 const groupKeys = [
   { value: 'team', label: '团体' }
@@ -181,7 +180,6 @@ export default {
     return {
       groupKeys,
       form: {
-        export: true,
         timeBegin: new Date(moment().startOf('day').subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss')),
         timeEnd: new Date(moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')),
         ticketTypeIdList: [], //
@@ -324,7 +322,7 @@ export default {
       })
     },
     handleExport (params) {
-      getGhSrStatistic(this.form).then(() => {
+      getGhSrStatistic(params).then(() => {
         this.$message.success('导出成功。')
         this.goToDownload()
       }, () => {

+ 2 - 2
src/pages/queryReport/osSaleStatistic/CheckStat.vue

@@ -184,7 +184,7 @@ export default {
     return {
       groupKeys,
       form: {
-        export: true,
+
         timeBegin: new Date(moment().startOf('day').subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss')),
         timeEnd: new Date(moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')),
         ticketTypeIdList: [], //
@@ -330,7 +330,7 @@ export default {
       })
     },
     handleExport (params) {
-      getOsCheckStatistic(this.form).then(() => {
+      getOsCheckStatistic(params).then(() => {
         this.$message.success('导出成功。')
         this.goToDownload()
       }, () => {

+ 1 - 2
src/pages/queryReport/osSaleStatistic/SaleStat.vue

@@ -181,7 +181,6 @@ export default {
     return {
       groupKeys,
       form: {
-        export: true,
         timeBegin: new Date(moment().startOf('day').subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss')),
         timeEnd: new Date(moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')),
         ticketTypeIdList: [], //
@@ -324,7 +323,7 @@ export default {
       })
     },
     handleExport (params) {
-      getOsSaleStatistic(this.form).then(() => {
+      getOsSaleStatistic(params).then(() => {
         this.$message.success('导出成功。')
         this.goToDownload()
       }, () => {

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

@@ -180,7 +180,6 @@ export default {
       }
     },
     reportExport () {
-      this.form.export = true
       this.setTime()
 
       if (!this.form.ticketTypeIdList) {

+ 12 - 18
src/pages/visitor/visitorStatistic.vue

@@ -81,7 +81,7 @@
         <el-tab-pane
           label="游客性别统计"
           name="gender">
-          <Sex :table-data="statisticsInfo.genderStatistics"></Sex>
+          <Sex :table-data="statisticsInfo.sexStatistics"></Sex>
         </el-tab-pane>
       </el-tabs>
     </el-card>
@@ -93,6 +93,7 @@ import Age from './Statistic/Age'
 import Sex from './Statistic/Sex'
 import AreaStatics from './Statistic/Area'
 import { getVisitorStatistics } from '@/api/visitor'
+import moment from 'moment'
 
 export default {
   name: 'visitorStatistic',
@@ -104,12 +105,6 @@ export default {
   data () {
     return {
       activeName: 'source',
-      ExportForm: {
-        // cancelTimeBegin: new Date(moment().format('YYYY-MM-DD') + ' 00:00:00'),
-        // cancelTimeEnd: new Date(moment().format('YYYY-MM-DD') + ' 23:59:59'),
-        // ticketTypeIdList: [], // 票种
-        // otaSourceNameList: []
-      },
       form: {
         statisticsTimeBegin: '',
         statisticsTimeEnd: '',
@@ -128,31 +123,30 @@ export default {
   },
   methods: {
     setTime () {
-      if (this.ExportForm.cancelTimeBegin) {
-        this.ExportForm.cancelTimeBegin = moment(this.ExportForm.cancelTimeBegin).format('YYYY-MM-DD HH:mm:ss')
+      if (this.form.statisticsTimeBegin) {
+        this.form.statisticsTimeBegin = moment(this.form.statisticsTimeBegin).format('YYYY-MM-DD HH:mm:ss')
       } else {
-        this.ExportForm.cancelTimeBegin = ''
+        this.form.statisticsTimeBegin = ''
       }
 
-      if (this.ExportForm.cancelTimeEnd) {
-        this.ExportForm.cancelTimeEnd = moment(this.ExportForm.cancelTimeEnd).format('YYYY-MM-DD HH:mm:ss')
+      if (this.form.statisticsTimeEnd) {
+        this.form.statisticsTimeEnd = moment(this.form.statisticsTimeEnd).format('YYYY-MM-DD HH:mm:ss')
       } else {
-        this.ExportForm.cancelTimeEnd = ''
+        this.form.statisticsTimeEnd = ''
       }
     },
 
     //导出
 
     reportExport () {
-      this.ExportForm.export = true
       this.setTime()
 
-      if (!this.ExportForm.ticketTypeIdList) {
-        this.ExportForm.ticketTypeIdList = []
+      if (!this.form.ticketTypeIdList) {
+        this.form.ticketTypeIdList = []
       }
 
-      if (!this.ExportForm.otaSourceNameList) {
-        this.ExportForm.otaSourceNameList = []
+      if (!this.form.otaSourceNameList) {
+        this.form.otaSourceNameList = []
       }
       this.$confirm(`是否要导出明细数据`, '确认提示', {
         confirmButtonText: '是',