公共询价详情过期时间的判断

src/main/webapp/resources/tpl/index/baseInfo/inquiryItem_detail.html

@@ -327,28 +327,11 @@ input[type="radio"], input[type="checkbox"] {
 	color: #d2272d;
 }
 
-.com_title {
-	width: 100%;
-	margin: 0px auto;
-	height: 40px;
-	line-height: 40px;
-	font-size: 14px;
-	color: #323232;
-	background: #f5f5f5;
-}
-
 .com_title font {
 	color: #327ebe;
 }
 
-.com_title01 {
-	height: 50px;
-	line-height: 50px;
-	width: 100%;
-	border-bottom: #3578ba 1px dotted;
-	border-top: #e8e8e8 1px solid;
-	margin-top: -4px;
-} /*  这里修改过 margin-top*/
+ /*  这里修改过 margin-top*/
 .com_title01 span {
 	margin-left: 20px;
 	font-size: 14px;
@@ -465,28 +448,6 @@ input[type="radio"], input[type="checkbox"] {
 	line-height: 50px;
 }
 
-.scroll-y {
-	width: 100%;
-	margin: 0 auto;
-	max-height: 500px;
-}
-
-.scroll-y.active {
-	overflow-y: scroll;
-	overflow-x: hidden;
-}
-
-#resultTop {
-	margin-top: -10px;
-	border-radius: 0px 20px 0px 0px;
-	box-shadow: 0 0 3px #ccc;
-	background: linear-gradient(to top, #e7e7e7 0%, #ffffff 100%);
-	height: 40px;
-	font-size: 14px;
-	line-height: 40px;
-	padding: 0;
-}
-
 #resultTop strong {
 	line-height: 40px;
 	font-weight: bold;
@@ -508,108 +469,6 @@ input[type="radio"], input[type="checkbox"] {
         margin-right: 50px;
         font-size: 14px;
     }
-</style>
-
-<!--<div class="ng-scope" style="width: 1170px; margin-left: -240px;">-->
-    <!--<form name="tenderForm">-->
-        <!--<div class="purc-tender">-->
-            <!--<div class="pub-com_head">-->
-                <!--<span>公共询价单</span>-->
-                <!--<div class="p-right">-->
-                    <!--<span class="fr"><em class="ng-binding">录入人：{{::inquiryItem.inquiry.recorder}}</em><time class="ng-binding">日期：{{::inquiryItem.inquiry.date | date :'yyyy-MM-dd HH:mm'}}</time></span>-->
-                <!--</div>-->
-            <!--</div>-->
-            <!--<div class="tender-content ng-scope">-->
-                <!--<div class="title-div" style="border-bottom: 1px dotted #327ebe;">-->
-                    <!--<span>询价信息</span>&nbsp;-->
-                    <!--<span style="color: rgb(211,37,38);">*</span>-->
-                <!--</div>-->
-                <!--<div class="row base-info">-->
-                    <!--<div class = "col-xs-4">-->
-                        <!--<div class="tender-desc">询价编号：</div>-->
-                        <!--<div ng-bind="::inquiryItem.inquiry.code"></div>-->
-                    <!--</div>-->
-                    <!--<div class = "col-xs-4">-->
-                        <!--<div class="tender-desc">询价企业：</div>-->
-                        <!--<div ng-bind="::inquiryItem.inquiry.enterprise.enName"></div>-->
-                    <!--</div>-->
-                    <!--<div class = "col-xs-4">-->
-                        <!--<div class="tender-desc">联系人：</div>-->
-                        <!--<div ng-bind="::inquiryItem.inquiry.recorder"></div>-->
-                    <!--</div>-->
-                    <!--<div class = "col-xs-4">-->
-                        <!--<div class="tender-desc">联系电话：</div>-->
-                        <!--<div ng-bind="::inquiryItem.inquiry.userBaseInfo.userTel"></div>-->
-                    <!--</div>-->
-                    <!--<div class="col-xs-4">-->
-                        <!--<span class="tender-desc">报价截止时间:</span>-->
-                        <!--<div ng-bind="::inquiryItem.inquiry.endDate | date:'yyyy-MM-dd'"></div>-->
-                    <!--</div>-->
-                    <!--<div class="col-xs-4">-->
-                    <!--</div>-->
-                    <!--<div class="col-xs-12">-->
-                        <!--<div class="tender-desc">附件：</div>-->
-                        <!--<div ng-if="inquiryItem.inquiry.attachs" class="col-xs-10">-->
-                            <!--<a class="file" ng-repeat="attach in inquiryItem.inquiry.attachs" href="file/{{attach.id}}">{{::attach.name}}</a>-->
-                        <!--</div>-->
-                        <!--<div ng-if="inquiryItem.inquiry.attachs == 0" class="col-xs-10" style="color: #959595;">无</div>-->
-                    <!--</div>-->
-                <!--</div>-->
-				<!--<div class="title-div" style="border-bottom: 1px dotted #327ebe;">-->
-                    <!--<span>物料信息</span>&nbsp;-->
-                    <!--<span style="color: rgb(211,37,38);">*</span>-->
-                <!--</div>-->
-                <!--<div class="row base-info">-->
-                    <!--<div class = "col-xs-4">-->
-                        <!--<div class="tender-desc">原厂型号：</div>-->
-                        <!--<div ng-bind="::inquiryItem.product.cmpCode"></div>-->
-                    <!--</div>-->
-                    <!--<div class = "col-xs-4">-->
-                        <!--<div class="tender-desc">品牌：</div>-->
-                        <!--<div ng-bind="::inquiryItem.product.brand"></div>-->
-                    <!--</div>-->
-                    <!--<div class = "col-xs-4">-->
-                        <!--<div class="tender-desc">物料规格：</div>-->
-                        <!--<div ng-bind="::inquiryItem.product.spec"></div>-->
-                    <!--</div>-->
-                    <!--<div class = "col-xs-4">-->
-                        <!--<div class="tender-desc">物料名称：</div>-->
-                        <!--<div ng-bind="::inquiryItem.product.title"></div>-->
-                    <!--</div>-->
-                    <!--<div class = "col-xs-4">-->
-                        <!--<div class="tender-desc">单位：</div>-->
-                        <!--<div ng-bind="::inquiryItem.product.unit"></div>-->
-                    <!--</div>-->
-                    <!--<div class="col-xs-4">-->
-                        <!--<span class="tender-desc">数量:</span>-->
-                        <!--<div ng-bind="::inquiryItem.needquantity"></div>-->
-                    <!--</div>-->
-                   <!--&lt;!&ndash;  <div class="col-xs-4">-->
-                    	<!--<span class="tender-desc">开始时间:</span>-->
-                        <!--<div ng-bind="::inquiryItem.fromDate| date:'yyyy-MM-dd'"></div>-->
-                    <!--</div>-->
-                    <!--<div class="col-xs-4">-->
-                    	<!--<span class="tender-desc">截止时间:</span>-->
-                        <!--<div ng-bind="::inquiryItem.toDate| date:'yyyy-MM-dd'"></div>-->
-                    <!--</div> &ndash;&gt;-->
-                <!--</div>-->
-                <!--<div class="col-xs-12" style="padding: 50px 0;">-->
-                    <!--<div ng-show="!currentHasBid" class="col-xs-2 pull-right btn-publish">-->
-                        <!--<button class="btn" ng-click="transtoInquiry(inquiryItem.id)" ng-disabled="enterprise.uu == inquiryItem.inquiry.enterprise.uu || nowdate > inquiryItem.toDate" ng-hide="inquiryItem.overdue == 1" title="如果询价单已过期，将无法进入报价">我要报价</button>-->
-                    <!--</div>-->
-                    <!--<div class="col-xs-2 pull-right btn-disabled" ng-show="currentHasBid">-->
-                        <!--<button class="btn" ng-disabled="disabled">已转报价</button>-->
-                    <!--</div>-->
-                    <!--<div class="pull-right a-detail" ng-show="currentHasBid">-->
-                        <!--<a ui-sref="sale.pubinquiry_detail({id:id})" target="_self" title="点击查看详情">>>查看详情</a>-->
-                    <!--</div>-->
-                <!--</div>-->
-            <!--</div>-->
-        <!--</div>-->
-    <!--</form>-->
-<!--</div>-->
-
-<style>
     .detail{
         width: 1170px;
         margin-left: -240px;
@@ -733,7 +592,10 @@ input[type="radio"], input[type="checkbox"] {
             <li>
                 <span>企业地址</span><em ng-bind="::inquiryItem.inquiry.ship"></em>
             </li>
-            <li>
+            <li ng-if="inquiryItem.endDate != null">
+                <span>报价截止</span><em ng-bind="::inquiryItem.endDate | date:'yyyy-MM-dd'"></em>
+            </li>
+            <li  ng-if="inquiryItem.endDate == null">
                 <span>报价截止</span><em ng-bind="::inquiryItem.inquiry.endDate | date:'yyyy-MM-dd'"></em>
             </li>
         </ul>