对接

src/api/order.js

@@ -8,8 +8,7 @@ export function apiOrder (url, params) {
 // 获取订单列表
 export function apiOrderList (params) {
   // 只显示用户绑定景点
-  params.keyWords13 = 1
-  return http.post('order/getOrderList', params)
+  return http.post('/admin/order/list', { data: params })
 }
 export function getLastThreeOrderList (params) {
   return http.post('order/getLastThreeOrderList', params)

src/pages/queryReport/salesQuery.vue

@@ -12,25 +12,19 @@
       </div>
       <el-form-item
         label="订单号"
-        prop="keyWords1"
+        prop="orderNo"
       >
-        <el-input v-model="form.keyWords1"></el-input>
+        <el-input v-model="form.orderNo"></el-input>
       </el-form-item>
       <template>
         <el-form-item
-          label="OTA订单号"
-          prop="ota_order_no"
-        >
-          <el-input v-model="form.ota_order_no"></el-input>
-        </el-form-item>
-        <el-form-item
-          label="渠道订单号"
-          prop="ota_3rd_order_no"
+          label="合作方订单号"
+          prop="partnerOrderNo"
         >
-          <el-input v-model="form.ota_3rd_order_no"></el-input>
+          <el-input v-model="form.partnerOrderNo"></el-input>
         </el-form-item>
       </template>
-      <el-form-item
+      <!-- <el-form-item
         label="票号"
         prop="keyWords7"
       >
@@ -158,16 +152,16 @@
       </el-form-item>
       <el-form-item
         label="银行交易流水号"
-        prop="keyWords17"
+        prop="orderNo7"
         label-width="180px"
       >
-        <el-input v-model="form.keyWords17"></el-input>
+        <el-input v-model="form.orderNo7"></el-input>
       </el-form-item>
       <el-form-item
         label="支付方式"
-        prop="keyWords10">
+        prop="orderNo0">
         <el-select
-          v-model="form.keyWords10"
+          v-model="form.orderNo0"
           filterable>
           <el-option
             label="全部"
@@ -182,10 +176,10 @@
       </el-form-item>
       <el-form-item
         label="票种列表"
-        prop="keyWords11"
+        prop="orderNo1"
       >
         <el-select
-          v-model="form.keyWords11"
+          v-model="form.orderNo1"
           placeholder="请选择"
           filterable>
           <el-option
@@ -203,10 +197,10 @@
 
       <el-form-item
         label="景点选择"
-        prop="keyWords12"
+        prop="orderNo2"
       >
         <el-select
-          v-model="form.keyWords12"
+          v-model="form.orderNo2"
           placeholder="请选择">
           <el-option
             value=""
@@ -292,7 +286,7 @@
         prop="keyWords29"
       >
         <el-input v-model="form.keyWords29"></el-input>
-      </el-form-item>
+      </el-form-item> -->
       <div class="btn-wrap">
         <el-button
           @click="reset"
@@ -320,44 +314,32 @@
         :data="tableData">
         <el-table-column
           width="190"
-          prop="order_no"
+          prop="orderNo"
           label="订单号"
           fixed="left"
         >
-          <template slot-scope="scope">
-            {{ scope.row.order_no }}
-            <svg-icon
-              v-if="scope.row.customer_type"
-              icon-class="you"
-              style="color:red; font-size:22px" />
-          </template>
         </el-table-column>
         <el-table-column
           width="120"
-          prop="ota_order_no"
+          prop="partnerOrderNo"
           label="OTA订单号"
         >
         </el-table-column>
         <el-table-column
           width="120"
-          prop="ota_3rd_order_no"
+          prop="ota_3rd_orderNo"
           label="渠道订单号"
         >
         </el-table-column>
         <el-table-column
           label="支付方式"
           width="120"
-          prop="pay_channel">
+          prop="payType">
         </el-table-column>
         <el-table-column
           label="已开发票"
           width="120"
           prop="is_invoice_picked">
-          <template slot-scope="scope">
-            <el-tag :type="scope.row.is_invoice_picked?'success':'info'">
-              {{ scope.row.is_invoice_picked?'是':'否' }}
-            </el-tag>
-          </template>
         </el-table-column>
         <el-table-column
           label="票种"
@@ -384,13 +366,13 @@
         <el-table-column
           width="80"
           label="销售渠道">
-          <template slot-scope="scope">
+          <!-- <template slot-scope="scope">
             <el-tag
               effect="dark"
               :type="channelList[scope.row.sale_channel_id].type">
               {{ channelList[scope.row.sale_channel_id].label }}
             </el-tag>
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column
           width="120"
@@ -411,7 +393,7 @@
 
         <el-table-column
           width="80"
-          prop="tickets.length"
+          prop="ticketList.length"
           label="所含票数"
         >
         </el-table-column>
@@ -420,7 +402,7 @@
           label="人数"
         >
           <template slot-scope="scope">
-            {{ reduceCheckNum(scope.row.tickets) }}
+            {{ reduceCheckNum(scope.row.ticketList) }}
           </template>
         </el-table-column>
         <el-table-column
@@ -436,14 +418,14 @@
           label="取票状态"
           fixed="right"
         >
-          <template slot-scope="scope">
+          <!-- <template slot-scope="scope">
             <el-tag
               :type="checkPrintStatus(scope.row.tickets).type"
               size="normal"
             >
               {{ checkPrintStatus(scope.row.tickets).text }}
             </el-tag>
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column
           width="90"
@@ -458,14 +440,14 @@
           label="支付状态"
           fixed="right"
         >
-          <template slot-scope="scope">
+          <!-- <template slot-scope="scope">
             <el-tag
               :type="getPayStatus(scope.row.pay_status,'type')"
               size="normal"
             >
               {{ getPayStatus(scope.row.pay_status) }}
             </el-tag>
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column
           width="80"
@@ -502,13 +484,13 @@
             -->
             <el-link
               type="primary"
-              v-if="scenicName==='昭苏' && scope.row.tickets.some(v=>v.is_invoice_picked===0&&v.status==='USED')&&scope.row.ota_name!=='清鹤自营售票'"
+              v-if="scenicName==='昭苏' && scope.row.ticketList.some(v=>v.is_invoice_picked===0&&v.status==='USED')&&scope.row.ota_name!=='清鹤自营售票'"
               @click="showPickInvoice(scope.row)">
               开票
             </el-link>
             <el-link
               type="primary"
-              v-if="scenicName!=='昭苏' && scope.row.tickets.some(v=>v.is_invoice_picked===0&&v.status==='USED')"
+              v-if="scenicName!=='昭苏' && scope.row.ticketList.some(v=>v.is_invoice_picked===0&&v.status==='USED')"
               @click="showPickInvoice(scope.row)">
               开票
             </el-link>
@@ -534,7 +516,7 @@
       @close="visible=false">
       <el-table
         ref="multipleTable"
-        :data="currentOrder.tickets"
+        :data="currentOrder.ticketList"
         @selection-change="handleSelectionChange">
         <el-table-column
           type="selection"
@@ -764,7 +746,7 @@ import { apiOrderList, pickInvoice, getInvoice } from '@/api/order'
 import { orderStatusDic, channelList, papersType } from '@/assets/staticData'
 import { getPayStatus } from '@/utils/index'
 
-import ReaderInput from '@/components/ReaderInput'
+// import ReaderInput from '@/components/ReaderInput'
 import Ellipsis from '@/components/Ellipsis'
 import moment from 'moment'
 import { payPOS } from '@/api/pay'
@@ -797,7 +779,7 @@ export default {
     }
   },
   components: {
-    ReaderInput,
+    // ReaderInput,
     Ellipsis
   },
   data () {
@@ -812,9 +794,9 @@ export default {
         endDate: new Date(moment().endOf('day').valueOf()),
         startDate1: new Date(moment().startOf('day').valueOf()),
         endDate1: new Date(moment().endOf('day').valueOf()),
-        ota_order_no: '', // OTA订单号
-        ota_3rd_order_no: '', // 渠道订单号
-        keyWords1: '', // 订单号
+        partnerOrderNo: '', // OTA订单号
+        ota_3rd_orderNo: '', // 渠道订单号
+        orderNo: '', // 订单号
         keyWords2: '', // 游客姓名
         keyWords3: '', // 游客手机
         keyWords4: '', // 游客身份证
@@ -823,10 +805,10 @@ export default {
         keyWords7: '', // 票号
         keyWords8: null,
         keyWords9: '', // 售票员
-        keyWords10: '',
-        keyWords11: '',
-        keyWords12: '',
-        keyWords17: '', // 银行交易流水号
+        orderNo0: '',
+        orderNo1: '',
+        orderNo2: '',
+        orderNo7: '', // 银行交易流水号
         keyWords20: '',
         keyWords28: '',
         keyWords29: '',
@@ -872,18 +854,14 @@ export default {
     }
   },
   async created () {
-    const searchParams = JSON.parse(sessionStorage.getItem('统计表-售票记录-の查询条件'))
+    const searchParams = JSON.parse(sessionStorage.getItem('统计表-售票记录-查询条件'))
     if (searchParams) {
     // 如果存在查询条件，则设置到组件的数据中
       this.form = searchParams // 记住上次搜索条件
     }
     this.getOrderList()
-    const res = await getSystemConfigList()
-    /*
-    const order_tag_list = res.list.find(v => v.config_key === 'order_tag_list')?.config_value || []
-    this.order_tag_list = order_tag_list.replace(/\s+/g, '').split(',')
-    */
-    this.order_tag_list = res.list.find(v => v.config_key === 'order_tag_list')?.config_value?.replace(/\s+/g, '')?.split(',') || []
+    // const res = await getSystemConfigList()
+    // this.order_tag_list = res.list.find(v => v.config_key === 'order_tag_list')?.config_value?.replace(/\s+/g, '')?.split(',') || []
   },
   methods: {
     getPayStatus,
@@ -891,10 +869,10 @@ export default {
       this.$refs.form.resetFields()
     },
     // 取票状态
-    checkPrintStatus (tickets) {
-      let tempArr = tickets.filter(i => i.is_print)
+    checkPrintStatus (ticketList) {
+      let tempArr = ticketList.filter(i => i.is_print)
       if (tempArr.length) {
-        if (tempArr.length === tickets.length) {
+        if (tempArr.length === ticketList.length) {
           return { type: 'success', text: '已取票' }
         } else {
           return { type: 'warning', text: '部分取票' }
@@ -998,34 +976,36 @@ export default {
       this.loading = true
       goFirst && (this.form.pageNum = 1)
       apiOrderList(this.form).then(res => {
-        this.total = res.total
+        this.total = res.data.total
 
-        res.list.forEach(item => {
+        res.data.records.forEach(item => {
           let ticketsName = []
-          item.tickets.forEach(i => {
-            if (ticketsName.indexOf(i.tname) < 0) {
-              ticketsName.push(i.tname)
+          item.ticketList.forEach(i => {
+            if (ticketsName.indexOf(i.ticketTypeName) < 0) {
+              ticketsName.push(i.ticketTypeName)
             }
           })
           item.ticketsName = ticketsName.join('，')
         })
 
-        this.tableData = res.list
-        if (this.projectName === 'czg') {
-          this.tableData.forEach(v => {
-            if (v.price === 0 && v.pay_channel === '现金') {
-              v.pay_channel = '免票'
-            }
-          })
-        }
+        this.tableData = res.data.records
+        this.tableData.forEach(v => {
+          if (v.price === 0 && v.pay_channel === '现金') {
+            v.pay_channel = '免票'
+          }
+        })
+
+        console.log(this.tableData, 'tableData')
       }).finally(() => {
         this.loading = false
       })
-      sessionStorage.setItem('统计表-售票记录-の查询条件', JSON.stringify(this.form)) // 下次记住
+      sessionStorage.setItem('统计表-售票记录-查询条件', JSON.stringify(this.form)) // 下次记住
     },
     reduceCheckNum (list) {
+      console.log(list, 'list')
+      if (!list) return 0
       return list.reduce((prev, item) => {
-        return prev + item.check_num
+        return prev + item.peopleNum
       }, 0)
     }
   }