修改主动报价单显示状态判断条件

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

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

@@ -270,13 +270,13 @@
 				</div>
 			</td>
 			<td class="text-center br-l">
-				<div ng-if="quotationItem.status == 101 && quotationItem.agreed == null" class="block">
+				<div ng-if="quotationItem.status == 101 && quotationItem.quotationItems[0].agreed == null" class="block">
 					<span class="text-trans warning">已提交</span>
 				</div>
-				<div ng-if="quotationItem.status == 101 && quotationItem.agreed == 1" class="block">
+				<div ng-if="quotationItem.status == 101 && quotationItem.quotationItems[0].agreed == 1" class="block">
 					<span class="text-trans success">报价已采纳</span>
 				</div>
-				<div ng-if="quotationItem.status == 101 && quotationItem.agreed == 0" class="block">
+				<div ng-if="quotationItem.status == 101 && quotationItem.quotationItems[0].agreed == 0" class="block">
 					<span class="text-trans error">报价未采纳</span>
 				</div>
 				<div ng-if="quotationItem.status == 100">

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

@@ -86,9 +86,9 @@
 		</div>
 		<div style="position: relative;">
 			<div ng-if="item.quotation.status == 100" class="status">在录入</div>
-			<div ng-if="item.quotation.status == 101 && item.quotation.agreed == null" class="status">已提交</div>
-			<div ng-if="item.quotation.status == 101 && item.quotation.agreed == 1" class="status">报价已采纳</div>
-			<div ng-if="item.quotation.status == 101 && item.quotation.agreed == 0" class="status">报价未采纳</div>
+			<div ng-if="item.quotation.status == 101 && item.agreed == null" class="status">已提交</div>
+			<div ng-if="item.quotation.status == 101 && item.agreed == 1" class="status">报价已采纳</div>
+			<div ng-if="item.quotation.status == 101 && item.agreed == 0" class="status">报价未采纳</div>
 		</div>
 		<div class="form-group form-group-sm" ng-if="item.quotation.code">
 			<label class="col-sm-2 text-right">单据时间</label>