Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
9294476f 1 parent 5f0626b3

文本框修正

Inline Side-by-side
Showing 2 changed files with 40 additions and 132 deletions
...@@ -77,8 +77,8 @@ ...@@ -77,8 +77,8 @@
77 class="formItem" 77 class="formItem"
78 type="textarea" 78 type="textarea"
79 placeholder="请输入运单号（回车分割）" 79 placeholder="请输入运单号（回车分割）"
80 - v-model.trim="formData.waybillNo" 80 + :autosize="true"
81 - rows="1" 81 + v-model="formData.waybillNo"
82 ></el-input> 82 ></el-input>
83 </el-form-item> 83 </el-form-item>
84 </el-col> 84 </el-col>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
125 type="textarea" 125 type="textarea"
126 placeholder="S_;P_;E2" 126 placeholder="S_;P_;E2"
127 v-model="ursa" 127 v-model="ursa"
128 - rows="1" 128 + :autosize="true"
129 ></el-input> 129 ></el-input>
130 </el-form-item> 130 </el-form-item>
131 </el-col> 131 </el-col>
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
136 type="textarea" 136 type="textarea"
137 placeholder="PVG;PEK" 137 placeholder="PVG;PEK"
138 v-model="siteName" 138 v-model="siteName"
139 - rows="1" 139 + :autosize="true"
140 ></el-input> 140 ></el-input>
141 </el-form-item> 141 </el-form-item>
142 </el-col> 142 </el-col>
...@@ -231,7 +231,9 @@ ...@@ -231,7 +231,9 @@
231 <el-form-item label="Handling Code"> 231 <el-form-item label="Handling Code">
232 <el-empty 232 <el-empty
233 description="暂无数据" 233 description="暂无数据"
234 - v-if="!selectData.HandlingCode || selectData.HandlingCode.length == 0" 234 + v-if="
235 + !selectData.HandlingCode || selectData.HandlingCode.length == 0
236 + "
235 ></el-empty> 237 ></el-empty>
236 <el-checkbox-group v-model="handingCodes" v-else> 238 <el-checkbox-group v-model="handingCodes" v-else>
237 <el-checkbox 239 <el-checkbox
...@@ -247,7 +249,9 @@ ...@@ -247,7 +249,9 @@
247 <el-form-item label="Sub Category"> 249 <el-form-item label="Sub Category">
248 <el-empty 250 <el-empty
249 description="暂无数据" 251 description="暂无数据"
250 - v-if="!selectData.SubCategory || selectData.SubCategory.length == 0" 252 + v-if="
253 + !selectData.SubCategory || selectData.SubCategory.length == 0
254 + "
251 ></el-empty> 255 ></el-empty>
252 <el-checkbox-group v-model="subCategorys" v-else> 256 <el-checkbox-group v-model="subCategorys" v-else>
253 <el-checkbox 257 <el-checkbox
...@@ -329,12 +333,12 @@ ...@@ -329,12 +333,12 @@
329 import Dialog from "./info.vue"; 333 import Dialog from "./info.vue";
330 import { findConditionData, findCargoAllocationData } from "@/api/cargoSelect"; 334 import { findConditionData, findCargoAllocationData } from "@/api/cargoSelect";
331 import { allDictData } from "@/api/destinationFlight"; 335 import { allDictData } from "@/api/destinationFlight";
332 -import { findFltConditionDataApi } from "@/api/findAllFltData"; 336 +// import { findFltConditionDataApi } from "@/api/findAllFltData";
333 import { downLoadXlsx } from "@/utils/zipdownload"; 337 import { downLoadXlsx } from "@/utils/zipdownload";
334 import { upCase } from "@/utils/FedEx"; 338 import { upCase } from "@/utils/FedEx";
335 339
336 export default { 340 export default {
337 - name:"CargoAllocation", 341 + name: "CargoAllocation",
338 components: { 342 components: {
339 Dialog, 343 Dialog,
340 }, 344 },
...@@ -344,7 +348,7 @@ export default { ...@@ -344,7 +348,7 @@ export default {
344 fltDateStart: null, 348 fltDateStart: null,
345 fltDateEnd: null, 349 fltDateEnd: null,
346 typeId: null, 350 typeId: null,
347 - portName:null, 351 + portName: null,
348 statusId: null, 352 statusId: null,
349 kindToAllocFlightId: null, 353 kindToAllocFlightId: null,
350 serviceTypeId: null, 354 serviceTypeId: null,
...@@ -369,7 +373,6 @@ export default { ...@@ -369,7 +373,6 @@ export default {
369 width: "50", 373 width: "50",
370 align: "center", 374 align: "center",
371 sorTable: false, 375 sorTable: false,
372 - slot: null,
373 fixed: true, 376 fixed: true,
374 }, 377 },
375 { 378 {
...@@ -379,7 +382,6 @@ export default { ...@@ -379,7 +382,6 @@ export default {
379 width: "50", 382 width: "50",
380 align: "center", 383 align: "center",
381 sorTable: false, 384 sorTable: false,
382 - slot: null,
383 fixed: false, 385 fixed: false,
384 }, 386 },
385 { 387 {
...@@ -389,7 +391,6 @@ export default { ...@@ -389,7 +391,6 @@ export default {
389 width: "150", 391 width: "150",
390 align: "center", 392 align: "center",
391 sorTable: true, 393 sorTable: true,
392 - slot: null,
393 fixed: false, 394 fixed: false,
394 }, 395 },
395 { 396 {
...@@ -399,7 +400,6 @@ export default { ...@@ -399,7 +400,6 @@ export default {
399 width: "150", 400 width: "150",
400 align: "center", 401 align: "center",
401 sorTable: true, 402 sorTable: true,
402 - slot: null,
403 fixed: false, 403 fixed: false,
404 }, 404 },
405 { 405 {
...@@ -409,7 +409,6 @@ export default { ...@@ -409,7 +409,6 @@ export default {
409 width: "150", 409 width: "150",
410 align: "center", 410 align: "center",
411 sorTable: true, 411 sorTable: true,
412 - slot: null,
413 fixed: false, 412 fixed: false,
414 }, 413 },
415 { 414 {
...@@ -419,7 +418,6 @@ export default { ...@@ -419,7 +418,6 @@ export default {
419 width: "150", 418 width: "150",
420 align: "center", 419 align: "center",
421 sorTable: true, 420 sorTable: true,
422 - slot: null,
423 fixed: false, 421 fixed: false,
424 }, 422 },
425 { 423 {
...@@ -429,7 +427,6 @@ export default { ...@@ -429,7 +427,6 @@ export default {
429 width: "150", 427 width: "150",
430 align: "center", 428 align: "center",
431 sorTable: true, 429 sorTable: true,
432 - slot: null,
433 fixed: false, 430 fixed: false,
434 }, 431 },
435 { 432 {
...@@ -439,7 +436,6 @@ export default { ...@@ -439,7 +436,6 @@ export default {
439 width: "150", 436 width: "150",
440 align: "center", 437 align: "center",
441 sorTable: true, 438 sorTable: true,
442 - slot: null,
443 fixed: false, 439 fixed: false,
444 }, 440 },
445 { 441 {
...@@ -449,7 +445,6 @@ export default { ...@@ -449,7 +445,6 @@ export default {
449 width: "150", 445 width: "150",
450 align: "center", 446 align: "center",
451 sorTable: true, 447 sorTable: true,
452 - slot: null,
453 fixed: false, 448 fixed: false,
454 }, 449 },
455 { 450 {
...@@ -468,7 +463,6 @@ export default { ...@@ -468,7 +463,6 @@ export default {
468 width: "150", 463 width: "150",
469 align: "center", 464 align: "center",
470 sorTable: true, 465 sorTable: true,
471 - slot: null,
472 fixed: false, 466 fixed: false,
473 }, 467 },
474 { 468 {
...@@ -478,7 +472,6 @@ export default { ...@@ -478,7 +472,6 @@ export default {
478 width: "150", 472 width: "150",
479 align: "center", 473 align: "center",
480 sorTable: true, 474 sorTable: true,
481 - slot: null,
482 fixed: false, 475 fixed: false,
483 }, 476 },
484 { 477 {
...@@ -488,7 +481,6 @@ export default { ...@@ -488,7 +481,6 @@ export default {
488 width: "150", 481 width: "150",
489 align: "center", 482 align: "center",
490 sorTable: true, 483 sorTable: true,
491 - slot: null,
492 fixed: false, 484 fixed: false,
493 }, 485 },
494 { 486 {
...@@ -498,7 +490,6 @@ export default { ...@@ -498,7 +490,6 @@ export default {
498 width: "150", 490 width: "150",
499 align: "center", 491 align: "center",
500 sorTable: true, 492 sorTable: true,
501 - slot: null,
502 fixed: false, 493 fixed: false,
503 }, 494 },
504 { 495 {
...@@ -508,7 +499,6 @@ export default { ...@@ -508,7 +499,6 @@ export default {
508 width: "150", 499 width: "150",
509 align: "center", 500 align: "center",
510 sorTable: true, 501 sorTable: true,
511 - slot: null,
512 fixed: false, 502 fixed: false,
513 }, 503 },
514 { 504 {
...@@ -518,7 +508,6 @@ export default { ...@@ -518,7 +508,6 @@ export default {
518 width: "150", 508 width: "150",
519 align: "center", 509 align: "center",
520 sorTable: true, 510 sorTable: true,
521 - slot: null,
522 fixed: false, 511 fixed: false,
523 }, 512 },
524 { 513 {
...@@ -528,7 +517,6 @@ export default { ...@@ -528,7 +517,6 @@ export default {
528 width: "150", 517 width: "150",
529 align: "center", 518 align: "center",
530 sorTable: true, 519 sorTable: true,
531 - slot: null,
532 fixed: false, 520 fixed: false,
533 }, 521 },
534 { 522 {
...@@ -538,7 +526,6 @@ export default { ...@@ -538,7 +526,6 @@ export default {
538 width: "150", 526 width: "150",
539 align: "center", 527 align: "center",
540 sorTable: false, 528 sorTable: false,
541 - slot: null,
542 fixed: false, 529 fixed: false,
543 }, 530 },
544 { 531 {
...@@ -548,7 +535,6 @@ export default { ...@@ -548,7 +535,6 @@ export default {
548 width: "150", 535 width: "150",
549 align: "center", 536 align: "center",
550 sorTable: true, 537 sorTable: true,
551 - slot: null,
552 fixed: false, 538 fixed: false,
553 }, 539 },
554 { 540 {
...@@ -558,7 +544,6 @@ export default { ...@@ -558,7 +544,6 @@ export default {
558 width: "150", 544 width: "150",
559 align: "center", 545 align: "center",
560 sorTable: true, 546 sorTable: true,
561 - slot: null,
562 fixed: false, 547 fixed: false,
563 }, 548 },
564 { 549 {
...@@ -568,7 +553,6 @@ export default { ...@@ -568,7 +553,6 @@ export default {
568 width: "150", 553 width: "150",
569 align: "center", 554 align: "center",
570 sorTable: false, 555 sorTable: false,
571 - slot: null,
572 fixed: false, 556 fixed: false,
573 }, 557 },
574 { 558 {
...@@ -578,7 +562,6 @@ export default { ...@@ -578,7 +562,6 @@ export default {
578 width: "150", 562 width: "150",
579 align: "center", 563 align: "center",
580 sorTable: true, 564 sorTable: true,
581 - slot: null,
582 fixed: false, 565 fixed: false,
583 }, 566 },
584 { 567 {
...@@ -588,7 +571,6 @@ export default { ...@@ -588,7 +571,6 @@ export default {
588 width: "150", 571 width: "150",
589 align: "center", 572 align: "center",
590 sorTable: true, 573 sorTable: true,
591 - slot: null,
592 fixed: false, 574 fixed: false,
593 }, 575 },
594 { 576 {
...@@ -598,7 +580,6 @@ export default { ...@@ -598,7 +580,6 @@ export default {
598 width: "150", 580 width: "150",
599 align: "center", 581 align: "center",
600 sorTable: true, 582 sorTable: true,
601 - slot: null,
602 fixed: false, 583 fixed: false,
603 }, 584 },
604 { 585 {
...@@ -608,7 +589,6 @@ export default { ...@@ -608,7 +589,6 @@ export default {
608 width: "150", 589 width: "150",
609 align: "center", 590 align: "center",
610 sorTable: true, 591 sorTable: true,
611 - slot: null,
612 fixed: false, 592 fixed: false,
613 }, 593 },
614 { 594 {
...@@ -618,7 +598,6 @@ export default { ...@@ -618,7 +598,6 @@ export default {
618 width: "150", 598 width: "150",
619 align: "center", 599 align: "center",
620 sorTable: true, 600 sorTable: true,
621 - slot: null,
622 fixed: false, 601 fixed: false,
623 }, 602 },
624 { 603 {
...@@ -628,7 +607,6 @@ export default { ...@@ -628,7 +607,6 @@ export default {
628 width: "150", 607 width: "150",
629 align: "center", 608 align: "center",
630 sorTable: true, 609 sorTable: true,
631 - slot: null,
632 fixed: false, 610 fixed: false,
633 }, 611 },
634 { 612 {
...@@ -638,7 +616,6 @@ export default { ...@@ -638,7 +616,6 @@ export default {
638 width: "150", 616 width: "150",
639 align: "center", 617 align: "center",
640 sorTable: true, 618 sorTable: true,
641 - slot: null,
642 fixed: false, 619 fixed: false,
643 }, 620 },
644 { 621 {
...@@ -648,7 +625,6 @@ export default { ...@@ -648,7 +625,6 @@ export default {
648 width: "150", 625 width: "150",
649 align: "center", 626 align: "center",
650 sorTable: true, 627 sorTable: true,
651 - slot: null,
652 fixed: false, 628 fixed: false,
653 }, 629 },
654 { 630 {
...@@ -658,7 +634,6 @@ export default { ...@@ -658,7 +634,6 @@ export default {
658 width: "150", 634 width: "150",
659 align: "center", 635 align: "center",
660 sorTable: true, 636 sorTable: true,
661 - slot: null,
662 fixed: false, 637 fixed: false,
663 }, 638 },
664 { 639 {
...@@ -668,7 +643,6 @@ export default { ...@@ -668,7 +643,6 @@ export default {
668 width: "150", 643 width: "150",
669 align: "center", 644 align: "center",
670 sorTable: true, 645 sorTable: true,
671 - slot: null,
672 fixed: false, 646 fixed: false,
673 }, 647 },
674 { 648 {
...@@ -678,7 +652,6 @@ export default { ...@@ -678,7 +652,6 @@ export default {
678 width: "170", 652 width: "170",
679 align: "center", 653 align: "center",
680 sorTable: true, 654 sorTable: true,
681 - slot: null,
682 fixed: false, 655 fixed: false,
683 }, 656 },
684 { 657 {
...@@ -688,7 +661,6 @@ export default { ...@@ -688,7 +661,6 @@ export default {
688 width: "150", 661 width: "150",
689 align: "center", 662 align: "center",
690 sorTable: true, 663 sorTable: true,
691 - slot: null,
692 fixed: false, 664 fixed: false,
693 }, 665 },
694 { 666 {
...@@ -698,7 +670,6 @@ export default { ...@@ -698,7 +670,6 @@ export default {
698 width: "150", 670 width: "150",
699 align: "center", 671 align: "center",
700 sorTable: false, 672 sorTable: false,
701 - slot: null,
702 fixed: false, 673 fixed: false,
703 }, 674 },
704 { 675 {
...@@ -708,7 +679,6 @@ export default { ...@@ -708,7 +679,6 @@ export default {
708 width: "150", 679 width: "150",
709 align: "center", 680 align: "center",
710 sorTable: false, 681 sorTable: false,
711 - slot: null,
712 fixed: false, 682 fixed: false,
713 }, 683 },
714 { 684 {
...@@ -718,7 +688,6 @@ export default { ...@@ -718,7 +688,6 @@ export default {
718 width: "150", 688 width: "150",
719 align: "center", 689 align: "center",
720 sorTable: false, 690 sorTable: false,
721 - slot: null,
722 fixed: false, 691 fixed: false,
723 }, 692 },
724 { 693 {
...@@ -728,7 +697,6 @@ export default { ...@@ -728,7 +697,6 @@ export default {
728 width: "150", 697 width: "150",
729 align: "center", 698 align: "center",
730 sorTable: false, 699 sorTable: false,
731 - slot: null,
732 fixed: false, 700 fixed: false,
733 }, 701 },
734 { 702 {
...@@ -738,7 +706,6 @@ export default { ...@@ -738,7 +706,6 @@ export default {
738 width: "150", 706 width: "150",
739 align: "center", 707 align: "center",
740 sorTable: true, 708 sorTable: true,
741 - slot: null,
742 fixed: false, 709 fixed: false,
743 }, 710 },
744 { 711 {
...@@ -748,7 +715,6 @@ export default { ...@@ -748,7 +715,6 @@ export default {
748 width: "300", 715 width: "300",
749 align: "center", 716 align: "center",
750 sorTable: false, 717 sorTable: false,
751 - slot: null,
752 fixed: false, 718 fixed: false,
753 }, 719 },
754 { 720 {
...@@ -758,7 +724,6 @@ export default { ...@@ -758,7 +724,6 @@ export default {
758 width: "150", 724 width: "150",
759 align: "center", 725 align: "center",
760 sorTable: false, 726 sorTable: false,
761 - slot: null,
762 fixed: false, 727 fixed: false,
763 }, 728 },
764 { 729 {
...@@ -768,7 +733,6 @@ export default { ...@@ -768,7 +733,6 @@ export default {
768 width: "150", 733 width: "150",
769 align: "center", 734 align: "center",
770 sorTable: true, 735 sorTable: true,
771 - slot: null,
772 fixed: false, 736 fixed: false,
773 }, 737 },
774 { 738 {
...@@ -778,7 +742,6 @@ export default { ...@@ -778,7 +742,6 @@ export default {
778 width: "150", 742 width: "150",
779 align: "center", 743 align: "center",
780 sorTable: true, 744 sorTable: true,
781 - slot: null,
782 fixed: false, 745 fixed: false,
783 }, 746 },
784 { 747 {
...@@ -788,7 +751,6 @@ export default { ...@@ -788,7 +751,6 @@ export default {
788 width: "150", 751 width: "150",
789 align: "center", 752 align: "center",
790 sorTable: true, 753 sorTable: true,
791 - slot: null,
792 fixed: false, 754 fixed: false,
793 }, 755 },
794 { 756 {
...@@ -798,7 +760,6 @@ export default { ...@@ -798,7 +760,6 @@ export default {
798 width: "150", 760 width: "150",
799 align: "center", 761 align: "center",
800 sorTable: true, 762 sorTable: true,
801 - slot: null,
802 fixed: false, 763 fixed: false,
803 }, 764 },
804 ], //表头数据 765 ], //表头数据
...@@ -833,7 +794,7 @@ export default { ...@@ -833,7 +794,7 @@ export default {
833 }, 794 },
834 created() { 795 created() {
835 this.seleData() 796 this.seleData()
836 - this.select() 797 + this.select();
837 }, 798 },
838 mounted() { 799 mounted() {
839 window.addEventListener("keydown", (code) => { 800 window.addEventListener("keydown", (code) => {
...@@ -979,6 +940,9 @@ export default { ...@@ -979,6 +940,9 @@ export default {
979 } 940 }
980 this.formData.page = this.page; 941 this.formData.page = this.page;
981 this.formData.size = this.size; 942 this.formData.size = this.size;
943 + if(this.formData.waybillNo){
944 + this.formData.waybillNo = this.formData.waybillNo.trim();
945 + }
982 }, 946 },
983 //导出表格 947 //导出表格
984 xlsx(val) { 948 xlsx(val) {
...@@ -1025,21 +989,21 @@ export default { ...@@ -1025,21 +989,21 @@ export default {
1025 this.select(); 989 this.select();
1026 }, 990 },
1027 //排序 991 //排序
1028 - sortChange(val){ 992 + sortChange(val) {
1029 - let data = [] 993 + let data = [];
1030 - let nullData = [] 994 + let nullData = [];
1031 - this.tableData.forEach(item=>{ 995 + this.tableData.forEach((item) => {
1032 - if(item[val.prop]){ 996 + if (item[val.prop]) {
1033 - data.push(item) 997 + data.push(item);
1034 - }else{ 998 + } else {
1035 - nullData.push(item) 999 + nullData.push(item);
1036 - } 1000 + }
1037 - }) 1001 + });
1038 - data = data.sort(this.$refs.newTables.compare(val.prop,val.order)) 1002 + data = data.sort(this.$refs.newTables.compare(val.prop, val.order));
1039 - if(val.order != "ascending"){ 1003 + if (val.order != "ascending") {
1040 - this.tableData = nullData.concat(data) 1004 + this.tableData = nullData.concat(data);
1041 - }else{ 1005 + } else {
1042 - this.tableData = data.concat(nullData) 1006 + this.tableData = data.concat(nullData);
1043 } 1007 }
1044 }, 1008 },
1045 //添加到航班 1009 //添加到航班
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 </el-col> 25 </el-col>
26 <el-col :span="6"> 26 <el-col :span="6">
27 <el-form-item label="配载航班号"> 27 <el-form-item label="配载航班号">
28 - <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" rows="1"></el-input> 28 + <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :autosize="true"></el-input>
29 </el-form-item> 29 </el-form-item>
30 </el-col> 30 </el-col>
31 <el-col :span="6"> 31 <el-col :span="6">
...@@ -51,10 +51,10 @@ ...@@ -51,10 +51,10 @@
51 <el-form-item label="运单号"> 51 <el-form-item label="运单号">
52 <el-input 52 <el-input
53 type="textarea" 53 type="textarea"
54 - v-model.trim="formData.waybillNo" 54 + v-model="formData.waybillNo"
55 class="formItem" 55 class="formItem"
56 placeholder="请输入运单号（回车间隔）" 56 placeholder="请输入运单号（回车间隔）"
57 - rows="1" 57 + :autosize="true"
58 ></el-input> 58 ></el-input>
59 </el-form-item> 59 </el-form-item>
60 </el-col> 60 </el-col>
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
102 v-model="ursa" 102 v-model="ursa"
103 class="formItem" 103 class="formItem"
104 placeholder="S_;P_;E2" 104 placeholder="S_;P_;E2"
105 - rows="1" 105 + :autosize="true"
106 ></el-input> 106 ></el-input>
107 </el-form-item> 107 </el-form-item>
108 </el-col> 108 </el-col>
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
113 v-model="siteName" 113 v-model="siteName"
114 class="formItem" 114 class="formItem"
115 placeholder="PVG;PEK" 115 placeholder="PVG;PEK"
116 - rows="1" 116 + :autosize="true"
117 ></el-input> 117 ></el-input>
118 </el-form-item> 118 </el-form-item>
119 </el-col> 119 </el-col>
...@@ -204,18 +204,6 @@ ...@@ -204,18 +204,6 @@
204 </el-select> 204 </el-select>
205 </el-form-item> 205 </el-form-item>
206 </el-col> 206 </el-col>
207 - <!-- <el-col :span="6">
208 - <el-form-item label="口岸代码">
209 - <el-select
210 - placeholder="不限"
211 - v-model="formData.portName"
212 - class="formItem"
213 - clearable
214 - >
215 -
216 - </el-select>
217 - </el-form-item>
218 - </el-col> -->
219 </el-row> 207 </el-row>
220 </el-col> 208 </el-col>
221 </el-row> 209 </el-row>
...@@ -228,9 +216,6 @@ ...@@ -228,9 +216,6 @@
228 @click="select" 216 @click="select"
229 >查询</el-button 217 >查询</el-button
230 > 218 >
231 - <!-- <el-button type="primary" size="small" @click="checks(tableData)"
232 - >全选/全否</el-button
233 - > -->
234 <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(0)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading" 219 <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(0)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading"
235 >{{downLoadingTip.downloading?downLoadingTip.tip:"导出本页查询结果"}}</el-button 220 >{{downLoadingTip.downloading?downLoadingTip.tip:"导出本页查询结果"}}</el-button
236 > 221 >
...@@ -243,7 +228,6 @@ ...@@ -243,7 +228,6 @@
243 <span style="paddingRight: 50px">总重量:{{ allWeight }}</span> 228 <span style="paddingRight: 50px">总重量:{{ allWeight }}</span>
244 <span>总件数:{{ allQty }}</span> 229 <span>总件数:{{ allQty }}</span>
245 </div> 230 </div>
246 - <!-- <RightToolbar :showSearch.sync="formShow" size="small"></RightToolbar> -->
247 <div class="formShow" @click="formShow = !formShow"><i class="el-icon-s-tools"></i>{{formShow?'收起条件':'更多条件'}}</div> 231 <div class="formShow" @click="formShow = !formShow"><i class="el-icon-s-tools"></i>{{formShow?'收起条件':'更多条件'}}</div>
248 </div> 232 </div>
249 </el-form> 233 </el-form>
...@@ -310,7 +294,6 @@ export default { ...@@ -310,7 +294,6 @@ export default {
310 width: "50", 294 width: "50",
311 align: "center", 295 align: "center",
312 sorTable: false, 296 sorTable: false,
313 - slot: null,
314 fixed:true, 297 fixed:true,
315 }, 298 },
316 { 299 {
...@@ -320,7 +303,6 @@ export default { ...@@ -320,7 +303,6 @@ export default {
320 width: "50", 303 width: "50",
321 align: "center", 304 align: "center",
322 sorTable: false, 305 sorTable: false,
323 - slot: null,
324 fixed:false, 306 fixed:false,
325 }, 307 },
326 { 308 {
...@@ -330,7 +312,6 @@ export default { ...@@ -330,7 +312,6 @@ export default {
330 width: "150", 312 width: "150",
331 align: "center", 313 align: "center",
332 sorTable: true, 314 sorTable: true,
333 - slot: null,
334 fixed:false, 315 fixed:false,
335 }, 316 },
336 { 317 {
...@@ -340,7 +321,6 @@ export default { ...@@ -340,7 +321,6 @@ export default {
340 width: "150", 321 width: "150",
341 align: "center", 322 align: "center",
342 sorTable: true, 323 sorTable: true,
343 - slot: null,
344 fixed:false, 324 fixed:false,
345 }, 325 },
346 { 326 {
...@@ -350,7 +330,6 @@ export default { ...@@ -350,7 +330,6 @@ export default {
350 width: "150", 330 width: "150",
351 align: "center", 331 align: "center",
352 sorTable: true, 332 sorTable: true,
353 - slot: null,
354 fixed:false, 333 fixed:false,
355 }, 334 },
356 { 335 {
...@@ -360,7 +339,6 @@ export default { ...@@ -360,7 +339,6 @@ export default {
360 width: "150", 339 width: "150",
361 align: "center", 340 align: "center",
362 sorTable: true, 341 sorTable: true,
363 - slot: null,
364 fixed:false, 342 fixed:false,
365 }, 343 },
366 { 344 {
...@@ -370,7 +348,6 @@ export default { ...@@ -370,7 +348,6 @@ export default {
370 width: "150", 348 width: "150",
371 align: "center", 349 align: "center",
372 sorTable: true, 350 sorTable: true,
373 - slot: null,
374 fixed:false, 351 fixed:false,
375 }, 352 },
376 { 353 {
...@@ -380,7 +357,6 @@ export default { ...@@ -380,7 +357,6 @@ export default {
380 width: "150", 357 width: "150",
381 align: "center", 358 align: "center",
382 sorTable: true, 359 sorTable: true,
383 - slot: null,
384 fixed:false, 360 fixed:false,
385 }, 361 },
386 { 362 {
...@@ -390,7 +366,6 @@ export default { ...@@ -390,7 +366,6 @@ export default {
390 width: "150", 366 width: "150",
391 align: "center", 367 align: "center",
392 sorTable: true, 368 sorTable: true,
393 - slot: null,
394 fixed:false, 369 fixed:false,
395 }, 370 },
396 { 371 {
...@@ -409,7 +384,6 @@ export default { ...@@ -409,7 +384,6 @@ export default {
409 width: "150", 384 width: "150",
410 align: "center", 385 align: "center",
411 sorTable: true, 386 sorTable: true,
412 - slot: null,
413 fixed:false, 387 fixed:false,
414 }, 388 },
415 { 389 {
...@@ -419,7 +393,6 @@ export default { ...@@ -419,7 +393,6 @@ export default {
419 width: "150", 393 width: "150",
420 align: "center", 394 align: "center",
421 sorTable: true, 395 sorTable: true,
422 - slot: null,
423 fixed:false, 396 fixed:false,
424 }, 397 },
425 { 398 {
...@@ -429,7 +402,6 @@ export default { ...@@ -429,7 +402,6 @@ export default {
429 width: "150", 402 width: "150",
430 align: "center", 403 align: "center",
431 sorTable: true, 404 sorTable: true,
432 - slot: null,
433 fixed:false, 405 fixed:false,
434 }, 406 },
435 { 407 {
...@@ -439,7 +411,6 @@ export default { ...@@ -439,7 +411,6 @@ export default {
439 width: "150", 411 width: "150",
440 align: "center", 412 align: "center",
441 sorTable: true, 413 sorTable: true,
442 - slot: null,
443 fixed:false, 414 fixed:false,
444 }, 415 },
445 { 416 {
...@@ -449,7 +420,6 @@ export default { ...@@ -449,7 +420,6 @@ export default {
449 width: "150", 420 width: "150",
450 align: "center", 421 align: "center",
451 sorTable: true, 422 sorTable: true,
452 - slot: null,
453 fixed:false, 423 fixed:false,
454 }, 424 },
455 { 425 {
...@@ -459,7 +429,6 @@ export default { ...@@ -459,7 +429,6 @@ export default {
459 width: "150", 429 width: "150",
460 align: "center", 430 align: "center",
461 sorTable: true, 431 sorTable: true,
462 - slot: null,
463 fixed:false, 432 fixed:false,
464 }, 433 },
465 { 434 {
...@@ -469,7 +438,6 @@ export default { ...@@ -469,7 +438,6 @@ export default {
469 width: "150", 438 width: "150",
470 align: "center", 439 align: "center",
471 sorTable: true, 440 sorTable: true,
472 - slot: null,
473 fixed:false, 441 fixed:false,
474 }, 442 },
475 { 443 {
...@@ -479,7 +447,6 @@ export default { ...@@ -479,7 +447,6 @@ export default {
479 width: "150", 447 width: "150",
480 align: "center", 448 align: "center",
481 sorTable: false, 449 sorTable: false,
482 - slot: null,
483 fixed:false, 450 fixed:false,
484 }, 451 },
485 { 452 {
...@@ -489,7 +456,6 @@ export default { ...@@ -489,7 +456,6 @@ export default {
489 width: "150", 456 width: "150",
490 align: "center", 457 align: "center",
491 sorTable: true, 458 sorTable: true,
492 - slot: null,
493 fixed:false, 459 fixed:false,
494 }, 460 },
495 { 461 {
...@@ -499,7 +465,6 @@ export default { ...@@ -499,7 +465,6 @@ export default {
499 width: "150", 465 width: "150",
500 align: "center", 466 align: "center",
501 sorTable: true, 467 sorTable: true,
502 - slot: null,
503 fixed:false, 468 fixed:false,
504 }, 469 },
505 { 470 {
...@@ -509,7 +474,6 @@ export default { ...@@ -509,7 +474,6 @@ export default {
509 width: "150", 474 width: "150",
510 align: "center", 475 align: "center",
511 sorTable: false, 476 sorTable: false,
512 - slot: null,
513 fixed:false, 477 fixed:false,
514 }, 478 },
515 { 479 {
...@@ -519,7 +483,6 @@ export default { ...@@ -519,7 +483,6 @@ export default {
519 width: "150", 483 width: "150",
520 align: "center", 484 align: "center",
521 sorTable: true, 485 sorTable: true,
522 - slot: null,
523 fixed:false, 486 fixed:false,
524 }, 487 },
525 { 488 {
...@@ -529,7 +492,6 @@ export default { ...@@ -529,7 +492,6 @@ export default {
529 width: "150", 492 width: "150",
530 align: "center", 493 align: "center",
531 sorTable: true, 494 sorTable: true,
532 - slot: null,
533 fixed:false, 495 fixed:false,
534 }, 496 },
535 { 497 {
...@@ -539,7 +501,6 @@ export default { ...@@ -539,7 +501,6 @@ export default {
539 width: "150", 501 width: "150",
540 align: "center", 502 align: "center",
541 sorTable: true, 503 sorTable: true,
542 - slot: null,
543 fixed:false, 504 fixed:false,
544 }, 505 },
545 { 506 {
...@@ -549,7 +510,6 @@ export default { ...@@ -549,7 +510,6 @@ export default {
549 width: "150", 510 width: "150",
550 align: "center", 511 align: "center",
551 sorTable: true, 512 sorTable: true,
552 - slot: null,
553 fixed:false, 513 fixed:false,
554 }, 514 },
555 { 515 {
...@@ -559,7 +519,6 @@ export default { ...@@ -559,7 +519,6 @@ export default {
559 width: "150", 519 width: "150",
560 align: "center", 520 align: "center",
561 sorTable: true, 521 sorTable: true,
562 - slot: null,
563 fixed:false, 522 fixed:false,
564 }, 523 },
565 { 524 {
...@@ -569,7 +528,6 @@ export default { ...@@ -569,7 +528,6 @@ export default {
569 width: "150", 528 width: "150",
570 align: "center", 529 align: "center",
571 sorTable: true, 530 sorTable: true,
572 - slot: null,
573 fixed:false, 531 fixed:false,
574 }, 532 },
575 { 533 {
...@@ -579,7 +537,6 @@ export default { ...@@ -579,7 +537,6 @@ export default {
579 width: "150", 537 width: "150",
580 align: "center", 538 align: "center",
581 sorTable: true, 539 sorTable: true,
582 - slot: null,
583 fixed:false, 540 fixed:false,
584 }, 541 },
585 { 542 {
...@@ -589,7 +546,6 @@ export default { ...@@ -589,7 +546,6 @@ export default {
589 width: "150", 546 width: "150",
590 align: "center", 547 align: "center",
591 sorTable: true, 548 sorTable: true,
592 - slot: null,
593 fixed:false, 549 fixed:false,
594 }, 550 },
595 { 551 {
...@@ -599,7 +555,6 @@ export default { ...@@ -599,7 +555,6 @@ export default {
599 width: "150", 555 width: "150",
600 align: "center", 556 align: "center",
601 sorTable: true, 557 sorTable: true,
602 - slot: null,
603 fixed:false, 558 fixed:false,
604 }, 559 },
605 { 560 {
...@@ -609,7 +564,6 @@ export default { ...@@ -609,7 +564,6 @@ export default {
609 width: "150", 564 width: "150",
610 align: "center", 565 align: "center",
611 sorTable: true, 566 sorTable: true,
612 - slot: null,
613 fixed:false, 567 fixed:false,
614 }, 568 },
615 { 569 {
...@@ -619,7 +573,6 @@ export default { ...@@ -619,7 +573,6 @@ export default {
619 width: "170", 573 width: "170",
620 align: "center", 574 align: "center",
621 sorTable: true, 575 sorTable: true,
622 - slot: null,
623 fixed:false, 576 fixed:false,
624 }, 577 },
625 { 578 {
...@@ -629,7 +582,6 @@ export default { ...@@ -629,7 +582,6 @@ export default {
629 width: "150", 582 width: "150",
630 align: "center", 583 align: "center",
631 sorTable: true, 584 sorTable: true,
632 - slot: null,
633 fixed:false, 585 fixed:false,
634 }, 586 },
635 { 587 {
...@@ -639,7 +591,6 @@ export default { ...@@ -639,7 +591,6 @@ export default {
639 width: "150", 591 width: "150",
640 align: "center", 592 align: "center",
641 sorTable: false, 593 sorTable: false,
642 - slot: null,
643 fixed:false, 594 fixed:false,
644 }, 595 },
645 { 596 {
...@@ -649,7 +600,6 @@ export default { ...@@ -649,7 +600,6 @@ export default {
649 width: "150", 600 width: "150",
650 align: "center", 601 align: "center",
651 sorTable: false, 602 sorTable: false,
652 - slot: null,
653 fixed:false, 603 fixed:false,
654 }, 604 },
655 { 605 {
...@@ -659,7 +609,6 @@ export default { ...@@ -659,7 +609,6 @@ export default {
659 width: "150", 609 width: "150",
660 align: "center", 610 align: "center",
661 sorTable: false, 611 sorTable: false,
662 - slot: null,
663 fixed:false, 612 fixed:false,
664 }, 613 },
665 { 614 {
...@@ -669,7 +618,6 @@ export default { ...@@ -669,7 +618,6 @@ export default {
669 width: "150", 618 width: "150",
670 align: "center", 619 align: "center",
671 sorTable: false, 620 sorTable: false,
672 - slot: null,
673 fixed:false, 621 fixed:false,
674 }, 622 },
675 { 623 {
...@@ -679,7 +627,6 @@ export default { ...@@ -679,7 +627,6 @@ export default {
679 width: "150", 627 width: "150",
680 align: "center", 628 align: "center",
681 sorTable: true, 629 sorTable: true,
682 - slot: null,
683 fixed:false, 630 fixed:false,
684 }, 631 },
685 { 632 {
...@@ -689,7 +636,6 @@ export default { ...@@ -689,7 +636,6 @@ export default {
689 width: "300", 636 width: "300",
690 align: "center", 637 align: "center",
691 sorTable: false, 638 sorTable: false,
692 - slot: null,
693 fixed:false, 639 fixed:false,
694 }, 640 },
695 { 641 {
...@@ -699,7 +645,6 @@ export default { ...@@ -699,7 +645,6 @@ export default {
699 width: "150", 645 width: "150",
700 align: "center", 646 align: "center",
701 sorTable: false, 647 sorTable: false,
702 - slot: null,
703 fixed:false, 648 fixed:false,
704 }, 649 },
705 { 650 {
...@@ -709,7 +654,6 @@ export default { ...@@ -709,7 +654,6 @@ export default {
709 width: "150", 654 width: "150",
710 align: "center", 655 align: "center",
711 sorTable: true, 656 sorTable: true,
712 - slot: null,
713 fixed:false, 657 fixed:false,
714 }, 658 },
715 { 659 {
...@@ -719,7 +663,6 @@ export default { ...@@ -719,7 +663,6 @@ export default {
719 width: "150", 663 width: "150",
720 align: "center", 664 align: "center",
721 sorTable: true, 665 sorTable: true,
722 - slot: null,
723 fixed:false, 666 fixed:false,
724 }, 667 },
725 { 668 {
...@@ -729,7 +672,6 @@ export default { ...@@ -729,7 +672,6 @@ export default {
729 width: "150", 672 width: "150",
730 align: "center", 673 align: "center",
731 sorTable: true, 674 sorTable: true,
732 - slot: null,
733 fixed:false, 675 fixed:false,
734 }, 676 },
735 { 677 {
...@@ -739,7 +681,6 @@ export default { ...@@ -739,7 +681,6 @@ export default {
739 width: "150", 681 width: "150",
740 align: "center", 682 align: "center",
741 sorTable: true, 683 sorTable: true,
742 - slot: null,
743 fixed:false, 684 fixed:false,
744 }, 685 },
745 ], //表头数据 686 ], //表头数据
...@@ -865,6 +806,9 @@ export default { ...@@ -865,6 +806,9 @@ export default {
865 this.formData.cargoPlaneStart = null; 806 this.formData.cargoPlaneStart = null;
866 this.formData.cargoPlaneEnd = null; 807 this.formData.cargoPlaneEnd = null;
867 } 808 }
809 + if(this.formData.waybillNo){
810 + this.formData.waybillNo = this.formData.waybillNo.trim();
811 + }
868 }, 812 },
869 //总和 813 //总和
870 cargoTotal(){ 814 cargoTotal(){
......