From dea900801e08e84acbc10f167308744d98101bfe Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 28 Nov 2024 10:28:43 +0800 Subject: [PATCH] =?UTF-8?q?11/28=20=E5=86=85=E9=83=A8=E7=A0=81=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/itextpdf/itextpdf.js | 9 ++++++ .../basic/business/stockOrderQRCodeDetail.vue | 30 +++++++++++++++---- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/src/api/itextpdf/itextpdf.js b/src/api/itextpdf/itextpdf.js index d7e09b78..ba1e448e 100644 --- a/src/api/itextpdf/itextpdf.js +++ b/src/api/itextpdf/itextpdf.js @@ -104,6 +104,15 @@ export function filterTemp(query) { }); } +export function getLabls(query) { + return axios( + { + url: "/udiwms/invInnerOrderPdfTemp/filter", + method: "get", + params: query + } + ) +} //---------打印订单 diff --git a/src/views/basic/business/stockOrderQRCodeDetail.vue b/src/views/basic/business/stockOrderQRCodeDetail.vue index 4a845af4..862228b3 100644 --- a/src/views/basic/business/stockOrderQRCodeDetail.vue +++ b/src/views/basic/business/stockOrderQRCodeDetail.vue @@ -149,9 +149,9 @@ @@ -170,7 +170,8 @@ import { orderDetailPDFFromTemplateFile, stockQRCodeTextPDFFromTemplateFile, stockQRCodeTextPDFFromTemplateFileMax, - stockQRCodeTextPDFFromTemplateStatementFile + stockQRCodeTextPDFFromTemplateStatementFile, + getLabls } from "@/api/itextpdf/itextpdf"; import {generateInCodeQRCodeText, generateInnerQRCodeText} from "@/api/inout/innerOrderQRCode"; @@ -217,6 +218,12 @@ export default { printCodeIdFk: null, stockOrderFk: null, }, + lablQuery:{ + page: 1, + limit: 10, + printCodeIdFk: null, + stockOrderFk: null, + }, filterUDIType: false, statusMap: { 0: "未打印", @@ -247,7 +254,7 @@ export default { window.open(this.pdffileUrl + row.fileName, '_blank'); }, refeshLabel() { - filterTemp(this.refreshQuery).then((response) => { + getLabls(this.lablQuery).then((response) => { if (response.code == 20000) { this.lableFileLsit = response.data.list; this.labelPrintVisible = true; @@ -261,6 +268,14 @@ export default { this.query.page = val.page; this.getStockQRCodeTextList(); }, + getLablList(){ + getLabls(this.lablQuery).then(res => { + if (res.code == 20000){ + this.lableFileLsit = res.data.list + this.labltotal = res.data.total || 0; + } + }) + }, getStockQRCodeTextList() { this.loading = true; filterPrint(this.query) //查找该单号下的所有条码 @@ -330,11 +345,15 @@ export default { }; if (row == null) { tQuery.orderId = this.formData.billNo; + this.lablQuery.stockOrderFk = this.formData.billNo + this.lablQuery.printCodeIdFk = null } else { if (row.reCount <= 0) { return this.$message.error('数量错误'); } tQuery.queryId = row.id; + this.lablQuery.printCodeIdFk =row.id + this.lablQuery.stockOrderFk = null } this.printStockOrderDetailPDFLoading = true; @@ -377,6 +396,7 @@ export default { printCodeIdFk: tQuery.queryId, stockOrderFk: tQuery.orderId, } + this.lablQuery.page = 1 this.printStockOrderDetailPDFLoading = false; this.$message.warning("打印文件正在生成中,请点击刷新按钮查看进度,请勿关闭按钮重复打印!"); }