Browse Source

bug 修复

lilei 3 năm trước cách đây
mục cha
commit
ea7a6e1c4c

+ 17 - 0
src/api/reportData.js

@@ -482,6 +482,14 @@ export const allocateReturnReportQueryCount = (params) => {
     method: 'post'
   })
 }
+export const allocateReturnReportExport = (params) => {
+  return axios({
+    url: '/report/allocateReturnReport/export',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}
 // 分页查询调拨退货明细报表
 export const allocateReturnReportDetailQueryPage = (params) => {
   const url = `/report/allocateReturnReport/detail/queryPage/${params.pageNo}/${params.pageSize}`
@@ -501,4 +509,13 @@ export const allocateReturnReportDetailQueryCount = (params) => {
     data: params,
     method: 'post'
   })
+}
+// 导出
+export const allocateReturnReportDetailExport = (params) => {
+  return axios({
+    url: '/report/allocateReturnReport/detail/export',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
 }

+ 5 - 5
src/views/reportData/transferReturnDetailReport/list.vue

@@ -14,7 +14,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="退货完成日期" prop="time">
-                <rangeDateTime ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -147,7 +147,7 @@
 import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
-import rangeDateTime from '@/views/common/rangeDateTime.vue'
+import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
 import reportModal from '@/views/common/reportModal.vue'
 import AllocateType from '@/views/common/allocateType.js'
@@ -155,11 +155,11 @@ import { getArea } from '@/api/data'
 import { productTypeQuery } from '@/api/productType'
 import ProductBrand from '@/views/common/productBrand.js'
 import { hdExportExcel } from '@/libs/exportExcel'
-import { allocateReturnReportDetailQueryPage, allocateReturnReportDetailQueryCount, reportSalesReturnDetailExport } from '@/api/reportData'
+import { allocateReturnReportDetailQueryPage, allocateReturnReportDetailQueryCount, allocateReturnReportDetailExport } from '@/api/reportData'
 export default {
   name: 'TransferReturnDetailReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDateTime, subarea, ProductBrand, reportModal, AllocateType },
+  components: { STable, VSelect, rangeDate, subarea, ProductBrand, reportModal, AllocateType },
   data () {
     return {
       spinning: false,
@@ -324,7 +324,7 @@ export default {
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
-          hdExportExcel(reportSalesReturnDetailExport, params, '销售退货明细报表', function () {
+          hdExportExcel(allocateReturnReportDetailExport, params, '调拨退货明细报表', function () {
             _this.exportLoading = false
             _this.spinning = false
           })

+ 2 - 2
src/views/reportData/transferReturnReport/list.vue

@@ -111,7 +111,7 @@ import subarea from '@/views/common/subarea.js'
 import reportModal from '@/views/common/reportModal.vue'
 import AllocateType from '@/views/common/allocateType.js'
 import { hdExportExcel } from '@/libs/exportExcel'
-import { allocateReturnReportQueryPage, allocateReturnReportQueryCount, salesReturnsExport } from '@/api/reportData'
+import { allocateReturnReportQueryPage, allocateReturnReportQueryCount, allocateReturnReportExport } from '@/api/reportData'
 export default {
   name: 'TransferReturnReportList',
   mixins: [commonMixin],
@@ -191,7 +191,7 @@ export default {
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
-          hdExportExcel(salesReturnsExport, params, '调拨退货单报表', function () {
+          hdExportExcel(allocateReturnReportExport, params, '调拨退货单报表', function () {
             _this.exportLoading = false
             _this.spinning = false
           })