变更相关业务的签名审核时间判断

app/controller/report_controller.js

@@ -947,21 +947,29 @@ module.exports = app => {
                 stgAuditForOrg = [];
                 stageFlow = [];
                 switch (params.stage_id) {
-                    case -300:
+                    case -300: // 变更令
                         const changeAudit = await ctx.service.changeAudit.getAuditors(params.change_id, params.change_times, true);
-                        const changeAuditOrg = await ctx.service.changeAudit.getAuditors(params.change_id, 1);
                         changeAudit.forEach(audit => {
                             stgAudit.push({ aid: audit.uid, status: audit.status, opinion: audit.sdesc, end_time: audit.sin_time, usite: audit.usite });
                         });
-                        changeAuditOrg.forEach(audit => {
-                            stgAuditForOrg.push({ aid: audit.uid, status: audit.status, opinion: audit.sdesc, end_time: audit.sin_time, usite: audit.usite });
-                        });
                         break;
-                    case -301:
+                    case -301: // 变更方案
+                        const changePlanAudit = await ctx.service.changePlanAudit.getAuditors(params.business_id, params.change_plan_times, true);
+                        changePlanAudit.forEach(audit => {
+                            stgAudit.push({ aid: audit.aid, status: audit.status, opinion: audit.opinion, end_time: audit.end_time, times: audit.times });
+                        });
                         break;
-                    case -302:
+                    case -302: // 变更立项
+                        const changeProjectAudit = await ctx.service.changeProjectAudit.getAuditors(params.business_id, params.change_project_times, true);
+                        changeProjectAudit.forEach(audit => {
+                            stgAudit.push({ aid: audit.aid, status: audit.status, opinion: audit.opinion, end_time: audit.end_time, times: audit.times });
+                        });
                         break;
-                    case -303:
+                    case -303: // 变更申请
+                        const changeApplyAudit = await ctx.service.changeApplyAudit.getAuditors(params.business_id, params.change_apply_times, true);
+                        changeApplyAudit.forEach(audit => {
+                            stgAudit.push({ aid: audit.aid, status: audit.status, opinion: audit.opinion, end_time: audit.end_time, times: audit.times });
+                        });
                         break;
                     default:
                         break;

app/public/report/js/rpt_main.js

@@ -328,10 +328,13 @@ let zTreeOprObj = {
             params.detail_id = DETAIL_ID;
             params.change_id = CHNAGE_ID;
             params.business_id = BUSINESS_ID;
-            params.change_times = CHANGE_TIMES;
             params.change_plan_id = CHNAGE_PLAN_ID;
             params.change_project_id = CHNAGE_PROJECT_ID;
             params.change_apply_id = CHNAGE_APPLY_ID;
+            params.change_times = CHANGE_TIMES;
+            params.change_plan_times = CHNAGE_PLAN_TIMES;
+            params.change_project_times = CHNAGE_PROJECT_TIMES;
+            params.change_apply_times = CHNAGE_APPLY_TIMES;
             _getSplitAmendmentParam(params, treeNode);
         
             rptArchiveObj.toggleBtn(false);
@@ -419,10 +422,14 @@ let zTreeOprObj = {
             params.detail_id = DETAIL_ID;
             params.change_id = CHNAGE_ID;
             params.business_id = BUSINESS_ID;
-            params.change_times = CHANGE_TIMES;
             params.change_plan_id = CHNAGE_PLAN_ID;
             params.change_project_id = CHNAGE_PROJECT_ID;
             params.change_apply_id = CHNAGE_APPLY_ID;
+            params.change_times = CHANGE_TIMES;
+            params.change_plan_times = CHNAGE_PLAN_TIMES;
+            params.change_project_times = CHNAGE_PROJECT_TIMES;
+            params.change_apply_times = CHNAGE_APPLY_TIMES;
+
             _getSplitAmendmentParam(params, me.currentNode);
             localStorage[CUST_NAME + '_custCfg'] = JSON.stringify(CUST_CFG);
 
@@ -749,10 +756,14 @@ let rptControlObj = {
         rst.detail_id = DETAIL_ID;
         rst.change_id = CHNAGE_ID;
         rst.business_id = BUSINESS_ID;
-        rst.change_times = CHANGE_TIMES;
         rst.change_plan_id = CHNAGE_PLAN_ID;
         rst.change_project_id = CHNAGE_PROJECT_ID;
         rst.change_apply_id = CHNAGE_APPLY_ID;
+        rst.change_times = CHANGE_TIMES;
+        rst.change_plan_times = CHNAGE_PLAN_TIMES;
+        rst.change_project_times = CHNAGE_PROJECT_TIMES;
+        rst.change_apply_times = CHNAGE_APPLY_TIMES;
+
     // rst.amendmentType = 
         return rst;
     },

app/view/report/index.ejs

@@ -406,8 +406,11 @@
     const CHANGE_TIMES = BGL_OBJ?.change?.times || 1;
     const BUSINESS_ID = BGL_OBJ?.BUSINESS_ID || '-1';
     const CHNAGE_PLAN_ID = BGL_OBJ?.change_plan?.id || '-1';
+    const CHNAGE_PLAN_TIMES = BGL_OBJ?.change_plan?.times || '-1';
     const CHNAGE_PROJECT_ID = BGL_OBJ?.change_project?.id || '-1';
+    const CHNAGE_PROJECT_TIMES = BGL_OBJ?.change_project?.times || '-1';
     const CHNAGE_APPLY_ID = BGL_OBJ?.change_apply?.id || '-1';
+    const CHNAGE_APPLY_TIMES = BGL_OBJ?.change_apply?.times || '-1';
 
     const PAGE_SHOW = {closeWatermark: 0, closeExportPdf: 0, closeExportExcel: 0, showArchive: 0, closeShowAllCustomized: 0, isTextSignature: 0, closeArchiveSignature: 0};
     <% if (pageShow !== null) { %>