在询价单中，增加了环保字段和价格类型

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

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

@@ -37,10 +37,18 @@
 			</div>
 		</div>
 		<div class="row row-sm item">
-			<div class="col-xs-6">
+			<div class="col-xs-3">
 				<span class="title">截止报价</span>
 				<div class="content" ng-bind="::inquiry.endDate | date:'yyyy-MM-dd'"></div>
 			</div>
+			<div class="col-xs-3">
+				<span class="title">环保要求</span>
+				<div class="content" ng-bind="::inquiry.environment"></div>
+			</div>
+			<div class="col-xs-6">
+				<span class="title">价格种类</span>
+				<div class="content" ng-bind="::inquiry.priceType"></div>
+			</div>
 		</div>
 		<div class="headerline" ng-if="inquiry.attachs.length">
 			<span class="content">附件</span>

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

@@ -73,6 +73,9 @@
 	.border-success {
 		border-color: #449d44;
 	}
+	.wordspacing25 {
+		word-spacing: 25px;
+	}
 </style>
 <div class="row">
 	<div class="top bold">
@@ -82,7 +85,7 @@
 	<div class="orderInfo">
 		<table>
 			<tr>
-				<td class="va-top text-right" width="50px"><label class="text-black">客户：</label></td>
+				<td class="va-top text-center" width="80px"><label class="text-black wordspacing25">客 户：</label></td>
 				<td>
 					<span ng-bind="purcInquiry.inquiry.enterprise.enName"></span><br>
 					<span class="text-help">{{purcInquiry.inquiry.enterprise.enAddress}} 
@@ -92,14 +95,14 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="va-top text-right"><label class="text-black">单据：</label></td>
+				<td class="va-top text-center"><label class="text-black wordspacing25">单 据：</label></td>
 				<td>
 					<span class="text-num" ng-bind="purcInquiry.inquiry.code"></span> {{purcInquiry.status | status}}<br>
 					<span class="text-help text-num">{{purcInquiry.inquiry.date | date:'yyyy-MM-dd'}} </span>
 				</td>
 			</tr>
 			<tr>
-				<td class="va-top text-right"><label class="text-black">物料：</label></td>
+				<td class="va-top text-center"><label class="text-black wordspacing25">物  料：</label></td>
 				<td>
 					<span ng-bind="purcInquiry.product.title"></span><br>
 					<span class="text-help" ng-bind="purcInquiry.product.spec"></span><br>
@@ -107,16 +110,28 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="va-top text-right"><label class="text-black">币别：</label></td>
+				<td class="va-top text-center"><label class="text-black wordspacing25">币 别：</label></td>
 				<td>
 					<span ng-bind="purcInquiry.currency"></span>
 				</td>
 			</tr>
 			<tr>
-				<td class="va-top text-right"><label class="text-black">税率：</label></td>
+				<td class="va-top text-center"><label class="text-black wordspacing25">税 率：</label></td>
 				<td>
 					<span ng-bind="purcInquiry.taxrate || '(无)'"></span> %
 				</td>
+			</tr>
+			<tr>
+				<td class="va-top text-center"><label class="text-black">环保要求：</label></td>
+				<td>
+					<span ng-bind="purcInquiry.inquiry.environment || '(无)'"></span>
+				</td>
+			</tr>
+			<tr rowspan="2">
+				<td class="va-top text-center"><label class="text-black">价格类型：</label></td>
+				<td>
+					<span ng-bind="purcInquiry.inquiry.priceType || '(无)'"></span>
+				</td>
 			</tr>
 		</table>
 	</div>

src/main/webapp/resources/tpl/index_mobile/sale/inquiry_list.html

@@ -88,13 +88,13 @@
 			<span>状态 | </span>
 			<div class="status" dropdown>
 				<span dropdown-toggle>
-					<span ng-if="_state == 'done'">已回复</span>
+					<span ng-if="_state == 'done'">已报价</span>
 					<span ng-if="_state == 'all'">全部&nbsp;&nbsp;&nbsp;</span>
-					<span ng-if="_state == 'todo'">待回复</span> <i class="fa fa-angle-down"></i></span>
+					<span ng-if="_state == 'todo'">待报价</span> <i class="fa fa-angle-down"></i></span>
 				<ul class="dropdown-menu dropdown-menu-right status-list">
 					<li ng-click="setState('all')">全部</li>
-					<li ng-click="setState('done')">已回复</li>
-					<li ng-click="setState('todo')">待回复</li>
+					<li ng-click="setState('done')">已报价</li>
+					<li ng-click="setState('todo')">待报价</li>
 				</ul>
 			</div>
 		</div>
@@ -118,19 +118,19 @@
 	<li class="list-group-item col-xs-12 order-line" ng-repeat="order in data.content" ui-sref="sale.inquiry_detail({itemId:order.id})">
 		<div class="row">
 			<div class="col-xs-8 text-num text-inverse">{{order.inquiry.code}}</div>
-			<div class="col-xs-4 text-muted f12 text-right">{{order.inquiry.date | date:'MM月dd日'}}</div>
+			<div class="col-xs-4 text-muted f12 text-right">{{order.inquiry.date | date:'yyyy年MM月dd日'}}</div>
 		</div>
 		<div class="row">
 			<div class="col-xs-12 f14 text-light">
 				<span>{{order.inquiry.enterprise.enName}}</span>
 				<span class="pull-right text-num text-right f18">
-					<span ng-if="order.status == 200 && inquiryItem.replyable" class="label label-primary">待报价</span>
+					<span ng-if="order.status == 200 && order.replyable" class="label label-primary">待报价</span>
 					<span ng-if="order.status == 201 && order.agreed == null" class="label label-info">
 						已报价
 					</span>
 					<span ng-if="order.status == 201 && order.agreed == 1" class="label label-success">报价已采纳</span>
 					<span ng-if="order.status == 201 && order.agreed == 0" class="label label-warning">报价未采纳</span>
-					<span ng-if="order.status == 200 && !inquiryItem.replyable" class="label label-default">已过期</span>
+					<span ng-if="order.status == 200 && !order.replyable" class="label label-default">已过期</span>
 				</span>
 			</div>
 			
@@ -141,7 +141,7 @@
 					客户正在审批...
 				</span>
 				<span ng-if="order.status==200" class="pull-right">
-					截止日期：<span ng-bind="order.inquiry.endDate | date:'MM月dd日'"></span>
+					截止日期：<span ng-bind="order.inquiry.endDate | date:'yyyy年MM月dd日'"></span>
 				</span>
 			</div>
 		</div>