签约清单权限调整

app/controller/deal_bills_controller.js

@@ -60,9 +60,9 @@ module.exports = app => {
             const upPermision = this.ctx.session.sessionUser.permission
                 ? this.ctx.session.sessionUser.permission.tender.indexOf('3') >= 0
                 : false;
-            if (((tender.ledger_status === auditConst.status.uncheck || tender.ledger_status === auditConst.status) && !isUser) ||
-                (tender.ledger_status === auditConst.status.checking && !isAuditor) ||
-                !(tender.ledger_status === auditConst.status.checked && isAuditor && upPermision)) {
+            if (!(((tender.ledger_status === auditConst.status.uncheck || tender.ledger_status === auditConst.status.checkNo) && isUser) ||
+                (tender.ledger_status === auditConst.status.checking && isAuditor) ||
+                (tender.ledger_status === auditConst.status.checked && isAuditor && upPermision))) {
                 throw '您无权进行该操作';
             }
         }

app/controller/ledger_controller.js

@@ -63,9 +63,9 @@ module.exports = app => {
             const upPermission = this.ctx.session.sessionUser.permission
                 ? this.ctx.session.sessionUser.permission.tender.indexOf('3') >= 0
                 : false;
-            return !(((tender.ledger_status === auditConst.status.uncheck || tender.ledger_status === auditConst.status) && !isUser) ||
-                (tender.ledger_status === auditConst.status.checking && !isAuditor) ||
-                !(tender.ledger_status === auditConst.status.checked && isAuditor && upPermission));
+            return ((tender.ledger_status === auditConst.status.uncheck || tender.ledger_status === auditConst.status.checkNo) && isUser) ||
+                (tender.ledger_status === auditConst.status.checking && isAuditor) ||
+                (tender.ledger_status === auditConst.status.checked && isAuditor && upPermission);
         }
 
         /**
@@ -157,7 +157,7 @@ module.exports = app => {
                     jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.ledger.explode),
                     stdBills,
                     stdChapters,
-                    dealBillsPermission: this._canUpdateDealBills(tender.data, auditors)
+                    dealBillsPermission: this._canUpdateDealBills(tender.data, auditors.filter(x => {return x.audit_order > 0}))
                 };
                 if ((tender.data.ledger_status === auditConst.status.uncheck || tender.data.ledger_status === auditConst.status.checkNo) && tender.data.user_id === ctx.session.sessionUser.accountId) {
                     // renderData.accountGroup = accountGroup;
@@ -628,7 +628,6 @@ module.exports = app => {
                         fileName = path.join(this.app.baseDir, 'app', 'public', 'files', 'template', 'ledger', '导入分项清单EXCEL格式.xls');
                         ctx.body = await fs.readFileSync(fileName);
                     } else if (file === '台账分解.xlsx') {
-                        console.log(file);
                         const create_time = Date.parse(new Date()) / 1000;
                         fileName = this.app.baseDir + '/app/public/files/ledger' + ctx.tender.id + '-' + create_time + '.xlsx';
                         const exportor = new exportExcel.exportLedger2Excel(ctx);