【前台】+【委外加工，验收验退界面 + 送货工厂字段】

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

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

@@ -251,6 +251,7 @@
 					</div>
 					<div class="text-muted" title="{{item.order.product.spec}}"
 						ng-bind="item.order.product.spec"></div>
+					<div class="text-bold text-inverse" ng-if="item.order.factory">送货工厂：<span ng-bind="::item.order.factory"></span></div>
 				</td>
 				<td class="text-center">
 					<div class="text-num" title="{{item.orderPrice}}">

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

@@ -281,6 +281,7 @@
 				<div ng-if="::order.remark" class="text-muted">
 					备注：<span ng-bind="::order.remark"></span>
 				</div>
+				<div class="text-bold text-inverse" ng-if="order.factory">送货工厂：<span ng-bind="::order.factory"></span></div>
 			</td>
 			<td class="text-center">
 				<div class="text-num" ng-bind="::order.price | number:6"></div>

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

@@ -255,6 +255,7 @@
 					</div>
 					<div class="text-muted" title="{{::item.order.product.spec}}"
 						ng-bind="::item.order.product.spec"></div>
+					<div class="text-bold text-inverse" ng-if="item.order.factory">送货工厂：<span ng-bind="::item.order.factory"></span></div>
 				</td>
 				<td class="text-center">
 					<div class="text-num" title="{{::item.order.price}}">

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

@@ -244,6 +244,7 @@
 				</div>
 				<div class="text-muted" title="{{item.orderItem.product.spec}}"
 					ng-bind="item.orderItem.product.spec"></div>
+				<div class="text-bold text-inverse"title="送货工厂"  ng-if="item.orderItem.factory">送货工厂：<span ng-bind="::item.orderItem.factory"></span></div>
 			</td>
 			<td class="text-center">
 				<div class="text-num"

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

@@ -244,6 +244,7 @@
 				</div>
 				<div class="text-muted" title="{{::item.orderItem.product.spec}}"
 					ng-bind="::item.orderItem.product.spec"></div>
+				<div class="text-bold text-inverse"title="送货工厂"  ng-if="item.orderItem.factory">送货工厂：<span ng-bind="::item.orderItem.factory"></span></div>
 			</td>
 			<td class="text-center">
 				<div class="text-num"