Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
629e1e97 1 parent 966e641a

代码更新

Inline Side-by-side
Showing 5 changed files with 228 additions and 117 deletions
1 import { login, logout, getInfo } from '@/api/login' 1 import { login, logout, getInfo } from '@/api/login'
2 import { changeCurrentPort } from "@/api/system/user.js"; 2 import { changeCurrentPort } from "@/api/system/user.js";
3 import { getToken, setToken, removeToken } from '@/utils/auth' 3 import { getToken, setToken, removeToken } from '@/utils/auth'
4 +import { Message } from 'element-ui'
4 5
5 const user = { 6 const user = {
6 state: { 7 state: {
...@@ -48,9 +49,11 @@ const user = { ...@@ -48,9 +49,11 @@ const user = {
48 49
49 return new Promise((resolve, reject) => { 50 return new Promise((resolve, reject) => {
50 login(username, password, rememberMe).then(res => { 51 login(username, password, rememberMe).then(res => {
52 + if(res.code === 200){
51 setToken(res.data) 53 setToken(res.data)
52 commit('SET_TOKEN', res.data) 54 commit('SET_TOKEN', res.data)
53 - resolve() 55 + }
56 + resolve(res)
54 }).catch(error => { 57 }).catch(error => {
55 reject(error) 58 reject(error)
56 }) 59 })
...@@ -63,7 +66,18 @@ const user = { ...@@ -63,7 +66,18 @@ const user = {
63 getInfo().then(res => { 66 getInfo().then(res => {
64 const user = res.data.user 67 const user = res.data.user
65 const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; 68 const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
66 - let ports = user.portName.split(','); 69 + let ports = [];
70 + if(user.portName){
71 + ports = user.portName.split(',');
72 + commit('SET_PORTNAMES',ports)
73 + commit('SET_ACTIVEPORTNAME', sessionStorage.getItem('portName')?sessionStorage.getItem('portName'):state.portNames[0])
74 + }else{
75 + Message({
76 + message: "未找到口岸信息！请确认后再登录",
77 + type: 'error'
78 + })
79 + this.login()
80 + }
67 if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组 81 if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
68 commit('SET_ROLES', res.data.roles) 82 commit('SET_ROLES', res.data.roles)
69 commit('SET_PERMISSIONS', res.data.permissions) 83 commit('SET_PERMISSIONS', res.data.permissions)
...@@ -72,14 +86,6 @@ const user = { ...@@ -72,14 +86,6 @@ const user = {
72 } 86 }
73 commit('SET_NAME', user.userName) 87 commit('SET_NAME', user.userName)
74 commit('SET_AVATAR', avatar) 88 commit('SET_AVATAR', avatar)
75 - commit('SET_PORTNAMES',ports)
76 - //口岸选择
77 - if (sessionStorage.getItem('portName')) {
78 - commit('SET_ACTIVEPORTNAME', sessionStorage.getItem('portName'))
79 - } else {
80 - commit('SET_ACTIVEPORTNAME', "PVG")
81 - }
82 -
83 resolve(res) 89 resolve(res)
84 }).catch(error => { 90 }).catch(error => {
85 reject(error) 91 reject(error)
......
...@@ -323,7 +323,7 @@ ...@@ -323,7 +323,7 @@
323 :limitStart="formData.limitStart" 323 :limitStart="formData.limitStart"
324 :page="page" 324 :page="page"
325 :shiftKey="shiftKey" 325 :shiftKey="shiftKey"
326 - height="350" 326 + :height="tableHeight"
327 @tableSelect="tableSelect" 327 @tableSelect="tableSelect"
328 @tableSelectAll="tableSelectAll" 328 @tableSelectAll="tableSelectAll"
329 @currentChange="currentChange" 329 @currentChange="currentChange"
...@@ -382,6 +382,7 @@ export default { ...@@ -382,6 +382,7 @@ export default {
382 align: "center", 382 align: "center",
383 sorTable: false, 383 sorTable: false,
384 fixed: true, 384 fixed: true,
385 + disabled:true
385 }, 386 },
386 { 387 {
387 type: "index", 388 type: "index",
...@@ -391,96 +392,107 @@ export default { ...@@ -391,96 +392,107 @@ export default {
391 align: "center", 392 align: "center",
392 sorTable: false, 393 sorTable: false,
393 fixed: false, 394 fixed: false,
395 + disabled:true
394 }, 396 },
395 { 397 {
396 type: "", 398 type: "",
397 name: "口岸代码", 399 name: "口岸代码",
398 value: "portName", 400 value: "portName",
399 - width: "150", 401 + width: "100",
400 align: "center", 402 align: "center",
401 sorTable: true, 403 sorTable: true,
402 fixed: false, 404 fixed: false,
405 + disabled:true
403 }, 406 },
404 { 407 {
405 type: "", 408 type: "",
406 name: "取件日期", 409 name: "取件日期",
407 value: "pickUpDate", 410 value: "pickUpDate",
408 - width: "150", 411 + width: "100",
409 align: "center", 412 align: "center",
410 sorTable: true, 413 sorTable: true,
411 fixed: false, 414 fixed: false,
415 + disabled:true
412 }, 416 },
413 { 417 {
414 type: "", 418 type: "",
415 name: "取件扫描号", 419 name: "取件扫描号",
416 value: "pickUpScanNo", 420 value: "pickUpScanNo",
417 - width: "150", 421 + width: "120",
418 align: "center", 422 align: "center",
419 sorTable: true, 423 sorTable: true,
420 fixed: false, 424 fixed: false,
425 + disabled:true
421 }, 426 },
422 { 427 {
423 type: "", 428 type: "",
424 name: "站点", 429 name: "站点",
425 value: "siteName", 430 value: "siteName",
426 - width: "150", 431 + width: "80",
427 align: "center", 432 align: "center",
428 sorTable: true, 433 sorTable: true,
429 fixed: false, 434 fixed: false,
435 + disabled:true
430 }, 436 },
431 { 437 {
432 type: "", 438 type: "",
433 name: "运单号", 439 name: "运单号",
434 value: "waybillNo", 440 value: "waybillNo",
435 - width: "150", 441 + width: "120",
436 align: "center", 442 align: "center",
437 sorTable: true, 443 sorTable: true,
438 fixed: false, 444 fixed: false,
445 + disabled:true
439 }, 446 },
440 { 447 {
441 type: "", 448 type: "",
442 name: "总单号", 449 name: "总单号",
443 value: "totalWaybillNo", 450 value: "totalWaybillNo",
444 - width: "150", 451 + width: "120",
445 align: "center", 452 align: "center",
446 sorTable: true, 453 sorTable: true,
447 fixed: false, 454 fixed: false,
455 + disabled:true
448 }, 456 },
449 { 457 {
450 type: "", 458 type: "",
451 name: "服务类型", 459 name: "服务类型",
452 value: "serviceTypeName", 460 value: "serviceTypeName",
453 - width: "150", 461 + width: "100",
454 align: "center", 462 align: "center",
455 sorTable: true, 463 sorTable: true,
456 fixed: false, 464 fixed: false,
465 + disabled:true
457 }, 466 },
458 { 467 {
459 type: "", 468 type: "",
460 name: "服务代码", 469 name: "服务代码",
461 value: "serviceCode", 470 value: "serviceCode",
462 - width: "150", 471 + width: "100",
463 align: "center", 472 align: "center",
464 sorTable: false, 473 sorTable: false,
465 - fixed:false, 474 + fixed: false,
475 + disabled:true
466 }, 476 },
467 { 477 {
468 type: "", 478 type: "",
469 name: "URSA", 479 name: "URSA",
470 value: "ursa", 480 value: "ursa",
471 - width: "150", 481 + width: "100",
472 align: "center", 482 align: "center",
473 sorTable: true, 483 sorTable: true,
474 fixed: false, 484 fixed: false,
485 + disabled:true
475 }, 486 },
476 { 487 {
477 type: "", 488 type: "",
478 name: "申报类型", 489 name: "申报类型",
479 value: "typeName", 490 value: "typeName",
480 - width: "150", 491 + width: "100",
481 align: "center", 492 align: "center",
482 sorTable: true, 493 sorTable: true,
483 fixed: false, 494 fixed: false,
495 + disabled:true
484 }, 496 },
485 { 497 {
486 type: "", 498 type: "",
...@@ -490,33 +502,37 @@ export default { ...@@ -490,33 +502,37 @@ export default {
490 align: "center", 502 align: "center",
491 sorTable: true, 503 sorTable: true,
492 fixed: false, 504 fixed: false,
505 + disabled:true
493 }, 506 },
494 { 507 {
495 type: "", 508 type: "",
496 name: "subcategory", 509 name: "subcategory",
497 value: "subCategory", 510 value: "subCategory",
498 - width: "150", 511 + width: "140",
499 align: "center", 512 align: "center",
500 sorTable: true, 513 sorTable: true,
501 fixed: false, 514 fixed: false,
515 + disabled:true
502 }, 516 },
503 { 517 {
504 type: "", 518 type: "",
505 name: "件数", 519 name: "件数",
506 value: "qty", 520 value: "qty",
507 - width: "150", 521 + width: "80",
508 align: "center", 522 align: "center",
509 sorTable: true, 523 sorTable: true,
510 fixed: false, 524 fixed: false,
525 + disabled:true
511 }, 526 },
512 { 527 {
513 type: "", 528 type: "",
514 name: "实际重量", 529 name: "实际重量",
515 value: "actualWeight", 530 value: "actualWeight",
516 - width: "150", 531 + width: "100",
517 align: "center", 532 align: "center",
518 sorTable: true, 533 sorTable: true,
519 fixed: false, 534 fixed: false,
535 + disabled:true
520 }, 536 },
521 { 537 {
522 type: "", 538 type: "",
...@@ -526,78 +542,87 @@ export default { ...@@ -526,78 +542,87 @@ export default {
526 align: "center", 542 align: "center",
527 sorTable: true, 543 sorTable: true,
528 fixed: false, 544 fixed: false,
545 + disabled:true
529 }, 546 },
530 { 547 {
531 type: "", 548 type: "",
532 name: "品名描述", 549 name: "品名描述",
533 value: "nameDescription", 550 value: "nameDescription",
534 - width: "150", 551 + width: "100",
535 align: "center", 552 align: "center",
536 sorTable: false, 553 sorTable: false,
537 fixed: false, 554 fixed: false,
555 + disabled:true
538 }, 556 },
539 { 557 {
540 type: "", 558 type: "",
541 name: "海关回执状态", 559 name: "海关回执状态",
542 value: "customsReceiptStatusName", 560 value: "customsReceiptStatusName",
543 - width: "150", 561 + width: "140",
544 align: "center", 562 align: "center",
545 sorTable: true, 563 sorTable: true,
546 fixed: false, 564 fixed: false,
565 + disabled:true
547 }, 566 },
548 { 567 {
549 type: "", 568 type: "",
550 name: "预审状态", 569 name: "预审状态",
551 value: "preQualificationStatus", 570 value: "preQualificationStatus",
552 - width: "150", 571 + width: "100",
553 align: "center", 572 align: "center",
554 sorTable: true, 573 sorTable: true,
555 fixed: false, 574 fixed: false,
575 + disabled:true
556 }, 576 },
557 { 577 {
558 type: "", 578 type: "",
559 name: "航班预审意见", 579 name: "航班预审意见",
560 value: "caPretrialOpinion", 580 value: "caPretrialOpinion",
561 - width: "150", 581 + width: "120",
562 align: "center", 582 align: "center",
563 sorTable: false, 583 sorTable: false,
564 fixed: false, 584 fixed: false,
585 + disabled:true
565 }, 586 },
566 { 587 {
567 type: "", 588 type: "",
568 name: "货物状态", 589 name: "货物状态",
569 value: "statusName", 590 value: "statusName",
570 - width: "150", 591 + width: "100",
571 align: "center", 592 align: "center",
572 sorTable: true, 593 sorTable: true,
573 fixed: false, 594 fixed: false,
595 + disabled:true
574 }, 596 },
575 { 597 {
576 type: "", 598 type: "",
577 name: "终配航班号", 599 name: "终配航班号",
578 value: "finalFlightNo", 600 value: "finalFlightNo",
579 - width: "150", 601 + width: "120",
580 align: "center", 602 align: "center",
581 sorTable: true, 603 sorTable: true,
582 fixed: false, 604 fixed: false,
605 + disabled:true
583 }, 606 },
584 { 607 {
585 type: "", 608 type: "",
586 name: "终配航班日期", 609 name: "终配航班日期",
587 value: "finalFlightTime", 610 value: "finalFlightTime",
588 - width: "150", 611 + width: "140",
589 align: "center", 612 align: "center",
590 sorTable: true, 613 sorTable: true,
591 fixed: false, 614 fixed: false,
615 + disabled:true
592 }, 616 },
593 { 617 {
594 type: "", 618 type: "",
595 name: "二配航班号", 619 name: "二配航班号",
596 value: "twoMatchFlightNo", 620 value: "twoMatchFlightNo",
597 - width: "150", 621 + width: "120",
598 align: "center", 622 align: "center",
599 sorTable: true, 623 sorTable: true,
600 fixed: false, 624 fixed: false,
625 + disabled:true
601 }, 626 },
602 { 627 {
603 type: "", 628 type: "",
...@@ -607,15 +632,17 @@ export default { ...@@ -607,15 +632,17 @@ export default {
607 align: "center", 632 align: "center",
608 sorTable: true, 633 sorTable: true,
609 fixed: false, 634 fixed: false,
635 + disabled:true
610 }, 636 },
611 { 637 {
612 type: "", 638 type: "",
613 name: "预配航班号", 639 name: "预配航班号",
614 value: "preplanFlightNo", 640 value: "preplanFlightNo",
615 - width: "150", 641 + width: "120",
616 align: "center", 642 align: "center",
617 sorTable: true, 643 sorTable: true,
618 fixed: false, 644 fixed: false,
645 + disabled:true
619 }, 646 },
620 { 647 {
621 type: "", 648 type: "",
...@@ -625,6 +652,7 @@ export default { ...@@ -625,6 +652,7 @@ export default {
625 align: "center", 652 align: "center",
626 sorTable: true, 653 sorTable: true,
627 fixed: false, 654 fixed: false,
655 + disabled:true
628 }, 656 },
629 { 657 {
630 type: "", 658 type: "",
...@@ -634,6 +662,7 @@ export default { ...@@ -634,6 +662,7 @@ export default {
634 align: "center", 662 align: "center",
635 sorTable: true, 663 sorTable: true,
636 fixed: false, 664 fixed: false,
665 + disabled:true
637 }, 666 },
638 { 667 {
639 type: "", 668 type: "",
...@@ -643,15 +672,17 @@ export default { ...@@ -643,15 +672,17 @@ export default {
643 align: "center", 672 align: "center",
644 sorTable: true, 673 sorTable: true,
645 fixed: false, 674 fixed: false,
675 + disabled:true
646 }, 676 },
647 { 677 {
648 type: "", 678 type: "",
649 name: "ACCS原航线", 679 name: "ACCS原航线",
650 value: "accsFlightRoute", 680 value: "accsFlightRoute",
651 - width: "150", 681 + width: "140",
652 align: "center", 682 align: "center",
653 sorTable: true, 683 sorTable: true,
654 fixed: false, 684 fixed: false,
685 + disabled:true
655 }, 686 },
656 { 687 {
657 type: "", 688 type: "",
...@@ -661,24 +692,27 @@ export default { ...@@ -661,24 +692,27 @@ export default {
661 align: "center", 692 align: "center",
662 sorTable: true, 693 sorTable: true,
663 fixed: false, 694 fixed: false,
695 + disabled:true
664 }, 696 },
665 { 697 {
666 type: "", 698 type: "",
667 name: "是否自动", 699 name: "是否自动",
668 value: "cargoRulesStatus", 700 value: "cargoRulesStatus",
669 - width: "150", 701 + width: "100",
670 align: "center", 702 align: "center",
671 sorTable: true, 703 sorTable: true,
672 fixed: false, 704 fixed: false,
705 + disabled:true
673 }, 706 },
674 { 707 {
675 type: "", 708 type: "",
676 name: "发件人账号", 709 name: "发件人账号",
677 value: "shipperAccount", 710 value: "shipperAccount",
678 - width: "150", 711 + width: "120",
679 align: "center", 712 align: "center",
680 sorTable: false, 713 sorTable: false,
681 fixed: false, 714 fixed: false,
715 + disabled:true
682 }, 716 },
683 { 717 {
684 type: "", 718 type: "",
...@@ -688,51 +722,57 @@ export default { ...@@ -688,51 +722,57 @@ export default {
688 align: "center", 722 align: "center",
689 sorTable: false, 723 sorTable: false,
690 fixed: false, 724 fixed: false,
725 + disabled:true
691 }, 726 },
692 { 727 {
693 type: "", 728 type: "",
694 name: "始发地城市名称", 729 name: "始发地城市名称",
695 value: "originCity", 730 value: "originCity",
696 - width: "150", 731 + width: "130",
697 align: "center", 732 align: "center",
698 sorTable: false, 733 sorTable: false,
699 fixed: false, 734 fixed: false,
735 + disabled:true
700 }, 736 },
701 { 737 {
702 type: "", 738 type: "",
703 name: "收件地", 739 name: "收件地",
704 value: "destinationSiteName", 740 value: "destinationSiteName",
705 - width: "150", 741 + width: "90",
706 align: "center", 742 align: "center",
707 sorTable: false, 743 sorTable: false,
708 fixed: false, 744 fixed: false,
745 + disabled:true
709 }, 746 },
710 { 747 {
711 type: "", 748 type: "",
712 name: "尺寸", 749 name: "尺寸",
713 value: "sizeStr", 750 value: "sizeStr",
714 - width: "150", 751 + width: "80",
715 align: "center", 752 align: "center",
716 sorTable: true, 753 sorTable: true,
717 fixed: false, 754 fixed: false,
755 + disabled:true
718 }, 756 },
719 { 757 {
720 type: "", 758 type: "",
721 name: "大货预审意见（是否可以配置航班）", 759 name: "大货预审意见（是否可以配置航班）",
722 value: "bigPretrialOpinion", 760 value: "bigPretrialOpinion",
723 - width: "300", 761 + width: "250",
724 align: "center", 762 align: "center",
725 sorTable: false, 763 sorTable: false,
726 fixed: false, 764 fixed: false,
765 + disabled:true
727 }, 766 },
728 { 767 {
729 type: "", 768 type: "",
730 name: "大货预审时间", 769 name: "大货预审时间",
731 value: "bigPretrialTime", 770 value: "bigPretrialTime",
732 - width: "150", 771 + width: "120",
733 align: "center", 772 align: "center",
734 sorTable: false, 773 sorTable: false,
735 fixed: false, 774 fixed: false,
775 + disabled:true
736 }, 776 },
737 { 777 {
738 type: "", 778 type: "",
...@@ -742,6 +782,7 @@ export default { ...@@ -742,6 +782,7 @@ export default {
742 align: "center", 782 align: "center",
743 sorTable: true, 783 sorTable: true,
744 fixed: false, 784 fixed: false,
785 + disabled:true
745 }, 786 },
746 { 787 {
747 type: "", 788 type: "",
...@@ -751,24 +792,27 @@ export default { ...@@ -751,24 +792,27 @@ export default {
751 align: "center", 792 align: "center",
752 sorTable: true, 793 sorTable: true,
753 fixed: false, 794 fixed: false,
795 + disabled:true
754 }, 796 },
755 { 797 {
756 type: "", 798 type: "",
757 name: "创建人", 799 name: "创建人",
758 value: "createUserName", 800 value: "createUserName",
759 - width: "150", 801 + width: "90",
760 align: "center", 802 align: "center",
761 sorTable: true, 803 sorTable: true,
762 fixed: false, 804 fixed: false,
805 + disabled:true
763 }, 806 },
764 { 807 {
765 type: "", 808 type: "",
766 name: "创建时间", 809 name: "创建时间",
767 value: "createTime", 810 value: "createTime",
768 - width: "150", 811 + width: "100",
769 align: "center", 812 align: "center",
770 sorTable: true, 813 sorTable: true,
771 fixed: false, 814 fixed: false,
815 + disabled:true
772 }, 816 },
773 ], //表头数据 817 ], //表头数据
774 tableData: [], //表格数据 818 tableData: [], //表格数据
...@@ -790,6 +834,7 @@ export default { ...@@ -790,6 +834,7 @@ export default {
790 size: 100, 834 size: 100,
791 allWeight: 0, 835 allWeight: 0,
792 allQty: 0, 836 allQty: 0,
837 + tableHeight:null,
793 dialogVisible: false, 838 dialogVisible: false,
794 shiftKey: false, 839 shiftKey: false,
795 createDate: null, 840 createDate: null,
...@@ -819,6 +864,7 @@ export default { ...@@ -819,6 +864,7 @@ export default {
819 this.shiftKey = false; 864 this.shiftKey = false;
820 } 865 }
821 }); 866 });
867 + this.tableHeight = window.innerHeight - this.$refs.form.$el.offsetHeight-60
822 }, 868 },
823 methods: { 869 methods: {
824 //查询条件 870 //查询条件
......
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
241 :limitStart="limitStart" 241 :limitStart="limitStart"
242 :page="page" 242 :page="page"
243 :shiftKey="shiftKey" 243 :shiftKey="shiftKey"
244 - height="450" 244 + :height="tableHeight"
245 @tableSelect="tableSelect" 245 @tableSelect="tableSelect"
246 @tableSelectAll="tableSelectAll" 246 @tableSelectAll="tableSelectAll"
247 @currentChange="currentChange" 247 @currentChange="currentChange"
...@@ -295,7 +295,8 @@ export default { ...@@ -295,7 +295,8 @@ export default {
295 width: "50", 295 width: "50",
296 align: "center", 296 align: "center",
297 sorTable: false, 297 sorTable: false,
298 - fixed:true, 298 + fixed: true,
299 + disabled:true
299 }, 300 },
300 { 301 {
301 type: "index", 302 type: "index",
...@@ -304,43 +305,48 @@ export default { ...@@ -304,43 +305,48 @@ export default {
304 width: "50", 305 width: "50",
305 align: "center", 306 align: "center",
306 sorTable: false, 307 sorTable: false,
307 - fixed:false, 308 + fixed: false,
309 + disabled:true
308 }, 310 },
309 { 311 {
310 type: "", 312 type: "",
311 name: "口岸代码", 313 name: "口岸代码",
312 value: "portName", 314 value: "portName",
313 - width: "150", 315 + width: "120",
314 align: "center", 316 align: "center",
315 sorTable: true, 317 sorTable: true,
316 - fixed:false, 318 + fixed: false,
319 + disabled:true
317 }, 320 },
318 { 321 {
319 type: "", 322 type: "",
320 name: "取件日期", 323 name: "取件日期",
321 value: "pickUpDate", 324 value: "pickUpDate",
322 - width: "150", 325 + width: "120",
323 align: "center", 326 align: "center",
324 sorTable: true, 327 sorTable: true,
325 - fixed:false, 328 + fixed: false,
329 + disabled:true
326 }, 330 },
327 { 331 {
328 type: "", 332 type: "",
329 name: "取件扫描号", 333 name: "取件扫描号",
330 value: "pickUpScanNo", 334 value: "pickUpScanNo",
331 - width: "150", 335 + width: "120",
332 align: "center", 336 align: "center",
333 sorTable: true, 337 sorTable: true,
334 - fixed:false, 338 + fixed: false,
339 + disabled:true
335 }, 340 },
336 { 341 {
337 type: "", 342 type: "",
338 name: "站点", 343 name: "站点",
339 value: "siteName", 344 value: "siteName",
340 - width: "150", 345 + width: "80",
341 align: "center", 346 align: "center",
342 sorTable: true, 347 sorTable: true,
343 - fixed:false, 348 + fixed: false,
349 + disabled:true
344 }, 350 },
345 { 351 {
346 type: "", 352 type: "",
...@@ -349,7 +355,8 @@ export default { ...@@ -349,7 +355,8 @@ export default {
349 width: "150", 355 width: "150",
350 align: "center", 356 align: "center",
351 sorTable: true, 357 sorTable: true,
352 - fixed:false, 358 + fixed: false,
359 + disabled:true
353 }, 360 },
354 { 361 {
355 type: "", 362 type: "",
...@@ -358,43 +365,48 @@ export default { ...@@ -358,43 +365,48 @@ export default {
358 width: "150", 365 width: "150",
359 align: "center", 366 align: "center",
360 sorTable: true, 367 sorTable: true,
361 - fixed:false, 368 + fixed: false,
369 + disabled:true
362 }, 370 },
363 { 371 {
364 type: "", 372 type: "",
365 name: "服务类型", 373 name: "服务类型",
366 value: "serviceTypeName", 374 value: "serviceTypeName",
367 - width: "150", 375 + width: "100",
368 align: "center", 376 align: "center",
369 sorTable: true, 377 sorTable: true,
370 - fixed:false, 378 + fixed: false,
379 + disabled:true
371 }, 380 },
372 { 381 {
373 type: "", 382 type: "",
374 name: "服务代码", 383 name: "服务代码",
375 value: "serviceCode", 384 value: "serviceCode",
376 - width: "150", 385 + width: "90",
377 align: "center", 386 align: "center",
378 sorTable: false, 387 sorTable: false,
379 - fixed:false, 388 + fixed: false,
389 + disabled:true
380 }, 390 },
381 { 391 {
382 type: "", 392 type: "",
383 name: "URSA", 393 name: "URSA",
384 value: "ursa", 394 value: "ursa",
385 - width: "150", 395 + width: "100",
386 align: "center", 396 align: "center",
387 sorTable: true, 397 sorTable: true,
388 - fixed:false, 398 + fixed: false,
399 + disabled:true
389 }, 400 },
390 { 401 {
391 type: "", 402 type: "",
392 name: "申报类型", 403 name: "申报类型",
393 value: "typeName", 404 value: "typeName",
394 - width: "150", 405 + width: "100",
395 align: "center", 406 align: "center",
396 sorTable: true, 407 sorTable: true,
397 - fixed:false, 408 + fixed: false,
409 + disabled:true
398 }, 410 },
399 { 411 {
400 type: "", 412 type: "",
...@@ -403,7 +415,8 @@ export default { ...@@ -403,7 +415,8 @@ export default {
403 width: "150", 415 width: "150",
404 align: "center", 416 align: "center",
405 sorTable: true, 417 sorTable: true,
406 - fixed:false, 418 + fixed: false,
419 + disabled:true
407 }, 420 },
408 { 421 {
409 type: "", 422 type: "",
...@@ -412,25 +425,28 @@ export default { ...@@ -412,25 +425,28 @@ export default {
412 width: "150", 425 width: "150",
413 align: "center", 426 align: "center",
414 sorTable: true, 427 sorTable: true,
415 - fixed:false, 428 + fixed: false,
429 + disabled:true
416 }, 430 },
417 { 431 {
418 type: "", 432 type: "",
419 name: "件数", 433 name: "件数",
420 value: "qty", 434 value: "qty",
421 - width: "150", 435 + width: "80",
422 align: "center", 436 align: "center",
423 sorTable: true, 437 sorTable: true,
424 - fixed:false, 438 + fixed: false,
439 + disabled:true
425 }, 440 },
426 { 441 {
427 type: "", 442 type: "",
428 name: "实际重量", 443 name: "实际重量",
429 value: "actualWeight", 444 value: "actualWeight",
430 - width: "150", 445 + width: "100",
431 align: "center", 446 align: "center",
432 sorTable: true, 447 sorTable: true,
433 - fixed:false, 448 + fixed: false,
449 + disabled:true
434 }, 450 },
435 { 451 {
436 type: "", 452 type: "",
...@@ -439,61 +455,68 @@ export default { ...@@ -439,61 +455,68 @@ export default {
439 width: "150", 455 width: "150",
440 align: "center", 456 align: "center",
441 sorTable: true, 457 sorTable: true,
442 - fixed:false, 458 + fixed: false,
459 + disabled:true
443 }, 460 },
444 { 461 {
445 type: "", 462 type: "",
446 name: "品名描述", 463 name: "品名描述",
447 value: "nameDescription", 464 value: "nameDescription",
448 - width: "150", 465 + width: "100",
449 align: "center", 466 align: "center",
450 sorTable: false, 467 sorTable: false,
451 - fixed:false, 468 + fixed: false,
469 + disabled:true
452 }, 470 },
453 { 471 {
454 type: "", 472 type: "",
455 name: "海关回执状态", 473 name: "海关回执状态",
456 value: "customsReceiptStatusName", 474 value: "customsReceiptStatusName",
457 - width: "150", 475 + width: "140",
458 align: "center", 476 align: "center",
459 sorTable: true, 477 sorTable: true,
460 - fixed:false, 478 + fixed: false,
479 + disabled:true
461 }, 480 },
462 { 481 {
463 type: "", 482 type: "",
464 name: "预审状态", 483 name: "预审状态",
465 value: "preQualificationStatus", 484 value: "preQualificationStatus",
466 - width: "150", 485 + width: "100",
467 align: "center", 486 align: "center",
468 sorTable: true, 487 sorTable: true,
469 - fixed:false, 488 + fixed: false,
489 + disabled:true
470 }, 490 },
471 { 491 {
472 type: "", 492 type: "",
473 name: "航班预审意见", 493 name: "航班预审意见",
474 value: "caPretrialOpinion", 494 value: "caPretrialOpinion",
475 - width: "150", 495 + width: "140",
476 align: "center", 496 align: "center",
477 sorTable: false, 497 sorTable: false,
478 - fixed:false, 498 + fixed: false,
499 + disabled:true
479 }, 500 },
480 { 501 {
481 type: "", 502 type: "",
482 name: "货物状态", 503 name: "货物状态",
483 value: "statusName", 504 value: "statusName",
484 - width: "150", 505 + width: "100",
485 align: "center", 506 align: "center",
486 sorTable: true, 507 sorTable: true,
487 - fixed:false, 508 + fixed: false,
509 + disabled:true
488 }, 510 },
489 { 511 {
490 type: "", 512 type: "",
491 name: "终配航班号", 513 name: "终配航班号",
492 value: "finalFlightNo", 514 value: "finalFlightNo",
493 - width: "150", 515 + width: "130",
494 align: "center", 516 align: "center",
495 sorTable: true, 517 sorTable: true,
496 - fixed:false, 518 + fixed: false,
519 + disabled:true
497 }, 520 },
498 { 521 {
499 type: "", 522 type: "",
...@@ -502,16 +525,18 @@ export default { ...@@ -502,16 +525,18 @@ export default {
502 width: "150", 525 width: "150",
503 align: "center", 526 align: "center",
504 sorTable: true, 527 sorTable: true,
505 - fixed:false, 528 + fixed: false,
529 + disabled:true
506 }, 530 },
507 { 531 {
508 type: "", 532 type: "",
509 name: "二配航班号", 533 name: "二配航班号",
510 value: "twoMatchFlightNo", 534 value: "twoMatchFlightNo",
511 - width: "150", 535 + width: "130",
512 align: "center", 536 align: "center",
513 sorTable: true, 537 sorTable: true,
514 - fixed:false, 538 + fixed: false,
539 + disabled:true
515 }, 540 },
516 { 541 {
517 type: "", 542 type: "",
...@@ -520,16 +545,18 @@ export default { ...@@ -520,16 +545,18 @@ export default {
520 width: "150", 545 width: "150",
521 align: "center", 546 align: "center",
522 sorTable: true, 547 sorTable: true,
523 - fixed:false, 548 + fixed: false,
549 + disabled:true
524 }, 550 },
525 { 551 {
526 type: "", 552 type: "",
527 name: "预配航班号", 553 name: "预配航班号",
528 value: "preplanFlightNo", 554 value: "preplanFlightNo",
529 - width: "150", 555 + width: "130",
530 align: "center", 556 align: "center",
531 sorTable: true, 557 sorTable: true,
532 - fixed:false, 558 + fixed: false,
559 + disabled:true
533 }, 560 },
534 { 561 {
535 type: "", 562 type: "",
...@@ -538,16 +565,18 @@ export default { ...@@ -538,16 +565,18 @@ export default {
538 width: "150", 565 width: "150",
539 align: "center", 566 align: "center",
540 sorTable: true, 567 sorTable: true,
541 - fixed:false, 568 + fixed: false,
569 + disabled:true
542 }, 570 },
543 { 571 {
544 type: "", 572 type: "",
545 name: "ACCS原航班号", 573 name: "ACCS原航班号",
546 value: "fltNoAccs", 574 value: "fltNoAccs",
547 - width: "150", 575 + width: "140",
548 align: "center", 576 align: "center",
549 sorTable: true, 577 sorTable: true,
550 - fixed:false, 578 + fixed: false,
579 + disabled:true
551 }, 580 },
552 { 581 {
553 type: "", 582 type: "",
...@@ -556,7 +585,8 @@ export default { ...@@ -556,7 +585,8 @@ export default {
556 width: "150", 585 width: "150",
557 align: "center", 586 align: "center",
558 sorTable: true, 587 sorTable: true,
559 - fixed:false, 588 + fixed: false,
589 + disabled:true
560 }, 590 },
561 { 591 {
562 type: "", 592 type: "",
...@@ -565,7 +595,8 @@ export default { ...@@ -565,7 +595,8 @@ export default {
565 width: "150", 595 width: "150",
566 align: "center", 596 align: "center",
567 sorTable: true, 597 sorTable: true,
568 - fixed:false, 598 + fixed: false,
599 + disabled:true
569 }, 600 },
570 { 601 {
571 type: "", 602 type: "",
...@@ -574,16 +605,18 @@ export default { ...@@ -574,16 +605,18 @@ export default {
574 width: "170", 605 width: "170",
575 align: "center", 606 align: "center",
576 sorTable: true, 607 sorTable: true,
577 - fixed:false, 608 + fixed: false,
609 + disabled:true
578 }, 610 },
579 { 611 {
580 type: "", 612 type: "",
581 name: "是否自动", 613 name: "是否自动",
582 value: "cargoRulesStatus", 614 value: "cargoRulesStatus",
583 - width: "150", 615 + width: "100",
584 align: "center", 616 align: "center",
585 sorTable: true, 617 sorTable: true,
586 - fixed:false, 618 + fixed: false,
619 + disabled:true
587 }, 620 },
588 { 621 {
589 type: "", 622 type: "",
...@@ -592,7 +625,8 @@ export default { ...@@ -592,7 +625,8 @@ export default {
592 width: "150", 625 width: "150",
593 align: "center", 626 align: "center",
594 sorTable: false, 627 sorTable: false,
595 - fixed:false, 628 + fixed: false,
629 + disabled:true
596 }, 630 },
597 { 631 {
598 type: "", 632 type: "",
...@@ -601,7 +635,8 @@ export default { ...@@ -601,7 +635,8 @@ export default {
601 width: "150", 635 width: "150",
602 align: "center", 636 align: "center",
603 sorTable: false, 637 sorTable: false,
604 - fixed:false, 638 + fixed: false,
639 + disabled:true
605 }, 640 },
606 { 641 {
607 type: "", 642 type: "",
...@@ -610,34 +645,38 @@ export default { ...@@ -610,34 +645,38 @@ export default {
610 width: "150", 645 width: "150",
611 align: "center", 646 align: "center",
612 sorTable: false, 647 sorTable: false,
613 - fixed:false, 648 + fixed: false,
649 + disabled:true
614 }, 650 },
615 { 651 {
616 type: "", 652 type: "",
617 name: "收件地", 653 name: "收件地",
618 value: "destinationSiteName", 654 value: "destinationSiteName",
619 - width: "150", 655 + width: "90",
620 align: "center", 656 align: "center",
621 sorTable: false, 657 sorTable: false,
622 - fixed:false, 658 + fixed: false,
659 + disabled:true
623 }, 660 },
624 { 661 {
625 type: "", 662 type: "",
626 name: "尺寸", 663 name: "尺寸",
627 value: "sizeStr", 664 value: "sizeStr",
628 - width: "150", 665 + width: "80",
629 align: "center", 666 align: "center",
630 sorTable: true, 667 sorTable: true,
631 - fixed:false, 668 + fixed: false,
669 + disabled:true
632 }, 670 },
633 { 671 {
634 type: "", 672 type: "",
635 name: "大货预审意见（是否可以配置航班）", 673 name: "大货预审意见（是否可以配置航班）",
636 value: "bigPretrialOpinion", 674 value: "bigPretrialOpinion",
637 - width: "300", 675 + width: "250",
638 align: "center", 676 align: "center",
639 sorTable: false, 677 sorTable: false,
640 - fixed:false, 678 + fixed: false,
679 + disabled:true
641 }, 680 },
642 { 681 {
643 type: "", 682 type: "",
...@@ -646,7 +685,8 @@ export default { ...@@ -646,7 +685,8 @@ export default {
646 width: "150", 685 width: "150",
647 align: "center", 686 align: "center",
648 sorTable: false, 687 sorTable: false,
649 - fixed:false, 688 + fixed: false,
689 + disabled:true
650 }, 690 },
651 { 691 {
652 type: "", 692 type: "",
...@@ -655,7 +695,8 @@ export default { ...@@ -655,7 +695,8 @@ export default {
655 width: "150", 695 width: "150",
656 align: "center", 696 align: "center",
657 sorTable: true, 697 sorTable: true,
658 - fixed:false, 698 + fixed: false,
699 + disabled:true
659 }, 700 },
660 { 701 {
661 type: "", 702 type: "",
...@@ -664,25 +705,28 @@ export default { ...@@ -664,25 +705,28 @@ export default {
664 width: "150", 705 width: "150",
665 align: "center", 706 align: "center",
666 sorTable: true, 707 sorTable: true,
667 - fixed:false, 708 + fixed: false,
709 + disabled:true
668 }, 710 },
669 { 711 {
670 type: "", 712 type: "",
671 name: "创建人", 713 name: "创建人",
672 value: "createUserName", 714 value: "createUserName",
673 - width: "150", 715 + width: "90",
674 align: "center", 716 align: "center",
675 sorTable: true, 717 sorTable: true,
676 - fixed:false, 718 + fixed: false,
719 + disabled:true
677 }, 720 },
678 { 721 {
679 type: "", 722 type: "",
680 name: "创建时间", 723 name: "创建时间",
681 value: "createTime", 724 value: "createTime",
682 - width: "150", 725 + width: "120",
683 align: "center", 726 align: "center",
684 sorTable: true, 727 sorTable: true,
685 - fixed:false, 728 + fixed: false,
729 + disabled:true
686 }, 730 },
687 ], //表头数据 731 ], //表头数据
688 findConditionData: {}, //货物查询条件 732 findConditionData: {}, //货物查询条件
...@@ -706,6 +750,7 @@ export default { ...@@ -706,6 +750,7 @@ export default {
706 limitSize: 100, //无限制-1 750 limitSize: 100, //无限制-1
707 page:1, 751 page:1,
708 progress:0, 752 progress:0,
753 + tableHeight:null,
709 formShow:true, 754 formShow:true,
710 }; 755 };
711 }, 756 },
...@@ -747,6 +792,7 @@ export default { ...@@ -747,6 +792,7 @@ export default {
747 this.shiftKey = false; 792 this.shiftKey = false;
748 } 793 }
749 }); 794 });
795 + this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight-50
750 }, 796 },
751 797
752 methods: { 798 methods: {
......
...@@ -105,10 +105,21 @@ export default { ...@@ -105,10 +105,21 @@ export default {
105 localStorage.removeItem("password"); 105 localStorage.removeItem("password");
106 localStorage.removeItem('rememberMe'); 106 localStorage.removeItem('rememberMe');
107 } 107 }
108 - this.$store.dispatch("Login", this.loginForm).then(() => { 108 + this.$store.dispatch("Login", this.loginForm).then(res => {
109 + this.loading = false;
110 + if(res.code != 200){
111 + this.$message({
112 + message: res.msg,
113 + type: "warning",
114 + });
115 + }
109 this.$router.push({ path: this.redirect || "/" }).catch(()=>{}); 116 this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
110 - }).catch(() => { 117 + }).catch(err => {
111 this.loading = false; 118 this.loading = false;
119 + this.$message({
120 + message: err,
121 + type: "warning",
122 + });
112 //this.getCode(); 123 //this.getCode();
113 }); 124 });
114 } 125 }
......
...@@ -266,7 +266,9 @@ export default { ...@@ -266,7 +266,9 @@ export default {
266 getRoleList({ size: null, page: null }) 266 getRoleList({ size: null, page: null })
267 .then((res) => { 267 .then((res) => {
268 if (res.code === 200) { 268 if (res.code === 200) {
269 - this.roleList = res.data.list; 269 + if(item.valid == 1){
270 + this.roleList.push(item)
271 + }
270 } else { 272 } else {
271 this.$message({ 273 this.$message({
272 message: res.msg, 274 message: res.msg,
......