Browse Source

bom求购、发票

huangb 7 years ago
parent
commit
c93d68e619

+ 8 - 9
src/main/webapp/resources/view/usercenter/forstore/bomDetail.html

@@ -856,11 +856,10 @@
                                                     <!--<span>{{of.replies[0].lapQty}}</span>
                                                     <span>{{of.currency + of.replies[0].price | currencyStr}}</span>-->
                                                 </div>
-                                                <ul class="red-text">
-                                                    <li ng-repeat="re in of.replies track by $Rekey">
-                                                        <span title="{{re.lapQty}}" ng-if="$Rekey === 0">{{re.lapQty}}+</span>
-                                                        <span title="{{re.lapQty}}" ng-if="$Rekey > 0">{{re.lapQty}}+</span>
-                                                        <span title="{{of.currency + re.price | currencyStr}}">{{of.currency + re.price | currencyStr}}+</span>
+                                                <ul class="red-text" style="margin: 0 auto;width: 120px;">
+                                                    <li ng-repeat="re in of.replies" style="line-height: normal;">
+                                                        <span style="display: inline-block;width: 49%;text-align: center;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" ng-bind="re.lapQty" title="{{re.lapQty}}">1+</span>
+                                                        <span style="display: inline-block;width: 49%;text-align: center;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="{{of.currency + re.price | currencyStr}}">{{of.currency + re.price | currencyStr}}</span>
                                                     </li>
                                                 </ul>
                                             </td>
@@ -902,10 +901,10 @@
                                                 <!--<span>{{of.replies[0].lapQty}}</span>
                                                 <span>{{of.currency + of.replies[0].price | currencyStr}}</span>-->
                                             </div>
-                                            <ul class="red-text">
-                                                <li ng-repeat="re in of.replies">
-                                                    <span ng-bind="re.lapQty" title="{{re.lapQty}}">1+</span>
-                                                    <span title="{{of.currency + re.price | currencyStr}}">{{of.currency + re.price | currencyStr}}</span>
+                                            <ul class="red-text" style="margin: 0 auto;width: 120px;">
+                                                <li ng-repeat="re in of.replies" style="line-height: normal;">
+                                                    <span style="display: inline-block;width: 49%;text-align: center;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" ng-bind="re.lapQty" title="{{re.lapQty}}">1+</span>
+                                                    <span style="display: inline-block;width: 49%;text-align: center;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="{{of.currency + re.price | currencyStr}}">{{of.currency + re.price | currencyStr}}</span>
                                                 </li>
                                             </ul>
                                         </td>

+ 2 - 1
src/main/webapp/resources/view/vendor/forstore/vendor-invoice.html

@@ -616,7 +616,8 @@
                                         </div>
                                         <div class="clearboth w100">
                                             <div class="pull-left name">买家: </div>
-                                            <div class="pull-left marginLeft overhidden" title="{{item.submitEnterprise.enName}}&nbsp;&nbsp;|&nbsp;&nbsp;{{item.submiter.userName}}" style="max-width: 224px">{{item.submitEnterprise.enName}}&nbsp;&nbsp;|&nbsp;&nbsp;{{item.submiter.userName}}</div>
+                                            <div class="pull-left marginLeft overhidden" ng-if="item.submitEnterprise.enName" title="{{item.submitEnterprise.enName}}&nbsp;&nbsp;|&nbsp;&nbsp;{{item.submiter.userName}}" style="max-width: 224px">{{item.submitEnterprise.enName}}&nbsp;&nbsp;|&nbsp;&nbsp;{{item.submiter.userName}}</div>
+                                            <div class="pull-left marginLeft overhidden" ng-if="!item.submitEnterprise.enName" title="{{item.submiter.userName}}" style="max-width: 224px">{{item.submiter.userName}}(个人帐户)</div>
                                         </div>
                                         <div class="clearboth w100">
                                             <div class="pull-left name">开票金额: </div>