归档表的签名遗漏问题

app/controller/report_archive_controller.js

@@ -365,7 +365,7 @@ module.exports = app => {
                     index++;
                     stream = await parts();
                 }
-                const body = this._updateArchiveCommon(ctx, prjId, stgId, rptId, parentUuid, childUuids);
+                const body = await this._updateArchiveCommon(ctx, prjId, stgId, rptId, parentUuid, childUuids);
                 ctx.body = body;
             } catch (error) {
                 ctx.helper.log(error);
@@ -389,7 +389,7 @@ module.exports = app => {
                 if (!(oss_result && oss_result.url && oss_result.res.status === 200)) {
                     throw '上传文件失败';
                 }
-                const body = this._updateArchiveCommon(ctx, prjId, stgId, rptId, newUuidName, []);
+                const body = await this._updateArchiveCommon(ctx, prjId, stgId, rptId, newUuidName, []);
                 ctx.body = body;
             } catch (err) {
                 this.log(err);
@@ -427,7 +427,7 @@ module.exports = app => {
                     }
                 }
 
-                const body = this._updateArchiveCommon(ctx, prjId, stgId, rptId, orgUuidName, []);
+                const body = await this._updateArchiveCommon(ctx, prjId, stgId, rptId, orgUuidName, []);
                 ctx.body = body;
             } catch (err) {
                 this.log(err);

app/public/report/js/rpt_print.js

@@ -34,83 +34,6 @@ let rptPrintHelper = {
             window.open('/printReport/' + sessionStorage.pageSize);
         }
     },
-    preview_bk: async function () {
-        if (zTreeOprObj.checkedRptTplNodes && zTreeOprObj.checkedRptTplNodes.length > 0) {
-            let refRptTplIds = [];
-            rptControlObj.getTplIdsCommon(refRptTplIds, null);
-            let params = rptControlObj.creatCommonExportParam(refRptTplIds);
-            await rptCustomObj.getCustomSelect(params);
-            let chkNodes = zTreeOprObj.treeObj.getCheckedNodes(true);
-            if (chkNodes.length > 0) {
-                delete params.orientation; // 打印时有勾选的话，不需要提供方向
-            }
-            if (COMMON_WATER_MARK_PIC_DATA === null || COMMON_WATER_MARK_PIC_DATA === '') {
-                params.needWaterMark = true;
-            } else {
-                params.needWaterMark = false;
-            }
-            CommonAjax.postXsrfEx("/tender/report_api/getMultiReports", params, 60000, true, getCookie('csrfToken_j'),
-                function(result){
-                    const signatureRelArr = [];
-                    for (const signatureRel of result.signatureRelInfo) {
-                        signatureRelArr.push(JSON.parse(signatureRel.rel_content));
-                    }
-                    if (params.needWaterMark) COMMON_WATER_MARK_PIC_DATA = result.waterMarkStr;
-                    for (let idx = 0; idx < result.data.length; idx++) {
-                        let singleSignatureRelArr = [];
-                        for (let rIdx = 0; rIdx < result.signatureRelInfo.length; rIdx++) {
-                            if (result.signatureRelInfo[rIdx].rpt_id === refRptTplIds[idx]) {
-                                singleSignatureRelArr = signatureRelArr[rIdx]; // 有些报表可能没有签名
-                                break;
-                            }
-                        }
-                        // rptSignatureHelper.mergeSignature(result.data[idx], ROLE_REL_LIST);
-                        // let pageRst = result.data;
-                        // STAGE_AUDIT = result.stageAudit;
-                        // STAGE_AUDIT_ORG = result.stageAuditOrg;
-                        // STAGE_FLOW = result.stageFlow;
-                        // //stageAuditOrg
-                        // if (result.signatureRelInfo && result.signatureRelInfo.length > 0) {
-                        //     CURRENT_ROLE_REL_ID = result.signatureRelInfo[0].id;
-                        //     ROLE_REL_LIST = me._parseRoleRelList(result.signatureRelInfo[0].rel_content);
-                        //     rptSignatureHelper.originalRoleRelList = me._parseRoleRelList(result.signatureRelInfo[0].rel_content);
-                        //     if (current_stage_status === 3) {
-                        //         rptSignatureHelper.mergeSignDate(pageRst, ROLE_REL_LIST);
-                        //         rptSignatureHelper.mergeSignature(pageRst, ROLE_REL_LIST);
-                        //         rptSignatureHelper.mergeSignAudit(pageRst, ROLE_REL_LIST, STAGE_AUDIT);
-                        //     }
-                        // } else {
-                        //     CURRENT_ROLE_REL_ID = -1;
-                        //     ROLE_REL_LIST = [];
-                        // }
-
-                        if (current_stage_status === 3) {
-                            rptSignatureHelper.mergeSignDate(result.data[idx], singleSignatureRelArr, false);
-                            rptSignatureHelper.mergeSignature(result.data[idx], singleSignatureRelArr);
-                            rptSignatureHelper.mergeSignAudit(result.data[idx], singleSignatureRelArr, result.stageAudit);
-                        }
-                    }
-                    sessionStorage.multiRptsData = JSON.stringify(result.data);
-                    sessionStorage.pageSize = rptControlObj.getCurrentPageSize();
-                    sessionStorage.orientation = rptControlObj.getCurrentOrientation();
-                    sessionStorage.scaleFactor = 1;
-                    sessionStorage.closeWaterMark = getCloseWatermark();
-                    sessionStorage.waterMarkStr = COMMON_WATER_MARK_PIC_DATA;
-                    window.open('/printReport/' + sessionStorage.pageSize);
-                },
-                function(failRst){
-                    sessionStorage.currentPageData = null;
-                    console.log(failRst);
-                },
-                function(exceptionRst){
-                    sessionStorage.currentPageData = null;
-                    console.log(exceptionRst);
-                }
-            );
-        } else {
-            //不可能的branch
-        }
-    },
     individualPreview: function() {
         let params = rptControlObj.creatCommonExportParam([1784]);
         delete sessionStorage.req_params; //删除