Browse Source

修复验收验退单展示字段的问题

suntg 7 years ago
parent
commit
a2ca74227d

+ 2 - 1
src/main/webapp/resources/tpl/index/sale/accept_detail.html

@@ -103,7 +103,8 @@
 							</div>
 						</td>
 						<td width="180">
-							<a ng-bind="::acceptitem.orderItem.order.code" ui-sref="sale.order_detail({id:acceptitem.orderItem.order.id})"></a>
+							<a ng-if="acceptitem.orderItem" ng-bind="::acceptitem.orderItem.order.code" ui-sref="sale.order_detail({id:acceptitem.orderItem.order.id})"></a>
+							<span ng-if="!acceptitem.orderItem">无关联的采购单</span>
 						</td>
 						<td class="text-center" width="180">
 							<div>

+ 2 - 1
src/main/webapp/resources/tpl/index/sale/return_detail.html

@@ -99,7 +99,8 @@
                 <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">
-                        <a ng-bind="returnitem.orderItem.order.code" ui-sref="sale.order_detail({id:returnitem.orderItem.order.id})" target="_blank"></a>
+                        <a ng-if="returnitem.orderItem" ng-bind="returnitem.orderItem.order.code" ui-sref="sale.order_detail({id:returnitem.orderItem.order.id})" target="_blank"></a>
+                        <span ng-if="!returnitem.orderItem">无关联的采购单</span>
                     </td>
                     <td width="180" class="text-center">
                         <div>

+ 2 - 2
src/main/webapp/resources/tpl/index/sale/returns.html

@@ -234,8 +234,8 @@
 					<div>
 						<span ng-bind="::item.product.title"></span>
 					</div>
-					<div class="text-muted" title="{{::item.orderItem.product.spec}}"
-						ng-bind="::item.orderItem.product.spec"></div>
+					<div class="text-muted" title="{{::item.product.title}}"
+						ng-bind="::item.product.title"></div>
 					<div class="text-bold text-inverse" title="送货工厂"
 						ng-if="item.orderItem.factory">
 						送货工厂:<span ng-bind="::item.orderItem.factory"></span>