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

app/public/report/js/rpt_main.js

@@ -531,8 +531,8 @@ let zTreeOprObj = {
                 $.bootstrapLoading.end();
                 let pageRst = result.data;
                 if (params.needWaterMark) COMMON_WATER_MARK_PIC_DATA = result.waterMarkStr;
-                STAGE_AUDIT = result.stageAudit;
-                STAGE_AUDIT_ORG = result.stageAuditOrg;
+                STAGE_AUDIT = result.stageAudit || [];
+                STAGE_AUDIT_ORG = result.stageAuditOrg || [];
                 STAGE_FLOW = result.stageFlow;
                 //stageAuditOrg
                 if (result.signatureRelInfo && result.signatureRelInfo.length > 0) {
@@ -1034,7 +1034,7 @@ let rptControlObj = {
                     function(result){
                         $.bootstrapLoading.end();
                         if (params.needWaterMark) COMMON_WATER_MARK_PIC_DATA = result.waterMarkStr;
-                        STAGE_AUDIT = result.stageAudit;
+                        STAGE_AUDIT = result.stageAudit || [];
                         let pageSize = rptControlObj.getCurrentPageSize();
                         let pageDataArr = result.data;
                         let signatureRelInfo = result.signatureRelInfo;
@@ -1203,7 +1203,7 @@ let rptControlObj = {
                         // closeWaitingView();
                         $.bootstrapLoading.end();
                         if (params.needWaterMark) COMMON_WATER_MARK_PIC_DATA = result.waterMarkStr;
-                        STAGE_AUDIT = result.stageAudit;
+                        STAGE_AUDIT = result.stageAudit || [];
                         let pageSize = rptControlObj.getCurrentPageSize();
                         let pageDataArr = result.data;
                         let signatureRelInfo = result.signatureRelInfo;