Browse Source

余额统计&带票额度统计,审核刷新调整为手动

lowkeyman 1 month atrás
parent
commit
c12d8eedd4

+ 19 - 8
admin/templates/default/refill_amount_stats.index.php

@@ -365,6 +365,7 @@
             <down-name-select title="机构设置" type="merchant_names"></down-name-select>
         </div>
         <div>
+            <button type="button" class="layui-btn layui-bg-blue" id="btn_refresh_approve">刷新审核</button>
             <button type="button" class="layui-btn layui-bg-blue" id="btn_search">更新数据</button>
             <button type="button" class="layui-btn layui-bg-red" id="btn_copy_data">拷贝数据</button>
             <button type="button" class="layui-btn layui-bg-red" id="btn_import">导入数据</button>
@@ -2105,6 +2106,8 @@
                             } else {
                                 channelTableFast.renderTable();
                             }
+
+                            loadMsgBadge();
                         }, 1000);
 
                         if (errs.length > 0) {
@@ -2574,8 +2577,8 @@
             const $fastBadge = $('#approveBadgeFast');
             $fastBadge.hide();
 
-            const refreshApprovalMessage = () => {
-                normalWorkflow.initializeGlobalTaskList();
+            const refreshApprovalMessage = async () => {
+                await normalWorkflow.initializeGlobalTaskList();
                 const normalMsg = normalWorkflow.getPendingTaskDetails();
                 const normalNum = normalMsg.length || 0;
 
@@ -2586,9 +2589,10 @@
                     $normalBadge.show();
                 }
 
-                fastWorkflow.initializeGlobalTaskList();
+                await fastWorkflow.initializeGlobalTaskList();
                 const fastMsg = fastWorkflow.getPendingTaskDetails();
                 const fastNum = fastMsg.length || 0;
+                console.log('fastNum', fastNum);
 
                 $fastBadge.html(fastNum);
                 if (fastNum === 0) {
@@ -2597,18 +2601,25 @@
                     $fastBadge.show();
                 }
             }
-            
-            if (systemUserName === 'admin') {
-                setInterval(refreshApprovalMessage, 2000);
-            }
+
+            refreshApprovalMessage();
         }
 
         loadMsgBadge();
-        
+
         $('#btn_search').on('click', function (){
             initPage();
         });
 
+        $('#btn_refresh_approve').on('click', function() {
+            if (systemUserName !== 'admin') {
+                showErr('您不是管理员,无审核权限');
+                return;
+            }
+
+            loadMsgBadge();
+        });
+
         $('.reset-col').on('click', function () {
             const tableId = $(this).data('table');
             const col = $(this).data('col');

+ 17 - 7
admin/templates/default/refill_quota_stats.index.php

@@ -362,6 +362,7 @@
         <div>
             <input class="layui-input query-input" type="text" readonly value="" name="query_month" id="query_month" autocomplete="off" />
             <button type="button" class="layui-btn layui-bg-blue" id="btn-update-all">更新数据</button>
+            <button type="button" class="layui-btn layui-bg-blue" id="btn_refresh_approve">刷新审核</button>
         </div>
     </div>
     <div class="layui-clear"></div>
@@ -2199,8 +2200,8 @@
             const chanBadge = $('#badge-approve-chan');
             chanBadge.hide();
 
-            const refreshApprovalMessage = () => {
-                companyWorkflow.initializeGlobalTaskList();
+            const refreshApprovalMessage = async () => {
+                await companyWorkflow.initializeGlobalTaskList();
                 const comMsg = companyWorkflow.getPendingTaskDetails();
                 const comNum = comMsg.length || 0;
 
@@ -2211,7 +2212,7 @@
                     companyBadge.show();
                 }
 
-                mchWorkflow.initializeGlobalTaskList();
+                await mchWorkflow.initializeGlobalTaskList();
                 const mchMsg = mchWorkflow.getPendingTaskDetails();
                 const mchNum = mchMsg.length || 0;
 
@@ -2222,7 +2223,7 @@
                     mchBadge.show();
                 }
 
-                chanWorkflow.initializeGlobalTaskList();
+                await chanWorkflow.initializeGlobalTaskList();
                 const chanMsg = chanWorkflow.getPendingTaskDetails();
                 const chanNum = chanMsg.length || 0;
 
@@ -2234,11 +2235,20 @@
                 }
             }
 
-            if (systemUserName === 'admin') {
-                setInterval(refreshApprovalMessage, 2000);
-            }
+            refreshApprovalMessage();
         }
 
+        loadMsgBadge();
+
+        $('#btn_refresh_approve').on('click', function() {
+            if (systemUserName !== 'admin') {
+                showErr('您不是管理员,无审核权限');
+                return;
+            }
+
+            loadMsgBadge();
+        });
+
         function setTableColVal(tableId, col, val) { //对整列设置值
             const trs = $('#' + tableId).next('.layui-table-view').find('.layui-table-body tbody tr');
             trs.each(function(i, tr) {