Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/view/change/index.ejs

@@ -30,9 +30,9 @@
                 <table class="table table-bordered">
                     <thead>
                     <tr>
-                        <th width="32%">申请编号/变更令号</th><th width="30%">工程名称</th>
-                        <th width="90">变更类别</th><th width="90">变更金额</th>
-                        <th width="100">审批状态</th><th>审批进度</th><th width="80"></th>
+                        <th>申请编号/变更令号</th><th>工程名称</th>
+                        <th width="10%">变更类别</th><th width="10%">变更金额</th>
+                        <th width="10%">审批状态</th><th width="10%">审批进度</th><th width="10%"></th>
                     </tr>
                     </thead>
                     <tbody id="changeList">

app/view/change/info.ejs

@@ -535,7 +535,6 @@
                     </tr>
                     </tfoot>
                 </table>
-
                 <table class="table table-striped table-bordered nowrap qd-table table-list" id="tablelist2" cellspacing="0" style="width:100%;display: none;">
                     <thead>
                     <tr>

app/view/change/info_modal.ejs

@@ -66,6 +66,7 @@
                         <div class="card-header">
                             审批流程
                         </div>
+                        <div class="modal-height-500" style="overflow: auto">
                         <ul class="list-group list-group-flush" id="auditList">
                             <% for (const [index, audit] of auditList.entries()) { %>
                                 <% if (audit.usite !== 0) { %>
@@ -78,6 +79,7 @@
                                 <% } %>
                             <% } %>
                         </ul>
+                        </div>
                         <input type="hidden" id="auditIdList" value="">
                     </div>
                 </div>
@@ -231,7 +233,7 @@
                 </div>
                 <div class="modal-body">
                     <div class="row">
-                        <div class="col-4">
+                        <div class="col-4 modal-height-500" style="overflow: auto">
                             <a href="#sub-ap" data-toggle="modal" data-category="" data-target="#sub-ap" id="hideSp">修改审批流程</a>
                             <div class="card mt-3">
                                 <ul class="list-group list-group-flush" id="shenpi-audit-list">
@@ -355,7 +357,7 @@
             </div>
             <div class="modal-body">
                 <div class="row">
-                    <div class="col-4">
+                    <div class="col-4 modal-height-500" style="overflow: auto">
                         <div class="card mt-3">
                             <ul class="list-group list-group-flush">
                                 <% for (const [index,a] of auditList2.entries()) { %>
@@ -445,7 +447,7 @@
                 </div>
                 <div class="modal-body">
                     <div class="row">
-                        <div class="col-4">
+                        <div class="col-4 modal-height-500" style="overflow: auto">
                             <div class="card mt-3">
                                 <ul class="list-group list-group-flush">
                                     <% for (const [index,a] of auditList2.entries()) { %>
@@ -542,7 +544,7 @@
                 </div>
                 <div class="modal-body">
                     <div class="row">
-                        <div class="col-4">
+                        <div class="col-4 modal-height-500" style="overflow: auto">
                             <div class="card mt-3">
                                 <ul class="list-group list-group-flush">
                                     <% for (const [index,a] of auditList2.entries()) { %>