Commit 305988f0b4c45ff7c07f1a14e93d5af01364228d
1 parent
f5d79d46
update...
Showing
2 changed files
with
8 additions
and
18 deletions
src/main/resources/static/pages/history_sch/edit/history_sch_maintain.html
| @@ -240,7 +240,7 @@ | @@ -240,7 +240,7 @@ | ||
| 240 | $('[name=lpName_eq]', modal).val('').html(''); | 240 | $('[name=lpName_eq]', modal).val('').html(''); |
| 241 | reLoadLp = true; | 241 | reLoadLp = true; |
| 242 | } | 242 | } |
| 243 | - | 243 | + |
| 244 | //nbbm autocomplete | 244 | //nbbm autocomplete |
| 245 | var carAutoCom=$('.autocomplete-cars', modal); | 245 | var carAutoCom=$('.autocomplete-cars', modal); |
| 246 | UIkit.autocomplete(carAutoCom, { | 246 | UIkit.autocomplete(carAutoCom, { |
| @@ -495,7 +495,7 @@ | @@ -495,7 +495,7 @@ | ||
| 495 | $(that).prepend('<i class="uk-icon-spinner uk-icon-spin"></i>'); | 495 | $(that).prepend('<i class="uk-icon-spinner uk-icon-spin"></i>'); |
| 496 | 496 | ||
| 497 | 497 | ||
| 498 | - var reCountEp = EventProxy.create('ylbUpdate', 'calcWaybill', 'scheduleDetail', function () { | 498 | + var reCountEp = EventProxy.create('ylbUpdate', function () { |
| 499 | $('i.uk-icon-spin', that).remove(); | 499 | $('i.uk-icon-spin', that).remove(); |
| 500 | $(that).removeAttr('disabled'); | 500 | $(that).removeAttr('disabled'); |
| 501 | notify_succ('重新统计成功！'); | 501 | notify_succ('重新统计成功！'); |
| @@ -507,15 +507,10 @@ | @@ -507,15 +507,10 @@ | ||
| 507 | }); | 507 | }); |
| 508 | 508 | ||
| 509 | //统计油 -廖磊 | 509 | //统计油 -廖磊 |
| 510 | - gb_common.$post('/ylb/updateHistory', {date:rq, line: lineCode}, function () { | 510 | + gb_common.$post('/ylb/updateHistoryJd', {date:rq, line: lineCode}, function () { |
| 511 | reCountEp.emitLater('ylbUpdate'); | 511 | reCountEp.emitLater('ylbUpdate'); |
| 512 | }); | 512 | }); |
| 513 | 513 | ||
| 514 | - //重新统计班次明细 | ||
| 515 | - /*gb_common.$post('/sch/reCalc/scheduleDetail', {date:rq, line: lineCode}, function () { | ||
| 516 | - reCountEp.emitLater('scheduleDetail'); | ||
| 517 | - });*/ | ||
| 518 | - | ||
| 519 | }, '我确定'); | 514 | }, '我确定'); |
| 520 | }); | 515 | }); |
| 521 | })(); | 516 | })(); |
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch_maintain.html
| @@ -2,8 +2,8 @@ | @@ -2,8 +2,8 @@ | ||
| 2 | <div class="uk-modal-dialog" style="width: 1180px;"> | 2 | <div class="uk-modal-dialog" style="width: 1180px;"> |
| 3 | <a href="" class="uk-modal-close uk-close"></a> | 3 | <a href="" class="uk-modal-close uk-close"></a> |
| 4 | <div class="uk-modal-header"> | 4 | <div class="uk-modal-header"> |
| 5 | - <h2>历史路单维护</h2> | ||
| 6 | - </div> | 5 | + <h2>历史路单维护</h2> |
| 6 | + </div> | ||
| 7 | 7 | ||
| 8 | <div style="padding-left: 12px;margin: 20px 0"> | 8 | <div style="padding-left: 12px;margin: 20px 0"> |
| 9 | <ul class="uk-subnav uk-subnav-pill h-s-time"> | 9 | <ul class="uk-subnav uk-subnav-pill h-s-time"> |
| @@ -242,7 +242,7 @@ | @@ -242,7 +242,7 @@ | ||
| 242 | $('[name=lpName_eq]', modal).val('').html(''); | 242 | $('[name=lpName_eq]', modal).val('').html(''); |
| 243 | reLoadLp = true; | 243 | reLoadLp = true; |
| 244 | } | 244 | } |
| 245 | - | 245 | + |
| 246 | //nbbm autocomplete | 246 | //nbbm autocomplete |
| 247 | var carAutoCom=$('.autocomplete-cars', modal); | 247 | var carAutoCom=$('.autocomplete-cars', modal); |
| 248 | UIkit.autocomplete(carAutoCom, { | 248 | UIkit.autocomplete(carAutoCom, { |
| @@ -296,7 +296,7 @@ | @@ -296,7 +296,7 @@ | ||
| 296 | f = 'value'; | 296 | f = 'value'; |
| 297 | var rs = {}; | 297 | var rs = {}; |
| 298 | $.each(arr, function () { | 298 | $.each(arr, function () { |
| 299 | - rs[this[f]]=this; | 299 | + rs[this[f]]=this; |
| 300 | }); | 300 | }); |
| 301 | return gb_common.get_vals(rs); | 301 | return gb_common.get_vals(rs); |
| 302 | } | 302 | } |
| @@ -431,7 +431,7 @@ | @@ -431,7 +431,7 @@ | ||
| 431 | $(that).prepend('<i class="uk-icon-spinner uk-icon-spin"></i>'); | 431 | $(that).prepend('<i class="uk-icon-spinner uk-icon-spin"></i>'); |
| 432 | 432 | ||
| 433 | 433 | ||
| 434 | - var reCountEp = EventProxy.create('ylbUpdate', 'calcWaybill', 'scheduleDetail', function () { | 434 | + var reCountEp = EventProxy.create('ylbUpdate', function () { |
| 435 | $('i.uk-icon-spin', that).remove(); | 435 | $('i.uk-icon-spin', that).remove(); |
| 436 | $(that).removeAttr('disabled'); | 436 | $(that).removeAttr('disabled'); |
| 437 | notify_succ('重新统计成功！'); | 437 | notify_succ('重新统计成功！'); |
| @@ -447,11 +447,6 @@ | @@ -447,11 +447,6 @@ | ||
| 447 | reCountEp.emitLater('ylbUpdate'); | 447 | reCountEp.emitLater('ylbUpdate'); |
| 448 | }); | 448 | }); |
| 449 | 449 | ||
| 450 | - //重新统计班次明细 | ||
| 451 | - /*gb_common.$post('/sch/reCalc/scheduleDetail', {date:rq, line: lineCode}, function () { | ||
| 452 | - reCountEp.emitLater('scheduleDetail'); | ||
| 453 | - });*/ | ||
| 454 | - | ||
| 455 | }, '我确定'); | 450 | }, '我确定'); |
| 456 | }); | 451 | }); |
| 457 | })(); | 452 | })(); |