Merge branch 'feature/invoice' into release/5.9
Showing
2 changed files
with
10 additions
and
2 deletions
@@ -138,8 +138,7 @@ function setShowInvoiceInfo() { | @@ -138,8 +138,7 @@ function setShowInvoiceInfo() { | ||
138 | _h += '电子发票'; | 138 | _h += '电子发票'; |
139 | } | 139 | } |
140 | 140 | ||
141 | - _h += ' ' + invoiceInfo.titleName + | ||
142 | - ' ' + invoiceInfo.contentName; | 141 | + _h += ' ' + invoiceInfo.titleName; |
143 | 142 | ||
144 | $dom.removeClass('hide').find('span').html(_h); | 143 | $dom.removeClass('hide').find('span').html(_h); |
145 | } | 144 | } |
@@ -771,6 +771,15 @@ | @@ -771,6 +771,15 @@ | ||
771 | padding-right: 20px; | 771 | padding-right: 20px; |
772 | font-size: 14px; | 772 | font-size: 14px; |
773 | 773 | ||
774 | + > span { | ||
775 | + display: inline-block; | ||
776 | + max-width: 300px; | ||
777 | + overflow: hidden; | ||
778 | + text-overflow: ellipsis; | ||
779 | + white-space: nowrap; | ||
780 | + vertical-align: middle; | ||
781 | + } | ||
782 | + | ||
774 | > label { | 783 | > label { |
775 | width: 80px; | 784 | width: 80px; |
776 | height: 24px; | 785 | height: 24px; |
-
Please register or login to post a comment