From 555facb099e0e94a60eebbdf9ff2e5610dbb9484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Fri, 7 Apr 2023 18:40:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/IoDeliveryAuditOrder.vue           | 4 ++--
 src/views/inout/IoDeliverySearchOrder.vue          | 4 ++--
 src/views/supplier/products/supDiProductsCheck.vue | 1 -
 src/views/system/print/pdfCodePrintSet.vue         | 2 +-
 src/views/system/print/pdfLabelPrintSet.vue        | 2 +-
 src/views/system/print/pdfStatementPrintSet.vue    | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/views/inout/IoDeliveryAuditOrder.vue b/src/views/inout/IoDeliveryAuditOrder.vue
index 20394cb..b602832 100644
--- a/src/views/inout/IoDeliveryAuditOrder.vue
+++ b/src/views/inout/IoDeliveryAuditOrder.vue
@@ -772,7 +772,7 @@ export default {
     printOrder(row) {
       let tQuery = {
         action: row.action,
-        moduleId: 2,
+        status: row.status,
       }
       this.loading = true;
       inspectionOrderPDFFromTemplateFile(tQuery).then((response) => {
@@ -781,7 +781,7 @@ export default {
             templateId: response.data,
             orderIdFk: row.billNo,
             action: row.action,
-            moduleId: 2,
+            status: row.status,
           }
           orderPDFFromTemplateFile(tQuery).then((response) => {
             //将pdf文件转换为url。
diff --git a/src/views/inout/IoDeliverySearchOrder.vue b/src/views/inout/IoDeliverySearchOrder.vue
index c0c29e7..84e82d2 100644
--- a/src/views/inout/IoDeliverySearchOrder.vue
+++ b/src/views/inout/IoDeliverySearchOrder.vue
@@ -736,7 +736,7 @@ export default {
     printOrder(row) {
       let tQuery = {
         action: row.action,
-        moduleId: 2,
+        status: row.status,
       }
       this.loading = true;
       inspectionOrderPDFFromTemplateFile(tQuery).then((response) => {
@@ -745,7 +745,7 @@ export default {
             templateId: response.data,
             orderIdFk: row.billNo,
             action: row.action,
-            moduleId: 2,
+            status: row.status,
           }
           orderPDFFromTemplateFile(tQuery).then((response) => {
             //将pdf文件转换为url。
diff --git a/src/views/supplier/products/supDiProductsCheck.vue b/src/views/supplier/products/supDiProductsCheck.vue
index abdc832..ce63477 100644
--- a/src/views/supplier/products/supDiProductsCheck.vue
+++ b/src/views/supplier/products/supDiProductsCheck.vue
@@ -64,7 +64,6 @@
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
         <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
         <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
-          <el-button type="primary" icon="el-icon-search" @click="acts">全部审核</el-button>
       </el-button-group>
       </div>
 
diff --git a/src/views/system/print/pdfCodePrintSet.vue b/src/views/system/print/pdfCodePrintSet.vue
index 02255e1..908fc0d 100644
--- a/src/views/system/print/pdfCodePrintSet.vue
+++ b/src/views/system/print/pdfCodePrintSet.vue
@@ -413,7 +413,7 @@ export default {
     },
 
     jumpDl(row) {
-      this.handleDownload(this.BASE_URL + "/udiwms/donwload/file?fileName=" + row.templateDlUrl, row.name + ".jrxml");
+      this.handleDownload(this.BASE_URL + "/udiwms/donwload/printFile?fileName=" + row.templateDlUrl, row.name + ".jrxml");
     },
     getModuleList() {
       this.moduleLoading = true;
diff --git a/src/views/system/print/pdfLabelPrintSet.vue b/src/views/system/print/pdfLabelPrintSet.vue
index 7665bc2..882fef9 100644
--- a/src/views/system/print/pdfLabelPrintSet.vue
+++ b/src/views/system/print/pdfLabelPrintSet.vue
@@ -413,7 +413,7 @@ export default {
     },
 
     jumpDl(row) {
-      this.handleDownload(this.BASE_URL + "/udiwms/donwload/file?fileName=" + row.templateDlUrl, row.name + ".jrxml");
+      this.handleDownload(this.BASE_URL + "/udiwms/donwload/printFile?fileName=" + row.templateDlUrl, row.name + ".jrxml");
     },
     getModuleList() {
       this.moduleLoading = true;
diff --git a/src/views/system/print/pdfStatementPrintSet.vue b/src/views/system/print/pdfStatementPrintSet.vue
index 17d10f6..8a6715c 100644
--- a/src/views/system/print/pdfStatementPrintSet.vue
+++ b/src/views/system/print/pdfStatementPrintSet.vue
@@ -413,7 +413,7 @@ export default {
     },
 
     jumpDl(row) {
-      this.handleDownload(this.BASE_URL + "/udiwms/donwload/file?fileName=" + row.templateDlUrl, row.name + ".jrxml");
+      this.handleDownload(this.BASE_URL + "/udiwms/donwload/printFile?fileName=" + row.templateDlUrl, row.name + ".jrxml");
     },
     getModuleList() {
       this.moduleLoading = true;