询价单详情单据状态显示修改

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

src/main/webapp/resources/css/index.css

@@ -138,7 +138,7 @@ a.none:hover {
 
 .text-trans {
 	position: absolute;
-	top: 5px;
+	margin-top: 5px;
 	right: 5px;
 	background-color: #fff;
 	border: 1px solid;

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

@@ -294,11 +294,9 @@
 							</div>
 						</td>
 						<td class="text-center" width="75">
-							<div
-								ng-if="inquiryItem.status == 201 && inquiryItem.agreed == null"
-								class="block">
+							<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == null && inquiryItem.invalid != 1" class="block">
 								<span class="text-trans warning">已报价</span>
-								<div ng-if="inquiryItem.replyable" style="padding-top: 50px;">
+								<div ng-if="inquiryItem.inquiry.overdue == 0 && inquiryItem.inquiry.check != 1" style="padding-top: 50px;">
 									<div ng-show="!inquiryItem.$editing">
 										<a ng-click="inquiryItem.$editing=!inquiryItem.$editing">修改报价</a>
 									</div>
@@ -308,48 +306,57 @@
 										</div>
 										<div>
 											<button ng-click="onReplyClick(inquiryItem, true)"
-												ng-disabled="!isValid(inquiryItem, true)"
-												class="btn btn-link btn-xs text-inverse">
+													ng-disabled="!isValid(inquiryItem, true)"
+													class="btn btn-link btn-xs text-inverse">
 												保存并<br>确认报价
 											</button>
 										</div>
 									</div>
 								</div>
-								<div ng-if="inquiryItem.inquiry.check == 1" class="text-muted"
-									style="padding-top: 50px;">
-									客户正在<br>审批...
-								</div>
+								<div ng-if="inquiryItem.inquiry.check == 1" class="text-muted" style="padding-top: 50px;">客户正在<br>审批...</div>
 							</div>
-							<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == 1"
-								class="block">
+							<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == 1 && inquiryItem.invalid != 1" class="block">
 								<span class="text-trans success">已采纳</span>
 							</div>
-							<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == 0"
-								class="block">
+							<div ng-if="inquiryItem.status == 201 && inquiryItem.invalid == 1" class="block">
+								<span class="text-trans text-light">已失效</span>
+							</div>
+							<div ng-if="inquiryItem.status == 314" class="block">
+								<span class="text-trans text-light">已作废</span>
+							</div>
+							<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == 0" class="block">
 								<span class="text-trans error">未采纳</span>
 							</div>
-							<div ng-if="inquiryItem.status == 200 && inquiryItem.inquiry.overdue != 1">
-								<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; cancel()">取消</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.status == 200">
+								<div ng-if="inquiryItem.inquiry.overdue == 0 && inquiryItem.inquiry.check != 1">
+									<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; cancel()">取消</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.inquiry.overdue == 0 && inquiryItem.inquiry.check == 1">
+									<span class="text-trans half">未报价</span>
+									<div class="text-muted" style="padding-top: 50px;">询价单已<br>被提交...</div>
+								</div>
+								<div ng-if="inquiryItem.inquiry.overdue == 1" class="block">
+									<span class="text-trans error">已过期</span>
+								</div>
 							</div>
 						</td>
 					</tr>