Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
931c5212 1 parent 57bbd9d9

feat: 修复BUG

Inline Side-by-side
Showing 3 changed files with 355 additions and 212 deletions
1 // base color 1 // base color
2 $blue: #324157; 2 $blue: #324157;
3 -$light-blue: #3A71A8; 3 +$light-blue: #3a71a8;
4 -$red: #C03639; 4 +$red: #c03639;
5 -$pink: #E65D6E; 5 +$pink: #e65d6e;
6 -$green: #30B08F; 6 +$green: #30b08f;
7 -$tiffany: #4AB7BD; 7 +$tiffany: #4ab7bd;
8 -$yellow: #FEC171; 8 +$yellow: #fec171;
9 -$panGreen: #30B08F; 9 +$panGreen: #30b08f;
10 10
11 // sidebar 11 // sidebar
12 $menuText: #bfcbd9; 12 $menuText: #bfcbd9;
13 -$menuActiveText: #4D148C; 13 +$menuActiveText: #4d148c;
14 -$subMenuActiveText: #4D148C; // https://github.com/ElemeFE/element/issues/12951 14 +$subMenuActiveText: #4d148c; // https://github.com/ElemeFE/element/issues/12951
15 15
16 $menuBg: #304156; 16 $menuBg: #304156;
17 $menuHover: #263445; 17 $menuHover: #263445;
...@@ -24,16 +24,16 @@ $sidebarLightTitle: #001529; ...@@ -24,16 +24,16 @@ $sidebarLightTitle: #001529;
24 $subMenuBg: #1f2d3d; 24 $subMenuBg: #1f2d3d;
25 $subMenuHover: #001528; 25 $subMenuHover: #001528;
26 26
27 -$sideBarWidth: 220px; 27 +$sideBarWidth: 210px;
28 -$fedexColor: #4D148C; 28 +$fedexColor: #4d148c;
29 -$fedexBorder: #E3E3E3; 29 +$fedexBorder: #e3e3e3;
30 -$fedexButton: #007AB7; 30 +$fedexButton: #007ab7;
31 $fedexError: #de002e; 31 $fedexError: #de002e;
32 -$fedexBottonColor: #FF6200; 32 +$fedexBottonColor: #ff6200;
33 -$formItemBackgroundColor: #F2F2F2; 33 +$formItemBackgroundColor: #f2f2f2;
34 -$fedexTablebackgroundColor: #FAFAFA; 34 +$fedexTablebackgroundColor: #fafafa;
35 $fedexTableBorderColor: #e3e3e3; 35 $fedexTableBorderColor: #e3e3e3;
36 -$formDisabledColor: #8E8E8E; 36 +$formDisabledColor: #8e8e8e;
37 37
38 // the :export directive is the magic sauce for webpack 38 // the :export directive is the magic sauce for webpack
39 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass 39 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
...@@ -59,5 +59,4 @@ $formDisabledColor: #8E8E8E; ...@@ -59,5 +59,4 @@ $formDisabledColor: #8E8E8E;
59 formDisabledColor: $formDisabledColor; 59 formDisabledColor: $formDisabledColor;
60 fedexTablebackgroundColor: $fedexTablebackgroundColor; 60 fedexTablebackgroundColor: $fedexTablebackgroundColor;
61 fedexTableBorderColor: $fedexTableBorderColor; 61 fedexTableBorderColor: $fedexTableBorderColor;
62 -
63 -}
...\ No newline at end of file ...\ No newline at end of file
62 +}
......
...@@ -400,6 +400,11 @@ ...@@ -400,6 +400,11 @@
400 :max-height="tableMaxheight" 400 :max-height="tableMaxheight"
401 :min-height="300" 401 :min-height="300"
402 ref="tableRef" 402 ref="tableRef"
403 + show-overflow
404 + show-header-overflow
405 + show-footer-overflow
406 + :virtual-y-config="{ enabled: true, gt: 0 }"
407 + :auto-resize="false"
403 :data="tableData" 408 :data="tableData"
404 :column-config="{ resizable: true }" 409 :column-config="{ resizable: true }"
405 :row-config="{ isCurrent: true, isHover: true }" 410 :row-config="{ isCurrent: true, isHover: true }"
...@@ -409,7 +414,12 @@ ...@@ -409,7 +414,12 @@
409 @checkbox-all="tableSelectAll" 414 @checkbox-all="tableSelectAll"
410 > 415 >
411 <vxe-column type="checkbox" width="50"></vxe-column> 416 <vxe-column type="checkbox" width="50"></vxe-column>
412 - <vxe-column field="billNo" title="提运单号" :show-overflow="true"> 417 + <vxe-column
418 + field="billNo"
419 + title="提运单号"
420 + :show-overflow="true"
421 + width="110"
422 + >
413 <template #default="{ row }"> 423 <template #default="{ row }">
414 <el-tooltip 424 <el-tooltip
415 class="item" 425 class="item"
...@@ -424,8 +434,14 @@ ...@@ -424,8 +434,14 @@
424 <vxe-column 434 <vxe-column
425 field="logisticsWaybillNumber" 435 field="logisticsWaybillNumber"
426 title="物流运单编号" 436 title="物流运单编号"
437 + width="110"
427 ></vxe-column> 438 ></vxe-column>
428 - <vxe-column field="orderno" title="订单编号" :show-overflow="true"> 439 + <vxe-column
440 + field="orderno"
441 + title="订单编号"
442 + :show-overflow="true"
443 + width="100"
444 + >
429 <template #default="{ row }"> 445 <template #default="{ row }">
430 <el-tooltip 446 <el-tooltip
431 class="item" 447 class="item"
...@@ -437,7 +453,7 @@ ...@@ -437,7 +453,7 @@
437 </el-tooltip> 453 </el-tooltip>
438 </template> 454 </template>
439 </vxe-column> 455 </vxe-column>
440 - <vxe-column field="flightNumber" title="航班号"></vxe-column> 456 + <vxe-column field="flightNumber" title="航班号" width="80"></vxe-column>
441 <vxe-column 457 <vxe-column
442 field="regulatoryVenueCode" 458 field="regulatoryVenueCode"
443 title="监管场所代码" 459 title="监管场所代码"
...@@ -468,238 +484,330 @@ ...@@ -468,238 +484,330 @@
468 field="orderReceiptStatus" 484 field="orderReceiptStatus"
469 title="订单回执" 485 title="订单回执"
470 :filters="receiptStatusFilters" 486 :filters="receiptStatusFilters"
487 + :show-overflow="true"
488 + width="130"
471 > 489 >
472 <template #default="{ row }"> 490 <template #default="{ row }">
473 - <el-popover 491 + <template
474 - placement="left" 492 + v-if="
475 - popper-class="portLogPopper" 493 + row[`orderReceiptStatus${row.declareId}`] &&
476 - :visible-arrow="false" 494 + row.orderReceiptStatus
477 - title="" 495 + "
478 - width="750"
479 - trigger="manual"
480 - v-model="row[`orderReceiptStatus${row.declareId}`]"
481 > 496 >
482 - <div style="text-align: right"> 497 + <el-popover
483 - <i 498 + placement="left"
499 + popper-class="portLogPopper"
500 + :visible-arrow="false"
501 + title=""
502 + width="750"
503 + trigger="manual"
504 + v-model="row[`orderReceiptStatus${row.declareId}`]"
505 + >
506 + <div style="text-align: right">
507 + <i
508 + @click.stop="
509 + popoverCloseNew(row, row.declareId, 'orderReceiptStatus')
510 + "
511 + class="el-icon-close"
512 + style="cursor: pointer; font-size: 20px; font-weight: 700"
513 + ></i>
514 + </div>
515 + <div style="margin-bottom: 5px">
516 + <span style="font-weight: 700; color: #515a6e"
517 + >订单编号：</span
518 + >
519 + {{ row.orderno }}
520 + </div>
521 + <el-table
522 + :data="popoverTableData"
523 + :pagination="false"
524 + :border="true"
525 + tooltip-effect="dark"
526 + max-height="300px"
527 + >
528 + <el-table-column
529 + property="receiptStatus"
530 + label="回执状态"
531 + ></el-table-column>
532 + <el-table-column
533 + property="statusTime"
534 + label="状态时间"
535 + ></el-table-column>
536 + <el-table-column
537 + property="receiptDescription"
538 + label="回执描述"
539 + ></el-table-column>
540 + </el-table>
541 + <el-button
542 + type="text"
543 + slot="reference"
484 @click.stop=" 544 @click.stop="
485 - popoverCloseNew(row, row.declareId, 'orderReceiptStatus') 545 + popoverChange({ data: row, status: 'orderReceiptStatus' })
486 " 546 "
487 - class="el-icon-close" 547 + >
488 - style="cursor: pointer; font-size: 20px; font-weight: 700" 548 + {{ row.orderReceiptStatus }}
489 - ></i> 549 + </el-button>
490 - </div> 550 + </el-popover>
491 - <div style="margin-bottom: 5px"> 551 + </template>
492 - <span style="font-weight: 700; color: #515a6e">订单编号：</span> 552 + <template v-else>
493 - {{ row.orderno }}
494 - </div>
495 - <el-table
496 - :data="popoverTableData"
497 - :pagination="false"
498 - :border="true"
499 - tooltip-effect="dark"
500 - max-height="300px"
501 - >
502 - <el-table-column
503 - property="receiptStatus"
504 - label="回执状态"
505 - ></el-table-column>
506 - <el-table-column
507 - property="statusTime"
508 - label="状态时间"
509 - ></el-table-column>
510 - <el-table-column
511 - property="receiptDescription"
512 - label="回执描述"
513 - ></el-table-column>
514 - </el-table>
515 <el-button 553 <el-button
516 type="text" 554 type="text"
517 - slot="reference" 555 + @click.stop="
518 - @click="
519 popoverChange({ data: row, status: 'orderReceiptStatus' }) 556 popoverChange({ data: row, status: 'orderReceiptStatus' })
520 " 557 "
521 > 558 >
522 {{ row.orderReceiptStatus }} 559 {{ row.orderReceiptStatus }}
523 </el-button> 560 </el-button>
524 - </el-popover> 561 + </template>
525 </template> 562 </template>
526 </vxe-column> 563 </vxe-column>
527 <vxe-column 564 <vxe-column
528 field="wayBillReceipt" 565 field="wayBillReceipt"
529 title="运单回执" 566 title="运单回执"
530 :filters="receiptStatusFilters" 567 :filters="receiptStatusFilters"
568 + :show-overflow="true"
569 + width="130"
531 > 570 >
532 <template #default="{ row }"> 571 <template #default="{ row }">
533 - <el-popover 572 + <template
534 - placement="left" 573 + v-if="row[`wayBillReceipt${row.declareId}`] && row.wayBillReceipt"
535 - popper-class="portLogPopper"
536 - :visible-arrow="false"
537 - title=""
538 - width="750"
539 - trigger="manual"
540 - v-model="row[`wayBillReceipt${row.declareId}`]"
541 > 574 >
542 - <div style="text-align: right"> 575 + <el-popover
543 - <i 576 + placement="left"
577 + popper-class="portLogPopper"
578 + :visible-arrow="false"
579 + title=""
580 + width="750"
581 + trigger="manual"
582 + v-model="row[`wayBillReceipt${row.declareId}`]"
583 + >
584 + <div style="text-align: right">
585 + <i
586 + @click.stop="
587 + popoverCloseNew(row, row.declareId, 'wayBillReceipt')
588 + "
589 + class="el-icon-close"
590 + style="cursor: pointer; font-size: 20px; font-weight: 700"
591 + ></i>
592 + </div>
593 + <div style="margin-bottom: 5px">
594 + <span style="font-weight: 700; color: #515a6e"
595 + >订单编号：</span
596 + >
597 + {{ row.orderno }}
598 + </div>
599 + <el-table
600 + :data="popoverTableData"
601 + :pagination="false"
602 + :border="true"
603 + tooltip-effect="dark"
604 + max-height="300px"
605 + >
606 + <el-table-column
607 + property="receiptStatus"
608 + label="回执状态"
609 + ></el-table-column>
610 + <el-table-column
611 + property="statusTime"
612 + label="状态时间"
613 + ></el-table-column>
614 + <el-table-column
615 + property="receiptDescription"
616 + label="回执描述"
617 + ></el-table-column>
618 + </el-table>
619 + <el-button
620 + type="text"
621 + slot="reference"
544 @click.stop=" 622 @click.stop="
545 - popoverCloseNew(row, row.declareId, 'wayBillReceipt') 623 + popoverChange({ data: row, status: 'wayBillReceipt' })
546 " 624 "
547 - class="el-icon-close" 625 + >
548 - style="cursor: pointer; font-size: 20px; font-weight: 700" 626 + {{ row.wayBillReceipt }}
549 - ></i> 627 + </el-button>
550 - </div> 628 + </el-popover>
551 - <div style="margin-bottom: 5px"> 629 + </template>
552 - <span style="font-weight: 700; color: #515a6e">订单编号：</span> 630 + <template v-else>
553 - {{ row.orderno }}
554 - </div>
555 - <el-table
556 - :data="popoverTableData"
557 - :pagination="false"
558 - :border="true"
559 - tooltip-effect="dark"
560 - max-height="300px"
561 - >
562 - <el-table-column
563 - property="receiptStatus"
564 - label="回执状态"
565 - ></el-table-column>
566 - <el-table-column
567 - property="statusTime"
568 - label="状态时间"
569 - ></el-table-column>
570 - <el-table-column
571 - property="receiptDescription"
572 - label="回执描述"
573 - ></el-table-column>
574 - </el-table>
575 <el-button 631 <el-button
576 type="text" 632 type="text"
577 - slot="reference" 633 + @click.stop="
578 - @click="popoverChange({ data: row, status: 'wayBillReceipt' })" 634 + popoverChange({ data: row, status: 'wayBillReceipt' })
635 + "
579 > 636 >
580 {{ row.wayBillReceipt }} 637 {{ row.wayBillReceipt }}
581 </el-button> 638 </el-button>
582 - </el-popover> 639 + </template>
583 </template> 640 </template>
584 </vxe-column> 641 </vxe-column>
585 <vxe-column 642 <vxe-column
586 field="listReceiptStatus" 643 field="listReceiptStatus"
587 title="清单回执" 644 title="清单回执"
588 :filters="listStatusFilters" 645 :filters="listStatusFilters"
646 + :show-overflow="true"
647 + width="130"
589 > 648 >
590 <template #default="{ row }"> 649 <template #default="{ row }">
591 - <el-popover 650 + <template
592 - placement="left" 651 + v-if="
593 - popper-class="portLogPopper" 652 + row[`listReceiptStatus${row.declareId}`] &&
594 - :visible-arrow="false" 653 + row.listReceiptStatus
595 - title="" 654 + "
596 - width="750"
597 - trigger="manual"
598 - v-model="row[`listReceiptStatus${row.declareId}`]"
599 > 655 >
600 - <div style="text-align: right"> 656 + <el-popover
601 - <i 657 + placement="left"
658 + popper-class="portLogPopper"
659 + :visible-arrow="false"
660 + title=""
661 + width="750"
662 + :offset="200"
663 + trigger="manual"
664 + v-model="row[`listReceiptStatus${row.declareId}`]"
665 + >
666 + <div style="text-align: right">
667 + <i
668 + @click.stop="
669 + popoverCloseNew(row, row.declareId, 'listReceiptStatus')
670 + "
671 + class="el-icon-close"
672 + style="cursor: pointer; font-size: 20px; font-weight: 700"
673 + ></i>
674 + </div>
675 + <div style="margin-bottom: 5px">
676 + <span style="font-weight: 700; color: #515a6e"
677 + >订单编号：</span
678 + >
679 + {{ row.orderno }}
680 + </div>
681 + <el-table
682 + :data="popoverTableData"
683 + :pagination="false"
684 + :border="true"
685 + tooltip-effect="dark"
686 + max-height="300px"
687 + >
688 + <el-table-column
689 + property="receiptStatus"
690 + label="回执状态"
691 + ></el-table-column>
692 + <el-table-column
693 + property="statusTime"
694 + label="状态时间"
695 + ></el-table-column>
696 + <el-table-column
697 + property="receiptDescription"
698 + label="回执描述"
699 + ></el-table-column>
700 + </el-table>
701 + <el-button
702 + type="text"
703 + slot="reference"
602 @click.stop=" 704 @click.stop="
603 - popoverCloseNew(row, row.declareId, 'listReceiptStatus') 705 + popoverChange({ data: row, status: 'listReceiptStatus' })
604 " 706 "
605 - class="el-icon-close" 707 + >
606 - style="cursor: pointer; font-size: 20px; font-weight: 700" 708 + {{ row.listReceiptStatus }}
607 - ></i> 709 + </el-button>
608 - </div> 710 + </el-popover>
609 - <div style="margin-bottom: 5px"> 711 + </template>
610 - <span style="font-weight: 700; color: #515a6e">订单编号：</span> 712 +
611 - {{ row.orderno }} 713 + <template v-else>
612 - </div>
613 - <el-table
614 - :data="popoverTableData"
615 - :pagination="false"
616 - :border="true"
617 - tooltip-effect="dark"
618 - max-height="300px"
619 - >
620 - <el-table-column
621 - property="receiptStatus"
622 - label="回执状态"
623 - ></el-table-column>
624 - <el-table-column
625 - property="statusTime"
626 - label="状态时间"
627 - ></el-table-column>
628 - <el-table-column
629 - property="receiptDescription"
630 - label="回执描述"
631 - ></el-table-column>
632 - </el-table>
633 <el-button 714 <el-button
634 type="text" 715 type="text"
635 - slot="reference" 716 + @click.stop="
636 - @click="
637 popoverChange({ data: row, status: 'listReceiptStatus' }) 717 popoverChange({ data: row, status: 'listReceiptStatus' })
638 " 718 "
639 > 719 >
640 {{ row.listReceiptStatus }} 720 {{ row.listReceiptStatus }}
641 </el-button> 721 </el-button>
642 - </el-popover> 722 + </template>
643 </template> 723 </template>
644 </vxe-column> 724 </vxe-column>
645 <vxe-column 725 <vxe-column
646 field="totalSplitOrderStatus" 726 field="totalSplitOrderStatus"
647 title="清单总分单回执" 727 title="清单总分单回执"
648 :filters="totalScoreStatusFilters" 728 :filters="totalScoreStatusFilters"
729 + :show-overflow="true"
730 + width="145"
649 > 731 >
650 <template #default="{ row }"> 732 <template #default="{ row }">
651 - <el-popover 733 + <template
652 - placement="left" 734 + v-if="
653 - popper-class="portLogPopper" 735 + row[`totalSplitOrderStatus${row.declareId}`] &&
654 - :visible-arrow="false" 736 + row.totalSplitOrderStatus
655 - title="" 737 + "
656 - width="750"
657 - trigger="manual"
658 - v-model="row[`totalSplitOrderStatus${row.declareId}`]"
659 > 738 >
660 - <div style="text-align: right"> 739 + <el-popover
661 - <i 740 + placement="left"
741 + popper-class="portLogPopper"
742 + :visible-arrow="false"
743 + title=""
744 + width="750"
745 + trigger="manual"
746 + v-model="row[`totalSplitOrderStatus${row.declareId}`]"
747 + >
748 + <div style="text-align: right">
749 + <i
750 + @click.stop="
751 + popoverCloseNew(
752 + row,
753 + row.declareId,
754 + 'totalSplitOrderStatus'
755 + )
756 + "
757 + class="el-icon-close"
758 + style="cursor: pointer; font-size: 20px; font-weight: 700"
759 + ></i>
760 + </div>
761 + <div style="margin-bottom: 5px">
762 + <span style="font-weight: 700; color: #515a6e"
763 + >订单编号：</span
764 + >
765 + {{ row.orderno }}
766 + </div>
767 + <el-table
768 + :data="popoverTableData"
769 + :pagination="false"
770 + :border="true"
771 + tooltip-effect="dark"
772 + max-height="300px"
773 + >
774 + <el-table-column
775 + property="receiptStatus"
776 + label="回执状态"
777 + ></el-table-column>
778 + <el-table-column
779 + property="statusTime"
780 + label="状态时间"
781 + ></el-table-column>
782 + <el-table-column
783 + property="receiptDescription"
784 + label="回执描述"
785 + ></el-table-column>
786 + </el-table>
787 + <el-button
788 + type="text"
789 + slot="reference"
662 @click.stop=" 790 @click.stop="
663 - popoverCloseNew(row, row.declareId, 'totalSplitOrderStatus') 791 + popoverChange({
792 + data: row,
793 + status: 'totalSplitOrderStatus',
794 + })
664 " 795 "
665 - class="el-icon-close" 796 + >
666 - style="cursor: pointer; font-size: 20px; font-weight: 700" 797 + {{ row.totalSplitOrderStatus }}
667 - ></i> 798 + </el-button>
668 - </div> 799 + </el-popover>
669 - <div style="margin-bottom: 5px"> 800 + </template>
670 - <span style="font-weight: 700; color: #515a6e">订单编号：</span> 801 + <template v-else>
671 - {{ row.orderno }}
672 - </div>
673 - <el-table
674 - :data="popoverTableData"
675 - :pagination="false"
676 - :border="true"
677 - tooltip-effect="dark"
678 - max-height="300px"
679 - >
680 - <el-table-column
681 - property="receiptStatus"
682 - label="回执状态"
683 - ></el-table-column>
684 - <el-table-column
685 - property="statusTime"
686 - label="状态时间"
687 - ></el-table-column>
688 - <el-table-column
689 - property="receiptDescription"
690 - label="回执描述"
691 - ></el-table-column>
692 - </el-table>
693 <el-button 802 <el-button
694 type="text" 803 type="text"
695 - slot="reference" 804 + @click.stop="
696 - @click="
697 popoverChange({ data: row, status: 'totalSplitOrderStatus' }) 805 popoverChange({ data: row, status: 'totalSplitOrderStatus' })
698 " 806 "
699 > 807 >
700 {{ row.totalSplitOrderStatus }} 808 {{ row.totalSplitOrderStatus }}
701 </el-button> 809 </el-button>
702 - </el-popover> 810 + </template>
703 </template> 811 </template>
704 </vxe-column> 812 </vxe-column>
705 <vxe-column title="操作" fixed="right" width="110"> 813 <vxe-column title="操作" fixed="right" width="110">
...@@ -1347,6 +1455,7 @@ export default { ...@@ -1347,6 +1455,7 @@ export default {
1347 row[`${type}${declareId}`] = false; 1455 row[`${type}${declareId}`] = false;
1348 this.$forceUpdate(); 1456 this.$forceUpdate();
1349 }, 1457 },
1458 +
1350 popoverChange(val) { 1459 popoverChange(val) {
1351 this.popoverTableData = []; 1460 this.popoverTableData = [];
1352 if (this.visiblePopover.flag) { 1461 if (this.visiblePopover.flag) {
...@@ -1696,5 +1805,8 @@ export default { ...@@ -1696,5 +1805,8 @@ export default {
1696 .vxe-table--render-default.border--outer .vxe-cell--col-resizable:before { 1805 .vxe-table--render-default.border--outer .vxe-cell--col-resizable:before {
1697 background-color: #ffffff; 1806 background-color: #ffffff;
1698 } 1807 }
1808 + .portLogPopper {
1809 + right: 135px !important;
1810 + }
1699 } 1811 }
1700 </style> 1812 </style>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <el-dialog 2 <el-dialog
3 class="entryDialog classCUploadDialog" 3 class="entryDialog classCUploadDialog"
4 :title="pageData.ebpName" 4 :title="pageData.ebpName"
5 - :visible.sync="outerVisible" 5 + :visible="outerVisible"
6 :show-close="false" 6 :show-close="false"
7 width="900px" 7 width="900px"
8 :close-on-click-modal="false" 8 :close-on-click-modal="false"
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
21 </div> 21 </div>
22 <Table 22 <Table
23 class="fedexDetialTable fedexSreachTable" 23 class="fedexDetialTable fedexSreachTable"
24 - ref="entryTable"
25 :data="pageData.value" 24 :data="pageData.value"
26 :headerData="headerData" 25 :headerData="headerData"
26 + :maxHeight="tableMaxheight"
27 :border="true" 27 :border="true"
28 :pagination="true" 28 :pagination="true"
29 :order="false" 29 :order="false"
...@@ -36,12 +36,13 @@ ...@@ -36,12 +36,13 @@
36 @tableSelect="tableSelect" 36 @tableSelect="tableSelect"
37 @tableSelectAll="tableSelectAll" 37 @tableSelectAll="tableSelectAll"
38 :selected="tableSelected" 38 :selected="tableSelected"
39 + :loading="loadings.searchLoading"
39 > 40 >
40 </Table> 41 </Table>
41 <div class="dialogOption entrySave"> 42 <div class="dialogOption entrySave">
42 <el-button 43 <el-button
43 class="entrySaveButton" 44 class="entrySaveButton"
44 - :disabled="loadings.submitLoading" 45 + :loading="loadings.submitLoading"
45 @click="submit" 46 @click="submit"
46 > 47 >
47 提 交 48 提 交
...@@ -80,6 +81,7 @@ export default { ...@@ -80,6 +81,7 @@ export default {
80 loadings: { 81 loadings: {
81 dialogLoading: false, 82 dialogLoading: false,
82 submitLoading: false, 83 submitLoading: false,
84 + searchLoading: false,
83 }, 85 },
84 title: "", 86 title: "",
85 tableSelected: [], 87 tableSelected: [],
...@@ -126,8 +128,12 @@ export default { ...@@ -126,8 +128,12 @@ export default {
126 align: "left", 128 align: "left",
127 }, 129 },
128 ], 130 ],
131 + tableMaxheight: null,
129 }; 132 };
130 }, 133 },
134 + mounted() {
135 + this.tableMaxheight = window.innerHeight - 400;
136 + },
131 methods: { 137 methods: {
132 tableSelect(val) { 138 tableSelect(val) {
133 this.tableSelected = val.selection; 139 this.tableSelected = val.selection;
...@@ -136,20 +142,28 @@ export default { ...@@ -136,20 +142,28 @@ export default {
136 this.tableSelected = val; 142 this.tableSelected = val;
137 }, 143 },
138 fetchPreview() { 144 fetchPreview() {
145 + this.loadings.searchLoading = true;
139 preview({ 146 preview({
140 ...this.selected, 147 ...this.selected,
141 ...this.page, 148 ...this.page,
142 - }).then((res) => { 149 + })
143 - if (res.code === "200") { 150 + .then((res) => {
144 - console.log(res.data); 151 + if (res.code === "200") {
145 - this.pageData = { 152 + console.log(res.data);
146 - ...res.data, 153 + this.pageData = {
147 - value: res.data.pageData.value, 154 + ...res.data,
148 - }; 155 + value: res.data.pageData.value,
149 - console.log(this.pageData); 156 + };
150 - this.page.total = res.data.pageData.totalItems; 157 + console.log(this.pageData);
151 - } 158 + this.page.total = res.data.pageData.totalItems;
152 - }); 159 + }
160 + })
161 + .catch((err) => {
162 + console.log(err);
163 + })
164 + .finally(() => {
165 + this.loadings.searchLoading = false;
166 + });
153 }, 167 },
154 search(val) { 168 search(val) {
155 if (val == 0) { 169 if (val == 0) {
...@@ -171,18 +185,29 @@ export default { ...@@ -171,18 +185,29 @@ export default {
171 this.msgError("请选择数据"); 185 this.msgError("请选择数据");
172 return; 186 return;
173 } 187 }
188 + this.loadings.submitLoading = true;
174 189
175 declareSummaryApplication({ 190 declareSummaryApplication({
176 ...this.selected, 191 ...this.selected,
177 logisticsNos: this.tableSelected.map((item) => item.logisticsNo), 192 logisticsNos: this.tableSelected.map((item) => item.logisticsNo),
178 - }).then((response) => { 193 + })
179 - if (response.data) { 194 + .then((response) => {
180 - this.msgSuccess("汇总申报成功"); 195 + if (response.data) {
181 - this.$router.push("summaryDataSearch"); 196 + this.msgSuccess("汇总申报成功");
182 - } else { 197 + this.close(true);
183 - this.msgError(response.message); 198 + this.$nextTick(() => {
184 - } 199 + this.$router.push("summaryDataSearch");
185 - }); 200 + });
201 + } else {
202 + this.msgError(response.message);
203 + }
204 + })
205 + .catch((err) => {
206 + console.log(err);
207 + })
208 + .finally(() => {
209 + this.loadings.submitLoading = false;
210 + });
186 }, 211 },
187 //新增 212 //新增
188 addapi(val) { 213 addapi(val) {
...@@ -216,4 +241,11 @@ export default { ...@@ -216,4 +241,11 @@ export default {
216 241
217 <style lang="scss" scoped> 242 <style lang="scss" scoped>
218 @import "@/assets/styles/variables.scss"; 243 @import "@/assets/styles/variables.scss";
244 +.entryDialog {
245 + ::v-deep {
246 + .el-dialog {
247 + margin-top: 5vh !important;
248 + }
249 + }
250 +}
219 </style> 251 </style>
......