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"
>
+ 打 印
查 看
地 图
{
+ console.log(res.data);
+ downloadXls(res.data, '商配配送计划数据.xlsx');
+ });
+
+ },
getvehicleData() {
return new Promise((rv, rev) => {
getVehicleList(1, 10, '').then(res => {
@@ -1132,6 +1156,26 @@ export default {
}
},
+ /**
+ * 获取单个打印页面
+ */
+ async printOrder(row) {
+ console.log('row :>> ', row);
+ const res = await printBatch({ ids: row.id, type: 1 });
+ console.log('res :>> ', res);
+ const {
+ data: { code, data },
+ } = res;
+ if (code === 200) {
+ // 初始化打印页面
+ this.html = '';
+ data.forEach(item => {
+ this.html += item.templateHtml;
+ });
+ this.isShow = true;
+ }
+ },
+
onLoad(page, params = {}) {
this.loading = true;
this.query.type = '1';
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
index 46ffa4b3..0b5a5116 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
@@ -3,11 +3,11 @@
-
+
-
+
@@ -62,7 +62,7 @@
-
+
搜 索
清 空
@@ -105,6 +105,13 @@
>批量打印
+ 导出
+
@@ -127,6 +134,7 @@
@selection="selectionsc"
>
+ 打 印
查 看
地 图
{
+ console.log(res.data);
+ downloadXls(res.data, '市配配送计划数据.xlsx');
+ });
+
+ },
getvehicleData() {
return new Promise((rv, rev) => {
getVehicleList(1, 10, '').then(res => {
@@ -1132,6 +1156,26 @@ export default {
}
},
+ /**
+ * 获取单个打印页面
+ */
+ async printOrder(row) {
+ console.log('row :>> ', row);
+ const res = await printBatch({ ids: row.id, type: 1 });
+ console.log('res :>> ', res);
+ const {
+ data: { code, data },
+ } = res;
+ if (code === 200) {
+ // 初始化打印页面
+ this.html = '';
+ data.forEach(item => {
+ this.html += item.templateHtml;
+ });
+ this.isShow = true;
+ }
+ },
+
/**
* 打印
*/
@@ -1184,7 +1228,7 @@ export default {
}
}
.avue-crud__header {
- // align-items: flex-end !important;
+ // align-items: flex-end !important;
}
// 日期选择框
.el-times {
@@ -1197,19 +1241,19 @@ export default {
margin-right: 0 !important;
:deep(.el-form-item__content) {
width: 180px;
- justify-content: flex-end
+ justify-content: flex-end;
}
}
-.avue-crud__right{
+.avue-crud__right {
display: flex;
- align-items: center;
+ align-items: center;
}
-.fr-fo{
- display:flex;
+.fr-fo {
+ display: flex;
}
-:deep(.avue-crud__header){
- .avue-crud__left{
- margin-top:0 !important;
+:deep(.avue-crud__header) {
+ .avue-crud__left {
+ margin-top: 0 !important;
}
}
diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index e9334f62..8df5761e 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -1,125 +1,5 @@
-
@@ -3053,8 +2933,8 @@ export default {
const zeroOrder = val;
// 记录传入行的id
zeroOrder.stockArticleId = val.stockArticleId;
- // 物料最大限数
- zeroOrder.maxNum = val.quantity;
+ // 物料最大限数 (总数减去冻结数量)
+ zeroOrder.maxNum = val.quantity - val.deliveryQuantity;
// 新增时, 检测是否齐套
zeroOrder.tiQuantity = val.libraryQuantity;
return zeroOrder;
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;
},
diff --git a/src/views/distribution/signdetail/distributionSigndetail.vue b/src/views/distribution/signdetail/distributionSigndetail.vue
index 5897ea67..412809e7 100644
--- a/src/views/distribution/signdetail/distributionSigndetail.vue
+++ b/src/views/distribution/signdetail/distributionSigndetail.vue
@@ -7,6 +7,13 @@
+ 导出
+
@@ -104,6 +111,9 @@ import option from '@/option/distribution/distributionSigndetail';
import { mapGetters } from 'vuex';
import dayjs from 'dayjs';
import { getDictionaryBiz } from '@/api/system/dict';
+import { getDeliveryListExport } from '@/api/distribution/distributionDeliveryList';
+import { downloadXls } from '@/utils/util';
+import { getSignforExport } from '@/api/distribution/distributionSignfor';
export default {
data() {
@@ -461,6 +471,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);
+ getSignforExport(row).then(res => {
+ // console.log(res.data);
+ downloadXls(res.data, '签收明细数据.xlsx');
+ });
+
+ },
showdrawer(value) {
this.drawerShow = value;
},
diff --git a/src/views/distribution/signfor/distributionSignfor.vue b/src/views/distribution/signfor/distributionSignfor.vue
index ec72848e..ac0fd3f8 100644
--- a/src/views/distribution/signfor/distributionSignfor.vue
+++ b/src/views/distribution/signfor/distributionSignfor.vue
@@ -75,7 +75,15 @@