采购变更单显示调整调整

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

@@ -255,11 +255,13 @@
 			<td colspan="6" class="order-info">
 				 <span><span class="text-bold">币别：</span>
 				 	<span ng-class="{'text-inverse': change.newCurrency != change.oldCurrency}" ng-bind="::change.newCurrency"></span>&nbsp;
-				 	<s class="text-muted" ng-if="change.newCurrency != change.oldCurrency" ng-bind="::change.oldCurrency"></s>&nbsp;&nbsp;&nbsp;&nbsp;
+				 	<s class="text-muted" ng-if="(change.newCurrency != change.oldCurrency) && (change.newCurrency != null)" ng-bind="::change.oldCurrency"></s>
+					<span  ng-if="(change.newCurrency != change.oldCurrency) && (change.newCurrency == null)" ng-bind="::change.oldCurrency"></span>&nbsp;&nbsp;&nbsp;&nbsp;
 				 </span>
 				 <span><span class="text-bold">支付方式：</span>
 				 	<span ng-class="{'text-inverse': change.newPayments != change.oldPayments}" ng-bind="::change.newPayments"></span>&nbsp;
-				 	<s class="text-muted" ng-if="change.newPayments != change.oldPayments" ng-bind="::change.oldPayments"></s>&nbsp;&nbsp;&nbsp;&nbsp;
+				 	<s class="text-muted" ng-if="(change.newPayments != change.oldPayments) && (change.newPayments != null)" ng-bind="::change.oldPayments"></s>
+					<span  ng-if="(change.newPayments != change.oldPayments) && (change.newPayments == null)" ng-bind="::change.oldPayments"></span>&nbsp;&nbsp;&nbsp;&nbsp;
 				 </span>
 				<span><span class="text-bold" ng-if="change.newApVendorName">应付供应商：</span>
 				 	<span ng-class="{'text-inverse': change.apVendorName != change.newApVendorName && change.newApVendorName != null}" ng-bind="::change.newApVendorName"></span>&nbsp;
@@ -317,34 +319,47 @@
 					ng-class="{'text-inverse': item.newPrice != item.oldPrice}"
 					title="{{item.newPrice}}" ng-bind="::item.newPrice | number:6"></div>
 				<div ng-if="isUser" ng-class="{'text-inverse': item.newPrice != item.oldPrice}">-</div>
-				<div ng-show="item.newPrice != item.oldPrice">
+				<div ng-show="(item.newPrice != item.oldPrice) && (item.newPrice != null)">
 					<s ng-if="!isUser" class="text-num text-muted" ng-bind="::item.oldPrice | number:6"></s>
 					<s ng-if="isUser" class="text-num text-muted" >-</s>
 				</div>
+				<div ng-show="(item.newPrice != item.oldPrice) && (item.newPrice == null)">
+					<span ng-if="!isUser"  ng-bind="::item.oldPrice | number:6"></span>
+					<span ng-if="isUser"  >-</span>
+				</div>
 				<div class="text-muted">
-					税率 <span class="text-num" ng-class="{'text-inverse': item.newTaxrate != item.oldTaxrate}">
+					税率 <span ng-show="item.newTaxrate != item.oldTaxrate && item.newTaxrate != null"><span class="text-num" ng-class="{'text-inverse': item.newTaxrate != item.oldTaxrate && item.newTaxrate != null}">
 						{{::item.newTaxrate}}%
-					</span> <s ng-if="item.newTaxrate != item.oldTaxrate">{{::item.oldTaxrate}}%</s>
+					</span> </span><s ng-if="(item.newTaxrate != item.oldTaxrate) && (item.newTaxrate != null)">{{::item.oldTaxrate}}%</s>
+					<span ng-if="(item.newTaxrate != item.oldTaxrate) && (item.newTaxrate == null)">{{::item.oldTaxrate}}%</span>
 				</div>
 			</td>
 			<td class="text-center">
 				<div class="text-num"
 					ng-class="{'text-inverse': item.newQty != item.oldQty}"
 					title="{{item.newQty}}" ng-bind="::item.newQty"></div>
-				<div ng-show="item.newQty != item.oldQty">
+				<div ng-show="item.newQty != item.oldQty && item.newQty != null">
 					<s class="text-num text-muted" title="{{item.oldQty}}"
 						ng-bind="::item.oldQty"></s>
 				</div>
+				<div ng-show="item.newQty != item.oldQty && item.newQty == null">
+					<span  title="{{item.oldQty}}"
+					   ng-bind="::item.oldQty"></span>
+				</div>
 				<div class="text-muted" ng-bind="::item.newProduct.unit"></div>
 			</td>
 			<td class="text-center br-l">
 				<div class="text-num"
 					ng-class="{'text-inverse': item.newDelivery != item.oldDelivery}"
 					ng-bind="::item.newDelivery | date:'yyyy-MM-dd'"></div>
-				<div ng-show="item.newDelivery != item.oldDelivery">
+				<div ng-show="item.newDelivery != item.oldDelivery && item.newDelivery != null">
 					<s class="text-num text-muted"
 						ng-bind="::item.oldDelivery | date:'yyyy-MM-dd'"></s>
 				</div>
+				<div ng-show="item.newDelivery != item.oldDelivery && item.newDelivery == null">
+					<span
+					   ng-bind="::item.oldDelivery | date:'yyyy-MM-dd'"></span>
+				</div>
 			</td>
 			<td class="text-center br-l" colspan="2">
 				<div ng-bind="::item.description"></div>

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

@@ -60,8 +60,10 @@
 				<div class="content">
 					<span ng-class="{'text-inverse': change.newCurrency != change.oldCurrency}"
 						ng-bind="::change.newCurrency"></span> 
-					<s ng-show="change.newCurrency != change.oldCurrency"
+					<s ng-show="(change.newCurrency != change.oldCurrency)  && (change.newCurrency != null)"
 						class="text-muted" ng-bind="::change.oldCurrency"></s>
+					<span ng-show="(change.newCurrency != change.oldCurrency)  && (change.newCurrency == null)"
+					    ng-bind="::change.oldCurrency"></span>
 				</div>
 			</div>
 			<div class="col-xs-3">
@@ -70,8 +72,10 @@
 					<span
 						ng-class="{'text-inverse': change.newRate != change.oldRate}"
 						ng-bind="::change.newRate"></span> <s
-						ng-show="change.newRate != change.oldRate" class="text-muted"
-						ng-bind="::change.oldRate"></s>
+						ng-show="(change.newRate != change.oldRate)  && (change.newRate != null)" class="text-muted"
+						ng-bind="::change.oldRate"></s> <span
+						ng-show="(change.newRate != change.oldRate)  && (change.newRate == null)"
+						ng-bind="::change.oldRate"></span>
 				</div>
 			</div>
 			<div class="col-xs-6">
@@ -79,8 +83,10 @@
 				<div class="content">
 					<span ng-class="{'text-inverse': change.newPayments != change.oldPayments}"
 						ng-bind="::change.newPayments"></span> 
-					<s ng-show="change.newPayments != change.oldPayments"
+					<s ng-show="change.newPayments != change.oldPayments && change.newPayments != null"
 						class="text-muted" ng-bind="::change.oldPayments"></s>
+					<span ng-show="change.newPayments != change.oldPayments && change.newPayments == null"
+					    ng-bind="::change.oldPayments"></span>
 				</div>
 			</div>
 			<div class="col-xs-12">
@@ -132,34 +138,47 @@
 								ng-class="{'text-inverse': item.newPrice != item.oldPrice}"
 								title="{{item.newPrice}}" ng-bind="::item.newPrice | number:6"></div>
 							<div ng-if="isUser" ng-class="{'text-inverse': item.newPrice != item.oldPrice}">-</div>
-							<div ng-show="item.newPrice != item.oldPrice">
+							<div ng-show="item.newPrice != item.oldPrice && item.newPrice != null">
 								<s ng-if="!isUser" class="text-num text-muted" ng-bind="::item.oldPrice | number:6"></s>
 								<s ng-if="isUser" class="text-num text-muted" >-</s>
 							</div>
+							<div ng-show="item.newPrice != item.oldPrice && item.newPrice == null">
+								<span ng-if="!isUser"  ng-bind="::item.oldPrice | number:6"></span>
+								<span ng-if="isUser"  >-</span>
+							</div>
 							<div class="text-muted">
-								税率 <span class="text-num" ng-class="{'text-inverse': item.newTaxrate != item.oldTaxrate}">
-									{{::item.newTaxrate}}%
-								</span> <s ng-if="item.newTaxrate != item.oldTaxrate">{{::item.oldTaxrate}}%</s>
+								税率 <span ng-show="item.newTaxrate != item.oldTaxrate && item.newTaxrate != null"><span class="text-num" ng-class="{'text-inverse': item.newTaxrate != item.oldTaxrate && item.newTaxrate != null}">
+						{{::item.newTaxrate}}%
+					</span> </span><s ng-if="(item.newTaxrate != item.oldTaxrate) && (item.newTaxrate != null)">{{::item.oldTaxrate}}%</s>
+								<span ng-if="(item.newTaxrate != item.oldTaxrate) && (item.newTaxrate == null)">{{::item.oldTaxrate}}%</span>
 							</div>
 						</td>
 						<td class="text-center" width="60">
 							<div class="text-num"
 								ng-class="{'text-inverse': item.newQty != item.oldQty}"
 								title="{{item.newQty}}" ng-bind="::item.newQty"></div>
-							<div ng-show="item.newQty != item.oldQty">
+							<div ng-show="item.newQty != item.oldQty && item.newQty != null">
 								<s class="text-num text-muted" title="{{item.oldQty}}"
 									ng-bind="::item.oldQty"></s>
 							</div>
+							<div ng-show="item.newQty != item.oldQty && item.newQty == null">
+								<span  title="{{item.oldQty}}"
+						   		ng-bind="::item.oldQty"></span>
+							</div>
 							<div class="text-muted" ng-bind="::item.newProduct.unit"></div>
 						</td>
 						<td class="text-center" width="120">
 							<div class="text-num"
 								ng-class="{'text-inverse': item.newDelivery != item.oldDelivery}"
 								ng-bind="::item.newDelivery | date:'yyyy-MM-dd'" style="width: 100%"></div>
-							<div ng-show="item.newDelivery != item.oldDelivery">
+							<div ng-show="item.newDelivery != item.oldDelivery && item.newDelivery != null">
 								<s class="text-num text-muted"
 									ng-bind="::item.oldDelivery | date:'yyyy-MM-dd'"></s>
 							</div>
+							<div ng-show="item.newDelivery != item.oldDelivery && item.newDelivery == null">
+					<span
+							ng-bind="::item.oldDelivery | date:'yyyy-MM-dd'"></span>
+							</div>
 						</td>
 						<td colspan="2" width="210">
 							<div ng-bind="change.description"></div>

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

@@ -279,7 +279,8 @@
 			<td colspan="6" class="order-info">
 				 <span><span class="text-bold">币别：</span>
 				 	<span ng-class="{'text-inverse': change.newCurrency != change.oldCurrency}" ng-bind="::change.newCurrency"></span>&nbsp;
-				 	<s class="text-muted" ng-if="change.newCurrency != change.oldCurrency" ng-bind="::change.oldCurrency"></s>&nbsp;&nbsp;&nbsp;&nbsp;
+				 	<s class="text-muted" ng-if="(change.newCurrency != change.oldCurrency) && (change.newCurrency != null)" ng-bind="::change.oldCurrency"></s>
+					<s class="text-muted" ng-if="(change.newCurrency != change.oldCurrency) && (change.newCurrency == null)" ng-bind="::change.oldCurrency"></s>
 				 </span>
 				<!-- <span><span class="text-bold">汇率：</span>
 				 	<span ng-class="{'text-inverse': change.newRate != change.oldRate}" ng-bind="::change.newRate"></span>&nbsp;
@@ -287,7 +288,8 @@
 				 </span>-->
 				 <span><span class="text-bold">支付方式：</span>
 				 	<span ng-class="{'text-inverse': change.newPayments != change.oldPayments}" ng-bind="::change.newPayments"></span>&nbsp;
-				 	<s class="text-muted" ng-if="change.newPayments != change.oldPayments" ng-bind="::change.oldPayments"></s>&nbsp;&nbsp;&nbsp;&nbsp;
+				 	<s class="text-muted" ng-if="(change.newPayments != change.oldPayments) && (change.newPayments != null)" ng-bind="::change.oldPayments"></s>
+					<s class="text-muted" ng-if="(change.newPayments != change.oldPayments) && (change.newPayments == null)" ng-bind="::change.oldPayments"></s>&nbsp;&nbsp;&nbsp;&nbsp;
 				 </span>
 				<span><span class="text-bold" ng-if="change.newApVendorName || change.newApVendorName == null">应付供应商：</span>
 				 	<span ng-class="{'text-inverse': change.apVendorName != change.newApVendorName && change.newApVendorName != null}" ng-bind="::change.newApVendorName"></span>&nbsp;
@@ -356,34 +358,47 @@
 					ng-class="{'text-inverse': item.newPrice != item.oldPrice}"
 					title="{{item.newPrice}}" ng-bind="::item.newPrice | number:6"></div>
 				<div ng-if="isUser" ng-class="{'text-inverse': item.newPrice != item.oldPrice}">-</div>
-				<div ng-show="item.newPrice != item.oldPrice">
+				<div ng-show="(item.newPrice != item.oldPrice) && (item.newPrice != null)">
 					<s ng-if="!isUser" class="text-num text-muted" ng-bind="::item.oldPrice | number:6"></s>
 					<s ng-if="isUser" class="text-num text-muted" >-</s>
 				</div>
+				<div ng-show="(item.newPrice != item.oldPrice) && (item.newPrice == null)">
+					<span ng-if="!isUser"  ng-bind="::item.oldPrice | number:6"></span>
+					<span ng-if="isUser"  >-</span>
+				</div>
 				<div class="text-muted">
-					税率 <span class="text-num" ng-class="{'text-inverse': item.newTaxrate != item.oldTaxrate}">
+					税率 <span ng-show="item.newTaxrate != item.oldTaxrate && item.newTaxrate != null"><span class="text-num" ng-class="{'text-inverse': item.newTaxrate != item.oldTaxrate && item.newTaxrate != null}">
 						{{::item.newTaxrate}}%
-					</span> <s ng-if="item.newTaxrate != item.oldTaxrate">{{::item.oldTaxrate}}%</s>
+					</span> </span><s ng-if="(item.newTaxrate != item.oldTaxrate) && (item.newTaxrate != null)">{{::item.oldTaxrate}}%</s>
+					<span ng-if="(item.newTaxrate != item.oldTaxrate) && (item.newTaxrate == null)">{{::item.oldTaxrate}}%</span>
 				</div>
 			</td>
 			<td class="text-center">
 				<div class="text-num"
 					ng-class="{'text-inverse': item.newQty != item.oldQty}"
 					title="{{item.newQty}}" ng-bind="::item.newQty"></div>
-				<div ng-show="item.newQty != item.oldQty">
+				<div ng-show="item.newQty != item.oldQty  && item.newQty != null">
 					<s class="text-num text-muted" title="{{item.oldQty}}"
 						ng-bind="::item.oldQty"></s>
 				</div>
+				<div ng-show="item.newQty != item.oldQty && item.newQty == null">
+					<span  title="{{item.oldQty}}"
+						   ng-bind="::item.oldQty"></span>
+				</div>
 				<div class="text-muted" ng-bind="::item.newProduct.unit"></div>
 			</td>
 			<td class="text-center br-l">
 				<div class="text-num"
 					ng-class="{'text-inverse': item.newDelivery != item.oldDelivery}"
 					ng-bind="::item.newDelivery | date:'yyyy-MM-dd'"></div>
-				<div ng-show="item.newDelivery != item.oldDelivery">
+				<div ng-show="item.newDelivery != item.oldDelivery && item.newDelivery != null">
 					<s class="text-num text-muted"
 						ng-bind="::item.oldDelivery | date:'yyyy-MM-dd'"></s>
 				</div>
+				<div ng-show="item.newDelivery != item.oldDelivery && item.newDelivery == null">
+					<span
+							ng-bind="::item.oldDelivery | date:'yyyy-MM-dd'"></span>
+				</div>
 			</td>
 			<td class="text-center br-l" colspan="2">
 				<div ng-bind="::item.description"></div>

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

@@ -79,8 +79,10 @@
 				<div class="content">
 					<span ng-class="{'text-inverse': change.newCurrency != change.oldCurrency}"
 						ng-bind="::change.newCurrency"></span> 
-					<s ng-show="change.newCurrency != change.oldCurrency"
+					<s ng-show="(change.newCurrency != change.oldCurrency)  && (change.newCurrency != null)"
 						class="text-muted" ng-bind="::change.oldCurrency"></s>
+					<span ng-show="(change.newCurrency != change.oldCurrency)  && (change.newCurrency == null)"
+						  ng-bind="::change.oldCurrency"></span>
 				</div>
 			</div>
 			<div class="col-xs-3">
@@ -89,8 +91,10 @@
 					<span
 						ng-class="{'text-inverse': change.newRate != change.oldRate}"
 						ng-bind="::change.newRate"></span> <s
-						ng-show="change.newRate != change.oldRate" class="text-muted"
-						ng-bind="::change.oldRate"></s>
+						ng-show="(change.newRate != change.oldRate) && (change.newRate != null)" class="text-muted"
+						ng-bind="::change.oldRate"></s> <span
+						ng-show="(change.newRate != change.oldRate)  && (change.newRate == null)"
+						ng-bind="::change.oldRate"></span>
 				</div>
 			</div>
 			<div class="col-xs-6">
@@ -98,8 +102,10 @@
 				<div class="content">
 					<span ng-class="{'text-inverse': change.newPayments != change.oldPayments}"
 						ng-bind="::change.newPayments"></span> 
-					<s ng-show="change.newPayments != change.oldPayments"
+					<s ng-show="change.newPayments != change.oldPayments && change.newPayments != null"
 						class="text-muted" ng-bind="::change.oldPayments"></s>
+					<span ng-show="change.newPayments != change.oldPayments && change.newPayments == null"
+						  ng-bind="::change.oldPayments"></span>
 				</div>
 			</div>
 			<div class="col-xs-12">
@@ -199,29 +205,38 @@
 								<s ng-if="isUser" class="text-num text-muted" >-</s>
 							</div>
 							<div class="text-muted">
-								税率 <span class="text-num" ng-class="{'text-inverse': item.newTaxrate != item.oldTaxrate}">
-									{{::item.newTaxrate}}%
-								</span> <s ng-if="item.newTaxrate != item.oldTaxrate">{{::item.oldTaxrate}}%</s>
+								税率 <span ng-show="item.newTaxrate != item.oldTaxrate && item.newTaxrate != null"><span class="text-num" ng-class="{'text-inverse': item.newTaxrate != item.oldTaxrate && item.newTaxrate != null}">
+						{{::item.newTaxrate}}%
+					</span> </span><s ng-if="(item.newTaxrate != item.oldTaxrate) && (item.newTaxrate != null)">{{::item.oldTaxrate}}%</s>
+								<span ng-if="(item.newTaxrate != item.oldTaxrate) && (item.newTaxrate == null)">{{::item.oldTaxrate}}%</span>
 							</div>
 						</td>
 						<td class="text-center" width="60">
 							<div class="text-num"
 								ng-class="{'text-inverse': item.newQty != item.oldQty}"
 								title="{{item.newQty}}" ng-bind="::item.newQty"></div>
-							<div ng-show="item.newQty != item.oldQty">
+							<div ng-show="item.newQty != item.oldQty && item.newQty != null">
 								<s class="text-num text-muted" title="{{item.oldQty}}"
 									ng-bind="::item.oldQty"></s>
 							</div>
+							<div ng-show="item.newQty != item.oldQty && item.newQty == null">
+								<span  title="{{item.oldQty}}"
+									   ng-bind="::item.oldQty"></span>
+							</div>
 							<div class="text-muted" ng-bind="::item.newProduct.unit"></div>
 						</td>
 						<td class="text-center" width="120">
 							<div class="text-num"
 								ng-class="{'text-inverse': item.newDelivery != item.oldDelivery}"
 								ng-bind="::item.newDelivery | date:'yyyy-MM-dd'" style="width: 100%"></div>
-							<div ng-show="item.newDelivery != item.oldDelivery">
+							<div ng-show="item.newDelivery != item.oldDelivery && item.newDelivery != null">
 								<s class="text-num text-muted"
 									ng-bind="::item.oldDelivery | date:'yyyy-MM-dd'"></s>
 							</div>
+							<div ng-show="item.newDelivery != item.oldDelivery && item.newDelivery == null">
+					<span
+							ng-bind="::item.oldDelivery | date:'yyyy-MM-dd'"></span>
+							</div>
 						</td>
 						<td colspan="2" width="210">
 							<div ng-bind="change.description"></div>