Browse Source

Merge remote-tracking branch 'origin/liusw-seekpurchae-v2.0.1.13' into liusw-seekpurchase-v2.0.1.13

liusw 8 years ago
parent
commit
36790ae70e

+ 6 - 6
src/main/webapp/resources/view/vendor/forstore/purchaseOffer.html

@@ -234,7 +234,7 @@
         height: 21px;
         line-height: 21px;
     }
-    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.user-name >div {
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td >div {
         width: 100px;
         overflow: hidden;
         text-overflow: ellipsis;
@@ -528,11 +528,11 @@
                     </div>
                 </td>
                 <td class="user-name"><div title="{{seek.userName}}" ng-bind="seek.userName"></div></td>
-                <td ng-bind="seek.code"></td>
-                <td ng-bind="seek.brand"></td>
-                <td ng-bind="seek.encapsulation || '--'"></td>
-                <td ng-bind="seek.produceDate || '--'"></td>
-                <td ng-bind="seek.amount || '--'"></td>
+                <td><div title="{{seek.code}}" ng-bind="seek.code"></div></td>
+                <td><div title="{{seek.brand}}" ng-bind="seek.brand"></div></td>
+                <td><div title="{{seek.encapsulation}}" ng-bind="seek.encapsulation || '--'"></div></td>
+                <td><div title="{{seek.produceDate}}" ng-bind="seek.produceDate || '--'"></div></td>
+                <td><div title="{{seek.amount}}" ng-bind="seek.amount || '--'"></div></td>
                 <td class="unit-price">
                     <span>{{seek.spCurrency + seek.spUnitPrice | currencyStr}}</span>
                 </td>

+ 6 - 6
src/main/webapp/resources/view/vendor/forstore/seekPurchase.html

@@ -177,7 +177,7 @@
         height: 21px;
         line-height: 21px;
     }
-    .seek-purchase .seek-purchase-content >table tbody tr.default-row td.user-name >div {
+    .seek-purchase .seek-purchase-content >table tbody tr.default-row td >div {
         width: 100px;
         overflow: hidden;
         text-overflow: ellipsis;
@@ -463,11 +463,11 @@
                         </div>
                     </td>
                     <td class="user-name"><div title="{{seek.userName}}" ng-bind="seek.userName"></div></td>
-                    <td ng-bind="seek.code || '-'"></td>
-                    <td ng-bind="seek.brand || '-'"></td>
-                    <td ng-bind="seek.encapsulation || '-'"></td>
-                    <td ng-bind="seek.produceDate || '-'"></td>
-                    <td ng-bind="seek.amount || '-'"></td>
+                    <td><div title="{{seek.code}}" ng-bind="seek.code"></div></td>
+                    <td><div title="{{seek.brand}}" ng-bind="seek.brand"></div></td>
+                    <td><div title="{{seek.encapsulation}}" ng-bind="seek.encapsulation || '--'"></div></td>
+                    <td><div title="{{seek.produceDate}}" ng-bind="seek.produceDate || '--'"></div></td>
+                    <td><div title="{{seek.amount}}" ng-bind="seek.amount || '--'"></div></td>
                     <td class="unit-price">
                         <span>{{seek.currency + seek.unitPrice | currencyStr}}</span>
                     </td>