采购变更单显示调整

src/main/webapp/resources/tpl/index/purc/change_detail.html

@@ -5,7 +5,7 @@
 </style>
 <div class="pane base-info" id="order-detail-list">
 	<div class="pub-com_head">
-		<span>客户采购变更单</span>
+		<span>采购变更单</span>
 		<div class="p-right">
 			<!-- <a href="#" class="pull-right text-simple"><i
 			class="fa fa-print fa-fw"></i>打印</a> -->
@@ -86,8 +86,8 @@
 			<div class="col-xs-12">
 				<span class="title" ng-if="change.newApVendorName">应付供应商</span>
 				<div class="content">
-				 	<span ng-class="{'text-inverse': change.apVendorName != change.newApVendorName}" ng-bind="::change.newApVendorName"></span>&nbsp;
-				 	<s class="text-muted" ng-if="change.apVendorName != change.newApVendorName" ng-bind="::change.apVendorName"></s>
+				 	<span ng-class="{'text-inverse': change.apVendorName != change.newApVendorName && change.newApVendorName != null}" ng-bind="::change.newApVendorName"></span>&nbsp;
+				 	<s class="text-muted" ng-if="change.apVendorName != change.newApVendorName && change.newApVendorName != null" ng-bind="::change.apVendorName"></s>
 				</div>
 			</div>
 		</div>
@@ -115,17 +115,17 @@
 								<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-show="item.oldProduct.code != item.newProduct.code">
-								<s class="text-num text-bold"  ng-bind="::item.oldProduct.code"></s>
+							<div>
+								<span class="text-num text-bold"  ng-bind="::item.oldProduct.code"></span>
 							</div>
 							<div>
-								<span ng-class="{'text-inverse': item.oldProduct.title != item.newProduct.title}" ng-bind="::item.newProduct.title"></span><span class="text-muted">（名称）</span>
+								<span 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-bind="::item.oldProduct.title"></span></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>
+							<div><span class="text-muted"  ng-bind="::item.oldProduct.spec"></span></div>
 						</td>
 						<td class="text-center" width="100">
 							<div class="text-num" ng-if="!isUser"
@@ -162,7 +162,7 @@
 							</div>
 						</td>
 						<td colspan="2" width="210">
-							<div ng-bind="::item.description"></div>
+							<div ng-bind="change.description"></div>
 							<div ng-if="change.agreed == 1" class="block">
 								<span class="text-trans success">已同意</span>
 							</div>

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

@@ -213,7 +213,7 @@
 							</div>
 						</td>
 						<td colspan="2" width="210">
-							<div ng-bind="::item.description"></div>
+							<div ng-bind="change.description"></div>
 							<div ng-if="change.agreed == 1" class="block">
 								<span class="text-trans success">已同意</span>
 							</div>