采购变更单与采购单解耦

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

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

@@ -193,7 +193,7 @@
 	<thead>
 		<tr class="header">
 			<th>商品</th>
-			<th>单价</th>
+			<th width="100">单价</th>
 			<th>数量</th>
 			<th width="120">交货日期</th>
 			<th width="140">变更内容</th>
@@ -227,11 +227,11 @@
 					</span> <span class="text-num text-bold"
 						ng-bind="::change.date | date:'yyyy-MM-dd'"></span> <span>流水号：<a
 						class="text-num" ng-bind="::change.code" ui-sref="sale.change_detail({id:change.id})" target="_self"></a></span> <span>订单：<a
-						class="text-num text-bold" ng-bind="::change.order.code" ui-sref="sale.order_detail({id:change.order.id})" target="_blank"></a></span>
+						class="text-num text-bold" ng-bind="::change.orderCode" ui-sref="sale.order_detail({id:change.orderId})" target="_blank"></a></span>
 				</div>
 			</td>
 			<td colspan="3"><a
-				ng-bind="::change.order.enterprise.enName"></a></td>
+				ng-bind="::change.enterprise.enName"></a></td>
 			<td colspan="1" class="">
 				<span ng-bind="change.description"></span>
 			</td>
@@ -247,16 +247,16 @@
 		<tr class="order-hd">
 			<td colspan="6" class="order-info">
 				 <span><span class="text-bold">币别：</span>
-				 	<span ng-class="{'text-inverse': change.newCurrency != change.order.currency}" ng-bind="::change.newCurrency"></span>&nbsp;
-				 	<s class="text-muted" ng-if="change.newCurrency != change.order.currency" ng-bind="::change.order.currency"></s>&nbsp;&nbsp;&nbsp;&nbsp;
+				 	<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;
 				 </span>
 				 <span><span class="text-bold">汇率：</span>
-				 	<span ng-class="{'text-inverse': change.newRate != change.order.rate}" ng-bind="::change.newRate"></span>&nbsp;
-				 	<s class="text-muted" ng-if="change.newRate != change.order.rate" ng-bind="::change.order.rate"></s>&nbsp;&nbsp;&nbsp;&nbsp;
+				 	<span ng-class="{'text-inverse': change.newRate != change.oldRate}" ng-bind="::change.newRate"></span>&nbsp;
+				 	<s class="text-muted" ng-if="change.newRate != change.oldRate" ng-bind="::change.order.rate"></s>&nbsp;&nbsp;&nbsp;&nbsp;
 				 </span>
 				 <span><span class="text-bold">支付方式：</span>
-				 	<span ng-class="{'text-inverse': change.newPayments != change.order.payments}" ng-bind="::change.newPayments"></span>&nbsp;
-				 	<s class="text-muted" ng-if="change.newPayments != change.order.payments" ng-bind="::change.order.payments"></s>&nbsp;&nbsp;&nbsp;&nbsp;
+				 	<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;
 				 </span>
 			</td>
 		</tr>
@@ -289,35 +289,43 @@
 		</tr>
 		<tr class="order-bd" ng-repeat="item in ::change.orderChangeItems">
 			<td class="product">
-				<div class="text-num text-bold" ng-bind="::item.newProduct.code"></div>
+				<div>
+					<span class="text-num text-bold" ng-bind="::item.newProduct.code"></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>
 			</td>
 			<td class="text-center">
 				<div class="text-num"
-					ng-class="{'text-inverse': item.newPrice != item.orderItem.price}"
+					ng-class="{'text-inverse': item.newPrice != item.oldPrice}"
 					title="{{item.newPrice}}" ng-bind="::item.newPrice | number:6"></div>
-				<div ng-show="item.newPrice != item.orderItem.price">
-					<s class="text-num text-muted" ng-bind="::item.orderItem.price | number:6"></s>
+				<div ng-show="item.newPrice != item.oldPrice">
+					<s class="text-num text-muted" ng-bind="::item.oldPrice | number:6"></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>
 				</div>
 			</td>
 			<td class="text-center">
 				<div class="text-num"
-					ng-class="{'text-inverse': item.newQty != item.orderItem.qty}"
+					ng-class="{'text-inverse': item.newQty != item.oldQty}"
 					title="{{item.newQty}}" ng-bind="::item.newQty"></div>
-				<div ng-show="item.newQty != item.orderItem.qty">
-					<s class="text-num text-muted" title="{{item.orderItem.qty}}"
-						ng-bind="::item.orderItem.qty"></s>
+				<div ng-show="item.newQty != item.oldQty">
+					<s class="text-num text-muted" title="{{item.oldQty}}"
+						ng-bind="::item.oldQty"></s>
 				</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.orderItem.delivery}"
+					ng-class="{'text-inverse': item.newDelivery != item.oldDelivery}"
 					ng-bind="::item.newDelivery | date:'yyyy-MM-dd'"></div>
-				<div ng-show="item.newDelivery != item.orderItem.delivery">
+				<div ng-show="item.newDelivery != item.oldDelivery">
 					<s class="text-num text-muted"
-						ng-bind="::item.orderItem.delivery | date:'yyyy-MM-dd'"></s>
+						ng-bind="::item.oldDelivery | date:'yyyy-MM-dd'"></s>
 				</div>
 			</td>
 			<td class="text-center br-l" colspan="2">

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

@@ -18,7 +18,7 @@
 			</div>
 			<div class="col-xs-6">
 				<span class="title">客户</span>
-				<div class="content" ng-bind="::change.order.enterprise.enName"></div>
+				<div class="content" ng-bind="::change.enterprise.enName"></div>
 			</div>
 		</div>
 		<div class="row row-sm item">
@@ -38,11 +38,11 @@
 			<div class="col-xs-3">
 				<span class="title">采购单号</span>
 				<div class="content">
-					<a ng-bind="::change.order.code"
-						ui-sref="sale.order_detail({id:change.order.id})" target="_blank"></a>
+					<a ng-bind="::change.orderCode"
+						ui-sref="sale.order_detail({id:change.orderId})" target="_blank"></a>
 				</div>
 			</div>
-			<div class="col-xs-3">
+			<!-- <div class="col-xs-3">
 				<span class="title">日期</span>
 				<div class="content"
 					ng-bind="::change.order.date | date:'yyyy-MM-dd'"></div>
@@ -50,9 +50,9 @@
 			<div class="col-xs-3">
 				<span class="title">采购类型</span>
 				<div class="content" ng-bind="::change.order.type"></div>
-			</div>
+			</div> -->
 		</div>
-		<div class="row row-sm item">
+		<!-- <div class="row row-sm item">
 			<div class="col-xs-3">
 				<span class="title">采购员</span>
 				<div class="content" ng-bind="::change.order.user.userName"></div>
@@ -61,7 +61,7 @@
 				<span class="title">交货地址</span>
 				<div class="content" ng-bind="::change.order.shipAddress"></div>
 			</div>
-		</div>
+		</div> -->
 		<div class="headerline">
 			<span class="index">3</span> <span class="content">交易信息变更</span>
 		</div>
@@ -69,31 +69,29 @@
 			<div class="col-xs-3">
 				<span class="title">币别</span>
 				<div class="content">
-					<span
-						ng-class="{'text-inverse': change.newCurrency != change.order.currency}"
-						ng-bind="::change.newCurrency"></span> <s
-						ng-show="change.newCurrency != change.order.currency"
-						class="text-muted" ng-bind="::change.order.currency"></s>
+					<span ng-class="{'text-inverse': change.newCurrency != change.oldCurrency}"
+						ng-bind="::change.newCurrency"></span> 
+					<s ng-show="change.newCurrency != change.oldCurrency"
+						class="text-muted" ng-bind="::change.oldCurrency"></s>
 				</div>
 			</div>
 			<div class="col-xs-3">
 				<span class="title">汇率</span>
 				<div class="text-num content">
 					<span
-						ng-class="{'text-inverse': change.newRate != change.order.rate}"
+						ng-class="{'text-inverse': change.newRate != change.oldRate}"
 						ng-bind="::change.newRate"></span> <s
-						ng-show="change.newRate != change.order.rate" class="text-muted"
-						ng-bind="::change.order.rate"></s>
+						ng-show="change.newRate != change.oldRate" class="text-muted"
+						ng-bind="::change.oldRate"></s>
 				</div>
 			</div>
 			<div class="col-xs-6">
 				<span class="title">付款方式</span>
 				<div class="content">
-					<span
-						ng-class="{'text-inverse': change.newPayments != change.order.payments}"
-						ng-bind="::change.newPayments"></span> <s
-						ng-show="change.newPayments != change.order.payments"
-						class="text-muted" ng-bind="::change.order.payments"></s>
+					<span ng-class="{'text-inverse': change.newPayments != change.oldPayments}"
+						ng-bind="::change.newPayments"></span> 
+					<s ng-show="change.newPayments != change.oldPayments"
+						class="text-muted" ng-bind="::change.oldPayments"></s>
 				</div>
 			</div>
 		</div>
@@ -138,7 +136,7 @@
 				<thead>
 					<tr class="header">
 						<th>商品</th>
-						<th>单价</th>
+						<th width="100">单价</th>
 						<th>数量</th>
 						<th width="120">交货日期</th>
 						<th width="140">变更内容</th>
@@ -148,35 +146,43 @@
 				<tbody>
 					<tr ng-repeat="item in change.orderChangeItems track by item.id">
 						<td>
-							<div class="text-num text-bold" ng-bind="::item.newProduct.code"></div>
+							<div>
+								<span class="text-num text-bold" ng-bind="::item.newProduct.code"></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>
 						</td>
 						<td class="text-center">
 							<div class="text-num"
-								ng-class="{'text-inverse': item.newPrice != item.orderItem.price}"
+								ng-class="{'text-inverse': item.newPrice != item.oldPrice}"
 								title="{{item.newPrice}}" ng-bind="::item.newPrice | number:6"></div>
-							<div ng-show="item.newPrice != item.orderItem.price">
-								<s class="text-num text-muted" ng-bind="::item.orderItem.price | number:6"></s>
+							<div ng-show="item.newPrice != item.oldPrice">
+								<s class="text-num text-muted" ng-bind="::item.oldPrice | number:6"></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>
 							</div>
 						</td>
 						<td class="text-center">
 							<div class="text-num"
-								ng-class="{'text-inverse': item.newQty != item.orderItem.qty}"
+								ng-class="{'text-inverse': item.newQty != item.oldQty}"
 								title="{{item.newQty}}" ng-bind="::item.newQty"></div>
-							<div ng-show="item.newQty != item.orderItem.qty">
-								<s class="text-num text-muted" title="{{item.orderItem.qty}}"
-									ng-bind="::item.orderItem.qty"></s>
+							<div ng-show="item.newQty != item.oldQty">
+								<s class="text-num text-muted" title="{{item.oldQty}}"
+									ng-bind="::item.oldQty"></s>
 							</div>
 							<div class="text-muted" ng-bind="::item.newProduct.unit"></div>
 						</td>
 						<td class="text-center">
 							<div class="text-num"
-								ng-class="{'text-inverse': item.newDelivery != item.orderItem.delivery}"
+								ng-class="{'text-inverse': item.newDelivery != item.oldDelivery}"
 								ng-bind="::item.newDelivery | date:'yyyy-MM-dd'"></div>
-							<div ng-show="item.newDelivery != item.orderItem.delivery">
+							<div ng-show="item.newDelivery != item.oldDelivery">
 								<s class="text-num text-muted"
-									ng-bind="::item.orderItem.delivery | date:'yyyy-MM-dd'"></s>
+									ng-bind="::item.oldDelivery | date:'yyyy-MM-dd'"></s>
 							</div>
 						</td>
 						<td colspan="2">