Ver código fonte

资金监管功能测试修复

ellisran 3 meses atrás
pai
commit
f831b5ecf6

+ 1 - 1
app/middleware/financial_check.js

@@ -26,7 +26,7 @@ module.exports = options => {
             if (!this.subProject) {
                 throw '项目不存在';
             }
-            if (!this.subProject.page_show.openFinancial) {
+            if (!this.session.sessionProject.page_show.openFinancial) {
                 throw '该功能已关闭或无法查看';
             }
             // const spid = this.params.spid;

+ 1 - 1
app/middleware/financial_pay_check.js

@@ -25,7 +25,7 @@ module.exports = options => {
     return function* financialPayCheck(next) {
         try {
             if (!this.subProject) throw '项目不存在';
-            if (!this.subProject.page_show.openFinancial) {
+            if (!this.session.sessionProject.page_show.openFinancial) {
                 throw '该功能已关闭或无法查看';
             }
             const fpid = this.params.fpid;

+ 4 - 2
app/service/financial_pay_tender_audit.js

@@ -196,12 +196,14 @@ module.exports = app => {
                         fAudit.fund_pay_permission = fAudit.fund_pay_permission ? this._.map(fAudit.fund_pay_permission.split(','), this._.toInteger) : [];
                         const financialPermission = await this.ctx.service.subProjPermission.getFinancailPermission(fAudit.fund_trans_permission, fAudit.fund_pay_permission);
                         if (!financialPermission.pay_show) {
+                            fAudit.fund_pay_permission.push(1);
                             const upPermission = {
                                 id: fAudit.id,
-                                fund_pay_permission: fAudit.fund_pay_permission.push(1).join(','),
+                                fund_pay_permission: fAudit.fund_pay_permission.join(','),
                             };
                             if (!financialPermission.transfer_show) {
-                                upPermission.fund_tran_permission = fAudit.fund_trans_permission.push(1).join(',');
+                                fAudit.fund_trans_permission.push(1);
+                                upPermission.fund_tran_permission = fAudit.fund_trans_permission.join(',');
                             }
                             await transaction.update(this.ctx.service.subProjPermission.tableName, upPermission);
                         }

+ 1 - 1
app/view/sp_setting/user_modal.ejs

@@ -33,7 +33,7 @@
             <div class="modal-header">
                 <h5 class="modal-title">编辑权限</h5>
             </div>
-            <div class="modal-body">
+            <div class="modal-body" style="max-height: 800px;overflow: auto;">
                 <% for (const pb of permissionBlock) { %>
                 <div class="card mb-2">
                     <h6 class="card-header">