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

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

@@ -48,7 +48,7 @@
     }
     .bom-list-detail .bom-info .info-list .info-list-item {
         font-size: 14px;
-        width: 33%;
+        width: 32%;
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
@@ -224,7 +224,7 @@
                     <input class="bom-input" ng-show="editBom" ng-model="tmpEditBom.name" type="text" ng-change="onTmpEditBomChange('name')">
                 </b>
             </li>
-            <li class="info-list-item"><b>本单共<span class="remind" ng-bind="bomData.amount || 0"></span>个产品</b></li>
+            <li class="info-list-item" style="margin-left:20px;"><b>本单共<span class="remind" ng-bind="bomData.amount || 0"></span>个产品</b></li>
             <li class="info-list-item">创建时间：{{bomData.releaseDate | date:'yyyy-MM-dd HH:mm:ss'}}</li>
             <li class="spec info-list-item">规格：
                 <span ng-show="!editBom" ng-bind="bomData.spec || '-'"></span>

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

@@ -1531,7 +1531,7 @@
             <tr ng-repeat="bom in $data">
                 <td ng-click="toBomdetail(bom.id)">
                     <img src="static/img/seekPurchase/Excel.png" alt="">
-                    <div style="width:300px">
+                    <div style="width:275px">
                         <p class="text-ellipse" title="{{bom.remark || bom.name}}" ng-bind="bom.remark || bom.name"></p>
                         <div class="text-ellipse" title="{{bom.spec}}">规格：{{bom.spec || '-'}}</div>
                     </div>
@@ -1546,7 +1546,9 @@
                     <div ng-if="bomTab == 'bomList'" class="middle">
                         <p>本单共<span class="remind-text">{{bom.amount}}</span>个产品</p>
                     </div>
-                    <div ng-bind="(bom.date || bom.releaseDate) | date:'yyyy-MM-dd HH:mm:ss'"></div>
+                    <div>
+                        创建时间：{{(bom.date || bom.releaseDate) | date:'yyyy-MM-dd HH:mm:ss'}}
+                    </div>
                     <a class="fr">查看详情</a>
                 </td>
             </tr>