Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
c1ea2864 2 parents e8069fa0 5264c9ba

Merge remote-tracking branch 'origin/uat'

Inline Side-by-side
Showing 6 changed files with 256 additions and 165 deletions
...@@ -80,10 +80,11 @@ ...@@ -80,10 +80,11 @@
80 color:#6379bb; 80 color:#6379bb;
81 border-bottom:1px solid #ddd; 81 border-bottom:1px solid #ddd;
82 margin:8px 10px 25px 10px; 82 margin:8px 10px 25px 10px;
83 + padding-top:15px;
83 padding-bottom:5px; 84 padding-bottom:5px;
84 .formItem { 85 .formItem {
85 width: 100%; 86 width: 100%;
86 - max-width: 310px; 87 + // max-width: 310px;
87 } 88 }
88 } 89 }
89 90
......
...@@ -42,5 +42,5 @@ module.exports = { ...@@ -42,5 +42,5 @@ module.exports = {
42 /** 42 /**
43 * 版本号 43 * 版本号
44 */ 44 */
45 - version:'version：1.0.0' 45 + version:'version：1.0.5'
46 } 46 }
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
19 end-placeholder="结束日期" 19 end-placeholder="结束日期"
20 v-model="fltDate" 20 v-model="fltDate"
21 :value-format="valueFormat" 21 :value-format="valueFormat"
22 + clearable
22 > 23 >
23 </el-date-picker> 24 </el-date-picker>
24 </el-form-item> 25 </el-form-item>
...@@ -79,6 +80,7 @@ ...@@ -79,6 +80,7 @@
79 placeholder="请输入运单号（回车分割）" 80 placeholder="请输入运单号（回车分割）"
80 :autosize="true" 81 :autosize="true"
81 v-model="formData.waybillNo" 82 v-model="formData.waybillNo"
83 + clearable
82 ></el-input> 84 ></el-input>
83 </el-form-item> 85 </el-form-item>
84 </el-col> 86 </el-col>
...@@ -126,6 +128,7 @@ ...@@ -126,6 +128,7 @@
126 placeholder="S_;P_;E2" 128 placeholder="S_;P_;E2"
127 v-model="ursa" 129 v-model="ursa"
128 :autosize="true" 130 :autosize="true"
131 + clearable
129 ></el-input> 132 ></el-input>
130 </el-form-item> 133 </el-form-item>
131 </el-col> 134 </el-col>
...@@ -137,6 +140,7 @@ ...@@ -137,6 +140,7 @@
137 placeholder="PVG;PEK" 140 placeholder="PVG;PEK"
138 v-model="siteName" 141 v-model="siteName"
139 :autosize="true" 142 :autosize="true"
143 + clearable
140 ></el-input> 144 ></el-input>
141 </el-form-item> 145 </el-form-item>
142 </el-col> 146 </el-col>
...@@ -192,24 +196,6 @@ ...@@ -192,24 +196,6 @@
192 </el-row> 196 </el-row>
193 </el-form-item> 197 </el-form-item>
194 </el-col> 198 </el-col>
195 - <!-- <el-col :span="6">
196 - <el-form-item label="航班类型">
197 - <el-select
198 - placeholder="不限"
199 - v-model="formData.kindToAllocFlightId"
200 - class="formItem"
201 - clearable
202 - >
203 - <el-option
204 - v-for="item in selectData.fltTypes"
205 - :label="item.chineseName"
206 - v-model="item.id"
207 - :key="item.id"
208 - >
209 - </el-option>
210 - </el-select>
211 - </el-form-item>
212 - </el-col> -->
213 <el-col :span="6"> 199 <el-col :span="6">
214 <el-form-item label="取件日期"> 200 <el-form-item label="取件日期">
215 <el-date-picker 201 <el-date-picker
...@@ -217,6 +203,7 @@ ...@@ -217,6 +203,7 @@
217 type="date" 203 type="date"
218 placeholder="选择日期" 204 placeholder="选择日期"
219 :value-format="valueFormat" 205 :value-format="valueFormat"
206 + clearable
220 > 207 >
221 </el-date-picker> 208 </el-date-picker>
222 </el-form-item> 209 </el-form-item>
...@@ -338,7 +325,6 @@ ...@@ -338,7 +325,6 @@
338 import Dialog from "./info.vue"; 325 import Dialog from "./info.vue";
339 import { findConditionData, findCargoAllocationData } from "@/api/cargoSelect"; 326 import { findConditionData, findCargoAllocationData } from "@/api/cargoSelect";
340 import { allDictData } from "@/api/destinationFlight"; 327 import { allDictData } from "@/api/destinationFlight";
341 -// import { findFltConditionDataApi } from "@/api/findAllFltData";
342 import { downLoadXlsx } from "@/utils/zipdownload"; 328 import { downLoadXlsx } from "@/utils/zipdownload";
343 import { upCase } from "@/utils/FedEx"; 329 import { upCase } from "@/utils/FedEx";
344 330
...@@ -379,6 +365,7 @@ export default { ...@@ -379,6 +365,7 @@ export default {
379 align: "center", 365 align: "center",
380 sorTable: false, 366 sorTable: false,
381 fixed: true, 367 fixed: true,
368 + disabled:true
382 }, 369 },
383 { 370 {
384 type: "index", 371 type: "index",
...@@ -388,96 +375,107 @@ export default { ...@@ -388,96 +375,107 @@ export default {
388 align: "center", 375 align: "center",
389 sorTable: false, 376 sorTable: false,
390 fixed: false, 377 fixed: false,
378 + disabled:true
391 }, 379 },
392 { 380 {
393 type: "", 381 type: "",
394 name: "口岸代码", 382 name: "口岸代码",
395 value: "portName", 383 value: "portName",
396 - width: "150", 384 + width: "100",
397 align: "center", 385 align: "center",
398 sorTable: true, 386 sorTable: true,
399 fixed: false, 387 fixed: false,
388 + disabled:true
400 }, 389 },
401 { 390 {
402 type: "", 391 type: "",
403 name: "取件日期", 392 name: "取件日期",
404 value: "pickUpDate", 393 value: "pickUpDate",
405 - width: "150", 394 + width: "120",
406 align: "center", 395 align: "center",
407 sorTable: true, 396 sorTable: true,
408 fixed: false, 397 fixed: false,
398 + disabled:true
409 }, 399 },
410 { 400 {
411 type: "", 401 type: "",
412 name: "取件扫描号", 402 name: "取件扫描号",
413 value: "pickUpScanNo", 403 value: "pickUpScanNo",
414 - width: "150", 404 + width: "120",
415 align: "center", 405 align: "center",
416 sorTable: true, 406 sorTable: true,
417 fixed: false, 407 fixed: false,
408 + disabled:true
418 }, 409 },
419 { 410 {
420 type: "", 411 type: "",
421 name: "站点", 412 name: "站点",
422 value: "siteName", 413 value: "siteName",
423 - width: "150", 414 + width: "80",
424 align: "center", 415 align: "center",
425 sorTable: true, 416 sorTable: true,
426 fixed: false, 417 fixed: false,
418 + disabled:true
427 }, 419 },
428 { 420 {
429 type: "", 421 type: "",
430 name: "运单号", 422 name: "运单号",
431 value: "waybillNo", 423 value: "waybillNo",
432 - width: "150", 424 + width: "120",
433 align: "center", 425 align: "center",
434 sorTable: true, 426 sorTable: true,
435 fixed: false, 427 fixed: false,
428 + disabled:true
436 }, 429 },
437 { 430 {
438 type: "", 431 type: "",
439 name: "总单号", 432 name: "总单号",
440 value: "totalWaybillNo", 433 value: "totalWaybillNo",
441 - width: "150", 434 + width: "120",
442 align: "center", 435 align: "center",
443 sorTable: true, 436 sorTable: true,
444 fixed: false, 437 fixed: false,
438 + disabled:true
445 }, 439 },
446 { 440 {
447 type: "", 441 type: "",
448 name: "服务类型", 442 name: "服务类型",
449 value: "serviceTypeName", 443 value: "serviceTypeName",
450 - width: "150", 444 + width: "100",
451 align: "center", 445 align: "center",
452 sorTable: true, 446 sorTable: true,
453 fixed: false, 447 fixed: false,
448 + disabled:true
454 }, 449 },
455 { 450 {
456 type: "", 451 type: "",
457 name: "服务代码", 452 name: "服务代码",
458 value: "serviceCode", 453 value: "serviceCode",
459 - width: "150", 454 + width: "100",
460 align: "center", 455 align: "center",
461 sorTable: false, 456 sorTable: false,
462 - fixed:false, 457 + fixed: false,
458 + disabled:true
463 }, 459 },
464 { 460 {
465 type: "", 461 type: "",
466 name: "URSA", 462 name: "URSA",
467 value: "ursa", 463 value: "ursa",
468 - width: "150", 464 + width: "100",
469 align: "center", 465 align: "center",
470 sorTable: true, 466 sorTable: true,
471 fixed: false, 467 fixed: false,
468 + disabled:true
472 }, 469 },
473 { 470 {
474 type: "", 471 type: "",
475 name: "申报类型", 472 name: "申报类型",
476 value: "typeName", 473 value: "typeName",
477 - width: "150", 474 + width: "100",
478 align: "center", 475 align: "center",
479 sorTable: true, 476 sorTable: true,
480 fixed: false, 477 fixed: false,
478 + disabled:true
481 }, 479 },
482 { 480 {
483 type: "", 481 type: "",
...@@ -487,33 +485,37 @@ export default { ...@@ -487,33 +485,37 @@ export default {
487 align: "center", 485 align: "center",
488 sorTable: true, 486 sorTable: true,
489 fixed: false, 487 fixed: false,
488 + disabled:true
490 }, 489 },
491 { 490 {
492 type: "", 491 type: "",
493 name: "subcategory", 492 name: "subcategory",
494 value: "subCategory", 493 value: "subCategory",
495 - width: "150", 494 + width: "140",
496 align: "center", 495 align: "center",
497 sorTable: true, 496 sorTable: true,
498 fixed: false, 497 fixed: false,
498 + disabled:true
499 }, 499 },
500 { 500 {
501 type: "", 501 type: "",
502 name: "件数", 502 name: "件数",
503 value: "qty", 503 value: "qty",
504 - width: "150", 504 + width: "80",
505 align: "center", 505 align: "center",
506 sorTable: true, 506 sorTable: true,
507 fixed: false, 507 fixed: false,
508 + disabled:true
508 }, 509 },
509 { 510 {
510 type: "", 511 type: "",
511 name: "实际重量", 512 name: "实际重量",
512 value: "actualWeight", 513 value: "actualWeight",
513 - width: "150", 514 + width: "100",
514 align: "center", 515 align: "center",
515 sorTable: true, 516 sorTable: true,
516 fixed: false, 517 fixed: false,
518 + disabled:true
517 }, 519 },
518 { 520 {
519 type: "", 521 type: "",
...@@ -523,78 +525,87 @@ export default { ...@@ -523,78 +525,87 @@ export default {
523 align: "center", 525 align: "center",
524 sorTable: true, 526 sorTable: true,
525 fixed: false, 527 fixed: false,
528 + disabled:true
526 }, 529 },
527 { 530 {
528 type: "", 531 type: "",
529 name: "品名描述", 532 name: "品名描述",
530 value: "nameDescription", 533 value: "nameDescription",
531 - width: "150", 534 + width: "100",
532 align: "center", 535 align: "center",
533 sorTable: false, 536 sorTable: false,
534 fixed: false, 537 fixed: false,
538 + disabled:true
535 }, 539 },
536 { 540 {
537 type: "", 541 type: "",
538 name: "海关回执状态", 542 name: "海关回执状态",
539 value: "customsReceiptStatusName", 543 value: "customsReceiptStatusName",
540 - width: "150", 544 + width: "140",
541 align: "center", 545 align: "center",
542 sorTable: true, 546 sorTable: true,
543 fixed: false, 547 fixed: false,
548 + disabled:true
544 }, 549 },
545 { 550 {
546 type: "", 551 type: "",
547 name: "预审状态", 552 name: "预审状态",
548 value: "preQualificationStatus", 553 value: "preQualificationStatus",
549 - width: "150", 554 + width: "100",
550 align: "center", 555 align: "center",
551 sorTable: true, 556 sorTable: true,
552 fixed: false, 557 fixed: false,
558 + disabled:true
553 }, 559 },
554 { 560 {
555 type: "", 561 type: "",
556 name: "航班预审意见", 562 name: "航班预审意见",
557 value: "caPretrialOpinion", 563 value: "caPretrialOpinion",
558 - width: "150", 564 + width: "120",
559 align: "center", 565 align: "center",
560 sorTable: false, 566 sorTable: false,
561 fixed: false, 567 fixed: false,
568 + disabled:true
562 }, 569 },
563 { 570 {
564 type: "", 571 type: "",
565 name: "货物状态", 572 name: "货物状态",
566 value: "statusName", 573 value: "statusName",
567 - width: "150", 574 + width: "100",
568 align: "center", 575 align: "center",
569 sorTable: true, 576 sorTable: true,
570 fixed: false, 577 fixed: false,
578 + disabled:true
571 }, 579 },
572 { 580 {
573 type: "", 581 type: "",
574 name: "终配航班号", 582 name: "终配航班号",
575 value: "finalFlightNo", 583 value: "finalFlightNo",
576 - width: "150", 584 + width: "120",
577 align: "center", 585 align: "center",
578 sorTable: true, 586 sorTable: true,
579 fixed: false, 587 fixed: false,
588 + disabled:true
580 }, 589 },
581 { 590 {
582 type: "", 591 type: "",
583 name: "终配航班日期", 592 name: "终配航班日期",
584 value: "finalFlightTime", 593 value: "finalFlightTime",
585 - width: "150", 594 + width: "140",
586 align: "center", 595 align: "center",
587 sorTable: true, 596 sorTable: true,
588 fixed: false, 597 fixed: false,
598 + disabled:true
589 }, 599 },
590 { 600 {
591 type: "", 601 type: "",
592 name: "二配航班号", 602 name: "二配航班号",
593 value: "twoMatchFlightNo", 603 value: "twoMatchFlightNo",
594 - width: "150", 604 + width: "120",
595 align: "center", 605 align: "center",
596 sorTable: true, 606 sorTable: true,
597 fixed: false, 607 fixed: false,
608 + disabled:true
598 }, 609 },
599 { 610 {
600 type: "", 611 type: "",
...@@ -604,15 +615,17 @@ export default { ...@@ -604,15 +615,17 @@ export default {
604 align: "center", 615 align: "center",
605 sorTable: true, 616 sorTable: true,
606 fixed: false, 617 fixed: false,
618 + disabled:true
607 }, 619 },
608 { 620 {
609 type: "", 621 type: "",
610 name: "预配航班号", 622 name: "预配航班号",
611 value: "preplanFlightNo", 623 value: "preplanFlightNo",
612 - width: "150", 624 + width: "120",
613 align: "center", 625 align: "center",
614 sorTable: true, 626 sorTable: true,
615 fixed: false, 627 fixed: false,
628 + disabled:true
616 }, 629 },
617 { 630 {
618 type: "", 631 type: "",
...@@ -622,6 +635,7 @@ export default { ...@@ -622,6 +635,7 @@ export default {
622 align: "center", 635 align: "center",
623 sorTable: true, 636 sorTable: true,
624 fixed: false, 637 fixed: false,
638 + disabled:true
625 }, 639 },
626 { 640 {
627 type: "", 641 type: "",
...@@ -631,6 +645,7 @@ export default { ...@@ -631,6 +645,7 @@ export default {
631 align: "center", 645 align: "center",
632 sorTable: true, 646 sorTable: true,
633 fixed: false, 647 fixed: false,
648 + disabled:true
634 }, 649 },
635 { 650 {
636 type: "", 651 type: "",
...@@ -640,15 +655,17 @@ export default { ...@@ -640,15 +655,17 @@ export default {
640 align: "center", 655 align: "center",
641 sorTable: true, 656 sorTable: true,
642 fixed: false, 657 fixed: false,
658 + disabled:true
643 }, 659 },
644 { 660 {
645 type: "", 661 type: "",
646 name: "ACCS原航线", 662 name: "ACCS原航线",
647 value: "accsFlightRoute", 663 value: "accsFlightRoute",
648 - width: "150", 664 + width: "140",
649 align: "center", 665 align: "center",
650 sorTable: true, 666 sorTable: true,
651 fixed: false, 667 fixed: false,
668 + disabled:true
652 }, 669 },
653 { 670 {
654 type: "", 671 type: "",
...@@ -658,24 +675,27 @@ export default { ...@@ -658,24 +675,27 @@ export default {
658 align: "center", 675 align: "center",
659 sorTable: true, 676 sorTable: true,
660 fixed: false, 677 fixed: false,
678 + disabled:true
661 }, 679 },
662 { 680 {
663 type: "", 681 type: "",
664 name: "是否自动", 682 name: "是否自动",
665 value: "cargoRulesStatus", 683 value: "cargoRulesStatus",
666 - width: "150", 684 + width: "100",
667 align: "center", 685 align: "center",
668 sorTable: true, 686 sorTable: true,
669 fixed: false, 687 fixed: false,
688 + disabled:true
670 }, 689 },
671 { 690 {
672 type: "", 691 type: "",
673 name: "发件人账号", 692 name: "发件人账号",
674 value: "shipperAccount", 693 value: "shipperAccount",
675 - width: "150", 694 + width: "120",
676 align: "center", 695 align: "center",
677 sorTable: false, 696 sorTable: false,
678 fixed: false, 697 fixed: false,
698 + disabled:true
679 }, 699 },
680 { 700 {
681 type: "", 701 type: "",
...@@ -685,51 +705,57 @@ export default { ...@@ -685,51 +705,57 @@ export default {
685 align: "center", 705 align: "center",
686 sorTable: false, 706 sorTable: false,
687 fixed: false, 707 fixed: false,
708 + disabled:true
688 }, 709 },
689 { 710 {
690 type: "", 711 type: "",
691 name: "始发地城市名称", 712 name: "始发地城市名称",
692 value: "originCity", 713 value: "originCity",
693 - width: "150", 714 + width: "130",
694 align: "center", 715 align: "center",
695 sorTable: false, 716 sorTable: false,
696 fixed: false, 717 fixed: false,
718 + disabled:true
697 }, 719 },
698 { 720 {
699 type: "", 721 type: "",
700 name: "收件地", 722 name: "收件地",
701 value: "destinationSiteName", 723 value: "destinationSiteName",
702 - width: "150", 724 + width: "90",
703 align: "center", 725 align: "center",
704 sorTable: false, 726 sorTable: false,
705 fixed: false, 727 fixed: false,
728 + disabled:true
706 }, 729 },
707 { 730 {
708 type: "", 731 type: "",
709 name: "尺寸", 732 name: "尺寸",
710 value: "sizeStr", 733 value: "sizeStr",
711 - width: "150", 734 + width: "80",
712 align: "center", 735 align: "center",
713 sorTable: true, 736 sorTable: true,
714 fixed: false, 737 fixed: false,
738 + disabled:true
715 }, 739 },
716 { 740 {
717 type: "", 741 type: "",
718 name: "大货预审意见（是否可以配置航班）", 742 name: "大货预审意见（是否可以配置航班）",
719 value: "bigPretrialOpinion", 743 value: "bigPretrialOpinion",
720 - width: "300", 744 + width: "250",
721 align: "center", 745 align: "center",
722 sorTable: false, 746 sorTable: false,
723 fixed: false, 747 fixed: false,
748 + disabled:true
724 }, 749 },
725 { 750 {
726 type: "", 751 type: "",
727 name: "大货预审时间", 752 name: "大货预审时间",
728 value: "bigPretrialTime", 753 value: "bigPretrialTime",
729 - width: "150", 754 + width: "120",
730 align: "center", 755 align: "center",
731 sorTable: false, 756 sorTable: false,
732 fixed: false, 757 fixed: false,
758 + disabled:true
733 }, 759 },
734 { 760 {
735 type: "", 761 type: "",
...@@ -739,6 +765,7 @@ export default { ...@@ -739,6 +765,7 @@ export default {
739 align: "center", 765 align: "center",
740 sorTable: true, 766 sorTable: true,
741 fixed: false, 767 fixed: false,
768 + disabled:true
742 }, 769 },
743 { 770 {
744 type: "", 771 type: "",
...@@ -748,24 +775,27 @@ export default { ...@@ -748,24 +775,27 @@ export default {
748 align: "center", 775 align: "center",
749 sorTable: true, 776 sorTable: true,
750 fixed: false, 777 fixed: false,
778 + disabled:true
751 }, 779 },
752 { 780 {
753 type: "", 781 type: "",
754 name: "创建人", 782 name: "创建人",
755 value: "createUserName", 783 value: "createUserName",
756 - width: "150", 784 + width: "90",
757 align: "center", 785 align: "center",
758 sorTable: true, 786 sorTable: true,
759 fixed: false, 787 fixed: false,
788 + disabled:true
760 }, 789 },
761 { 790 {
762 type: "", 791 type: "",
763 name: "创建时间", 792 name: "创建时间",
764 value: "createTime", 793 value: "createTime",
765 - width: "150", 794 + width: "100",
766 align: "center", 795 align: "center",
767 sorTable: true, 796 sorTable: true,
768 fixed: false, 797 fixed: false,
798 + disabled:true
769 }, 799 },
770 ], //表头数据 800 ], //表头数据
771 tableData: [], //表格数据 801 tableData: [], //表格数据
...@@ -817,19 +847,6 @@ export default { ...@@ -817,19 +847,6 @@ export default {
817 methods: { 847 methods: {
818 //查询条件 848 //查询条件
819 async seleData() { 849 async seleData() {
820 - // findFltConditionDataApi()
821 - // .then((res) => {
822 - // if (res.code === 200) {
823 - // this.selectData.fltTypes = res.data.flightType;
824 - // }else{
825 - // this.$message({
826 - // message: "查询条件不存在",
827 - // type: "warning",
828 - // });
829 - // }
830 - // })
831 - // .catch(() => {});
832 -
833 allDictData() 850 allDictData()
834 .then((res) => { 851 .then((res) => {
835 if (res.code === 200) { 852 if (res.code === 200) {
......
1 <template> 1 <template>
2 - <div style="margin: 40px" class="app-container"> 2 + <div>
3 <el-form 3 <el-form
4 :inline="true" 4 :inline="true"
5 :model="queryParams" 5 :model="queryParams"
6 - class="demo-form-inline" 6 + class="form-header"
7 - size="small" 7 + size="medium"
8 + label-position="right"
9 + label-width="auto"
8 > 10 >
9 <el-form-item label="航班号"> 11 <el-form-item label="航班号">
10 <el-input 12 <el-input
11 v-model.trim="purposeOfFlightNo" 13 v-model.trim="purposeOfFlightNo"
12 placeholder="航班号" 14 placeholder="航班号"
13 @keyup.enter.native="getList" 15 @keyup.enter.native="getList"
16 + clearable
14 ></el-input> 17 ></el-input>
15 </el-form-item> 18 </el-form-item>
16 <el-form-item label="状态"> 19 <el-form-item label="状态">
17 - <el-select v-model="queryParams.status" placeholder="状态"> 20 + <el-select v-model="queryParams.status" placeholder="状态" clearable>
18 <el-option label="有效" value="1"></el-option> 21 <el-option label="有效" value="1"></el-option>
19 <el-option label="停用" value="3"></el-option> 22 <el-option label="停用" value="3"></el-option>
20 </el-select> 23 </el-select>
...@@ -28,21 +31,31 @@ ...@@ -28,21 +31,31 @@
28 >查询</el-button 31 >查询</el-button
29 > 32 >
30 </el-form-item> 33 </el-form-item>
34 + <div>
35 + <el-button
36 + style="margin-bottom: 20px"
37 + type="primary"
38 + icon="el-icon-plus"
39 + size="mini"
40 + @click="
41 + $router.push({
42 + name: 'FlightAllocConfigAdd',
43 + params: { handle: 'add' },
44 + })
45 + "
46 + >添加</el-button
47 + >
48 + </div>
31 </el-form> 49 </el-form>
32 - <el-button 50 +
33 - style="margin-bottom: 20px" 51 + <el-table
34 - type="primary" 52 + :data="flyList"
35 - icon="el-icon-plus" 53 + v-loading="loading"
36 - size="mini" 54 + size="small"
37 - @click=" 55 + highlight-current-row
38 - $router.push({ 56 + border
39 - name: 'FlightAllocConfigAdd', 57 + stripe
40 - params: { handle: 'add' },
41 - })
42 - "
43 - >添加</el-button
44 > 58 >
45 - <el-table :data="flyList" v-loading="loading" size="small">
46 <el-table-column 59 <el-table-column
47 prop="purposeOfFlightNo" 60 prop="purposeOfFlightNo"
48 label="航班号" 61 label="航班号"
......
1 <template> 1 <template>
2 - <div class="app-container"> 2 + <div>
3 <el-form :model="queryParams" ref="queryForm" :inline="true"> 3 <el-form :model="queryParams" ref="queryForm" :inline="true">
4 <el-form-item label="ACCS原航班"> 4 <el-form-item label="ACCS原航班">
5 <el-input 5 <el-input
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
43 v-model="queryParams.flightDate" 43 v-model="queryParams.flightDate"
44 type="date" 44 type="date"
45 placeholder="选择日期" 45 placeholder="选择日期"
46 + clearable
46 > 47 >
47 </el-date-picker> 48 </el-date-picker>
48 </el-form-item> 49 </el-form-item>
...@@ -77,7 +78,15 @@ ...@@ -77,7 +78,15 @@
77 </el-form-item> 78 </el-form-item>
78 </el-form> 79 </el-form>
79 80
80 - <el-table v-loading="loading" :data="sourceFlightRulesList"> 81 + <el-table
82 + v-loading="loading"
83 + height="550"
84 + size="small"
85 + :data="sourceFlightRulesList"
86 + highlight-current-row
87 + border
88 + stripe
89 + >
81 <el-table-column type="index" label="序号" align="center"> 90 <el-table-column type="index" label="序号" align="center">
82 <template slot-scope="scope">{{ scope.$index + 1 }}</template> 91 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
83 </el-table-column> 92 </el-table-column>
......
...@@ -19,13 +19,14 @@ ...@@ -19,13 +19,14 @@
19 start-placeholder="开始日期" 19 start-placeholder="开始日期"
20 end-placeholder="结束日期" 20 end-placeholder="结束日期"
21 :value-format="valueFormat" 21 :value-format="valueFormat"
22 + clearable
22 > 23 >
23 </el-date-picker> 24 </el-date-picker>
24 </el-form-item> 25 </el-form-item>
25 </el-col> 26 </el-col>
26 <el-col :span="6"> 27 <el-col :span="6">
27 <el-form-item label="配载航班号"> 28 <el-form-item label="配载航班号">
28 - <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :autosize="true"></el-input> 29 + <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :autosize="true" clearable></el-input>
29 </el-form-item> 30 </el-form-item>
30 </el-col> 31 </el-col>
31 <el-col :span="6"> 32 <el-col :span="6">
...@@ -55,6 +56,7 @@ ...@@ -55,6 +56,7 @@
55 class="formItem" 56 class="formItem"
56 placeholder="请输入运单号（回车间隔）" 57 placeholder="请输入运单号（回车间隔）"
57 :autosize="true" 58 :autosize="true"
59 + clearable
58 ></el-input> 60 ></el-input>
59 </el-form-item> 61 </el-form-item>
60 </el-col> 62 </el-col>
...@@ -103,6 +105,7 @@ ...@@ -103,6 +105,7 @@
103 class="formItem" 105 class="formItem"
104 placeholder="S_;P_;E2" 106 placeholder="S_;P_;E2"
105 :autosize="true" 107 :autosize="true"
108 + clearable
106 ></el-input> 109 ></el-input>
107 </el-form-item> 110 </el-form-item>
108 </el-col> 111 </el-col>
...@@ -114,6 +117,7 @@ ...@@ -114,6 +117,7 @@
114 class="formItem" 117 class="formItem"
115 placeholder="PVG;PEK" 118 placeholder="PVG;PEK"
116 :autosize="true" 119 :autosize="true"
120 + clearable
117 ></el-input> 121 ></el-input>
118 </el-form-item> 122 </el-form-item>
119 </el-col> 123 </el-col>
...@@ -129,13 +133,14 @@ ...@@ -129,13 +133,14 @@
129 start-placeholder="开始日期" 133 start-placeholder="开始日期"
130 end-placeholder="结束日期" 134 end-placeholder="结束日期"
131 :value-format="valueFormat" 135 :value-format="valueFormat"
136 + clearable
132 > 137 >
133 </el-date-picker> 138 </el-date-picker>
134 </el-form-item> 139 </el-form-item>
135 </el-col> 140 </el-col>
136 <el-col :span="6"> 141 <el-col :span="6">
137 <el-form-item label="ACCS原航班号"> 142 <el-form-item label="ACCS原航班号">
138 - <el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号"></el-input> 143 + <el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号" clearable></el-input>
139 </el-form-item> 144 </el-form-item>
140 </el-col> 145 </el-col>
141 <el-col :span="6"> 146 <el-col :span="6">
...@@ -146,6 +151,7 @@ ...@@ -146,6 +151,7 @@
146 type="date" 151 type="date"
147 placeholder="选择日期" 152 placeholder="选择日期"
148 :value-format="valueFormat" 153 :value-format="valueFormat"
154 + clearable
149 > 155 >
150 </el-date-picker> 156 </el-date-picker>
151 </el-form-item> 157 </el-form-item>
...@@ -160,6 +166,7 @@ ...@@ -160,6 +166,7 @@
160 start-placeholder="开始日期" 166 start-placeholder="开始日期"
161 end-placeholder="结束日期" 167 end-placeholder="结束日期"
162 :value-format="valueFormat" 168 :value-format="valueFormat"
169 + clearable
163 > 170 >
164 </el-date-picker> 171 </el-date-picker>
165 </el-form-item> 172 </el-form-item>
...@@ -295,7 +302,8 @@ export default { ...@@ -295,7 +302,8 @@ export default {
295 width: "50", 302 width: "50",
296 align: "center", 303 align: "center",
297 sorTable: false, 304 sorTable: false,
298 - fixed:true, 305 + fixed: true,
306 + disabled:true
299 }, 307 },
300 { 308 {
301 type: "index", 309 type: "index",
...@@ -304,97 +312,108 @@ export default { ...@@ -304,97 +312,108 @@ export default {
304 width: "50", 312 width: "50",
305 align: "center", 313 align: "center",
306 sorTable: false, 314 sorTable: false,
307 - fixed:false, 315 + fixed: false,
316 + disabled:true
308 }, 317 },
309 { 318 {
310 type: "", 319 type: "",
311 name: "口岸代码", 320 name: "口岸代码",
312 value: "portName", 321 value: "portName",
313 - width: "150", 322 + width: "100",
314 align: "center", 323 align: "center",
315 sorTable: true, 324 sorTable: true,
316 - fixed:false, 325 + fixed: false,
326 + disabled:true
317 }, 327 },
318 { 328 {
319 type: "", 329 type: "",
320 name: "取件日期", 330 name: "取件日期",
321 value: "pickUpDate", 331 value: "pickUpDate",
322 - width: "150", 332 + width: "120",
323 align: "center", 333 align: "center",
324 sorTable: true, 334 sorTable: true,
325 - fixed:false, 335 + fixed: false,
336 + disabled:true
326 }, 337 },
327 { 338 {
328 type: "", 339 type: "",
329 name: "取件扫描号", 340 name: "取件扫描号",
330 value: "pickUpScanNo", 341 value: "pickUpScanNo",
331 - width: "150", 342 + width: "120",
332 align: "center", 343 align: "center",
333 sorTable: true, 344 sorTable: true,
334 - fixed:false, 345 + fixed: false,
346 + disabled:true
335 }, 347 },
336 { 348 {
337 type: "", 349 type: "",
338 name: "站点", 350 name: "站点",
339 value: "siteName", 351 value: "siteName",
340 - width: "150", 352 + width: "80",
341 align: "center", 353 align: "center",
342 sorTable: true, 354 sorTable: true,
343 - fixed:false, 355 + fixed: false,
356 + disabled:true
344 }, 357 },
345 { 358 {
346 type: "", 359 type: "",
347 name: "运单号", 360 name: "运单号",
348 value: "waybillNo", 361 value: "waybillNo",
349 - width: "150", 362 + width: "120",
350 align: "center", 363 align: "center",
351 sorTable: true, 364 sorTable: true,
352 - fixed:false, 365 + fixed: false,
366 + disabled:true
353 }, 367 },
354 { 368 {
355 type: "", 369 type: "",
356 name: "总单号", 370 name: "总单号",
357 value: "totalWaybillNo", 371 value: "totalWaybillNo",
358 - width: "150", 372 + width: "120",
359 align: "center", 373 align: "center",
360 sorTable: true, 374 sorTable: true,
361 - fixed:false, 375 + fixed: false,
376 + disabled:true
362 }, 377 },
363 { 378 {
364 type: "", 379 type: "",
365 name: "服务类型", 380 name: "服务类型",
366 value: "serviceTypeName", 381 value: "serviceTypeName",
367 - width: "150", 382 + width: "100",
368 align: "center", 383 align: "center",
369 sorTable: true, 384 sorTable: true,
370 - fixed:false, 385 + fixed: false,
386 + disabled:true
371 }, 387 },
372 { 388 {
373 type: "", 389 type: "",
374 name: "服务代码", 390 name: "服务代码",
375 value: "serviceCode", 391 value: "serviceCode",
376 - width: "150", 392 + width: "100",
377 align: "center", 393 align: "center",
378 sorTable: false, 394 sorTable: false,
379 - fixed:false, 395 + fixed: false,
396 + disabled:true
380 }, 397 },
381 { 398 {
382 type: "", 399 type: "",
383 name: "URSA", 400 name: "URSA",
384 value: "ursa", 401 value: "ursa",
385 - width: "150", 402 + width: "100",
386 align: "center", 403 align: "center",
387 sorTable: true, 404 sorTable: true,
388 - fixed:false, 405 + fixed: false,
406 + disabled:true
389 }, 407 },
390 { 408 {
391 type: "", 409 type: "",
392 name: "申报类型", 410 name: "申报类型",
393 value: "typeName", 411 value: "typeName",
394 - width: "150", 412 + width: "100",
395 align: "center", 413 align: "center",
396 sorTable: true, 414 sorTable: true,
397 - fixed:false, 415 + fixed: false,
416 + disabled:true
398 }, 417 },
399 { 418 {
400 type: "", 419 type: "",
...@@ -403,34 +422,38 @@ export default { ...@@ -403,34 +422,38 @@ export default {
403 width: "150", 422 width: "150",
404 align: "center", 423 align: "center",
405 sorTable: true, 424 sorTable: true,
406 - fixed:false, 425 + fixed: false,
426 + disabled:true
407 }, 427 },
408 { 428 {
409 type: "", 429 type: "",
410 name: "subcategory", 430 name: "subcategory",
411 value: "subCategory", 431 value: "subCategory",
412 - width: "150", 432 + width: "140",
413 align: "center", 433 align: "center",
414 sorTable: true, 434 sorTable: true,
415 - fixed:false, 435 + fixed: false,
436 + disabled:true
416 }, 437 },
417 { 438 {
418 type: "", 439 type: "",
419 name: "件数", 440 name: "件数",
420 value: "qty", 441 value: "qty",
421 - width: "150", 442 + width: "80",
422 align: "center", 443 align: "center",
423 sorTable: true, 444 sorTable: true,
424 - fixed:false, 445 + fixed: false,
446 + disabled:true
425 }, 447 },
426 { 448 {
427 type: "", 449 type: "",
428 name: "实际重量", 450 name: "实际重量",
429 value: "actualWeight", 451 value: "actualWeight",
430 - width: "150", 452 + width: "100",
431 align: "center", 453 align: "center",
432 sorTable: true, 454 sorTable: true,
433 - fixed:false, 455 + fixed: false,
456 + disabled:true
434 }, 457 },
435 { 458 {
436 type: "", 459 type: "",
...@@ -439,79 +462,88 @@ export default { ...@@ -439,79 +462,88 @@ export default {
439 width: "150", 462 width: "150",
440 align: "center", 463 align: "center",
441 sorTable: true, 464 sorTable: true,
442 - fixed:false, 465 + fixed: false,
466 + disabled:true
443 }, 467 },
444 { 468 {
445 type: "", 469 type: "",
446 name: "品名描述", 470 name: "品名描述",
447 value: "nameDescription", 471 value: "nameDescription",
448 - width: "150", 472 + width: "100",
449 align: "center", 473 align: "center",
450 sorTable: false, 474 sorTable: false,
451 - fixed:false, 475 + fixed: false,
476 + disabled:true
452 }, 477 },
453 { 478 {
454 type: "", 479 type: "",
455 name: "海关回执状态", 480 name: "海关回执状态",
456 value: "customsReceiptStatusName", 481 value: "customsReceiptStatusName",
457 - width: "150", 482 + width: "140",
458 align: "center", 483 align: "center",
459 sorTable: true, 484 sorTable: true,
460 - fixed:false, 485 + fixed: false,
486 + disabled:true
461 }, 487 },
462 { 488 {
463 type: "", 489 type: "",
464 name: "预审状态", 490 name: "预审状态",
465 value: "preQualificationStatus", 491 value: "preQualificationStatus",
466 - width: "150", 492 + width: "100",
467 align: "center", 493 align: "center",
468 sorTable: true, 494 sorTable: true,
469 - fixed:false, 495 + fixed: false,
496 + disabled:true
470 }, 497 },
471 { 498 {
472 type: "", 499 type: "",
473 name: "航班预审意见", 500 name: "航班预审意见",
474 value: "caPretrialOpinion", 501 value: "caPretrialOpinion",
475 - width: "150", 502 + width: "120",
476 align: "center", 503 align: "center",
477 sorTable: false, 504 sorTable: false,
478 - fixed:false, 505 + fixed: false,
506 + disabled:true
479 }, 507 },
480 { 508 {
481 type: "", 509 type: "",
482 name: "货物状态", 510 name: "货物状态",
483 value: "statusName", 511 value: "statusName",
484 - width: "150", 512 + width: "100",
485 align: "center", 513 align: "center",
486 sorTable: true, 514 sorTable: true,
487 - fixed:false, 515 + fixed: false,
516 + disabled:true
488 }, 517 },
489 { 518 {
490 type: "", 519 type: "",
491 name: "终配航班号", 520 name: "终配航班号",
492 value: "finalFlightNo", 521 value: "finalFlightNo",
493 - width: "150", 522 + width: "120",
494 align: "center", 523 align: "center",
495 sorTable: true, 524 sorTable: true,
496 - fixed:false, 525 + fixed: false,
526 + disabled:true
497 }, 527 },
498 { 528 {
499 type: "", 529 type: "",
500 name: "终配航班日期", 530 name: "终配航班日期",
501 value: "finalFlightTime", 531 value: "finalFlightTime",
502 - width: "150", 532 + width: "140",
503 align: "center", 533 align: "center",
504 sorTable: true, 534 sorTable: true,
505 - fixed:false, 535 + fixed: false,
536 + disabled:true
506 }, 537 },
507 { 538 {
508 type: "", 539 type: "",
509 name: "二配航班号", 540 name: "二配航班号",
510 value: "twoMatchFlightNo", 541 value: "twoMatchFlightNo",
511 - width: "150", 542 + width: "120",
512 align: "center", 543 align: "center",
513 sorTable: true, 544 sorTable: true,
514 - fixed:false, 545 + fixed: false,
546 + disabled:true
515 }, 547 },
516 { 548 {
517 type: "", 549 type: "",
...@@ -520,16 +552,18 @@ export default { ...@@ -520,16 +552,18 @@ export default {
520 width: "150", 552 width: "150",
521 align: "center", 553 align: "center",
522 sorTable: true, 554 sorTable: true,
523 - fixed:false, 555 + fixed: false,
556 + disabled:true
524 }, 557 },
525 { 558 {
526 type: "", 559 type: "",
527 name: "预配航班号", 560 name: "预配航班号",
528 value: "preplanFlightNo", 561 value: "preplanFlightNo",
529 - width: "150", 562 + width: "120",
530 align: "center", 563 align: "center",
531 sorTable: true, 564 sorTable: true,
532 - fixed:false, 565 + fixed: false,
566 + disabled:true
533 }, 567 },
534 { 568 {
535 type: "", 569 type: "",
...@@ -538,7 +572,8 @@ export default { ...@@ -538,7 +572,8 @@ export default {
538 width: "150", 572 width: "150",
539 align: "center", 573 align: "center",
540 sorTable: true, 574 sorTable: true,
541 - fixed:false, 575 + fixed: false,
576 + disabled:true
542 }, 577 },
543 { 578 {
544 type: "", 579 type: "",
...@@ -547,7 +582,8 @@ export default { ...@@ -547,7 +582,8 @@ export default {
547 width: "150", 582 width: "150",
548 align: "center", 583 align: "center",
549 sorTable: true, 584 sorTable: true,
550 - fixed:false, 585 + fixed: false,
586 + disabled:true
551 }, 587 },
552 { 588 {
553 type: "", 589 type: "",
...@@ -556,16 +592,18 @@ export default { ...@@ -556,16 +592,18 @@ export default {
556 width: "150", 592 width: "150",
557 align: "center", 593 align: "center",
558 sorTable: true, 594 sorTable: true,
559 - fixed:false, 595 + fixed: false,
596 + disabled:true
560 }, 597 },
561 { 598 {
562 type: "", 599 type: "",
563 name: "ACCS原航线", 600 name: "ACCS原航线",
564 value: "accsFlightRoute", 601 value: "accsFlightRoute",
565 - width: "150", 602 + width: "140",
566 align: "center", 603 align: "center",
567 sorTable: true, 604 sorTable: true,
568 - fixed:false, 605 + fixed: false,
606 + disabled:true
569 }, 607 },
570 { 608 {
571 type: "", 609 type: "",
...@@ -574,25 +612,28 @@ export default { ...@@ -574,25 +612,28 @@ export default {
574 width: "170", 612 width: "170",
575 align: "center", 613 align: "center",
576 sorTable: true, 614 sorTable: true,
577 - fixed:false, 615 + fixed: false,
616 + disabled:true
578 }, 617 },
579 { 618 {
580 type: "", 619 type: "",
581 name: "是否自动", 620 name: "是否自动",
582 value: "cargoRulesStatus", 621 value: "cargoRulesStatus",
583 - width: "150", 622 + width: "100",
584 align: "center", 623 align: "center",
585 sorTable: true, 624 sorTable: true,
586 - fixed:false, 625 + fixed: false,
626 + disabled:true
587 }, 627 },
588 { 628 {
589 type: "", 629 type: "",
590 name: "发件人账号", 630 name: "发件人账号",
591 value: "shipperAccount", 631 value: "shipperAccount",
592 - width: "150", 632 + width: "120",
593 align: "center", 633 align: "center",
594 sorTable: false, 634 sorTable: false,
595 - fixed:false, 635 + fixed: false,
636 + disabled:true
596 }, 637 },
597 { 638 {
598 type: "", 639 type: "",
...@@ -601,52 +642,58 @@ export default { ...@@ -601,52 +642,58 @@ export default {
601 width: "150", 642 width: "150",
602 align: "center", 643 align: "center",
603 sorTable: false, 644 sorTable: false,
604 - fixed:false, 645 + fixed: false,
646 + disabled:true
605 }, 647 },
606 { 648 {
607 type: "", 649 type: "",
608 name: "始发地城市名称", 650 name: "始发地城市名称",
609 value: "originCity", 651 value: "originCity",
610 - width: "150", 652 + width: "130",
611 align: "center", 653 align: "center",
612 sorTable: false, 654 sorTable: false,
613 - fixed:false, 655 + fixed: false,
656 + disabled:true
614 }, 657 },
615 { 658 {
616 type: "", 659 type: "",
617 name: "收件地", 660 name: "收件地",
618 value: "destinationSiteName", 661 value: "destinationSiteName",
619 - width: "150", 662 + width: "90",
620 align: "center", 663 align: "center",
621 sorTable: false, 664 sorTable: false,
622 - fixed:false, 665 + fixed: false,
666 + disabled:true
623 }, 667 },
624 { 668 {
625 type: "", 669 type: "",
626 name: "尺寸", 670 name: "尺寸",
627 value: "sizeStr", 671 value: "sizeStr",
628 - width: "150", 672 + width: "80",
629 align: "center", 673 align: "center",
630 sorTable: true, 674 sorTable: true,
631 - fixed:false, 675 + fixed: false,
676 + disabled:true
632 }, 677 },
633 { 678 {
634 type: "", 679 type: "",
635 name: "大货预审意见（是否可以配置航班）", 680 name: "大货预审意见（是否可以配置航班）",
636 value: "bigPretrialOpinion", 681 value: "bigPretrialOpinion",
637 - width: "300", 682 + width: "250",
638 align: "center", 683 align: "center",
639 sorTable: false, 684 sorTable: false,
640 - fixed:false, 685 + fixed: false,
686 + disabled:true
641 }, 687 },
642 { 688 {
643 type: "", 689 type: "",
644 name: "大货预审时间", 690 name: "大货预审时间",
645 value: "bigPretrialTime", 691 value: "bigPretrialTime",
646 - width: "150", 692 + width: "120",
647 align: "center", 693 align: "center",
648 sorTable: false, 694 sorTable: false,
649 - fixed:false, 695 + fixed: false,
696 + disabled:true
650 }, 697 },
651 { 698 {
652 type: "", 699 type: "",
...@@ -655,7 +702,8 @@ export default { ...@@ -655,7 +702,8 @@ export default {
655 width: "150", 702 width: "150",
656 align: "center", 703 align: "center",
657 sorTable: true, 704 sorTable: true,
658 - fixed:false, 705 + fixed: false,
706 + disabled:true
659 }, 707 },
660 { 708 {
661 type: "", 709 type: "",
...@@ -664,25 +712,28 @@ export default { ...@@ -664,25 +712,28 @@ export default {
664 width: "150", 712 width: "150",
665 align: "center", 713 align: "center",
666 sorTable: true, 714 sorTable: true,
667 - fixed:false, 715 + fixed: false,
716 + disabled:true
668 }, 717 },
669 { 718 {
670 type: "", 719 type: "",
671 name: "创建人", 720 name: "创建人",
672 value: "createUserName", 721 value: "createUserName",
673 - width: "150", 722 + width: "90",
674 align: "center", 723 align: "center",
675 sorTable: true, 724 sorTable: true,
676 - fixed:false, 725 + fixed: false,
726 + disabled:true
677 }, 727 },
678 { 728 {
679 type: "", 729 type: "",
680 name: "创建时间", 730 name: "创建时间",
681 value: "createTime", 731 value: "createTime",
682 - width: "150", 732 + width: "100",
683 align: "center", 733 align: "center",
684 sorTable: true, 734 sorTable: true,
685 - fixed:false, 735 + fixed: false,
736 + disabled:true
686 }, 737 },
687 ], //表头数据 738 ], //表头数据
688 findConditionData: {}, //货物查询条件 739 findConditionData: {}, //货物查询条件
...@@ -706,7 +757,7 @@ export default { ...@@ -706,7 +757,7 @@ export default {
706 limitSize: 100, //无限制-1 757 limitSize: 100, //无限制-1
707 page:1, 758 page:1,
708 progress:0, 759 progress:0,
709 - formShow:false, 760 + formShow:true,
710 }; 761 };
711 }, 762 },
712 created() { 763 created() {
......