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/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/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
index 610479b8..6bcd6286 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
@@ -50,8 +50,14 @@
>创建自提
自提签收
+ >自提签收
+ 导出
+
@@ -332,13 +338,14 @@ import {
remove,
getListOwn,
getBillLadingDetail,
- getListOwnNUm,
+ getListOwnNUm, getBillLadingExport
} from '@/api/distribution/distrilbutionBillLading';
import option from '@/option/distribution/distrilbutionBillLading';
import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
import { getToken } from '@/utils/auth';
import dayjs from 'dayjs';
+import { downloadXls } from '@/utils/util';
export default {
data() {
@@ -727,6 +734,20 @@ export default {
},
},
methods: {
+ /**
+ * 导出
+ * */
+ handleExportInfo(){
+ let row = {};
+ if (!!this.ids) {
+ row.ids = this.ids;
+ }
+ getBillLadingExport(row).then(res => {
+ console.log(res.data);
+ downloadXls(res.data, '已确定预约单数据.xlsx');
+ });
+
+ },
showdrawer(value) {
this.drawerShow = value;
},
diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue
index 1d802cbe..ac07362e 100644
--- a/src/views/distribution/reservation/reservation.vue
+++ b/src/views/distribution/reservation/reservation.vue
@@ -68,6 +68,13 @@
plain
>批量转配送
+ 导出
+
@@ -210,6 +217,14 @@
plain
>批量打印
+ 导出
+
@@ -416,7 +431,7 @@ import {
confirms,
addReservations,
cancelReservation,
- patchPrintList,
+ patchPrintList, reservationExport
} from '@/api/distribution/distributionReservation';
import option from '@/option/distribution/distributionReservation';
import { mapGetters } from 'vuex';
@@ -428,6 +443,7 @@ import { getListTeam } from '@/api/basicdata/basicdataTeamGroup';
import { getStockUpArea, stockUp } from '@/api/basicdata/basicdataGoodsArea';
import dayjs from 'dayjs';
import print from '@/utils/print';
+import { downloadXls } from '@/utils/util';
export default {
data() {
@@ -1025,6 +1041,28 @@ export default {
},
},
methods: {
+ /**
+ * 导出
+ * */
+ handleExportInfo(type){
+ let row = {};
+ if (!!this.ids) {
+ row.ids = this.ids;
+ }
+ let nulName ;
+ if(type === 1){
+ //未
+ nulName = '待确定预约单数据.xlsx';
+ }else{
+ //已
+ nulName = '已确定预约单数据.xlsx';
+ }
+ reservationExport(row).then(res => {
+ console.log(res.data);
+ downloadXls(res.data, nulName);
+ });
+
+ },
showdrawer(value) {
this.drawerShow = value;
},