update..

潘钊
1 parent d0fd9df5
Showing 2 changed files with 44 additions and 7 deletions
src/main/resources/static/pages/history_sch/edit/history_sch_maintain.html
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch_maintain.html
@@ -38,6 +38,8 @@
                     </div>
                     <button class="uk-button">检索</button>
                     <a class="add_lp_link" title="先点击检索后再临加路牌"><i class="uk-icon-plus"></i> 临加路牌</a>
+                    <button id="reCountBtn" class="uk-button uk-button-danger uk-button-mini" style="position: absolute;right: 12px;bottom: 14px;">
+                        重新统计</button>
                 </fieldset>
             </form>
         </div>
@@ -476,6 +478,41 @@
             $('[name=xlBm_eq]', f).on('change', clearLpSelect);
             //clearLpSelect
+
+
+            /**
+             * 重新统计
+             */
+            $('#reCountBtn', modal).on('click', function () {
+                var lineSelect = $('[name=xlBm_eq]', modal);
+                var rq = $('.h-s-time li.uk-active', modal).text(),
+                        lineName = lineSelect[0].options[lineSelect[0].selectedIndex].text,//$('.h-s-line li.uk-active', modal).text(),
+                        lineCode = lineSelect.val();
+
+                var that = this;
+                alt_confirm('确定要重新统计 ' + lineName + '（'+rq+'）的数据吗？',function () {
+                    $(that).attr('disabled', 'disabled');
+                    $(that).prepend('<i class="uk-icon-spinner uk-icon-spin"></i>');
+
+
+                    var reCountEp = EventProxy.create('ylbUpdate', function () {
+                        $('i.uk-icon-spin', that).remove();
+                        $(that).removeAttr('disabled');
+                        notify_succ('重新统计成功！');
+                    });
+
+                    //统计路单 -娄高峰
+                    /*gb_common.$get('/calcWaybill/generateNew', {date:rq, line: lineCode}, function () {
+                     reCountEp.emitLater('calcWaybill');
+                     });*/
+
+                    //统计油 -廖磊
+                    gb_common.$post('/ylb/updateHistory', {date:rq, line: lineCode}, function () {
+                        reCountEp.emitLater('ylbUpdate');
+                    });
+
+                }, '我确定');
+            });
         })();
     </script>
 </div>
 \ No newline at end of file
@@ -421,26 +421,26 @@
              * 重新统计
              */
             $('#reCountBtn', modal).on('click', function () {
-                $(this).attr('disabled', 'disabled');
-                $(this).prepend('<i class="uk-icon-spinner uk-icon-spin"></i>');
-
                 var rq = $('.h-s-time li.uk-active', modal).text(),
                         lineName = $('.h-s-line li.uk-active', modal).text(),
                         lineCode = $('.h-s-line li.uk-active', modal).data('id');
                 var that = this;
                 alt_confirm('确定要重新统计 ' + lineName + '（'+rq+'）的数据吗？',function () {
+                    $(that).attr('disabled', 'disabled');
+                    $(that).prepend('<i class="uk-icon-spinner uk-icon-spin"></i>');
+
-                    var reCountEp = EventProxy.create('calcWaybill', 'ylbUpdate', function () {
+                    var reCountEp = EventProxy.create('ylbUpdate', function () {
                         $('i.uk-icon-spin', that).remove();
-                        $(this).removeAttr('disabled');
+                        $(that).removeAttr('disabled');
                         notify_succ('重新统计成功！');
                     });
                     //统计路单 -娄高峰
-                    gb_common.$get('/calcWaybill/generateNew', {date:rq, line: lineCode}, function () {
+                    /*gb_common.$get('/calcWaybill/generateNew', {date:rq, line: lineCode}, function () {
                         reCountEp.emitLater('calcWaybill');
-                    });
+                    });*/
                     //统计油 -廖磊
                     gb_common.$post('/ylb/updateHistory', {date:rq, line: lineCode}, function () {