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

app/public/report/js/rpt_main.js

@@ -418,7 +418,7 @@ let zTreeOprObj = {
     _setupArchive: function() {
         //
     },
-    _chkPrePayStatus: async function() {
+    _chkPrePayStatus: function() {
         let rst = 0;
         let me = zTreeOprObj;
         if (me.currentNode && me.currentNode.hasOwnProperty('flags') && me.currentNode.flags.hasOwnProperty('rptTplType')) {
@@ -462,8 +462,7 @@ let zTreeOprObj = {
                     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);
-                    let ppStatus = zTreeOprObj._chkPrePayStatus();
-                    if (current_stage_status === 3 || ppStatus === 3) {
+                    if (getStageStatus() === 3) {
                         rptSignatureHelper.mergeSignDate(pageRst, ROLE_REL_LIST, true);
                         rptSignatureHelper.mergeSignature(pageRst, ROLE_REL_LIST, true);
                         await rptSignatureHelper.resetDummySignature(pageRst, ROLE_REL_LIST); // 这里重新整理签章坐标信息(因签章大小在后台暂时获取不到，挪到前端处理)
@@ -864,8 +863,7 @@ let rptControlObj = {
                             }
                             signatureRelArr.push(tmpRel);
                         }
-                        let ppStatus = zTreeOprObj._chkPrePayStatus();
-                        if (current_stage_status === 3 || ppStatus === 3) {
+                        if (getStageStatus() === 3) {
                             // 统一安排merge（除草图外）
                             for (let idx = 0; idx < pageDataArr.length; idx++) {
                                 const pageObj = pageDataArr[idx];
@@ -1339,7 +1337,9 @@ function dynamicLoadJs(url, type, callback) {
 }
 
 function getStageStatus() {
-    return current_stage_status;
+    let ppStatus = zTreeOprObj._chkPrePayStatus();
+    if (ppStatus === 3) return ppStatus
+    else return current_stage_status;
 }
 
 function getStageId() {