询价单超期不允许报价

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@1127 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/model/PurchaseInquiryItem.java

@@ -463,7 +463,7 @@ public class PurchaseInquiryItem {
 	/**
 	 * 是否可报价
 	 * <p>
-	 * 1.未报价
+	 * 1.未报价，未截止报价
 	 * </p>
 	 * <p>
 	 * 2.已报价，未截止报价，客户未提交
@@ -472,9 +472,11 @@ public class PurchaseInquiryItem {
 	 * @return
 	 */
 	public boolean isReplyable() {
-		return this.status == Status.NOT_REPLY.value()
-				|| (this.status == Status.REPLIED.value() && this.inquiry.getEndDate() != null
-						&& DateUtils.compare(this.inquiry.getEndDate(), new Date(), DateUtils.COMPARE_DAY) >= 0
-						&& (this.inquiry.getCheck() == null || this.inquiry.getCheck() != Constant.YES) && this.agreed == null);
+		if (this.inquiry.getEndDate() != null) {
+			return DateUtils.compare(this.inquiry.getEndDate(), new Date(), DateUtils.COMPARE_DAY) >= 0
+					&& (this.status == Status.NOT_REPLY.value() || (this.status == Status.REPLIED.value()
+							&& (this.inquiry.getCheck() == null || this.inquiry.getCheck() != Constant.YES) && this.agreed == null));
+		}
+		return this.status == Status.NOT_REPLY.value();
 	}
 }

src/main/webapp/resources/tpl/index/sale/inquiry.html

@@ -255,10 +255,12 @@
 				<td>
 					税率：<span ng-bind="::inquiryItem.taxrate || 0"></span>%
 				</td>
-				<td class="text-right" colspan="1" class="order-sum"><span
-					class="text-inverse text-bold"
-					ng-bind="::inquiryItem.inquiry.endDate | timespan"></span> <span
-					class="text-muted">后截止报价</span></td>
+				<td class="text-right" colspan="1" class="order-sum">
+					<div ng-if="inquiryItem.replyable">
+						<span class="text-inverse text-bold" ng-bind="::inquiryItem.inquiry.endDate | timespan"></span> 
+						<span class="text-muted">后截止报价</span>
+					</div>
+				</td>
 				<td class="text-center">
 					<div class="operates">
 						<!-- <a ng-click="print(inquiryItem)" class="text-muted" title="打印"><i
@@ -456,26 +458,31 @@
 						<span class="text-trans error">报价未采纳</span>
 					</div>
 					<div ng-if="inquiryItem.status == 200">
-						<div ng-show="!inquiryItem.$editing">
-							<a ng-click="inquiryItem.$editing=!inquiryItem.$editing">报 价</a>
-						</div>
-						<div ng-show="inquiryItem.$editing">
-							<div>
-								<a ng-click="inquiryItem.$editing=!inquiryItem.$editing">取消</a>
-							</div>
-							<div>
-								<button ng-click="onReplyClick(inquiryItem)"
-									ng-disabled="!isValid(inquiryItem)"
-									class="btn btn-link btn-xs text-default">保存</button>
+						<div ng-if="inquiryItem.replyable">
+							<div ng-show="!inquiryItem.$editing">
+								<a ng-click="inquiryItem.$editing=!inquiryItem.$editing">报 价</a>
 							</div>
-							<div>
-								<button ng-click="onReplyClick(inquiryItem, true)"
-									ng-disabled="!isValid(inquiryItem, true)"
-									class="btn btn-link btn-xs text-inverse">
-									保存并<br>确认报价
-								</button>
+							<div ng-show="inquiryItem.$editing">
+								<div>
+									<a ng-click="inquiryItem.$editing=!inquiryItem.$editing">取消</a>
+								</div>
+								<div>
+									<button ng-click="onReplyClick(inquiryItem)"
+										ng-disabled="!isValid(inquiryItem)"
+										class="btn btn-link btn-xs text-default">保存</button>
+								</div>
+								<div>
+									<button ng-click="onReplyClick(inquiryItem, true)"
+										ng-disabled="!isValid(inquiryItem, true)"
+										class="btn btn-link btn-xs text-inverse">
+										保存并<br>确认报价
+									</button>
+								</div>
 							</div>
 						</div>
+						<div ng-if="!inquiryItem.replyable" class="block">
+							<span class="text-trans error">已过期</span>
+						</div>
 					</div>
 				</td>
 			</tr>