开关功能修复及wap待办页进入bug

app/controller/wap_controller.js

@@ -152,19 +152,70 @@ module.exports = app => {
             // 获取待审批的变更期
             const auditChanges = await ctx.service.changeAudit.getAuditChangeByWap(ctx.session.sessionUser.accountId);
             // 获取待审批的变更立项
-            let auditChangeProjects = [];
-            if (ctx.subProject.page_show.openChangeProject) {
-                auditChangeProjects = await ctx.service.changeProjectAudit.getAuditChangeProjectByWap(ctx.session.sessionUser.accountId);
+            const auditChangeProjects = [];
+            const changeProjects = await ctx.service.changeProjectAudit.getAuditChangeProjectByWap(ctx.session.sessionUser.accountId);
+            for (const cp of changeProjects) {
+                let sp = null;
+                if (cp.spid) {
+                    if (ctx.helper._.findIndex(subProjects, { id: cp.spid }) !== -1) {
+                        sp = ctx.helper._.find(subProjects, { id: cp.spid });
+                    } else {
+                        sp = await ctx.service.subProject.getDataById(cp.spid);
+                        subProjects.push(sp);
+                    }
+                }
+                if (sp) {
+                    const pageShow = JSON.parse(sp.page_show);
+                    if (pageShow.openChangeProject) {
+                        auditChangeProjects.push(cp);
+                    }
+                } else {
+                    auditChangeProjects.push(cp);
+                }
             }
             // 获取待审批的变更申请
-            let auditChangeApplys = [];
-            if (ctx.subProject.page_show.openChangeApply) {
-                auditChangeApplys = await ctx.service.changeApplyAudit.getAuditChangeApplyByWap(ctx.session.sessionUser.accountId);
+            const auditChangeApplys = [];
+            const changeApplys = await ctx.service.changeApplyAudit.getAuditChangeApplyByWap(ctx.session.sessionUser.accountId);
+            for (const ca of changeApplys) {
+                let sp = null;
+                if (ca.spid) {
+                    if (ctx.helper._.findIndex(subProjects, { id: ca.spid }) !== -1) {
+                        sp = ctx.helper._.find(subProjects, { id: ca.spid });
+                    } else {
+                        sp = await ctx.service.subProject.getDataById(ca.spid);
+                        subProjects.push(sp);
+                    }
+                }
+                if (sp) {
+                    const pageShow = JSON.parse(sp.page_show);
+                    if (pageShow.openChangeApply) {
+                        auditChangeApplys.push(ca);
+                    }
+                } else {
+                    auditChangeApplys.push(ca);
+                }
             }
             // 获取待审批的变更方案
-            let auditChangePlans = [];
-            if (ctx.subProject.page_show.openChangePlan) {
-                auditChangePlans = await ctx.service.changePlanAudit.getAuditChangePlanByWap(ctx.session.sessionUser.accountId);
+            const auditChangePlans = [];
+            const changePlans = await ctx.service.changePlanAudit.getAuditChangePlanByWap(ctx.session.sessionUser.accountId);
+            for (const cp of changePlans) {
+                let sp = null;
+                if (cp.spid) {
+                    if (ctx.helper._.findIndex(subProjects, { id: cp.spid }) !== -1) {
+                        sp = ctx.helper._.find(subProjects, { id: cp.spid });
+                    } else {
+                        sp = await ctx.service.subProject.getDataById(cp.spid);
+                        subProjects.push(sp);
+                    }
+                }
+                if (sp) {
+                    const pageShow = JSON.parse(sp.page_show);
+                    if (pageShow.openChangePlan) {
+                        auditChangePlans.push(cp);
+                    }
+                } else {
+                    auditChangePlans.push(cp);
+                }
             }
             // 获取待审批的台账修订
             const auditRevise = await ctx.service.reviseAudit.getAuditReviseByWap(ctx.session.sessionUser.accountId);

app/service/change_apply_audit.js

@@ -1388,7 +1388,7 @@ module.exports = app => {
             const sql =
                 'SELECT sa.`aid`, sa.`times`, sa.`begin_time`, sa.`end_time`, sa.`tid`, sa.`caid`,' +
                 '    s.*,' +
-                '    t.`name` as `t_name`, t.`project_id`, t.`type`, t.`user_id`,' +
+                '    t.`name` as `t_name`, t.`project_id`, t.`type`, t.`user_id`, t.`spid`, ' +
                 '    ti.`deal_info`, ti.`decimal` ' +
                 '  FROM ?? AS sa' +
                 '    Left Join ?? AS s On sa.`caid` = s.`id`' +

app/service/change_plan_audit.js

@@ -725,7 +725,7 @@ module.exports = app => {
             const sql =
                 'SELECT sa.`aid`, sa.`times`, sa.`begin_time`, sa.`end_time`, sa.`tid`, sa.`cpid`,' +
                 '    s.*,' +
-                '    t.`name` as `t_name`, t.`project_id`, t.`type`, t.`user_id`,' +
+                '    t.`name` as `t_name`, t.`project_id`, t.`type`, t.`user_id`, t.`spid`,' +
                 '    ti.`deal_info`, ti.`decimal` ' +
                 '  FROM ?? AS sa' +
                 '    Left Join ?? AS s On sa.`cpid` = s.`id`' +

app/service/change_project_audit.js

@@ -1524,7 +1524,7 @@ module.exports = app => {
             const sql =
                 'SELECT sa.`aid`, sa.`times`, sa.`begin_time`, sa.`end_time`, sa.`tid`, sa.`cpid`,' +
                 '    s.*,' +
-                '    t.`name` as `t_name`, t.`project_id`, t.`type`, t.`user_id`,' +
+                '    t.`name` as `t_name`, t.`project_id`, t.`type`, t.`user_id`, t.`spid`,' +
                 '    ti.`deal_info`, ti.`decimal` ' +
                 '  FROM ?? AS sa' +
                 '    Left Join ?? AS s On sa.`cpid` = s.`id`' +

app/view/measure/stage.ejs

@@ -11,7 +11,7 @@
                 <a href="/tender/<%= ctx.tender.id %>/settle" class="btn btn-primary btn-sm">计量结算</a>
                 <% } %>
                 <% if ((ctx.session.sessionUser.accountId === ctx.tender.data.user_id || ctx.tender.userAssistsId.indexOf(ctx.session.sessionUser.accountId) >= 0) && ctx.tender.data.ledger_status === auditConst.status.checked) { %>
-                    <% if (!ctx.session.sessionProject.page_show.close1stStageCheckDealParam && ctx.helper.checkZero(ctx.tender.info.deal_param.contractPrice) && stages.length === 0) { %>
+                    <% if (!ctx.subProject.page_show.close1stStageCheckDealParam && ctx.helper.checkZero(ctx.tender.info.deal_param.contractPrice) && stages.length === 0) { %>
                         <a href="#add-qi" data-toggle="modal" data-target="#tips" class="btn btn-primary btn-sm">开始新一期</a>
                     <% } else { %>
                         <% if (ctx.session.sessionProject.page_show.openMultiStageCalc && unCompleteStageCount < ctx.session.sessionProject.page_show.maxMultiStageCount) { %>