收方单导出问题

app/public/report/js/rpt_jspdf.js

@@ -32,11 +32,11 @@ const JpcJsPDFHelper = {
         //
         // doc.save('Test.pdf');
     },
-    outputAsPdf: function (pageData, paperSize, pdfName, signatureRelArr, signAuditArr, keepOrgValue = false) {
-        let doc = this._createPdf(pageData, paperSize, signatureRelArr, signAuditArr, keepOrgValue);
+    outputAsPdf: function (pageData, paperSize, pdfName, signatureRelArr, signAuditArr, keepOrgValue = false, ppStatus = -1) {
+        let doc = this._createPdf(pageData, paperSize, signatureRelArr, signAuditArr, keepOrgValue, ppStatus);
         doc.save(pdfName + '.pdf');
     },
-    _createPdf: function (pageData, paperSize, signatureRelArr, signAuditArr, keepOrgValue = false) {
+    _createPdf: function (pageData, paperSize, signatureRelArr, signAuditArr, keepOrgValue = false, ppStatus = -1) {
         let me = this;
         let offsetX = 0;
         let offsetY = 0;
@@ -71,7 +71,7 @@ const JpcJsPDFHelper = {
         }
 
         let newPageMergeBand = private_getIniPageMergeBorder(pageObj[JV.BAND_PROP_MERGE_BAND]);
-        let ppStatus = zTreeOprObj._chkPrePayStatus();
+        // let ppStatus = zTreeOprObj._chkPrePayStatus();
         if (!keepOrgValue) {
             if (current_stage_status === 3 || ppStatus === 3) {
                 rptSignatureHelper.mergeSignDate(pageObj, signatureRelArr, false);
@@ -122,7 +122,7 @@ const JpcJsPDFHelper = {
                     JpcFigureOutput.drawToPdf(doc, page);
                 }                
                 // 计量有电子签名，要单独处理
-                let ppStatus = zTreeOprObj._chkPrePayStatus();
+                // let ppStatus = zTreeOprObj._chkPrePayStatus();
                 for (let cell of page.signature_cells) {
                     if (current_stage_status === 3 || ppStatus === 3) {
                         private_drawSignature(doc, ctx, cell, styles, controls, newPageMergeBand, false, signatureRelArr);

app/public/report/js/rpt_main.js

@@ -1106,7 +1106,7 @@ let rptControlObj = {
                 signatureRelArr.push(ROLE_REL_LIST);
                 // closeWaitingView();
                 $.bootstrapLoading.end();
-                JpcJsPDFHelper.outputAsPdf(pageData, pageSize, rpt_names[0], signatureRelArr);
+                JpcJsPDFHelper.outputAsPdf(pageData, pageSize, rpt_names[0], signatureRelArr, STAGE_AUDIT, false, zTreeOprObj._chkPrePayStatus());
             }
         }
     },
@@ -1234,7 +1234,7 @@ function downloadPDFReport(pageDataArr, pageSize, rpt_names, signatureRelArr, si
             let rptName = new_rpt_names[rptControlObj.currentDownloadIdx];
             rptControlObj.currentDownloadIdx++;
 
-            JpcJsPDFHelper.outputAsPdf(pageData, pageSize, rptName, singleSignatureRelArr, STAGE_AUDIT); // 精确控制签名
+            JpcJsPDFHelper.outputAsPdf(pageData, pageSize, rptName, singleSignatureRelArr, STAGE_AUDIT, false, zTreeOprObj._chkPrePayStatus()); // 精确控制签名
             if (pageData.splitArcPages) {
                 // let prePageVal = pageData.splitArcPages[0], rptNameIdx = 0;
                 // let indPages = [];