From bc1408fa1174092a8f70e4df83f9d7cf10e22695 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Tue, 17 Oct 2023 12:34:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AC=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=93=81=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/distribution/distributionStockList.js | 32 +++++++++++++++++++ .../delivery/distributionStockArticle.vue | 1 + .../distributionStockArticleMarket.vue | 3 +- .../delivery/distributionStockArticleSelf.vue | 1 + .../inventory/distributionStockList.vue | 24 +++++++++++++- .../distributionStockListDetails.vue | 18 ++++++++++- .../distributionStockListDiscuss.vue | 19 +++++++++-- .../inventory/distributionStockListMarket.vue | 20 ++++++++++-- .../inventory/distributionStockListSelf.vue | 20 ++++++++++-- 9 files changed, 129 insertions(+), 9 deletions(-) diff --git a/src/api/distribution/distributionStockList.js b/src/api/distribution/distributionStockList.js index 7e48e288..aa77f2f5 100644 --- a/src/api/distribution/distributionStockList.js +++ b/src/api/distribution/distributionStockList.js @@ -122,6 +122,38 @@ export const update = (row) => { }) } +/** + * + * @param row + * @returns {AxiosPromise} + */ +export const stockExport = (row) => { + return request({ + url: '/api/logpm-distribution/distributionStockList/export-distributionStockList', + method: 'get', + params: { + ...row + }, + responseType: 'blob', + }) +} + +/** + * 查询库存品入库明细 + * @param row + * @returns {AxiosPromise} + */ +export const stockInfoExport = (row) => { + return request({ + url: '/api/logpm-distribution//distributionStockListInfo/export-distributionStockListInfo', + method: 'get', + params: { + ...row + }, + responseType: 'blob', + }) +} + /** * 库存品列表 * @param current diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue index 3bacd1ae..490b330a 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue @@ -1181,6 +1181,7 @@ export default { // console.log("cxcxcxc",i); let aa = await getListOwn(this.page.currentPage, this.page.pageSize, { stockArticleId: i.id, + parcelType: "2" }).then(); // console.log("包件物料不存在！！",aa.data.data.records); aa.data.data.records.forEach(l => { diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue index 8a7f7d57..aa5da591 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue @@ -1131,6 +1131,7 @@ export default { // console.log("cxcxcxc",i); let aa = await getListOwn(this.page.currentPage, this.page.pageSize, { stockArticleIds: i.id, + parcelType: "2" }).then(); // console.log("包件物料不存在！！",aa.data.data.records); aa.data.data.records.forEach(l => { @@ -1451,7 +1452,7 @@ export default { return this.$message({ type: "error", message: '功能还在开发中' - }) + }) this.title = '新增'; this.form = {}; this.box = true; diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue index c175ac44..e5aef0e0 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue @@ -1350,6 +1350,7 @@ export default { // console.log("cxcxcxc",i); let aa = await getListOwn(this.page.currentPage, this.page.pageSize, { stockArticleIds: i.id, + parcelType: "2" }).then(); // console.log("包件物料不存在！！",aa.data.data.records); aa.data.data.records.forEach(l => { diff --git a/src/views/distribution/inventory/distributionStockList.vue b/src/views/distribution/inventory/distributionStockList.vue index 8774a6b1..8ce4484f 100644 --- a/src/views/distribution/inventory/distributionStockList.vue +++ b/src/views/distribution/inventory/distributionStockList.vue @@ -29,7 +29,8 @@ - + + 导 出
@@ -309,6 +310,7 @@ import { remove, addParcels, getStockListOwn, + stockExport, } from '@/api/distribution/distributionStockList'; import { getListParcelDetails } from '@/api/distribution/distributionParcelDetails'; import { getListMaterial } from '@/api/basic/basicMaterial'; @@ -918,10 +920,30 @@ export default { this.query[row.prop] = index; this.onLoad(this.page); }, + //导出 + handleExport() { + let row = { }; + if(!!this.ids){ + row.ids = this.ids; + } + // exportBlob( + // `/api/logpm-distribution/distributionStockList/export-distributionStockList?${this.website.tokenHeader}=${getToken()}`,`row = ${row}` + // ).then(res => { + // downloadXls(res.data, '库存品数据.xlsx'); + // }); + + stockExport(row).then( res =>{ + console.log(res.data); + downloadXls(res.data, '库存品数据.xlsx'); + }); + + }, + //导入 handleImport() { this.excelBox = true; }, + refreshChange() { this.onLoad(this.page); }, diff --git a/src/views/distribution/inventory/distributionStockListDetails.vue b/src/views/distribution/inventory/distributionStockListDetails.vue index 64632c29..66e62e01 100644 --- a/src/views/distribution/inventory/distributionStockListDetails.vue +++ b/src/views/distribution/inventory/distributionStockListDetails.vue @@ -129,6 +129,7 @@
+ { + console.log(res.data); + downloadXls(res.data, '库存品数据.xlsx'); + }); + + }, + handleClick(tab, event) { console.log(tab, event); console.log(tab.props.name); diff --git a/src/views/distribution/inventory/distributionStockListDiscuss.vue b/src/views/distribution/inventory/distributionStockListDiscuss.vue index c624967a..2496185f 100644 --- a/src/views/distribution/inventory/distributionStockListDiscuss.vue +++ b/src/views/distribution/inventory/distributionStockListDiscuss.vue @@ -29,7 +29,8 @@ - + + 导 出
@@ -349,7 +350,7 @@ import { update, remove, addParcels, - getStockListOwn, + getStockListOwn, stockExport } from '@/api/distribution/distributionStockList'; import { getListParcelDetails } from '@/api/distribution/distributionParcelDetails'; import { getListMaterial } from '@/api/basic/basicMaterial'; @@ -927,7 +928,21 @@ export default { this.query[row.prop] = index; this.onLoad(this.page); }, +//导出 + handleExport() { + let row = { + serviceType: this.query.serviceType + }; + if(!!this.ids){ + row.ids = this.ids; + } + stockExport(row).then( res =>{ + console.log(res.data); + downloadXls(res.data, '商配库存品数据.xlsx'); + }); + + }, handleImport() { this.excelBox = true; }, diff --git a/src/views/distribution/inventory/distributionStockListMarket.vue b/src/views/distribution/inventory/distributionStockListMarket.vue index 3201394f..e4c48df5 100644 --- a/src/views/distribution/inventory/distributionStockListMarket.vue +++ b/src/views/distribution/inventory/distributionStockListMarket.vue @@ -29,7 +29,8 @@ - + + 导 出
@@ -308,7 +309,7 @@ import { update, remove, addParcels, - getStockListOwn, + getStockListOwn, stockExport } from '@/api/distribution/distributionStockList'; import { getListParcelDetails } from '@/api/distribution/distributionParcelDetails'; import { getListMaterial } from '@/api/basic/basicMaterial'; @@ -918,6 +919,21 @@ export default { this.query[row.prop] = index; this.onLoad(this.page); }, + //导出 + handleExport() { + let row = { + serviceType: this.query.serviceType + }; + if(!!this.ids){ + row.ids = this.ids; + } + + stockExport(row).then( res =>{ + console.log(res.data); + downloadXls(res.data, '市配库存品数据.xlsx'); + }); + + }, handleImport() { this.excelBox = true; diff --git a/src/views/distribution/inventory/distributionStockListSelf.vue b/src/views/distribution/inventory/distributionStockListSelf.vue index f31d5c98..f3f38c69 100644 --- a/src/views/distribution/inventory/distributionStockListSelf.vue +++ b/src/views/distribution/inventory/distributionStockListSelf.vue @@ -29,7 +29,9 @@ - + + 导 出 +
@@ -308,7 +310,7 @@ import { update, remove, addParcels, - getStockListOwn, + getStockListOwn, stockExport } from '@/api/distribution/distributionStockList'; import { getListParcelDetails } from '@/api/distribution/distributionParcelDetails'; import { getListMaterial } from '@/api/basic/basicMaterial'; @@ -918,6 +920,20 @@ export default { this.query[row.prop] = index; this.onLoad(this.page); }, + //导出 + handleExport() { + let row = { + serviceType: this.query.serviceType + }; + if(!!this.ids){ + row.ids = this.ids; + } + stockExport(row).then( res =>{ + console.log(res.data); + downloadXls(res.data, '自提库存品数据.xlsx'); + }); + + }, handleImport() { this.excelBox = true;