Browse Source

资金bug修复

ellisran 7 months atrás
parent
commit
142b034b77
3 changed files with 6 additions and 6 deletions
  1. 2 2
      app/middleware/financial_pay_audit_check.js
  2. 3 3
      app/router.js
  3. 1 1
      app/view/financial/summary.ejs

+ 2 - 2
app/middleware/financial_pay_audit_check.js

@@ -8,7 +8,7 @@
  * @version
  */
 
-const status = require('../const/audit').changeApply.status;
+const status = require('../const/audit').financial.status;
 const shenpiConst = require('../const/shenpi');
 const _ = require('lodash');
 
@@ -36,7 +36,7 @@ module.exports = options => {
                 this.financialPay = financialPay;
             }
             const financialPay = this.financialPay;
-            if ((financialPay.status === status.uncheck || financialPay.status === status.checkNo)) {
+            if (financialPay.status === status.uncheck || financialPay.status === status.checkNo) {
                 // 进一步比较审批流是否与审批流程设置的相同,不同则替换为固定审批流或固定的终审
                 const auditList = yield this.service.financialPayAudit.getAllDataByCondition({ where: { fpid: financialPay.id, times: financialPay.times }, orders: [['order', 'asc']] });
                 const condition = { tid: financialPay.tid, sp_type: shenpiConst.sp_other_type.financial, sp_status: shenpiConst.sp_status.gdspl };

+ 3 - 3
app/router.js

@@ -972,9 +972,9 @@ module.exports = app => {
     app.post('/financial/:spid/pay/save', sessionAuth, financialCheck, 'financialController.paySave');
     app.get('/financial/:spid/pay/:fpid/detail', sessionAuth, financialCheck, financialPayCheck, financialPayAuditCheck, 'financialController.payDetail');
     app.post('/financial/:spid/pay/:fpid/save', sessionAuth, financialCheck, financialPayCheck, 'financialController.payDetailSave');
-    app.post('/financial/:spid/pay/:fpid/file/upload', sessionAuth, financialCheck, financialPayCheck, financialPayAuditCheck, 'financialController.payUploadFile');
-    app.post('/financial/:spid/pay/:fpid/file/delete', sessionAuth, financialCheck, financialPayCheck, financialPayAuditCheck, 'financialController.payDeleteFile');
-    app.get('/financial/:spid/pay/:fpid/file/:fid/download', sessionAuth, financialCheck, financialPayCheck, financialPayAuditCheck, 'financialController.payDownloadFile');
+    app.post('/financial/:spid/pay/:fpid/file/upload', sessionAuth, financialCheck, financialPayCheck, 'financialController.payUploadFile');
+    app.post('/financial/:spid/pay/:fpid/file/delete', sessionAuth, financialCheck, financialPayCheck, 'financialController.payDeleteFile');
+    app.get('/financial/:spid/pay/:fpid/file/:fid/download', sessionAuth, financialCheck, financialPayCheck, 'financialController.payDownloadFile');
     app.post('/financial/:spid/pay/:fpid/audit/start', sessionAuth, financialCheck, financialPayCheck, financialPayAuditCheck, 'financialController.startPayAudit');
     app.post('/financial/:spid/pay/:fpid/audit/check', sessionAuth, financialCheck, financialPayCheck, 'financialController.checkPayAudit');
     app.get('/financial/:spid/summary', sessionAuth, financialCheck, 'financialController.summary');

+ 1 - 1
app/view/financial/summary.ejs

@@ -5,7 +5,7 @@
         <div class="title-main  d-flex">
             <% include ./sub_mini_menu.ejs %>
             <div class="col-12 pl-0">
-                <div class="d-inline-block mr-2 col-sm-5">
+                <div class="d-inline-block mr-2 col-sm-3">
                     <div class="input-group input-group-sm pr-1">
                         <select class="form-control form-control-sm" multiple id="tender-select">
                             <option value="0" selected>全部</option>