修改

src/pages/checkerManage/subProjectManage.vue

@@ -196,6 +196,7 @@
         </el-form-item>
         <el-form-item
           label="检票设备"
+          v-if="currentItem.id"
           prop="checkerIds">
           <el-select
             v-model="currentItem.checkerIds"

src/pages/queryReport/checkStatistic.vue

@@ -270,15 +270,31 @@ export default {
       }
     },
     reportExport () {
-      this.form.export = true
-      // this.form.exportDetail = true
+      this.$confirm(`是否要导出明细数据`, '确认提示', {
+        confirmButtonText: '是',
+        cancelButtonText: '否',
+        type: 'warning'
+      }).then(() => {
+        this.handelExport({
+          ...this.form,
+          export: true,
+          exportDetail: true
+        })
+      }).catch(() => {
+        this.handelExport({
+          ...this.form,
+          export: true,
+          exportDetail: false
+        })
+      })
+    },
+    handleExport (params) {
       getCheckerVerifyStatistics(this.form).then(() => {
         this.$message.success('导出成功。')
         this.goToDownload()
       }, () => {
         this.$message.success('导出失败。')
       })
-      this.reset()
     }
   }
 }

src/pages/queryReport/checkerStatistic.vue

@@ -319,9 +319,26 @@ export default {
       }
     },
     reportExport () {
-      this.form.export = true
-      this.form.exportDetail = true
-      getCheckerAccessStatistics(this.form).then(() => {
+      this.$confirm(`是否要导出明细数据`, '确认提示', {
+        confirmButtonText: '是',
+        cancelButtonText: '否',
+        type: 'warning'
+      }).then(() => {
+        this.handelExport({
+          ...this.form,
+          export: true,
+          exportDetail: true
+        })
+      }).catch(() => {
+        this.handelExport({
+          ...this.form,
+          export: true,
+          exportDetail: false
+        })
+      })
+    },
+    handelExport (params) {
+      getCheckerAccessStatistics(params).then(() => {
         this.$message.success('导出成功。')
         this.goToDownload()
       }, () => {

src/pages/queryReport/refundStatistic.vue

@@ -186,7 +186,26 @@ export default {
       if (!this.form.otaSourceNameList) {
         this.form.otaSourceNameList = []
       }
-      getCancelOrderStatistics(this.form).then(() => {
+      this.$confirm(`是否要导出明细数据`, '确认提示', {
+        confirmButtonText: '是',
+        cancelButtonText: '否',
+        type: 'warning'
+      }).then(() => {
+        this.handelExport({
+          ...this.form,
+          export: true,
+          exportDetail: true
+        })
+      }).catch(() => {
+        this.handelExport({
+          ...this.form,
+          export: true,
+          exportDetail: false
+        })
+      })
+    },
+    handelExport (params) {
+      getCancelOrderStatistics(params).then(() => {
         this.$message.success('导出成功。')
         this.goToDownload()
       }, () => {

src/pages/queryReport/reportList.vue

@@ -79,6 +79,11 @@
         border
         v-loading="loading"
         :data="tableData">
+        <el-table-column
+          label="创建时间"
+          prop="createTime"
+        >
+        </el-table-column>
         <el-table-column
           label="文件名称"
           prop="fileName"

src/pages/queryReport/salesQuery.vue

@@ -240,13 +240,13 @@
         >
         </el-table-column>
         <el-table-column
-          width="200"
+          width="300"
           prop="partnerOrderNo"
           label="第三方订单号"
         >
         </el-table-column>
         <el-table-column
-          width="100"
+          width="150"
           prop="orderCategory"
           label="订单类型"
         >
@@ -256,11 +256,11 @@
         </el-table-column>
         <el-table-column
           prop="firstTicketTypeName"
-          width="100"
+          width="150"
           label="票种">
         </el-table-column>
         <el-table-column
-          width="80"
+          width="150"
           prop="isOnlineOrder"
           label="销售来源"
         >
@@ -269,14 +269,14 @@
           </template>
         </el-table-column>
         <el-table-column
-          width="100"
+          width="150"
           prop="otaSourceName"
           label="销售渠道"
         >
         </el-table-column>
         <el-table-column
           label="支付渠道"
-          width="100"
+          width="150"
           prop="payChannel">
         </el-table-column>
         <el-table-column
@@ -379,9 +379,9 @@
           </template>
         </el-table-column>
         <el-table-column
-          label="备注"
+          label="下单备注"
           show-overflow-tooltip
-          prop="remark">
+          prop="createOrderRemark">
         </el-table-column>
         <el-table-column
           label="操作"

src/pages/sellManage/common/confirmMixin.js

@@ -20,7 +20,7 @@ export default {
       type: Array,
       default: () => []
     },
-    remark: {
+    createOrderRemark: {
       type: String,
       default: ''
     },
@@ -263,6 +263,7 @@ export default {
       })
 
       params.discountDescription = params.tickets.map((item) => item.discountDescription).filter(i => i).join('，')
+      params.createOrderRemark = this.createOrderRemark
       this.tickets = params.tickets
 
       if (this.createOrderStatus === 1) {

src/pages/sellManage/retail/Confirm.vue

@@ -92,8 +92,8 @@
 
       <br>
       <el-form-item
-        label="备注">
-        {{ remark }}
+        label="下单备注">
+        {{ createOrderRemark }}
       </el-form-item>
     </el-form>
     <div

src/pages/sellManage/retail/OrderInfo.vue

@@ -22,10 +22,10 @@
               :controls="false"
               v-model.number="actualMoney"></el-input-number>
           </span>
-          <span class="item">备注：
+          <span class="item">下单备注：
             <el-input
               clearable
-              v-model="remark"
+              v-model="createOrderRemark"
               style="width:200px"></el-input>
           </span>
         </div>
@@ -160,10 +160,10 @@
             style="width: 200px"
           ></el-input-number>
         </el-form-item>
-        <el-form-item label="说明">
+        <el-form-item label="优惠说明">
           <el-input
             type="textarea"
-            v-model="discountInfo.description"
+            v-model="discountInfo.discountDescription"
             :rows="3"
             placeholder="请输入说明"
           ></el-input>
@@ -176,7 +176,7 @@
     </el-dialog>
 
     <Confirm
-      :remark="remark"
+      :create-order-remark="createOrderRemark"
       :tickets="tickets"
       :order-items="value"
       :form-data="formData"
@@ -258,7 +258,7 @@ export default {
     return {
       payChannel: '',
       actualMoney: 0,
-      remark: '',
+      createOrderRemark: '',
       formData: {},
       pictureRemarks: [{
         idKey: randomString(),
@@ -272,7 +272,7 @@ export default {
       discountInfo: {
         ticketPrice: 0,
         discountPrice: 0,
-        description: ''
+        discountDescription: ''
       }
     }
   },
@@ -288,17 +288,17 @@ export default {
       this.currentItem = item
       this.discountInfo.ticketPrice = item.currentTicket.price
       this.discountInfo.discountPrice = item.discountPrice || 0
-      this.discountInfo.description = item.description || ''
+      this.discountInfo.discountDescription = item.discountDescription || ''
       this.showDiscountDialog = true
     },
     confirmDistinct () {
-      const { discountPrice, description } = this.discountInfo
+      const { discountPrice, discountDescription } = this.discountInfo
       this.$set(this.currentItem, 'discountPrice', discountPrice)
-      this.$set(this.currentItem, 'description', description)
+      this.$set(this.currentItem, 'discountDescription', discountDescription)
       this.currentItem.tickets.forEach(ticket => {
         this.$set(ticket, 'discountPrice', discountPrice)
         this.$set(ticket, 'price', ticket.originalPrice - discountPrice)
-        this.$set(ticket, 'description', description)
+        this.$set(ticket, 'discountDescription', discountDescription)
       })
       this.showDiscountDialog = false
     },
@@ -343,7 +343,7 @@ export default {
     },
     handleComplete () {
       this.$emit('clear')
-      this.remark = ''
+      this.createOrderRemark = ''
       this.$localStore.get('defaultPayWay') && this.setPayWay()
       this.$parent.$parent.$refs.orderRecord.getOrderList()
     },

src/router/index.js

@@ -290,7 +290,7 @@ let routerMap = [
         path: 'checkerStatistic',
         name: 'checkerStatistic',
         component: require('@/pages/queryReport/checkerStatistic').default,
-        meta: { title: '检票设备统计', permissionName: 'statistics-center:checker-statistics' }
+        meta: { title: '设备统计', permissionName: 'statistics-center:checker-statistics' }
       },
       {
         path: 'reportList',