Merge remote-tracking branch 'origin/release-201823-wangcz' into release-201823-wangcz

src/main/webapp/resources/view/sso/ssoAddress.html

@@ -369,7 +369,6 @@
                 </div>
             </div>
             <div class="edit-btn">
-                <button class="btn btn-default" ng-click="reset(myForm)" type="button">取消</button>
                 <button class="btn btn-success" ng-click="save()" type="button">保存</button>
             </div>
         </div>

src/main/webapp/resources/view/sso/ssoInvoice.html

@@ -96,7 +96,7 @@
     text-align: center;
     width: 100px;
     height: 20px;
-    background: #eee;
+    /*background: #eee;*/
     border-top-left-radius: 3px;
     border-top-right-radius: 3px;
     margin-left: 390px;
@@ -718,6 +718,7 @@
             <div class="form-btn">
               <input type="button" value="取消" class="btn" ng-if="invoices.length > 0" ng-click="setChangeBillStatusFlag(false)">
               <input type="submit" value="保存" class="btn"
+                     style="background: #5078cb;border-color: #3b88c3;"
                      ng-click="saveBill(form.$invalid)">
             </div>
           </div>

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>

src/main/webapp/resources/view/usercenter/forstore/buyer_invoice_record.html

@@ -293,7 +293,7 @@
                                             </div>
                                             <div class="clearboth w100" ng-if="item.invoicetype === 1206">
                                                 <div class="pull-left name">订单号: </div>
-                                                <div class="pull-left marginLeft" style="max-width: 224px; max-height: 40px;overflow-y: auto;">
+                                                <div class="pull-left marginLeft" style="max-width: 224px; max-height: 40px;overflow-y: auto;overflow-x: hidden;">
                                                     <p ng-repeat="orderid in item.orderids"><a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a></p>
                                                 </div>
                                             </div>
@@ -321,7 +321,7 @@
                                             </div>
                                             <div class="clearboth w100" ng-if="item.invoicetype === 1205">
                                                 <div class="pull-left name">订单号: </div>
-                                                <div class="pull-left marginLeft" style="max-width: 224px;max-height: 40px;overflow-y: auto;">
+                                                <div class="pull-left marginLeft" style="max-width: 224px;max-height: 40px;overflow-y: auto;overflow-x: hidden;">
                                                     <p ng-repeat="orderid in item.orderids"><a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a></p>
                                                 </div>
                                             </div>

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

@@ -55,7 +55,7 @@
         font-size: 14px;
         color: #666;
         border-bottom: 1px solid #dae5fd;
-        border-right: 1px solid #dae5fd;
+        /*border-right: 1px solid #dae5fd;*/
         height: 40px;
         vertical-align: middle;
         text-align: center;
@@ -458,7 +458,7 @@
                                         </div>
                                         <div class="clearboth w100" ng-if="item.invoicetype !== 1205">
                                             <div class="pull-left name">订单号: </div>
-                                            <div class="pull-left marginLeft" style="max-width: 224px;max-height: 40px;overflow-y: auto;">
+                                            <div class="pull-left marginLeft" style="max-width: 224px;max-height: 40px;overflow-y: auto;overflow-x: hidden;">
                                                 <p ng-repeat="(col,orderid) in item.orderids">
                                                     <a ng-href="vendor#/purchase/detail/{{item.purchaseids[col] | EncryptionFilter}}" ng-bind="orderid" title="{{orderid}}" target="_blank"></a>
                                                     <!--<a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a>-->
@@ -481,7 +481,7 @@
                                         </div>
                                         <div class="clearboth w100" ng-if="item.invoicetype === 1205">
                                             <div class="pull-left name">订单号: </div>
-                                            <div class="pull-left marginLeft" style="max-width: 224px;max-height: 40px;overflow-y: auto;">
+                                            <div class="pull-left marginLeft" style="max-width: 224px;max-height: 40px;overflow-y: auto;overflow-x: hidden;">
                                                 <p ng-repeat="(col,orderid) in item.orderids">
                                                     <a ng-href="vendor#/purchase/detail/{{item.purchaseids[col] | EncryptionFilter}}" ng-bind="orderid" title="{{orderid}}" target="_blank"></a>
                                                     <!--<a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a>-->
@@ -606,7 +606,7 @@
                 </thead>
                 <tbody>
                     <tr ng-repeat="item in billData track by $index">
-                        <td colspan="2" style="position: relative;padding: 0px">
+                        <td colspan="2" style="position: relative;padding: 8px">
                             <div class="clearboth tbpadding" >
                                 <div class="pull-left clearboth" style="margin-bottom: 0px;width: 65%">
                                     <div class="list clearboth pull-left" style="width: 50%">
@@ -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>