From f1bc7f4c44c2aa32ff8bd124bda145f4e74a35b4 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 4 Jul 2024 11:30:34 +0800
Subject: [PATCH] md

---
 src/components/PdfViewer/viewer.vue           |  2 +-
 .../emis/EmisBaseTools/TanexPrinterPanel.vue  | 29 +++++++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/components/PdfViewer/viewer.vue b/src/components/PdfViewer/viewer.vue
index 5849039e..60627853 100644
--- a/src/components/PdfViewer/viewer.vue
+++ b/src/components/PdfViewer/viewer.vue
@@ -393,7 +393,7 @@ export default {
           }
 
           this.pageCount=this.cacheFileList.length;
-          const thisPage=this.cacheFileList[0];
+          const thisPage=this.cacheFileList[page-1];
 
           const pdfBase64 = thisPage.pdfBase64;
 
diff --git a/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue b/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue
index 38d548b1..0782dec7 100644
--- a/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue
+++ b/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue
@@ -335,6 +335,13 @@
                 text: '正在生成预览...'
         })
 
+        let orderSeqMap = new Map();
+        let newOrderList=printDataList.orderList.split(",");
+        for(let i=0; i<newOrderList.length; i++){
+          let billCodeItem=newOrderList[i];
+          orderSeqMap[billCodeItem]=i+1;
+        }
+
         that.pdfList=[];
         that.showCounter=0;
         this.tanexPrinter.batchGetPDFAdv(printDataList,billCount,this.printManCode,async function(code,msg,data){
@@ -349,7 +356,8 @@
                   let pdfInfo={
                     "billCode":pdfData.ydSn,
                     "pdfUrl":null,
-                    "pdfBase64":pdfData.file
+                    "pdfBase64":pdfData.file,
+                    "seqNo":orderSeqMap[pdfData.ydSn]
                   }
 
                   that.pdfList.push(pdfInfo);
@@ -437,6 +445,12 @@
 
         this.printOrderList=newOrderList;
 
+        let orderSeqMap = new Map();
+        for(let i=0; i<newOrderList.length; i++){
+          let billCodeItem=newOrderList[i];
+          orderSeqMap[billCodeItem]=i+1;
+        }
+
         that.pdfList=[];
         that.showCounter=0;
         this.tanexPrinter.batchGetPDF(this.selTplCode,this.selPrinterName,newOrderList,this.printManCode,async function(code,msg,data){
@@ -453,7 +467,8 @@
                   let pdfInfo={
                     "billCode":pdfData.ydSn,
                     "pdfUrl":null,
-                    "pdfBase64":pdfData.file
+                    "pdfBase64":pdfData.file,
+                    "seqNo":orderSeqMap[pdfData.ydSn]
                   }
 
                   that.pdfList.push(pdfInfo);
@@ -529,6 +544,13 @@
         const loadingInstance = this.$loading({
                 text: '正在下载...'
         })
+
+        let orderSeqMap = new Map();
+        for(let i=0; i<newOrderList.length; i++){
+          let billCodeItem=newOrderList[i];
+          orderSeqMap[billCodeItem]=i+1;
+        }
+
         // 清空以前的数据
         this.pdfList=[];
         this.tanexPrinter.batchGetPDF(this.selTplCode,this.selPrinterName,newOrderList,this.printManCode,function(code,msg,data){
@@ -544,7 +566,8 @@
                   let pdfInfo={
                     "billCode":pdfData.ydSn,
                     "pdfUrl":null,
-                    "pdfBase64":pdfData.file
+                    "pdfBase64":pdfData.file,
+                    "seqNo":orderSeqMap[pdfData.ydSn]
                   }
                   that.pdfList.push(pdfInfo);