后台工具主页宽度调整

.gitignore

@@ -2,6 +2,7 @@ node_modules/
 .git/
 dist/
 .idea/
+.vscode/
 tmp/
 modules/reports/util/pdf_base_files/*.ttf
 modules/reports/util/pdf_base_files/*.ttc

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

@@ -28,15 +28,15 @@
         <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>类型</th>
+                                <th width="160">编办</th>
+                                <th width="300">清单规则</th>
+                                <th width="100">类型</th>
                                 <th width="160">添加时间</th>
                                 <th width="70">操作</th>
                             </tr>

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/fee_rate_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="/feeRate/main" class="list-group-item list-group-item-action <%= compilation.active %>">
+                        <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 %>">
+                        <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 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>

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/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/progressive_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">
@@ -68,11 +84,11 @@
                             <% }} %>
                         </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/section_tree.js

@@ -667,23 +667,28 @@ let sectionTreeObj = {
         const $seach = $('#rationSearch');
         $seach.val(rationCode);
         //去后台搜索该定额
+        $.bootstrapLoading.start();
         CommonAjax.post('/rationRepository/api/getRationItem', {rationLibId: pageOprObj.rationLibId, code: rationCode}, function (rstData) {
             if (!rstData) {
                 alert(`不存在定额${rationCode}`);
+                $.bootstrapLoading.end();
                 return;
             }
             //定位至相关章节
             const sectionId = rstData.sectionId;
             if (!sectionId) {
+                $.bootstrapLoading.end();
                 return;
             }
             const sectionNode = me.tree.nodes[`id_${sectionId}`];
             if (!sectionNode) {
+                $.bootstrapLoading.end();
                 return;
             }
             const sectionRow = sectionNode.serialNo();
             me.sheet.setActiveCell(sectionRow, 1);
             me.sheet.showRow(sectionRow, GC.Spread.Sheets.VerticalPosition.top);
+            $.bootstrapLoading.end();
             const doAfterGetRation = function (rations) {
                 const findRation = _.find(rations, {code: rationCode});
                 const rIdx = rations.indexOf(findRation);
@@ -694,6 +699,7 @@ let sectionTreeObj = {
             };
             me.initSelection(sectionNode, doAfterGetRation);
         }, function () {
+            $.bootstrapLoading.end();
         });
     }
 };

web/maintain/ration_repository/main.html

@@ -47,7 +47,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/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>

web/maintain/vehicleVesselTax_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>