修改

src/components/GlobalComponents/OrderDetail.vue

@@ -464,15 +464,15 @@ export default {
       if (!this.orderData) return []
       return this.orderData.ticketList.filter(i =>
         this.ticketNoSearch1
-          ? i.ticketNo.includes(this.ticketNoSearch1)
+          ? !!i.ticketNo.includes(this.ticketNoSearch1)
           : true
       )
     },
     checkLogList () {
       if (!this.orderData) return []
-      return this.orderData.ticketCheckLogList.filter(i =>
+      return this.ticketCheckLogList.filter(i =>
         this.ticketNoSearch2
-          ? i.ticketNo.includes(this.ticketNoSearch2)
+          ? !!i.ticketNo.includes(this.ticketNoSearch2)
           : true
       )
     }
@@ -489,7 +489,10 @@ export default {
       activeTab: 'ticketCheckInfo',
       ticketNoSearch: '',
       ticketNoSearch1: '',
-      ticketNoSearch2: ''
+      ticketNoSearch2: '',
+      ticketCheckScenicList: [],
+      ticketSecondPrintLogList: [],
+      ticketCheckLogList: []
     }
   },
   filters: {
@@ -588,9 +591,9 @@ export default {
         data.pictureRemarks = data.pictureRemarks.filter(i => i.url)
       }
 
-      this.orderData.ticketCheckScenicList = []
-      this.orderData.ticketCheckLogList = []
-      this.orderData.ticketSecondPrintLogList = []
+      this.ticketCheckScenicList = []
+      this.ticketCheckLogList = []
+      this.ticketSecondPrintLogList = []
 
       if (this.orderData.ticketList) {
         this.orderData.ticketList.forEach(async ticket => {
@@ -600,7 +603,7 @@ export default {
 
           if (ticketCheckScenicList && ticketCheckScenicList.length) {
             ticketCheckScenicList.forEach((scenic) => {
-              this.orderData.ticketCheckScenicList.push({
+              this.ticketCheckScenicList.push({
                 ...scenic,
                 ticketNo,
                 ticketTypeName,
@@ -611,7 +614,7 @@ export default {
 
           if (ticketCheckLogList && ticketCheckLogList.length) {
             ticketCheckLogList.forEach((log) => {
-              this.orderData.ticketCheckLogList.push({
+              this.ticketCheckLogList.push({
                 ...log,
                 ticketNo,
                 ticketTypeName,
@@ -622,7 +625,7 @@ export default {
 
           if (ticketSecondPrintLogList && ticketSecondPrintLogList.length) {
             ticketSecondPrintLogList.forEach((log) => {
-              this.orderData.ticketSecondPrintLogList.push({
+              this.ticketSecondPrintLogList.push({
                 ...log,
                 ticketNo,
                 ticketTypeName,

src/pages/queryReport/OrderStatistic.vue

@@ -59,6 +59,25 @@
         </el-select>
       </el-form-item>
 
+      <el-form-item
+        label="景点"
+        prop="scenicIdList"
+      >
+        <el-select
+          v-model="form.scenicIdList"
+          placeholder="请选择"
+          multiple
+          clearable
+          filterable>
+          <el-option
+            v-for="(item, idx) in scenicList"
+            :key="`scene-${idx}`"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+
       <el-form-item
         label="售票员"
         prop="adminIdList">
@@ -389,6 +408,7 @@ export default {
         otaSourceNameList: [], // 渠道id
         payChannelList: [],
         adminIdList: [], // 售票员id
+        scenicIdList: [], // 景点id
         groupByList: ['ticketTypeName'],
         pageSize: 10,
         pageNum: 1

src/pages/queryReport/osSaleStatistic/CheckStat.vue

@@ -115,33 +115,37 @@
           :label="item.label">
         </el-table-column>
         <el-table-column
-          prop="otaSourceName"
-          label="订单渠道">
+          prop="statDate"
+          label="日期">
         </el-table-column>
+        <!-- <el-table-column
+          prop="team"
+          label="团体">
+        </el-table-column> -->
         <el-table-column
           prop="ticketTypeName"
-          label="票种名称">
+          label="票种">
         </el-table-column>
         <el-table-column
           prop="unitPrice"
-          label="单价">
+          label="门票单价">
         </el-table-column>
         <el-table-column
-          prop="checkCount"
-          label="检票数量">
+          prop="scenicName"
+          label="子景点名称">
+        </el-table-column>
+        <el-table-column
+          prop="scenicUnitPrice"
+          label="子景点单价">
         </el-table-column>
         <el-table-column
           prop="checkNum"
-          label="检票人数">
+          label="检票张数">
         </el-table-column>
         <el-table-column
           prop="checkPrice"
           label="检票金额">
         </el-table-column>
-        <el-table-column
-          prop="checkSettlementPrice"
-          label="检票结算金额">
-        </el-table-column>
       </el-table>
     </div>
   </div>

src/pages/queryReport/osSaleStatistic/SaleStat.vue

@@ -116,28 +116,44 @@
           :label="item.label">
         </el-table-column>
         <el-table-column
-          prop="otaSourceName"
-          label="订单渠道">
+          prop="statDate"
+          label="日期"
+          align="center">
         </el-table-column>
+        <!-- <el-table-column
+          prop="team"
+          label="团体"
+          align="center">
+        </el-table-column> -->
         <el-table-column
           prop="ticketTypeName"
-          label="票种名称">
+          label="票种"
+          align="center">
         </el-table-column>
         <el-table-column
           prop="unitPrice"
-          label="单价">
+          label="门票单价"
+          align="center">
         </el-table-column>
         <el-table-column
-          prop="checkCount"
-          label="检票数量">
+          prop="scenicName"
+          label="子景点名称"
+          align="center">
         </el-table-column>
         <el-table-column
-          prop="checkNum"
-          label="检票人数">
+          prop="scenicUnitPrice"
+          label="子景点单价"
+          align="center">
         </el-table-column>
         <el-table-column
-          prop="checkPrice"
-          label="检票金额">
+          prop="saleNum"
+          label="售票张数"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="salePrice"
+          label="售票金额"
+          align="center">
         </el-table-column>
       </el-table>
     </div>

src/pages/queryReport/salesQuery.vue

@@ -174,6 +174,24 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item
+        label="景点"
+        prop="scenicIdList"
+      >
+        <el-select
+          v-model="form.scenicIdList"
+          placeholder="请选择"
+          multiple
+          clearable
+          filterable>
+          <el-option
+            v-for="(item, idx) in scenicList"
+            :key="`scene-${idx}`"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item
         label="售票员"
         prop="adminIdList"
@@ -1534,6 +1552,7 @@ export default {
         visitorPhone: '', // 游客手机
         visitorIdentify: '', // 游客身份证
         ticketTypeIdList: [], // 票种列表
+        scenicIdList: [], // 景点列表
         pageNum: 1,
         pageSize: 10
       },

src/router/index.js

@@ -262,12 +262,12 @@ let routerMap = [
         component: require('@/pages/queryReport/osSaleStatistic').default,
         meta: { title: '分账统计', permissionName: 'ticket-manage:order-scenic-split-statistics' }
       },
-      // {
-      //   path: 'ghSplitRecordStatistic',
-      //   name: 'ghSplitRecordStatistic',
-      //   component: require('@/pages/queryReport/ghSplitRecordStatistic').default,
-      //   meta: { title: '工行商户统计', permissionName: 'ticket-manage:order-scenic-split-statistics' }
-      // },
+      {
+        path: 'ghSplitRecordStatistic',
+        name: 'ghSplitRecordStatistic',
+        component: require('@/pages/queryReport/ghSplitRecordStatistic').default,
+        meta: { title: '工行商户统计', permissionName: 'ticket-manage:gh-mer-split-statistics' }
+      },
       {
         path: 'checkQuery',
         name: 'checkQuery',