Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/controller/report_archive_controller.js

@@ -111,6 +111,7 @@ module.exports = app => {
             const prjId = params.prjId;
             const stgId = params.stgId;
             const rptId = params.rptId;
+            const ttlPgs = params.ttlPgs;
             const content = params.content;
             const orgArchiveList = await ctx.service.rptArchiveEncryption.getPrjStgArchiveEncryption(prjId, stgId);
             if (orgArchiveList.length > 0) {
@@ -126,7 +127,7 @@ module.exports = app => {
                 }
                 if (!hasArchive) {
                     // 表示有新的要加
-                    contentArr.push({ rpt_id: rptId, encryption: content });
+                    contentArr.push({ rpt_id: rptId, total_page: ttlPgs, encryption: content });
                 } else {
                     //
                 }

app/public/report/js/rpt_archive.js

@@ -344,7 +344,7 @@ let rptArchiveObj = {
             try {
                 let doc = JpcJsPDFHelper._createPdf(currentRptPageRst, rptControlObj.getCurrentPageSize(), ROLE_REL_LIST, STAGE_AUDIT);
                 let pageEncryptInfo = rptArchiveObj._getPageSignatureInfo(currentRptPageRst, currentNode.refId);
-                console.log(pageEncryptInfo);
+                // console.log(pageEncryptInfo);
                 let formData = new FormData();
                 formData.append('file', doc.output('blob'), 'upload.pdf'); //上传单个文件的添加方式
                 if (!rptArchiveObj._chkIfFullArchives(currentNode)) {
@@ -360,6 +360,7 @@ let rptArchiveObj = {
                             params.prjId = PROJECT_ID;
                             params.stgId = current_stage_id;
                             params.rptId = currentNode.refId;
+                            params.ttlPgs = currentRptPageRst.items.length;
                             params.content = pageEncryptInfo;
                             CommonAjax.postXsrfEx("/tender/report_api/addArchiveEncryption", params, 10000, true, getCookie('csrfToken_j'),
                                 function(result){