把弹层html移出layout

web/users/css/style.css

@@ -48,7 +48,7 @@ body{
 .header {
   background:#f4f5f5;
   position: fixed;
-  z-index: 10;
+  z-index: 500;
   width: 100%;
   height: 50px;
   top: 0;
@@ -57,7 +57,6 @@ body{
 }
 .main{
   position: relative;
-  z-index: 4;
 }
 .main-nav {
   position: fixed;

web/users/views/compilation/add.html

@@ -101,4 +101,5 @@
     let billList = '<%- billList %>';
     let rationList = '<%- rationList %>';
 </script>
-<script type="text/javascript" src="/web/users/js/compilation.js"></script>
+<script type="text/javascript" src="/web/users/js/compilation.js"></script>
+<%include ../compilation/modal.html %>

web/users/views/compilation/index.html

@@ -101,4 +101,5 @@
         <% } %>
 	</div>
 </div>
-<script type="text/javascript" src="/web/users/js/compilation.js"></script>
+<script type="text/javascript" src="/web/users/js/compilation.js"></script>
+<%include ../compilation/modal.html %>

web/users/views/layout/layout.html

@@ -55,48 +55,4 @@
         <%- body %>
     </div>
 </div>
-<div class="modal fade" id="edit-account" tabindex="-1" role="dialog">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title">编辑账号</h4>
-            </div>
-            <div class="modal-body">
-                <div class="form-group">
-                    <label>权限</label>
-                    <div class="checkbox">
-                        <label>
-                            <input type="checkbox" name="permission[]" data-permission="manager"> 用户管理
-                        </label>&nbsp;
-                        <label>
-                            <input type="checkbox" name="permission[]" data-permission="notify"> 通知管理
-                        </label>&nbsp;
-                        <label>
-                            <input type="checkbox" name="permission[]" data-permission="stdBillsmain"> 清单规则编辑器
-                        </label>&nbsp;
-                        <label>
-                            <input type="checkbox" name="permission[]" data-permission="rationRepository"> 定额编辑器
-                        </label>&nbsp;
-                        <label>
-                            <input type="checkbox" name="permission[]" data-permission="report"> 报表模板
-                        </label>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label>禁止登录</label>
-                    <div class="checkbox">
-                        <label>
-                            <input type="checkbox" name="can_login"> 是
-                        </label>
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" id="save-manager">确定</button>
-            </div>
-        </div>
-    </div>
-</div>
-<%include ../compilation/modal.html %>
 </body>

web/users/views/manager/index.html

@@ -53,4 +53,47 @@
         </div>
     </div>
 </div>
-<script type="text/javascript" src="/web/users/js/manager.js"></script>
+<script type="text/javascript" src="/web/users/js/manager.js"></script>
+<div class="modal fade" id="edit-account" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title">编辑账号</h4>
+            </div>
+            <div class="modal-body">
+                <div class="form-group">
+                    <label>权限</label>
+                    <div class="checkbox">
+                        <label>
+                            <input type="checkbox" name="permission[]" data-permission="manager"> 用户管理
+                        </label>&nbsp;
+                        <label>
+                            <input type="checkbox" name="permission[]" data-permission="notify"> 通知管理
+                        </label>&nbsp;
+                        <label>
+                            <input type="checkbox" name="permission[]" data-permission="stdBillsmain"> 清单规则编辑器
+                        </label>&nbsp;
+                        <label>
+                            <input type="checkbox" name="permission[]" data-permission="rationRepository"> 定额编辑器
+                        </label>&nbsp;
+                        <label>
+                            <input type="checkbox" name="permission[]" data-permission="report"> 报表模板
+                        </label>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label>禁止登录</label>
+                    <div class="checkbox">
+                        <label>
+                            <input type="checkbox" name="can_login"> 是
+                        </label>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" id="save-manager">确定</button>
+            </div>
+        </div>
+    </div>
+</div>