瀏覽代碼

全局样式调整

MaiXinRong 5 年之前
父節點
當前提交
5d1af47b05
共有 65 個文件被更改,包括 887 次插入880 次删除
  1. 12 2
      app/public/css/main.css
  2. 4 2
      app/public/js/bootstrap/bootstrap-paginator.js
  3. 1 1
      app/public/js/category.js
  4. 3 1
      app/public/js/revise.js
  5. 12 2
      app/public/js/tender.js
  6. 2 2
      app/view/boot/index.ejs
  7. 5 5
      app/view/change/bills_modal.ejs
  8. 5 5
      app/view/change/file_modal.ejs
  9. 1 1
      app/view/change/index.ejs
  10. 29 29
      app/view/change/info.ejs
  11. 29 29
      app/view/change/info_modal.ejs
  12. 15 15
      app/view/change/modal.ejs
  13. 6 6
      app/view/layout/modal.ejs
  14. 2 21
      app/view/layout/page.ejs
  15. 2 2
      app/view/layout/project_list.ejs
  16. 1 1
      app/view/layout/tender_list.ejs
  17. 7 7
      app/view/ledger/audit_modal.ejs
  18. 2 2
      app/view/ledger/explode.ejs
  19. 15 15
      app/view/ledger/explode_modal.ejs
  20. 15 15
      app/view/material/audit_modal.ejs
  21. 1 1
      app/view/material/info.ejs
  22. 4 4
      app/view/material/list_modal.ejs
  23. 6 6
      app/view/material/modal.ejs
  24. 3 3
      app/view/measure/audit.ejs
  25. 7 7
      app/view/measure/audit_modal.ejs
  26. 2 2
      app/view/measure/compare_modal.ejs
  27. 13 13
      app/view/measure/stage_modal.ejs
  28. 28 28
      app/view/measure/wlist_modal.ejs
  29. 3 3
      app/view/measure/work.ejs
  30. 24 24
      app/view/measure/work_modal.ejs
  31. 1 1
      app/view/profile/info.ejs
  32. 1 1
      app/view/profile/safe.ejs
  33. 1 1
      app/view/profile/sign.ejs
  34. 7 7
      app/view/profile/sms.ejs
  35. 1 1
      app/view/report/index.ejs
  36. 17 17
      app/view/report/rpt_all_popup.ejs
  37. 4 4
      app/view/report/rpt_content_format.ejs
  38. 3 3
      app/view/revise/history.ejs
  39. 1 1
      app/view/revise/info.ejs
  40. 12 12
      app/view/setting/category_modal.ejs
  41. 4 4
      app/view/setting/info.ejs
  42. 23 23
      app/view/setting/user_modal.ejs
  43. 14 14
      app/view/setting/user_permission_modal.ejs
  44. 34 34
      app/view/stage/audit_modal.ejs
  45. 2 2
      app/view/stage/compare_modal.ejs
  46. 1 1
      app/view/stage/deal.ejs
  47. 21 21
      app/view/stage/deal_modal.ejs
  48. 1 1
      app/view/stage/detail.ejs
  49. 10 10
      app/view/stage/detail_modal.ejs
  50. 1 1
      app/view/stage/gather.ejs
  51. 11 11
      app/view/stage/index.ejs
  52. 15 15
      app/view/stage/measure_modal.ejs
  53. 9 9
      app/view/stage/modal.ejs
  54. 8 8
      app/view/stage/pay_modal.ejs
  55. 1 1
      app/view/stage/report.ejs
  56. 13 13
      app/view/stage/report_modal.ejs
  57. 1 1
      app/view/stage/stage_sub_menu.ejs
  58. 1 1
      app/view/stage/stage_sub_mini_menu.ejs
  59. 1 1
      app/view/tender/cooperation.ejs
  60. 4 4
      app/view/tender/cooperationModal.ejs
  61. 386 384
      app/view/tender/detail.ejs
  62. 11 11
      app/view/tender/manage_modal.ejs
  63. 6 6
      app/view/tender/modal.ejs
  64. 1 1
      app/view/tender/tender_sub_menu.ejs
  65. 1 1
      app/view/tender/tender_sub_mini_menu.ejs

+ 12 - 2
app/public/css/main.css

@@ -721,6 +721,7 @@ body{
 }
 .form-control-sm {
   font-size:12px;
+  padding-top:.1rem;
 }
 label{
   margin-bottom:.3rem;
@@ -835,8 +836,17 @@ legend {
   bottom:20px;
 }
 .side-fold a{
-  font-size:18px;
+  font-size:24px;
+}
+.min-side {
+  padding-bottom:5px;
 }
 .min-side .side-fold{
  bottom:10px;
-}
+}
+.min-side .side-fold a{
+  font-size:18px;
+}
+.form-text{
+  font-size:12px;
+}

+ 4 - 2
app/public/js/bootstrap/bootstrap-paginator.js

@@ -585,7 +585,6 @@
     };
 
     $.fn.bootstrapPaginator.sizeArray = {
-
         "2": {
             "large": "pagination-large",
             "small": "pagination-small",
@@ -595,8 +594,11 @@
             "large": "pagination-lg",
             "small": "pagination-sm",
             "mini": ""
+        },
+        "4": {
+            "large": "pagination-lg",
+            "small": "pagination-sm",
         }
-
     };
 
     $.fn.bootstrapPaginator.defaults = {

+ 1 - 1
app/public/js/category.js

@@ -38,7 +38,7 @@ function getCategoryHtml(category) {
         html.push('<td>');
         if (d.value && d.value.length > 0) {
             for (const v of d.value) {
-                html.push('<span class="h5"><span class="badge badge-secondary">', v.value, '</span></span>\n');
+                html.push('<span class="badge badge-secondary">', v.value, '</span>\n');
             }
         } else {
             html.push('请在右侧添加值');

+ 3 - 1
app/public/js/revise.js

@@ -1482,7 +1482,9 @@ $(document).ready(() => {
         // 修订详情 保存
         $('#save').click(function () {
             const content = $('#content').val();
-            postData('save', { content: content });
+            postData('save', { content: content }, function () {
+                $('#content').attr('org-value', content);
+            });
         });
     }
 

+ 12 - 2
app/public/js/tender.js

@@ -130,8 +130,13 @@ $(document).ready(function() {
         SpreadJsObj.protectedSheet(sheet);
         sheet.options.rowHeaderVisible = false;
         sheet.options.colHeaderVisible = false;
+
+        const vStyle = new spreadNS.Style();
+        vStyle.font = '12px 微软雅黑';
+        sheet.setDefaultStyle(vStyle, spreadNS.SheetArea.viewport);
+
         SpreadJsObj.massOperationSheet(sheet, function () {
-            sheet.defaults.rowHeight = 28;
+            sheet.defaults.rowHeight = 25;
             sheet.setColumnCount(3);
             sheet.setRowCount(14);
             sheet.setColumnWidth(0, 1);
@@ -271,10 +276,15 @@ $(document).ready(function() {
         spread.options.showHorizontalScrollbar = false;
         const sheet = spread.getActiveSheet();
         SpreadJsObj.protectedSheet(sheet);
+
+        const vStyle = new spreadNS.Style();
+        vStyle.font = '12px 微软雅黑';
+        sheet.setDefaultStyle(vStyle, spreadNS.SheetArea.viewport);
+
         SpreadJsObj.massOperationSheet(sheet, function () {
             sheet.options.rowHeaderVisible = false;
             sheet.options.colHeaderVisible = false;
-            sheet.defaults.rowHeight = 35;
+            sheet.defaults.rowHeight = 25;
             sheet.setColumnCount(3);
             sheet.setRowCount(6);
             sheet.setColumnWidth(0, 1);

+ 2 - 2
app/view/boot/index.ejs

@@ -55,7 +55,7 @@
                                 </select>
                             </div>
                             <div class="form-group">
-                                <a class="btn btn-link" data-toggle="collapse" href="#moreinfo" aria-expanded="false" aria-controls="moreinfo">更多选项</a>
+                                <a class="btn btn-sm btn-link" data-toggle="collapse" href="#moreinfo" aria-expanded="false" aria-controls="moreinfo">更多选项</a>
                             </div>
                             <div class="collapse" id="moreinfo">
                                 <div class="form-group">
@@ -77,7 +77,7 @@
                             </div>
                             <div class="form-group">
                                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>"/>
-                                <button class="btn btn-primary btn-block" type="submit">下一步</button>
+                                <button class="btn btn-primary btn-sm btn-block" type="submit">下一步</button>
                             </div>
                         </form>
                     </div>

+ 5 - 5
app/view/change/bills_modal.ejs

@@ -177,8 +177,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <button type="button" class="btn btn-primary">添加</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>
+                <button type="button" class="btn btn-primary btn-sm">添加</button>
             </div>
         </div>
     </div>
@@ -200,10 +200,10 @@
             </div>
             <div class="modal-footer">
                 <!--无法提交-->
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">好的</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">好的</button>
                 <!--确认提交-->
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <button type="button" class="btn btn-primary" data-dismiss="modal">确认提交</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>
+                <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal">确认提交</button>
             </div>
         </div>
     </div>

+ 5 - 5
app/view/change/file_modal.ejs

@@ -13,8 +13,8 @@
                 <p><a href="" class="btn btn-primary">选择文件</a></p>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <button type="button" class="btn btn-primary">添加</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>
+                <button type="button" class="btn btn-primary btn-sm">添加</button>
             </div>
         </div>
     </div>
@@ -36,10 +36,10 @@
             </div>
             <div class="modal-footer">
                 <!--无法提交-->
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">好的</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">好的</button>
                 <!--确认提交-->
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <button type="button" class="btn btn-primary" data-dismiss="modal">确认提交</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>
+                <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal">确认提交</button>
             </div>
         </div>
     </div>

+ 1 - 1
app/view/change/index.ejs

@@ -17,7 +17,7 @@
             <% if (tender.user_id === uid) { %>
             <div class="ml-auto">
                 <a href="#add-bj" data-toggle="modal" data-target="#add-bj" class="btn btn-sm btn-primary pull-right">新建变更令</a>
-                <a href="#setting" data-toggle="modal" data-target="#setting" class="btn btn-sm btn-outline-primary pull-right"><i class="fa fa-cog"></i></a>
+                <a href="#setting" data-toggle="modal" data-target="#setting" class="btn btn-sm btn-outline-primary pull-right ml-1"><i class="fa fa-cog"></i></a>
             </div>
             <% } %>
         </div>

+ 29 - 29
app/view/change/info.ejs

@@ -181,45 +181,45 @@
                         <div class="form-group">
                             <label><b class="text-danger">*&nbsp;</b>申请编号</label>
                             <a href="javascript:void(0);" class="pull-right reduction-code" data-toggle="tooltip" data-placement="bottom" title="" data-code="<%- change.code %>" data-original-title="重置"><i class="fa fa-repeat"></i></a>
-                            <input class="form-control" name="code" value="<%- change.code %>" type="text">
+                            <input class="form-control form-control-sm" name="code" value="<%- change.code %>" type="text">
                         </div>
                         <div class="form-group">
                             <label><b class="text-danger">*&nbsp;</b>工程名称</label>
-                            <input class="form-control" name="name" value="<%- change.name %>" type="text">
+                            <input class="form-control form-control-sm" name="name" value="<%- change.name %>" type="text">
                         </div>
                         <div class="form-group">
                             <label>桩号</label>
-                            <input class="form-control" name="peg" value="<%- change.peg %>" type="text">
+                            <input class="form-control form-control-sm" name="peg" value="<%- change.peg %>" type="text">
                         </div>
                         <div class="form-group">
                             <label>原设计图名称</label>
-                            <input class="form-control" name="org_name" placeholder="" type="text" value="<%- change.org_name %>">
+                            <input class="form-control form-control-sm" name="org_name" placeholder="" type="text" value="<%- change.org_name %>">
                         </div>
                         <div class="form-group">
                             <label>原图号</label>
-                            <input class="form-control" name="org_code" placeholder="" type="text" value="<%- change.org_code %>">
+                            <input class="form-control form-control-sm" name="org_code" placeholder="" type="text" value="<%- change.org_code %>">
                         </div>
                         <div class="form-group">
                             <label>变更设计图名称</label>
-                            <input class="form-control" name="new_name" placeholder="" type="text" value="<%- change.new_name %>">
+                            <input class="form-control form-control-sm" name="new_name" placeholder="" type="text" value="<%- change.new_name %>">
                         </div>
                         <div class="form-group">
                             <label>变更图号</label>
-                            <input class="form-control" name="new_code" placeholder="" type="text" value="<%- change.new_code %>">
+                            <input class="form-control form-control-sm" name="new_code" placeholder="" type="text" value="<%- change.new_code %>">
                         </div>
                     </div>
                     <div class="col-md-4" style="z-index:999">
                         <div class="form-group">
                             <label><b class="text-danger">*&nbsp;</b>工程变更理由及内容</label>
-                            <textarea class="form-control" name="content" rows="6"><%- change.content %></textarea>
+                            <textarea class="form-control form-control-sm" name="content" rows="6"><%- change.content %></textarea>
                         </div>
                         <div class="form-group">
                             <label>工程变更合同依据</label>
-                            <textarea class="form-control" name="basis" rows="6"><%- change.basis %></textarea>
+                            <textarea class="form-control form-control-sm" name="basis" rows="6"><%- change.basis %></textarea>
                         </div>
                         <div class="form-group">
                             <label>备注</label>
-                            <textarea class="form-control" name="memo" rows="3"><%- change.memo %></textarea>
+                            <textarea class="form-control form-control-sm" name="memo" rows="3"><%- change.memo %></textarea>
                         </div>
                     </div>
                     <div class="col-md-4">
@@ -238,7 +238,7 @@
                         </div>
                         <div class="form-group">
                             <label>变更类别 </label>
-                            <select class="form-control" name="class">
+                            <select class="form-control form-control-sm" name="class">
                                 <% for (const c in changeConst.class) { %>
                                 <% const cClass = changeConst.class[c] %>
                                 <option value="<%- cClass.value %>"<% if (cClass.value === change.class) { %> selected<% } %>><%- cClass.name %></option>
@@ -247,7 +247,7 @@
                         </div>
                         <div class="form-group">
                             <label>变更性质 </label>
-                            <select class="form-control" name="quality">
+                            <select class="form-control form-control-sm" name="quality">
                                 <% for (const q in changeConst.quality) { %>
                                 <% const cQuality = changeConst.quality[q] %>
                                 <option value="<%- cQuality.value %>"<% if (cQuality.value === change.quality) { %> selected<% } %>><%- cQuality.name %></option>
@@ -257,7 +257,7 @@
                         <div class="form-group">
                             <label>变更提出单位</label>
                             <a href="#editcompany" style="float:right;" class="" data-toggle="modal">编辑</a>
-                            <select class="form-control" id="company" name="company">
+                            <select class="form-control form-control-sm" id="company" name="company">
                                 <% for (const company of companyList) { %>
                                 <option <% if (company.name === change.company) { %>selected<% } %>><%- company.name %></option>
                                 <% } %>
@@ -289,37 +289,37 @@
                     <form>
                         <div class="form-group">
                             <label>申请编号</label>
-                            <input class="form-control" value="<%- change.code %>" type="text" readonly>
+                            <input class="form-control form-control-sm" value="<%- change.code %>" type="text" readonly>
                         </div>
                         <% if (auditStatus === 4) { %>
                         <div class="form-group">
                             <label>变更令号(批复编号)</label>
-                            <input class="form-control" value="<%- change.p_code %>" type="text" readonly>
+                            <input class="form-control form-control-sm" value="<%- change.p_code %>" type="text" readonly>
                         </div>
                         <% } %>
                         <div class="form-group">
                             <label>工程名称</label>
-                            <input class="form-control" value="<%- change.name %>" type="text" readonly>
+                            <input class="form-control form-control-sm" value="<%- change.name %>" type="text" readonly>
                         </div>
                         <div class="form-group">
                             <label>桩号</label>
-                            <input class="form-control" value="<%- change.peg %>" type="text" readonly>
+                            <input class="form-control form-control-sm" value="<%- change.peg %>" type="text" readonly>
                         </div>
                         <div class="form-group">
                             <label>原设计图名称</label>
-                            <input class="form-control" placeholder="" type="text" value="<%- change.org_name %>" readonly>
+                            <input class="form-control form-control-sm" placeholder="" type="text" value="<%- change.org_name %>" readonly>
                         </div>
                         <div class="form-group">
                             <label>原图号</label>
-                            <input class="form-control" placeholder="" type="text" value="<%- change.org_code %>" readonly>
+                            <input class="form-control form-control-sm" placeholder="" type="text" value="<%- change.org_code %>" readonly>
                         </div>
                         <div class="form-group">
                             <label>变更设计图名称</label>
-                            <input class="form-control" placeholder="" type="text" value="<%- change.new_name %>" readonly>
+                            <input class="form-control form-control-sm" placeholder="" type="text" value="<%- change.new_name %>" readonly>
                         </div>
                         <div class="form-group">
                             <label>变更图号</label>
-                            <input class="form-control" placeholder="" type="text" value="<%- change.new_code %>" readonly>
+                            <input class="form-control form-control-sm" placeholder="" type="text" value="<%- change.new_code %>" readonly>
                         </div>
                     </form>
                 </div>
@@ -327,15 +327,15 @@
                     <form>
                         <div class="form-group">
                             <label>工程变更理由及内容</label>
-                            <textarea class="form-control" rows="6" readonly><%- change.content %></textarea>
+                            <textarea class="form-control form-control-sm" rows="6" readonly><%- change.content %></textarea>
                         </div>
                         <div class="form-group">
                             <label>工程变更合同依据</label>
-                            <textarea class="form-control" rows="6" readonly><%- change.basis %></textarea>
+                            <textarea class="form-control form-control-sm" rows="6" readonly><%- change.basis %></textarea>
                         </div>
                         <div class="form-group">
                             <label>备注</label>
-                            <textarea class="form-control" rows="3" readonly><%- change.memo %></textarea>
+                            <textarea class="form-control form-control-sm" rows="3" readonly><%- change.memo %></textarea>
                         </div>
                     </form>
                 </div>
@@ -357,7 +357,7 @@
                         </div>
                         <div class="form-group">
                             <label>变更类别 </label>
-                            <select class="form-control" disabled>
+                            <select class="form-control form-control-sm" disabled>
                                 <% for (const c in changeConst.class) { %>
                                 <% const cClass = changeConst.class[c] %>
                                 <% if (cClass.value === change.class) { %>
@@ -368,7 +368,7 @@
                         </div>
                         <div class="form-group">
                             <label>变更性质 </label>
-                            <select class="form-control" disabled>
+                            <select class="form-control form-control-sm" disabled>
                                 <% for (const q in changeConst.quality) { %>
                                 <% const cQuality = changeConst.quality[q] %>
                                 <% if (cQuality.value === change.quality) { %>
@@ -379,7 +379,7 @@
                         </div>
                         <div class="form-group">
                             <label>变更提出单位</label>
-                            <select class="form-control" disabled>
+                            <select class="form-control form-control-sm" disabled>
                                 <option><%- change.company %></option>
                             </select>
                         </div>
@@ -398,7 +398,7 @@
                         </div>
                         <div class="form-group">
                             <label>批复文号</label>
-                            <input class="form-control" id="w_code" placeholder="" type="text" value="<%- change.w_code %>" <% if (auditStatus !== 6) { %>readonly<% } %>>
+                            <input class="form-control form-control-sm" id="w_code" placeholder="" type="text" value="<%- change.w_code %>" <% if (auditStatus !== 6) { %>readonly<% } %>>
                         </div>
                     </form>
                 </div>
@@ -454,7 +454,7 @@
                         <td data-site="2"><input class="form-control form-control-sm" placeholder="变更部位" type="text" value="<%= cl.bwmx %>"></td>
                         <td data-site="3"><input class="form-control form-control-sm" placeholder="变更详情" type="text" value="<%= cl.detail %>"></td>
                         <td data-site="4">
-                            <select class="form-control input-sm">
+                            <select class="form-control form-control-sm input-sm">
                                 <% for (const j in changeUnits) { %>
                                     <% if (changeUnits[j].unit !== undefined && changeUnits[j].unit === cl.unit) { %>
                                 <option selected="selected"><%= changeUnits[j].unit %></option>

+ 29 - 29
app/view/change/info_modal.ejs

@@ -13,19 +13,19 @@
                 <div id="companyshow">
                     <% for (const company of companyList) { %>
                     <div class="form-group">
-                        <input type="text" id="<%= company.id %>" class="form-control" value="<%= company.name %>">
+                        <input type="text" id="<%= company.id %>" class="form-control form-control-sm" value="<%= company.name %>">
                     </div>
                     <% } %>
                 </div>
                 <div class="alert alert-warning" role="alert">修改后,已创建的变更不受影响。</div>
                 <p><button class="btn btn-primary btn-sm" id="addcompany" role="button" title="填写公司"><b class="fa fa-plus"></b></button></p>
                 <div id="companyadddiv">
-                    <!--<input type="text" class="form-control" placeholder="请输入公司名称">-->
+                    <!--<input type="text" class="form-control form-control-sm" placeholder="请输入公司名称">-->
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <button type="button" id="updatecompany" class="btn btn-primary">确定</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>
+                <button type="button" id="updatecompany" class="btn btn-primary btn-sm">确定</button>
             </div>
         </div>
     </div>
@@ -45,14 +45,14 @@
                         <label>选择审批人</label>
                         <div class="input-group">
                             <div class="input-group-prepend">
-                                <select class="form-control" id="account_group">
+                                <select class="form-control form-control-sm" id="account_group">
                                     <option value="0">所有分组</option>
                                     <% for (const dw in accountGroup) { %>
                                         <option value="<%= dw %>"><%= accountGroup[dw] %></option>
                                     <% } %>
                                 </select>
                             </div>
-                            <select class="form-control" id="account_list">
+                            <select class="form-control form-control-sm" id="account_list">
                                 <option value="0">选择审批人</option>
                                 <% for (const account of accountList) { %>
                                     <option value="<%= account.id %>"><%= account.name %><% if (account.role !== '') { %>(<%= account.role %>)<% } %><% if (account.company !== '') { %> -<%= account.company %><% } %></option>
@@ -82,9 +82,9 @@
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                    <button type="button" data-sumbit="sumbit_change" data-category="up_change" class="btn btn-primary up-change">确认上报</button>
-                    <button type="button" data-sumbit="sumbit_change" data-category="save_change" class="btn btn-success save-change">保存修改</button>
+                    <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                    <button type="button" data-sumbit="sumbit_change" data-category="up_change" class="btn btn-primary btn-sm up-change">确认上报</button>
+                    <button type="button" data-sumbit="sumbit_change" data-category="save_change" class="btn btn-success btn-sm save-change">保存修改</button>
                 </div>
             </form>
         </div>
@@ -213,9 +213,9 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <!--<button type="button" class="add-list-btn btn btn-outline-primary">添加空白清单</button>-->
-                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="cancel-list-btn">取消</button>
-                <button type="button" class="add-list-btn btn btn-primary">添加</button>
+                <!--<button type="button" class="add-list-btn btn btn-sm btn-outline-primary">添加空白清单</button>-->
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal" id="cancel-list-btn">取消</button>
+                <button type="button" class="add-list-btn btn btn-primary btn-sm">添加</button>
             </div>
         </div>
     </div>
@@ -312,9 +312,9 @@
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                    <button type="button" data-sumbit="sumbit_change" data-category="up_change" class="btn btn-primary up-change">确认上报</button>
-                    <button type="button" data-sumbit="sumbit_change" data-category="save_change" class="btn btn-success save-change">保存修改</button>
+                    <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                    <button type="button" data-sumbit="sumbit_change" data-category="up_change" class="btn btn-primary btn-sm up-change">确认上报</button>
+                    <button type="button" data-sumbit="sumbit_change" data-category="save_change" class="btn btn-success btn-sm save-change">保存修改</button>
                 </div>
             </div>
         </div>
@@ -406,7 +406,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>
@@ -455,13 +455,13 @@
                                 <% if (a.status === 2) { %>
                                     <div class="form-group">
                                         <label>审批意见<b class="text-danger">*</b></label>
-                                        <textarea class="form-control" name="sdesc">同意</textarea>
+                                        <textarea class="form-control form-control-sm" name="sdesc">同意</textarea>
                                         <input type="hidden" name="audit_id" value="<%= a.id %>">
                                         <% if (a.usort !== 0 && index+1 === auditList.length) { %>
                                         <!--终审填写批复编号-->
                                         <div class="form-group mt-3">
                                             <label><b class="text-danger">*&nbsp;</b>变更令号(批复编号)</label>
-                                            <input class="form-control" value="<%= change.code %>" name="p_code" type="text">
+                                            <input class="form-control form-control-sm" value="<%= change.code %>" name="p_code" type="text">
                                         </div>
                                         <% } else { %>
                                             <input type="hidden" name="audit_next_id" value="<%= auditList[index+1].id %>">
@@ -478,8 +478,8 @@
                     <input type="hidden" name="w_code" value="<%= change.w_code %>">
                     <input type="hidden" name="change_id" value="<%= change.cid %>">
                     <input type="hidden" name="bills_list" id="change-list-approval" value="">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                    <button type="button" class="btn btn-success approval-btn">确认通过</button>
+                    <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                    <button type="button" class="btn btn-success btn-sm approval-btn">确认通过</button>
                 </div>
                 </form>
             </div>
@@ -526,7 +526,7 @@
                                     <% if (a.status === 2) { %>
                                         <div class="form-group">
                                             <label>审批意见<b class="text-danger">*</b></label>
-                                            <textarea class="form-control" name="sdesc">不同意</textarea>
+                                            <textarea class="form-control form-control-sm" name="sdesc">不同意</textarea>
                                             <input type="hidden" name="audit_id" value="<%= a.id %>">
                                         </div>
                                         <div class="alert alert-warning">
@@ -558,9 +558,9 @@
                 <div class="modal-footer">
                     <input type="hidden" name="w_code" value="<%= change.w_code %>">
                     <input type="hidden" name="change_id" value="<%= change.cid %>">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                    <button type="button" class="btn btn-warning change-approval-back approval-btn">确认退回</button>
-                    <button type="button" class="btn btn-danger change-approval-stop approval-btn" style="display: none">确认终止</button>
+                    <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                    <button type="button" class="btn btn-warning btn-sm change-approval-back approval-btn">确认退回</button>
+                    <button type="button" class="btn btn-danger btn-sm change-approval-stop approval-btn" style="display: none">确认终止</button>
                 </div>
                 </form>
             </div>
@@ -580,11 +580,11 @@
             </div>
             <div class="modal-body">
                 <p>大小限制:30MB,支持office等文档格式、图片格式、压缩包格式</p>
-                <p><input class="btn btn-primary" value="选择文件" type="file" id="upload-file" multiple /></p>
+                <p><input class="btn btn-primary btn-sm" value="选择文件" type="file" id="upload-file" multiple /></p>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <button type="button" class="btn btn-primary" id="upload-file-btn">添加</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>
+                <button type="button" class="btn btn-primary btn-sm" id="upload-file-btn">添加</button>
             </div>
         </div>
     </div>
@@ -603,8 +603,8 @@
             <div class="modal-footer">
                 <input type="hidden" name="cid" value="<%= change.cid %>">
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>" />
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="submit" class="btn btn-warning">确定重审</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="submit" class="btn btn-warning btn-sm">确定重审</button>
             </div>
         </form>
     </div>

+ 15 - 15
app/view/change/modal.ejs

@@ -11,8 +11,8 @@
             <form class="modal-footer" action="/tender/<%- tender.id %>/change/delete" method="post">
                 <input type="hidden" name="cid" id="delete-cid" value="">
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>" />
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <button type="submit" class="btn btn-danger">确定删除</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>
+                <button type="submit" class="btn btn-danger btn-sm">确定删除</button>
             </form>
         </div>
     </div>
@@ -29,22 +29,22 @@
                 <div class="form-group">
                     <label>申请编号<b class="text-danger">*</b></label>
                     <div class="input-group">
-                        <input type="text" class="form-control is-invalid" placeholder="请输入变更令号" value="变更申请编号" id="bj-code">
+                        <input type="text" class="form-control form-control-sm is-invalid" placeholder="请输入变更令号" value="变更申请编号" id="bj-code">
                         <div class="input-group-append" id="autoCodeShow" <% if (codeRule.length === 0) { %>style="display: none"<% } %>>
-                            <button class="btn btn-outline-secondary" type="button" title="自动编号" id="autoCode"><i class="fa fa-repeat"></i></button>
+                            <button class="btn btn-sm btn-outline-secondary" type="button" title="自动编号" id="autoCode"><i class="fa fa-repeat"></i></button>
                         </div>
                         <div class="invalid-feedback" style="display: none" id="bjHint">您输入的编号已存在。</div>
                     </div>
                 </div>
                 <div class="form-group">
                     <label>工程名称<b class="text-danger">*</b></label>
-                    <input class="form-control" value="" type="text" id="bj-name">
+                    <input class="form-control form-control-sm" value="" type="text" id="bj-name">
                     <div class="invalid-feedback" style="display: none" id="name_error_msg">名称超过100个字,请缩减名称。</div>
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="addCancel">关闭</button>
-                <a href="javascript: void(0)" class="btn btn-primary" id="addOk">确认添加</a>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal" id="addCancel">关闭</button>
+                <a href="javascript: void(0)" class="btn btn-primary btn-sm" id="addOk">确认添加</a>
             </div>
         </div>
     </div>
@@ -90,7 +90,7 @@
                         </h5>
                         <h5 class="my-3">连接符</h5>
                         <div class="form-group">
-                            <select class="form-control connector-change">
+                            <select class="form-control form-control-sm connector-change">
                                 <option disabled selected>请选择</option>
                                 <% for (const index in ruleConst.connectorString) { %>
                                     <option value="<%- index %>" <% if (tender.c_connector !== null && tender.c_connector === parseInt(index)) { %>selected<% } %>><%- ruleConst.connectorString[index] %></option>
@@ -99,7 +99,7 @@
                         </div>
                         <h5 class="my-3">添加新规则组件</h5>
                         <div class="form-group">
-                            <select class="form-control rule-change">
+                            <select class="form-control form-control-sm rule-change">
                                 <option disabled selected>请选择组件</option>
                                 <% for (const index in ruleConst.ruleString) { %>
                                 <option value="<%- index %>"><%- ruleConst.ruleString[index] %></option>
@@ -108,20 +108,20 @@
                         </div>
                         <div class="form-group" id="format" style="display: none">
                             <label>自动编号位数</label>
-                            <input min="3" class="form-control" step="1" max="6" value="3" type="number">
+                            <input min="3" class="form-control form-control-sm" step="1" max="6" value="3" type="number">
                         </div>
                         <div class="form-group" id="text" style="display: none">
                             <label>起始编号</label>
-                            <input class="form-control" value="001" type="text">
+                            <input class="form-control form-control-sm" value="001" type="text">
                         </div>
-                        <button class="btn btn-outline-primary" id="addRule">添加组件</button>
+                        <button class="btn btn-sm btn-outline-primary" id="addRule">添加组件</button>
                     </div>
                 </div>
             </div>
             <div class="modal-footer">
-                <% if (tender.c_rule_first) { %><button type="button" class="btn btn-secondary" data-dismiss="modal" id="changeFirst">暂时不需要</button><% } %>
-                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="hide_modal" <% if (tender.c_rule_first) { %>style="display: none"<% } %>>关闭</button>
-                <button type="button" class="btn btn-primary" id="setRule">确定添加</button>
+                <% if (tender.c_rule_first) { %><button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal" id="changeFirst">暂时不需要</button><% } %>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal" id="hide_modal" <% if (tender.c_rule_first) { %>style="display: none"<% } %>>关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="setRule">确定添加</button>
             </div>
         </div>
     </div>

+ 6 - 6
app/view/layout/modal.ejs

@@ -8,8 +8,8 @@
             <div class="modal-body">
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" id="modify-permission">提交修改</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="modify-permission">提交修改</button>
             </div>
         </div>
     </div>
@@ -25,16 +25,16 @@
             <div class="modal-body">
                 <div class="form-group">
                     <label>变更编号<b class="text-danger">*</b></label>
-                    <input class="form-control"  value="0006" type="text" readonly>
+                    <input class="form-control form-control-sm"  value="0006" type="text" readonly>
                 </div>
                 <div class="form-group">
                     <label>变更名称<b class="text-danger">*</b></label>
-                    <input class="form-control"  placeholder="输入标段名称" type="text">
+                    <input class="form-control form-control-sm"  placeholder="输入标段名称" type="text">
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary">确定新建</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm">确定新建</button>
             </div>
         </div>
     </div>

+ 2 - 21
app/view/layout/page.ejs

@@ -1,24 +1,5 @@
-<!--<div class="btn-toolbar" role="toolbar" aria-label="Toolbar with button groups">-->
-    <!--<div class="btn-group mr-2" role="group" aria-label="First group">-->
-        <!--<button type="button" class="btn btn-light" disabled title="首页"><i class="fa fa-caret-left"></i></button>-->
-        <!--<button type="button" class="btn btn-light" disabled title="上一页"><i class="fa fa-angle-left"></i></button>-->
-    <!--</div>-->
-    <!--<div class="btn-group mr-2" role="group" aria-label="Second group">-->
-        <!--<button type="button" class="btn btn-light active">1</button>-->
-        <!--<button type="button" class="btn btn-light">2</button>-->
-        <!--<button type="button" class="btn btn-light">3</button>-->
-        <!--<button type="button" class="btn btn-light">4</button>-->
-        <!--<button type="button" class="btn btn-light">5</button>-->
-        <!--<button type="button" class="btn btn-light" title="更多">...</button>-->
-    <!--</div>-->
-    <!--<div class="btn-group" role="group" aria-label="Third group">-->
-        <!--<button type="button" class="btn btn-light" title="下一页"><i class="fa fa-angle-right"></i></button>-->
-        <!--<button type="button" class="btn btn-light" title="尾页"><i class="fa fa-caret-right"></i></button>-->
-    <!--</div>-->
-<!--</div>-->
-
 <nav aria-label="Page navigation example">
-    <ul class="pagination"></ul>
+    <ul class="pagination pagination-sm"></ul>
 </nav>
 <script type="text/javascript" src="/public/js/bootstrap/bootstrap-paginator.js"></script>
 <script type="text/javascript">
@@ -27,7 +8,7 @@
         currentPage: "<%= pageInfo.page %>",
         totalPages: "<%= pageInfo.total %>",
         numberOfPages: 5,
-        size: "normal",
+        size: "small",
         itemContainerClass: function(type, page, current) {
             let className = 'page-item';
             this.currentPage = parseInt(this.currentPage);

+ 2 - 2
app/view/layout/project_list.ejs

@@ -3,7 +3,7 @@
     <span class="name"><%= ctx.session.sessionProject.name %></span>
     <% if (ctx.session.sessionProjectList.length > 0) { %>
     <div class="btn-group">
-        <a class=" btn" data-toggle="dropdown">
+        <a class=" btn btn-sm" data-toggle="dropdown">
             <span class="fa fa-caret-down" data-toggle="tooltip" data-placement="bottom" title="切换项目"></span>
         </a>
         <div class="dropdown-menu">
@@ -15,7 +15,7 @@
         </div>
     </div>
     <% } %>
-    <a href="/project/info" class="btn" data-toggle="tooltip" data-placement="bottom" title="项目设置"><i
+    <a href="/project/info" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="项目设置"><i
             class="fa fa-cogs"></i></a>
 </div>
 <% } %>

+ 1 - 1
app/view/layout/tender_list.ejs

@@ -1,7 +1,7 @@
 <div class="poj-name">
     <span class="name" id="tenderName"><%- ctx.session.sessionUser.tenderName %></span>
     <div class="btn-group">
-        <a class=" btn" data-toggle="dropdown">
+        <a class=" btn btn-sm" data-toggle="dropdown">
             <span class="fa fa-caret-down" data-toggle="tooltip" data-placement="bottom" title="切换标段"></span>
         </a>
         <div class="dropdown-menu">

+ 7 - 7
app/view/ledger/audit_modal.ejs

@@ -20,7 +20,7 @@
                             <% } else if (auditors[i].status === auditConst.status.checking) { %>
                             <div class="form-group">
                                 <label>审批意见<b class="text-danger">*</b></label>
-                                <textarea class="form-control" name="opinion">同意</textarea>
+                                <textarea class="form-control form-control-sm" name="opinion">同意</textarea>
                             </div>
                             <% } %>
                         </li>
@@ -29,10 +29,10 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>" />
                 <input type="hidden" name="checkType" value="<%= auditConst.status.checked %>" />
-                <button type="submit" class="btn btn-success" >确认通过</button>
+                <button type="submit" class="btn btn-success btn-sm" >确认通过</button>
             </div>
         </form>
     </div>
@@ -58,7 +58,7 @@
                             <% } else if (auditors[i].status === auditConst.status.checking) { %>
                             <div class="form-group">
                                 <label>审批意见<b class="text-danger">*</b></label>
-                                <textarea class="form-control" name="opinion">不同意</textarea>
+                                <textarea class="form-control form-control-sm" name="opinion">不同意</textarea>
                             </div>
                             <div class="alert alert-warning">审批退回,将直接退回给上报人。</div>
                             <% } %>
@@ -68,10 +68,10 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>" />
                 <input type="hidden" name="checkType" value="<%= auditConst.status.checkNo %>" />
-                <button type="submit" class="btn btn-warning" >确认退回</button>
+                <button type="submit" class="btn btn-warning btn-sm" >确认退回</button>
             </div>
         </form>
     </div>
@@ -203,7 +203,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>

+ 2 - 2
app/view/ledger/explode.ejs

@@ -36,7 +36,7 @@
                         <div class="input-group-prepend">
                             <span class="input-group-text" id="basic-addon1">表达式</span>
                         </div>
-                        <input type="text" class="form-control m-0" id="bills-expr" readonly="">
+                        <input type="text" class="form-control form-control-sm m-0" id="bills-expr" readonly="">
                     </div>
                 </div>
             </div>
@@ -82,7 +82,7 @@
                                         <div class="input-group-prepend">
                                             <span class="input-group-text" id="basic-addon1">表达式</span>
                                         </div>
-                                        <input type="text" class="form-control m-0" id="pos-expr" readonly="">
+                                        <input type="text" class="form-control form-control-sm m-0" id="pos-expr" readonly="">
                                     </div>
                                 </div>
                             </li>

+ 15 - 15
app/view/ledger/explode_modal.ejs

@@ -19,8 +19,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" id="upload-ledger-ok">确认上传</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="upload-ledger-ok">确认上传</button>
             </div>
         </div>
     </div>
@@ -35,16 +35,16 @@
             <div class="modal-body">
                 <div class="form-group">
                     <label for="exampleFormControlFile1">Excel模板</label>
-                    <div class="form-control"><a id="downloadDealTemplate" href="/tender/<%- ctx.tender.id %>/deal/download/template.xls" class="btn btn-sm btn-link">下载</a></div>
+                    <div class="form-control form-control-sm"><a id="downloadDealTemplate" href="/tender/<%- ctx.tender.id %>/deal/download/template.xls" class="btn btn-sm btn-link">下载</a></div>
                 </div>
                 <div class="form-group">
                     <label for="exampleFormControlFile1">上传签约清单Excel文件</label>
-                    <div class="form-control"><input type="file" class="form-control-file" id="deal-bills-file"></div>
+                    <div class="form-control form-control-sm"><input type="file" class="form-control-file" id="deal-bills-file"></div>
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" id="upload-deal-bills">确认上传</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="upload-deal-bills">确认上传</button>
             </div>
         </div>
     </div>
@@ -74,8 +74,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <button type="button" class="btn btn-primary" id="batch-ok">确定</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>
+                <button type="button" class="btn btn-primary btn-sm" id="batch-ok">确定</button>
             </div>
         </div>
     </div>
@@ -93,14 +93,14 @@
                     <label>选择审批人</label>
                     <div class="input-group">
                         <div class="input-group-prepend">
-                            <select class="form-control" id="account_group">
+                            <select class="form-control form-control-sm" id="account_group">
                                 <option value="0">所有分组</option>
                                 <% for (const dw in accountGroup) { %>
                                     <option value="<%= dw %>"><%= accountGroup[dw] %></option>
                                 <% } %>
                             </select>
                         </div>
-                        <select class="form-control" id="account_list">
+                        <select class="form-control form-control-sm" id="account_list">
                             <option value="0">选择审批人</option>
                             <% for (const account of accountList) { %>
                                 <option value="<%= account.id %>"><%= account.name %><% if (account.role !== '') { %>(<%= account.role %>)<% } %><% if (account.company !== '') { %> -<%= account.company %><% } %></option>
@@ -124,9 +124,9 @@
                 </div>
             </div>
             <form class="modal-footer" method="post" action="/tender/<%- tender.id %>/ledger/audit/start" onsubmit="return checkAuditorFrom()">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>">
-                <button class="btn btn-primary" type="submit">确认上报</button>
+                <button class="btn btn-primary btn-sm" type="submit">确认上报</button>
             </form>
         </div>
     </div>
@@ -240,8 +240,8 @@
             </div>
             <form class="modal-footer" action="/tender/<%- tender.id %>/ledger/audit/start" method="post" onsubmit="return checkAuditorFrom()">
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="submit" class="btn btn-primary">确认上报</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="submit" class="btn btn-primary btn-sm">确认上报</button>
             </form>
         </div>
     </div>
@@ -374,7 +374,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>

+ 15 - 15
app/view/material/audit_modal.ejs

@@ -11,14 +11,14 @@
                     <label>选择审批人</label>
                     <div class="input-group">
                         <div class="input-group-prepend">
-                            <select class="form-control" id="account_group">
+                            <select class="form-control form-control-sm" id="account_group">
                                 <option value="0">所有分组</option>
                                 <% for (const dw in accountGroup) { %>
                                     <option value="<%= dw %>"><%= accountGroup[dw] %></option>
                                 <% } %>
                             </select>
                         </div>
-                        <select class="form-control" id="account_list">
+                        <select class="form-control form-control-sm" id="account_list">
                             <option value="0">选择审批人</option>
                             <% for (const account of accountList) { %>
                                 <option value="<%= account.id %>"><%= account.name %><% if (account.role !== '') { %>(<%= account.role %>)<% } %><% if (account.company !== '') { %> -<%= account.company %><% } %></option>
@@ -42,9 +42,9 @@
                 </div>
             </div>
             <form class="modal-footer" method="post" action="<%- preUrl %>/audit/start" onsubmit="return checkAuditorFrom()">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>">
-                <button class="btn btn-primary" type="submit">确认上报</button>
+                <button class="btn btn-primary btn-sm" type="submit">确认上报</button>
             </form>
         </div>
     </div>
@@ -109,7 +109,7 @@
                                     <% } else if (auditors[iA].status === auditConst.status.checking) { %>
                                     <div class="form-group">
                                         <label>审批意见<b class="text-danger">*</b></label>
-                                        <textarea class="form-control" name="opinion">同意</textarea>
+                                        <textarea class="form-control form-control-sm" name="opinion">同意</textarea>
                                     </div>
                                     <% } %>
                                 </li>
@@ -120,10 +120,10 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>" />
                 <input type="hidden" name="checkType" value="<%= auditConst.status.checked %>" />
-                <button type="submit" class="btn btn-success" >确认通过</button>
+                <button type="submit" class="btn btn-success btn-sm" >确认通过</button>
             </div>
         </form>
     </div>
@@ -185,7 +185,7 @@
                                     <% } else if (auditors[iA].status === auditConst.status.checking) { %>
                                     <div class="form-group">
                                         <label>审批意见<b class="text-danger">*</b></label>
-                                        <textarea class="form-control" name="opinion">不同意</textarea>
+                                        <textarea class="form-control form-control-sm" name="opinion">不同意</textarea>
                                     </div>
                                     <% } %>
                                 </li>
@@ -196,10 +196,10 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>" />
                 <input type="hidden" name="checkType" value="<%= auditConst.status.checkNo %>" />
-                <button type="submit" class="btn btn-warning" >确认退回</button>
+                <button type="submit" class="btn btn-warning btn-sm" >确认退回</button>
             </div>
         </form>
     </div>
@@ -332,7 +332,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>
@@ -418,7 +418,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>
@@ -503,7 +503,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>
@@ -618,8 +618,8 @@
                 </div>
                 <form class="modal-footer" method="post" action="<%- preUrl %>/audit/start" onsubmit="return checkAuditorFrom()">
                     <input type="hidden" name="_csrf" value="<%= ctx.csrf %>">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                    <button class="btn btn-primary" type="submit">确认上报</button>
+                    <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                    <button class="btn btn-primary btn-sm" type="submit">确认上报</button>
                 </form>
             </div>
         </div>

+ 1 - 1
app/view/material/info.ejs

@@ -33,7 +33,7 @@
                             <div class="input-group-prepend">
                                 <span class="input-group-text" id="basic-addon1">增税税率</span>
                             </div>
-                            <select class="form-control col-1" id="changeRate">
+                            <select class="form-control form-control-sm col-1" id="changeRate">
                                 <% if (!material.readOnly) { %>
                                 <option value="9" <% if(material.rate === 9) { %>selected<% } %>>9%</option>
                                 <option value="10" <% if(material.rate === 10) { %>selected<% } %>>10%</option>

+ 4 - 4
app/view/material/list_modal.ejs

@@ -8,9 +8,9 @@
             </div>
             <div class="modal-body">
                 <div class="input-group input-group-sm mb-2">
-                    <input type="text" class="form-control" name="search" id="search_input" placeholder="输入 工料编号 / 名称 检索" aria-describedby="button-addon2">
+                    <input type="text" class="form-control form-control-sm" name="search" id="search_input" placeholder="输入 工料编号 / 名称 检索" aria-describedby="button-addon2">
                     <div class="input-group-append">
-                        <button class="btn btn-outline-secondary" type="button" id="search_btn"><i class="fa fa-search"></i></button>
+                        <button class="btn btn-outline-secondary btn-sm" type="button" id="search_btn"><i class="fa fa-search"></i></button>
                     </div>
                 </div>
                 <div class="modal-height-300">
@@ -36,8 +36,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" id="add_material_bill">确定添加</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="add_material_bill">确定添加</button>
             </div>
         </div>
     </div>

+ 6 - 6
app/view/material/modal.ejs

@@ -10,7 +10,7 @@
             <div class="modal-body">
                 <div class="form-group">
                     <label>调差期</label>
-                    <input class="form-control" value="第 <%- materials.length + 1 %> 期" type="text" readonly="">
+                    <input class="form-control form-control-sm" value="第 <%- materials.length + 1 %> 期" type="text" readonly="">
                 </div>
                 <div class="form-group">
                     <label>本期调差,包含计量期<span class="ml-2 text-danger" id="show_order" style="display: none">第<b class="mx-2"></b>期</span></label>
@@ -29,8 +29,8 @@
             <div class="modal-footer">
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>" />
                 <input type="hidden" name="s_order" value="" id="s_order" />
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="submit" id="addMaterial" class="btn btn-primary">确定添加</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="submit" id="addMaterial" class="btn btn-primary btn-sm">确定添加</button>
             </div>
         </form>
     </div>
@@ -51,8 +51,8 @@
             <div class="modal-footer">
                 <input type="hidden" name="material_id" value="<%= materials[0].id %>">
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>" />
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <button type="submit" class="btn btn-danger">确定删除</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>
+                <button type="submit" class="btn btn-danger btn-sm">确定删除</button>
             </div>
         </form>
     </div>
@@ -135,7 +135,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>

+ 3 - 3
app/view/measure/audit.ejs

@@ -195,7 +195,7 @@
                                     <div class="input-group-prepend">
                                         <span class="input-group-text" id="basic-addon3">表号前缀</span>
                                     </div>
-                                    <input type="text" class="form-control" id="basic-url" aria-describedby="basic-addon3">
+                                    <input type="text" class="form-control form-control-sm" id="basic-url" aria-describedby="basic-addon3">
                                 </div>
                             </div>
                         </div>
@@ -231,12 +231,12 @@
                             </div>
                             <div class="form-group">
                                 <label>计算式说明:</label>
-                                <textarea class="form-control"></textarea>
+                                <textarea class="form-control form-control-sm"></textarea>
                             </div>
                             <div class="form-group">
                                 <a href="#edit-img" data-toggle="modal" data-target="#edit-img"  class="pull-right">添加草图</a>
                                 <label>计算草图:</label>
-                                <p class="form-control"><img src="img/sketch/2.png" class="d-100"></p>
+                                <p class="form-control form-control-sm"><img src="img/sketch/2.png" class="d-100"></p>
                             </div>
                         </div>
                     </div>

+ 7 - 7
app/view/measure/audit_modal.ejs

@@ -20,7 +20,7 @@
                             <% } else if (auditors[i].status === auditConst.status.checking) { %>
                             <div class="form-group">
                                 <label>审批意见<b class="text-danger">*</b></label>
-                                <textarea class="form-control" name="opinion"></textarea>
+                                <textarea class="form-control form-control-sm" name="opinion"></textarea>
                             </div>
                             <% } %>
                         </li>
@@ -29,11 +29,11 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>" />
                 <input type="hidden" name="mid" value="<%- measure.mid %>" />
                 <input type="hidden" name="checkType" value="<%= auditConst.status.checked %>" />
-                <button type="submit" class="btn btn-success" >确认通过</button>
+                <button type="submit" class="btn btn-success btn-sm" >确认通过</button>
             </div>
         </form>
     </div>
@@ -59,7 +59,7 @@
                             <% } else if (auditors[i].status === auditConst.status.checking) { %>
                             <div class="form-group">
                                 <label>审批意见<b class="text-danger">*</b></label>
-                                <textarea class="form-control" name="opinion"></textarea>
+                                <textarea class="form-control form-control-sm" name="opinion"></textarea>
                             </div>
                             <% } %>
                         </li>
@@ -68,11 +68,11 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>" />
                 <input type="hidden" name="mid" value="<%- measure.mid %>" />
                 <input type="hidden" name="checkType" value="<%= auditConst.status.checkNo %>" />
-                <button type="submit" class="btn btn-warning" >确认退回</button>
+                <button type="submit" class="btn btn-warning btn-sm" >确认退回</button>
             </div>
         </form>
     </div>
@@ -101,7 +101,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>

+ 2 - 2
app/view/measure/compare_modal.ejs

@@ -14,8 +14,8 @@
                 </table>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" id="select-qi-ok">确认</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="select-qi-ok">确认</button>
             </div>
         </div>
     </div>

+ 13 - 13
app/view/measure/stage_modal.ejs

@@ -10,21 +10,21 @@
             <div class="modal-body">
                 <div class="form-group">
                     <label>期</label>
-                    <input class="form-control" value="第 <%- stages.length + 1 %> 期" type="text" readonly="">
+                    <input class="form-control form-control-sm" value="第 <%- stages.length + 1 %> 期" type="text" readonly="">
                 </div>
                 <div class="form-group">
                     <label>计量年月</label>
-                    <input class="datepicker-here form-control" placeholder="点击选择年月" data-view="months" data-min-view="months" data-date-format="yyyy-MM" data-language="zh" type="text" name="date" autocomplete="off">
+                    <input class="datepicker-here form-control form-control-sm" placeholder="点击选择年月" data-view="months" data-min-view="months" data-date-format="yyyy-MM" data-language="zh" type="text" name="date" autocomplete="off">
                 </div>
                 <div class="form-group">
                     <label>开始-截止日期</label>
-                    <input class="datepicker-here form-control" placeholder="点击选择时间" data-range="true" data-multiple-dates-separator=" ~ " data-language="zh" type="text" name="period" autocomplete="off">
+                    <input class="datepicker-here form-control form-control-sm" placeholder="点击选择时间" data-range="true" data-multiple-dates-separator=" ~ " data-language="zh" type="text" name="period" autocomplete="off">
                 </div>
             </div>
             <div class="modal-footer">
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>" />
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="submit" class="btn btn-primary" id="add-stage-btn">确定添加</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="submit" class="btn btn-primary btn-sm" id="add-stage-btn">确定添加</button>
             </div>
         </form>
     </div>
@@ -45,8 +45,8 @@
             <div class="modal-footer">
                 <input type="hidden" name="stage_id" value="<%= stages[0].id %>">
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>" />
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <button type="submit" class="btn btn-danger">确定删除</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>
+                <button type="submit" class="btn btn-danger btn-sm">确定删除</button>
             </div>
         </form>
     </div>
@@ -129,7 +129,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>
@@ -145,22 +145,22 @@
             <div class="modal-body">
                 <div class="form-group">
                     <label>期</label>
-                    <input class="form-control" value="第 <%- stages[0].order %> 期" type="text" readonly="" name="name">
+                    <input class="form-control form-control-sm" value="第 <%- stages[0].order %> 期" type="text" readonly="" name="name">
                 </div>
                 <div class="form-group">
                     <label>计量年月</label>
-                    <input class="datepicker-here form-control" id="edit-date" name="date" placeholder="点击选择年月" data-view="months" data-min-view="months" data-date-format="yyyy-MM" data-language="zh" type="text">
+                    <input class="datepicker-here form-control form-control-sm" id="edit-date" name="date" placeholder="点击选择年月" data-view="months" data-min-view="months" data-date-format="yyyy-MM" data-language="zh" type="text">
                 </div>
                 <div class="form-group">
                     <label>开始-截止日期</label>
-                    <input class="datepicker-here form-control" id="edit-period" name="period" placeholder="点击选择时间" data-range="true" data-multiple-dates-separator=" ~ " data-language="zh" type="text">
+                    <input class="datepicker-here form-control form-control-sm" id="edit-period" name="period" placeholder="点击选择时间" data-range="true" data-multiple-dates-separator=" ~ " data-language="zh" type="text">
                 </div>
             </div>
             <div class="modal-footer">
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>" />
                 <input type="hidden" name="order" value="<%- stages[0].order %>">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="submit" class="btn btn-primary" id="edit-ok" >确定修改</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="submit" class="btn btn-primary btn-sm" id="edit-ok" >确定修改</button>
             </div>
         </form>
     </div>

+ 28 - 28
app/view/measure/wlist_modal.ejs

@@ -9,27 +9,27 @@
                 <div class="form-group">
                     <label>中间计量编号<b class="text-danger">*</b></label>
                     <div class="input-group">
-                        <input type="text" class="form-control" placeholder="请输入中间计量编号" value="WJQR1-201711" id="mj-code">
+                        <input type="text" class="form-control form-control-sm" placeholder="请输入中间计量编号" value="WJQR1-201711" id="mj-code">
                         <div class="input-group-append">
-                            <button class="btn btn-outline-secondary" type="button" title="自动编号" id="autoCode"><i class="fa fa-repeat"></i></button>
+                            <button class="btn btn-outline-secondary btn-sm" type="button" title="自动编号" id="autoCode"><i class="fa fa-repeat"></i></button>
                         </div>
                         <div class="invalid-feedback" style="display: none" id="mj-Hint">您输入的编号已存在</div>
                     </div>
                 </div>
                 <div class="form-group">
                     <label>计量月份</label>
-                    <input data-view="months" data-min-view="months" class="datepicker-here form-control" placeholder="按时间筛选" type="text" data-date-format="yyyy MM " data-language="zh" id="mj-date">
+                    <input data-view="months" data-min-view="months" class="datepicker-here form-control form-control-sm" placeholder="按时间筛选" type="text" data-date-format="yyyy MM " data-language="zh" id="mj-date">
                 </div>
                 <div class="form-group">
                     <label>计量期</label>
-                    <select class="form-control">
+                    <select class="form-control form-control-sm">
                         <option disabled>选填</option>
                     </select>
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="addCancel">关闭</button>
-                <button type="button" class="btn btn-primary" id="addOk">添加</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal" id="addCancel">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="addOk">添加</button>
             </div>
         </div>
     </div>
@@ -55,9 +55,9 @@
                         <div class="form-group">
                             <label>中间计量编号<b class="text-danger">*</b></label>
                             <div class="input-group">
-                                <input type="text" class="form-control" placeholder="请输入中间计量编号" value="WJQR1-201711">
+                                <input type="text" class="form-control form-control-sm" placeholder="请输入中间计量编号" value="WJQR1-201711">
                                 <div class="input-group-append">
-                                    <button class="btn btn-outline-secondary" type="button" title="自动编号"><i class="fa fa-repeat"></i></button>
+                                    <button class="btn btn-outline-secondary btn-sm" type="button" title="自动编号"><i class="fa fa-repeat"></i></button>
                                 </div>
                             </div>
                         </div>
@@ -67,7 +67,7 @@
                         </div>
                         <div class="form-group">
                             <label>计量期</label>
-                            <select class="form-control">
+                            <select class="form-control form-control-sm">
                                 <option>选填</option>
                                 <option>15</option>
                                 <option>14</option>
@@ -97,7 +97,7 @@
                         </h5>
                         <h5>添加新规则组件</h5>
                         <div class="form-group">
-                            <select class="form-control">
+                            <select class="form-control form-control-sm">
                                 <option disabled selected>请选择组件</option>
                                 <% for (const index in ruleConst.ruleString) { %>
                                 <option value="<%- index %>"><%- ruleConst.ruleString[index] %></option>
@@ -106,20 +106,20 @@
                         </div>
                         <div class="form-group" id="format" style="display: none">
                             <label>自动编号位数</label>
-                            <input min="3" class="form-control" step="1" max="6" value="3" type="number">
+                            <input min="3" class="form-control form-control-sm" step="1" max="6" value="3" type="number">
                         </div>
                         <div class="form-group" id="text" style="display: none">
                             <label>起始编号</label>
-                            <input class="form-control" value="001" type="text">
+                            <input class="form-control form-control-sm" value="001" type="text">
                         </div>
-                        <button class="btn btn-primary" id="addRule">添加组件</button>
+                        <button class="btn btn-primary btn-sm" id="addRule">添加组件</button>
                     </div>
                 </div>
             </div>
             <div class="modal-footer d-flex justify-content-between">
                 <div>
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                    <button type="button" class="btn btn-primary">确定</button>
+                    <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                    <button type="button" class="btn btn-primary btn-sm">确定</button>
                 </div>
             </div>
         </div>
@@ -136,22 +136,22 @@
                 <div class="form-group">
                     <label>中间计量编号<b class="text-danger">*</b></label>
                     <div class="input-group">
-                        <input id="codeEdit" type="text" class="form-control" placeholder="请输入中间计量编号" value="WJQR1-201711">
+                        <input id="codeEdit" type="text" class="form-control form-control-sm" placeholder="请输入中间计量编号" value="WJQR1-201711">
                         <div class="input-group-append">
-                            <button class="btn btn-outline-secondary" type="button" title="自动编号"><i class="fa fa-repeat"></i></button>
+                            <button class="btn btn-outline-secondary btn-sm" type="button" title="自动编号"><i class="fa fa-repeat"></i></button>
                         </div>
                     </div>
                 </div>
                 <div class="form-group">
                     <label>计量月份</label>
-                    <input data-view="months" data-min-view="months" class="datepicker-here form-control" placeholder="按时间筛选" type="text" data-date-format="yyyy MM " data-language="zh">
+                    <input data-view="months" data-min-view="months" class="datepicker-here form-control form-control-sm" placeholder="按时间筛选" type="text" data-date-format="yyyy MM " data-language="zh">
                 </div>
             </div>
             <div class="modal-footer d-flex justify-content-between">
                 <a href="javascript: void(0)" data-toggle="modal" data-target="#del" class="btn btn-outline-danger btn-sm pull-right">删除 WJQR1-201710</a>
                 <div>
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                    <button type="button" class="btn btn-primary" id="editOk">确定</button>
+                    <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                    <button type="button" class="btn btn-primary btn-sm" id="editOk">确定</button>
                 </div>
             </div>
         </div>
@@ -191,7 +191,7 @@
                 </h5>
                 <h5>添加新规则组件</h5>
                 <div class="form-group">
-                    <select class="form-control">
+                    <select class="form-control form-control-sm">
                         <option disabled selected>请选择组件</option>
                         <% for (const index in ruleConst.ruleString) { %>
                         <option value="<%- index %>"><%- ruleConst.ruleString[index] %></option>
@@ -200,17 +200,17 @@
                 </div>
                 <div class="form-group" id="format" style="display: none">
                     <label>自动编号位数</label>
-                    <input min="3" class="form-control" step="1" max="6" value="3" type="number">
+                    <input min="3" class="form-control form-control-sm" step="1" max="6" value="3" type="number">
                 </div>
                 <div class="form-group" id="text" style="display: none">
                     <label>起始编号</label>
-                    <input class="form-control" value="001" type="text">
+                    <input class="form-control form-control-sm" value="001" type="text">
                 </div>
-                <button class="btn btn-primary" id="addRule">添加组件</button>
+                <button class="btn btn-primary btn-sm" id="addRule">添加组件</button>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <button class="btn btn-primary" id="setRule">确定</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>
+                <button class="btn btn-primary btn-sm" id="setRule">确定</button>
             </div>
         </div>
     </div>
@@ -223,8 +223,8 @@
                 <h5>确认删除 <span id="code">WJQR1-201710</span> ?</h5>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-danger" id="delOk">确认删除</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-danger btn-sm" id="delOk">确认删除</button>
             </div>
         </div>
     </div>

+ 3 - 3
app/view/measure/work.ejs

@@ -173,7 +173,7 @@
                                     <div class="input-group-prepend">
                                         <span class="input-group-text" id="basic-addon3">表号前缀</span>
                                     </div>
-                                    <input type="text" class="form-control" id="basic-url" aria-describedby="basic-addon3">
+                                    <input type="text" class="form-control form-control-sm" id="basic-url" aria-describedby="basic-addon3">
                                 </div>
                             </div>
                         </div>
@@ -209,12 +209,12 @@
                             </div>
                             <div class="form-group">
                                 <label>计算式说明:</label>
-                                <textarea class="form-control"></textarea>
+                                <textarea class="form-control form-control-sm"></textarea>
                             </div>
                             <div class="form-group">
                                 <a href="#edit-img" data-toggle="modal" data-target="#edit-img"  class="pull-right">添加草图</a>
                                 <label>计算草图:</label>
-                                <p class="form-control"><img src="img/sketch/2.png" class="d-100"></p>
+                                <p class="form-control form-control-sm"><img src="img/sketch/2.png" class="d-100"></p>
                             </div>
                         </div>
                     </div>

+ 24 - 24
app/view/measure/work_modal.ejs

@@ -9,27 +9,27 @@
                 <div class="form-group">
                     <label>中间计量编号<b class="text-danger">*</b></label>
                     <div class="input-group">
-                        <input type="text" class="form-control" placeholder="请输入中间计量编号" value="WJQR1-201711" id="mj-code">
+                        <input type="text" class="form-control form-control-sm" placeholder="请输入中间计量编号" value="WJQR1-201711" id="mj-code">
                         <div class="input-group-append">
-                            <button class="btn btn-outline-secondary" type="button" title="自动编号" id="autoCode"><i class="fa fa-repeat"></i></button>
+                            <button class="btn btn-outline-secondary btn-sm" type="button" title="自动编号" id="autoCode"><i class="fa fa-repeat"></i></button>
                         </div>
                         <div class="invalid-feedback" style="display: none" id="mj-Hint">您输入的编号已存在</div>
                     </div>
                 </div>
                 <div class="form-group">
                     <label>计量月份</label>
-                    <input data-view="months" data-min-view="months" class="datepicker-here form-control" placeholder="按时间筛选" type="text" data-date-format="yyyy MM " data-language="zh" id="mj-date">
+                    <input data-view="months" data-min-view="months" class="datepicker-here form-control form-control-sm" placeholder="按时间筛选" type="text" data-date-format="yyyy MM " data-language="zh" id="mj-date">
                 </div>
                 <div class="form-group">
                     <label>计量期</label>
-                    <select class="form-control">
+                    <select class="form-control form-control-sm">
                         <option disabled>选填</option>
                     </select>
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="addCancel">关闭</button>
-                <button type="button" class="btn btn-primary" id="addOk">添加</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal" id="addCancel">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="addOk">添加</button>
             </div>
         </div>
     </div>
@@ -43,9 +43,9 @@
             </div>
             <div class="modal-body">
                 <div class="input-group mb-3">
-                    <input type="text" class="form-control" placeholder="输入项目节编号/名称 检索">
+                    <input type="text" class="form-control form-control-sm" placeholder="输入项目节编号/名称 检索">
                     <div class="input-group-append">
-                        <button class="btn btn-primary" type="button" id="search-pos">检索</button>
+                        <button class="btn btn-primary btn-sm" type="button" id="search-pos">检索</button>
                     </div>
                 </div>
                 <!--检索结果-->
@@ -63,8 +63,8 @@
                 </table>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" id="chooseBills">选择计量清单</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="chooseBills">选择计量清单</button>
             </div>
         </div>
     </div>
@@ -78,9 +78,9 @@
             </div>
             <div class="modal-body">
                 <div class="input-group mb-3">
-                    <input type="text" class="form-control" placeholder="输入清单编号/名称 检索">
+                    <input type="text" class="form-control form-control-sm" placeholder="输入清单编号/名称 检索">
                     <div class="input-group-append">
-                        <button class="btn btn-primary" type="button" id="search-bills">检索</button>
+                        <button class="btn btn-primary btn-sm" type="button" id="search-bills">检索</button>
                     </div>
                 </div>
                 <!--检索结果-->
@@ -95,8 +95,8 @@
                 </table>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-primary" id="choosePos">选择计量范围</button>
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="choosePos">选择计量范围</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>
@@ -128,7 +128,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>
@@ -144,9 +144,9 @@
                 <div class="form-group">
                     <label>搜索审批人</label>
                     <div class="input-group">
-                        <input class="form-control" placeholder="请输入姓名进行检索" type="text" id="searchName">
+                        <input class="form-control form-control-sm" placeholder="请输入姓名进行检索" type="text" id="searchName">
                         <div class="input-group-append">
-                            <button class="btn btn-outline-secondary" type="button" id="searchAccount"><i class="fa fa-search"></i></button>
+                            <button class="btn btn-outline-secondary btn-sm" type="button" id="searchAccount"><i class="fa fa-search"></i></button>
                         </div>
                     </div>
                 </div>
@@ -169,8 +169,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" id="auditStart">确认上报</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="auditStart">确认上报</button>
             </div>
         </div>
     </div>
@@ -194,8 +194,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-primary" id="auditRestart">确认上报</button>
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="auditRestart">确认上报</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>
@@ -227,7 +227,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>
@@ -257,8 +257,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" >确认</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" >确认</button>
             </div>
         </div>
     </div>

+ 1 - 1
app/view/profile/info.ejs

@@ -18,7 +18,7 @@
                         <input-text label="手机" value="<%= accountData.mobile %>" name="mobile" maxlength="11"></input-text>
                         <input-text label="电话" value="<%= accountData.telephone %>" name="telephone"></input-text>
                         <input type="hidden" name="_csrf" value="<%= ctx.csrf %>">
-                        <button type="submit" class="btn btn-primary" id="base-submit">确认修改</button>
+                        <button type="submit" class="btn btn-primary btn-sm" id="base-submit">确认修改</button>
                     </form>
                 </div>
             </div>

+ 1 - 1
app/view/profile/safe.ejs

@@ -16,7 +16,7 @@
                         <input-text label="新密码" password="true" name="new_password" id="new_password"></input-text>
                         <input-text label="确认新密码" password="true" name="confirm_password"></input-text>
                         <input type="hidden" name="_csrf" value="<%= ctx.csrf %>">
-                        <button type="submit" class="btn btn-primary" id="modify-password">修改密码</button>
+                        <button type="submit" class="btn btn-primary btn-sm" id="modify-password">修改密码</button>
                         <% } else { %>
                         <p>SSO用户请到<a href="#">此处</a>修改密码</p>
                         <% } %>

+ 1 - 1
app/view/profile/sign.ejs

@@ -31,7 +31,7 @@
                             <div><img src="/profile/qrCode" width="150"></div>
                             <small class="form-text text-danger">微信扫码使用在线手写程序</small>
                         </div>
-                        <button type="button" class="btn btn-danger" id="delete-sign">移除签名</button>
+                        <button type="button" class="btn btn-danger btn-sm" id="delete-sign">移除签名</button>
                         <div class="form-group">
                             <label>签名图预览</label>
                             <div>

+ 7 - 7
app/view/profile/sms.ejs

@@ -14,9 +14,9 @@
                     <div class="form-group">
                         <label>已认证手机(用于 找回密码、接收通知)</label>
                         <div class="input-group mb-3">
-                            <input class="form-control" readonly="" value="<%= accountData.auth_mobile %>">
+                            <input class="form-control form-control-sm" readonly="" value="<%= accountData.auth_mobile %>">
                             <div class="input-group-append">
-                                <button class="btn btn-outline-secondary" id="change-mobile">修改手机</button>
+                                <button class="btn btn-outline-secondary btn-sm" id="change-mobile">修改手机</button>
                             </div>
                         </div>
                     </div>
@@ -26,19 +26,19 @@
                         <div class="form-group">
                             <label>认证手机(用于 找回密码、接收通知)</label>
                             <div class="input-group mb-3">
-                                <input class="form-control" placeholder="输入11位手机号码" value="" name="auth_mobile" maxlength="11"/>
+                                <input class="form-control form-control-sm" placeholder="输入11位手机号码" value="" name="auth_mobile" maxlength="11"/>
                                 <div class="input-group-append">
-                                    <button class="btn btn-outline-secondary" type="button" id="get-code">获取验证码</button>
+                                    <button class="btn btn-outline-secondary btn-sm" type="button" id="get-code">获取验证码</button>
                                 </div>
                             </div>
                         </div>
                         <div class="form-group">
                             <div class="input-group mb-3">
-                                <input class="form-control" type="text" readonly="readonly" name="code" placeholder="输入短信中的6位验证码" />
+                                <input class="form-control form-control-sm" type="text" readonly="readonly" name="code" placeholder="输入短信中的6位验证码" />
                                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>">
                             </div>
                         </div>
-                        <button type="button" class="btn btn-secondary disabled" id="bind-btn">确认绑定</button>
+                        <button type="button" class="btn btn-secondary btn-sm disabled" id="bind-btn">确认绑定</button>
                     </form>
                     <% if (accountData.auth_mobile !== '') { %>
                     <!--短信通知开关(已有认证手机后显示)-->
@@ -61,7 +61,7 @@
                                 </div>
                             </div>
                             <% } %>
-                            <button type="submit" class="btn btn-primary">确认修改</button>
+                            <button type="submit" class="btn btn-primary btn-sm">确认修改</button>
                         </form>
                     </div>
                     <% } %>

+ 1 - 1
app/view/report/index.ejs

@@ -112,7 +112,7 @@
                                         <div class="input-group-prepend">
                                             <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上一页" onclick="rptControlObj.prePage(this)"><i class="fa fa-chevron-left"></i></button>
                                         </div>
-                                        <input class="form-control" id="rpt_page_num" value="1/10" onKeydown="rptControlObj.onKeydown(event, this)" style="width:60px" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="输入页码按回车键,快速跳转">
+                                        <input class="form-control form-control-sm" id="rpt_page_num" value="1/10" onKeydown="rptControlObj.onKeydown(event, this)" style="width:60px" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="输入页码按回车键,快速跳转">
                                         <div class="input-group-append">
                                             <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下一页" onclick="rptControlObj.nextPage(this)"><i class="fa fa-chevron-right"></i></button>
                                         </div>

+ 17 - 17
app/view/report/rpt_all_popup.ejs

@@ -14,7 +14,7 @@
                             <div class="input-group-prepend">
                                 <span class="input-group-text">上</span>
                             </div>
-                            <input type="number" class="form-control" id="elementMargin_Top" value="12" onchange="rptControlObj.changeMargin('Top', this)" onkeyup="rptControlObj.changeMargin('Top', this)">
+                            <input type="number" class="form-control form-control-sm" id="elementMargin_Top" value="12" onchange="rptControlObj.changeMargin('Top', this)" onkeyup="rptControlObj.changeMargin('Top', this)">
                         </div>
                     </div>
                 </div>
@@ -24,7 +24,7 @@
                             <div class="input-group-prepend">
                                 <span class="input-group-text">左</span>
                             </div>
-                            <input type="number" class="form-control" id="elementMargin_Left" value="12" onchange="rptControlObj.changeMargin('Left', this)" onkeyup="rptControlObj.changeMargin('Left', this)">
+                            <input type="number" class="form-control form-control-sm" id="elementMargin_Left" value="12" onchange="rptControlObj.changeMargin('Left', this)" onkeyup="rptControlObj.changeMargin('Left', this)">
                         </div>
                     </div>
                     <div class="col-6">
@@ -35,7 +35,7 @@
                             <div class="input-group-prepend">
                                 <span class="input-group-text">右</span>
                             </div>
-                            <input type="number" class="form-control" id="elementMargin_Right" value="12" onchange="rptControlObj.changeMargin('Right', this)" onkeyup="rptControlObj.changeMargin('Right', this)">
+                            <input type="number" class="form-control form-control-sm" id="elementMargin_Right" value="12" onchange="rptControlObj.changeMargin('Right', this)" onkeyup="rptControlObj.changeMargin('Right', this)">
                         </div>
                     </div>
                 </div>
@@ -45,15 +45,15 @@
                             <div class="input-group-prepend">
                                 <span class="input-group-text">下</span>
                             </div>
-                            <input type="number" class="form-control" id="elementMargin_Bottom"value="12" onchange="rptControlObj.changeMargin('Bottom', this)" onkeyup="rptControlObj.changeMargin('Bottom', this)">
+                            <input type="number" class="form-control form-control-sm" id="elementMargin_Bottom"value="12" onchange="rptControlObj.changeMargin('Bottom', this)" onkeyup="rptControlObj.changeMargin('Bottom', this)">
                         </div>
                     </div>
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-link float-left" data-dismiss="modal" onclick="rptControlObj.restoreMargine(); zTreeOprObj.changeCfg();">恢复默认值</button>
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <a href="javascript:void(0)" class="btn btn-primary" data-dismiss="modal" onclick="rptControlObj.confirmCfgChange()">确定</a>
+                <button type="button" class="btn btn-link btn-sm float-left" data-dismiss="modal" onclick="rptControlObj.restoreMargine(); zTreeOprObj.changeCfg();">恢复默认值</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>
+                <a href="javascript:void(0)" class="btn btn-primary btn-sm" data-dismiss="modal" onclick="rptControlObj.confirmCfgChange()">确定</a>
             </div>
         </div>
     </div>
@@ -103,9 +103,9 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-link float-left" data-dismiss="modal" onclick="rptControlObj.restoreFormat(); zTreeOprObj.changeCfg();">恢复默认值</button>
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <a href="javascript:void(0)" class="btn btn-primary" data-dismiss="modal" onclick="rptControlObj.confirmCfgChange()">确定</a>
+                <button type="button" class="btn btn-link btn-sm float-left" data-dismiss="modal" onclick="rptControlObj.restoreFormat(); zTreeOprObj.changeCfg();">恢复默认值</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>
+                <a href="javascript:void(0)" class="btn btn-primary btn-sm" data-dismiss="modal" onclick="rptControlObj.confirmCfgChange()">确定</a>
             </div>
         </div>
     </div>
@@ -150,8 +150,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <a onclick="rptControlObj.getExcel()" class="btn btn-primary" data-dismiss="modal">确定导出</a>
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                <a onclick="rptControlObj.getExcel()" class="btn btn-primary btn-sm" data-dismiss="modal">确定导出</a>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>
             </div>
         </div>
     </div>
@@ -168,8 +168,8 @@
             <div class="modal-body" id="eSignatureBodyDiv">
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal" onclick="rptSignatureHelper.removeSelectSignature()">取消</button>
-                <a onclick="rptSignatureHelper.setupAfterSelectSignature()" class="btn btn-primary" data-dismiss="modal">确定</a>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal" onclick="rptSignatureHelper.removeSelectSignature()">取消</button>
+                <a onclick="rptSignatureHelper.setupAfterSelectSignature()" class="btn btn-primary btn-sm" data-dismiss="modal">确定</a>
             </div>
         </div>
     </div>
@@ -202,7 +202,7 @@
                             <div class="input-group-prepend">
                                 <span class="input-group-text" id="inputGroup-sizing-sm"><i class="fa fa-search"></i></span>
                             </div>
-                            <input type="text" class="form-control" placeholder="搜索...">
+                            <input type="text" class="form-control form-control-sm" placeholder="搜索...">
                         </div>
                         <div class="modal-height-300" id="project_account_select_div">
                         </div>
@@ -217,13 +217,13 @@
                                         <div class="input-group-prepend">
                                             <span class="input-group-text" id="inputGroup-sizing-sm">角色名称</span>
                                         </div>
-                                        <input type="text" class="form-control" id="acc_role_name" placeholder="最多10个字符">
+                                        <input type="text" class="form-control form-control-sm" id="acc_role_name" placeholder="最多10个字符">
                                     </div>
                                     <div class="input-group input-group-sm mb-1">
                                         <div class="input-group-prepend">
                                             <span class="input-group-text" id="inputGroup-sizing-sm">绑定成员</span>
                                         </div>
-                                        <select class="form-control" id="project_account_select_dom">
+                                        <select class="form-control form-control-sm" id="project_account_select_dom">
                                         </select>
                                     </div>
                                     <a href="javascript:void(0)" onclick="rptSignatureHelper.createNewRole(this)" class="btn btn-sm btn-primary">添加角色</a>

+ 4 - 4
app/view/report/rpt_content_format.ejs

@@ -37,10 +37,10 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-link float-left" onclick="rptControlObj.restoreCustCFG()">恢复默认值</button>
-                <button type="button" class="btn btn-link float-left" onclick="rptControlObj.saveCustCfg()">存为默认值</button>
-                <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="rptControlObj.confirmCfgChange()">确定</button>
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                <button type="button" class="btn btn-link btn-sm float-left" onclick="rptControlObj.restoreCustCFG()">恢复默认值</button>
+                <button type="button" class="btn btn-link btn-sm float-left" onclick="rptControlObj.saveCustCfg()">存为默认值</button>
+                <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" onclick="rptControlObj.confirmCfgChange()">确定</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>
             </div>
         </div>
     </div>

+ 3 - 3
app/view/revise/history.ejs

@@ -71,15 +71,15 @@
                             <div class="alert alert-warning">历史修订暂不支持查看历史台帐。</div>
                             <div class="form-group mt-2">
                                 <label >提交人</label>
-                                <input id="user-name" type="" class="form-control" value="<%- revise.user_name %>" disabled>
+                                <input id="user-name" type="" class="form-control form-control-sm" value="<%- revise.user_name %>" disabled>
                             </div>
                             <div class="form-group">
                                 <label >修订内容<b class="text-danger">*</b></label>
-                                <textarea id="content" class="form-control" value="编写错漏5" rows="12" readonly=""><%- revise.content %></textarea>
+                                <textarea id="content" class="form-control form-control-sm" value="编写错漏5" rows="12" readonly=""><%- revise.content %></textarea>
                             </div>
                             <div class="form-group">
                                 <label >审批完成</label>
-                                <input id="end-time" type="" class="form-control" value="<%- (revise.end_time ? revise.end_time.toLocaleString() : '') %>" disabled>
+                                <input id="end-time" type="" class="form-control form-control-sm" value="<%- (revise.end_time ? revise.end_time.toLocaleString() : '') %>" disabled>
                             </div>
                         </div>
                     </div>

+ 1 - 1
app/view/revise/info.ejs

@@ -121,7 +121,7 @@
                             </div>
                             <div class="form-group">
                                 <label >修订内容<b class="text-danger">*</b></label>
-                                <textarea class="form-control form-control-sm" id="content" value="<%- revise.content %>" rows="12" <% if (readOnly) { %> readonly="" <% } %>><%- revise.content %></textarea>
+                                <textarea class="form-control form-control-sm" id="content" org-value="<%- revise.content %>" rows="12" <% if (readOnly) { %> readonly="" <% } %>><%- revise.content %></textarea>
                             </div>
                         </div>
                     </div>

+ 12 - 12
app/view/setting/category_modal.ejs

@@ -8,7 +8,7 @@
             <div class="modal-body">
                 <div class="form-group">
                     <label>类别名称</label>
-                    <input class="form-control"  placeholder="请使用简短的名称" type="text" name="name">
+                    <input class="form-control form-control-sm"  placeholder="请使用简短的名称" type="text" name="name">
                 </div>
                 <div class="form-group">
                     <label>类型</label>
@@ -17,8 +17,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" id="add-cate-ok">确认添加</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="add-cate-ok">确认添加</button>
             </div>
         </div>
     </div>
@@ -33,7 +33,7 @@
             <div class="modal-body">
                 <div class="form-group">
                     <label>类别名称</label>
-                    <input class="form-control"  placeholder="请使用简短的名称" value="年份" type="text" name="name">
+                    <input class="form-control form-control-sm"  placeholder="请使用简短的名称" value="年份" type="text" name="name">
                 </div>
                 <div class="form-group">
                     <label>类型</label>
@@ -42,8 +42,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" id="edit-cate-ok">确认</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="edit-cate-ok">确认</button>
             </div>
         </div>
     </div>
@@ -68,8 +68,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" id="add-ok">确认</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="add-ok">确认</button>
             </div>
         </div>
     </div>
@@ -85,8 +85,8 @@
                 <h5>删除后,数据无法恢复,请谨慎操作。</h5>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-danger" id="del-cate-ok">确认删除</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-danger btn-sm" id="del-cate-ok">确认删除</button>
             </div>
         </div>
     </div>
@@ -115,8 +115,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-danger" id="del-cate-value-ok">确认删除</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-danger btn-sm" id="del-cate-value-ok">确认删除</button>
             </div>
         </div>
     </div>

+ 4 - 4
app/view/setting/info.ejs

@@ -14,15 +14,15 @@
                     <% if (projectData.user_account === ctx.session.sessionUser.account) { %><form id="info-form" action="/<%= ctx.controllerName %>/updateinfo/<%= projectData.id === undefined ? 0 : projectData.id %>?_csrf=<%= ctx.csrf %>" method="post"><% } %>
                         <div class="form-group">
                             <label>项目编号</label>
-                            <input class="form-control" value="<%= projectData.code%>" type="text" readonly>
+                            <input class="form-control form-control-sm" value="<%= projectData.code%>" type="text" readonly>
                         </div>
                         <div class="form-group">
                             <label>项目名称</label>
-                            <input class="form-control" value="<%= projectData.name%>" type="text" <% if (projectData.user_account !== ctx.session.sessionUser.account) { %>readonly<% } else { %>name="name" id="name" placeholder="请输入项目名称"<% } %>>
+                            <input class="form-control form-control-sm" value="<%= projectData.name%>" type="text" <% if (projectData.user_account !== ctx.session.sessionUser.account) { %>readonly<% } else { %>name="name" id="name" placeholder="请输入项目名称"<% } %>>
                         </div>
                         <div class="form-group">
                             <label>管理员</label>
-                            <input class="form-control" value="<%= projectData.user_account %>" type="text" readonly>
+                            <input class="form-control form-control-sm" value="<%= projectData.user_account %>" type="text" readonly>
                         </div>
                         <div class="form-group">
                             <label>销售负责人</label>
@@ -40,7 +40,7 @@
                         </div>
                         <div class="form-group">
                             <label>创建时间</label>
-                            <input class="form-control" value=<%= dateStr%> type="text" readonly>
+                            <input class="form-control form-control-sm" value=<%= dateStr%> type="text" readonly>
                         </div>
                         <% if (projectData.user_account === ctx.session.sessionUser.account) { %></form><% } %>
                 </div>

+ 23 - 23
app/view/setting/user_modal.ejs

@@ -9,7 +9,7 @@
             <div class="modal-body">
                 <div class="form-group">
                     <label><b class="text-danger">*</b>账号组</label>
-                    <select class="form-control" name="account_group">
+                    <select class="form-control form-control-sm" name="account_group">
                         <option value="0">请选择</option>
                         <% for (const dw in accountGroup) { %>
                         <option value="<%= dw %>"><%= accountGroup[dw] %></option>
@@ -18,7 +18,7 @@
                 </div>
                 <div class="form-group">
                     <label>登录账号<b class="text-danger">*</b></label>
-                    <input class="form-control" name="account" placeholder="支持英文数字组合" type="text">
+                    <input class="form-control form-control-sm" name="account" placeholder="支持英文数字组合" type="text">
                     <input value="" class="account-check" type="hidden">
                     <div class="invalid-feedback">
                         该账号已存在。
@@ -27,36 +27,36 @@
                 <div class="form-group">
                     <label>登录密码<b class="text-danger">*</b></label>
                     <div class="input-group">
-                        <input type="text" name="password" class="form-control" placeholder="密码支持英文数字及符号">
+                        <input type="text" name="password" class="form-control form-control-sm" placeholder="密码支持英文数字及符号">
                         <div class="input-group-append">
-                            <button id="rand-password" class="btn btn-outline-secondary" type="button">随机密码</button>
+                            <button id="rand-password" class="btn btn-outline-secondary btn-sm" type="button">随机密码</button>
                         </div>
                     </div>
                 </div>
                 <div class="form-group">
                     <label>姓名<b class="text-danger">*</b></label>
-                    <input class="form-control" name="name" value="" type="text">
+                    <input class="form-control form-control-sm" name="name" value="" type="text">
                 </div>
                 <div class="form-group">
                     <label>单位名称<b class="text-danger">*</b></label>
-                    <input class="form-control" name="company" value="" type="text">
+                    <input class="form-control form-control-sm" name="company" value="" type="text">
                 </div>
                 <div class="form-group">
                     <label>角色/职位<b class="text-danger">*</b></label>
-                    <input class="form-control" name="role" value="" type="text">
+                    <input class="form-control form-control-sm" name="role" value="" type="text">
                 </div>
                 <div class="form-group">
                     <label>手机<b class="text-danger">*</b></label>
-                    <input class="form-control" name="mobile" value="" type="number">
+                    <input class="form-control form-control-sm" name="mobile" value="" type="number">
                 </div>
                 <div class="form-group">
                     <label>电话</label>
-                    <input class="form-control" name="telephone" placeholder="格式000-0000000" type="text">
+                    <input class="form-control form-control-sm" name="telephone" placeholder="格式000-0000000" type="text">
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="submit" class="btn btn-primary">确定添加</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="submit" class="btn btn-primary btn-sm">确定添加</button>
             </div>
             </form>
         </div>
@@ -73,7 +73,7 @@
             <div class="modal-body">
                 <div class="form-group">
                     <label>账号组<b class="text-danger">*</b></label>
-                    <select class="form-control" name="account_group">
+                    <select class="form-control form-control-sm" name="account_group">
                         <option value="0">请选择</option>
                         <% for (const dw in accountGroup) { %>
                             <option value="<%= dw %>"><%= accountGroup[dw] %></option>
@@ -82,7 +82,7 @@
                 </div>
                 <div class="form-group">
                     <label>登录账号<b class="text-danger">*</b></label>
-                    <input class="form-control" value="" name="account" placeholder="支持英文数字组合" type="text">
+                    <input class="form-control form-control-sm" value="" name="account" placeholder="支持英文数字组合" type="text">
                     <input value="" class="account-check" type="hidden">
                     <div class="invalid-feedback">
                         该账号已存在。
@@ -93,38 +93,38 @@
                     <div class="input-group">
                         <input type="text" id="reset-password" class="form-control" placeholder="密码支持英文数字及符号">
                         <div class="input-group-append">
-                            <button id="reset-password-btn" class="btn btn-outline-secondary" type="button">修改密码</button>
+                            <button id="reset-password-btn" class="btn btn-outline-secondary btn-sm" type="button">修改密码</button>
                         </div>
                     </div>
                     <span class="form-text text-success">如果账号已有认证手机,密码也将发送至该手机。</span>
                 </div>
                 <div class="form-group">
                     <label>姓名<b class="text-danger">*</b></label>
-                    <input class="form-control" value="" name="name" type="text">
+                    <input class="form-control form-control-sm" value="" name="name" type="text">
                     <small class="form-text text-muted">修改姓名,将影响所有该账号参与数据</small>
                 </div>
                 <div class="form-group">
                     <label>单位名称<b class="text-danger">*</b></label>
-                    <input class="form-control" value="" name="company" type="text">
+                    <input class="form-control form-control-sm" value="" name="company" type="text">
                 </div>
                 <div class="form-group">
                     <label>角色/职位<b class="text-danger">*</b></label>
-                    <input class="form-control" value="" name="role" type="text">
+                    <input class="form-control form-control-sm" value="" name="role" type="text">
                 </div>
                 <div class="form-group">
                     <label>手机<b class="text-danger">*</b></label>
-                    <input class="form-control" value="" name="mobile" type="number">
+                    <input class="form-control form-control-sm" value="" name="mobile" type="number">
                 </div>
                 <div class="form-group">
                     <label>电话</label>
-                    <input class="form-control" value="" name="telephone" placeholder="格式000-0000000" type="text">
+                    <input class="form-control form-control-sm" value="" name="telephone" placeholder="格式000-0000000" type="text">
                 </div>
             </div>
             <div class="modal-footer">
                 <input type="hidden" name="id" id="user-id" value="">
-                <!--<button type="button" class="btn btn-outline-danger" data-dismiss="modal">删除账号</button>-->
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="submit" class="btn btn-primary">提交修改</button>
+                <!--<button type="button" class="btn btn-outline-danger btn-sm" data-dismiss="modal">删除账号</button>-->
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="submit" class="btn btn-primary btn-sm">提交修改</button>
             </div>
             </form>
         </div>
@@ -145,7 +145,7 @@
                 <p>当前限制账号总数:<b><%= projectData.max_user %></b></p>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>

+ 14 - 14
app/view/setting/user_permission_modal.ejs

@@ -9,7 +9,7 @@
             <div class="modal-body">
                 <div class="form-group">
                     <label><b class="text-danger">*</b>账号组</label>
-                    <select class="form-control" name="account_group">
+                    <select class="form-control form-control-sm" name="account_group">
                         <option value="0">请选择</option>
                         <% for (const dw in accountGroup) { %>
                         <option value="<%= dw %>"><%= accountGroup[dw] %></option>
@@ -18,7 +18,7 @@
                 </div>
                 <div class="form-group">
                     <label>登录账号<b class="text-danger">*</b></label>
-                    <input class="form-control" name="account" placeholder="支持英文数字组合" type="text">
+                    <input class="form-control form-control-sm" name="account" placeholder="支持英文数字组合" type="text">
                     <input value="" class="account-check" type="hidden">
                     <div class="invalid-feedback">
                         该账号已存在。
@@ -27,36 +27,36 @@
                 <div class="form-group">
                     <label>登录密码<b class="text-danger">*</b></label>
                     <div class="input-group">
-                        <input type="text" name="password" class="form-control" placeholder="密码支持英文数字及符号">
+                        <input type="text" name="password" class="form-control form-control-sm" placeholder="密码支持英文数字及符号">
                         <div class="input-group-append">
-                            <button id="rand-password" class="btn btn-outline-secondary" type="button">随机密码</button>
+                            <button id="rand-password" class="btn btn-outline-secondary btn-sm" type="button">随机密码</button>
                         </div>
                     </div>
                 </div>
                 <div class="form-group">
                     <label>姓名<b class="text-danger">*</b></label>
-                    <input class="form-control" name="name" value="" type="text">
+                    <input class="form-control form-control-sm" name="name" value="" type="text">
                 </div>
                 <div class="form-group">
                     <label>单位名称<b class="text-danger">*</b></label>
-                    <input class="form-control" name="company" value="" type="text">
+                    <input class="form-control form-control-sm" name="company" value="" type="text">
                 </div>
                 <div class="form-group">
                     <label>角色/职位<b class="text-danger">*</b></label>
-                    <input class="form-control" name="role" value="" type="text">
+                    <input class="form-control form-control-sm" name="role" value="" type="text">
                 </div>
                 <div class="form-group">
                     <label>手机<b class="text-danger">*</b></label>
-                    <input class="form-control" name="mobile" value="" type="number">
+                    <input class="form-control form-control-sm" name="mobile" value="" type="number">
                 </div>
                 <div class="form-group">
                     <label>电话</label>
-                    <input class="form-control" name="telephone" placeholder="格式000-0000000" type="text">
+                    <input class="form-control form-control-sm" name="telephone" placeholder="格式000-0000000" type="text">
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="submit" class="btn btn-primary">确定添加</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="submit" class="btn btn-primary btn-sm">确定添加</button>
             </div>
             </form>
         </div>
@@ -93,8 +93,8 @@
             </div>
             <div class="modal-footer">
                 <input type="hidden" name="id" value="">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="submit" class="btn btn-primary">提交修改</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="submit" class="btn btn-primary btn-sm">提交修改</button>
             </div>
             </form>
         </div>
@@ -115,7 +115,7 @@
                 <p>当前限制账号总数:<b><%= projectData.max_user %></b></p>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>

+ 34 - 34
app/view/stage/audit_modal.ejs

@@ -11,9 +11,9 @@
                 <!--<div class="form-group">-->
                     <!--<label>搜索审批人</label>-->
                     <!--<div class="input-group">-->
-                        <!--<input class="form-control" placeholder="请输入姓名进行检索" type="text" id="searchName">-->
+                        <!--<input class="form-control form-control-sm" placeholder="请输入姓名进行检索" type="text" id="searchName">-->
                         <!--<div class="input-group-append">-->
-                            <!--<button class="btn btn-outline-secondary" type="button" id="searchAccount"><i class="fa fa-search"></i></button>-->
+                            <!--<button class="btn btn-outline-secondary btn-sm" type="button" id="searchAccount"><i class="fa fa-search"></i></button>-->
                         <!--</div>-->
                     <!--</div>-->
                 <!--</div>-->
@@ -21,14 +21,14 @@
                     <label>选择审批人</label>
                     <div class="input-group">
                         <div class="input-group-prepend">
-                            <select class="form-control" id="account_group">
+                            <select class="form-control form-control-sm" id="account_group">
                                 <option value="0">所有分组</option>
                                 <% for (const dw in accountGroup) { %>
                                     <option value="<%= dw %>"><%= accountGroup[dw] %></option>
                                 <% } %>
                             </select>
                         </div>
-                        <select class="form-control" id="account_list">
+                        <select class="form-control form-control-sm" id="account_list">
                             <option value="0">选择审批人</option>
                             <% for (const account of accountList) { %>
                             <% if (account.id !== ctx.session.sessionUser.accountId) { %>
@@ -64,9 +64,9 @@
                 </div>
             </div>
             <form class="modal-footer" method="post" action="<%- preUrl %>/audit/start" onsubmit="return checkAuditorFrom()">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>">
-                <button class="btn btn-primary" type="submit">确认上报</button>
+                <button class="btn btn-primary btn-sm" type="submit">确认上报</button>
             </form>
         </div>
     </div>
@@ -82,9 +82,9 @@
                 <h5>上报前,需要「完成本期中间计量」。</h5>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <% if (ctx.url !== '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/detail') { %>
-                <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/detail" class="btn btn-primary">进入中间计量</a>
+                <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/detail" class="btn btn-primary btn-sm">进入中间计量</a>
                 <% } %>
             </div>
         </div>
@@ -161,7 +161,7 @@
                                     <% } else if (auditors[iA].status === auditConst.status.checking) { %>
                                     <div class="form-group">
                                         <label>审批意见<b class="text-danger">*</b></label>
-                                        <textarea class="form-control" name="opinion">同意</textarea>
+                                        <textarea class="form-control form-control-sm" name="opinion">同意</textarea>
                                     </div>
                                     <% } %>
                                 </li>
@@ -172,10 +172,10 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>" />
                 <input type="hidden" name="checkType" value="<%= auditConst.status.checked %>" />
-                <button type="submit" class="btn btn-success" >确认通过</button>
+                <button type="submit" class="btn btn-success btn-sm" >确认通过</button>
             </div>
         </form>
     </div>
@@ -247,7 +247,7 @@
                                     <% } else if (auditors[iA].status === auditConst.status.checking) { %>
                                     <div class="form-group">
                                         <label>审批意见<b class="text-danger">*</b></label>
-                                        <textarea class="form-control" name="opinion">不同意</textarea>
+                                        <textarea class="form-control form-control-sm" name="opinion">不同意</textarea>
                                     </div>
                                     <div class="alert alert-warning">
                                         <div class="form-check form-check-inline">
@@ -271,9 +271,9 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>" />
-                <button type="submit" class="btn btn-warning" >确认退回</button>
+                <button type="submit" class="btn btn-warning btn-sm" >确认退回</button>
             </div>
         </form>
     </div>
@@ -289,9 +289,9 @@
                 <h5>审批前,需要「完成本期中间计量」。</h5>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <% if (ctx.url !== '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/detail') { %>
-                <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/detail" class="btn btn-primary">进入中间计量</a>
+                <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/detail" class="btn btn-primary btn-sm">进入中间计量</a>
                 <% } %>
             </div>
         </div>
@@ -425,7 +425,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>
@@ -559,7 +559,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>
@@ -644,7 +644,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>
@@ -759,8 +759,8 @@
                 </div>
                 <form class="modal-footer" method="post" action="<%- preUrl %>/audit/start" onsubmit="return checkAuditorFrom()">
                     <input type="hidden" name="_csrf" value="<%= ctx.csrf %>">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                    <button class="btn btn-primary" type="submit">确认上报</button>
+                    <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                    <button class="btn btn-primary btn-sm" type="submit">确认上报</button>
                 </form>
             </div>
         </div>
@@ -776,9 +776,9 @@
                 <h5>上报前,需要「完成本期中间计量」。</h5>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <% if (ctx.url !== '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/detail') { %>
-                <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/detail" class="btn btn-primary">进入中间计量</a>
+                <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/detail" class="btn btn-primary btn-sm">进入中间计量</a>
                 <% } %>
             </div>
         </div>
@@ -913,7 +913,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>
@@ -981,7 +981,7 @@
                                     <% } else if (auditors[iA].status === auditConst.status.checking) { %>
                                     <div class="form-group">
                                         <label>审批意见<b class="text-danger">*</b></label>
-                                        <textarea class="form-control" name="opinion">同意</textarea>
+                                        <textarea class="form-control form-control-sm" name="opinion">同意</textarea>
                                     </div>
                                     <% } %>
                                 </li>
@@ -992,10 +992,10 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>" />
                 <input type="hidden" name="checkType" value="<%= auditConst.status.checked %>" />
-                <button type="submit" class="btn btn-success" >确认通过</button>
+                <button type="submit" class="btn btn-success btn-sm" >确认通过</button>
             </div>
         </form>
     </div>
@@ -1062,7 +1062,7 @@
                                     <% } else if (auditors[iA].status === auditConst.status.checking) { %>
                                     <div class="form-group">
                                         <label>审批意见<b class="text-danger">*</b></label>
-                                        <textarea class="form-control" name="opinion">不同意</textarea>
+                                        <textarea class="form-control form-control-sm" name="opinion">不同意</textarea>
                                     </div>
                                     <div class="alert alert-warning">
                                         <div class="form-check form-check-inline">
@@ -1086,9 +1086,9 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>" />
-                <button type="submit" class="btn btn-warning" >确认退回</button>
+                <button type="submit" class="btn btn-warning btn-sm" >确认退回</button>
             </div>
         </form>
     </div>
@@ -1104,9 +1104,9 @@
                     <h5>审批前,需要「完成本期中间计量」。</h5>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                    <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                     <% if (ctx.url !== '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/detail') { %>
-                    <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/detail" class="btn btn-primary">进入中间计量</a>
+                    <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/detail" class="btn btn-primary btn-sm">进入中间计量</a>
                     <% } %>
                 </div>
             </div>
@@ -1126,8 +1126,8 @@
                     <h5>确认由「终审-<%= ctx.stage.auditors[ctx.stage.auditors.length-1].name %>」重新审批「第<%= ctx.stage.order %>期」?</h5>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                    <a href="<%- preUrl %>/audit/check/again" class="btn btn-warning">确定重审</a>
+                    <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                    <a href="<%- preUrl %>/audit/check/again" class="btn btn-warning btn-sm">确定重审</a>
                 </div>
             </div>
         </div>

+ 2 - 2
app/view/stage/compare_modal.ejs

@@ -22,8 +22,8 @@
                 </table>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" id="select-qi-ok">确认</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="select-qi-ok">确认</button>
             </div>
         </div>
     </div>

+ 1 - 1
app/view/stage/deal.ejs

@@ -16,7 +16,7 @@
                         <div class="input-group-prepend">
                             <span class="input-group-text" id="basic-addon1">表达式</span>
                         </div>
-                        <input type="text" class="form-control m-0">
+                        <input type="text" class="form-control form-control-sm m-0">
                     </div>
                 </div>
             </div>

+ 21 - 21
app/view/stage/deal_modal.ejs

@@ -9,9 +9,9 @@
                 <div class="form-group">
                     <label>搜索审批人</label>
                     <div class="input-group">
-                        <input class="form-control" placeholder="请输入姓名进行检索" type="text">
+                        <input class="form-control form-control-sm" placeholder="请输入姓名进行检索" type="text">
                         <div class="input-group-append">
-                            <button class="btn btn-outline-secondary" type="button"><i class="fa fa-search"></i></button>
+                            <button class="btn btn-outline-secondary btn-sm" type="button"><i class="fa fa-search"></i></button>
                         </div>
                     </div>
                 </div>
@@ -36,8 +36,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary">确认上报</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm">确认上报</button>
             </div>
         </div>
     </div>
@@ -69,7 +69,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>
@@ -94,7 +94,7 @@
                             <h5 class="card-title">2 王五 <small class="text-muted">监理</small></h5>
                             <div class="form-group">
                                 <label>审批意见<b class="text-danger">*</b></label>
-                                <textarea class="form-control" ></textarea>
+                                <textarea class="form-control form-control-sm" ></textarea>
                             </div>
                         </li>
                         <li class="list-group-item">
@@ -104,8 +104,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-success" >确认通过</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-success btn-sm" >确认通过</button>
             </div>
         </div>
     </div>
@@ -130,7 +130,7 @@
                             <h5 class="card-title">2 王五 <small class="text-muted">监理</small></h5>
                             <div class="form-group">
                                 <label>审批意见<b class="text-danger">*</b></label>
-                                <textarea class="form-control" ></textarea>
+                                <textarea class="form-control form-control-sm" ></textarea>
                             </div>
                             <div class="alert alert-warning">审批退回,将直接退回给上报人。</data-min-view>
                         </li>
@@ -141,8 +141,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-warning" >确认退回</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-warning btn-sm" >确认退回</button>
             </div>
         </div>
     </div>
@@ -173,8 +173,8 @@
                 </table>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary">确定修改</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm">确定修改</button>
             </div>
         </div>
     </div>
@@ -216,8 +216,8 @@
                 </table>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary">确定修改</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm">确定修改</button>
             </div>
         </div>
     </div>
@@ -251,7 +251,7 @@
                 <!--计量期数模式-->
                 <div class="form-group">
                     <label>限制期数</label>
-                    <input class="form-control" type="number">
+                    <input class="form-control form-control-sm" type="number">
                 </div>
                 <!--计量金额模式-->
                 <div class="form-group">
@@ -273,7 +273,7 @@
                 </div>
                 <div class="form-group">
                     <label>限制金额</label>
-                    <input class="form-control" type="number">
+                    <input class="form-control form-control-sm" type="number">
                 </div>
                 <!--公用提示-->
                 <p>设置为:</p>
@@ -281,8 +281,8 @@
                 <p class="pl-3">当期金额直接计量至(扣款限额 - 截止上期金额)</p>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" >确定</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" >确定</button>
             </div>
         </div>
     </div>
@@ -310,8 +310,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" >确定</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" >确定</button>
             </div>
         </div>
     </div>

+ 1 - 1
app/view/stage/detail.ejs

@@ -76,7 +76,7 @@
                             </div>
                             <div class="form-group">
                                 <label>计算式说明:</label>
-                                <textarea class="form-control" readonly="" id="calc-memo"></textarea>
+                                <textarea class="form-control form-control-sm" readonly="" id="calc-memo"></textarea>
                             </div>
                             <div class="form-group">
                                 <div class="d-flex justify-content-between my-3">

+ 10 - 10
app/view/stage/detail_modal.ejs

@@ -34,9 +34,9 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <% if (!stage.readOnly && stage.user_id === ctx.session.sessionUser.accountId) { %>
-                <button type="button" class="btn btn-primary" id="choose-ok">重新生成</button>
+                <button type="button" class="btn btn-primary btn-sm" id="choose-ok">重新生成</button>
                 <% } %>
             </div>
         </div>
@@ -67,9 +67,9 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <% if (!stage.readOnly && stage.user_id === ctx.session.sessionUser.accountId) { %>
-                <button type="button" class="btn btn-primary" id="choose2-ok">确定</button>
+                <button type="button" class="btn btn-primary btn-sm" id="choose2-ok">确定</button>
                 <% } %>
             </div>
         </div>
@@ -91,8 +91,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" id="edit-img-ok">确认</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="edit-img-ok">确认</button>
             </div>
         </div>
     </div>
@@ -118,9 +118,9 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <% if (!stage.readOnly) { %>
-                <button type="button" class="btn btn-primary" >确认</button>
+                <button type="button" class="btn btn-primary btn-sm" >确认</button>
                 <% } %>
             </div>
         </div>
@@ -138,8 +138,8 @@
                 <h5>确认完成后,即可上报本期计量。</h5>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <a id="done-detail" href="javascript: void(0);" class="btn btn-success" >确认完成</a>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>
+                <a id="done-detail" href="javascript: void(0);" class="btn btn-success btn-sm" >确认完成</a>
             </div>
         </div>
     </div>

+ 1 - 1
app/view/stage/gather.ejs

@@ -32,7 +32,7 @@
                         </form>
                         <span class="dropdown-item-text text-danger">
                             <div class="input-group input-group-sm">
-                                <input type="number" step="5" class="form-control m-0" placeholder="100" max="100" min="50" id="over-percent" value="100">
+                                <input type="number" step="5" class="form-control form-control-sm m-0" placeholder="100" max="100" min="50" id="over-percent" value="100">
                                 <div class="input-group-append">
                                     <span class="input-group-text" id="basic-addon2">%</span>
                                 </div>

+ 11 - 11
app/view/stage/index.ejs

@@ -29,7 +29,7 @@
                         <div class="input-group-prepend">
                             <span class="input-group-text" id="basic-addon1">表达式</span>
                         </div>
-                        <input type="text" class="form-control m-0" id="bills-expr" readonly="">
+                        <input type="text" class="form-control form-control-sm m-0" id="bills-expr" readonly="">
                     </div>
                 </div>
             </div>
@@ -71,14 +71,14 @@
                                                 </div>
                                             </div>
                                         </div>
-                                        <input type="text" class="form-control" placeholder="按名称查找" id="pos-search-keyword">
+                                        <input type="text" class="form-control form-control-sm" placeholder="按名称查找" id="pos-search-keyword">
                                         <!--搜索结果显示-->
                                         <div class="input-group-append" >
                                             <span class="input-group-text" id="pos-search-result">结果:0</span>
                                         </div>
                                         <div class="input-group-append" >
-                                            <button class="btn btn-outline-secondary" type="button" title="上一个" id="pos-search-pre"><i class="fa fa-angle-double-left"></i></button>
-                                            <button class="btn btn-outline-secondary" type="button" title="下一个" id="pos-search-next"><i class="fa fa-angle-double-right"></i></button>
+                                            <button class="btn btn-outline-secondary btn-sm" type="button" title="上一个" id="pos-search-pre"><i class="fa fa-angle-double-left"></i></button>
+                                            <button class="btn btn-outline-secondary btn-sm" type="button" title="下一个" id="pos-search-next"><i class="fa fa-angle-double-right"></i></button>
                                         </div>
                                     </div>
                                 </div>
@@ -90,7 +90,7 @@
                                         <div class="input-group-prepend">
                                             <span class="input-group-text" id="basic-addon1">表达式</span>
                                         </div>
-                                        <input type="text" class="form-control m-0" id="pos-expr" readonly="">
+                                        <input type="text" class="form-control form-control-sm m-0" id="pos-expr" readonly="">
                                     </div>
                                 </div>
                             </li>
@@ -115,9 +115,9 @@
                                         <input type="radio" name="searchType" id="empty"> 漏计
                                     </div>
                                 </div>
-                                <input type="text" class="form-control" placeholder="可查找 项目节编号 / 清单编号 /名称" id="keyword">
+                                <input type="text" class="form-control form-control-sm" placeholder="可查找 项目节编号 / 清单编号 /名称" id="keyword">
                                 <div class="input-group-append">
-                                    <button class="btn btn-outline-secondary" type="button" id="searchLedger">搜索</button>
+                                    <button class="btn btn-outline-secondary btn-sm" type="button" id="searchLedger">搜索</button>
                                 </div>
                             </div>
                         </div>
@@ -190,7 +190,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">文件名</span>
                                                     </div>
-                                                    <input type="text" class="form-control" value="asdasd">
+                                                    <input type="text" class="form-control form-control-sm" value="asdasd">
                                                     <div class="input-group-append">
                                                         <span class="input-group-text">.jpg</span>
                                                     </div>
@@ -201,7 +201,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">所在节点</span>
                                                     </div>
-                                                    <input type="text" class="form-control" value="1 第一部分 建筑安装工程非" readonly="">
+                                                    <input type="text" class="form-control form-control-sm" value="1 第一部分 建筑安装工程非" readonly="">
                                                 </div>
                                             </div>
                                             <div class="form-group">
@@ -209,7 +209,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">上传时间</span>
                                                     </div>
-                                                    <input type="text" class="form-control" value="2018-10-20" readonly="">
+                                                    <input type="text" class="form-control form-control-sm" value="2018-10-20" readonly="">
                                                 </div>
                                             </div>
                                             <div class="form-group">
@@ -217,7 +217,7 @@
                                                     <div class="input-group-prepend">
                                                         <span class="input-group-text">备注</span>
                                                     </div>
-                                                    <input type="text" class="form-control" value="">
+                                                    <input type="text" class="form-control form-control-sm" value="">
                                                 </div>
                                             </div>
                                             <div class="form-group">

+ 15 - 15
app/view/stage/measure_modal.ejs

@@ -48,8 +48,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary">添加</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm">添加</button>
             </div>
         </div>
     </div>
@@ -65,9 +65,9 @@
                 <div class="form-group">
                     <label>搜索审批人</label>
                     <div class="input-group">
-                        <input class="form-control" placeholder="请输入姓名进行检索" type="text">
+                        <input class="form-control form-control-sm" placeholder="请输入姓名进行检索" type="text">
                         <div class="input-group-append">
-                            <button class="btn btn-outline-secondary" type="button"><i class="fa fa-search"></i></button>
+                            <button class="btn btn-outline-secondary btn-sm" type="button"><i class="fa fa-search"></i></button>
                         </div>
                     </div>
                 </div>
@@ -92,8 +92,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary">确认上报</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm">确认上报</button>
             </div>
         </div>
     </div>
@@ -125,7 +125,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>
@@ -150,7 +150,7 @@
                             <h5 class="card-title">2 王五 <small class="text-muted">监理</small></h5>
                             <div class="form-group">
                                 <label>审批意见<b class="text-danger">*</b></label>
-                                <textarea class="form-control" ></textarea>
+                                <textarea class="form-control form-control-sm" ></textarea>
                             </div>
                         </li>
                         <li class="list-group-item">
@@ -160,8 +160,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-success" >确认通过</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-success btn-sm" >确认通过</button>
             </div>
         </div>
     </div>
@@ -186,7 +186,7 @@
                             <h5 class="card-title">2 王五 <small class="text-muted">监理</small></h5>
                             <div class="form-group">
                                 <label>审批意见<b class="text-danger">*</b></label>
-                                <textarea class="form-control" ></textarea>
+                                <textarea class="form-control form-control-sm" ></textarea>
                             </div>
                             <div class="alert alert-warning">审批退回,将直接退回给上报人。</data-min-view>
                         </li>
@@ -197,8 +197,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-warning" >确认退回</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-warning btn-sm" >确认退回</button>
             </div>
         </div>
     </div>
@@ -228,8 +228,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" >确认</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" >确认</button>
             </div>
         </div>
     </div>

+ 9 - 9
app/view/stage/modal.ejs

@@ -26,8 +26,8 @@
                 </table>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" id="row-view-ok">确认</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="row-view-ok">确认</button>
             </div>
         </div>
     </div>
@@ -189,9 +189,9 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <% if (!stage.readOnly) { %>
-                <button type="button" class="btn btn-primary" id="usg-bg-ok">添加</button>
+                <button type="button" class="btn btn-primary btn-sm" id="usg-bg-ok">添加</button>
                 <% } %>
             </div>
         </div>
@@ -222,8 +222,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" >确认</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" >确认</button>
             </div>
         </div>
     </div>
@@ -238,12 +238,12 @@
             <div class="modal-body">
                 <div class="form-group">
                     <label for="formGroupExampleInput">大小限制:10MB,支持<span data-toggle="tooltip" data-placement="bottom" title="" data-original-title="doc,docx,xls,xlsx,ppt,pptx,pdf">office等文档格式</span>、<span data-toggle="tooltip" data-placement="bottom" title="" data-original-title="jpg,png,bmp">图片格式</span>、<span data-toggle="tooltip" data-placement="bottom" title="" data-original-title="rar,zip">压缩包格式</span></label>
-                    <input type="file" class="form-control" id="upload-file" multiple>
+                    <input type="file" class="form-control form-control-sm" id="upload-file" multiple>
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" id="upload-file-btn">确认</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="upload-file-btn">确认</button>
             </div>
         </div>
     </div>

+ 8 - 8
app/view/stage/pay_modal.ejs

@@ -27,7 +27,7 @@
                 <!--计量期数模式-->
                 <div class="form-group" dl-type="1">
                     <label>限制期数</label>
-                    <input class="form-control" id="stage-count" type="number">
+                    <input class="form-control form-control-sm" id="stage-count" type="number">
                 </div>
                 <!--计量金额模式-->
                 <div class="form-group" dl-type="2">
@@ -49,7 +49,7 @@
                 </div>
                 <div class="form-group" dl-type="2">
                     <label>限制金额</label>
-                    <input class="form-control" id="tp" type="number">
+                    <input class="form-control form-control-sm" id="tp" type="number">
                 </div>
                 <!--公用提示-->
                 <div id="dl-hint">
@@ -59,9 +59,9 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <% if (!stage.readOnly) { %>
-                <button type="button" class="btn btn-primary" id="deadline-ok">确定</button>
+                <button type="button" class="btn btn-primary btn-sm" id="deadline-ok">确定</button>
                 <% } %>
             </div>
         </div>
@@ -78,7 +78,7 @@
                 <% if (uploadPermission) { %>
                 <div class="form-group">
                     <label for="formGroupExampleInput">大小限制:10MB,支持<span data-toggle="tooltip" data-placement="bottom" title="doc,docx,xls,xlsx,ppt,pptx,pdf">office等文档格式</span>、<span data-toggle="tooltip" data-placement="bottom" title="jpg,png,bmp">图片格式</span>、<span data-toggle="tooltip" data-placement="bottom" title="rar,zip">压缩包格式</span></label>
-                    <input type="file" class="form-control" id="upload-file" multiple>
+                    <input type="file" class="form-control form-control-sm" id="upload-file" multiple>
                 </div>
                 <% } %>
                 <div class="modal-height-500" style="overflow:auto;">
@@ -98,8 +98,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <!--<button type="button" class="btn btn-primary" id="upload-file-btn">确定</button>-->
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <!--<button type="button" class="btn btn-primary btn-sm" id="upload-file-btn">确定</button>-->
             </div>
         </div>
     </div>
@@ -120,7 +120,7 @@
                 </table>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>

+ 1 - 1
app/view/stage/report.ejs

@@ -103,7 +103,7 @@
                                         <div class="input-group-prepend">
                                             <button type="button" class="btn btn-secondary btn-sm" disabled="" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上一页"><i class="fa fa-chevron-left"></i></button>
                                         </div>
-                                        <input class="form-control" value="1/10" style="width:60px" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="输入页码按回车键,快速跳转">
+                                        <input class="form-control form-control-sm" value="1/10" style="width:60px" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="输入页码按回车键,快速跳转">
                                         <div class="input-group-append">
                                             <button type="button" class="btn btn-secondary btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下一页"><i class="fa fa-chevron-right"></i></button>
                                         </div>

+ 13 - 13
app/view/stage/report_modal.ejs

@@ -9,7 +9,7 @@
                 <div class="form-group">
                     <label>搜索审批人</label>
                     <div class="input-group">
-                        <input class="form-control" placeholder="请输入姓名进行检索" type="text">
+                        <input class="form-control form-control-sm" placeholder="请输入姓名进行检索" type="text">
                         <div class="input-group-append">
                             <button class="btn btn-outline-secondary" type="button"><i class="fa fa-search"></i></button>
                         </div>
@@ -36,8 +36,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary">确认上报</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm">确认上报</button>
             </div>
         </div>
     </div>
@@ -69,7 +69,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
             </div>
         </div>
     </div>
@@ -94,7 +94,7 @@
                             <h5 class="card-title">2 王五 <small class="text-muted">监理</small></h5>
                             <div class="form-group">
                                 <label>审批意见<b class="text-danger">*</b></label>
-                                <textarea class="form-control" ></textarea>
+                                <textarea class="form-control form-control-sm" ></textarea>
                             </div>
                         </li>
                         <li class="list-group-item">
@@ -104,8 +104,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-success" >确认通过</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-success btn-sm" >确认通过</button>
             </div>
         </div>
     </div>
@@ -130,7 +130,7 @@
                             <h5 class="card-title">2 王五 <small class="text-muted">监理</small></h5>
                             <div class="form-group">
                                 <label>审批意见<b class="text-danger">*</b></label>
-                                <textarea class="form-control" ></textarea>
+                                <textarea class="form-control form-control-sm" ></textarea>
                             </div>
                             <div class="alert alert-warning">审批退回,将直接退回给上报人。</data-min-view>
                         </li>
@@ -141,8 +141,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-warning" >确认退回</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-warning btn-sm" >确认退回</button>
             </div>
         </div>
     </div>
@@ -158,7 +158,7 @@
                 <div class="form-group">
                     <label>输入提取码</label>
                     <div class="input-group">
-                        <input class="form-control" placeholder="请输入6位提取码" type="text">
+                        <input class="form-control form-control-sm" placeholder="请输入6位提取码" type="text">
                         <div class="input-group-append">
                             <button class="btn btn-outline-secondary" type="button"><i class="fa fa-search"></i></button>
                         </div>
@@ -181,9 +181,9 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                 <!--有结果出现添加-->
-                <button type="button" class="btn btn-primary" >确认添加</button>
+                <button type="button" class="btn btn-primary btn-sm" >确认添加</button>
             </div>
         </div>
     </div>

+ 1 - 1
app/view/stage/stage_sub_menu.ejs

@@ -56,6 +56,6 @@
                 </ul>
             </div>
         <% include ./audit_btn.ejs %>
-        <div class="side-fold"><a href="javascript: void(0)" data-toggle="tooltip" data-placement="top" data-original-title="折叠侧栏" id="to-mini-menu"><i class="fa fa-sign-out fa-flip-horizontal"></i></a></div>
+        <div class="side-fold"><a href="javascript: void(0)" data-toggle="tooltip" data-placement="top" data-original-title="折叠侧栏" id="to-mini-menu"><i class="fa fa-upload fa-rotate-270"></i></a></div>
     </div>
 </div>

+ 1 - 1
app/view/stage/stage_sub_mini_menu.ejs

@@ -55,6 +55,6 @@
             </ul>
         </div>
         <% include ./audit_btn.ejs %>
-        <div class="side-fold"><a href="javascript: void(0);" data-toggle="tooltip" data-placement="top" data-original-title="展开侧栏" id="to-menu"><i class="fa fa-thumb-tack"></i></a></div>
+        <div class="side-fold"><a href="javascript: void(0);" data-toggle="tooltip" data-placement="top" data-original-title="展开侧栏" id="to-menu"><i class="fa fa-upload fa-rotate-90"></i></a></div>
     </div>
 </div>

+ 1 - 1
app/view/tender/cooperation.ejs

@@ -12,7 +12,7 @@
                 <label><%= tp %></label>
                 <div class="form-group form-check">
                     <h5 class="d-inline-block"><span class="badge badge-secondary"><%= user.name %>-<%= user.role %></span></h5>
-                    <h5 class="d-inline-block"><span class="badge badge-secondary">王五-监理 <a href="#" class="btn-danger px-1" title="移除"><i class="fa fa-remove"></i></a></span> </h5>
+                    <h5 class="d-inline-block"><span class="badge badge-secondary">王五-监理 <a href="#" class="btn-danger btn-sm px-1" title="移除"><i class="fa fa-remove"></i></a></span> </h5>
                     <a href="#add" data-toggle="modal" data-target="#add" class="ml-3">添加协作人</a>
                 </div>
             </div>

+ 4 - 4
app/view/tender/cooperationModal.ejs

@@ -9,9 +9,9 @@
                 <div class="form-group">
                     <label>搜索</label>
                     <div class="input-group">
-                        <input class="form-control" placeholder="请输入姓名进行检索" type="text">
+                        <input class="form-control form-control-sm" placeholder="请输入姓名进行检索" type="text">
                         <div class="input-group-append">
-                            <button class="btn btn-outline-secondary" type="button"><i class="fa fa-search"></i></button>
+                            <button class="btn btn-outline-secondary btn-sm" type="button"><i class="fa fa-search"></i></button>
                         </div>
                     </div>
                 </div>
@@ -26,8 +26,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary">确认上报</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm">确认上报</button>
             </div>
         </div>
     </div>

+ 386 - 384
app/view/tender/detail.ejs

@@ -21,518 +21,520 @@
     </div>
     <div class="content-wrap">
         <div class="c-body">
-            <!--金额概况-->
-            <div class="row mx-1 mb-3">
-                <div class="col-auto pr-0">
-                    <div class="card text-center">
-                        <div class="card-body">
-                            <h5 class="card-title"><%- ctx.helper.formatMoney(tender.total_price) %></h5>
-                            <p class="card-text text-muted">0号台帐合同</p>
+            <div class="sjs-height-0">
+                <!--金额概况-->
+                <div class="row mx-1 mb-3">
+                    <div class="col-auto pr-0">
+                        <div class="card text-center">
+                            <div class="card-body">
+                                <h5 class="card-title"><%- ctx.helper.formatMoney(tender.total_price) %></h5>
+                                <p class="card-text text-muted">0号台帐合同</p>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <div class="col-auto pr-0">
-                    <div class="card text-center">
-                        <div class="card-body">
-                            <h5 class="card-title"><%- ctx.helper.formatMoney(tender.gather_tp) %></h5>
-                            <p class="card-text text-muted">本期完成</p>
+                    <div class="col-auto pr-0">
+                        <div class="card text-center">
+                            <div class="card-body">
+                                <h5 class="card-title"><%- ctx.helper.formatMoney(tender.gather_tp) %></h5>
+                                <p class="card-text text-muted">本期完成</p>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <div class="col-auto pr-0">
-                    <div class="card text-center">
-                        <div class="card-body">
-                            <h5 class="card-title"><%- ctx.helper.formatMoney(tender.end_qc_tp) %><small class="text-danger"  data-toggle="tooltip" data-placement="bottom" title="" data-original-title="占合同比例"><%- tender.qc_ratio %>%</small></h5>
-                            <p class="card-text text-muted">截止本期变更</p>
+                    <div class="col-auto pr-0">
+                        <div class="card text-center">
+                            <div class="card-body">
+                                <h5 class="card-title"><%- ctx.helper.formatMoney(tender.end_qc_tp) %><small class="text-danger"  data-toggle="tooltip" data-placement="bottom" title="" data-original-title="占合同比例"><%- tender.qc_ratio %>%</small></h5>
+                                <p class="card-text text-muted">截止本期变更</p>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <div class="col-auto pr-0">
-                    <div class="card text-center">
-                        <div class="card-body">
-                            <h5 class="card-title"><%- ctx.helper.formatMoney(tender.end_gather_tp) %></h5>
-                            <p class="card-text text-muted">截止本期完成</p>
+                    <div class="col-auto pr-0">
+                        <div class="card text-center">
+                            <div class="card-body">
+                                <h5 class="card-title"><%- ctx.helper.formatMoney(tender.end_gather_tp) %></h5>
+                                <p class="card-text text-muted">截止本期完成</p>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <div class="col-auto pr-0">
-                    <div class="card text-center">
-                        <div class="card-body">
-                            <h5 class="card-title"><%- ctx.helper.formatMoney(tender.pre_gather_tp) %></h5>
-                            <p class="card-text text-muted">截止上期完成</p>
+                    <div class="col-auto pr-0">
+                        <div class="card text-center">
+                            <div class="card-body">
+                                <h5 class="card-title"><%- ctx.helper.formatMoney(tender.pre_gather_tp) %></h5>
+                                <p class="card-text text-muted">截止上期完成</p>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <div class="col-auto pr-0">
-                    <div class="card text-center">
-                        <div class="card-body">
-                            <h5 class="card-title"><%- ctx.helper.formatMoney(tender.yf_tp) %></h5>
-                            <p class="card-text text-muted">本期应付</p>
+                    <div class="col-auto pr-0">
+                        <div class="card text-center">
+                            <div class="card-body">
+                                <h5 class="card-title"><%- ctx.helper.formatMoney(tender.yf_tp) %></h5>
+                                <p class="card-text text-muted">本期应付</p>
+                            </div>
                         </div>
                     </div>
                 </div>
-            </div>
-            <!--进度条-->
-            <div class="mb-3">
-                <div class="progress">
-                    <% if (tender.pre_ratio > 0) { %>
-                    <div class="progress-bar bg-success" style="width: <%- tender.pre_ratio %>%;" data-placement="bottom" data-toggle="tooltip" data-original-title="截止上期累计完成:¥<%- ctx.helper.formatMoney(tender.end_gather_tp) %>"><%- tender.pre_ratio %>%</div>
-                    <% } %>
-                    <% if (tender.cur_ratio > 0) { %>
-                    <div class="progress-bar bg-info" style="width: <%- tender.cur_ratio %>%;" data-placement="bottom" data-toggle="tooltip" data-original-title="本期完成:¥<%- ctx.helper.formatMoney(tender.gather_tp) %>"><%- tender.cur_ratio %>%</div>
-                    <% } %>
-                    <% if (tender.other_ratio > 0) { %>
-                    <div class="progress-bar bg-gray" style="width: <%- tender.other_ratio %>%;" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成:¥<%- ctx.helper.formatMoney(tender.other_tp) %>"><%- tender.other_ratio %>%</div>
-                    <% } %>
+                <!--进度条-->
+                <div class="mb-3">
+                    <div class="progress">
+                        <% if (tender.pre_ratio > 0) { %>
+                        <div class="progress-bar bg-success" style="width: <%- tender.pre_ratio %>%;" data-placement="bottom" data-toggle="tooltip" data-original-title="截止上期累计完成:¥<%- ctx.helper.formatMoney(tender.end_gather_tp) %>"><%- tender.pre_ratio %>%</div>
+                        <% } %>
+                        <% if (tender.cur_ratio > 0) { %>
+                        <div class="progress-bar bg-info" style="width: <%- tender.cur_ratio %>%;" data-placement="bottom" data-toggle="tooltip" data-original-title="本期完成:¥<%- ctx.helper.formatMoney(tender.gather_tp) %>"><%- tender.cur_ratio %>%</div>
+                        <% } %>
+                        <% if (tender.other_ratio > 0) { %>
+                        <div class="progress-bar bg-gray" style="width: <%- tender.other_ratio %>%;" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成:¥<%- ctx.helper.formatMoney(tender.other_tp) %>"><%- tender.other_ratio %>%</div>
+                        <% } %>
+                    </div>
                 </div>
-            </div>
-            <ul class="nav nav-tabs">
-                <!--<li class="nav-item">-->
+                <ul class="nav nav-tabs">
+                    <!--<li class="nav-item">-->
                     <!--<a class="nav-link active" data-toggle="tab" href="#tubiao" role="tab">进度表</a>-->
-                <!--</li>-->
-                <li class="nav-item">
-                    <a class="nav-link active" data-toggle="tab" href="#shuxing" role="tab">标段属性</a>
-                </li>
-            </ul>
-            <div class="tab-content">
-                <!--进度表-->
-                <div id="tubiao" class="tab-pane">
-                    <!--月进度图表-->
-                    <div id="chartContainer3" style="height: 300px; width: 100%;" class="my-5">
-                    </div>
-                    <!--期汇总图表-->
-                    <div id="chartContainer4" style="height: 300px; width: 100%;" class="mb-5">
+                    <!--</li>-->
+                    <li class="nav-item">
+                        <a class="nav-link active" data-toggle="tab" href="#shuxing" role="tab">标段属性</a>
+                    </li>
+                </ul>
+                <div class="tab-content">
+                    <!--进度表-->
+                    <div id="tubiao" class="tab-pane">
+                        <!--月进度图表-->
+                        <div id="chartContainer3" style="height: 300px; width: 100%;" class="my-5">
+                        </div>
+                        <!--期汇总图表-->
+                        <div id="chartContainer4" style="height: 300px; width: 100%;" class="mb-5">
+                        </div>
                     </div>
-                </div>
-                <!--标段属性-->
-                <div id="shuxing" class="tab-pane active">
-                    <div class="row my-3">
-                        <div class="col-2">
-                            <div class="nav flex-column nav-pills" >
-                                <a class="nav-link active" data-toggle="pill" href="#v-pills-1" role="tab">标段属性</a>
-                                <a class="nav-link"  data-toggle="pill" href="#v-pills-2" role="tab">小数位数</a>
-                                <a class="nav-link"  data-toggle="pill" href="#v-pills-3" role="tab">清单精度</a>
-                                <a class="nav-link"  data-toggle="pill" href="#v-pills-4" role="tab">合同参数</a>
-                                <a class="nav-link"  data-toggle="pill" href="#v-pills-5" role="tab">显示设置</a>
-                                <a class="nav-link"  data-toggle="pill" href="#v-pills-6" role="tab">章节设置</a>
+                    <!--标段属性-->
+                    <div id="shuxing" class="tab-pane active">
+                        <div class="row m-0 my-3">
+                            <div class="col-2">
+                                <div class="nav flex-column nav-pills" >
+                                    <a class="nav-link active" data-toggle="pill" href="#v-pills-1" role="tab">标段属性</a>
+                                    <a class="nav-link"  data-toggle="pill" href="#v-pills-2" role="tab">小数位数</a>
+                                    <a class="nav-link"  data-toggle="pill" href="#v-pills-3" role="tab">清单精度</a>
+                                    <a class="nav-link"  data-toggle="pill" href="#v-pills-4" role="tab">合同参数</a>
+                                    <a class="nav-link"  data-toggle="pill" href="#v-pills-5" role="tab">显示设置</a>
+                                    <a class="nav-link"  data-toggle="pill" href="#v-pills-6" role="tab">章节设置</a>
+                                </div>
                             </div>
-                        </div>
-                        <div class="col">
-                            <div class="tab-content">
-                                <div class="tab-pane fade show active" id="v-pills-1" role="tabpanel">
-                                    <!--操作-->
-                                    <div class="d-flex justify-content-end mt-3">
-                                        <div>
-                                            <button type="button" class="btn btn-sm btn-outline-primary" id="edit-1"> 编辑</button>
-                                        </div>
-                                        <div style="display: none">
-                                            <button type="button" class="btn btn-sm btn-outline-success" id="post-1"><i class="fa fa-check"></i> 提交</button>&nbsp;
-                                            <button type="button" class="btn btn-sm btn-outline-danger" id="cancel-1"><i class="fa fa-close"></i> 取消</button>
+                            <div class="col">
+                                <div class="tab-content">
+                                    <div class="tab-pane fade show active" id="v-pills-1" role="tabpanel">
+                                        <!--操作-->
+                                        <div class="d-flex justify-content-end mt-3">
+                                            <div>
+                                                <button type="button" class="btn btn-sm btn-outline-primary" id="edit-1"> 编辑</button>
+                                            </div>
+                                            <div style="display: none">
+                                                <button type="button" class="btn btn-sm btn-outline-success" id="post-1"><i class="fa fa-check"></i> 提交</button>&nbsp;
+                                                <button type="button" class="btn btn-sm btn-outline-danger" id="cancel-1"><i class="fa fa-close"></i> 取消</button>
+                                            </div>
                                         </div>
-                                    </div>
-                                    <!--合同信息-->
-                                    <legend class="mt-3">合同信息</legend>
-                                    <!--默认显示-->
-                                    <div class="form-group">
-                                        <div class="row">
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">建设项目名称</span>
+                                        <!--合同信息-->
+                                        <legend class="mt-3">合同信息</legend>
+                                        <!--默认显示-->
+                                        <div class="form-group">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">建设项目名称</span>
+                                                        </div>
+                                                        <input type="text" class="form-control form-control-sm" value="项目A" readonly="" id="build-name" maxlength="100">
                                                     </div>
-                                                    <input type="text" class="form-control" value="项目A" readonly="" id="build-name" maxlength="100">
                                                 </div>
-                                            </div>
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">合同编号</span>
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">合同编号</span>
+                                                        </div>
+                                                        <input type="text" class="form-control form-control-sm" value="" readonly="" id="deal-code" maxlength="100">
                                                     </div>
-                                                    <input type="text" class="form-control" value="" readonly="" id="deal-code" maxlength="100">
                                                 </div>
-                                            </div>
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">合同名称</span>
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">合同名称</span>
+                                                        </div>
+                                                        <input type="text" class="form-control form-control-sm" value="" readonly="" id="deal-name" maxlength="100">
                                                     </div>
-                                                    <input type="text" class="form-control" value="" readonly="" id="deal-name" maxlength="100">
                                                 </div>
                                             </div>
                                         </div>
-                                    </div>
-                                    <!--参建单位-->
-                                    <legend class="mt-3">参建单位</legend>
-                                    <!--编辑模式-->
-                                    <div class="form-group">
-                                        <label>建设单位:</label>
-                                        <div class="row">
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">单位名称</span>
+                                        <!--参建单位-->
+                                        <legend class="mt-3">参建单位</legend>
+                                        <!--编辑模式-->
+                                        <div class="form-group">
+                                            <label>建设单位:</label>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">单位名称</span>
+                                                        </div>
+                                                        <input type="text" class="form-control form-control-sm" value="" id="build-company" maxlength="100">
                                                     </div>
-                                                    <input type="text" class="form-control" value="" id="build-company" maxlength="100">
                                                 </div>
-                                            </div>
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">法人代表</span>
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">法人代表</span>
+                                                        </div>
+                                                        <input type="text" class="form-control form-control-sm" value="" id="build-corporation" maxlength="100">
                                                     </div>
-                                                    <input type="text" class="form-control" value="" id="build-corporation" maxlength="100">
                                                 </div>
-                                            </div>
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">签订日期</span>
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">签订日期</span>
+                                                        </div>
+                                                        <input type="date" class="form-control form-control-sm" value="" id="build-date">
                                                     </div>
-                                                    <input type="date" class="form-control" value="" id="build-date">
                                                 </div>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label>承包单位1:</label>
-                                        <div class="row">
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">单位名称</span>
+                                        <div class="form-group">
+                                            <label>承包单位1:</label>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">单位名称</span>
+                                                        </div>
+                                                        <input type="text" class="form-control form-control-sm" value="" id="contract1-company" maxlength="100">
                                                     </div>
-                                                    <input type="text" class="form-control" value="" id="contract1-company" maxlength="100">
                                                 </div>
-                                            </div>
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">法人代表</span>
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">法人代表</span>
+                                                        </div>
+                                                        <input type="text" class="form-control form-control-sm" value="" id="contract1-corporation" maxlength="100">
                                                     </div>
-                                                    <input type="text" class="form-control" value="" id="contract1-corporation" maxlength="100">
                                                 </div>
-                                            </div>
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">签订日期</span>
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">签订日期</span>
+                                                        </div>
+                                                        <input type="date" class="form-control form-control-sm" value="" id="contract1-date">
                                                     </div>
-                                                    <input type="date" class="form-control" value="" id="contract1-date">
                                                 </div>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label>承包单位2:</label>
-                                        <div class="row">
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">单位名称</span>
+                                        <div class="form-group">
+                                            <label>承包单位2:</label>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">单位名称</span>
+                                                        </div>
+                                                        <input type="text" class="form-control form-control-sm" value="" id="contract2-company" maxlength="100">
                                                     </div>
-                                                    <input type="text" class="form-control" value="" id="contract2-company" maxlength="100">
                                                 </div>
-                                            </div>
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">法人代表</span>
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">法人代表</span>
+                                                        </div>
+                                                        <input type="text" class="form-control form-control-sm" value="" id="contract2-corporation" maxlength="100">
                                                     </div>
-                                                    <input type="text" class="form-control" value="" id="contract2-corporation" maxlength="100">
                                                 </div>
-                                            </div>
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">签订日期</span>
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">签订日期</span>
+                                                        </div>
+                                                        <input type="date" class="form-control form-control-sm" value="" id="contract2-date">
                                                     </div>
-                                                    <input type="date" class="form-control" value="" id="contract2-date">
                                                 </div>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label>监理单位1:</label>
-                                        <div class="row">
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">单位名称</span>
+                                        <div class="form-group">
+                                            <label>监理单位1:</label>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">单位名称</span>
+                                                        </div>
+                                                        <input type="text" class="form-control form-control-sm" value="" id="supervision1-company" maxlength="100">
                                                     </div>
-                                                    <input type="text" class="form-control" value="" id="supervision1-company" maxlength="100">
                                                 </div>
-                                            </div>
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">法人代表</span>
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">法人代表</span>
+                                                        </div>
+                                                        <input type="text" class="form-control form-control-sm" value="" id="supervision1-corporation" maxlength="100">
                                                     </div>
-                                                    <input type="text" class="form-control" value="" id="supervision1-corporation" maxlength="100">
                                                 </div>
-                                            </div>
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">签订日期</span>
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">签订日期</span>
+                                                        </div>
+                                                        <input type="date" class="form-control form-control-sm" value="" id="supervision1-date">
                                                     </div>
-                                                    <input type="date" class="form-control" value="" id="supervision1-date">
                                                 </div>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label>监理单位2:</label>
-                                        <div class="row">
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">单位名称</span>
+                                        <div class="form-group">
+                                            <label>监理单位2:</label>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">单位名称</span>
+                                                        </div>
+                                                        <input type="text" class="form-control form-control-sm" value="" id="supervision2-company" maxlength="100">
                                                     </div>
-                                                    <input type="text" class="form-control" value="" id="supervision2-company" maxlength="100">
                                                 </div>
-                                            </div>
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">法人代表</span>
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">法人代表</span>
+                                                        </div>
+                                                        <input type="text" class="form-control form-control-sm" value="" id="supervision2-corporation" maxlength="100">
                                                     </div>
-                                                    <input type="text" class="form-control" value="" id="supervision2-corporation" maxlength="100">
                                                 </div>
-                                            </div>
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">签订日期</span>
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">签订日期</span>
+                                                        </div>
+                                                        <input type="date" class="form-control form-control-sm" value="" id="supervision2-date">
                                                     </div>
-                                                    <input type="date" class="form-control" value="" id="supervision2-date">
                                                 </div>
                                             </div>
                                         </div>
-                                    </div>
-                                    <!--技术参数-->
-                                    <legend class="mt-3">技术参数</legend>
-                                    <div class="form-group">
-                                        <div class="row">
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">公路等级</span>
+                                        <!--技术参数-->
+                                        <legend class="mt-3">技术参数</legend>
+                                        <div class="form-group">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">公路等级</span>
+                                                        </div>
+                                                        <select class="form-control form-control-sm" disabled="" id="load-level">
+                                                            <option value="1">高速公路</option>
+                                                            <option value="2">一级公路</option>
+                                                            <option value="3">二级公路</option>
+                                                            <option value="4">三级公路</option>
+                                                            <option value="5">四级公路</option>
+                                                        </select>
                                                     </div>
-                                                    <select class="form-control" disabled="" id="load-level">
-                                                        <option value="1">高速公路</option>
-                                                        <option value="2">一级公路</option>
-                                                        <option value="3">二级公路</option>
-                                                        <option value="4">三级公路</option>
-                                                        <option value="5">四级公路</option>
-                                                    </select>
                                                 </div>
-                                            </div>
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">长度(KM)</span>
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">长度(KM)</span>
+                                                        </div>
+                                                        <input type="text" class="form-control form-control-sm" value="" readonly="" id="length" min="0" max="10000"
+                                                               oninput="limitDealParamLength(this)" onchange="checkNumberValid(this)">
                                                     </div>
-                                                    <input type="text" class="form-control" value="" readonly="" id="length" min="0" max="10000"
-                                                           oninput="limitDealParamLength(this)" onchange="checkNumberValid(this)">
                                                 </div>
-                                            </div>
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">起始桩号</span>
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">起始桩号</span>
+                                                        </div>
+                                                        <input type="text" class="form-control form-control-sm" value="" readonly="" id="start-peg" maxlength="100">
                                                     </div>
-                                                    <input type="text" class="form-control" value="" readonly="" id="start-peg" maxlength="100">
                                                 </div>
-                                            </div>
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">终止桩号</span>
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">终止桩号</span>
+                                                        </div>
+                                                        <input type="text" class="form-control form-control-sm" value="" readonly="" id="end-peg" maxlength="100">
                                                     </div>
-                                                    <input type="text" class="form-control" value="" readonly="" id="end-peg" maxlength="100">
                                                 </div>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <div class="row">
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">车道数</span>
+                                        <div class="form-group">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">车道数</span>
+                                                        </div>
+                                                        <input type="text" class="form-control form-control-sm" value="" readonly="" id="lane-count" maxlength="100">
                                                     </div>
-                                                    <input type="text" class="form-control" value="" readonly="" id="lane-count" maxlength="100">
                                                 </div>
-                                            </div>
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">合同工期</span>
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">合同工期</span>
+                                                        </div>
+                                                        <input type="text" class="form-control form-control-sm" value="" readonly="" id="deal-period" maxlength="100">
                                                     </div>
-                                                    <input type="text" class="form-control" value="" readonly="" id="deal-period" maxlength="100">
                                                 </div>
-                                            </div>
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">开工日期</span>
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">开工日期</span>
+                                                        </div>
+                                                        <input type="date" class="form-control form-control-sm" value="" readonly="" id="start-date">
                                                     </div>
-                                                    <input type="date" class="form-control" value="" readonly="" id="start-date">
                                                 </div>
-                                            </div>
-                                            <div class="col">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">计划完工日期</span>
+                                                <div class="col">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">计划完工日期</span>
+                                                        </div>
+                                                        <input type="date" class="form-control form-control-sm" value="" readonly="" id="plan-end-date">
                                                     </div>
-                                                    <input type="date" class="form-control" value="" readonly="" id="plan-end-date">
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="tab-pane fade" id="v-pills-2" role="tabpanel" >
-                                    <% if (((tender.ledger_status === audit.ledger.status.uncheck || tender.ledger_status === audit.ledger.status.checkNo) && tender.user_id === ctx.session.sessionUser.accountId)
-                                            || (lastStage && lastStage.user_id === ctx.session.sessionUser.accountId && (lastStage.status === audit.stage.status.checkNo || lastStage.status === audit.stage.status.uncheck))) { %>
-                                    <!--操作-->
-                                    <div class="d-flex justify-content-end mt-3">
+                                    <div class="tab-pane fade" id="v-pills-2" role="tabpanel" >
+                                        <% if (((tender.ledger_status === audit.ledger.status.uncheck || tender.ledger_status === audit.ledger.status.checkNo) && tender.user_id === ctx.session.sessionUser.accountId)
+                                                || (lastStage && lastStage.user_id === ctx.session.sessionUser.accountId && (lastStage.status === audit.stage.status.checkNo || lastStage.status === audit.stage.status.uncheck))) { %>
+                                        <!--操作-->
+                                        <div class="d-flex justify-content-end mt-3">
                                         <span>
                                             <button type="button" class="btn btn-sm btn-outline-primary" id="edit-2">编辑</button>
                                         </span>
-                                        <span style="display: none">
+                                            <span style="display: none">
                                             <button type="button" class="btn btn-sm btn-outline-success" id="post-2"><i class="fa fa-check"></i> 提交</button>&nbsp;
                                             <button type="button" class="btn btn-sm btn-outline-danger" id="cancel-2"><i class="fa fa-close"></i>  取消</button>
                                         </span>
-                                    </div>
-                                    <% } %>
-                                    <!--小数位数-->
-                                    <legend class="mt-3">小数位数</legend>
-                                    <div class="form-group">
-                                        <label>全局设置</label>
-                                        <div class="row">
-                                            <div class="col-2">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">单价</span>
+                                        </div>
+                                        <% } %>
+                                        <!--小数位数-->
+                                        <legend class="mt-3">小数位数</legend>
+                                        <div class="form-group">
+                                            <label>全局设置</label>
+                                            <div class="row">
+                                                <div class="col-2">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">单价</span>
+                                                        </div>
+                                                        <input type="number" class="form-control form-control-sm" value="3" id="decimal-up" min="0" max="4" maxlength="1" oninput="limitDecimal(this)">
                                                     </div>
-                                                    <input type="number" class="form-control" value="3" id="decimal-up" min="0" max="4" maxlength="1" oninput="limitDecimal(this)">
                                                 </div>
-                                            </div>
-                                            <div class="col-2">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">金额</span>
+                                                <div class="col-2">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">金额</span>
+                                                        </div>
+                                                        <input type="number" class="form-control form-control-sm" value="2" id="decimal-tp" onchange="CalculateAllDealParam()" oninput="limitDecimal(this)" min="0" max="4" maxlength="1">
                                                     </div>
-                                                    <input type="number" class="form-control" value="2" id="decimal-tp" onchange="CalculateAllDealParam()" oninput="limitDecimal(this)" min="0" max="4" maxlength="1">
                                                 </div>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label>单独设置</label>
-                                        <div class="row">
-                                            <div class="col-auto">
-                                                <div class="form-group form-check mt-1">
-                                                    <input type="checkbox" class="form-check-input" id="decimal-pay" onchange="CalculateAllDealParam()">
-                                                    <label class="form-check-label" for="exampleCheck2">合同支付</label>
+                                        <div class="form-group">
+                                            <label>单独设置</label>
+                                            <div class="row">
+                                                <div class="col-auto">
+                                                    <div class="form-group form-check mt-1">
+                                                        <input type="checkbox" class="form-check-input" id="decimal-pay" onchange="CalculateAllDealParam()">
+                                                        <label class="form-check-label" for="exampleCheck2">合同支付</label>
+                                                    </div>
                                                 </div>
-                                            </div>
-                                            <div class="col-2">
-                                                <div class="input-group input-group-sm">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text">金额</span>
+                                                <div class="col-2">
+                                                    <div class="input-group input-group-sm">
+                                                        <div class="input-group-prepend">
+                                                            <span class="input-group-text">金额</span>
+                                                        </div>
+                                                        <input type="number" class="form-control form-control-sm" value="2" readonly="" id="decimal-pay-tp" onchange="CalculateAllDealParam()" oninput="limitDecimal(this)" min="0" max="4" maxlength="1"
+                                                        >
                                                     </div>
-                                                    <input type="number" class="form-control" value="2" readonly="" id="decimal-pay-tp" onchange="CalculateAllDealParam()" oninput="limitDecimal(this)" min="0" max="4" maxlength="1"
-                                                    >
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="tab-pane fade" id="v-pills-3" role="tabpanel" >
-                                    <% if (((tender.ledger_status === audit.ledger.status.uncheck || tender.ledger_status === audit.ledger.status.checkNo) && tender.user_id === ctx.session.sessionUser.accountId)
-                                            || (lastStage && lastStage.user_id === ctx.session.sessionUser.accountId && (lastStage.status === audit.stage.status.checkNo || lastStage.status === audit.stage.status.uncheck))) { %>
-                                    <!--操作-->
-                                    <div class="d-flex justify-content-end mt-3">
-                                        <div class="alert alert-danger m-0 p-1 px-2" id="hint-3" style="display: none"><i class="fa fa-smile-o mr-2"></i>A simple danger alert—check it out!</div>
-                                        <div>
-                                            <button type="button" class="btn btn-sm btn-outline-primary" id="edit-3"> 编辑</button>
+                                    <div class="tab-pane fade" id="v-pills-3" role="tabpanel" >
+                                        <% if (((tender.ledger_status === audit.ledger.status.uncheck || tender.ledger_status === audit.ledger.status.checkNo) && tender.user_id === ctx.session.sessionUser.accountId)
+                                                || (lastStage && lastStage.user_id === ctx.session.sessionUser.accountId && (lastStage.status === audit.stage.status.checkNo || lastStage.status === audit.stage.status.uncheck))) { %>
+                                        <!--操作-->
+                                        <div class="d-flex justify-content-end mt-3">
+                                            <div class="alert alert-danger m-0 p-1 px-2" id="hint-3" style="display: none"><i class="fa fa-smile-o mr-2"></i>A simple danger alert—check it out!</div>
+                                            <div>
+                                                <button type="button" class="btn btn-sm btn-outline-primary" id="edit-3"> 编辑</button>
+                                            </div>
+                                            <div style="display: none">
+                                                <button type="button" class="btn btn-sm btn-outline-success" id="post-3"><i class="fa fa-check"></i> 提交</button>&nbsp;
+                                                <button type="button" class="btn btn-sm btn-outline-danger" id="cancel-3"><i class="fa fa-close"></i> 取消</button>
+                                            </div>
                                         </div>
-                                        <div style="display: none">
-                                            <button type="button" class="btn btn-sm btn-outline-success" id="post-3"><i class="fa fa-check"></i> 提交</button>&nbsp;
-                                            <button type="button" class="btn btn-sm btn-outline-danger" id="cancel-3"><i class="fa fa-close"></i> 取消</button>
+                                        <% } %>
+                                        <legend class="mt-3">清单精度</legend>
+                                        <!--默认显示-->
+                                        <div class="form-group" id="precision-spread" style="height: 365px; width: 600px;">
                                         </div>
                                     </div>
-                                    <% } %>
-                                    <legend class="mt-3">清单精度</legend>
-                                    <!--默认显示-->
-                                    <div class="form-group" id="precision-spread" style="height: 365px; width: 600px;">
-                                    </div>
-                                </div>
-                                <div class="tab-pane fade" id="v-pills-4" role="tabpanel" >
-                                    <% if (!lastStage || (lastStage.order === 1 && lastStage.user_id === ctx.session.sessionUser.accountId && (lastStage.status === audit.stage.status.checkNo || lastStage.status === audit.stage.status.uncheck))) { %>
-                                    <!--操作-->
-                                    <div class="d-flex justify-content-end mt-3">
-                                        <div class="alert alert-danger m-0 p-1 px-2" id="hint-4" style="display: none"><i class="fa fa-smile-o mr-2"></i>A simple danger alert—check it out!</div>
-                                        <div>
-                                            <button type="button" class="btn btn-sm btn-outline-primary" id="edit-4"> 编辑</button>
+                                    <div class="tab-pane fade" id="v-pills-4" role="tabpanel" >
+                                        <% if (!lastStage || (lastStage.order === 1 && lastStage.user_id === ctx.session.sessionUser.accountId && (lastStage.status === audit.stage.status.checkNo || lastStage.status === audit.stage.status.uncheck))) { %>
+                                        <!--操作-->
+                                        <div class="d-flex justify-content-end mt-3">
+                                            <div class="alert alert-danger m-0 p-1 px-2" id="hint-4" style="display: none"><i class="fa fa-smile-o mr-2"></i>A simple danger alert—check it out!</div>
+                                            <div>
+                                                <button type="button" class="btn btn-sm btn-outline-primary" id="edit-4"> 编辑</button>
+                                            </div>
+                                            <div style="display: none">
+                                                <button type="button" class="btn btn-sm btn-outline-success" id="post-4"><i class="fa fa-check"></i> 提交</button>&nbsp;
+                                                <button type="button" class="btn btn-sm btn-outline-danger" id="cancel-4"><i class="fa fa-close"></i> 取消</button>
+                                            </div>
                                         </div>
-                                        <div style="display: none">
-                                            <button type="button" class="btn btn-sm btn-outline-success" id="post-4"><i class="fa fa-check"></i> 提交</button>&nbsp;
-                                            <button type="button" class="btn btn-sm btn-outline-danger" id="cancel-4"><i class="fa fa-close"></i> 取消</button>
+                                        <% } %>
+                                        <legend class="mt-3">合同参数</legend>
+                                        <!--默认显示-->
+                                        <div class="form-group" id="param-spread" style="height: 230px; width: 600px;">
                                         </div>
                                     </div>
-                                    <% } %>
-                                    <legend class="mt-3">合同参数</legend>
-                                    <!--默认显示-->
-                                    <div class="form-group" id="param-spread" style="height: 230px; width: 600px;">
-                                    </div>
-                                </div>
-                                <div class="tab-pane fade" id="v-pills-5" role="tabpanel" >
-                                    <!--操作-->
-                                    <div class="d-flex justify-content-end mt-3">
+                                    <div class="tab-pane fade" id="v-pills-5" role="tabpanel" >
+                                        <!--操作-->
+                                        <div class="d-flex justify-content-end mt-3">
                                         <span>
                                             <button type="button" class="btn btn-sm btn-outline-primary" id="edit-5">编辑</button>
                                         </span>
-                                        <span style="display: none">
+                                            <span style="display: none">
                                             <button type="button" class="btn btn-sm btn-outline-success" id="post-5"><i class="fa fa-check"></i> 提交</button>&nbsp;
                                             <button type="button" class="btn btn-sm btn-outline-danger" id="cancel-5"><i class="fa fa-close"></i>  取消</button>
                                         </span>
-                                    </div>
-                                    <legend class="mt-3">台帐列显示</legend>
-                                    <div class="form-group">
+                                        </div>
+                                        <legend class="mt-3">台帐列显示</legend>
                                         <div class="form-group">
-                                            <div class="row">
-                                                <div class="col">
-                                                    <div class="form-group form-check">
-                                                        <input type="checkbox" class="form-check-input" id="ledger-dgn-qty" checked="">
-                                                        <label class="form-check-label" for="ledger-dgn-qty">设计数量</label>
-                                                    </div>
-                                                    <div class="form-group form-check">
-                                                        <input type="checkbox" class="form-check-input" id="ledger-cl-qty" checked="">
-                                                        <label class="form-check-label" for="ledger-cl-qty">错漏增减</label>
+                                            <div class="form-group">
+                                                <div class="row">
+                                                    <div class="col">
+                                                        <div class="form-group form-check">
+                                                            <input type="checkbox" class="form-check-input" id="ledger-dgn-qty" checked="">
+                                                            <label class="form-check-label" for="ledger-dgn-qty">设计数量</label>
+                                                        </div>
+                                                        <div class="form-group form-check">
+                                                            <input type="checkbox" class="form-check-input" id="ledger-cl-qty" checked="">
+                                                            <label class="form-check-label" for="ledger-cl-qty">错漏增减</label>
+                                                        </div>
                                                     </div>
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
-                                </div>
-                                <!--章节设置-->
-                                <div class="tab-pane fade" id="v-pills-6" role="tabpanel" >
-                                    <!--操作-->
-                                    <div class="d-flex justify-content-end mt-3">
-                                        <div class="alert alert-danger m-0 p-1 px-2" id="hint-6" style="display: none"><i class="fa fa-smile-o mr-2"></i>A simple danger alert—check it out!</div>
-                                        <span>
+                                    <!--章节设置-->
+                                    <div class="tab-pane fade" id="v-pills-6" role="tabpanel" >
+                                        <!--操作-->
+                                        <div class="d-flex justify-content-end mt-3">
+                                            <div class="alert alert-danger m-0 p-1 px-2" id="hint-6" style="display: none"><i class="fa fa-smile-o mr-2"></i>A simple danger alert—check it out!</div>
+                                            <span>
                                             <button type="button" class="btn btn-sm btn-outline-primary" id="edit-6">编辑</button>
                                         </span>
-                                        <span style="display: none">
+                                            <span style="display: none">
                                             <button type="button" class="btn btn-sm btn-outline-success" id="post-6"><i class="fa fa-check"></i> 提交</button>
                                             <button type="button" class="btn btn-sm btn-outline-danger" id="cancel-6"><i class="fa fa-close"></i>  取消</button>
                                         </span>
-                                    </div>
-                                    <legend class="mt-3">章节设置</legend>
-                                    <!--默认显示-->
-                                    <div class="form-group" id="chapter-spread" style="height: 330px; width: 600px;">
+                                        </div>
+                                        <legend class="mt-3">章节设置</legend>
+                                        <!--默认显示-->
+                                        <div class="form-group" id="chapter-spread" style="height: 330px; width: 600px;">
+                                        </div>
                                     </div>
                                 </div>
                             </div>

+ 11 - 11
app/view/tender/manage_modal.ejs

@@ -8,7 +8,7 @@
             <div class="modal-body">
                 <div class="form-group">
                     <label>标段名称<b class="text-danger">*</b></label>
-                    <input class="form-control"  placeholder="输入标段名称" type="text" name="name">
+                    <input class="form-control form-control-sm"  placeholder="输入标段名称" type="text" name="name">
                 </div>
                 <div class="form-group">
                     <label ><b class="text-danger">*</b>计价规范</label>
@@ -23,8 +23,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" id="add-bd-ok">确定添加</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="add-bd-ok">确定添加</button>
             </div>
         </div>
     </div>
@@ -39,12 +39,12 @@
             <div class="modal-body">
                 <div class="form-group">
                     <label>标段名称<b class="text-danger">*</b></label>
-                    <input class="form-control"  placeholder="输入标段名称" type="text" name="name">
+                    <input class="form-control form-control-sm"  placeholder="输入标段名称" type="text" name="name">
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" id="edit-bd-ok">确定修改</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="edit-bd-ok">确定修改</button>
             </div>
         </div>
     </div>
@@ -60,8 +60,8 @@
                 <h5>删除后,数据无法恢复,请谨慎操作。</h5>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-danger" id="del-bd-ok">确定删除</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-danger btn-sm" id="del-bd-ok">确定删除</button>
             </div>
         </div>
     </div>
@@ -79,8 +79,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary">确定添加</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm">确定添加</button>
             </div>
         </div>
     </div>
@@ -103,7 +103,7 @@
                             <div class="card-body">
                                 <h5 class="card-title"><i class="fa fa-bookmark"></i><%- measureType[mt].title %></h5>
                                 <p class="card-text"><b><%- measureType[mt].name %></b><%- measureType[mt].hint%></p>
-                                <a href="#" mst="<%- measureType[mt].value %>" class="btn btn-primary">选择他</a>
+                                <a href="#" mst="<%- measureType[mt].value %>" class="btn btn-primary btn-sm">选择他</a>
                             </div>
                         </div>
                     </div>

+ 6 - 6
app/view/tender/modal.ejs

@@ -8,7 +8,7 @@
             <div class="modal-body">
                 <div class="form-group">
                     <label>标段名称<b class="text-danger">*</b></label>
-                    <input class="form-control"  placeholder="输入标段名称" type="text" name="name">
+                    <input class="form-control form-control-sm"  placeholder="输入标段名称" type="text" name="name">
                 </div>
                 <div class="form-group">
                     <label ><b class="text-danger">*</b>计价规范</label>
@@ -23,8 +23,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" id="add-bd-ok">确定添加</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="add-bd-ok">确定添加</button>
             </div>
         </div>
     </div>
@@ -42,8 +42,8 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" id="set-cate-ok">确定</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="set-cate-ok">确定</button>
             </div>
         </div>
     </div>
@@ -66,7 +66,7 @@
                             <div class="card-body">
                                 <h5 class="card-title"><i class="fa fa-bookmark"></i><%- measureType[mt].title %></h5>
                                 <p class="card-text"><b><%- measureType[mt].name %></b><%- measureType[mt].hint%></p>
-                                <a href="#" mst="<%- measureType[mt].value %>" class="btn btn-primary">选择他</a>
+                                <a href="#" mst="<%- measureType[mt].value %>" class="btn btn-primary btn-sm">选择他</a>
                             </div>
                         </div>
                     </div>

+ 1 - 1
app/view/tender/tender_sub_menu.ejs

@@ -42,6 +42,6 @@
                 <li <% if (ctx.url === '/tender/' + ctx.tender.id + '/report') { %>class="active"<% } %>><a href="/tender/<%- ctx.tender.id %>/report"><i class="fa fa-file-text-o"></i> <span>报表</span></a></li>
             </ul>
         </div>
-        <div class="side-fold"><a href="javascript: void(0)" data-toggle="tooltip" data-placement="top" data-original-title="折叠侧栏" id="to-mini-menu"><i class="fa fa-sign-out fa-flip-horizontal"></i></a></div>
+        <div class="side-fold"><a href="javascript: void(0)" data-toggle="tooltip" data-placement="top" data-original-title="折叠侧栏" id="to-mini-menu"><i class="fa fa-upload fa-rotate-270"></i></a></div>
     </div>
 </div>

+ 1 - 1
app/view/tender/tender_sub_mini_menu.ejs

@@ -39,6 +39,6 @@
                 <li <% if (ctx.url === '/tender/' + ctx.tender.id + '/report') { %>class="active"<% } %>><a href="/tender/<%- ctx.tender.id %>/report"><i class="fa fa-file-text-o"></i> <span>报表</span></a></li>
             </ul>
         </div>
-        <div class="side-fold"><a href="javascript: void(0);" data-toggle="tooltip" data-placement="top" data-original-title="展开侧栏" id="to-menu"><i class="fa fa-thumb-tack"></i></a></div>
+        <div class="side-fold"><a href="javascript: void(0);" data-toggle="tooltip" data-placement="top" data-original-title="展开侧栏" id="to-menu"><i class="fa fa-upload fa-rotate-90"></i></a></div>
     </div>
 </div>