fix: 修复工作台和待办事项

app/controller/dashboard_controller.js

@@ -149,7 +149,7 @@ module.exports = app => {
                 noticeList.push(...ctx.helper.addKeyValue4ObjArray(spCostStageDuty, 'shenpi_type', 'costStageDuty'));
                 const spContracts = subProject.page_show.openContract ? ctx.helper._.filter(auditShenpiContracts, c => c.spid === subProject.id || c.tender_spid === subProject.id) : [];
                 noticeList.push(...ctx.helper.addKeyValue4ObjArray(spContracts, 'shenpi_type', 'contract'));
-                const spContractPays = (subProject.page_show.openContractTenderShenpi || subProject.page_show.openContractSubProjectShenpi) ? ctx.helper._.filter(auditShenpiContractPays, cp => cp.spid === subProject.id || cp.tender_spid === subProject.id) : [];
+                const spContractPays = (subProject.page_show.openContractPayTenderShenpi || subProject.page_show.openContractPaySubProjectShenpi) ? ctx.helper._.filter(auditShenpiContractPays, cp => cp.spid === subProject.id || cp.tender_spid === subProject.id) : [];
                 for (const pay of spContractPays) {
                     pay.shenpi_type = pay.contract_type === 2 ? 'contractReceipt' : 'contractPay';
                 }
@@ -387,7 +387,7 @@ module.exports = app => {
                             break;
                         case 'contractPay':
                         case 'contractReceipt':
-                            if (!sp.page_show.openContractTenderShenpi && !sp.page_show.openContractSubProjectShenpi) closeType = true;
+                            if (!sp.page_show.openContractPayTenderShenpi && !sp.page_show.openContractPaySubProjectShenpi) closeType = true;
                             calcTime = t.begin_time;
                             break;
                         default:
@@ -446,8 +446,8 @@ module.exports = app => {
             // 获取待审批的合同列表
             const auditContracts = ctx.subProject.page_show.openContract ? await ctx.service.contractSpAudit.getAuditContract(ctx.session.sessionUser.accountId, ctx.subProject.id) : [];
             // 获取待审批的合同支付（回款）列表
-            const auditContractPays = (ctx.subProject.page_show.openContractTenderShenpi || ctx.subProject.page_show.openContractSubProjectShenpi) ? await ctx.service.contractSpAudit.getAuditContractPay(ctx.session.sessionUser.accountId, ctx.subProject.id) : [];
-            
+            const auditContractPays = (ctx.subProject.page_show.openContractPayTenderShenpi || ctx.subProject.page_show.openContractPaySubProjectShenpi) ? await ctx.service.contractSpAudit.getAuditContractPay(ctx.session.sessionUser.accountId, ctx.subProject.id) : [];
+
             const pa = await ctx.service.projectAccount.getDataById(ctx.session.sessionUser.accountId);
             const noticeList = await ctx.service.noticePush.getNotice(ctx.session.sessionProject.id, pa.id, ctx.subProject.id);
             const projectData = await ctx.service.project.getDataById(ctx.session.sessionProject.id);