yangc 7 vuotta sitten
vanhempi
commit
5c25b4a34b

+ 6 - 5
src/main/webapp/resources/view/usercenter/forstore/bomDetail.html

@@ -650,7 +650,7 @@
                 <th width="260">品牌/物料名称</th>
                 <th width="260">型号/规格</th>
                 <th width="110">采购数量(PCS)</th>
-                <th width="120">状态/截止时间</th>
+                <th width="120">状态/截止日期</th>
                 <th width="136">操作</th>
                     <!--
                     <select class="select-adder form-control" ng-model="searchStatus" ng-change="onSearch(searchStatus)">
@@ -703,17 +703,18 @@
                 </td>
                 <td class="left-time">
                     <div class="row-wrap">
-                        <span ng-if="seek.offerAmount == 0" style="color:red;">待报价</span>
-                        <span ng-if="seek.agreed == 0 && seek.offerAmount > 0">已报价</span>
+                        <span ng-if="seek.offerAmount == 0 || !seek.offerAmount" style="color:red;">待报价</span>
+                        <span ng-if="(seek.agreed == 0 || !seek.agreed) && seek.offerAmount > 0">已报价</span>
                         <span ng-if="seek.agreed == 1" style="color:green;">已采纳</span>
-                        <div class="remain" ng-if="seek.remainingTime > 0">
+                        <div style="margin-top: 34px;">{{seek.endDate | date : 'yyyy-MM-dd'}}</div>
+                      <!--  <div class="remain" ng-if="seek.remainingTime > 0">
                             剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" ng-if="getDay(seek.remainingTime) > 0" class="red-text"></span>
                             <i ng-if="getDay(seek.remainingTime) > 0">&nbsp;天&nbsp;</i>
                             <span ng-if="getDay(seek.remainingTime) <= 0" ng-bind="getHours(seek.remainingTime)" class="red-text">5</span>
                             <i ng-if="getDay(seek.remainingTime) <= 0">&nbsp;小时</i>
                         </div>
                         <div class="remain" ng-if="seek.remainingTime <= 0"><span>已截止</span></div>
-                        <div class="remain" ng-if="seek.remainingTime == null"><span>-</span></div>
+                        <div class="remain" ng-if="seek.remainingTime == null"><span>-</span></div>-->
                     </div>
                 </td>
                 <!--<td class="left-time" ng-if="seek.remainingTime > 0">-->