فهرست منبع

数据检查,改版

MaiXinRong 4 سال پیش
والد
کامیت
4ce93d5bf0
1فایلهای تغییر یافته به همراه33 افزوده شده و 11 حذف شده
  1. 33 11
      app/view/shares/ledger_check_modal.ejs

+ 33 - 11
app/view/shares/ledger_check_modal.ejs

@@ -1,4 +1,3 @@
-
 <!--数据检查-->
 <div class="modal fade" id="ledger-check-modal" data-backdrop="static">
     <div class="modal-dialog" role="document">
@@ -7,6 +6,21 @@
                 <h5 class="modal-title">数据检查</h5>
             </div>
             <div class="modal-body">
+                <div class="text-center my-3">
+                    <button class="btn btn-primary px-5" id="ledger-check-begin">开始检查</button>
+                    <h6 class="text-center mt-3">数据检查可以为您排查有问题项</h6>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="modal fade" id="ledger-check-result" 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">
                 <p>数据检查,将检查罗列台帐中以下内容:</p>
                 <div class="card mb-2 p-2 border-success" id="check-sibling">
                     <div class="d-flex justify-content-between">
@@ -38,9 +52,8 @@
                         <span class="text-success" title="完成" name="check-status"><i class="fa fa-check"></i></span>
                     </div>
                 </div>
-                 <a href="javascript: void(0);" class="btn btn-sm btn-block btn-primary" id="ledger-check-begin">开始检查</a>
                  <a href="#" class="btn btn-sm btn-block btn-primary disabled" id="ledger-check-waiting">检查中,请等待...</a>
-                <p class="text-center text-success" id="ledger-check-hint">检查完成,现在您可以查看结果。</p>
+                 <p class="text-center text-success" id="ledger-check-hint">检查完成,现在您可以查看结果。</p>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">关闭</button>
@@ -71,8 +84,9 @@
         }
 
         const initWaitingModal = function () {
-            $('.card', '#ledger-check-modal').removeClass('border-success');
-            $('[name=check-status]', '#ledger-check-modal').removeClass('text-success').addClass('text-muted').html('待检查');
+            $('.card', '#ledger-check-result').removeClass('border-success').removeClass('border-warning');
+            $('[name=check-status]', '#ledger-check-result').removeClass('text-success').removeClass('text-warning')
+                .addClass('text-muted').html('待检查');
             showCheckPart($('#check-sibling'), checkOption.sibling.enable);
             showCheckPart($('#check-empty-code'), checkOption.empty_code.enable);
             showCheckPart($('#check-calc'), checkOption.calc.enable);
@@ -88,8 +102,13 @@
             const checkStatus = $('[name=check-status]', selector);
             checkStatus.html('<i class="fa fa-spinner fa-spin"></i>');
             const result = checkFun(ledger, option);
-            checkStatus.removeClass('text-muted').addClass('text-success').html('<i class="fa fa-check"></i>');
-            $(selector).addClass('border-success');
+            if (result && result.length > 0) {
+                checkStatus.removeClass('text-muted').addClass('text-warning').html('<i class="fa fa-exclamation-triangle"></i>');
+                $(selector).addClass('border-warning');
+            } else {
+                checkStatus.removeClass('text-muted').addClass('text-success').html('<i class="fa fa-check"></i>');
+                $(selector).addClass('border-success');
+            }
             return result;
         }
 
@@ -189,7 +208,6 @@
 
 
         const checkData = function () {
-            $('#ledger-check-begin').hide();
             $('#ledger-check-waiting').show();
             const checkData = {
                 check_time: new Date(),
@@ -229,10 +247,14 @@
             }
         }
 
-        $('#ledger-check-begin').bind('click', checkData);
-        $('#ledger-check-modal').bind('show.bs.modal', initWaitingModal);
-        $('#ledger-check-show').bind('click', function () {
+        $('#ledger-check-begin').bind('click', () => {
             $('#ledger-check-modal').modal('hide');
+            initWaitingModal();
+            checkData();
+            $('#ledger-check-result').modal('show');
+        });
+        $('#ledger-check-show').bind('click', function () {
+            $('#ledger-check-result').modal('hide');
             setting.checkList.show();
         });
     }