diff --git a/src/api/distribution/distributionDeliveryList.js b/src/api/distribution/distributionDeliveryList.js index 9f8fa3e5..0ed9f4c2 100644 --- a/src/api/distribution/distributionDeliveryList.js +++ b/src/api/distribution/distributionDeliveryList.js @@ -22,6 +22,18 @@ export const getPage = (current, size, params) => { }, }); }; + +export const getDeliveryListExport = row => { + return request({ + url: '/api/logpm-distribution/deliveryList/export-distributionDeliveryList', + method: 'get', + params: { + ...row + }, + responseType: 'blob', + }) +}; + export const getstatistics = (current, size, params) => { return request({ url: '/api/logpm-distribution/deliveryList/statistics', diff --git a/src/api/distribution/distributionReservation.js b/src/api/distribution/distributionReservation.js index 5c9b647a..bb1e58ee 100644 --- a/src/api/distribution/distributionReservation.js +++ b/src/api/distribution/distributionReservation.js @@ -23,6 +23,22 @@ export const getDetail = (id) => { }) } +/** + * 预约数据导出 + * @param row + * @returns {AxiosPromise} + */ +export const reservationExport = (row) => { + return request({ + url: '/api/logpm-distribution/reservation/export-distrbutionReservation', + method: 'get', + params: { + ...row + }, + responseType: 'blob', + }) +} + export const remove = (ids) => { return request({ url: '/api/logpm-distribution/reservation/remove', diff --git a/src/api/distribution/distributionSignfor.js b/src/api/distribution/distributionSignfor.js index a56287e1..d64c31ac 100644 --- a/src/api/distribution/distributionSignfor.js +++ b/src/api/distribution/distributionSignfor.js @@ -22,6 +22,22 @@ export const getPage = (current, size, params) => { } }) } + +/** + * 导出 + * @param row + * @returns {AxiosPromise} + */ +export const getSignforExport = row => { + return request({ + url: '/api/logpm-distribution/signfor/export-export-distributionSignfor', + method: 'get', + params: { + ...row + }, + responseType: 'blob', + }) +}; export const getListOrder = (current, size, params) => { return request({ url: '/api/logpm-distribution/reservationStockarticle/orderpage', diff --git a/src/api/distribution/distrilbutionBillLading.js b/src/api/distribution/distrilbutionBillLading.js index 4513d71f..c16116a0 100644 --- a/src/api/distribution/distrilbutionBillLading.js +++ b/src/api/distribution/distrilbutionBillLading.js @@ -69,6 +69,16 @@ export const getListOwnNUm = params => { }, }); }; +//导出 +export const getBillLadingExport = params => { + return request({ + url: '/api/logpm-distribution/distrilbutionBillLading/listNum', + method: 'get', + params: { + ...params, + }, + }); +}; export const getDetail = id => { return request({ diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue index 11a65d34..5721c20d 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryList.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue @@ -164,6 +164,13 @@ >批量打印 --> + 导出 +
@@ -328,7 +335,7 @@ import { remove, getPage, getstatistics, - printBatch, + printBatch, getDeliveryListExport } from '@/api/distribution/distributionDeliveryList'; import option from '@/option/distribution/distributionDeliveryList'; import { mapGetters } from 'vuex'; @@ -337,6 +344,8 @@ import { addIncrement } from '@/api/distribution/distributionStockArticle'; import { getDriverList } from '@/api/basicdata/basicdataDriverArtery'; import { getVehicleList } from '@/api/basicdata/basicdataVehicle'; import print from '@/utils/print'; +import { getBillLadingExport } from '@/api/distribution/distrilbutionBillLading'; +import { downloadXls } from '@/utils/util'; export default { data() { @@ -702,6 +711,23 @@ export default { }, }, methods: { + /** + * 导出 + * */ + handleExportInfo(){ + let row = {}; + // if (!!this.ids) { + // row.ids = this.ids; + // } + const ids = this.selectionList.join(','); + row.ids = ids; + // console.log("<><><>>",ids); + getDeliveryListExport(row).then(res => { + // console.log(res.data); + downloadXls(res.data, '全部配送计划数据.xlsx'); + }); + + }, getvehicleData() { return new Promise((rv, rev) => { getVehicleList(1, 10, '').then(res => { diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue index b13d70eb..2025f09a 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue @@ -107,6 +107,13 @@ 新增商配 批量打印 + 导出 +
@@ -129,6 +136,7 @@ @selection="selectionsc" >