变更签名日期逻辑调整(流程外的取变更令的审批通过时间)

app/controller/report_controller.js

@@ -633,22 +633,26 @@ module.exports = app => {
                 if (stage_id === -300) {
                     bglObj.BUSINESS_ID = ctx.params.cid;
                     bglObj.change = await ctx.service.change.getChangeByCid(ctx.params.cid);
+                    bglObj.currentBz = bglObj.change;
                     bglObj.status = bglObj.change.status;
                     // const audit = await ctx.service.changeAudit.getChangeByCid(ctx.params.cid);
                 }
                 if (stage_id === -301) {
                     bglObj.BUSINESS_ID = ctx.params.cplnid;
                     bglObj.change_plan = await ctx.service.changePlan.getDataById(ctx.params.cplnid);
+                    bglObj.currentBz = bglObj.change_plan;
                     bglObj.status = bglObj.change_plan.status;
                 }
                 if (stage_id === -302) {
                     bglObj.BUSINESS_ID = ctx.params.cprjid;
                     bglObj.change_project = await ctx.service.changeProject.getDataById(ctx.params.cprjid);
+                    bglObj.currentBz = bglObj.change_project;
                     bglObj.status = bglObj.change_project.status;
                 }
                 if (stage_id === -303) {
                     bglObj.BUSINESS_ID = ctx.params.caid;
                     bglObj.change_apply = await ctx.service.changeApply.getDataById(ctx.params.caid);
+                    bglObj.currentBz = bglObj.change_apply;
                     bglObj.status = bglObj.change_apply.status;
                 }
                 const changeId = ctx.params.cid;

app/public/report/js/rpt_signature.js

@@ -145,11 +145,13 @@ let rptSignatureHelper = {
             const elementsStrArr = [];
             let dftDate = _getSignDateByAllScenarios(userAcc.id);
             if (dftDate !== '' && dftDate.length >= 10) {
-                // dftDate = (new Date(dftDate)).Format('yyyy-MM-dd');
                 dftDate = new Date(dftDate); // 不Format,保留时分秒
             } else if (dftDate === '') {
-                // dftDate = (new Date()).Format('yyyy-MM-dd');
-                dftDate = new Date();
+                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);
+                } else {
+                    dftDate = new Date();
+                }
             }
             let roleRel = null;
             if (directAcc) {
@@ -836,11 +838,13 @@ let rptSignatureHelper = {
                 if (role_rel.sign_date === undefined || role_rel.sign_date ===  null || role_rel.sign_date ===  '') {
                     let dftDate = _getSignDateByAllScenarios(role_rel.acc_id);
                     if (dftDate !== '' && dftDate.length >= 10) {
-                        // dftDate = (new Date(dftDate)).Format('yyyy-MM-dd');
                         dftDate = new Date(dftDate); // 不Format,保留时分秒
                     } else if (dftDate === '') {
-                        // dftDate = (new Date()).Format('yyyy-MM-dd');
-                        dftDate = new Date();
+                        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);
+                        } else {
+                            dftDate = new Date();
+                        }
                     }
                     role_rel.sign_date = dftDate;
                     if (isMergeOrgAlso) {