后台工具主页宽度调整

web/maintain/basic_info_lib/html/main.html

@@ -2,22 +2,34 @@
     <div class="content">
         <div class="container-fluid">
             <div class="row">
-                <div class="col-md-5">
+                <div class="col-md-8">
                     <div class="warp-p2 mt-3">
                         <table class="table table-hover table-bordered">
-                            <thead><tr><th >库名称</th><th width="160">添加时间</th><th width="70">操作</th></tr></thead>
+                            <thead>
+                                <tr>
+                                    <th>库名称</th>
+                                    <th width="160">添加时间</th>
+                                    <th width="70">操作</th>
+                                </tr>
+                            </thead>
                             <tbody id="showArea">
-                            <% for(let lib of basicInfoLibs){ %>
-                            <tr class="libTr">
-                                <td id="<%= lib.ID%>"><a href="/basicInfo/edit/<%= lib.ID%>?locked=true"><%= lib.name%></a></td>
-                                <td><%= moment(lib.createDate).format('YYYY-MM-DD')%></td>
-                                <td>
-                                    <a class="lock-btn-control disabled" href="javascript:void(0);" style="color: #0275d8" onclick='getBasicInfoLib("<%= lib.ID%>")' title="编辑"><i class="fa fa-pencil-square-o"></i></a>
-                                    <a class="text-danger lock-btn-control disabled" href="javascript:void(0);" style="color: #0275d8" onclick='showDeleteModal("<%= lib.ID%>")' title="删除"><i class="fa fa-remove"></i></a>
-                                    <a class="lock" data-locked="true" href="javascript:void(0);" title="解锁"><i class="fa fa-unlock-alt"></i></a>
-                                </td>
-                            </tr>
-                            <% } %>
+                                <% for(let lib of basicInfoLibs){ %>
+                                <tr class="libTr">
+                                    <td id="<%= lib.ID%>"><a
+                                            href="/basicInfo/edit/<%= lib.ID%>?locked=true"><%= lib.name%></a></td>
+                                    <td><%= moment(lib.createDate).format('YYYY-MM-DD')%></td>
+                                    <td>
+                                        <a class="lock-btn-control disabled" href="javascript:void(0);"
+                                            style="color: #0275d8" onclick='getBasicInfoLib("<%= lib.ID%>")'
+                                            title="编辑"><i class="fa fa-pencil-square-o"></i></a>
+                                        <a class="text-danger lock-btn-control disabled" href="javascript:void(0);"
+                                            style="color: #0275d8" onclick='showDeleteModal("<%= lib.ID%>")'
+                                            title="删除"><i class="fa fa-remove"></i></a>
+                                        <a class="lock" data-locked="true" href="javascript:void(0);" title="解锁"><i
+                                                class="fa fa-unlock-alt"></i></a>
+                                    </td>
+                                </tr>
+                                <% } %>
                             </tbody>
                         </table>
                     </div>
@@ -38,17 +50,18 @@
                 </button>
             </div>
             <div class="modal-body">
-                <form id="addLibForm" method="post" action="/basicInfo/addLib" enctype="application/x-www-form-urlencoded21">
+                <form id="addLibForm" method="post" action="/basicInfo/addLib"
+                    enctype="application/x-www-form-urlencoded21">
                     <div class="form-group">
                         <label>库名称</label>
                         <input id="name" name="name" class="form-control" placeholder="请输入基本信息库名称" type="text">
                         <small class="form-text text-danger" id="nameError" style="display: none">请输入基本信息库名称。</small>
                     </div>
-                    <input type="hidden" name = "userAccount" value="<%= userAccount%>">
+                    <input type="hidden" name="userAccount" value="<%= userAccount%>">
                 </form>
             </div>
             <div class="modal-footer">
-                <button id="addLibs"  class="btn btn-primary">新建</button>
+                <button id="addLibs" class="btn btn-primary">新建</button>
                 <button type="button" id="cancelBtn" class="btn btn-secondary" data-dismiss="modal">取消</button>
             </div>
         </div>
@@ -76,7 +89,7 @@
                 </form>
             </div>
             <div class="modal-footer">
-                <a id="rename" href="javascript: void(0);" class="btn btn-primary" >确定</a>
+                <a id="rename" href="javascript: void(0);" class="btn btn-primary">确定</a>
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
             </div>
         </div>
@@ -99,7 +112,7 @@
                 <input type="hidden" id="delCount">
             </div>
             <div class="modal-footer">
-                <a id="delete" href="javascript:void(0);" class="btn btn-danger" >确认</a>
+                <a id="delete" href="javascript:void(0);" class="btn btn-danger">确认</a>
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
             </div>
         </div>
@@ -107,4 +120,4 @@
 </div>
 
 <script src="/public/web/lock_util.js"></script>
-<script type="text/javascript" src="/web/maintain/basic_info_lib/js/basic_info.js"></script>
+<script type="text/javascript" src="/web/maintain/basic_info_lib/js/basic_info.js"></script>

web/maintain/bill_template_lib/html/main.html

@@ -16,7 +16,7 @@
                         <% }} %>
                     </div>
                 </div>
-                <div class="col-md-8">
+                <div class="col-md-10">
                     <div class="warp-p2 mt-3">
                         <table class="table table-hover table-bordered">
                             <thead>

web/maintain/billsGuidance_lib/html/main.html

@@ -1,163 +1,184 @@
 <!DOCTYPE html>
 <html lang="zh-CN">
+
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>清单指引编辑器</title>
-    <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
-    <link rel="stylesheet" href="/web/maintain/billsGuidance_lib/css/main.css">
-    <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <meta http-equiv="x-ua-compatible" content="ie=edge">
+  <title>清单指引编辑器</title>
+  <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
+  <link rel="stylesheet" href="/web/maintain/billsGuidance_lib/css/main.css">
+  <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
 </head>
 
 <body>
-    <div class="header">
-        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 ">
-            <span class="header-logo px-2">清单指引编辑器</span>
-            <div class="navbar-text"></div>
-        </nav>
-        <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
-          <ul class="nav navbar-nav px-1">
-              <li class="nav-item">
-                  <a class="nav-link" href="javacript:void(0);" aria-haspopup="true" aria-expanded="false" data-toggle="modal" data-target="#add">新建清单指引库</a>
-              </li>
-          </ul>
-        </nav>
-    </div>
-    <div class="main">
-        <div class="content">
-            <div class="container-fluid">
-                <div class="row">
-                  <div class="col-md-8">
-                    <div class="warp-p2 mt-3">
-                      <table class="table table-hover table-bordered">
-                        <thead><tr><th>清单指引名称</th><th>编办</th><th>清单规则</th><th>类型</th><th width="160">添加时间</th><th width="70">操作</th></tr></thead>
-                        <tbody>
-                        </tbody>
-                      </table>
-                    </div>
-                  </div>
-                </div>
+  <div class="header">
+    <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 ">
+      <span class="header-logo px-2">清单指引编辑器</span>
+      <div class="navbar-text"></div>
+    </nav>
+    <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
+      <ul class="nav navbar-nav px-1">
+        <li class="nav-item">
+          <a class="nav-link" href="javacript:void(0);" aria-haspopup="true" aria-expanded="false" data-toggle="modal"
+            data-target="#add">新建清单指引库</a>
+        </li>
+      </ul>
+    </nav>
+  </div>
+  <div class="main">
+    <div class="content">
+      <div class="container-fluid">
+        <div class="row">
+          <div class="col-md-10">
+            <div class="warp-p2 mt-3">
+              <table class="table table-hover table-bordered">
+                <thead>
+                  <tr>
+                    <th>清单指引名称</th>
+                    <th width="160">编办</th>
+                    <th width="300">清单规则</th>
+                    <th width="100">类型</th>
+                    <th width="160">添加时间</th>
+                    <th width="70">操作</th>
+                  </tr>
+                </thead>
+                <tbody>
+                </tbody>
+              </table>
             </div>
+          </div>
         </div>
+      </div>
     </div>
-    <!--弹出添加-->
-    <div class="modal fade" id="add" data-backdrop="static" style="display: none;" aria-hidden="true">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                  <h5 class="modal-title">添加清单指引</h5>
-                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">×</span>
-                  </button>
-                </div>
-                <div class="modal-body">
-                  <form>
-                    <div class="form-group">
-                      <label>清单指引名称</label>
-                      <input id="createName" class="form-control" placeholder="输入清单指引名称" type="text">
-                    </div>
-                    <div class="form-group">
-                      <label>编办</label>
-                      <select id="comSels" class="form-control"><option>重庆2018</option></select>
-                    </div>
-                    <div class="form-group">
-                      <label>清单规则</label>
-                      <select id="billsLibSels" class="form-control"><option>重庆清单规则-2013</option></select>
-                    </div>
-                      <div class="form-group">
-                          <label>类型</label>
-                          <div>
-                              <div class="form-check form-check-inline">
-                                  <label class="form-check-label">
-                                      <input class="form-check-input" type="radio" checked name="inlineRadioOptions" id="inlineRadio1" value="1"> 清单指引
-                                  </label>
-                              </div>
-                              <div class="form-check form-check-inline">
-                                  <label class="form-check-label">
-                                      <input class="form-check-input" type="radio" name="inlineRadioOptions" id="inlineRadio2" value="2"> 清单精灵
-                                  </label>
-                              </div>
-                          </div>
-                      </div>
-                  </form>
+  </div>
+  <!--弹出添加-->
+  <div class="modal fade" id="add" data-backdrop="static" style="display: none;" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h5 class="modal-title">添加清单指引</h5>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">×</span>
+          </button>
+        </div>
+        <div class="modal-body">
+          <form>
+            <div class="form-group">
+              <label>清单指引名称</label>
+              <input id="createName" class="form-control" placeholder="输入清单指引名称" type="text">
+            </div>
+            <div class="form-group">
+              <label>编办</label>
+              <select id="comSels" class="form-control">
+                <option>重庆2018</option>
+              </select>
+            </div>
+            <div class="form-group">
+              <label>清单规则</label>
+              <select id="billsLibSels" class="form-control">
+                <option>重庆清单规则-2013</option>
+              </select>
+            </div>
+            <div class="form-group">
+              <label>类型</label>
+              <div>
+                <div class="form-check form-check-inline">
+                  <label class="form-check-label">
+                    <input class="form-check-input" type="radio" checked name="inlineRadioOptions" id="inlineRadio1"
+                      value="1"> 清单指引
+                  </label>
                 </div>
-                <div class="modal-footer">
-                    <a href="javascript:void(0);" id="addY" class="btn btn-primary">确定</a>
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                <div class="form-check form-check-inline">
+                  <label class="form-check-label">
+                    <input class="form-check-input" type="radio" name="inlineRadioOptions" id="inlineRadio2" value="2">
+                    清单精灵
+                  </label>
                 </div>
+              </div>
             </div>
+          </form>
+        </div>
+        <div class="modal-footer">
+          <a href="javascript:void(0);" id="addY" class="btn btn-primary">确定</a>
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
         </div>
+      </div>
     </div>
-    <!--弹出编辑-->
-    <div class="modal fade" id="edit" data-backdrop="static" style="display: none;" aria-hidden="true">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                  <h5 class="modal-title">编辑清单指引</h5>
-                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">×</span>
-                  </button>
-                </div>
-                <div class="modal-body">
-                  <form>
-                    <div class="form-group">
-                      <label>清单指引名称</label>
-                      <input id="edName" class="form-control" placeholder="输入清单指引名称" type="text" value="XXX清单指引">
-                    </div>
-                    <div class="form-group">
-                      <label>编办</label>
-                      <select id="edComSels" class="form-control" disabled><option>重庆2018</option></select>
-                    </div>
-                    <div class="form-group">
-                      <label>清单规则</label>
-                      <select id="edBillsLibSels" class="form-control" disabled><option>重庆清单规则-2013</option></select>
-                    </div>
-                  </form>
-                </div>
-                <div class="modal-footer">
-                    <a href="javascript:void(0);" id="editY" class="btn btn-primary">确定</a>
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                </div>
+  </div>
+  <!--弹出编辑-->
+  <div class="modal fade" id="edit" data-backdrop="static" style="display: none;" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h5 class="modal-title">编辑清单指引</h5>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">×</span>
+          </button>
+        </div>
+        <div class="modal-body">
+          <form>
+            <div class="form-group">
+              <label>清单指引名称</label>
+              <input id="edName" class="form-control" placeholder="输入清单指引名称" type="text" value="XXX清单指引">
+            </div>
+            <div class="form-group">
+              <label>编办</label>
+              <select id="edComSels" class="form-control" disabled>
+                <option>重庆2018</option>
+              </select>
             </div>
+            <div class="form-group">
+              <label>清单规则</label>
+              <select id="edBillsLibSels" class="form-control" disabled>
+                <option>重庆清单规则-2013</option>
+              </select>
+            </div>
+          </form>
+        </div>
+        <div class="modal-footer">
+          <a href="javascript:void(0);" id="editY" class="btn btn-primary">确定</a>
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
         </div>
+      </div>
     </div>
+  </div>
 
-    <!--弹出删除-->
-    <div class="modal fade" id="del" data-backdrop="static" style="display: none;" aria-hidden="true">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                  <h5 class="modal-title">删除确认</h5>
-                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">×</span>
-                  </button>
-                </div>
-                <div class="modal-body">
-                    <h5 class="text-danger">删除后无法恢复，确认是否删除？</h5>
-                </div>
-                <div class="modal-footer">
-                    <a id="delY" href="javascript:void(0);" class="btn btn-danger">确认</a>
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                </div>
-            </div>
+  <!--弹出删除-->
+  <div class="modal fade" id="del" data-backdrop="static" style="display: none;" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h5 class="modal-title">删除确认</h5>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">×</span>
+          </button>
+        </div>
+        <div class="modal-body">
+          <h5 class="text-danger">删除后无法恢复，确认是否删除？</h5>
+        </div>
+        <div class="modal-footer">
+          <a id="delY" href="javascript:void(0);" class="btn btn-danger">确认</a>
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
         </div>
+      </div>
     </div>
-    <!-- JS. -->
-    <script src="/lib/jquery/jquery.min.js"></script>
-    <script src="/lib/tether/tether.min.js"></script>
-    <script src="/lib/bootstrap/bootstrap.min.js"></script>
-    <script src="/lib/lodash/lodash.js"></script>
-    <script src="/public/web/PerfectLoad.js"></script>
-    <script src="/web/maintain/billsGuidance_lib/js/global.js"></script>
-    <script src="/public/web/uuid.js"></script>
-    <script src="/public/web/common_ajax.js"></script>
-    <script src="/public/web/lock_util.js"></script>
-    <script src="/web/maintain/billsGuidance_lib/js/main.js"></script>
+  </div>
+  <!-- JS. -->
+  <script src="/lib/jquery/jquery.min.js"></script>
+  <script src="/lib/tether/tether.min.js"></script>
+  <script src="/lib/bootstrap/bootstrap.min.js"></script>
+  <script src="/lib/lodash/lodash.js"></script>
+  <script src="/public/web/PerfectLoad.js"></script>
+  <script src="/web/maintain/billsGuidance_lib/js/global.js"></script>
+  <script src="/public/web/uuid.js"></script>
+  <script src="/public/web/common_ajax.js"></script>
+  <script src="/public/web/lock_util.js"></script>
+  <script src="/web/maintain/billsGuidance_lib/js/main.js"></script>
 
 </body>
 <script type="text/javascript">
-    autoFlashHeight();
+  autoFlashHeight();
 </script>
 
-</html>
+</html>

web/maintain/bills_lib/html/main.html

@@ -29,7 +29,7 @@
         <div class="content">
             <div class="container-fluid">
                 <div class="row">
-                  <div class="col-md-8">
+                  <div class="col-md-10">
                     <div class="warp-p2 mt-3">
                       <table class="table table-hover table-bordered">
                         <thead>

web/maintain/calc_program_lib/html/main.html

@@ -16,7 +16,7 @@
                         <% }} %>
                     </div>
                 </div>
-                <div class="col-md-8">
+                <div class="col-md-10">
                     <div class="warp-p2 mt-3">
                         <table class="table table-hover table-bordered">
                             <thead><tr><th>库名称</th><th>自定义显示名称</th><th >费用定额</th><th width="160">添加时间</th><th width="70">操作</th></tr></thead>

web/maintain/economic_lib/html/main.html

@@ -2,7 +2,7 @@
     <div class="content">
         <div class="container-fluid">
             <div class="row">
-                <div class="col-md-5">
+                <div class="col-md-8">
                     <div class="warp-p2 mt-3">
                         <table class="table table-hover table-bordered">
                             <thead><tr><th >库名称</th><th width="160">添加时间</th><th width="70">操作</th></tr></thead>

web/maintain/engineer_feature_lib/html/main.html

@@ -2,7 +2,7 @@
     <div class="content">
         <div class="container-fluid">
             <div class="row">
-                <div class="col-md-5">
+                <div class="col-md-8">
                     <div class="warp-p2 mt-3">
                         <table class="table table-hover table-bordered">
                             <thead><tr><th >库名称</th><th width="160">添加时间</th><th width="70">操作</th></tr></thead>

web/maintain/engineer_info_lib/html/main.html

@@ -2,7 +2,7 @@
     <div class="content">
         <div class="container-fluid">
             <div class="row">
-                <div class="col-md-5">
+                <div class="col-md-8">
                     <div class="warp-p2 mt-3">
                         <table class="table table-hover table-bordered">
                             <thead><tr><th >库名称</th><th width="160">添加时间</th><th width="70">操作</th></tr></thead>

web/maintain/fee_rate_lib/html/main.html

@@ -3,36 +3,51 @@
         <div class="container-fluid">
             <div class="row">
                 <div class="col-md-2">
-                <div class="list-group mt-3">
-                    <% for (let compilation of compilationList) { %>
-                    <% if (compilation._id === 'all') { %>
-                    <a href="/feeRate/main" class="list-group-item list-group-item-action <%= compilation.active %>">
-                        所有
-                    </a>
-                    <% } else { %>
-                    <a id="<%= compilation._id %>" href="/feeRate/main?filter=<%= compilation._id %>" class="list-group-item list-group-item-action <%= compilation.active %>">
-                        <%= compilation.name %>
-                    </a>
-                    <% }} %>
+                    <div class="list-group mt-3">
+                        <% for (let compilation of compilationList) { %>
+                        <% if (compilation._id === 'all') { %>
+                        <a href="/feeRate/main"
+                            class="list-group-item list-group-item-action <%= compilation.active %>">
+                            所有
+                        </a>
+                        <% } else { %>
+                        <a id="<%= compilation._id %>" href="/feeRate/main?filter=<%= compilation._id %>"
+                            class="list-group-item list-group-item-action <%= compilation.active %>">
+                            <%= compilation.name %>
+                        </a>
+                        <% }} %>
+                    </div>
                 </div>
-            </div>
-                <div class="col-md-8">
+                <div class="col-md-10">
                     <div class="warp-p2 mt-3">
                         <table class="table table-hover table-bordered">
-                            <thead><tr><th>库名称</th><th >费用定额</th><th width="160">添加时间</th><th width="70">操作</th></tr></thead>
+                            <thead>
+                                <tr>
+                                    <th>库名称</th>
+                                    <th width="160">费用定额</th>
+                                    <th width="160">添加时间</th>
+                                    <th width="70">操作</th>
+                                </tr>
+                            </thead>
                             <tbody id="showArea">
-                            <% for(let lib of feeRateLibs){ %>
-                            <tr class="libTr">
-                                <td id="<%= lib.ID%>"><a href="/feeRate/edit/<%= lib.ID%>?locked=true"><%= lib.libName%></a></td>
-                                <td><%= lib.compilationName%></td>
-                                <td><%= moment(lib.createDate).format('YYYY-MM-DD')%></td>
-                                <td>
-                                    <a class="lock-btn-control disabled" href="javascript:void(0);" style="color: #0275d8" onclick='getFeeRateLib("<%= lib.ID%>")' title="编辑"><i class="fa fa-pencil-square-o"></i></a>
-                                    <a class="text-danger lock-btn-control disabled" href="javascript:void(0);" style="color: #0275d8" onclick='showDeleteModal("<%= lib.ID%>")' title="删除"><i class="fa fa-remove"></i></a>
-                                    <a class="lock" data-locked="true" href="javascript:void(0);" title="解锁"><i class="fa fa-unlock-alt"></i></a>
-                                </td>
-                            </tr>
-                            <% } %>
+                                <% for(let lib of feeRateLibs){ %>
+                                <tr class="libTr">
+                                    <td id="<%= lib.ID%>"><a
+                                            href="/feeRate/edit/<%= lib.ID%>?locked=true"><%= lib.libName%></a></td>
+                                    <td><%= lib.compilationName%></td>
+                                    <td><%= moment(lib.createDate).format('YYYY-MM-DD')%></td>
+                                    <td>
+                                        <a class="lock-btn-control disabled" href="javascript:void(0);"
+                                            style="color: #0275d8" onclick='getFeeRateLib("<%= lib.ID%>")' title="编辑"><i
+                                                class="fa fa-pencil-square-o"></i></a>
+                                        <a class="text-danger lock-btn-control disabled" href="javascript:void(0);"
+                                            style="color: #0275d8" onclick='showDeleteModal("<%= lib.ID%>")'
+                                            title="删除"><i class="fa fa-remove"></i></a>
+                                        <a class="lock" data-locked="true" href="javascript:void(0);" title="解锁"><i
+                                                class="fa fa-unlock-alt"></i></a>
+                                    </td>
+                                </tr>
+                                <% } %>
                             </tbody>
                         </table>
                     </div>
@@ -53,7 +68,8 @@
                 </button>
             </div>
             <div class="modal-body">
-                <form id="addLibForm" method="post" action="/feeRate/addLib" enctype="application/x-www-form-urlencoded21">
+                <form id="addLibForm" method="post" action="/feeRate/addLib"
+                    enctype="application/x-www-form-urlencoded21">
                     <div class="form-group">
                         <label>库名称</label>
                         <input id="name" name="name" class="form-control" placeholder="请输入费率标准库名称" type="text">
@@ -63,11 +79,11 @@
                         <label>编办名称</label>
                         <select id="compilationSels" name="compilationId" class="form-control"></select>
                     </div>
-                    <input type="hidden" name = "userAccount" value="<%= userAccount%>">
+                    <input type="hidden" name="userAccount" value="<%= userAccount%>">
                 </form>
             </div>
             <div class="modal-footer">
-                <button id="addLibs"  class="btn btn-primary">新建</button>
+                <button id="addLibs" class="btn btn-primary">新建</button>
                 <button type="button" id="cancelBtn" class="btn btn-secondary" data-dismiss="modal">取消</button>
             </div>
         </div>
@@ -95,7 +111,7 @@
                 </form>
             </div>
             <div class="modal-footer">
-                <a id="rename" href="javascript: void(0);" class="btn btn-primary" >确定</a>
+                <a id="rename" href="javascript: void(0);" class="btn btn-primary">确定</a>
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
             </div>
         </div>
@@ -118,7 +134,7 @@
                 <input type="hidden" id="delCount">
             </div>
             <div class="modal-footer">
-                <a id="delete" href="javascript:void(0);" class="btn btn-danger" >确认</a>
+                <a id="delete" href="javascript:void(0);" class="btn btn-danger">确认</a>
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
             </div>
         </div>
@@ -126,4 +142,4 @@
 </div>
 
 <script src="/public/web/lock_util.js"></script>
-<script type="text/javascript" src="/web/maintain/fee_rate_lib/js/fee_rate.js"></script>
+<script type="text/javascript" src="/web/maintain/fee_rate_lib/js/fee_rate.js"></script>

web/maintain/main_col_lib/html/main.html

@@ -2,7 +2,7 @@
     <div class="content">
         <div class="container-fluid">
             <div class="row">
-                <div class="col-md-8">
+                <div class="col-md-10">
                     <div class="warp-p2 mt-3">
                         <table class="table table-hover table-bordered">
                             <thead><tr><th>列设置名称</th><th width="160">编办</th><th width="160">添加时间</th><th width="70">操作</th></tr></thead>

web/maintain/main_quantity_lib/html/main.html

@@ -2,7 +2,7 @@
     <div class="content">
         <div class="container-fluid">
             <div class="row">
-                <div class="col-md-5">
+                <div class="col-md-8">
                     <div class="warp-p2 mt-3">
                         <table class="table table-hover table-bordered">
                             <thead><tr><th >库名称</th><th width="160">添加时间</th><th width="70">操作</th></tr></thead>

web/maintain/material_lib/html/main.html

@@ -2,7 +2,7 @@
     <div class="content">
         <div class="container-fluid">
             <div class="row">
-                <div class="col-md-5">
+                <div class="col-md-8">
                     <div class="warp-p2 mt-3">
                         <table class="table table-hover table-bordered">
                             <thead><tr><th >库名称</th><th width="160">添加时间</th><th width="70">操作</th></tr></thead>

web/maintain/material_replace_lib/html/main.html

@@ -2,24 +2,39 @@
     <div class="content">
         <div class="container-fluid">
             <div class="row">
-                <div class="col-md-8">
+                <div class="col-md-10">
                     <div class="warp-p2 mt-3">
                         <table class="table table-hover table-bordered">
-                            <thead><tr><th>库名称</th><th>清单规则</th><th >费用定额</th><th width="160">添加时间</th><th width="70">操作</th></tr></thead>
+                            <thead>
+                                <tr>
+                                    <th>库名称</th>
+                                    <th width="300">清单规则</th>
+                                    <th width="160">费用定额</th>
+                                    <th width="160">添加时间</th>
+                                    <th width="70">操作</th>
+                                </tr>
+                            </thead>
                             <tbody id="showArea">
-                            <% for(let lib of materialLibs){ %>
-                            <tr class="libTr">
-                                <td id="<%= lib.ID%>"><a href="/materialReplace/edit/<%= lib.ID%>?locked=true"><%= lib.name%></a></td>
-                                <td><%= lib.billsLibName%></td>
-                                <td><%= lib.compilationName%></td>
-                                <td><%= moment(lib.createDate).format('YYYY-MM-DD')%></td>
-                                <td>
-                                    <a class="lock-btn-control disabled" href="javascript:void(0);" style="color: #0275d8" onclick='getMaterialLib("<%= lib.ID%>")' title="编辑"><i class="fa fa-pencil-square-o"></i></a>
-                                    <a class="text-danger lock-btn-control disabled" href="javascript:void(0);" style="color: #0275d8" onclick='showDeleteModal("<%= lib.ID%>")' title="删除"><i class="fa fa-remove"></i></a>
-                                    <a class="lock" data-locked="true" href="javascript:void(0);" title="解锁"><i class="fa fa-unlock-alt"></i></a>
-                                </td>
-                            </tr>
-                            <% } %>
+                                <% for(let lib of materialLibs){ %>
+                                <tr class="libTr">
+                                    <td id="<%= lib.ID%>"><a
+                                            href="/materialReplace/edit/<%= lib.ID%>?locked=true"><%= lib.name%></a>
+                                    </td>
+                                    <td><%= lib.billsLibName%></td>
+                                    <td><%= lib.compilationName%></td>
+                                    <td><%= moment(lib.createDate).format('YYYY-MM-DD')%></td>
+                                    <td>
+                                        <a class="lock-btn-control disabled" href="javascript:void(0);"
+                                            style="color: #0275d8" onclick='getMaterialLib("<%= lib.ID%>")'
+                                            title="编辑"><i class="fa fa-pencil-square-o"></i></a>
+                                        <a class="text-danger lock-btn-control disabled" href="javascript:void(0);"
+                                            style="color: #0275d8" onclick='showDeleteModal("<%= lib.ID%>")'
+                                            title="删除"><i class="fa fa-remove"></i></a>
+                                        <a class="lock" data-locked="true" href="javascript:void(0);" title="解锁"><i
+                                                class="fa fa-unlock-alt"></i></a>
+                                    </td>
+                                </tr>
+                                <% } %>
                             </tbody>
                         </table>
                     </div>
@@ -40,7 +55,8 @@
                 </button>
             </div>
             <div class="modal-body">
-                <form id="addLibForm" method="post" action="/materialReplace/addLib" enctype="application/x-www-form-urlencoded21">
+                <form id="addLibForm" method="post" action="/materialReplace/addLib"
+                    enctype="application/x-www-form-urlencoded21">
                     <div class="form-group">
                         <label>库名称</label>
                         <input id="name" name="name" class="form-control" placeholder="请输入材料库名称" type="text">
@@ -54,11 +70,11 @@
                         <label>编办名称</label>
                         <select id="compilationSels" name="compilationId" class="form-control"></select>
                     </div>
-                    <input type="hidden" name = "userAccount" value="<%= userAccount%>">
+                    <input type="hidden" name="userAccount" value="<%= userAccount%>">
                 </form>
             </div>
             <div class="modal-footer">
-                <button id="addLibs"  class="btn btn-primary">新建</button>
+                <button id="addLibs" class="btn btn-primary">新建</button>
                 <button type="button" id="cancelBtn" class="btn btn-secondary" data-dismiss="modal">取消</button>
             </div>
         </div>
@@ -86,7 +102,7 @@
                 </form>
             </div>
             <div class="modal-footer">
-                <a id="rename" href="javascript: void(0);" class="btn btn-primary" >确定</a>
+                <a id="rename" href="javascript: void(0);" class="btn btn-primary">确定</a>
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
             </div>
         </div>
@@ -109,7 +125,7 @@
                 <input type="hidden" id="delCount">
             </div>
             <div class="modal-footer">
-                <a id="delete" href="javascript:void(0);" class="btn btn-danger" >确认</a>
+                <a id="delete" href="javascript:void(0);" class="btn btn-danger">确认</a>
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
             </div>
         </div>
@@ -117,4 +133,4 @@
 </div>
 
 <script src="/public/web/lock_util.js"></script>
-<script type="text/javascript" src="/web/maintain/material_replace_lib/js/material_replace.js"></script>
+<script type="text/javascript" src="/web/maintain/material_replace_lib/js/material_replace.js"></script>

web/maintain/over_height_lib/html/main.html

@@ -2,7 +2,7 @@
     <div class="content">
         <div class="container-fluid">
             <div class="row">
-                <div class="col-md-5">
+                <div class="col-md-8">
                     <div class="warp-p2 mt-3">
                         <table class="table table-hover table-bordered">
                             <thead><tr><th >库名称</th><th width="160">添加时间</th><th width="70">操作</th></tr></thead>

web/maintain/project_feature_lib/html/main.html

@@ -6,33 +6,48 @@
                     <div class="list-group mt-3">
                         <% for (let compilation of compilationList) { %>
                         <% if (compilation._id === 'all') { %>
-                        <a href="/projectFeature/main" class="list-group-item list-group-item-action <%= compilation.active %>">
+                        <a href="/projectFeature/main"
+                            class="list-group-item list-group-item-action <%= compilation.active %>">
                             所有
                         </a>
                         <% } else { %>
-                        <a id="<%= compilation._id %>" href="/projectFeature/main?filter=<%= compilation._id %>" class="list-group-item list-group-item-action <%= compilation.active %>">
+                        <a id="<%= compilation._id %>" href="/projectFeature/main?filter=<%= compilation._id %>"
+                            class="list-group-item list-group-item-action <%= compilation.active %>">
                             <%= compilation.name %>
                         </a>
                         <% }} %>
                     </div>
                 </div>
-                <div class="col-md-8">
+                <div class="col-md-10">
                     <div class="warp-p2 mt-3">
                         <table class="table table-hover table-bordered">
-                            <thead><tr><th >库名称</th><th>费用定额</th><th width="160">添加时间</th><th width="70">操作</th></tr></thead>
+                            <thead>
+                                <tr>
+                                    <th>库名称</th>
+                                    <th width="160">费用定额</th>
+                                    <th width="160">添加时间</th>
+                                    <th width="70">操作</th>
+                                </tr>
+                            </thead>
                             <tbody id="showArea">
-                            <% for(let lib of featureLibs){ %>
-                            <tr class="libTr">
-                                <td id="<%= lib.ID%>"><a href="/projectFeature/edit/<%= lib.ID%>?locked=true"><%= lib.name%></a></td>
-                                <td><%= lib.compilationName%></td>
-                                <td><%= moment(lib.createDate).format('YYYY-MM-DD')%></td>
-                                <td>
-                                    <a class="lock-btn-control disabled" href="javascript:void(0);" style="color: #0275d8" onclick='getFeatureLib("<%= lib.ID%>")' title="编辑"><i class="fa fa-pencil-square-o"></i></a>
-                                    <a class="text-danger lock-btn-control disabled" href="javascript:void(0);" onclick='showDeleteModal("<%= lib.ID%>")' title="删除"><i class="fa fa-remove"></i></a>
-                                    <a class="lock" data-locked="true" href="javascript:void(0);" title="解锁"><i class="fa fa-unlock-alt"></i></a>
-                                </td>
-                            </tr>
-                            <% } %>
+                                <% for(let lib of featureLibs){ %>
+                                <tr class="libTr">
+                                    <td id="<%= lib.ID%>"><a
+                                            href="/projectFeature/edit/<%= lib.ID%>?locked=true"><%= lib.name%></a></td>
+                                    <td><%= lib.compilationName%></td>
+                                    <td><%= moment(lib.createDate).format('YYYY-MM-DD')%></td>
+                                    <td>
+                                        <a class="lock-btn-control disabled" href="javascript:void(0);"
+                                            style="color: #0275d8" onclick='getFeatureLib("<%= lib.ID%>")' title="编辑"><i
+                                                class="fa fa-pencil-square-o"></i></a>
+                                        <a class="text-danger lock-btn-control disabled" href="javascript:void(0);"
+                                            onclick='showDeleteModal("<%= lib.ID%>")' title="删除"><i
+                                                class="fa fa-remove"></i></a>
+                                        <a class="lock" data-locked="true" href="javascript:void(0);" title="解锁"><i
+                                                class="fa fa-unlock-alt"></i></a>
+                                    </td>
+                                </tr>
+                                <% } %>
                             </tbody>
                         </table>
                     </div>
@@ -53,7 +68,8 @@
                 </button>
             </div>
             <div class="modal-body">
-                <form id="addLibForm" method="post" action="/projectFeature/addLib" enctype="application/x-www-form-urlencoded21">
+                <form id="addLibForm" method="post" action="/projectFeature/addLib"
+                    enctype="application/x-www-form-urlencoded21">
                     <div class="form-group">
                         <label>库名称</label>
                         <input id="name" name="name" class="form-control" placeholder="请输入特征库名称" type="text">
@@ -63,16 +79,16 @@
                         <label>编办名称</label>
                         <select class="form-control" name="compilationId">
                             <% for (let compilation of compilationList) { %>
-                                <% if (compilation.name !== '所有') { %>
+                            <% if (compilation.name !== '所有') { %>
                             <option value="<%= compilation._id %>"><%= compilation.name %></option>
                             <% }} %>
                         </select>
                     </div>
-                    <input type="hidden" name = "userAccount" value="<%= userAccount%>">
+                    <input type="hidden" name="userAccount" value="<%= userAccount%>">
                 </form>
             </div>
             <div class="modal-footer">
-                <button id="addLibs"  class="btn btn-primary">新建</button>
+                <button id="addLibs" class="btn btn-primary">新建</button>
                 <button type="button" id="cancelBtn" class="btn btn-secondary" data-dismiss="modal">取消</button>
             </div>
         </div>
@@ -100,7 +116,7 @@
                 </form>
             </div>
             <div class="modal-footer">
-                <a id="rename" href="javascript: void(0);" class="btn btn-primary" >确定</a>
+                <a id="rename" href="javascript: void(0);" class="btn btn-primary">确定</a>
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
             </div>
         </div>
@@ -123,7 +139,7 @@
                 <input type="hidden" id="delCount">
             </div>
             <div class="modal-footer">
-                <a id="delete" href="javascript:void(0);" class="btn btn-danger" >确认</a>
+                <a id="delete" href="javascript:void(0);" class="btn btn-danger">确认</a>
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
             </div>
         </div>
@@ -131,4 +147,4 @@
 </div>
 
 <script src="/public/web/lock_util.js"></script>
-<script type="text/javascript" src="/web/maintain/project_feature_lib/js/project_feature.js"></script>
+<script type="text/javascript" src="/web/maintain/project_feature_lib/js/project_feature.js"></script>

web/maintain/ration_repository/js/ration.js

@@ -118,7 +118,9 @@ let rationOprObj = {
         sheet.resumePaint();
         sheet.resumeEvent();
     },
+    // TODO info.oldSelections is null
     onSelectionChanged: function (sender, info) {
+        console.log(info);
         if(info.oldSelections.length === 0 && info.newSelections.length > 0 || info.oldSelections[0].row !== info.newSelections[0].row){
             let row = info.newSelections[0].row;
             let me = rationOprObj;

web/maintain/ration_repository/js/section_tree.js

@@ -673,15 +673,18 @@ let sectionTreeObj = {
         CommonAjax.post('/rationRepository/api/getRationItem', {rationLibId: pageOprObj.rationLibId, code: rationCode}, function (rstData) {
             if (!rstData) {
                 alert(`不存在定额${rationCode}`);
+                $.bootstrapLoading.end();
                 return;
             }
             //定位至相关章节
             let sectionId = rstData.sectionId;
             if (!sectionId) {
+                $.bootstrapLoading.end();
                 return;
             }
             let sectionNode = me.tree.nodes[`id_${sectionId}`];
             if (!sectionNode) {
+                $.bootstrapLoading.end();
                 return;
             }
             let sectionRow = sectionNode.serialNo();

web/maintain/ration_repository/main.html

@@ -46,15 +46,15 @@
                             <% }} %>
                         </div>
                     </div>
-                  <div class="col-md-8">
+                  <div class="col-md-10">
                     <div class="warp-p2 mt-3">
                       <table class="table table-hover table-bordered">
                         <thead>
                             <tr>
                                 <th>定额库名称</th>
-                                <th>定额库编码</th>
+                                <th width="100">定额库编码</th>
                                 <th width="160">费用定额</th>
-                                <th width="160">添加时间</th>
+                                <th width="120">添加时间</th>
                                 <th width="90">操作</th>
                                 <th width="90">原始数据</th>
                                 <th width="150">内部数据</th>

web/maintain/std_glj_lib/html/main.html

@@ -30,14 +30,14 @@
         <div class="content">
             <div class="container-fluid">
                 <div class="row">
-                  <div class="col-md-8">
+                  <div class="col-md-10">
                     <div class="warp-p2 mt-3">
                       <table class="table table-hover table-bordered">
                         <thead>
                             <tr>
                                 <th>人材机库名称</th>
-                                <th>费用定额</th>
-                                <th>定额库</th>
+                                <th width="160">费用定额</th>
+                                <th width="320">定额库</th>
                                 <th width="160">添加时间</th>
                                 <th width="70">操作</th>
                                 <th width="90">价格数据</th>