前端调整

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

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

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

@@ -118,20 +118,20 @@
 					<tr ng-repeat="item in change.orderChangeItems track by item.id">
 						<td width="380">
 							<div>
-								<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-num text-bold" ng-class="{'text-inverse'}" ng-bind="::item.oldProduct.code"></span><span class="text-muted">（型号）</span>
 								<span class="text-light">&nbsp;&nbsp;&nbsp;订单第 <span class="text-num">{{::item.orderItemNumber}}</span> 行</span>
 							</div>
+							<!--<div>-->
+								<!--<span class="text-num text-bold"  ng-bind="::item.oldProduct.code"></span>-->
+							<!--</div>-->
 							<div>
-								<span class="text-num text-bold"  ng-bind="::item.oldProduct.code"></span>
+								<span ng-bind="::item.oldProduct.title"></span><span class="text-muted">（名称）</span>
 							</div>
+							<!--<div><span ng-bind="::item.oldProduct.title"></span></div>-->
 							<div>
-								<span ng-bind="::item.newProduct.title"></span><span class="text-muted">（名称）</span>
+								<span ng-class="{'text-inverse'}" ng-bind="::item.oldProduct.spec"></span><span class="text-muted">（规格）</span>
 							</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><span class="text-muted"  ng-bind="::item.oldProduct.spec"></span></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"

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

@@ -327,28 +327,28 @@
 		</tr>
 		<tr class="order-bd" ng-repeat="item in ::change.orderChangeItems">
 			<td class="product">
-				<div ng-show = "item.newProduct.code != null">
-					<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>
+				<div ng-show = "item.oldProduct.code != item.newProduct.code && item.newProduct.code != null">
+					<span class="text-num text-bold" ng-class="{'text-inverse': item.oldProduct.code != item.newProduct.code && item.newProduct.code != null}" 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.newProduct.code == null">
+				<div ng-show = "item.oldProduct.code == item.newProduct.code || item.newProduct.code == null">
 					<span class="text-num text-bold"  ng-bind="::item.oldProduct.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) && (item.newProduct.code != null) ">
 					<s class="text-num text-bold"  ng-bind="::item.oldProduct.code"></s>
 				</div>
-				<div ng-show="item.newProduct.title != null">
-					<span ng-class="{'text-inverse': item.oldProduct.title != item.newProduct.title}" ng-bind="::item.newProduct.title"></span><span class="text-muted">（名称）</span>
+				<div ng-show="item.oldProduct.title != item.newProduct.title && item.newProduct.title != null">
+					<span ng-class="{'text-inverse': item.oldProduct.title != item.newProduct.title && item.newProduct.title != null}" ng-bind="::item.newProduct.title"></span><span class="text-muted">（名称）</span>
 				</div>
-				<div ng-show="item.newProduct.title == null">
+				<div ng-show="item.oldProduct.title == item.newProduct.title || item.newProduct.title == null">
 					<span  ng-bind="::item.oldProduct.title"></span><span class="text-muted">（名称）</span>
 				</div>
 				<div><s ng-show="((item.oldProduct.title != item.newProduct.title) && (item.newProduct.title != null))" ng-bind="::item.oldProduct.title"></s></div>
-				<div ng-show="item.newProduct.spec != null">
-					<span ng-class="{'text-inverse': item.oldProduct.spec != item.newProduct.spec}" ng-bind="::item.newProduct.spec"></span><span class="text-muted">（规格）</span>
+				<div ng-show="item.oldProduct.spec != item.newProduct.spec && item.newProduct.spec != null">
+					<span ng-class="{'text-inverse': item.oldProduct.spec != item.newProduct.spec && item.newProduct.spec != null}" ng-bind="::item.newProduct.spec"></span><span class="text-muted">（规格）</span>
 				</div>
-				<div ng-show="item.newProduct.spec == null">
+				<div ng-show="item.newProduct.spec == item.oldProduct.spec || item.newProduct.spec == null">
 					<span  ng-bind="::item.oldProduct.spec"></span><span class="text-muted">（规格）</span>
 				</div>
 				<div><s class="text-muted" ng-show="((item.oldProduct.spec != item.newProduct.spec) && (item.newProduct.spec != null))" ng-bind="::item.oldProduct.spec"></s></div>

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

@@ -173,7 +173,7 @@
 								<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.newProduct.code == null">
+							<div ng-show="item.newProduct.code == item.oldProduct.code || item.newProduct.code == null">
 								<span class="text-num text-bold"  ng-bind="::item.oldProduct.code"></span><span class="text-muted">（型号）</span>
 								<span class="text-light">&nbsp;&nbsp;&nbsp;订单第 <span class="text-num">{{::item.orderItemNumber}}</span> 行</span>
 							</div>
@@ -183,14 +183,14 @@
 							<div ng-show="(item.oldProduct.title != item.newProduct.title) && (item.newProduct.title != null)">
 								<span ng-class="{'text-inverse': item.oldProduct.title != item.newProduct.title}" ng-bind="::item.newProduct.title"></span><span class="text-muted">（名称）</span>
 							</div>
-							<div ng-show="item.newProduct.title == null">
+							<div ng-show="item.newProduct.title == item.oldProduct.title || item.newProduct.title == null">
 								<span  ng-bind="::item.oldProduct.title"></span><span class="text-muted">（名称）</span>
 							</div>
 							<div><s ng-show="(item.oldProduct.title != item.newProduct.title) && (item.newProduct.title != null)" ng-bind="::item.oldProduct.title"></s></div>
 							<div ng-show="(item.oldProduct.spec != item.newProduct.spec) && (item.newProduct.spec != null)">
 								<span ng-class="{'text-inverse': item.oldProduct.spec != item.newProduct.spec}" ng-bind="::item.newProduct.spec"></span><span class="text-muted">（规格）</span>
 							</div>
-							<div ng-show="item.newProduct.spec == null)">
+							<div ng-show="item.newProduct.spec == item.oldProduct.spec || item.newProduct.spec == null)">
 								<span  ng-bind="::item.oldProduct.spec"></span><span class="text-muted">（规格）</span>
 							</div>
 							<div><s class="text-muted" ng-show="(item.oldProduct.title != item.newProduct.title) && (item.newProduct.title != null)" ng-bind="::item.oldProduct.spec"></s></div>