Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
4cfe11f4 1 parent d2f19073

文本框修正，bug修复

Inline Side-by-side
Showing 4 changed files with 51 additions and 122 deletions
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
9 }" 9 }"
10 > 10 >
11 <logo v-if="showLogo" :collapse="isCollapse" /> 11 <logo v-if="showLogo" :collapse="isCollapse" />
12 - <!-- <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper"> --> 12 + <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
13 <el-menu 13 <el-menu
14 :default-active="activeMenu" 14 :default-active="activeMenu"
15 :collapse="isCollapse" 15 :collapse="isCollapse"
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 /> 36 />
37 </el-menu> 37 </el-menu>
38 <div class="version">{{ version }}</div> 38 <div class="version">{{ version }}</div>
39 - <!-- </el-scrollbar> --> 39 + </el-scrollbar>
40 </div> 40 </div>
41 </template> 41 </template>
42 42
......
...@@ -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>
...@@ -373,7 +373,6 @@ export default { ...@@ -373,7 +373,6 @@ export default {
373 width: "50", 373 width: "50",
374 align: "center", 374 align: "center",
375 sorTable: false, 375 sorTable: false,
376 - slot: null,
377 fixed: true, 376 fixed: true,
378 }, 377 },
379 { 378 {
...@@ -383,7 +382,6 @@ export default { ...@@ -383,7 +382,6 @@ export default {
383 width: "50", 382 width: "50",
384 align: "center", 383 align: "center",
385 sorTable: false, 384 sorTable: false,
386 - slot: null,
387 fixed: false, 385 fixed: false,
388 }, 386 },
389 { 387 {
...@@ -393,7 +391,6 @@ export default { ...@@ -393,7 +391,6 @@ export default {
393 width: "150", 391 width: "150",
394 align: "center", 392 align: "center",
395 sorTable: true, 393 sorTable: true,
396 - slot: null,
397 fixed: false, 394 fixed: false,
398 }, 395 },
399 { 396 {
...@@ -403,7 +400,6 @@ export default { ...@@ -403,7 +400,6 @@ export default {
403 width: "150", 400 width: "150",
404 align: "center", 401 align: "center",
405 sorTable: true, 402 sorTable: true,
406 - slot: null,
407 fixed: false, 403 fixed: false,
408 }, 404 },
409 { 405 {
...@@ -413,7 +409,6 @@ export default { ...@@ -413,7 +409,6 @@ export default {
413 width: "150", 409 width: "150",
414 align: "center", 410 align: "center",
415 sorTable: true, 411 sorTable: true,
416 - slot: null,
417 fixed: false, 412 fixed: false,
418 }, 413 },
419 { 414 {
...@@ -423,7 +418,6 @@ export default { ...@@ -423,7 +418,6 @@ export default {
423 width: "150", 418 width: "150",
424 align: "center", 419 align: "center",
425 sorTable: true, 420 sorTable: true,
426 - slot: null,
427 fixed: false, 421 fixed: false,
428 }, 422 },
429 { 423 {
...@@ -433,7 +427,6 @@ export default { ...@@ -433,7 +427,6 @@ export default {
433 width: "150", 427 width: "150",
434 align: "center", 428 align: "center",
435 sorTable: true, 429 sorTable: true,
436 - slot: null,
437 fixed: false, 430 fixed: false,
438 }, 431 },
439 { 432 {
...@@ -443,7 +436,6 @@ export default { ...@@ -443,7 +436,6 @@ export default {
443 width: "150", 436 width: "150",
444 align: "center", 437 align: "center",
445 sorTable: true, 438 sorTable: true,
446 - slot: null,
447 fixed: false, 439 fixed: false,
448 }, 440 },
449 { 441 {
...@@ -453,7 +445,6 @@ export default { ...@@ -453,7 +445,6 @@ export default {
453 width: "150", 445 width: "150",
454 align: "center", 446 align: "center",
455 sorTable: true, 447 sorTable: true,
456 - slot: null,
457 fixed: false, 448 fixed: false,
458 }, 449 },
459 { 450 {
...@@ -472,7 +463,6 @@ export default { ...@@ -472,7 +463,6 @@ export default {
472 width: "150", 463 width: "150",
473 align: "center", 464 align: "center",
474 sorTable: true, 465 sorTable: true,
475 - slot: null,
476 fixed: false, 466 fixed: false,
477 }, 467 },
478 { 468 {
...@@ -482,7 +472,6 @@ export default { ...@@ -482,7 +472,6 @@ export default {
482 width: "150", 472 width: "150",
483 align: "center", 473 align: "center",
484 sorTable: true, 474 sorTable: true,
485 - slot: null,
486 fixed: false, 475 fixed: false,
487 }, 476 },
488 { 477 {
...@@ -492,7 +481,6 @@ export default { ...@@ -492,7 +481,6 @@ export default {
492 width: "150", 481 width: "150",
493 align: "center", 482 align: "center",
494 sorTable: true, 483 sorTable: true,
495 - slot: null,
496 fixed: false, 484 fixed: false,
497 }, 485 },
498 { 486 {
...@@ -502,7 +490,6 @@ export default { ...@@ -502,7 +490,6 @@ export default {
502 width: "150", 490 width: "150",
503 align: "center", 491 align: "center",
504 sorTable: true, 492 sorTable: true,
505 - slot: null,
506 fixed: false, 493 fixed: false,
507 }, 494 },
508 { 495 {
...@@ -512,7 +499,6 @@ export default { ...@@ -512,7 +499,6 @@ export default {
512 width: "150", 499 width: "150",
513 align: "center", 500 align: "center",
514 sorTable: true, 501 sorTable: true,
515 - slot: null,
516 fixed: false, 502 fixed: false,
517 }, 503 },
518 { 504 {
...@@ -522,7 +508,6 @@ export default { ...@@ -522,7 +508,6 @@ export default {
522 width: "150", 508 width: "150",
523 align: "center", 509 align: "center",
524 sorTable: true, 510 sorTable: true,
525 - slot: null,
526 fixed: false, 511 fixed: false,
527 }, 512 },
528 { 513 {
...@@ -532,7 +517,6 @@ export default { ...@@ -532,7 +517,6 @@ export default {
532 width: "150", 517 width: "150",
533 align: "center", 518 align: "center",
534 sorTable: true, 519 sorTable: true,
535 - slot: null,
536 fixed: false, 520 fixed: false,
537 }, 521 },
538 { 522 {
...@@ -542,7 +526,6 @@ export default { ...@@ -542,7 +526,6 @@ export default {
542 width: "150", 526 width: "150",
543 align: "center", 527 align: "center",
544 sorTable: false, 528 sorTable: false,
545 - slot: null,
546 fixed: false, 529 fixed: false,
547 }, 530 },
548 { 531 {
...@@ -552,7 +535,6 @@ export default { ...@@ -552,7 +535,6 @@ export default {
552 width: "150", 535 width: "150",
553 align: "center", 536 align: "center",
554 sorTable: true, 537 sorTable: true,
555 - slot: null,
556 fixed: false, 538 fixed: false,
557 }, 539 },
558 { 540 {
...@@ -562,7 +544,6 @@ export default { ...@@ -562,7 +544,6 @@ export default {
562 width: "150", 544 width: "150",
563 align: "center", 545 align: "center",
564 sorTable: true, 546 sorTable: true,
565 - slot: null,
566 fixed: false, 547 fixed: false,
567 }, 548 },
568 { 549 {
...@@ -572,7 +553,6 @@ export default { ...@@ -572,7 +553,6 @@ export default {
572 width: "150", 553 width: "150",
573 align: "center", 554 align: "center",
574 sorTable: false, 555 sorTable: false,
575 - slot: null,
576 fixed: false, 556 fixed: false,
577 }, 557 },
578 { 558 {
...@@ -582,7 +562,6 @@ export default { ...@@ -582,7 +562,6 @@ export default {
582 width: "150", 562 width: "150",
583 align: "center", 563 align: "center",
584 sorTable: true, 564 sorTable: true,
585 - slot: null,
586 fixed: false, 565 fixed: false,
587 }, 566 },
588 { 567 {
...@@ -592,7 +571,6 @@ export default { ...@@ -592,7 +571,6 @@ export default {
592 width: "150", 571 width: "150",
593 align: "center", 572 align: "center",
594 sorTable: true, 573 sorTable: true,
595 - slot: null,
596 fixed: false, 574 fixed: false,
597 }, 575 },
598 { 576 {
...@@ -602,7 +580,6 @@ export default { ...@@ -602,7 +580,6 @@ export default {
602 width: "150", 580 width: "150",
603 align: "center", 581 align: "center",
604 sorTable: true, 582 sorTable: true,
605 - slot: null,
606 fixed: false, 583 fixed: false,
607 }, 584 },
608 { 585 {
...@@ -612,7 +589,6 @@ export default { ...@@ -612,7 +589,6 @@ export default {
612 width: "150", 589 width: "150",
613 align: "center", 590 align: "center",
614 sorTable: true, 591 sorTable: true,
615 - slot: null,
616 fixed: false, 592 fixed: false,
617 }, 593 },
618 { 594 {
...@@ -622,7 +598,6 @@ export default { ...@@ -622,7 +598,6 @@ export default {
622 width: "150", 598 width: "150",
623 align: "center", 599 align: "center",
624 sorTable: true, 600 sorTable: true,
625 - slot: null,
626 fixed: false, 601 fixed: false,
627 }, 602 },
628 { 603 {
...@@ -632,7 +607,6 @@ export default { ...@@ -632,7 +607,6 @@ export default {
632 width: "150", 607 width: "150",
633 align: "center", 608 align: "center",
634 sorTable: true, 609 sorTable: true,
635 - slot: null,
636 fixed: false, 610 fixed: false,
637 }, 611 },
638 { 612 {
...@@ -642,7 +616,6 @@ export default { ...@@ -642,7 +616,6 @@ export default {
642 width: "150", 616 width: "150",
643 align: "center", 617 align: "center",
644 sorTable: true, 618 sorTable: true,
645 - slot: null,
646 fixed: false, 619 fixed: false,
647 }, 620 },
648 { 621 {
...@@ -652,7 +625,6 @@ export default { ...@@ -652,7 +625,6 @@ export default {
652 width: "150", 625 width: "150",
653 align: "center", 626 align: "center",
654 sorTable: true, 627 sorTable: true,
655 - slot: null,
656 fixed: false, 628 fixed: false,
657 }, 629 },
658 { 630 {
...@@ -662,7 +634,6 @@ export default { ...@@ -662,7 +634,6 @@ export default {
662 width: "150", 634 width: "150",
663 align: "center", 635 align: "center",
664 sorTable: true, 636 sorTable: true,
665 - slot: null,
666 fixed: false, 637 fixed: false,
667 }, 638 },
668 { 639 {
...@@ -672,7 +643,6 @@ export default { ...@@ -672,7 +643,6 @@ export default {
672 width: "150", 643 width: "150",
673 align: "center", 644 align: "center",
674 sorTable: true, 645 sorTable: true,
675 - slot: null,
676 fixed: false, 646 fixed: false,
677 }, 647 },
678 { 648 {
...@@ -682,7 +652,6 @@ export default { ...@@ -682,7 +652,6 @@ export default {
682 width: "170", 652 width: "170",
683 align: "center", 653 align: "center",
684 sorTable: true, 654 sorTable: true,
685 - slot: null,
686 fixed: false, 655 fixed: false,
687 }, 656 },
688 { 657 {
...@@ -692,7 +661,6 @@ export default { ...@@ -692,7 +661,6 @@ export default {
692 width: "150", 661 width: "150",
693 align: "center", 662 align: "center",
694 sorTable: true, 663 sorTable: true,
695 - slot: null,
696 fixed: false, 664 fixed: false,
697 }, 665 },
698 { 666 {
...@@ -702,7 +670,6 @@ export default { ...@@ -702,7 +670,6 @@ export default {
702 width: "150", 670 width: "150",
703 align: "center", 671 align: "center",
704 sorTable: false, 672 sorTable: false,
705 - slot: null,
706 fixed: false, 673 fixed: false,
707 }, 674 },
708 { 675 {
...@@ -712,7 +679,6 @@ export default { ...@@ -712,7 +679,6 @@ export default {
712 width: "150", 679 width: "150",
713 align: "center", 680 align: "center",
714 sorTable: false, 681 sorTable: false,
715 - slot: null,
716 fixed: false, 682 fixed: false,
717 }, 683 },
718 { 684 {
...@@ -722,7 +688,6 @@ export default { ...@@ -722,7 +688,6 @@ export default {
722 width: "150", 688 width: "150",
723 align: "center", 689 align: "center",
724 sorTable: false, 690 sorTable: false,
725 - slot: null,
726 fixed: false, 691 fixed: false,
727 }, 692 },
728 { 693 {
...@@ -732,7 +697,6 @@ export default { ...@@ -732,7 +697,6 @@ export default {
732 width: "150", 697 width: "150",
733 align: "center", 698 align: "center",
734 sorTable: false, 699 sorTable: false,
735 - slot: null,
736 fixed: false, 700 fixed: false,
737 }, 701 },
738 { 702 {
...@@ -742,7 +706,6 @@ export default { ...@@ -742,7 +706,6 @@ export default {
742 width: "150", 706 width: "150",
743 align: "center", 707 align: "center",
744 sorTable: true, 708 sorTable: true,
745 - slot: null,
746 fixed: false, 709 fixed: false,
747 }, 710 },
748 { 711 {
...@@ -752,7 +715,6 @@ export default { ...@@ -752,7 +715,6 @@ export default {
752 width: "300", 715 width: "300",
753 align: "center", 716 align: "center",
754 sorTable: false, 717 sorTable: false,
755 - slot: null,
756 fixed: false, 718 fixed: false,
757 }, 719 },
758 { 720 {
...@@ -762,7 +724,6 @@ export default { ...@@ -762,7 +724,6 @@ export default {
762 width: "150", 724 width: "150",
763 align: "center", 725 align: "center",
764 sorTable: false, 726 sorTable: false,
765 - slot: null,
766 fixed: false, 727 fixed: false,
767 }, 728 },
768 { 729 {
...@@ -772,7 +733,6 @@ export default { ...@@ -772,7 +733,6 @@ export default {
772 width: "150", 733 width: "150",
773 align: "center", 734 align: "center",
774 sorTable: true, 735 sorTable: true,
775 - slot: null,
776 fixed: false, 736 fixed: false,
777 }, 737 },
778 { 738 {
...@@ -782,7 +742,6 @@ export default { ...@@ -782,7 +742,6 @@ export default {
782 width: "150", 742 width: "150",
783 align: "center", 743 align: "center",
784 sorTable: true, 744 sorTable: true,
785 - slot: null,
786 fixed: false, 745 fixed: false,
787 }, 746 },
788 { 747 {
...@@ -792,7 +751,6 @@ export default { ...@@ -792,7 +751,6 @@ export default {
792 width: "150", 751 width: "150",
793 align: "center", 752 align: "center",
794 sorTable: true, 753 sorTable: true,
795 - slot: null,
796 fixed: false, 754 fixed: false,
797 }, 755 },
798 { 756 {
...@@ -802,7 +760,6 @@ export default { ...@@ -802,7 +760,6 @@ export default {
802 width: "150", 760 width: "150",
803 align: "center", 761 align: "center",
804 sorTable: true, 762 sorTable: true,
805 - slot: null,
806 fixed: false, 763 fixed: false,
807 }, 764 },
808 ], //表头数据 765 ], //表头数据
...@@ -836,7 +793,7 @@ export default { ...@@ -836,7 +793,7 @@ export default {
836 }; 793 };
837 }, 794 },
838 created() { 795 created() {
839 - this.seleData(); 796 + this.seleData()
840 this.select(); 797 this.select();
841 }, 798 },
842 mounted() { 799 mounted() {
...@@ -983,6 +940,9 @@ export default { ...@@ -983,6 +940,9 @@ export default {
983 } 940 }
984 this.formData.page = this.page; 941 this.formData.page = this.page;
985 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 + }
986 }, 946 },
987 //导出表格 947 //导出表格
988 xlsx(val) { 948 xlsx(val) {
......
...@@ -34,7 +34,12 @@ ...@@ -34,7 +34,12 @@
34 type="primary" 34 type="primary"
35 icon="el-icon-plus" 35 icon="el-icon-plus"
36 size="mini" 36 size="mini"
37 - @click="$router.push({ name: 'FlightAllocConfigInfo', params: { handle: 'add' } })" 37 + @click="
38 + $router.push({
39 + name: 'FlightAllocConfigInfo',
40 + params: { handle: 'add' },
41 + })
42 + "
38 >添加</el-button 43 >添加</el-button
39 > 44 >
40 <el-table :data="flyList" v-loading="loading" size="small"> 45 <el-table :data="flyList" v-loading="loading" size="small">
...@@ -127,12 +132,12 @@ import { ...@@ -127,12 +132,12 @@ import {
127 import { parseTime } from "@/utils/FedEx"; 132 import { parseTime } from "@/utils/FedEx";
128 133
129 export default { 134 export default {
130 - name:"FlightAllocConfig", 135 + name: "FlightAllocConfig",
131 data() { 136 data() {
132 return { 137 return {
133 queryParams: { 138 queryParams: {
134 purposeOfFlightNo: "", 139 purposeOfFlightNo: "",
135 - status:"1", 140 + status: "1",
136 start: 0, 141 start: 0,
137 limit: 10, 142 limit: 10,
138 }, 143 },
...@@ -187,15 +192,16 @@ export default { ...@@ -187,15 +192,16 @@ export default {
187 cancelButtonText: "取消", 192 cancelButtonText: "取消",
188 showCancelButton: true, 193 showCancelButton: true,
189 type: "warning", 194 type: "warning",
190 - }) 195 + }).then(() => {
191 - .then(function () { 196 + delFlightId(id)
192 - return delFlightId(id); 197 + .then((res) => {
193 - }) 198 + this.$message({
194 - .then(() => { 199 + message: res.msg,
195 - this.getList(); 200 + type: res.code === 200 ? "success" : "warning",
196 - this.msgSuccess("删除成功"); 201 + });
197 - }) 202 + })
198 - .catch(function () {}); 203 + .catch(() => {});
204 + });
199 } 205 }
200 }, 206 },
201 //启用，停用 207 //启用，停用
...@@ -205,30 +211,33 @@ export default { ...@@ -205,30 +211,33 @@ export default {
205 confirmButtonText: "确定", 211 confirmButtonText: "确定",
206 cancelButtonText: "取消", 212 cancelButtonText: "取消",
207 type: "warning", 213 type: "warning",
208 - }) 214 + }).then(() => {
209 - .then(function () { 215 + enableOrDisable(id, status)
210 - return enableOrDisable(id, status); 216 + .then((res) => {
211 - }) 217 + if (res.code != 200) {
212 - .then(() => { 218 + this.msgError(res.msg);
213 - this.getList(); 219 + } else {
214 - this.msgSuccess(tip + "成功"); 220 + this.getList();
215 - }) 221 + this.msgSuccess(tip + "成功");
216 - .catch(function () {}); 222 + }
223 + })
224 + .catch(() => {});
225 + });
217 }, 226 },
218 }, 227 },
219 created() { 228 created() {
220 this.getList(); 229 this.getList();
221 }, 230 },
222 - computed:{ 231 + computed: {
223 purposeOfFlightNo: { 232 purposeOfFlightNo: {
224 get: function () { 233 get: function () {
225 return this.queryParams.purposeOfFlightNo; 234 return this.queryParams.purposeOfFlightNo;
226 }, 235 },
227 set: function (val) { 236 set: function (val) {
228 - this.queryParams.purposeOfFlightNo = val.toUpperCase() 237 + this.queryParams.purposeOfFlightNo = val.toUpperCase();
229 }, 238 },
230 }, 239 },
231 - } 240 + },
232 }; 241 };
233 </script> 242 </script>
234 243
......
...@@ -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>
...@@ -294,7 +294,6 @@ export default { ...@@ -294,7 +294,6 @@ export default {
294 width: "50", 294 width: "50",
295 align: "center", 295 align: "center",
296 sorTable: false, 296 sorTable: false,
297 - slot: null,
298 fixed:true, 297 fixed:true,
299 }, 298 },
300 { 299 {
...@@ -304,7 +303,6 @@ export default { ...@@ -304,7 +303,6 @@ export default {
304 width: "50", 303 width: "50",
305 align: "center", 304 align: "center",
306 sorTable: false, 305 sorTable: false,
307 - slot: null,
308 fixed:false, 306 fixed:false,
309 }, 307 },
310 { 308 {
...@@ -314,7 +312,6 @@ export default { ...@@ -314,7 +312,6 @@ export default {
314 width: "150", 312 width: "150",
315 align: "center", 313 align: "center",
316 sorTable: true, 314 sorTable: true,
317 - slot: null,
318 fixed:false, 315 fixed:false,
319 }, 316 },
320 { 317 {
...@@ -324,7 +321,6 @@ export default { ...@@ -324,7 +321,6 @@ export default {
324 width: "150", 321 width: "150",
325 align: "center", 322 align: "center",
326 sorTable: true, 323 sorTable: true,
327 - slot: null,
328 fixed:false, 324 fixed:false,
329 }, 325 },
330 { 326 {
...@@ -334,7 +330,6 @@ export default { ...@@ -334,7 +330,6 @@ export default {
334 width: "150", 330 width: "150",
335 align: "center", 331 align: "center",
336 sorTable: true, 332 sorTable: true,
337 - slot: null,
338 fixed:false, 333 fixed:false,
339 }, 334 },
340 { 335 {
...@@ -344,7 +339,6 @@ export default { ...@@ -344,7 +339,6 @@ export default {
344 width: "150", 339 width: "150",
345 align: "center", 340 align: "center",
346 sorTable: true, 341 sorTable: true,
347 - slot: null,
348 fixed:false, 342 fixed:false,
349 }, 343 },
350 { 344 {
...@@ -354,7 +348,6 @@ export default { ...@@ -354,7 +348,6 @@ export default {
354 width: "150", 348 width: "150",
355 align: "center", 349 align: "center",
356 sorTable: true, 350 sorTable: true,
357 - slot: null,
358 fixed:false, 351 fixed:false,
359 }, 352 },
360 { 353 {
...@@ -364,7 +357,6 @@ export default { ...@@ -364,7 +357,6 @@ export default {
364 width: "150", 357 width: "150",
365 align: "center", 358 align: "center",
366 sorTable: true, 359 sorTable: true,
367 - slot: null,
368 fixed:false, 360 fixed:false,
369 }, 361 },
370 { 362 {
...@@ -374,7 +366,6 @@ export default { ...@@ -374,7 +366,6 @@ export default {
374 width: "150", 366 width: "150",
375 align: "center", 367 align: "center",
376 sorTable: true, 368 sorTable: true,
377 - slot: null,
378 fixed:false, 369 fixed:false,
379 }, 370 },
380 { 371 {
...@@ -393,7 +384,6 @@ export default { ...@@ -393,7 +384,6 @@ export default {
393 width: "150", 384 width: "150",
394 align: "center", 385 align: "center",
395 sorTable: true, 386 sorTable: true,
396 - slot: null,
397 fixed:false, 387 fixed:false,
398 }, 388 },
399 { 389 {
...@@ -403,7 +393,6 @@ export default { ...@@ -403,7 +393,6 @@ export default {
403 width: "150", 393 width: "150",
404 align: "center", 394 align: "center",
405 sorTable: true, 395 sorTable: true,
406 - slot: null,
407 fixed:false, 396 fixed:false,
408 }, 397 },
409 { 398 {
...@@ -413,7 +402,6 @@ export default { ...@@ -413,7 +402,6 @@ export default {
413 width: "150", 402 width: "150",
414 align: "center", 403 align: "center",
415 sorTable: true, 404 sorTable: true,
416 - slot: null,
417 fixed:false, 405 fixed:false,
418 }, 406 },
419 { 407 {
...@@ -423,7 +411,6 @@ export default { ...@@ -423,7 +411,6 @@ export default {
423 width: "150", 411 width: "150",
424 align: "center", 412 align: "center",
425 sorTable: true, 413 sorTable: true,
426 - slot: null,
427 fixed:false, 414 fixed:false,
428 }, 415 },
429 { 416 {
...@@ -433,7 +420,6 @@ export default { ...@@ -433,7 +420,6 @@ export default {
433 width: "150", 420 width: "150",
434 align: "center", 421 align: "center",
435 sorTable: true, 422 sorTable: true,
436 - slot: null,
437 fixed:false, 423 fixed:false,
438 }, 424 },
439 { 425 {
...@@ -443,7 +429,6 @@ export default { ...@@ -443,7 +429,6 @@ export default {
443 width: "150", 429 width: "150",
444 align: "center", 430 align: "center",
445 sorTable: true, 431 sorTable: true,
446 - slot: null,
447 fixed:false, 432 fixed:false,
448 }, 433 },
449 { 434 {
...@@ -453,7 +438,6 @@ export default { ...@@ -453,7 +438,6 @@ export default {
453 width: "150", 438 width: "150",
454 align: "center", 439 align: "center",
455 sorTable: true, 440 sorTable: true,
456 - slot: null,
457 fixed:false, 441 fixed:false,
458 }, 442 },
459 { 443 {
...@@ -463,7 +447,6 @@ export default { ...@@ -463,7 +447,6 @@ export default {
463 width: "150", 447 width: "150",
464 align: "center", 448 align: "center",
465 sorTable: false, 449 sorTable: false,
466 - slot: null,
467 fixed:false, 450 fixed:false,
468 }, 451 },
469 { 452 {
...@@ -473,7 +456,6 @@ export default { ...@@ -473,7 +456,6 @@ export default {
473 width: "150", 456 width: "150",
474 align: "center", 457 align: "center",
475 sorTable: true, 458 sorTable: true,
476 - slot: null,
477 fixed:false, 459 fixed:false,
478 }, 460 },
479 { 461 {
...@@ -483,7 +465,6 @@ export default { ...@@ -483,7 +465,6 @@ export default {
483 width: "150", 465 width: "150",
484 align: "center", 466 align: "center",
485 sorTable: true, 467 sorTable: true,
486 - slot: null,
487 fixed:false, 468 fixed:false,
488 }, 469 },
489 { 470 {
...@@ -493,7 +474,6 @@ export default { ...@@ -493,7 +474,6 @@ export default {
493 width: "150", 474 width: "150",
494 align: "center", 475 align: "center",
495 sorTable: false, 476 sorTable: false,
496 - slot: null,
497 fixed:false, 477 fixed:false,
498 }, 478 },
499 { 479 {
...@@ -503,7 +483,6 @@ export default { ...@@ -503,7 +483,6 @@ export default {
503 width: "150", 483 width: "150",
504 align: "center", 484 align: "center",
505 sorTable: true, 485 sorTable: true,
506 - slot: null,
507 fixed:false, 486 fixed:false,
508 }, 487 },
509 { 488 {
...@@ -513,7 +492,6 @@ export default { ...@@ -513,7 +492,6 @@ export default {
513 width: "150", 492 width: "150",
514 align: "center", 493 align: "center",
515 sorTable: true, 494 sorTable: true,
516 - slot: null,
517 fixed:false, 495 fixed:false,
518 }, 496 },
519 { 497 {
...@@ -523,7 +501,6 @@ export default { ...@@ -523,7 +501,6 @@ export default {
523 width: "150", 501 width: "150",
524 align: "center", 502 align: "center",
525 sorTable: true, 503 sorTable: true,
526 - slot: null,
527 fixed:false, 504 fixed:false,
528 }, 505 },
529 { 506 {
...@@ -533,7 +510,6 @@ export default { ...@@ -533,7 +510,6 @@ export default {
533 width: "150", 510 width: "150",
534 align: "center", 511 align: "center",
535 sorTable: true, 512 sorTable: true,
536 - slot: null,
537 fixed:false, 513 fixed:false,
538 }, 514 },
539 { 515 {
...@@ -543,7 +519,6 @@ export default { ...@@ -543,7 +519,6 @@ export default {
543 width: "150", 519 width: "150",
544 align: "center", 520 align: "center",
545 sorTable: true, 521 sorTable: true,
546 - slot: null,
547 fixed:false, 522 fixed:false,
548 }, 523 },
549 { 524 {
...@@ -553,7 +528,6 @@ export default { ...@@ -553,7 +528,6 @@ export default {
553 width: "150", 528 width: "150",
554 align: "center", 529 align: "center",
555 sorTable: true, 530 sorTable: true,
556 - slot: null,
557 fixed:false, 531 fixed:false,
558 }, 532 },
559 { 533 {
...@@ -563,7 +537,6 @@ export default { ...@@ -563,7 +537,6 @@ export default {
563 width: "150", 537 width: "150",
564 align: "center", 538 align: "center",
565 sorTable: true, 539 sorTable: true,
566 - slot: null,
567 fixed:false, 540 fixed:false,
568 }, 541 },
569 { 542 {
...@@ -573,7 +546,6 @@ export default { ...@@ -573,7 +546,6 @@ export default {
573 width: "150", 546 width: "150",
574 align: "center", 547 align: "center",
575 sorTable: true, 548 sorTable: true,
576 - slot: null,
577 fixed:false, 549 fixed:false,
578 }, 550 },
579 { 551 {
...@@ -583,7 +555,6 @@ export default { ...@@ -583,7 +555,6 @@ export default {
583 width: "150", 555 width: "150",
584 align: "center", 556 align: "center",
585 sorTable: true, 557 sorTable: true,
586 - slot: null,
587 fixed:false, 558 fixed:false,
588 }, 559 },
589 { 560 {
...@@ -593,7 +564,6 @@ export default { ...@@ -593,7 +564,6 @@ export default {
593 width: "150", 564 width: "150",
594 align: "center", 565 align: "center",
595 sorTable: true, 566 sorTable: true,
596 - slot: null,
597 fixed:false, 567 fixed:false,
598 }, 568 },
599 { 569 {
...@@ -603,7 +573,6 @@ export default { ...@@ -603,7 +573,6 @@ export default {
603 width: "170", 573 width: "170",
604 align: "center", 574 align: "center",
605 sorTable: true, 575 sorTable: true,
606 - slot: null,
607 fixed:false, 576 fixed:false,
608 }, 577 },
609 { 578 {
...@@ -613,7 +582,6 @@ export default { ...@@ -613,7 +582,6 @@ export default {
613 width: "150", 582 width: "150",
614 align: "center", 583 align: "center",
615 sorTable: true, 584 sorTable: true,
616 - slot: null,
617 fixed:false, 585 fixed:false,
618 }, 586 },
619 { 587 {
...@@ -623,7 +591,6 @@ export default { ...@@ -623,7 +591,6 @@ export default {
623 width: "150", 591 width: "150",
624 align: "center", 592 align: "center",
625 sorTable: false, 593 sorTable: false,
626 - slot: null,
627 fixed:false, 594 fixed:false,
628 }, 595 },
629 { 596 {
...@@ -633,7 +600,6 @@ export default { ...@@ -633,7 +600,6 @@ export default {
633 width: "150", 600 width: "150",
634 align: "center", 601 align: "center",
635 sorTable: false, 602 sorTable: false,
636 - slot: null,
637 fixed:false, 603 fixed:false,
638 }, 604 },
639 { 605 {
...@@ -643,7 +609,6 @@ export default { ...@@ -643,7 +609,6 @@ export default {
643 width: "150", 609 width: "150",
644 align: "center", 610 align: "center",
645 sorTable: false, 611 sorTable: false,
646 - slot: null,
647 fixed:false, 612 fixed:false,
648 }, 613 },
649 { 614 {
...@@ -653,7 +618,6 @@ export default { ...@@ -653,7 +618,6 @@ export default {
653 width: "150", 618 width: "150",
654 align: "center", 619 align: "center",
655 sorTable: false, 620 sorTable: false,
656 - slot: null,
657 fixed:false, 621 fixed:false,
658 }, 622 },
659 { 623 {
...@@ -663,7 +627,6 @@ export default { ...@@ -663,7 +627,6 @@ export default {
663 width: "150", 627 width: "150",
664 align: "center", 628 align: "center",
665 sorTable: true, 629 sorTable: true,
666 - slot: null,
667 fixed:false, 630 fixed:false,
668 }, 631 },
669 { 632 {
...@@ -673,7 +636,6 @@ export default { ...@@ -673,7 +636,6 @@ export default {
673 width: "300", 636 width: "300",
674 align: "center", 637 align: "center",
675 sorTable: false, 638 sorTable: false,
676 - slot: null,
677 fixed:false, 639 fixed:false,
678 }, 640 },
679 { 641 {
...@@ -683,7 +645,6 @@ export default { ...@@ -683,7 +645,6 @@ export default {
683 width: "150", 645 width: "150",
684 align: "center", 646 align: "center",
685 sorTable: false, 647 sorTable: false,
686 - slot: null,
687 fixed:false, 648 fixed:false,
688 }, 649 },
689 { 650 {
...@@ -693,7 +654,6 @@ export default { ...@@ -693,7 +654,6 @@ export default {
693 width: "150", 654 width: "150",
694 align: "center", 655 align: "center",
695 sorTable: true, 656 sorTable: true,
696 - slot: null,
697 fixed:false, 657 fixed:false,
698 }, 658 },
699 { 659 {
...@@ -703,7 +663,6 @@ export default { ...@@ -703,7 +663,6 @@ export default {
703 width: "150", 663 width: "150",
704 align: "center", 664 align: "center",
705 sorTable: true, 665 sorTable: true,
706 - slot: null,
707 fixed:false, 666 fixed:false,
708 }, 667 },
709 { 668 {
...@@ -713,7 +672,6 @@ export default { ...@@ -713,7 +672,6 @@ export default {
713 width: "150", 672 width: "150",
714 align: "center", 673 align: "center",
715 sorTable: true, 674 sorTable: true,
716 - slot: null,
717 fixed:false, 675 fixed:false,
718 }, 676 },
719 { 677 {
...@@ -723,7 +681,6 @@ export default { ...@@ -723,7 +681,6 @@ export default {
723 width: "150", 681 width: "150",
724 align: "center", 682 align: "center",
725 sorTable: true, 683 sorTable: true,
726 - slot: null,
727 fixed:false, 684 fixed:false,
728 }, 685 },
729 ], //表头数据 686 ], //表头数据
...@@ -849,6 +806,9 @@ export default { ...@@ -849,6 +806,9 @@ export default {
849 this.formData.cargoPlaneStart = null; 806 this.formData.cargoPlaneStart = null;
850 this.formData.cargoPlaneEnd = null; 807 this.formData.cargoPlaneEnd = null;
851 } 808 }
809 + if(this.formData.waybillNo){
810 + this.formData.waybillNo = this.formData.waybillNo.trim();
811 + }
852 }, 812 },
853 //总和 813 //总和
854 cargoTotal(){ 814 cargoTotal(){
......