潘钊 / bsth_control · Commits

Commit 34ac4955a760c06722e6b45b4040d4f57af10ef5

Authored by 娄高锋
1 parent 65ac686b
build: skipped

行车路单:发车误点展示位置调整

Inline Side-by-side
Showing 3 changed files with 10 additions and 9 deletions
src/main/resources/static/pages/forms/mould/waybill_minhang.xls
View file @34ac495
No preview for this file type
src/main/resources/static/pages/forms/mould/waybill_minhang_dl.xls
View file @34ac495
No preview for this file type
src/main/resources/static/pages/forms/statement/waybill.html
  View file @34ac495
@@ -497,8 +497,8 @@ @@ -497,8 +497,8 @@
497 <td colspan="1">&nbsp;</td> 497 <td colspan="1">&nbsp;</td>
498 <td rowspan="2">夜班</td> 498 <td rowspan="2">夜班</td>
499 <td colspan="2">&nbsp;</td> 499 <td colspan="2">&nbsp;</td>
500 - <td rowspan="2">交叉</td>  
501 - <td colspan="3">&nbsp;</td> 500 + <td rowspan="2" colspan="2">交叉</td>
  501 + <td colspan="2">&nbsp;</td>
502 <td rowspan="2" colspan="2">其他</td> 502 <td rowspan="2" colspan="2">其他</td>
503 <td colspan="2">&nbsp;</td> 503 <td colspan="2">&nbsp;</td>
504 </tr> 504 </tr>
@@ -506,7 +506,7 @@ @@ -506,7 +506,7 @@
506 <td colspan="1">&nbsp;</td> 506 <td colspan="1">&nbsp;</td>
507 <td colspan="1">&nbsp;</td> 507 <td colspan="1">&nbsp;</td>
508 <td colspan="2">&nbsp;</td> 508 <td colspan="2">&nbsp;</td>
509 - <td colspan="3">&nbsp;</td> 509 + <td colspan="2">&nbsp;</td>
510 <td colspan="2">&nbsp;</td> 510 <td colspan="2">&nbsp;</td>
511 </tr> 511 </tr>
512 <tr> 512 <tr>
@@ -514,8 +514,9 @@ @@ -514,8 +514,9 @@
514 <td colspan="2">工号</td> 514 <td colspan="2">工号</td>
515 <!-- <td rowspan="2">公里耗油</td> --> 515 <!-- <td rowspan="2">公里耗油</td> -->
516 <td colspan="2">起讫站</td> 516 <td colspan="2">起讫站</td>
517 - <td colspan="4">时间</td> 517 + <td colspan="2">发车时间</td>
518 <td colspan="2">发车误点</td> 518 <td colspan="2">发车误点</td>
  519 + <td colspan="2">到站时间</td>
519 <td colspan="2">到站误点</td> 520 <td colspan="2">到站误点</td>
520 <td rowspan="2" width="66px">里程(公里)计划</td> 521 <td rowspan="2" width="66px">里程(公里)计划</td>
521 <td rowspan="2">备注</td> 522 <td rowspan="2">备注</td>
@@ -527,10 +528,10 @@ @@ -527,10 +528,10 @@
527 <td colspan="1">终点</td> 528 <td colspan="1">终点</td>
528 <td colspan="1">计发</td> 529 <td colspan="1">计发</td>
529 <td colspan="1">实发</td> 530 <td colspan="1">实发</td>
530 - <td colspan="1">应到</td>  
531 - <td colspan="1">实到</td>  
532 <td colspan="1">快</td> 531 <td colspan="1">快</td>
533 <td colspan="1">慢</td> 532 <td colspan="1">慢</td>
  533 + <td colspan="1">应到</td>
  534 + <td colspan="1">实到</td>
534 <td colspan="1">快</td> 535 <td colspan="1">快</td>
535 <td colspan="1">慢</td> 536 <td colspan="1">慢</td>
536 </tr> 537 </tr>
@@ -549,10 +550,10 @@ @@ -549,10 +550,10 @@
549 <td>{{obj.zdzName}}</td> 550 <td>{{obj.zdzName}}</td>
550 <td>{{obj.fcsj}}</td> 551 <td>{{obj.fcsj}}</td>
551 <td>{{obj.fcsjActual}}</td> 552 <td>{{obj.fcsjActual}}</td>
552 - <td>{{obj.zdsj}}</td>  
553 - <td>{{obj.zdsjActual}}</td>  
554 <td>{{obj.fast_start}}</td> 553 <td>{{obj.fast_start}}</td>
555 <td>{{obj.slow_start}}</td> 554 <td>{{obj.slow_start}}</td>
  555 + <td>{{obj.zdsj}}</td>
  556 + <td>{{obj.zdsjActual}}</td>
556 <td>{{obj.fast}}</td> 557 <td>{{obj.fast}}</td>
557 <td>{{obj.slow}}</td> 558 <td>{{obj.slow}}</td>
558 <td> 559 <td>
@@ -567,7 +568,7 @@ @@ -567,7 +568,7 @@
567 {{/each}} 568 {{/each}}
568 {{if list.length == 0}} 569 {{if list.length == 0}}
569 <tr> 570 <tr>
570 - <td colspan="14"><h6 class="muted">没有找到相关数据</h6></td> 571 + <td colspan="15"><h6 class="muted">没有找到相关数据</h6></td>
571 </tr> 572 </tr>
572 {{/if}} 573 {{/if}}
573 </script> 574 </script>