Bläddra i källkod

BUG# 3634 变更方案部分

Tony Kang 1 år sedan
förälder
incheckning
1b378b8b56
2 ändrade filer med 10 tillägg och 4 borttagningar
  1. 1 1
      app/controller/report_controller.js
  2. 9 3
      app/public/report/js/rpt_signature.js

+ 1 - 1
app/controller/report_controller.js

@@ -959,7 +959,7 @@ module.exports = app => {
                     case -301: // 变更方案
                         const changePlanAudit = await ctx.service.changePlanAudit.getAuditors(params.business_id, params.change_plan_times, true);
                         const change_plan = await ctx.service.changePlan.getDataById(params.business_id);
-                        stgAudit.push({ aid: change_plan.uid, status: change_plan.status, opinion: '', end_time: change_plan.in_time, order: 0 }); // 加上原报,且默认status = 3
+                        stgAudit.push({ aid: change_plan.uid, status: 3, opinion: '', end_time: change_plan.in_time, order: 0 }); // 加上原报,且默认status = 3
                         changePlanAudit.forEach(audit => {
                             stgAudit.push({ aid: audit.aid, status: 3, opinion: audit.opinion, end_time: audit.end_time, times: audit.times, order: audit.order });
                         });

+ 9 - 3
app/public/report/js/rpt_signature.js

@@ -147,7 +147,7 @@ let rptSignatureHelper = {
             if (dftDate !== '' && dftDate.length >= 10) {
                 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) {
+                if (current_stage_id <= -300 && current_stage_id > -400 && BGL_OBJ && BGL_OBJ.currentBz && BGL_OBJ.currentBz.status === 3) {
                     if (STAGE_AUDIT && STAGE_AUDIT.length > 0) {
                         dftDate = new Date(STAGE_AUDIT[STAGE_AUDIT.length - 1].end_time);
                     } else {
@@ -512,7 +512,13 @@ let rptSignatureHelper = {
         params.business_id = BUSINESS_ID;
         params.source_type = SOURCE_TYPE;
         params.rpt_id = zTreeOprObj.currentNode.refId;
-        params.rel_content = ROLE_REL_LIST;
+        // params.rel_content = ROLE_REL_LIST;
+        params.rel_content = [];
+        ROLE_REL_LIST.forEach(role_rel => {
+            if (role_rel.signature_name.indexOf('dummy_pic') < 0) {
+                params.rel_content.push(role_rel);
+            }
+        }); 
         return params;
     },
 
@@ -851,7 +857,7 @@ let rptSignatureHelper = {
                     if (dftDate !== '' && dftDate.length >= 10) {
                         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) {
+                        if (current_stage_id <= -300 && current_stage_id > -400 && BGL_OBJ && BGL_OBJ.currentBz && BGL_OBJ.currentBz.status === 3) {
                             if (STAGE_AUDIT && STAGE_AUDIT.length > 0) {
                                 dftDate = new Date(STAGE_AUDIT[STAGE_AUDIT.length - 1].end_time);
                             } else {