修复测试提出的部分问题

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

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

@@ -244,9 +244,15 @@
 							class="text-num" ng-bind="::inquiryItem.inquiry.code" href="#"></a></span>
 					</div>
 				</td>
-				<td colspan="3"><a href="#"
+				<td colspan="2"><a href="#"
 					ng-bind="::inquiryItem.inquiry.enterprise.enName"></a></td>
-				<td class="text-right" colspan="2" class="order-sum"><span
+				<td>
+					币别：<span ng-bind="::inquiryItem.currency"></span>
+				</td>
+				<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>
@@ -267,6 +273,9 @@
 					</div>
 					<div class="text-muted"
 						ng-bind="::inquiryItem.product.spec"></div>
+					<div ng-if="inquiryItem.inquiry.attachs.length" class="text-muted">
+						附件：<a class="file" ng-repeat="attach in inquiryItem.inquiry.attachs" href="file/{{attach.id}}">{{::attach.name}}</a>
+					</div>
 				</td>
 				<td class="text-center">
 					<div ng-show="!inquiryItem.$editing">

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

@@ -48,7 +48,7 @@
 	</div>
 	<ul class="list-unstyled">
 		<li ng-class="{'active': active=='inquiry'}"><a ui-sref="sale.inquiry">客户询价管理</a></li>
-		<li ng-class="{'active': active=='quotation'}"><a ui-sref="sale.quotation">主动报价</a></li>
+		<!-- <li ng-class="{'active': active=='quotation'}"><a ui-sref="sale.quotation">主动报价</a></li> -->
 	</ul>
 </div>
 <div class="left-nav">

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

@@ -198,7 +198,7 @@
 	<thead>
 		<tr class="header">
 			<th>商品</th>
-			<th>单价</th>
+			<th width="80">单价</th>
 			<th width="100">数量</th>
 			<th width="120">交货日期</th>
 			<th width="180">回复状态</th>
@@ -211,8 +211,8 @@
 			<td colspan="6">
 				<div>
 					<label><input type="checkbox" class="selector select_all"
-						ng-model="selectAll">全选</label> <a href="javascript:void(0)"
-						class="btn btn-default btn-xs">批量回复</a>
+						ng-model="checkboxes.checked" ng-click="checkAll()">全选</label> <a href="javascript:void(0)"
+						class="btn btn-default btn-xs" ng-click="replyByBatch()">批量回复</a>
 				</div> <!-- 分页 -->
 			</td>
 		</tr>
@@ -225,7 +225,7 @@
 			<td class="first">
 				<div class="order-main">
 					<span> <input type="checkbox" class="selector"
-						ng-model="order.$selected">
+						ng-model="order.$selected" ng-click="checkOne(order)">
 					</span> <span class="text-num text-bold"
 						ng-bind="::order.date | date:'yyyy-MM-dd'"></span> <span>订单号：<a
 						class="text-num" ng-bind="::order.code" href="#"></a></span>
@@ -257,8 +257,10 @@
 				<div class="text-muted"
 					ng-bind="::item.product.spec"></div>
 			</td>
-			<td class="text-center text-num"
-				ng-bind="::item.price"></td>
+			<td class="text-center">
+				<div class="text-num" ng-bind="::item.price"></div>
+				<div class="text-muted">税率：{{::item.taxrate || 0}}%</div>
+			</td>
 			<td class="text-center">
 				<div class="text-num" ng-bind="::item.qty"></div>
 				<div class="text-muted" ng-bind="::item.product.unit"></div>

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

@@ -263,6 +263,9 @@
 				</div>
 				<div class="text-muted" title="{{sample.proofing.product.spec}}"
 					ng-bind="sample.proofing.product.spec"></div>
+				<div ng-if="sample.proofing.envrequiry" title="环保要求">
+					<i class="fa fa-tree fa-fw" style="color: #33CC33;"></i> 环保要求：<span ng-bind="::sample.proofing.envrequiry"></span>
+				</div>
 			</td>
 			<td class="text-center">
 				<div class="text-num text-bold"
@@ -272,7 +275,10 @@
 			<td class="text-center">
 				<div ng-show="sample.proofing.isCharge != '是'" class="label label-default">不收费</div>
 				<div ng-show="sample.proofing.isCharge == '是'" class="text-num">
-					<span ng-bind="sample.price | currency: currency(sample.currency)"></span>
+					<span ng-bind="::sample.price | currency: currency(sample.currency)"></span>
+				</div>
+				<div ng-show="sample.proofing.isCharge == '是'" class="text-muted">
+					税率：<span class="text-num" ng-bind="::sample.taxrate"></span>%
 				</div>
 				<div ng-show="sample.proofing.isCharge == '是'">
 					<br>
@@ -360,7 +366,10 @@
 					<label class="col-md-2 col-sm-2 col">规格：</label>
 					<div class="col-md-4 col-sm-4 col">{{sampleItem.proofing.product.spec}}</div>
 					<label class="col-md-2 col-sm-2 col">数量：</label>
-					<div class="col-md-4 col-sm-4 col">{{sampleItem.qty}} {{sampleItem.proofing.product.unit}}</div>
+					<div class="col-md-4 col-sm-4 col input-group" ng-init="sampleItem.sampleSend.sendQty = sampleItem.qty">
+						<input ng-model="sampleItem.sampleSend.sendQty" class="form-control input-sm" type="number" max="{{sampleItem.qty}}" min="0">
+						<span style="width: 56px;" class="input-group-addon">{{sampleItem.proofing.product.unit}}</span>
+					</div>
 				</div>
 				<div class="row" style="">
 					<label class="col-md-2 col-sm-2 col">送样单号：</label>
@@ -411,7 +420,10 @@
 					<label class="col-md-2 col-sm-2 col">品牌：</label>
 					<div class="col-md-4 col-sm-4 col"><input ng-model="sampleItem.sampleSend.brand" class="form-control input-sm" type="text"></div>
 					<label class="col-md-2 col-sm-2 col">采购单价：</label>
-					<div class="col-md-4 col-sm-4 col"><input ng-model="sampleItem.sampleSend.puprice" class="form-control input-sm" type="number"></div>
+					<div class="col-md-4 col-sm-4 col">
+						<input ng-model="sampleItem.sampleSend.puprice" class="form-control input-sm" type="text" 
+							ng-pattern="/^[1-9]\d*\.\d*|0\.\d*[1-9]\d*$/">
+					</div>
 				</div>
 				<div class="row" style="">
 					<label class="col-md-2 col-sm-2 col">附件：</label>