变更令签名取审批时间调整

app/controller/report_controller.js

@@ -950,30 +950,33 @@ module.exports = app => {
                     case -300: // 变更令
                         const changeAudit = await ctx.service.changeAudit.getAuditors(params.change_id, params.change_times, true);
                         changeAudit.forEach(audit => {
-                            stgAudit.push({ aid: audit.uid, status: audit.status, opinion: audit.sdesc, end_time: audit.sin_time, usite: audit.usite });
+                            stgAudit.push({ aid: audit.uid, status: audit.status, opinion: audit.sdesc, end_time: audit.sin_time, order: audit.usite });
                         });
                         break;
                     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 });
+                            stgAudit.push({ aid: audit.aid, status: audit.status, opinion: audit.opinion, end_time: audit.end_time, times: audit.times, order: audit.order });
                         });
                         break;
                     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 });
+                            stgAudit.push({ aid: audit.aid, status: audit.status, opinion: audit.opinion, end_time: audit.end_time, times: audit.times, order: audit.order });
                         });
                         break;
                     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 });
+                            stgAudit.push({ aid: audit.aid, status: audit.status, opinion: audit.opinion, end_time: audit.end_time, times: audit.times, order: audit.order });
                         });
                         break;
                     default:
                         break;
                 }
+                stgAudit.sort(function(stg1, stg2) {
+                    return stg1.order - stg2.order;
+                });
                 this._mergeBlankRoleSignDate(roleRel, stgAudit);
             }
 

app/public/report/js/rpt_signature.js

@@ -148,7 +148,11 @@ let rptSignatureHelper = {
                 dftDate = new Date(dftDate); // 不Format,保留时分秒
             } else if (dftDate === '') {
                 if (STAGE_ID <= -300 && STAGE_ID > -400 && BGL_OBJ && BGL_OBJ.currentBz && BGL_OBJ.currentBz.status === 3) {
-                    dftDate = new Date(BGL_OBJ.currentBz.in_time);
+                    if (STAGE_AUDIT && STAGE_AUDIT.length > 0) {
+                        dftDate = new Date(STAGE_AUDIT[STAGE_AUDIT.length - 1].end_time);
+                    } else {
+                        dftDate = new Date();
+                    }
                 } else {
                     dftDate = new Date();
                 }
@@ -841,7 +845,11 @@ let rptSignatureHelper = {
                         dftDate = new Date(dftDate); // 不Format,保留时分秒
                     } else if (dftDate === '') {
                         if (STAGE_ID <= -300 && STAGE_ID > -400 && BGL_OBJ && BGL_OBJ.currentBz && BGL_OBJ.currentBz.status === 3) {
-                            dftDate = new Date(BGL_OBJ.currentBz.in_time);
+                            if (STAGE_AUDIT && STAGE_AUDIT.length > 0) {
+                                dftDate = new Date(STAGE_AUDIT[STAGE_AUDIT.length - 1].end_time);
+                            } else {
+                                dftDate = new Date();
+                            }
                         } else {
                             dftDate = new Date();
                         }