refactor: 工程变更，台账未分解提示移动到info界面上报按钮中判断

app/controller/change_controller.js

@@ -130,7 +130,6 @@ module.exports = app => {
                 codeRule,
                 dealCode: ctx.tender.info.deal_info.dealCode,
                 auditConst: audit.flow,
-                ledgerConsts: audit.ledger.status,
                 changeConst,
                 ruleType: codeRuleConst.ruleType.change,
                 ruleConst: codeRuleConst.measure,
@@ -271,10 +270,8 @@ module.exports = app => {
 
                 // 根据auditStatus获取审批人列表
                 const auditList = await ctx.service.changeAudit.getListByStatus(change, auditStatus);
-
                 // 获取已选清单
                 let changeList = await ctx.service.changeAuditList.getAllDataByCondition({ where: { cid: ctx.params.cid } });
-
                 const renderData = {
                     uid: ctx.session.sessionUser.accountId,
                     tender,
@@ -282,6 +279,7 @@ module.exports = app => {
                     changeConst,
                     auditStatus,
                     auditConst: audit.flow,
+                    ledgerConsts: audit.ledger.status,
                     attList,
                     whiteList,
                     auditList,

app/public/js/change.js

@@ -184,10 +184,7 @@ $(document).ready(() => {
     $('.ml-auto').on('click', 'a', function () {
         const content = $(this).attr('href');
         if (content === '#add-bj') {
-            if (parseInt(ledger_status) === ledgerConsts.uncheck) {
-                $('#warning-ledger').modal('show');
-            } else {
-                $('#add-bj-modal').modal('show')
+            $('#add-bj-modal').modal('show')
                 getNewCode();
                 if ($('#changeList').children.length === 0) {
                     $('#addCancel').hide();
@@ -195,7 +192,18 @@ $(document).ready(() => {
                     $('#addCancel').show();
                 }
                 $('#bj-code').removeClass('is-invalid');
-            }
+            // if (parseInt(ledger_status) === ledgerConsts.uncheck) {
+            //     $('#warning-ledger').modal('show');
+            // } else {
+            //     $('#add-bj-modal').modal('show')
+            //     getNewCode();
+            //     if ($('#changeList').children.length === 0) {
+            //         $('#addCancel').hide();
+            //     } else {
+            //         $('#addCancel').show();
+            //     }
+            //     $('#bj-code').removeClass('is-invalid');
+            // }
         }
     })
     // 新增变更令 modal显示
@@ -213,9 +221,7 @@ $(document).ready(() => {
     //     }
     //     $('#bj-code').removeClass('is-invalid');
     // });
-    $('#led-warning').click(function () {
-        $('#warning-ledger').modal('hide');
-    })
+
     // 获取最新可用变更令号
     $('#autoCode').click(getNewCode);
     // 新增变更令 确认

app/public/js/change_approval.js

@@ -149,7 +149,6 @@ const postDataWithAsync = function (url, data, successCallback, errorCallBack, s
 };
 
 function auditCheck(i) {
-    console.log('111111111')
     const inlineRadio1 = $('#change-back:checked').val()
     const inlineRadio2 = $('#chagne-backnew:checked').val()
     const opinion = $('textarea[name="sdesc"]').eq(i).val().replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/\s/g, ' ');

app/view/change/bills_modal.ejs

@@ -207,4 +207,25 @@
             </div>
         </div>
     </div>
-</div>
+</div>
+
+<div class="modal fade" id="warning-ledger" data-backdrop="static">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">警告</h5>
+            </div>
+            <div class="modal-body">
+                <h5>请先上报审批台账，再上报审批变更令。</h5>
+            </div>
+            <div class="modal-footer">
+                <button id="led-warning" class="btn btn-danger btn-sm">确定</button>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    $('#led-warning').click(function () {
+        $('#warning-ledger').modal('hide');
+    });
+</script>

app/view/change/file_modal.ejs

@@ -43,4 +43,24 @@
             </div>
         </div>
     </div>
-</div>
+</div>
+<div class="modal fade" id="warning-ledger" data-backdrop="static">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">警告</h5>
+            </div>
+            <div class="modal-body">
+                <h5>请先上报审批台账，再上报审批变更令。</h5>
+            </div>
+            <div class="modal-footer">
+                <button id="led-warning" class="btn btn-danger btn-sm">确定</button>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    $('#led-warning').click(function () {
+        $('#warning-ledger').modal('hide');
+    });
+</script>

app/view/change/index.ejs

@@ -80,9 +80,6 @@
         </div>
     </div>
 </div>
-<script>
-    const tendetStatus = '<%- tender %>'
-</script>
 <script src="/public/js/sub_menu.js"></script>
 <script>
     $.subMenu({

app/view/change/info.ejs

@@ -736,7 +736,16 @@
     const totalPriceUnit = '<%- tpUnit %>';
     const unitPriceUnit = '<%- upUnit %>';
     const accountId = '<%- uid %>';
+    const ledgeStatus = '<%- tender.ledger_status %>';
+    const ledgerConsts = JSON.parse('<%- JSON.stringify(ledgerConsts) %>');
     autoFlashHeight();
+    $('a[href="#sub-ap"').click(function() {
+        if (parseInt(ledgeStatus) === ledgerConsts.uncheck) {
+            $('#warning-ledger').modal('show');
+            return false
+        }
+    });
+
 </script>
 <script src="/public/js/datatable/jquery.dataTables.min.js"></script>
 <script src="/public/js/datatable/dataTables.bootstrap4.min.js"></script>

app/view/change/info_modal.ejs

@@ -789,6 +789,23 @@
     </div>
 </div>
 <% } %>
+
+<div class="modal fade" id="warning-ledger" data-backdrop="static">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">警告</h5>
+            </div>
+            <div class="modal-body">
+                <h5>请先上报审批台账，再上报审批变更令。</h5>
+            </div>
+            <div class="modal-footer">
+                <button id="led-warning" class="btn btn-danger btn-sm">确定</button>
+            </div>
+        </div>
+    </div>
+</div>
+
 <script>
     $('.modal').on('shown.bs.modal', function () {
         const height = $(this)[0].scrollHeight
@@ -798,4 +815,7 @@
             scrollBox.scrollTop(height);
         }
     });
+    $('#led-warning').click(function () {
+        $('#warning-ledger').modal('hide');
+    });
 </script>

app/view/change/modal.ejs

@@ -18,22 +18,6 @@
     </div>
 </div>
 
-<div class="modal fade" id="warning-ledger" data-backdrop="static">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title">警告</h5>
-            </div>
-            <div class="modal-body">
-                <h5>请先上报审批台账，再上报审批变更令。</h5>
-            </div>
-            <div class="modal-footer">
-                <button id="led-warning" class="btn btn-danger btn-sm">确定</button>
-            </div>
-        </div>
-    </div>
-</div>
-
 <% if (tender.user_id === uid) { %>
 <!--弹出添加变更令-->
 <div class="modal fade" id="add-bj-modal" data-backdrop="static">
@@ -150,8 +134,6 @@
     let codeRule = JSON.parse('<%- JSON.stringify(codeRule) %>');
     let connectorRule = '<%- tender.c_connector %>';
     let cRuleFirst = '<%- tender.c_rule_first %>';
-    const ledger_status = '<%- JSON.stringify(tender.ledger_status) %>';
-    const ledgerConsts = JSON.parse('<%- JSON.stringify(ledgerConsts) %>');
 </script>
 <script src="/public/js/moment/moment.min.js"></script>