出入库单与订单关联

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

src/main/webapp/resources/tpl/index/qc/badIn.html

@@ -261,7 +261,7 @@
 					ng-bind="::item.batchCode"></div>
 			</td>
 			<td class="br-l" colspan="2">
-				<div>单据编号：<a ng-bind="::item.orderItem.order.code"></a></div>
+				<div>单据编号：<a ui-sref="sale.order_detail({id:item.orderItem.order.id})" ng-bind="::item.orderItem.order.code"></a></div>
 				<div>
 					第 <span ng-bind="::item.orderItem.number"></span> 行
 					&nbsp;&nbsp;&nbsp;&nbsp;数量：<span ng-bind="::item.orderItem.qty"></span>

src/main/webapp/resources/tpl/index/qc/badOut.html

@@ -261,7 +261,7 @@
 					ng-bind="::item.batchCode"></div>
 			</td>
 			<td class="br-l" colspan="2">
-				<div>单据编号：<a ng-bind="::item.orderItem.order.code"></a></div>
+				<div>单据编号：<a ui-sref="sale.order_detail({id:item.orderItem.order.id})" ng-bind="::item.orderItem.order.code"></a></div>
 				<div>
 					第 <span ng-bind="::item.orderItem.number"></span> 行
 					&nbsp;&nbsp;&nbsp;&nbsp;数量：<span ng-bind="::item.orderItem.qty"></span>

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

@@ -253,7 +253,7 @@
 					ng-bind="item.batchCode"></div>
 			</td>
 			<td class="br-l" colspan="2">
-				<div>单据编号：<a ng-bind="item.orderItem.order.code"></a></div>
+				<div>单据编号：<a  ui-sref="sale.order_detail({id:item.orderItem.order.id})" ng-bind="item.orderItem.order.code"></a></div>
 				<div>
 					第 <span ng-bind="item.orderItem.number"></span> 行
 					&nbsp;&nbsp;&nbsp;&nbsp;数量：<span ng-bind="item.orderItem.qty"></span>

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

@@ -337,10 +337,10 @@
 							</div>
 						</div>
 					</div>
-					<div ng-if="item.acceptQty" class="text-success">
+					<div ng-if="item.acceptQty" class="text-success text-center text-bold">
 						客户验收：{{::item.acceptQty}}
 					</div>
-					<div ng-if="item.returnQty" class="text-error">
+					<div ng-if="item.returnQty" class="text-error text-center text-bold">
 						客户验退：{{::item.returnQty}}
 					</div>
 				</div>

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

@@ -172,6 +172,12 @@
 									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>
+							<div ng-if="item.returnQty" class="text-error text-center text-bold">
+								客户验退：{{::item.returnQty}}
+							</div>
 						</td>
 						<td class="text-center">
 							<div ng-if="item.replyQty>=item.qty" class="block">

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

@@ -253,7 +253,7 @@
 					ng-bind="::item.batchCode"></div>
 			</td>
 			<td class="br-l" colspan="2">
-				<div>单据编号：<a ng-bind="::item.orderItem.order.code"></a></div>
+				<div>单据编号：<a  ui-sref="sale.order_detail({id:item.orderItem.order.id})" ng-bind="::item.orderItem.order.code"></a></div>
 				<div>
 					第 <span ng-bind="::item.orderItem.number"></span> 行
 					&nbsp;&nbsp;&nbsp;&nbsp;数量：<span ng-bind="::item.orderItem.qty"></span>