收料单检验上传

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

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

@@ -337,11 +337,11 @@
 							</div>
 						</div>
 					</div>
-					<div ng-if="item.acceptQty" class="text-success text-center text-bold">
-						客户验收：{{::item.acceptQty}}
+					<div ng-if="item.acceptQty" class="text-success text-center text-bold f14">
+						客户验收：{{::item.acceptQty}}{{::item.product.unit}}
 					</div>
-					<div ng-if="item.returnQty" class="text-error text-center text-bold">
-						客户验退：{{::item.returnQty}}
+					<div ng-if="item.returnQty" class="text-error text-center text-bold f14">
+						客户验退：{{::item.returnQty}}{{::item.product.unit}}
 					</div>
 				</div>
 				<div style="margin: 0 auto" ng-if="item.$editing">

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

@@ -172,11 +172,11 @@
 									ng-model="item.reply.remark" class="form-control input-xs"
 									placeholder="回复备注" />
 							</div>
-							<div ng-if="item.acceptQty" class="text-success text-center text-bold">
-								客户验收：{{::item.acceptQty}}
+							<div ng-if="item.acceptQty" class="text-success text-center text-bold f14">
+								客户验收：{{::item.acceptQty}}{{::item.product.unit}}
 							</div>
-							<div ng-if="item.returnQty" class="text-error text-center text-bold">
-								客户验退：{{::item.returnQty}}
+							<div ng-if="item.returnQty" class="text-error text-center text-bold f14">
+								客户验退：{{::item.returnQty}}{{::item.product.unit}}
 							</div>
 						</td>
 						<td class="text-center">

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

@@ -263,10 +263,35 @@
 				</div>
 			</td>
 			<td class="text-center br-l">
-				<div class="text-num text-bold"
-					title="{{item.qty}}" ng-bind="::item.qty"></div>
-				<div class="text-muted" ng-bind="::item.orderItem.product.unit"></div>
+				<div>
+					<span class="text-num text-bold" title="{{item.qty}}" ng-bind="::item.qty"></span>
+					<span class="text-muted" ng-bind="::item.orderItem.product.unit"></span>
+				</div>
 				<div><code ng-if="item.replyRemark"><i class="fa fa-fw fa-warning"></i><span ng-bind="::item.replyRemark"></span></code></div>
+				<div ng-if="item.verifyQty > 0" class="dropdown text-center">
+					<br>
+					<a href="javascript:void(0);" class="dropdown-toggle text-default">客户已收料{{::item.verifyQty}}{{::item.orderItem.product.unit}}<i class="fa fa-fw fa-angle-down"></i></a>
+					<div class="dropdown-menu pane" style="width: 300px;">
+						<div class="pane-body">
+							<ul class="list-unstyled list-menu">
+								<li ng-repeat="verify in item.verifies">
+									<div class="row row-sm">
+										<div class="col-xs-6">{{::verify.code}}</div>
+										<div class="col-xs-6">检验员：{{::verify.testman}}</div>
+									</div>
+									<div class="row row-sm">
+										<div class="col-xs-4">检验：{{::verify.qty}}</div>
+										<div class="col-xs-4">合格：{{::verify.okQty || 0}}</div>
+										<div class="col-xs-4">不合格：{{::verify.notokQty || 0}}</div>
+									</div>
+									<div class="text-right text-muted">
+										{{::verify.date | date:'MM月dd日 HH:mm:ss'}}
+									</div>
+								</li>
+							</ul>
+						</div>
+					</div>
+				</div>
 			</td>
 			<td class="br-l" colspan="2">
 				<div>单据编号：<a href="#/sale/order/{{::item.orderItem.order.id}}" ng-bind="::item.orderItem.order.code"></a></div>