项目设置，功能设置，部分设置应用调整

app/controller/change_controller.js

@@ -54,7 +54,7 @@ module.exports = app => {
             const pageSize = ctx.pageSize;
             const sorts = ctx.query.sort ? ctx.query.sort : 0;
             const orders = ctx.query.order ? ctx.query.order : 0;
-            const state = ctx.session.sessionProject.page_show.openChangeState && ctx.query.state ? parseInt(ctx.query.state) : 0;
+            const state = ctx.subProject.page_show.openChangeState && ctx.query.state ? parseInt(ctx.query.state) : 0;
             const changes = await ctx.service.change.getListByStatus(tender.id, status, 1, sorts, orders, state);
             const total = await ctx.service.change.getCountByStatus(tender.id, status, state);
             let page_total = 0;
@@ -168,7 +168,7 @@ module.exports = app => {
                 addPermission,
             };
 
-            if (ctx.session.sessionProject.page_show.openChangeState) {
+            if (ctx.subProject.page_show.openChangeState) {
                 // 工程变更类别读取
                 const fun_set = this.ctx.subProject.fun_set;
                 const changeState = fun_set.change_state;
@@ -406,7 +406,7 @@ module.exports = app => {
                 // 获取变更方案的清单
                 let planList = [];
                 let showPlanBtn = false;
-                if (ctx.session.sessionProject.page_show.openChangePlan) {
+                if (ctx.subProject.page_show.openChangePlan) {
                     const planInfo = change.plan_code ? await ctx.service.changePlan.getDataByCondition({ tid: tender.id, code: change.plan_code }) : null;
                     showPlanBtn = change.plan_code !== null && change.plan_code !== '';
                     if (planInfo && planInfo.id) {
@@ -569,7 +569,7 @@ module.exports = app => {
          */
         async relation(ctx) {
             try {
-                if (!ctx.session.sessionProject.page_show.openChangePlan) {
+                if (!ctx.subProject.page_show.openChangePlan) {
                     throw '该功能已关闭';
                 }
                 // await this._getChangeAuditViewData(ctx);
@@ -615,7 +615,7 @@ module.exports = app => {
                 switch (data.type) {
                     case 'add':
                     case 'batchadd':
-                        if (!ctx.session.sessionProject.page_show.openChangeWhiteList) {
+                        if (!ctx.subProject.page_show.openChangeWhiteList) {
                             throw '空白清单添加功能未开启。';
                         }
                         const fun_set = this.ctx.subProject.fun_set;

app/controller/dashboard_controller.js

@@ -34,9 +34,9 @@ module.exports = app => {
             const auditRevise = await ctx.service.reviseAudit.getAuditRevise(ctx.session.sessionUser.accountId);
             const auditMaterial = ctx.session.sessionProject.page_show.openMaterial ? await ctx.service.materialAudit.getAuditMaterial(ctx.session.sessionUser.accountId) : [];
             const auditAdvance = await ctx.service.advanceAudit.getAuditAdvance(ctx.session.sessionUser.accountId);
-            const auditChangeProject = ctx.session.sessionProject.page_show.openChangeProject ? await ctx.service.changeProjectAudit.getAuditChangeProject(ctx.session.sessionUser.accountId) : [];
-            const auditChangeApply = ctx.session.sessionProject.page_show.openChangeApply ? await ctx.service.changeApplyAudit.getAuditChangeApply(ctx.session.sessionUser.accountId) : [];
-            const auditChangePlan = ctx.session.sessionProject.page_show.openChangePlan ? await ctx.service.changePlanAudit.getAuditChangePlan(ctx.session.sessionUser.accountId) : [];
+            const auditChangeProject = ctx.subProject.page_show.openChangeProject ? await ctx.service.changeProjectAudit.getAuditChangeProject(ctx.session.sessionUser.accountId) : [];
+            const auditChangeApply = ctx.subProject.page_show.openChangeApply ? await ctx.service.changeApplyAudit.getAuditChangeApply(ctx.session.sessionUser.accountId) : [];
+            const auditChangePlan = ctx.subProject.page_show.openChangePlan ? await ctx.service.changePlanAudit.getAuditChangePlan(ctx.session.sessionUser.accountId) : [];
             const auditPayments = ctx.session.sessionProject.page_show.openPayment ? await ctx.service.paymentDetailAudit.getAuditPayment(ctx.session.sessionUser.accountId) : [];
             const auditStageAss = await ctx.service.stageAuditAss.getAuditStageAss(ctx.session.sessionUser.accountId);
             const auditFinancials = ctx.session.sessionProject.page_show.openFinancial ? await ctx.service.financialPayAudit.getAuditFinancial(ctx.session.sessionUser.accountId) : [];
@@ -64,9 +64,9 @@ module.exports = app => {
                 { count: await ctx.service.stageAudit.getCountByChecked(ctx.session.sessionUser.accountId), name: '计量审批' },
                 { count: await ctx.service.changeAudit.getCountByChecked(ctx.session.sessionUser.accountId), name: '变更审批' },
             ];
-            if (ctx.session.sessionProject.page_show.openChangeProject) shenpi_count.push({ count: await ctx.service.changeProjectAudit.getCountByChecked(ctx.session.sessionUser.accountId), name: '变更立项' });
-            if (ctx.session.sessionProject.page_show.openChangeApply) shenpi_count.push({ count: await ctx.service.changeApplyAudit.getCountByChecked(ctx.session.sessionUser.accountId), name: '变更申请' });
-            if (ctx.session.sessionProject.page_show.openChangePlan) shenpi_count.push({ count: await ctx.service.changePlanAudit.getCountByChecked(ctx.session.sessionUser.accountId), name: '变更方案' });
+            if (ctx.subProject.page_show.openChangeProject) shenpi_count.push({ count: await ctx.service.changeProjectAudit.getCountByChecked(ctx.session.sessionUser.accountId), name: '变更立项' });
+            if (ctx.subProject.page_show.openChangeApply) shenpi_count.push({ count: await ctx.service.changeApplyAudit.getCountByChecked(ctx.session.sessionUser.accountId), name: '变更申请' });
+            if (ctx.subProject.page_show.openChangePlan) shenpi_count.push({ count: await ctx.service.changePlanAudit.getCountByChecked(ctx.session.sessionUser.accountId), name: '变更方案' });
             if (ctx.session.sessionProject.page_show.openMaterial) shenpi_count.push({ count: await ctx.service.materialAudit.getCountByChecked(ctx.session.sessionUser.accountId), name: '材料调差' });
             if (ctx.session.sessionProject.page_show.openFinancial) shenpi_count.push({ count: await ctx.service.financialPayAudit.getCountByChecked(ctx.session.sessionUser.accountId), name: '资金支付' });
             // shenpi_count.push({ count: await ctx.service.advanceAudit.getCountByChecked(ctx.session.sessionUser.accountId), name: '预付款' });
@@ -77,9 +77,9 @@ module.exports = app => {
                 await ctx.service.reviseAudit.getLastEndTimeByChecked(ctx.session.sessionUser.accountId),
                 await ctx.service.stageAudit.getLastEndTimeByChecked(ctx.session.sessionUser.accountId),
                 await ctx.service.changeAudit.getLastEndTimeByChecked(ctx.session.sessionUser.accountId),
-                ctx.session.sessionProject.page_show.openChangeProject ? await ctx.service.changeProjectAudit.getLastEndTimeByChecked(ctx.session.sessionUser.accountId) : null,
-                ctx.session.sessionProject.page_show.openChangeApply ? await ctx.service.changeApplyAudit.getLastEndTimeByChecked(ctx.session.sessionUser.accountId) : null,
-                ctx.session.sessionProject.page_show.openChangePlan ? await ctx.service.changePlanAudit.getLastEndTimeByChecked(ctx.session.sessionUser.accountId) : null,
+                ctx.subProject.page_show.openChangeProject ? await ctx.service.changeProjectAudit.getLastEndTimeByChecked(ctx.session.sessionUser.accountId) : null,
+                ctx.subProject.page_show.openChangeApply ? await ctx.service.changeApplyAudit.getLastEndTimeByChecked(ctx.session.sessionUser.accountId) : null,
+                ctx.subProject.page_show.openChangePlan ? await ctx.service.changePlanAudit.getLastEndTimeByChecked(ctx.session.sessionUser.accountId) : null,
                 ctx.session.sessionProject.page_show.openMaterial ? await ctx.service.materialAudit.getLastEndTimeByChecked(ctx.session.sessionUser.accountId) : null,
                 ctx.session.sessionProject.page_show.openFinancial ? await ctx.service.financialPayAudit.getLastEndTimeByChecked(ctx.session.sessionUser.accountId) : null,
             ];

app/controller/login_controller.js

@@ -191,7 +191,9 @@ module.exports = app => {
 
                 // 判断是否已经有对应用户信息，没有则跳转初始化页面
                 const needBoot = await ctx.service.customer.isNeedBoot(ctx.request.body);
-                const url = needBoot ? '/boot' : (subProject && subProject.length === 1 ? `/sp/${subProject[0].id}/dashboard` : '/dashboard');
+                // todo 登录进来暂时跳转项目列表，工作台做好了以后须改回去
+                const url = needBoot ? '/boot' : (subProject && subProject.length === 1 ? `/sp/${subProject[0].id}/dashboard` : '/subproj');
+                // const url = needBoot ? '/boot' : (subProject && subProject.length === 1 ? `/sp/${subProject[0].id}/dashboard` : '/dashboard');
 
                 const query = URL.parse(ctx.request.header.referer, true).query;
                 ctx.redirect(query.referer ? query.referer : url);

app/controller/material_controller.js

@@ -64,7 +64,7 @@ module.exports = app => {
                     auditType,
                     jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.material.index),
                 };
-                let openMaterialTax = ctx.session.sessionProject.page_show.openMaterialTax;
+                let openMaterialTax = ctx.subProject.page_show.openMaterialTax;
                 let allMaterialTax = true;
                 renderData.materials = await ctx.service.material.getValidMaterials(ctx.tender.id);
                 const lastMaterial = renderData.materials.length > 0 ? renderData.materials[0] : null;
@@ -904,11 +904,11 @@ module.exports = app => {
                     data: {},
                 };
                 const notControlList = ['join', 'notjoin', 'change', 'notchange', 'self', 'noself', 'useOther', 'add', 'del', 'update', 'paste'];
-                if (ctx.session.sessionProject.page_show.openMaterialChecklist && ctx.app._.indexOf(notControlList, data.type) === -1) {
+                if (ctx.subProject.page_show.openMaterialChecklist && ctx.app._.indexOf(notControlList, data.type) === -1) {
                     throw '清单设置功能已启动，请前往清单设置页操作清单内容';
                 }
                 const selfControlList = ['self', 'noself', 'add', 'del', 'update', 'paste'];
-                if (!ctx.session.sessionProject.page_show.openMaterialSelf && ctx.app._.indexOf(selfControlList, data.type) !== -1) {
+                if (!ctx.subProject.page_show.openMaterialSelf && ctx.app._.indexOf(selfControlList, data.type) !== -1) {
                     throw '单独设置工料功能已关闭，无法设置';
                 }
                 switch (data.type) {
@@ -1576,7 +1576,7 @@ module.exports = app => {
         async _setChecklistPermission(ctx) {
             // 清单设置权限判断
             ctx.material.checklistPermission = false;
-            if (ctx.session.sessionProject.page_show.openMaterialChecklist && ctx.material.highOrder === ctx.material.order && ctx.material.status !== auditConst.status.checked) {
+            if (ctx.subProject.page_show.openMaterialChecklist && ctx.material.highOrder === ctx.material.order && ctx.material.status !== auditConst.status.checked) {
                 const permission = ctx.session.sessionUser.permission;
                 if ((permission && ((permission.tender !== undefined && permission.tender.indexOf('4') !== -1) || (permission.material !== undefined && permission.material.indexOf('1') !== -1))) || (ctx.material.order === 1 && ctx.session.sessionUser.accountId === ctx.material.user_id && (ctx.material.status === auditConst.status.uncheck || ctx.material.status === auditConst.status.checkNo))) {
                     ctx.material.checklistPermission = true;

app/controller/report_controller.js

@@ -747,7 +747,7 @@ module.exports = app => {
                 const sp_id = -1;
                 const { treeNodes, custCfg } = await this._createNodes(ctx, source_type, pid);
                 // const { treeNodes, custCfg, allTreeItems, allIndivTreeItems } = await this._createNodes(ctx, sourceTypeConst.sourceType.tender, tender.data.project_id);
-                const state = ctx.session.sessionProject.page_show.openChangeState && ctx.query.state ? parseInt(ctx.query.state) : 0;
+                const state = ctx.subProject.page_show.openChangeState && ctx.query.state ? parseInt(ctx.query.state) : 0;
                 const changes = await ctx.service.change.getListByStatus(tenderId, 0, 0, 0, 0, state);
                 let change_times = 1;
                 const stageList = [];

app/controller/stage_controller.js

@@ -99,7 +99,7 @@ module.exports = app => {
 
         async _checkStageStart(ctx) {
             // 上报日期获取，及上报权限开关
-            if (ctx.session.sessionProject.page_show.openStageStart) {
+            if (ctx.subProject.page_show.openStageStart) {
                 const stageStart = ctx.session.sessionProject.funSet.stage_start;
                 const thisYear = moment().year();
                 // const thisYear = 2021;
@@ -1354,7 +1354,7 @@ module.exports = app => {
                 }
 
                 await this._checkStageStart(ctx);
-                if (ctx.session.sessionProject.page_show.openStageStart && !ctx.stage.startPermission) {
+                if (ctx.subProject.page_show.openStageStart && !ctx.stage.startPermission) {
                     throw '非指定日期范围内无法上报';
                 }
 

app/controller/tender_controller.js

@@ -515,7 +515,7 @@ module.exports = app => {
                 // 调差最新期数据
                 const materials = await ctx.service.material.getValidMaterials(ctx.tender.id);
                 let materialData = null;
-                let openMaterialTax = ctx.session.sessionProject.page_show.openMaterialTax;
+                let openMaterialTax = ctx.subProject.page_show.openMaterialTax;
                 let allMaterialTax = true;
                 if (materials && materials.length > 0) {
                     materialData = materials[0];

app/controller/wap_controller.js

@@ -137,17 +137,17 @@ module.exports = app => {
             const auditChanges = await ctx.service.changeAudit.getAuditChangeByWap(ctx.session.sessionUser.accountId);
             // 获取待审批的变更立项
             let auditChangeProjects = [];
-            if (ctx.session.sessionProject.page_show.openChangeProject) {
+            if (ctx.subProject.page_show.openChangeProject) {
                 auditChangeProjects = await ctx.service.changeProjectAudit.getAuditChangeProjectByWap(ctx.session.sessionUser.accountId);
             }
             // 获取待审批的变更申请
             let auditChangeApplys = [];
-            if (ctx.session.sessionProject.page_show.openChangeApply) {
+            if (ctx.subProject.page_show.openChangeApply) {
                 auditChangeApplys = await ctx.service.changeApplyAudit.getAuditChangeApplyByWap(ctx.session.sessionUser.accountId);
             }
             // 获取待审批的变更方案
             let auditChangePlans = [];
-            if (ctx.session.sessionProject.page_show.openChangePlan) {
+            if (ctx.subProject.page_show.openChangePlan) {
                 auditChangePlans = await ctx.service.changePlanAudit.getAuditChangePlanByWap(ctx.session.sessionUser.accountId);
             }
             // 获取待审批的台账修订
@@ -395,7 +395,7 @@ module.exports = app => {
                 }
                 // 变更立项列表
                 let changeProjects = [];
-                if (ctx.session.sessionProject.page_show.openChangeProject) {
+                if (ctx.subProject.page_show.openChangeProject) {
                     changeProjects = await ctx.service.changeProject.getListByStatus(ctx.tender.id, 0, 0);
                     for (const c of changeProjects) {
                         c.showApprovalBtn = false;
@@ -411,7 +411,7 @@ module.exports = app => {
 
                 // 变更申请列表
                 let changeApplys = [];
-                if (ctx.session.sessionProject.page_show.openChangeApply) {
+                if (ctx.subProject.page_show.openChangeApply) {
                     changeApplys = await ctx.service.changeApply.getListByStatus(ctx.tender.id, 0, 0);
                     for (const c of changeApplys) {
                         c.showApprovalBtn = false;
@@ -427,7 +427,7 @@ module.exports = app => {
 
                 // 变更方案列表
                 let changePlans = [];
-                if (ctx.session.sessionProject.page_show.openChangePlan) {
+                if (ctx.subProject.page_show.openChangePlan) {
                     changePlans = await ctx.service.changePlan.getListByStatus(ctx.tender.id, 0, 0);
                     for (const c of changePlans) {
                         c.showApprovalBtn = false;

app/middleware/change_apply_check.js

@@ -23,7 +23,7 @@ module.exports = options => {
     return function* changeApplyCheck(next) {
         try {
             // 获取revise
-            if (!this.session.sessionProject.page_show.openChangeApply) {
+            if (!this.subProject.page_show.openChangeApply) {
                 throw '该功能已关闭';
             }
             const caid = this.params.caid || this.request.body.caid;

app/middleware/change_plan_check.js

@@ -23,7 +23,7 @@ module.exports = options => {
     return function* changePlanCheck(next) {
         try {
             // 获取revise
-            if (!this.session.sessionProject.page_show.openChangePlan) {
+            if (!this.subProject.page_show.openChangePlan) {
                 throw '该功能已关闭';
             }
             const cpid = this.params.cpid || this.request.body.cpid;

app/middleware/change_project_check.js

@@ -23,7 +23,7 @@ module.exports = options => {
     return function* changeProjectCheck(next) {
         try {
             // 获取revise
-            if (!this.session.sessionProject.page_show.openChangeProject) {
+            if (!this.subProject.page_show.openChangeProject) {
                 throw '该功能已关闭';
             }
             const cpid = this.params.cpid || this.request.body.cpid;

app/middleware/material_check.js

@@ -51,7 +51,7 @@ module.exports = options => {
 
             // 读取原报、审核人数据
             yield this.service.material.loadMaterialUser(material);
-            const openMaterialTax = this.session.sessionProject.page_show.openMaterialTax;
+            const openMaterialTax = this.subProject.page_show.openMaterialTax;
             if ((material.status === status.uncheck || material.status === status.checkNo) && material.material_tax !== openMaterialTax) {
                 yield this.service.material.updateMaterialTax(material.id, openMaterialTax);
                 material.material_tax = openMaterialTax;
@@ -95,8 +95,8 @@ module.exports = options => {
             });
             // 调差的readOnly 指表格和页面只能看不能改，和审批无关
             material.readOnly = !(((material.status === status.uncheck || material.status === status.checkNo) && accountId === material.user_id)
-                || (this.session.sessionProject.page_show.openMaterialEditForAudit && (material.status === status.checking || material.status === status.checkNoPre) && material.curAuditorIds.indexOf(accountId) !== -1));
-            material.editForAudit = this.session.sessionProject.page_show.openMaterialEditForAudit && (material.status === status.checking || material.status === status.checkNoPre) && material.curAuditorIds.indexOf(accountId) !== -1;
+                || (this.subProject.page_show.openMaterialEditForAudit && (material.status === status.checking || material.status === status.checkNoPre) && material.curAuditorIds.indexOf(accountId) !== -1));
+            material.editForAudit = this.subProject.page_show.openMaterialEditForAudit && (material.status === status.checking || material.status === status.checkNoPre) && material.curAuditorIds.indexOf(accountId) !== -1;
             material.decimal = material.decimal ? JSON.parse(material.decimal) : materialConst.decimal;
             // 判断stage流程可否撤回，是哪一种撤回
             // yield this.service.material.doCheckMaterialCanCancel(material);

app/middleware/tender_check.js

@@ -76,13 +76,13 @@ module.exports = options => {
             const reviseAuditorsId = this.helper._.map(reviseAuditors, 'audit_id');
             const materialAuditors = yield this.service.materialAudit.getAllAuditors(tender.id);
             const materialAuditorsId = this.helper._.map(materialAuditors, 'aid');
-            const changeProjectAuditors = this.session.sessionProject.page_show.openChangeProject ? yield this.service.changeProjectAudit.getAllAuditors(tender.id) : [];
+            const changeProjectAuditors = this.subProject.page_show.openChangeProject ? yield this.service.changeProjectAudit.getAllAuditors(tender.id) : [];
             const changeProjectAuditorsId = this.helper._.map(changeProjectAuditors, 'aid');
-            const changeProjectXsAuditors = this.session.sessionProject.page_show.openChangeProject ? yield this.service.changeProjectXsAudit.getAllAuditors(tender.id) : [];
+            const changeProjectXsAuditors = this.subProject.page_show.openChangeProject ? yield this.service.changeProjectXsAudit.getAllAuditors(tender.id) : [];
             const changeProjectXsAuditorsId = this.helper._.map(changeProjectXsAuditors, 'aid');
-            const changeApplyAuditors = this.session.sessionProject.page_show.openChangeApply ? yield this.service.changeApplyAudit.getAllAuditors(tender.id) : [];
+            const changeApplyAuditors = this.subProject.page_show.openChangeApply ? yield this.service.changeApplyAudit.getAllAuditors(tender.id) : [];
             const changeApplyAuditorsId = this.helper._.map(changeApplyAuditors, 'aid');
-            const changePlanAuditors = this.session.sessionProject.page_show.openChangePlan ? yield this.service.changePlanAudit.getAllAuditors(tender.id) : [];
+            const changePlanAuditors = this.subProject.page_show.openChangePlan ? yield this.service.changePlanAudit.getAllAuditors(tender.id) : [];
             const changePlanAuditorsId = this.helper._.map(changePlanAuditors, 'aid');
             const tenderPermission = this.session.sessionUser.permission ? this.session.sessionUser.permission.tender : null;
             const isTenderTourist = yield this.service.tenderTourist.getDataByCondition({ tid: tender.id, user_id: accountId });

app/service/material.js

@@ -198,7 +198,7 @@ module.exports = app => {
                 user_id: this.ctx.session.sessionUser.accountId,
                 stage_id: data.stage_id.join(','),
                 s_order: data.s_order,
-                material_tax: this.ctx.session.sessionProject.page_show.openMaterialTax,
+                material_tax: this.ctx.subProject.page_show.openMaterialTax,
                 decimal: preMaterial && preMaterial.decimal ? preMaterial.decimal : JSON.stringify(materialConst.decimal),
                 is_new: 1,
                 is_stage_self: data.is_stage_self,

app/service/tender.js

@@ -115,13 +115,13 @@ module.exports = app => {
                 // 根据用户权限查阅标段
                 // tender 163条数据，project_account 68条数据测试
                 // 查询两张表耗时0.003s，查询tender左连接project_account耗时0.002s
-                const changeProjectSql = this.ctx.session.sessionProject.page_show.openChangeProject ? '    OR (t.`ledger_status` = ' + auditConst.ledger.status.checked + ' AND ' +
+                const changeProjectSql = this.ctx.subProject.page_show.openChangeProject ? '    OR (t.`ledger_status` = ' + auditConst.ledger.status.checked + ' AND ' +
                     '        t.id IN ( SELECT cpa.`tid` FROM ' + this.ctx.service.changeProjectAudit.tableName + ' AS cpa WHERE cpa.`aid` = ' + session.sessionUser.accountId + ' GROUP BY cpa.`tid`))' : '';
-                const changeApplySql = this.ctx.session.sessionProject.page_show.openChangeApply ? '    OR (t.`ledger_status` = ' + auditConst.ledger.status.checked + ' AND ' +
+                const changeApplySql = this.ctx.subProject.page_show.openChangeApply ? '    OR (t.`ledger_status` = ' + auditConst.ledger.status.checked + ' AND ' +
                     '        t.id IN ( SELECT caa.`tid` FROM ' + this.ctx.service.changeApplyAudit.tableName + ' AS caa WHERE caa.`aid` = ' + session.sessionUser.accountId + ' GROUP BY caa.`tid`))' : '';
-                const changePlanSql = this.ctx.session.sessionProject.page_show.openChangePlan ? '    OR (t.`ledger_status` = ' + auditConst.ledger.status.checked + ' AND ' +
+                const changePlanSql = this.ctx.subProject.page_show.openChangePlan ? '    OR (t.`ledger_status` = ' + auditConst.ledger.status.checked + ' AND ' +
                     '        t.id IN ( SELECT cpla.`tid` FROM ' + this.ctx.service.changePlanAudit.tableName + ' AS cpla WHERE cpla.`aid` = ' + session.sessionUser.accountId + ' GROUP BY cpla.`tid`))' : '';
-                const changeProjectXsSql = this.ctx.session.sessionProject.page_show.openChangeProject ? '    OR (t.`ledger_status` = ' + auditConst.ledger.status.checked + ' AND ' +
+                const changeProjectXsSql = this.ctx.subProject.page_show.openChangeProject ? '    OR (t.`ledger_status` = ' + auditConst.ledger.status.checked + ' AND ' +
                     '        t.id IN ( SELECT cpxa.`tid` FROM ' + this.ctx.service.changeProjectXsAudit.tableName + ' AS cpxa WHERE cpxa.`aid` = ' + session.sessionUser.accountId + ' GROUP BY cpxa.`tid`))' : '';
                 sql = 'SELECT t.`id`, t.`project_id`, t.`name`, t.`status`, t.`category`, t.`ledger_times`, t.`ledger_status`, t.`measure_type`, t.`user_id`, t.`create_time`, t.`total_price`, t.`deal_tp`,' +
                     '    pa.`name` As `user_name`, pa.`role` As `user_role`, pa.`company` As `user_company` ' +

app/view/change/apply.ejs

@@ -132,7 +132,7 @@
     let connectorRule = '<%- c_connector %>';
     const cRuleFirst = parseInt('<%- c_rule_first %>');
     const ruleType = parseInt('<%- ruleType %>');
-    const openChangeProject = parseInt('<%- ctx.session.sessionProject.page_show.openChangeProject %>');
+    const openChangeProject = parseInt('<%- ctx.subProject.page_show.openChangeProject %>');
     const rulesType = '<%- rule_type %>';
     const auditType = JSON.parse(unescape('<%- escape(JSON.stringify(auditType)) %>'));
     const auditConst = JSON.parse(unescape('<%- escape(JSON.stringify(auditConst)) %>'));

app/view/change/apply_modal.ejs

@@ -61,7 +61,7 @@
                         <div class="invalid-feedback" style="display: none" id="bjHint">您输入的编号已存在。</div>
                     </div>
                 </div>
-                <% if (ctx.session.sessionProject.page_show.openChangeProject) { %>
+                <% if (ctx.subProject.page_show.openChangeProject) { %>
                 <div class="form-group">
                     <label>关联变更立项</label>
                     <select class="form-control form-control-sm" id="project-code">

app/view/change/index.ejs

@@ -51,7 +51,7 @@
                         </div>
                     </div>
                 </div>
-                <% if (ctx.session.sessionProject.page_show.openChangeState) { %>
+                <% if (ctx.session.page_show.openChangeState) { %>
                 <div class="d-inline-block">
                     <div class="btn-group">
                         <button type="button" class="btn btn-sm btn-light text-primary dropdown-toggle" data-toggle="dropdown" id="state_zhankai" data-value="<%- state %>">变更令状态：<% if (state !== 0) { %><%- ctx.helper._.find(changeState, { order: state }).name %>(<%- ctx.helper._.find(changeState, { order: state }).count %>)<% } else { %>全部<% } %></button>
@@ -90,7 +90,7 @@
                     <thead class="text-center">
                     <tr><th width="3%">序号</th>
                         <th width="16%" id="sort_change">申请编号/变更令号</th><th width="22%">变更工程名称</th>
-                        <th width="7%">变更性质</th><% if (ctx.session.sessionProject.page_show.openChangeState) { %><th width="7%">变更令状态</th><% } %>
+                        <th width="7%">变更性质</th><% if (ctx.subProject.page_show.openChangeState) { %><th width="7%">变更令状态</th><% } %>
                         <th width="7%">变更金额</th><th width="7%">计价金额</th>
                         <th width="7%">不计价金额</th><th width="6%">创建人</th><th width="7%">审批状态</th>
                         <th width="12%">审批进度</th><th width="4%">操作</th>
@@ -109,7 +109,7 @@
                         <td><a href="/tender/<%- tender.id %>/change/<%- c.cid %>/information"><% if (c.status !== auditConst.status.checked) { %><%- c.code %><% } else { %><%- c.p_code %><% } %></a></td>
                         <td><%- c.name %></td>
                         <td><%- qualityArray[c.quality] %><% c.quality %></td>
-                        <% if (ctx.session.sessionProject.page_show.openChangeState) { %>
+                        <% if (ctx.subProject.page_show.openChangeState) { %>
                         <td><%- ctx.helper._.find(changeState, { order: c.state }).name %></td>
                         <% } %>
                         <td style="text-align: right"><%= ctx.helper.roundNum(c.total_price, tpUnit) %></td>
@@ -185,7 +185,7 @@
             autoFlashHeight();
         }
     });
-    const openChangePlan = parseInt('<%- ctx.session.sessionProject.page_show.openChangePlan %>');
+    const openChangePlan = parseInt('<%- ctx.subProject.page_show.openChangePlan %>');
     const changePlanList = JSON.parse(unescape('<%- escape(JSON.stringify(changePlanList)) %>'));
 </script>
 <script src="/public/js/change.js"></script>

app/view/change/information.ejs

@@ -9,7 +9,7 @@
                         <div class="btn-group btn-group-toggle group-tab">
                             <a class="btn btn-sm btn-light active" href="javascript:void(0);">变更详情</a>
                             <a class="btn btn-sm btn-light" href="/tender/<%- ctx.tender.id %>/change/<%- ctx.change.cid %>/report">输出报表</a>
-                            <% if (ctx.session.sessionProject.page_show.openChangePlan) { %>
+                            <% if (ctx.subProject.page_show.openChangePlan) { %>
                             <a class="btn btn-sm btn-light" href="/tender/<%- ctx.tender.id %>/change/<%- ctx.change.cid %>/relation">关联数据</a>
                             <% } %>
                         </div>
@@ -105,7 +105,7 @@
                         <div class="sjs-sh-1" style="overflow-y: auto;">
                             <% if (!change.readOnly) { %>
                             <form class="p-2" action="/tender/<%- change.tid %>/change/<%- change.cid %>/information/save?_csrf_j=<%= ctx.csrf %>" method="post" id="change_form">
-                                <% if (ctx.session.sessionProject.page_show.openChangeState) { %>
+                                <% if (ctx.subProject.page_show.openChangeState) { %>
                                 <div class="form-group">
                                     <label>变更状态</label>
                                     <div>
@@ -225,7 +225,7 @@
                             </form>
                             <% } else { %>
                             <form class="p-2">
-                                <% if (ctx.session.sessionProject.page_show.openChangeState) { %>
+                                <% if (ctx.subProject.page_show.openChangeState) { %>
                                 <div class="form-group">
                                     <label>变更状态</label>
                                     <div>
@@ -399,7 +399,7 @@
                                         <!--                                    <a href="#addlist" data-toggle="modal" class="btn btn-sm btn-light text-primary" id="open-list-modal" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="添加清单"><i class="fa fa-plus" aria-hidden="true"></i> <span class="order_text"><% if (change.order_by === 0) { %>添加<% } else { %>插入<% } %></span>台账清单</a>-->
                                         <a href="javascript:void(0);" id="set-site-btn" class="btn btn-sm btn-light text-primary" data-placement="bottom" title="" data-original-title="添加清单"><i class="fa fa-plus" aria-hidden="true"></i> <span class="order_text"><% if (change.order_by === 0) { %>添加<% } else { %>插入<% } %></span>台账清单</a>
                                     </div>
-                                    <% if (ctx.session.sessionProject.page_show.openChangeWhiteList) { %>
+                                    <% if (ctx.subProject.page_show.openChangeWhiteList) { %>
                                         <div class="d-inline-block mr-1 judge-hide">
                                             <a href="javascript:void(0);" class="btn btn-sm btn-light text-primary" id="add-white-btn" data-original-title="添加清单"><i class="fa fa-plus" aria-hidden="true"></i> <span class="order_text"><% if (change.order_by === 0) { %>添加<% } else { %>插入<% } %></span>空白清单</a>
                                         </div>
@@ -592,7 +592,7 @@
             }
         }
     }
-    const openChangeState = <%- ctx.session.sessionProject.page_show.openChangeState ? true : false %>;
+    const openChangeState = <%- ctx.subProject.page_show.openChangeState ? true : false %>;
     const startLimit = 9;
     const settleStatus = JSON.parse('<%- JSON.stringify(settleStatus) %>');
     const removeSettleNum = <%- removeSettleNum %>;
@@ -635,7 +635,7 @@
         w_code: JSON.parse(unescape('<%- escape(JSON.stringify(change.w_code ? change.w_code : '')) %>')),
     };
     let changeInfo = Object.assign({}, back_changeInfo);
-    const openChangeWhiteList = <%- ctx.session.sessionProject.page_show.openChangeWhiteList %>;
+    const openChangeWhiteList = <%- ctx.subProject.page_show.openChangeWhiteList %>;
     let deLimit = parseInt('<%- deLimit %>');
     console.log(changeInfo);
 </script>

app/view/change/modal.ejs

@@ -61,7 +61,7 @@
                         <div class="invalid-feedback" style="display: none" id="bjHint">您输入的编号已存在。</div>
                     </div>
                 </div>
-                <% if (ctx.session.sessionProject.page_show.openChangePlan) { %>
+                <% if (ctx.subProject.page_show.openChangePlan) { %>
                     <style>
                         .select2-container {
                             /*display: inline-block!important;*/

app/view/change/plan.ejs

@@ -131,7 +131,7 @@
     let connectorRule = '<%- c_connector %>';
     const cRuleFirst = parseInt('<%- c_rule_first %>');
     const ruleType = parseInt('<%- ruleType %>');
-    const openChangeApply = parseInt('<%- ctx.session.sessionProject.page_show.openChangeApply %>');
+    const openChangeApply = parseInt('<%- ctx.subProject.page_show.openChangeApply %>');
     const rulesType = '<%- rule_type %>';
     const auditType = JSON.parse(unescape('<%- escape(JSON.stringify(auditType)) %>'));
     const auditConst = JSON.parse(unescape('<%- escape(JSON.stringify(auditConst)) %>'));

app/view/change/plan_modal.ejs

@@ -61,7 +61,7 @@
                         <div class="invalid-feedback" style="display: none" id="bjHint">您输入的编号已存在。</div>
                     </div>
                 </div>
-                <% if (ctx.session.sessionProject.page_show.openChangeApply) { %>
+                <% if (ctx.subProject.page_show.openChangeApply) { %>
                     <div class="form-group">
                         <label>关联变更申请</label>
                         <select class="form-control form-control-sm" id="apply-code">

app/view/change/relation.ejs

@@ -28,7 +28,7 @@
                     </thead>
                     <tbody>
                     <tbody>
-                    <% if (ctx.session.sessionProject.page_show.openChangeProject) { %>
+                    <% if (ctx.subProject.page_show.openChangeProject) { %>
                     <tr id="project">
                         <td class="text-center">变更立项</td>
                         <td><% if (changeProjectInfo) { %><%- changeProjectInfo.code %><% } %></td>
@@ -36,7 +36,7 @@
                         <td class="text-center"><% if (changeProjectInfo) { %><a target="_blank" href="/tender/<%- tender.id %>/change/project/<%- changeProjectInfo.id %>/information">查看详情</a><% } %></td>
                     </tr>
                     <% } %>
-                    <% if (ctx.session.sessionProject.page_show.openChangeApply) { %>
+                    <% if (ctx.subProject.page_show.openChangeApply) { %>
                     <tr id="apply">
                         <td class="text-center">变更申请</td>
                         <td><% if (changeApplyInfo) { %><%- changeApplyInfo.code %><% } %></td>
@@ -44,7 +44,7 @@
                         <td class="text-center"><% if (changeApplyInfo) { %><a target="_blank" href="/tender/<%- tender.id %>/change/apply/<%- changeApplyInfo.id %>/information">查看详情</a><% } %></td>
                     </tr>
                     <% } %>
-                    <% if (ctx.session.sessionProject.page_show.openChangePlan) { %>
+                    <% if (ctx.subProject.page_show.openChangePlan) { %>
                     <tr id="plan">
                         <td class="text-center">变更方案</td>
                         <td><% if (ctx.session.sessionUser.accountId === ctx.change.uid) { %><input id="plan_code" class="form-control form-control-sm" type="text" value="<% if (changePlanInfo) { %><%- changePlanInfo.code %><% } %>" data-name="plan_code" <% if (ctx.session.sessionUser.accountId !== change.uid) { %>readonly<% } %> placeholder="自动读取，没有就为空，可编辑"><% } else { %><% if (changePlanInfo) { %><%- changePlanInfo.code %><% } %><% } %></td>

app/view/dashboard/index.ejs

@@ -54,13 +54,13 @@
                                     <% if (auditChanges.length !== 0) { %>
                                     <option value="3">变更审批（<%- auditChanges.length %>）</option>
                                     <% } %>
-                                    <% if (ctx.session.sessionProject.page_show.openChangeProject && auditChangeProject.length !== 0) { %>
+                                    <% if (ctx.subProject.page_show.openChangeProject && auditChangeProject.length !== 0) { %>
                                         <option value="7">变更立项（<%- auditChangeProject.length %>）</option>
                                     <% } %>
-                                    <% if (ctx.session.sessionProject.page_show.openChangeApply && auditChangeApply.length !== 0) { %>
+                                    <% if (ctx.subProject.page_show.openChangeApply && auditChangeApply.length !== 0) { %>
                                         <option value="8">变更申请（<%- auditChangeApply.length %>）</option>
                                     <% } %>
-                                    <% if (ctx.session.sessionProject.page_show.openChangePlan && auditChangePlan.length !== 0) { %>
+                                    <% if (ctx.subProject.page_show.openChangePlan && auditChangePlan.length !== 0) { %>
                                         <option value="9">变更方案（<%- auditChangePlan.length %>）</option>
                                     <% } %>
                                     <% if (ctx.session.sessionProject.page_show.openMaterial && auditMaterial.length !== 0) { %>
@@ -392,13 +392,13 @@
                                     <option value="4">台账修订</option>
                                     <option value="2">计量审批</option>
                                     <option value="3">变更审批</option>
-                                    <% if (ctx.session.sessionProject.page_show.openChangeProject) { %>
+                                    <% if (ctx.subProject.page_show.openChangeProject) { %>
                                         <option value="7">变更立项</option>
                                     <% } %>
-                                    <% if (ctx.session.sessionProject.page_show.openChangeApply) { %>
+                                    <% if (ctx.subProject.page_show.openChangeApply) { %>
                                         <option value="8">变更申请</option>
                                     <% } %>
-                                    <% if (ctx.session.sessionProject.page_show.openChangePlan) { %>
+                                    <% if (ctx.subProject.page_show.openChangePlan) { %>
                                         <option value="9">变更方案</option>
                                     <% } %>
                                     <% if (ctx.session.sessionProject.page_show.openMaterial) { %>
@@ -483,7 +483,7 @@
                                                     <td class="<%- acChange.statusClass[notice.status]%>"><%- acChange.statusString[notice.status]%></td>
                                                     <td><%- notice.opinion ? notice.opinion : '' %></td>
                                                 </tr>
-                                            <% } else if(notice.type === pushType.changeProject && ctx.session.sessionProject.page_show.openChangeProject) { %>
+                                            <% } else if(notice.type === pushType.changeProject && ctx.subProject.page_show.openChangeProject) { %>
                                                 <tr data-type="7">
                                                     <td><span class="bg-new-changeProject text-new-changeProject badge text-width">变更立项</span></td>
                                                     <td><a href="/tender/<%- notice.tid %>"><%- notice.name %></a> <a href="/tender/<%- notice.tid %>/change/project/<%- notice.cpid %>/information"><%- notice.c_code %></a></td>
@@ -493,7 +493,7 @@
                                                     <td class="<%- acChangeProject.statusClass[notice.status] %>"><%- acChangeProject.statusString[notice.status] %></td>
                                                     <td><%- notice.opinion ? notice.opinion : '' %></td>
                                                 </tr>
-                                            <% } else if(notice.type === pushType.changeApply && ctx.session.sessionProject.page_show.openChangeApply) { %>
+                                            <% } else if(notice.type === pushType.changeApply && ctx.subProject.page_show.openChangeApply) { %>
                                                 <tr data-type="8">
                                                     <td><span class="bg-new-changeApply text-new-changeApply badge text-width">变更申请</span></td>
                                                     <td><a href="/tender/<%- notice.tid %>"><%- notice.name %></a> <a href="/tender/<%- notice.tid %>/change/apply/<%- notice.caid %>/information"><%- notice.c_code %></a></td>
@@ -503,7 +503,7 @@
                                                     <td class="<%- acChangeApply.statusClass[notice.status]%>"><%- acChangeApply.statusString[notice.status] %></td>
                                                     <td><%- notice.opinion ? notice.opinion : '' %></td>
                                                 </tr>
-                                            <% } else if(notice.type === pushType.changePlan && ctx.session.sessionProject.page_show.openChangePlan) { %>
+                                            <% } else if(notice.type === pushType.changePlan && ctx.subProject.page_show.openChangePlan) { %>
                                                 <tr data-type="9">
                                                     <td><span class="bg-new-changePlan text-new-changePlan badge text-width">变更方案</span></td>
                                                     <td><a href="/tender/<%- notice.tid %>"><%- notice.name %></a> <a href="/tender/<%- notice.tid %>/change/plan/<%- notice.cpid %>/information"><%- notice.c_code %></a></td>
@@ -655,13 +655,13 @@
             'rgba(251, 182, 45,'+ transparentCount +')',
             'rgba(82, 196, 26,'+ transparentCount +')',
             'rgba(22, 208, 208,'+ transparentCount +')',
-            <% if (ctx.session.sessionProject.page_show.openChangeProject) { %>
+            <% if (ctx.subProject.page_show.openChangeProject) { %>
             'rgba(51, 119, 255,'+ transparentCount +')',
             <% } %>
-            <% if (ctx.session.sessionProject.page_show.openChangeApply) { %>
+            <% if (ctx.subProject.page_show.openChangeApply) { %>
             'rgba(41, 58, 210,'+ transparentCount +')',
             <% } %>
-            <% if (ctx.session.sessionProject.page_show.openChangePlan) { %>
+            <% if (ctx.subProject.page_show.openChangePlan) { %>
             'rgba(114, 46, 209,'+ transparentCount +')',
             <% } %>
             <% if (ctx.session.sessionProject.page_show.openMaterial) { %>

app/view/material/exponent.ejs

@@ -21,7 +21,7 @@
                 <!--</div>-->
             </div>
             <div class="ml-auto">
-                <% if (ctx.session.sessionProject.page_show.openMaterialChecklist && material.order === material.highOrder) { %>
+                <% if (ctx.subProject.page_show.openMaterialChecklist && material.order === material.highOrder) { %>
                     <a href="/tender/<%- ctx.tender.id %>/measure/material/<%- material.highOrder %>/checklist" class="btn btn-sm btn-outline-primary">批量设置调差清单</a>
                 <% } %>
             </div>

app/view/material/file.ejs

@@ -38,7 +38,7 @@
           <!--</span>-->
         <!--</div>-->
       <div class="ml-auto">
-        <% if (ctx.session.sessionProject.page_show.openMaterialChecklist && material.order === material.highOrder) { %>
+        <% if (ctx.subProject.page_show.openMaterialChecklist && material.order === material.highOrder) { %>
           <a href="/tender/<%- ctx.tender.id %>/measure/material/<%- material.highOrder %>/checklist" class="btn btn-sm btn-outline-primary">批量设置调差清单</a>
         <% } %>
       </div>

app/view/material/info.ejs

@@ -36,7 +36,7 @@
                 </div>
             </div>
             <div class="ml-auto">
-                <% if (ctx.session.sessionProject.page_show.openMaterialChecklist && material.order === material.highOrder) { %>
+                <% if (ctx.subProject.page_show.openMaterialChecklist && material.order === material.highOrder) { %>
                     <a href="/tender/<%- ctx.tender.id %>/measure/material/<%- material.highOrder %>/checklist" class="btn btn-sm btn-outline-primary">批量设置调差清单</a>
                 <% } %>
             </div>
@@ -325,6 +325,6 @@
     const months = JSON.parse('<%- JSON.stringify(months) %>');
     let monthsList = JSON.parse('<%- JSON.stringify(monthsList) %>');
     const gljLists = JSON.parse(unescape('<%- escape(JSON.stringify(gljLists)) %>'));
-    const openMaterialChecklist = parseInt(<%- ctx.session.sessionProject.page_show.openMaterialChecklist %>);
+    const openMaterialChecklist = parseInt(<%- ctx.subProject.page_show.openMaterialChecklist %>);
     let materialListData2, materialChecklistData, notJoinList, ledger, curLedgerData, pos, curPosData, gclGatherData, gclList, selfList, gclGatherListData;
 </script>

app/view/material/list.ejs

@@ -20,7 +20,7 @@
                 </div>
             </div>
             <div class="ml-auto">
-                <% if (ctx.session.sessionProject.page_show.openMaterialChecklist && material.order === material.highOrder) { %>
+                <% if (ctx.subProject.page_show.openMaterialChecklist && material.order === material.highOrder) { %>
                     <a href="/tender/<%- ctx.tender.id %>/measure/material/<%- material.highOrder %>/checklist" class="btn btn-sm btn-outline-primary">批量设置调差清单</a>
                 <% } %>
             </div>
@@ -104,7 +104,7 @@
     const materialStageData = isStageSelf ? JSON.parse(unescape('<%- escape(JSON.stringify(materialStageData)) %>')) : [];
     const materialStageBillsData = isStageSelf ? JSON.parse(unescape('<%- escape(JSON.stringify(materialStageBillsData)) %>')) : [];
     const readOnly = <%- material.readOnly %>;
-    const openMaterialSelf = parseInt(<%- ctx.session.sessionProject.page_show.openMaterialSelf %>);
+    const openMaterialSelf = parseInt(<%- ctx.subProject.page_show.openMaterialSelf %>);
     const editListPermission = <%- material.editListPermission ? material.editListPermission : false %>;
     const stage_order = <%- material.order %>;
     const materialID = <%- material.id %>;
@@ -113,6 +113,6 @@
     const qtySourceValueConst = JSON.parse(unescape('<%- escape(JSON.stringify(qtySourceValueConst)) %>'));
     const materialIsNewQty = parseInt('<%- material.is_new_qty %>');
     const materialDecimal = JSON.parse(unescape('<%- escape(JSON.stringify(material.decimal)) %>'));
-    const openMaterialChecklist = parseInt(<%- ctx.session.sessionProject.page_show.openMaterialChecklist %>);
+    const openMaterialChecklist = parseInt(<%- ctx.subProject.page_show.openMaterialChecklist %>);
     let materialListData, materialChecklistData, notJoinList, notChangeList, ledger, curLedgerData, pos, curPosData, gclGatherData, gclList, selfList, gclGatherListData;
 </script>

app/view/report/index.ejs

@@ -95,7 +95,7 @@
                     <a class="btn btn-sm btn-light" href="/tender/<%- tender_id %>/change/apply/<%- bizId %>/information">申请详情</a>
                     <% } %>
                     <a class="btn btn-sm btn-light active" href="javascript:void(0);">输出报表</a>
-                    <% if (ctx.session.sessionProject.page_show.openChangePlan && [-300].includes(stg_id)) { %>
+                    <% if (ctx.subProject.page_show.openChangePlan && [-300].includes(stg_id)) { %>
                     <a class="btn btn-sm btn-light" href="/tender/<%- tender_id %>/change/<%- bizId %>/relation">关联数据</a>
                     <% } %>
                 </div>

app/view/stage/audit_btn.ejs

@@ -3,14 +3,14 @@
     <% if (ctx.session.sessionUser.accountId === ctx.stage.user_id) { %>
 
     <% if (ctx.stage.isCheckFirst) { %>
-    <% if (!ctx.session.sessionProject.page_show.openStageStart || (ctx.session.sessionProject.page_show.openStageStart && ctx.stage.startPermission)) { %>
+    <% if (!ctx.subProject.page_show.openStageStart || (ctx.subProject.page_show.openStageStart && ctx.stage.startPermission)) { %>
     <a id="sub-sp-btn" href="javascript: void(0);" data-toggle="modal" data-target="#sub-sp" class="btn btn-primary btn-sm btn-block">上报审批</a>
     <% } else { %>
     <a href="javascript:void(0);" data-toggle="tooltip" data-placement="right" class="btn btn-secondary btn-sm btn-block" data-original-title="不在上报时间范围内">上报审批</a>
     <% } %>
     <% } %>
 
-    <% if (ctx.session.sessionProject.page_show.openStageStart && ctx.stage.startPermission) { %><p class="text-warning text-center">截止:<%- ctx.stage.startEndDay %></p><% } %>
+    <% if (ctx.subProject.page_show.openStageStart && ctx.stage.startPermission) { %><p class="text-warning text-center">截止:<%- ctx.stage.startEndDay %></p><% } %>
     <% } else { %>
     <a id="sub-sp-btn" href="javascript: void(0);" data-toggle="modal" data-target="#sub-sp" class="btn btn-outline-secondary btn-sm btn-block">上报中</a>
     <% } %>
@@ -27,12 +27,12 @@
     <% } else if (ctx.stage.status === auditConst.status.checkNo) { %>
         <a href="#sp-list"  data-type="hide" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm btn-block text-muted sp-list-btn">审批退回</a>
         <% if (ctx.session.sessionUser.accountId === ctx.stage.user_id) { %>
-            <% if (!ctx.session.sessionProject.page_show.openStageStart || (ctx.session.sessionProject.page_show.openStageStart && ctx.stage.startPermission)) { %>
+            <% if (!ctx.subProject.page_show.openStageStart || (ctx.subProject.page_show.openStageStart && ctx.stage.startPermission)) { %>
             <a href="#sp-list" data-type="show" data-toggle="modal" data-target="#sp-list"  class="btn btn-primary btn-sm btn-block sp-list-btn">重新上报</a>
             <% } else { %>
             <a href="javascript:void(0);" data-toggle="tooltip" data-placement="right" class="btn btn-secondary btn-sm btn-block" data-original-title="不在上报时间范围内">重新上报</a>
             <% } %>
-            <% if (ctx.session.sessionProject.page_show.openStageStart && ctx.stage.startPermission) { %><p class="text-warning text-center">截止:<%- ctx.stage.startEndDay %></p><% } %>
+            <% if (ctx.subProject.page_show.openStageStart && ctx.stage.startPermission) { %><p class="text-warning text-center">截止:<%- ctx.stage.startEndDay %></p><% } %>
         <% } %>
     <% } else if (ctx.stage.status === auditConst.status.checkNoPre) { %>
         <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm btn-block text-muted">审批退回</a>

app/view/tender/tender_sub_menu.ejs

@@ -40,16 +40,16 @@
             <% } %>
         </div>
         <div class="nav-box">
-            <% if (!ctx.session.sessionProject.page_show.openChangeProject && !ctx.session.sessionProject.page_show.openChangeApply && !ctx.session.sessionProject.page_show.openChangePlan) { %>
+            <% if (!ctx.subProject.page_show.openChangeProject && !ctx.subProject.page_show.openChangeApply && !ctx.subProject.page_show.openChangePlan) { %>
             <ul class="nav-list list-unstyled">
                 <li <% if (ctx.url.indexOf('/tender/' + ctx.tender.id + '/change') !== -1) { %>class="active"<% } %>><a class="change_sort_link h3" href="/tender/<%- ctx.tender.id %>/change"><i class="fa fa-retweet fa-fw"></i> <span>工程变更</span></a></li>
             </ul>
             <% } else { %>
             <h3><i class="fa fa-retweet fa-fw"></i> 工程变更</h3>
             <ul class="nav-list list-unstyled sub-list">
-                <% if (ctx.session.sessionProject.page_show.openChangeProject) { %><li <% if (ctx.url.indexOf('/tender/' + ctx.tender.id + '/change/project') !== -1) { %>class="active"<% } %>><a class="change_project_sort_link" href="/tender/<%- ctx.tender.id %>/change/project"><span>变更立项</span></a></li><% } %>
-                    <% if (ctx.session.sessionProject.page_show.openChangeApply) { %><li <% if (ctx.url.indexOf('/tender/' + ctx.tender.id + '/change/apply') !== -1) { %>class="active"<% } %>><a class="change_apply_sort_link" href="/tender/<%- ctx.tender.id %>/change/apply"><span>变更申请</span></a></li><% } %>
-                    <% if (ctx.session.sessionProject.page_show.openChangePlan) { %><li <% if (ctx.url.indexOf('/tender/' + ctx.tender.id + '/change/plan') !== -1) { %>class="active"<% } %>><a class="change_plan_sort_link" href="/tender/<%- ctx.tender.id %>/change/plan"><span>变更方案</span></a></li><% } %>
+                <% if (ctx.subProject.page_show.openChangeProject) { %><li <% if (ctx.url.indexOf('/tender/' + ctx.tender.id + '/change/project') !== -1) { %>class="active"<% } %>><a class="change_project_sort_link" href="/tender/<%- ctx.tender.id %>/change/project"><span>变更立项</span></a></li><% } %>
+                    <% if (ctx.subProject.page_show.openChangeApply) { %><li <% if (ctx.url.indexOf('/tender/' + ctx.tender.id + '/change/apply') !== -1) { %>class="active"<% } %>><a class="change_apply_sort_link" href="/tender/<%- ctx.tender.id %>/change/apply"><span>变更申请</span></a></li><% } %>
+                    <% if (ctx.subProject.page_show.openChangePlan) { %><li <% if (ctx.url.indexOf('/tender/' + ctx.tender.id + '/change/plan') !== -1) { %>class="active"<% } %>><a class="change_plan_sort_link" href="/tender/<%- ctx.tender.id %>/change/plan"><span>变更方案</span></a></li><% } %>
                 <li <% if (ctx.url.indexOf('/tender/' + ctx.tender.id + '/change') !== -1 && ctx.url.indexOf('/tender/' + ctx.tender.id + '/change/project') === -1 && ctx.url.indexOf('/tender/' + ctx.tender.id + '/change/apply') === -1 &&  ctx.url.indexOf('/tender/' + ctx.tender.id + '/change/plan') === -1) { %>class="active"<% } %>><a class="change_sort_link" href="/tender/<%- ctx.tender.id %>/change"><span>变更令</span></a></li>
             </ul>
             <% } %>

app/view/tender/tender_sub_mini_menu.ejs

@@ -34,16 +34,16 @@
             </ul>
         </div>
         <div class="nav-box">
-            <% if (!ctx.session.sessionProject.page_show.openChangeProject && !ctx.session.sessionProject.page_show.openChangeApply && !ctx.session.sessionProject.page_show.openChangePlan) { %>
+            <% if (!ctx.subProject.page_show.openChangeProject && !ctx.subProject.page_show.openChangeApply && !ctx.subProject.page_show.openChangePlan) { %>
                 <ul class="nav-list list-unstyled">
                     <li <% if (ctx.url.indexOf('/tender/' + ctx.tender.id + '/change') !== -1) { %>class="active"<% } %>><a class="change_sort_link h3" href="/tender/<%- ctx.tender.id %>/change"><i class="fa fa-retweet fa-fw"></i> <span>工程变更</span></a></li>
                 </ul>
             <% } else { %>
                 <h3><i class="fa fa-retweet fa-fw"></i> 工程变更</h3>
                 <ul class="nav-list list-unstyled sub-list">
-                    <% if (ctx.session.sessionProject.page_show.openChangeProject) { %><li <% if (ctx.url.indexOf('/tender/' + ctx.tender.id + '/change/project') !== -1) { %>class="active"<% } %>><a class="change_project_sort_link" href="/tender/<%- ctx.tender.id %>/change/project"><span>变更立项</span></a></li><% } %>
-                    <% if (ctx.session.sessionProject.page_show.openChangeApply) { %><li <% if (ctx.url.indexOf('/tender/' + ctx.tender.id + '/change/apply') !== -1) { %>class="active"<% } %>><a class="change_apply_sort_link" href="/tender/<%- ctx.tender.id %>/change/apply"><span>变更申请</span></a></li><% } %>
-                    <% if (ctx.session.sessionProject.page_show.openChangePlan) { %><li <% if (ctx.url.indexOf('/tender/' + ctx.tender.id + '/change/plan') !== -1) { %>class="active"<% } %>><a class="change_plan_sort_link" href="/tender/<%- ctx.tender.id %>/change/plan"><span>变更方案</span></a></li><% } %>
+                    <% if (ctx.subProject.page_show.openChangeProject) { %><li <% if (ctx.url.indexOf('/tender/' + ctx.tender.id + '/change/project') !== -1) { %>class="active"<% } %>><a class="change_project_sort_link" href="/tender/<%- ctx.tender.id %>/change/project"><span>变更立项</span></a></li><% } %>
+                    <% if (ctx.subProject.page_show.openChangeApply) { %><li <% if (ctx.url.indexOf('/tender/' + ctx.tender.id + '/change/apply') !== -1) { %>class="active"<% } %>><a class="change_apply_sort_link" href="/tender/<%- ctx.tender.id %>/change/apply"><span>变更申请</span></a></li><% } %>
+                    <% if (ctx.subProject.page_show.openChangePlan) { %><li <% if (ctx.url.indexOf('/tender/' + ctx.tender.id + '/change/plan') !== -1) { %>class="active"<% } %>><a class="change_plan_sort_link" href="/tender/<%- ctx.tender.id %>/change/plan"><span>变更方案</span></a></li><% } %>
                     <li <% if (ctx.url.indexOf('/tender/' + ctx.tender.id + '/change') !== -1 && ctx.url.indexOf('/tender/' + ctx.tender.id + '/change/project') === -1 && ctx.url.indexOf('/tender/' + ctx.tender.id + '/change/apply') === -1 &&  ctx.url.indexOf('/tender/' + ctx.tender.id + '/change/plan') === -1) { %>class="active"<% } %>><a class="change_sort_link" href="/tender/<%- ctx.tender.id %>/change"><span>变更令</span></a></li>
                 </ul>
             <% } %>

app/view/wap/shenpi_change_index.ejs

@@ -42,17 +42,17 @@
     <!--标段概况-->
     <div class="py-6">
         <ul class="nav nav-tabs nav-fill">
-            <% if (ctx.session.sessionProject.page_show.openChangeProject) { %>
+            <% if (ctx.subProject.page_show.openChangeProject) { %>
                 <li class="nav-item">
                     <a class="px-1 nav-link" data-toggle="tab" href="#changeProject" role="tab">变更立项</a>
                 </li>
             <% } %>
-            <% if (ctx.session.sessionProject.page_show.openChangeApply) { %>
+            <% if (ctx.subProject.page_show.openChangeApply) { %>
                 <li class="nav-item">
                     <a class="px-1 nav-link" data-toggle="tab" href="#changeApply" role="tab">变更申请</a>
                 </li>
             <% } %>
-            <% if (ctx.session.sessionProject.page_show.openChangePlan) { %>
+            <% if (ctx.subProject.page_show.openChangePlan) { %>
                 <li class="nav-item">
                     <a class="px-1 nav-link" data-toggle="tab" href="#changePlan" role="tab">变更方案</a>
                 </li>
@@ -62,7 +62,7 @@
             </li>
         </ul>
         <div class="tab-content">
-            <% if (ctx.session.sessionProject.page_show.openChangeProject) { %>
+            <% if (ctx.subProject.page_show.openChangeProject) { %>
                 <div class="tab-pane" id="changeProject">
                     <dl class="mb-2 mt-3">
                     <% for (const c of changeProjects) { %>
@@ -110,7 +110,7 @@
                     </dl>
                 </div>
             <% } %>
-            <% if (ctx.session.sessionProject.page_show.openChangeApply) { %>
+            <% if (ctx.subProject.page_show.openChangeApply) { %>
                 <div class="tab-pane" id="changeApply">
                     <dl class="mb-2 mt-3">
                     <% for (const c of changeApplys) { %>
@@ -158,7 +158,7 @@
                     </dl>
                 </div>
             <% } %>
-            <% if (ctx.session.sessionProject.page_show.openChangePlan) { %>
+            <% if (ctx.subProject.page_show.openChangePlan) { %>
                 <div class="tab-pane" id="changePlan">
                     <dl class="mb-2 mt-3">
                     <% for (const c of changePlans) { %>
@@ -276,7 +276,7 @@
 <script src="/public/js/wap/global.js"></script>
 <script>
     $(document).ready(function () {
-        <% if (ctx.session.sessionProject.page_show.openChangeProject) { %>
+        <% if (ctx.subProject.page_show.openChangeProject) { %>
         if (window.location.hash && window.location.hash === '#changeProject') {
             $('#change').removeClass('active');
             $('.nav-item a[href="#change"]').removeClass('active');
@@ -285,7 +285,7 @@
             $('.nav-item a[href="#changeProject"]').addClass('active');
         }
         <% } %>
-        <% if (ctx.session.sessionProject.page_show.openChangeApply) { %>
+        <% if (ctx.subProject.page_show.openChangeApply) { %>
         if (window.location.hash && window.location.hash === '#changeApply') {
             $('#change').removeClass('active');
             $('.nav-item a[href="#change"]').removeClass('active');
@@ -294,7 +294,7 @@
             $('.nav-item a[href="#changeApply"]').addClass('active');
         }
         <% } %>
-        <% if (ctx.session.sessionProject.page_show.openChangePlan) { %>
+        <% if (ctx.subProject.page_show.openChangePlan) { %>
         if (window.location.hash && window.location.hash === '#changePlan') {
             $('#change').removeClass('active');
             $('.nav-item a[href="#change"]').removeClass('active');

app/view/wap/tender.ejs

@@ -208,21 +208,21 @@
                 </dl>
             </div>
             <div class="tab-pane" id="biangeng">
-                <% if (ctx.session.sessionProject.page_show.openChangeProject) { %>
+                <% if (ctx.subProject.page_show.openChangeProject) { %>
                 <div class="card my-3">
                     <div class="card-body">
                         <a href="/wap/tender/<%- tender.id %>/change#changeProject"><h5 class="card-title d-flex justify-content-between">变更立项</h5></a>
                     </div>
                 </div>
                 <% } %>
-                <% if (ctx.session.sessionProject.page_show.openChangeApply) { %>
+                <% if (ctx.subProject.page_show.openChangeApply) { %>
                     <div class="card my-3">
                         <div class="card-body">
                             <a href="/wap/tender/<%- tender.id %>/change#changeApply"><h5 class="card-title d-flex justify-content-between">变更申请</h5></a>
                         </div>
                     </div>
                 <% } %>
-                <% if (ctx.session.sessionProject.page_show.openChangePlan) { %>
+                <% if (ctx.subProject.page_show.openChangePlan) { %>
                     <div class="card my-3">
                         <div class="card-body">
                             <a href="/wap/tender/<%- tender.id %>/change#changePlan"><h5 class="card-title d-flex justify-content-between">变更方案</h5></a>