Browse Source

报表归档,弹窗调整

MaiXinRong 3 years ago
parent
commit
0c05f54e71

+ 1 - 1
app/controller/report_archive_controller.js

@@ -148,7 +148,7 @@ module.exports = app => {
             if (stage_id === -1) {
                 await this.layout('report/index_archive.ejs', renderData, 'report/archive_popup.ejs');
             } else {
-                await this.layout('report/index_archive.ejs', renderData, 'stage/audit_modal.ejs');
+                await this.layout('report/index_archive.ejs', renderData, 'report/stage_archive_modal.ejs');
             }
         }
 

+ 20 - 0
app/view/report/stage_archive_modal.ejs

@@ -0,0 +1,20 @@
+<% if(ctx.session.sessionUser.is_admin) { %>
+<!--删除归档报表 因归档页面要引用这个界面,layout没法再多render一个ejs,只能在这加了-->
+<div class="modal fade" id="del-archive" data-backdrop="static">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">删除归档报表</h5>
+            </div>
+            <div class="modal-body" id="disp_archive_info_body">
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">取消</button>
+                <button type="button" class="btn btn-sm btn-danger" data-dismiss="modal" id="delete_file">确定删除</button>
+            </div>
+        </div>
+    </div>
+</div>
+<% } %>
+
+<% include ../stage/audit_modal.ejs %>

+ 0 - 18
app/view/stage/audit_modal.ejs

@@ -802,24 +802,6 @@
 <% } %>
 <% } %>
 
-<% if(ctx.session.sessionUser.is_admin) { %>
-  <!--删除归档报表 因归档页面要引用这个界面,layout没法再多render一个ejs,只能在这加了-->
-  <div class="modal fade" id="del-archive" data-backdrop="static">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title">删除归档报表</h5>
-            </div>
-            <div class="modal-body" id="disp_archive_info_body">
-            </div>
-            <div class="modal-footer">
-              <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">取消</button>
-              <button type="button" class="btn btn-sm btn-danger" data-dismiss="modal" id="delete_file">确定删除</button>
-            </div>
-        </div>
-    </div>
-  </div>
-<% } %>
 
 <% include ../shares/check_data_modal.ejs %>
 <script type="text/javascript">