验收、验退单据更改字段。

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

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

@@ -83,7 +83,7 @@
 					<tr class="header">
 						<th width="50">序号</th>
 						<th width="180">采购单号</th>
-						<th width="180">产品名称</th>
+						<th width="180">产品</th>
 						<th width="100">品牌</th>
 						<th width="50">单位</th>
 						<th width="60">单价</th>
@@ -105,7 +105,11 @@
 							<a ng-bind="::acceptitem.orderItem.order.code" ui-sref="sale.order_detail({id:acceptitem.orderItem.order.id})"></a>
 						</td>
 						<td class="text-center" width="180">
-							<div><span ng-bind="::acceptitem.orderItem.product.title"></span><span ng-bind="::acceptitem.orderItem.product.cmpcode"></span></div>
+							<div>
+								<span ng-bind="::acceptitem.orderItem.product.code"></span>
+								<span ng-bind="::acceptitem.orderItem.product.title"></span>
+								<span ng-bind="::acceptitem.orderItem.product.cmpcode"></span>
+							</div>
 						</td>
 						<td class="text-center" width="100">
 							<div ng-bind="::acceptitem.orderItem.product.brand"></div>

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

@@ -83,7 +83,7 @@
                 <tr class="header">
                     <th width="50">序号</th>
                     <th width="180">采购单号</th>
-                    <th width="180">产品名称</th>
+                    <th width="180">产品</th>
                     <th width="100">品牌</th>
                     <th width="50">单位</th>
                     <th width="60">单价</th>
@@ -97,7 +97,13 @@
                 <tbody>
                 <tr ng-repeat="returnitem in returns.returnItems| orderBy:'number'" ng-class="{'scoroll':order.orderItems.length>10}">
                     <td width="50"><span ng-bind="::returnitem.number"></span></td>
-                    <td width="180"><span ng-bind="::returnitem.orderItem.order.code"></span></td>
+                    <td width="180">
+                        <div>
+                            <span ng-bind="::acceptitem.orderItem.product.code"></span>
+                            <span ng-bind="::acceptitem.orderItem.product.title"></span>
+                            <span ng-bind="::acceptitem.orderItem.product.cmpcode"></span>
+                        </div>
+                    </td>
                     <td width="180" class="text-center"><span ng-bind="::returnitem.product.title"></span></td>
                     <td width="100" class="text-center"><span ng-bind="::returnitem.product.brand"></span></td>
                     <td width="50" class="text-center"><span ng-bind="::returnitem.product.unit"></span></td>