Browse Source

接口对接

zhangdan 4 years ago
parent
commit
900afdb888
1 changed files with 56 additions and 67 deletions
  1. 56 67
      src/views/SetmealSales/VerificationRecords.vue

+ 56 - 67
src/views/SetmealSales/VerificationRecords.vue

@@ -17,26 +17,26 @@
           </a-col>
           </a-col>
           <a-col :span="6">
           <a-col :span="6">
             <a-form-item label="核销门店" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
             <a-form-item label="核销门店" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <a-select placeholder="请选择" allowClear v-model="storeId" mode="multiple">
+              <a-select placeholder="请选择" allowClear v-model="searchForm.usedStoreId">
                 <a-select-option v-for="item in storeOptionData" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
                 <a-select-option v-for="item in storeOptionData" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
               </a-select>
               </a-select>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :span="6">
           <a-col :span="6">
             <a-form-item label="客户信息" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
             <a-form-item label="客户信息" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <a-input v-model.trim="searchForm.orderNo" placeholder="请输入手机号/车牌号" allowClear />
+              <a-input v-model.trim="searchForm.queryWorld" placeholder="请输入手机号/车牌号" allowClear />
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :span="6">
           <a-col :span="6">
             <a-form-item label="套餐名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
             <a-form-item label="套餐名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <a-input v-model.trim="searchForm.customerMobile" placeholder="请输入" allowClear />
+              <a-input v-model.trim="searchForm.bundName" placeholder="请输入" allowClear />
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
         </a-row>
         </a-row>
         <a-row :gutter="48">
         <a-row :gutter="48">
           <a-col :span="6">
           <a-col :span="6">
             <a-form-item label="关联订单号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
             <a-form-item label="关联订单号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <a-input v-model.trim="searchForm.customerMobile" placeholder="请输入" allowClear :maxLength="11" />
+              <a-input v-model.trim="searchForm.orderNo" placeholder="请输入" allowClear :maxLength="11" />
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :span="18">
           <a-col :span="18">
@@ -94,12 +94,8 @@ import {
 } from '@/components'
 } from '@/components'
 import getDate from '@/libs/getDate.js'
 import getDate from '@/libs/getDate.js'
 import {
 import {
-  orderCenterList,
-  itemList,
-  storeList,
-  orderTotal,
-  exportOrder
-} from '@/api/order.js'
+  getVerificationRecordsList,getVerificationRecordsListTotal,settlementRecordsExport
+} from '@/api/SetmealSales.js'
 // import OrderDetailModal from './OrderDetailModal.vue'
 // import OrderDetailModal from './OrderDetailModal.vue'
 import moment from 'moment'
 import moment from 'moment'
 export default {
 export default {
@@ -111,16 +107,14 @@ export default {
   },
   },
   data () {
   data () {
     return {
     return {
-      storeId: [], // 网点名称
       // 查询参数
       // 查询参数
       searchForm: {
       searchForm: {
         beginDate: null, // 创建的开始时间
         beginDate: null, // 创建的开始时间
         endDate: null, // 创建的结束时间
         endDate: null, // 创建的结束时间
-        storeIdList: [], // 网点名称
+        usedStoreId: '', // 核销门店
         orderNo: '', // 单号
         orderNo: '', // 单号
-        itemId: undefined, // 服务项目
-        customerMobile: '', // 手机号码
-        orderStatus: '' // 状态
+        queryWorld: '', // 客户信息
+        bundName: '' // 套餐名称
       },
       },
       loading: false, // 导出loading
       loading: false, // 导出loading
       orderTotal: '', // 合计开单数量
       orderTotal: '', // 合计开单数量
@@ -147,12 +141,12 @@ export default {
         minWidth: '40',
         minWidth: '40',
         align: 'center'
         align: 'center'
       },
       },
-      {
-        title: '核销时间',
-        dataIndex: 'orderNo',
-        minWidth: '40',
-        align: 'center'
-      },
+      // {
+      //   title: '核销时间',
+      //   dataIndex: 'orderNo',
+      //   minWidth: '40',
+      //   align: 'center'
+      // },
       {
       {
         title: '核销服务名称',
         title: '核销服务名称',
         dataIndex: 'storeName',
         dataIndex: 'storeName',
@@ -182,8 +176,7 @@ export default {
       loadData: parameter => {
       loadData: parameter => {
         this.searchForm.beginDate == null ? this.searchForm.beginDate = getDate.getToday().starttime : null
         this.searchForm.beginDate == null ? this.searchForm.beginDate = getDate.getToday().starttime : null
         this.searchForm.endDate == null ? this.searchForm.endDate = getDate.getToday().endtime : null
         this.searchForm.endDate == null ? this.searchForm.endDate = getDate.getToday().endtime : null
-        this.searchForm.storeIdList = this.storeId
-        return orderCenterList(Object.assign(parameter, this.searchForm)).then(res => {
+        return getVerificationRecordsList(Object.assign(parameter, this.searchForm)).then(res => {
           // console.log(res,'0000000000000000000')
           // console.log(res,'0000000000000000000')
           if (res.status == 200) {
           if (res.status == 200) {
             return res.data
             return res.data
@@ -232,48 +225,46 @@ export default {
       console.log(this.searchForm.beginDate, this.searchForm.endDate)
       console.log(this.searchForm.beginDate, this.searchForm.endDate)
     },
     },
     // 获取服务项目数据
     // 获取服务项目数据
-    getItemListData () {
-      itemList({
-        pageNo: 1,
-        pageSize: 1000
-      }).then(res => {
-        // console.log(res, '-----------')
-        if (res.status == 200) {
-          this.itemOptionData = res.data.list || []
-        } else {
-          this.itemOptionData = []
-        }
-      })
-    },
-    // 获取网点名称数据
-    getStoreListData () {
-      storeList({
-        pageNo: 1,
-        pageSize: 1000
-      }).then(res => {
-        // console.log(res, '-----------')
-        if (res.status == 200) {
-          this.storeOptionData = res.data.list || []
-        } else {
-          this.storeOptionData = []
-        }
-      })
-    },
+    // getItemListData () {
+    //   itemList({
+    //     pageNo: 1,
+    //     pageSize: 1000
+    //   }).then(res => {
+    //     // console.log(res, '-----------')
+    //     if (res.status == 200) {
+    //       this.itemOptionData = res.data.list || []
+    //     } else {
+    //       this.itemOptionData = []
+    //     }
+    //   })
+    // },
+    // // 获取网点名称数据
+    // getStoreListData () {
+    //   storeList({
+    //     pageNo: 1,
+    //     pageSize: 1000
+    //   }).then(res => {
+    //     // console.log(res, '-----------')
+    //     if (res.status == 200) {
+    //       this.storeOptionData = res.data.list || []
+    //     } else {
+    //       this.storeOptionData = []
+    //     }
+    //   })
+    // },
     // 合计
     // 合计
     getTotal () {
     getTotal () {
       const params = {
       const params = {
         beginDate: this.searchForm.beginDate,
         beginDate: this.searchForm.beginDate,
         endDate: this.searchForm.endDate,
         endDate: this.searchForm.endDate,
-        storeIdList: this.searchForm.storeIdList,
+        usedStoreId: this.searchForm.usedStoreId,
         orderNo: this.searchForm.orderNo,
         orderNo: this.searchForm.orderNo,
-        itemId: this.searchForm.itemId,
-        customerMobile: this.searchForm.customerMobile,
-        orderStatus: this.searchForm.orderStatus
+        queryWorld: this.searchForm.queryWorld,
+        bundName: this.searchForm.bundName
       }
       }
       params.beginDate == null ? params.beginDate = getDate.getToday().starttime : null
       params.beginDate == null ? params.beginDate = getDate.getToday().starttime : null
       params.endDate == null ? params.endDate = getDate.getToday().endtime : null
       params.endDate == null ? params.endDate = getDate.getToday().endtime : null
-      params.storeIdList = this.storeId
-      orderTotal(params).then(res => {
+      getVerificationRecordsListTotal(params).then(res => {
         console.log(res, '--------')
         console.log(res, '--------')
         if (res.status == 200) {
         if (res.status == 200) {
           this.orderTotal = res.data.orderNum || 0
           this.orderTotal = res.data.orderNum || 0
@@ -314,9 +305,8 @@ export default {
         moment(getDate.getToday().starttime, this.dateFormat),
         moment(getDate.getToday().starttime, this.dateFormat),
         moment(getDate.getToday().endtime, this.dateFormat)
         moment(getDate.getToday().endtime, this.dateFormat)
       ]
       ]
-      this.storeId = []
+      this.searchForm.usedStoreId = ''
       this.searchForm.orderNo = ''
       this.searchForm.orderNo = ''
-      this.searchForm.itemId = undefined
       this.searchForm.customerMobile = ''
       this.searchForm.customerMobile = ''
       this.searchForm.orderStatus = ''
       this.searchForm.orderStatus = ''
       // this.$refs.searchForm.resetFields()
       // this.$refs.searchForm.resetFields()
@@ -329,13 +319,12 @@ export default {
       const params = {
       const params = {
         beginDate: this.searchForm.beginDate == null ? getDate.getToday().starttime : this.searchForm.beginDate,
         beginDate: this.searchForm.beginDate == null ? getDate.getToday().starttime : this.searchForm.beginDate,
         endDate: this.searchForm.endDate == null ? getDate.getToday().endtime : this.searchForm.endDate,
         endDate: this.searchForm.endDate == null ? getDate.getToday().endtime : this.searchForm.endDate,
-        storeIdList: this.storeId,
+        usedStoreId: this.searchForm.usedStoreId,
         orderNo: this.searchForm.orderNo,
         orderNo: this.searchForm.orderNo,
-        itemId: this.searchForm.itemId,
-        customerMobile: this.searchForm.customerMobile,
-        orderStatus: this.searchForm.orderStatus
+        queryWorld: this.searchForm.queryWorld,
+        bundName: this.searchForm.bundName
       }
       }
-      exportOrder(params).then(res => {
+      settlementRecordsExport(params).then(res => {
         console.log(res)
         console.log(res)
         this.loading = false
         this.loading = false
         this.download(res)
         this.download(res)
@@ -351,7 +340,7 @@ export default {
       link.style.display = 'none'
       link.style.display = 'none'
       link.href = url
       link.href = url
       const a = moment().format('YYYYMMDDhhmmss')
       const a = moment().format('YYYYMMDDhhmmss')
-      const fname = '订单记录-' + a
+      const fname = '核销记录-' + a
       console.log(fname, '111111')
       console.log(fname, '111111')
       link.setAttribute('download', fname + '.xlsx')
       link.setAttribute('download', fname + '.xlsx')
 
 
@@ -361,9 +350,9 @@ export default {
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
     next(vm => {
     next(vm => {
-      vm.getItemListData()
-      vm.handleRest()
-      vm.getStoreListData()
+      // vm.getItemListData()
+      // vm.handleRest()
+      // vm.getStoreListData()
     })
     })
   }
   }
 }
 }