采购变更单物料变更内容显示，采购单列表调整

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

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

@@ -314,11 +314,20 @@
 		<tr class="order-bd" ng-repeat="item in ::change.orderChangeItems">
 			<td class="product">
 				<div>
-					<span class="text-num text-bold" ng-bind="::item.newProduct.code"></span>
+					<span class="text-num text-bold" ng-class="{'text-inverse': item.oldProduct.code != item.newProduct.code}" ng-bind="::item.newProduct.code"></span><span class="text-muted">（型号）</span>
 					<span class="text-light">&nbsp;&nbsp;&nbsp;订单第 <span class="text-num">{{::item.orderItemNumber}}</span> 行</span>
 				</div>
-				<div ng-bind="::item.newProduct.title"></div>
-				<div class="text-muted" ng-bind="::item.newProduct.spec"></div>
+				<div ng-show="item.oldProduct.code != item.newProduct.code">
+					<s class="text-num text-bold"  ng-bind="::item.oldProduct.code"></s>
+				</div>
+				<div>
+					<span ng-class="{'text-inverse': item.oldProduct.title != item.newProduct.title}" ng-bind="::item.newProduct.title"></span><span class="text-muted">（名称）</span>
+				</div>
+				<div><s ng-show="item.oldProduct.title != item.newProduct.title" ng-bind="::item.oldProduct.title"></s></div>
+				<div>
+					<span ng-class="{'text-inverse': item.oldProduct.spec != item.newProduct.spec}" ng-bind="::item.newProduct.spec"></span><span class="text-muted">（规格）</span>
+				</div>
+				<div><s class="text-muted" ng-show="item.oldProduct.spec != item.newProduct.spec" ng-bind="::item.oldProduct.spec"></s></div>
 			</td>
 			<td class="text-center">
 				<div class="text-num"

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

@@ -532,7 +532,7 @@
 						</div>
 						<br>
 						<div class="text-left">
-							<a ng-if="item.replyQty < item.qty" ng-click="onReplyClick(item)" class="text-inverse">
+							<a ng-if="(item.replyQty || 0) < item.qty" ng-click="onReplyClick(item)" class="text-inverse">
 								<i class="fa fa-arrow-up"></i> 确认回复
 							</a>
 							<br>