Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/lib/rm/material.js

@@ -352,6 +352,10 @@ class rptMemChange extends RptMemBase {
                 return this.getMaterialStage(fields);
             case 'mem_material_exponent':
                 return this.getMaterialExponent(fields);
+            case 'mem_material_exponent_node':
+                return this.ctx.service.materialExponentNode.getAllDataByCondition({ where: { mid: this.ctx.material.id } });
+            case 'mem_material_exponent_shard':
+                return this.ctx.service.materialExponentShard.getAllDataByCondition({ where: { mid: this.ctx.material.id } });
             default:
                 return [];
         }

app/middleware/contract_check.js

@@ -23,7 +23,7 @@ module.exports = options => {
      */
     return function* contractCheck(next) {
         try {
-            if (!this.subProject.page_show.openContract) {
+            if (!this.subProject.page_show.openContract && !this.subProject.page_show.openTenderContract) {
                 throw '该功能已关闭或无法查看';
             }
             const tid = this.params.tid || null;