From ed4f1c4e32a52388d05662a490ef2d7558264a5d Mon Sep 17 00:00:00 2001
From: lihao <Lglh@10086>
Date: Wed, 28 May 2025 18:10:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E9=A1=B9=E5=8F=91=E7=A5=A8=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../invoiceSale/card/invoiceSaleCard.js       | 39 +++++++-----
 .../invoiceSale/list/invoiceSaleList.js       | 60 +++++++------------
 2 files changed, 46 insertions(+), 53 deletions(-)

diff --git a/src/sscivm/invoiceSale/invoiceSale/card/invoiceSaleCard.js b/src/sscivm/invoiceSale/invoiceSale/card/invoiceSaleCard.js
index 6424440..b85c597 100644
--- a/src/sscivm/invoiceSale/invoiceSale/card/invoiceSaleCard.js
+++ b/src/sscivm/invoiceSale/invoiceSale/card/invoiceSaleCard.js
@@ -294,36 +294,43 @@ class InvoiceSaleCard extends Component {
                         if(pdf_type.value){
                             arrInvoiceTypes.push('1');
                             invoiceType='1';
-                            let params = {pk, invoiceType};
-                            formDownload({
-                                params,
-                                url: '/nccloud/sscivm/ivsale/InvoiceDownloadAction.do',
-                                // url: '/nccloud/sscivm/ivsale/InvoiceIsDownloadAction.do',
-                                enctype: 1
-                            });
+                            // let params = {pk, invoiceType};
+                            // formDownload({
+                            //     params,
+                            //     url: '/nccloud/sscivm/ivsale/InvoiceDownloadAction.do',
+                            //     // url: '/nccloud/sscivm/ivsale/InvoiceIsDownloadAction.do',
+                            //     enctype: 1
+                            // });
                         }
                         if(xml_type.value){
                             arrInvoiceTypes.push('2');
                             invoiceType='2';
-                            let params = {pk, invoiceType};
-                            formDownload({
-                                params,
-                                url: '/nccloud/sscivm/ivsale/InvoiceDownloadAction.do',
-                                // url: '/nccloud/sscivm/ivsale/InvoiceIsDownloadAction.do',
-                                enctype: 1
-                            });
+                            // let params = {pk, invoiceType};
+                            // formDownload({
+                            //     params,
+                            //     url: '/nccloud/sscivm/ivsale/InvoiceDownloadAction.do',
+                            //     // url: '/nccloud/sscivm/ivsale/InvoiceIsDownloadAction.do',
+                            //     enctype: 1
+                            // });
                         }
                         if(ofd_type.value){
                             arrInvoiceTypes.push('3');
                             invoiceType='3';
-                            let params = {pk, invoiceType};
+                            // let params = {pk, invoiceType};
+                            // formDownload({
+                            //     params,
+                            //     url: '/nccloud/sscivm/ivsale/InvoiceDownloadAction.do',
+                            //     // url: '/nccloud/sscivm/ivsale/InvoiceIsDownloadAction.do',
+                            //     enctype: 1
+                            // });
+                        }
+                        let params = {pk, arrInvoiceTypes};
                             formDownload({
                                 params,
                                 url: '/nccloud/sscivm/ivsale/InvoiceDownloadAction.do',
                                 // url: '/nccloud/sscivm/ivsale/InvoiceIsDownloadAction.do',
                                 enctype: 1
                             });
-                        }
                         this.props.modal.close('LnvoiceDownloadTypeModal')
                         // let params = {pk, invoiceType};
                         // requestApi.download({
diff --git a/src/sscivm/invoiceSale/invoiceSale/list/invoiceSaleList.js b/src/sscivm/invoiceSale/invoiceSale/list/invoiceSaleList.js
index 3d58336..e359cf9 100644
--- a/src/sscivm/invoiceSale/invoiceSale/list/invoiceSaleList.js
+++ b/src/sscivm/invoiceSale/invoiceSale/list/invoiceSaleList.js
@@ -332,44 +332,30 @@ class InvoiceSale extends Component {
                                     content: '请选择下载的文件类型'
                                 })
                             }
-                            for(let i=0;i<formData.length;i++){
-                                let pk = formData[i].data.values.pk_invoice.value; //当前发票pk
-                                let arrInvoiceTypes = [];
-                                if (pdf_type.value) {
-                                    arrInvoiceTypes.push('1');
-                                    invoiceType = '1';
-                                    let params = {pk
-                                        , invoiceType};
-                                    formDownload({
-                                        params,
-                                        url: '/nccloud/sscivm/ivsale/InvoiceDownloadAction.do',
-                                        // url: '/nccloud/sscivm/ivsale/InvoiceIsDownloadAction.do',
-                                        enctype: 1
-                                    });
-                                }
-                                if (xml_type.value) {
-                                    arrInvoiceTypes.push('2');
-                                    invoiceType = '2';
-                                    let params = {pk, invoiceType};
-                                    formDownload({
-                                        params,
-                                        url: '/nccloud/sscivm/ivsale/InvoiceDownloadAction.do',
-                                        // url: '/nccloud/sscivm/ivsale/InvoiceIsDownloadAction.do',
-                                        enctype: 1
-                                    });
-                                }
-                                if (ofd_type.value) {
-                                    arrInvoiceTypes.push('3');
-                                    invoiceType = '3';
-                                    let params = {pk, invoiceType};
-                                    formDownload({
-                                        params,
-                                        url: '/nccloud/sscivm/ivsale/InvoiceDownloadAction.do',
-                                        // url: '/nccloud/sscivm/ivsale/InvoiceIsDownloadAction.do',
-                                        enctype: 1
-                                    });
-                                }
+                            let arrInvoiceTypes = [];
+                            if (pdf_type.value) {
+                                arrInvoiceTypes.push('1');
                             }
+                            if (xml_type.value) {
+                                arrInvoiceTypes.push('2');
+                            }
+                            if (ofd_type.value) {
+                                arrInvoiceTypes.push('3');
+                            }
+                            let pk = [];
+                            for(let i=0;i<formData.length;i++){
+                                // let pk = formData[i].data.values.pk_invoice.value; //当前发票pk
+                                
+                                pk.push(formData[i].data.values.pk_invoice.value);
+                               
+                            }
+                            let params = {pk, arrInvoiceTypes};
+                            formDownload({
+                                params,
+                                url: '/nccloud/sscivm/ivsale/InvoiceDownloadAction.do',
+                                // url: '/nccloud/sscivm/ivsale/InvoiceIsDownloadAction.do',
+                                enctype: 1
+                            });
                             this.props.modal.close('LnvoiceDownloadTypeModal')
                         },
                         cancelBtnClick: () => {