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

Conflicts:
	app/service/cost_stage_book.js

app/controller/cost_controller.js

@@ -1025,6 +1025,7 @@ module.exports = app => {
 
         async gather(ctx) {
             try {
+                await this.checkDutyRela(ctx);
                 const ledgerStages = await this.getTypeStages(ctx, 'ledger', 'ASC');
                 const renderData = {
                     ledgerStages,

app/public/js/cost_gather.js

@@ -79,7 +79,7 @@ $(document).ready(() => {
                     this.tree.nodes.forEach(x => { x[col.field] = 0; });
                 }
                 for (const s of gp.stages) {
-                    for (b of s.detail.bills) {
+                    for (const b of s.detail.bills) {
                         const node = this.tree.nodes.find(x => { return x.cost_id === b.cost_id; });
                         if (!node) continue;
                         for (const lf of loadFields) {
@@ -183,4 +183,4 @@ $(document).ready(() => {
             ledgerGatherSpread.refresh();
         }
     });
-});
+});

app/public/js/cost_stage_duty.js

@@ -431,7 +431,7 @@ $(document).ready(function() {
             const profit = ZhCalc.sub(in_tp, out_tp);
             const profit_rate = in_tp ? ZhCalc.mul(ZhCalc.div(profit, in_tp), 100, 2) : 0;
             html.push(`<tr><td>项目收入</td><td><input type="number" class="form-control form-control-sm nospin" name="in_tp" value="${in_tp}" ${readOnly ? 'readOnly' : ''}></td></tr>`);
-            html.push(`<tr><td>项目支出</td><td>${out_tp}</td></tr>`);
+            html.push(`<tr><td>项目支出</td><td>${out_tp || 0}</td></tr>`);
             html.push(`<tr><td>利润</td><td>${profit}</td></tr>`);
             html.push(`<tr><td>利润率</td><td>${profit_rate}</td></tr>`);
             $('#duty-extra').html(html.join(''));
@@ -547,4 +547,4 @@ $(document).ready(function() {
             }, 100);
         });
     })('a[name=showLevel]', billsObj.sheet);
-});
+});

app/router.js

@@ -576,7 +576,7 @@ module.exports = app => {
     app.post('/sp/:id/cost/tender/:tid/:stype/:sorder/file/upload', sessionAuth, subProjectCheck, tenderCheck, tenderPermissionCheck, costStageCheck, 'costController.uploadStageFile');
     app.post('/sp/:id/cost/tender/:tid/:stype/:sorder/file/delete', sessionAuth, subProjectCheck, tenderCheck, tenderPermissionCheck, costStageCheck, 'costController.deleteStageFile');
     app.post('/sp/:id/cost/tender/:tid/:stype/:sorder/stage/tag', sessionAuth, subProjectCheck, tenderCheck, tenderPermissionCheck, costStageCheck, 'costController.tag');
-    app.get('/sp/:id/cost/tender/:tid/flow', sessionAuth, subProjectCheck, tenderCheck, projectManagerCheck, 'tenderController.shenpiSet');
+    app.get('/sp/:id/cost/tender/:tid/flow', sessionAuth, subProjectCheck, tenderCheck, tenderPermissionCheck, projectManagerCheck, 'tenderController.shenpiSet');
     app.post('/sp/:id/cost/tender/:tid/:stype/:sorder/audit/add', sessionAuth, subProjectCheck, tenderCheck, tenderPermissionCheck, costStageCheck, 'costController.addStageAudit');
     app.post('/sp/:id/cost/tender/:tid/:stype/:sorder/audit/delete', sessionAuth, subProjectCheck, tenderCheck, tenderPermissionCheck, costStageCheck, 'costController.deleteStageAudit');
     app.post('/sp/:id/cost/tender/:tid/:stype/:sorder/audit/start', sessionAuth, subProjectCheck, tenderCheck, tenderPermissionCheck, costStageCheck, 'costController.stageAuditStart');

app/view/safe/inspection_information.ejs

@@ -5,7 +5,7 @@
             <% include ./sub_mini_menu.ejs %>
             <div>
                 <div class="d-inline-block">
-                    质量巡检
+                    安全巡检
                 </div>
             </div>
             <div class="ml-auto">