一些bug修复和需求修改

app/public/js/change.js

@@ -12,8 +12,6 @@ function getNewCode() {
     postData('/tender/'+ $('#tenderId').val() +'/change/newCode', null, function (code) {
         if (code !== '') {
             $('#bj-code').val(code);
-        } else {
-            $('#bj-code').val('变更申请编号');
         }
     });
 }
@@ -169,6 +167,9 @@ $(document).ready(() => {
             connector: connectorRule,
             data: JSON.stringify(codeRule),
         };
+        if (codeRule.length !== 0) {
+            $('#autoCodeShow').show();
+        }
         postData('/tender/rule', data, function () {
             $('#setting').modal('hide');
             if (parseInt(cRuleFirst) && showNoNeed) {

app/view/change/modal.ejs

@@ -11,7 +11,7 @@
                     <label>申请编号<b class="text-danger">*</b></label>
                     <div class="input-group">
                         <input type="text" class="form-control is-invalid" placeholder="请输入变更令号" value="变更申请编号" id="bj-code">
-                        <div class="input-group-append">
+                        <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>
                         </div>
                         <div class="invalid-feedback" style="display: none" id="bjHint">您输入的编号已存在</div>

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" name="opinion">同意</textarea>
                             </div>
                             <% } %>
                         </li>
@@ -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" name="opinion">不同意</textarea>
                             </div>
                             <% } %>
                         </li>
@@ -120,7 +120,7 @@
                                             <% } %>
                                             <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[ah[iA].status] %>"></i> <%- ah[iA].name %> <small class="text-muted"><%- ah[iA].role %></small></h5>
                                             <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %>
-                                            <p class="card-text mb-1"><%- auditConst.statusString[ah[iA].status]%>，<%- ah[iA].opinion %>。</p>
+                                            <p class="card-text mb-1"><%- ah[iA].opinion %></p>
                                             <p class="card-text"><small class="text-muted"><%- ah[iA].end_time.toLocaleDateString() %></small></p>
                                             <% } %>
                                         </li>
@@ -131,7 +131,7 @@
                                             <% } %>
                                             <h5 class="card-title"><i class="fa fa-stop-circle <%- auditConst.statusClass[ah[iA].status] %>"></i> <%- ah[iA].name %> <small class="text-muted"><%- ah[iA].role %></small></h5>
                                             <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %>
-                                            <p class="card-text mb-1"><%- auditConst.statusString[ah[iA].status]%>，<%- ah[iA].opinion %>。</p>
+                                            <p class="card-text mb-1"><%- ah[iA].opinion %></p>
                                             <p class="card-text"><small class="text-muted"><%- ah[iA].end_time.toLocaleDateString() %></small></p>
                                             <% } %>
                                         </li>
@@ -142,7 +142,7 @@
                                             <% } %>
                                             <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[ah[iA].status] %>"></i> <%- ah[iA].name %> <small class="text-muted"><%- ah[iA].role %></small></h5>
                                             <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %>
-                                            <p class="card-text mb-1"><%- auditConst.statusString[ah[iA].status]%>，<%- ah[iA].opinion %>。</p>
+                                            <p class="card-text mb-1"><%- ah[iA].opinion %></p>
                                             <p class="card-text"><small class="text-muted"><%- ah[iA].end_time.toLocaleDateString() %></small></p>
                                             <% } %>
                                         </li>
@@ -167,7 +167,7 @@
                                         <% } %>
                                         <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[auditors[iA].status] %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small></h5>
                                         <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %>
-                                        <p class="card-text mb-1"><%- auditConst.statusString[auditors[iA].status]%>，<%- auditors[iA].opinion %>。</p>
+                                        <p class="card-text mb-1"><%- auditors[iA].opinion %></p>
                                         <p class="card-text"><small class="text-muted"><%- auditors[iA].end_time.toLocaleDateString() %></small></p>
                                         <% } %>
                                     </li>
@@ -178,7 +178,7 @@
                                         <% } %>
                                         <h5 class="card-title"><i class="fa fa-stop-circle <%- auditConst.statusClass[auditors[iA].status] %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small></h5>
                                         <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %>
-                                        <p class="card-text"><%- auditConst.statusString[auditors[iA].status]%>，<%- auditors[iA].opinion %>。</p>
+                                        <p class="card-text"><%- auditors[iA].opinion %></p>
                                         <p class="card-text"><small class="text-muted"><%- auditors[iA].end_time.toLocaleDateString() %></small></p>
                                         <% } %>
                                     </li>
@@ -189,7 +189,7 @@
                                         <% } %>
                                         <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[auditors[iA].status] %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small></h5>
                                         <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %>
-                                        <p class="card-text"><%- auditConst.statusString[auditors[iA].status]%>，<%- auditors[iA].opinion %>。</p>
+                                        <p class="card-text"><%- auditors[iA].opinion %></p>
                                         <p class="card-text"><small class="text-muted"><%- auditors[iA].end_time.toLocaleDateString() %></small></p>
                                         <% } %>
                                     </li>

app/view/ledger/explode_modal.ejs

@@ -235,7 +235,7 @@
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[ah[iA].status] %>"></i> <%- ah[iA].name %> <small class="text-muted"><%- ah[iA].role %></small></h5>
                                     <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text mb-1"><%- auditConst.statusString[ah[iA].status]%>，<%- ah[iA].opinion %>。</p>
+                                    <p class="card-text mb-1"><%- ah[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- ah[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -246,7 +246,7 @@
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-stop-circle <%- auditConst.statusClass[ah[iA].status] %>"></i> <%- ah[iA].name %> <small class="text-muted"><%- ah[iA].role %></small></h5>
                                     <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text mb-1"><%- auditConst.statusString[ah[iA].status]%>，<%- ah[iA].opinion %>。</p>
+                                    <p class="card-text mb-1"><%- ah[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- ah[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -257,7 +257,7 @@
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[ah[iA].status] %>"></i> <%- ah[iA].name %> <small class="text-muted"><%- ah[iA].role %></small></h5>
                                     <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text mb-1"><%- auditConst.statusString[ah[iA].status]%>，<%- ah[iA].opinion %>。</p>
+                                    <p class="card-text mb-1"><%- ah[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- ah[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -282,7 +282,7 @@
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[auditors[iA].status] %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small></h5>
                                     <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text mb-1"><%- auditConst.statusString[auditors[iA].status]%>，<%- auditors[iA].opinion %>。</p>
+                                    <p class="card-text mb-1"><%- auditors[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- auditors[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -293,7 +293,7 @@
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-stop-circle <%- auditConst.statusClass[auditors[iA].status] %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small></h5>
                                     <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text mb-1"><%- auditConst.statusString[auditors[iA].status]%>，<%- auditors[iA].opinion %>。</p>
+                                    <p class="card-text mb-1"><%- auditors[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- auditors[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -304,7 +304,7 @@
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[auditors[iA].status] %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small></h5>
                                     <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text mb-1"><%- auditConst.statusString[auditors[iA].status]%>，<%- auditors[iA].opinion %>。</p>
+                                    <p class="card-text mb-1"><%- auditors[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- auditors[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>