Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/controller/stage_controller.js

@@ -777,7 +777,7 @@ module.exports = app => {
                 const renderData = await this._getDefaultRenderData(ctx);
                 renderData.changeConst = changeConst;
                 renderData.jsFiles = this.app.jsFiles.common.concat(this.app.jsFiles.stage.change);
-                await this.layout('stage/change.ejs', renderData);
+                await this.layout('stage/change.ejs', renderData, 'stage/audit_modal.ejs');
             } catch (err) {
                 this.log(err);
                 ctx.redirect('/tender/' + ctx.tender.id + '/measure/stage');
@@ -804,6 +804,8 @@ module.exports = app => {
                 if (ctx.stage.status === auditConst.status.checking || ctx.stage.status === auditConst.status.checked) {
                     throw '当前不允许添加审核人';
                 }
+
+                ctx.stage.auditorList = await ctx.service.stageAudit.getAuditors(ctx.stage.id, ctx.stage.times);
                 // 检查审核人是否已存在
                 const exist = this.app._.find(ctx.stage.auditorList, {aid: id});
                 if (exist) {

app/view/measure/stage_modal.ejs

@@ -30,6 +30,7 @@
     </div>
 </div>
 <% } %>
+<% if (stages && stages.length >= 1) { %>
 <!--删除期-->
 <div class="modal fade" id="del-qi" data-backdrop="static">
     <div class="modal-dialog" role="document">
@@ -50,6 +51,7 @@
         </form>
     </div>
 </div>
+<% } %>
 <!--审批流程/结果-->
 <div class="modal fade" id="sp-list" data-backdrop="static">
     <div class="modal-dialog modal-lg" role="document">

config/web.js

@@ -203,6 +203,7 @@ const JsFiles = {
                     "/public/js/zh_calc.js",
                     "/public/js/path_tree.js",
                     "/public/js/stage_change.js",
+                    "/public/js/stage_audit.js",
                 ],
                 mergeFile: 'stage_change',
             },
@@ -219,6 +220,7 @@ const JsFiles = {
                     "/public/js/path_tree.js",
                     "/public/js/gcl_gather.js",
                     "/public/js/stage_gather.js",
+                    "/public/js/stage_audit.js",
                 ],
                 mergeFile: 'stage_gather',
             },
@@ -234,6 +236,7 @@ const JsFiles = {
                     "/public/js/zh_calc.js",
                     "/public/js/path_tree.js",
                     "/public/js/stage_compare.js",
+                    "/public/js/stage_audit.js",
                 ],
                 mergeFile: 'stage_compare',
             }