潘钊 / bsth_control · Commits

Commit d2f2c84dcf1f79b58e79e20e926f681fb123f1a0

Authored by 徐烜
1 parent 24b631bc
build: skipped

行车路单报表添加待发时间列

Inline Side-by-side
Showing 7 changed files with 23 additions and 19 deletions
src/main/resources/static/pages/forms/mould/waybill.xls
View file @d2f2c84
No preview for this file type
src/main/resources/static/pages/forms/mould/waybill_minhang.xls
View file @d2f2c84
No preview for this file type
src/main/resources/static/pages/forms/mould/waybill_minhang_dl.xls
View file @d2f2c84
No preview for this file type
src/main/resources/static/pages/forms/mould/waybill_qingpu.xls
View file @d2f2c84
No preview for this file type
src/main/resources/static/pages/forms/mould/waybillday.xls
View file @d2f2c84
No preview for this file type
src/main/resources/static/pages/forms/statement/waybill.html
  View file @d2f2c84
@@ -428,31 +428,31 @@ @@ -428,31 +428,31 @@
428 </script> 428 </script>
429 <script type="text/html" id="ludan_1"> 429 <script type="text/html" id="ludan_1">
430 <tr> 430 <tr>
431 - <td colspan="14">行车路单</td> 431 + <td colspan="15">行车路单</td>
432 </tr> 432 </tr>
433 <tr> 433 <tr>
434 - <td colspan="14">路别:{{xlName}} 路牌:{{lpName}} 车号:{{clZbh}}({{plate}}) 出场时间:{{fcsjActual}} 到达站名:{{zdzName}} 当班调派:{{dbdp}} 日期:{{scheduleDate}}</td> 434 + <td colspan="15">路别:{{xlName}} 路牌:{{lpName}} 车号:{{clZbh}}({{plate}}) 出场时间:{{fcsjActual}} 到达站名:{{zdzName}} 当班调派:{{dbdp}} 日期:{{scheduleDate}}</td>
435 </tr> 435 </tr>
436 <tr> 436 <tr>
437 {{if type==0}} 437 {{if type==0}}
438 <td colspan="2">出场存油 {{ccyl}}升</td> 438 <td colspan="2">出场存油 {{ccyl}}升</td>
439 <td colspan="2">加注量 {{jzl}}升</td> 439 <td colspan="2">加注量 {{jzl}}升</td>
440 <td colspan="2">进场存油 {{jcyl}}升</td> 440 <td colspan="2">进场存油 {{jcyl}}升</td>
441 - <td colspan="4">加注机油 &nbsp;升</td> 441 + <td colspan="5">加注机油 &nbsp;升</td>
442 <td colspan="4">本日耗油 {{yh}}升</td> 442 <td colspan="4">本日耗油 {{yh}}升</td>
443 {{/if}} 443 {{/if}}
444 {{if type==1}} 444 {{if type==1}}
445 <td colspan="2">出场存电 {{ccyl}}%</td> 445 <td colspan="2">出场存电 {{ccyl}}%</td>
446 <td colspan="2">充电量 {{jzl}}度</td> 446 <td colspan="2">充电量 {{jzl}}度</td>
447 <td colspan="2">进场存电 {{jcyl}}%</td> 447 <td colspan="2">进场存电 {{jcyl}}%</td>
448 - <td colspan="4">加注机油 &nbsp;升</td> 448 + <td colspan="5">加注机油 &nbsp;升</td>
449 <td colspan="4">本日耗电 {{yh}}度</td> 449 <td colspan="4">本日耗电 {{yh}}度</td>
450 {{/if}} 450 {{/if}}
451 {{if type==2}} 451 {{if type==2}}
452 <td colspan="2">出场存电 {{ccyl}}%</td> 452 <td colspan="2">出场存电 {{ccyl}}%</td>
453 <td colspan="2">充电量 {{jzl}}度</td> 453 <td colspan="2">充电量 {{jzl}}度</td>
454 <td colspan="2">进场存电 {{jcyl}}%</td> 454 <td colspan="2">进场存电 {{jcyl}}%</td>
455 - <td colspan="4">加注机油 &nbsp;升</td> 455 + <td colspan="5">加注机油 &nbsp;升</td>
456 <td colspan="4">本日耗电 {{yh}}度</td> 456 <td colspan="4">本日耗电 {{yh}}度</td>
457 {{/if}} 457 {{/if}}
458 </tr> 458 </tr>
@@ -464,7 +464,7 @@ @@ -464,7 +464,7 @@
464 <td rowspan="2">夜班</td> 464 <td rowspan="2">夜班</td>
465 <td colspan="1">&nbsp;</td> 465 <td colspan="1">&nbsp;</td>
466 <td rowspan="2" colspan="2">交叉</td> 466 <td rowspan="2" colspan="2">交叉</td>
467 - <td colspan="2">&nbsp;</td> 467 + <td colspan="3">&nbsp;</td>
468 <td rowspan="2">其他</td> 468 <td rowspan="2">其他</td>
469 <td colspan="1">&nbsp;</td> 469 <td colspan="1">&nbsp;</td>
470 <td colspan="1">&nbsp;</td> 470 <td colspan="1">&nbsp;</td>
@@ -474,7 +474,7 @@ @@ -474,7 +474,7 @@
474 <td colspan="1">&nbsp;</td> 474 <td colspan="1">&nbsp;</td>
475 <td colspan="1">&nbsp;</td> 475 <td colspan="1">&nbsp;</td>
476 <td colspan="1">&nbsp;</td> 476 <td colspan="1">&nbsp;</td>
477 - <td colspan="2">&nbsp;</td> 477 + <td colspan="3">&nbsp;</td>
478 <td colspan="1">&nbsp;</td> 478 <td colspan="1">&nbsp;</td>
479 <td colspan="1">&nbsp;</td> 479 <td colspan="1">&nbsp;</td>
480 <td colspan="1">&nbsp;</td> 480 <td colspan="1">&nbsp;</td>
@@ -484,7 +484,7 @@ @@ -484,7 +484,7 @@
484 <td colspan="2">工号</td> 484 <td colspan="2">工号</td>
485 <td rowspan="2">公里耗油</td> 485 <td rowspan="2">公里耗油</td>
486 <td colspan="2">起讫站</td> 486 <td colspan="2">起讫站</td>
487 - <td colspan="4">时间</td> 487 + <td colspan="5">时间</td>
488 <td colspan="2">误点</td> 488 <td colspan="2">误点</td>
489 <td rowspan="2" width="66px">里程(公里)计划</td> 489 <td rowspan="2" width="66px">里程(公里)计划</td>
490 <td rowspan="2">备注</td> 490 <td rowspan="2">备注</td>
@@ -495,6 +495,7 @@ @@ -495,6 +495,7 @@
495 <td colspan="1">起点</td> 495 <td colspan="1">起点</td>
496 <td colspan="1">终点</td> 496 <td colspan="1">终点</td>
497 <td colspan="1">计发</td> 497 <td colspan="1">计发</td>
  498 + <td colspan="1">待发</td>
498 <td colspan="1">实发</td> 499 <td colspan="1">实发</td>
499 <td colspan="1">应到</td> 500 <td colspan="1">应到</td>
500 <td colspan="1">实到</td> 501 <td colspan="1">实到</td>
@@ -515,6 +516,7 @@ @@ -515,6 +516,7 @@
515 <td>{{obj.qdzName}}</td> 516 <td>{{obj.qdzName}}</td>
516 <td>{{obj.zdzName}}</td> 517 <td>{{obj.zdzName}}</td>
517 <td>{{obj.fcsj}}</td> 518 <td>{{obj.fcsj}}</td>
  519 + <td>{{obj.dfsj}}</td>
518 <td>{{obj.fcsjActual}}</td> 520 <td>{{obj.fcsjActual}}</td>
519 <td>{{obj.zdsj}}</td> 521 <td>{{obj.zdsj}}</td>
520 <td>{{obj.zdsjActual}}</td> 522 <td>{{obj.zdsjActual}}</td>
@@ -543,7 +545,7 @@ @@ -543,7 +545,7 @@
543 <td colspan="2">计划公里</td> 545 <td colspan="2">计划公里</td>
544 <td>{{jhlc}}</td> 546 <td>{{jhlc}}</td>
545 <td colspan="2">烂班班次</td> 547 <td colspan="2">烂班班次</td>
546 - <td>{{cjbc}}</td> 548 + <td colspan="2">{{cjbc}}</td>
547 <td colspan="3"> 烂班公里</td> 549 <td colspan="3"> 烂班公里</td>
548 <td colspan="2">{{remMileage}}</td> 550 <td colspan="2">{{remMileage}}</td>
549 </tr> 551 </tr>
@@ -553,7 +555,7 @@ @@ -553,7 +555,7 @@
553 <td colspan="2">临加公里</td> 555 <td colspan="2">临加公里</td>
554 <td>{{addMileage}}</td> 556 <td>{{addMileage}}</td>
555 <td colspan="2">实际班次</td> 557 <td colspan="2">实际班次</td>
556 - <td>{{sjbc}}</td> 558 + <td colspan="2">{{sjbc}}</td>
557 <td colspan="3">营运公里</td> 559 <td colspan="3">营运公里</td>
558 <td colspan="2">{{yygl}}</td> 560 <td colspan="2">{{yygl}}</td>
559 </tr> 561 </tr>
@@ -563,7 +565,7 @@ @@ -563,7 +565,7 @@
563 <td colspan="2">总公里</td> 565 <td colspan="2">总公里</td>
564 <td>{{realMileage}}</td> 566 <td>{{realMileage}}</td>
565 <td colspan="2"></td> 567 <td colspan="2"></td>
566 - <td></td> 568 + <td colspan="2"></td>
567 <td colspan="3"></td> 569 <td colspan="3"></td>
568 <td colspan="2"></td> 570 <td colspan="2"></td>
569 </tr> 571 </tr>
src/main/resources/static/pages/forms/statement/waybillQp.html
  View file @d2f2c84
@@ -258,16 +258,16 @@ @@ -258,16 +258,16 @@
258 </script> 258 </script>
259 <script type="text/html" id="ludan_1"> 259 <script type="text/html" id="ludan_1">
260 <tr> 260 <tr>
261 - <td colspan="16">行车路单</td> 261 + <td colspan="17">行车路单</td>
262 </tr> 262 </tr>
263 <tr> 263 <tr>
264 - <td colspan="16">路别:{{map.xlName}} 车号:{{map.clZbh}} 出场时间:{{map.fcsjActual}} 到达站名:{{map.zdzName}} 日期:{{map.scheduleDate}}</td> 264 + <td colspan="17">路别:{{map.xlName}} 车号:{{map.clZbh}} 出场时间:{{map.fcsjActual}} 到达站名:{{map.zdzName}} 日期:{{map.scheduleDate}}</td>
265 </tr> 265 </tr>
266 <tr> 266 <tr>
267 <td colspan="2">出场存油 &nbsp;升</td> 267 <td colspan="2">出场存油 &nbsp;升</td>
268 <td colspan="3">加注油量 {{map.jzl}}升</td> 268 <td colspan="3">加注油量 {{map.jzl}}升</td>
269 <td colspan="2">进场存油 &nbsp;升</td> 269 <td colspan="2">进场存油 &nbsp;升</td>
270 - <td colspan="4">加注机油 &nbsp;升</td> 270 + <td colspan="5">加注机油 &nbsp;升</td>
271 <td colspan="5">本日耗油 &nbsp;升</td> 271 <td colspan="5">本日耗油 &nbsp;升</td>
272 </tr> 272 </tr>
273 <tr> 273 <tr>
@@ -276,7 +276,7 @@ @@ -276,7 +276,7 @@
276 <td title={{map.zdp}}>{{map.zdpT}}</td> 276 <td title={{map.zdp}}>{{map.zdpT}}</td>
277 <td >中班(职号)</td> 277 <td >中班(职号)</td>
278 <td title={{map.zwdp}}>{{map.zwdpT}}</td> 278 <td title={{map.zwdp}}>{{map.zwdpT}}</td>
279 - <td colspan="2">夜班(职号)</td> 279 + <td colspan="3">夜班(职号)</td>
280 <td colspan="2" title={{map.wdp}}>{{map.wdpT}}</td> 280 <td colspan="2" title={{map.wdp}}>{{map.wdpT}}</td>
281 <td colspan="2">其他</td> 281 <td colspan="2">其他</td>
282 <td colspan="3">&nbsp;</td> 282 <td colspan="3">&nbsp;</td>
@@ -287,7 +287,7 @@ @@ -287,7 +287,7 @@
287 <td colspan="2">工号</td> 287 <td colspan="2">工号</td>
288 <td rowspan="2">公里耗油</td> 288 <td rowspan="2">公里耗油</td>
289 <td colspan="2">起讫站</td> 289 <td colspan="2">起讫站</td>
290 - <td colspan="4">时间</td> 290 + <td colspan="5">时间</td>
291 <td colspan="2">误点</td> 291 <td colspan="2">误点</td>
292 <td rowspan="2" width="66px">里程(公里)计划</td> 292 <td rowspan="2" width="66px">里程(公里)计划</td>
293 <td rowspan="2" width="66px">里程(公里)实际</td> 293 <td rowspan="2" width="66px">里程(公里)实际</td>
@@ -299,6 +299,7 @@ @@ -299,6 +299,7 @@
299 <td colspan="1">起点</td> 299 <td colspan="1">起点</td>
300 <td colspan="1">终点</td> 300 <td colspan="1">终点</td>
301 <td colspan="1">计发</td> 301 <td colspan="1">计发</td>
  302 + <td colspan="1">待发</td>
302 <td colspan="1">实发</td> 303 <td colspan="1">实发</td>
303 <td colspan="1">应到</td> 304 <td colspan="1">应到</td>
304 <td colspan="1">实到</td> 305 <td colspan="1">实到</td>
@@ -322,6 +323,7 @@ @@ -322,6 +323,7 @@
322 <td>{{obj.qdzName}}</td> 323 <td>{{obj.qdzName}}</td>
323 <td>{{obj.zdzName}}</td> 324 <td>{{obj.zdzName}}</td>
324 <td>{{obj.fcsj}}</td> 325 <td>{{obj.fcsj}}</td>
  326 + <td>{{obj.dfsj}}</td>
325 <td>{{obj.fcsjActual}}</td> 327 <td>{{obj.fcsjActual}}</td>
326 <td>{{obj.zdsj}}</td> 328 <td>{{obj.zdsj}}</td>
327 <td>{{obj.zdsjActual}}</td> 329 <td>{{obj.zdsjActual}}</td>
@@ -354,7 +356,7 @@ @@ -354,7 +356,7 @@
354 <td >{{map.yygljh}}</td> 356 <td >{{map.yygljh}}</td>
355 <td >损失公里</td> 357 <td >损失公里</td>
356 <td>{{map.ssgl}}</td> 358 <td>{{map.ssgl}}</td>
357 - <td colspan="2">空驶公里</td> 359 + <td colspan="3">空驶公里</td>
358 <td colspan="1">{{map.ksgl}}</td> 360 <td colspan="1">{{map.ksgl}}</td>
359 <td colspan="3">营运公里(实际)</td> 361 <td colspan="3">营运公里(实际)</td>
360 <td colspan="2">{{map.yyglsj}}</td> 362 <td colspan="2">{{map.yyglsj}}</td>
@@ -367,7 +369,7 @@ @@ -367,7 +369,7 @@
367 <td>{{map.jcclc}}</td> 369 <td>{{map.jcclc}}</td>
368 <td >加车公里</td> 370 <td >加车公里</td>
369 <td>{{map.ljgl}}</td> 371 <td>{{map.ljgl}}</td>
370 - <td colspan="2">损失班次</td> 372 + <td colspan="3">损失班次</td>
371 <td colspan="1">{{map.ssbc}}</td> 373 <td colspan="1">{{map.ssbc}}</td>
372 <td colspan="3"></td> 374 <td colspan="3"></td>
373 <td colspan="2"></td> 375 <td colspan="2"></td>
@@ -381,7 +383,7 @@ @@ -381,7 +383,7 @@
381 <td >加车班次</td> 383 <td >加车班次</td>
382 <td>{{map.ljbc}}</td> 384 <td>{{map.ljbc}}</td>
383 385
384 - <td colspan="3"></td> 386 + <td colspan="4"></td>
385 <td colspan="5"></td> 387 <td colspan="5"></td>
386 </tr> 388 </tr>
387 </script> 389 </script>