采购变更移动版页面

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

src/main/webapp/resources/tpl/index_mobile/sale/saleChange.html

@@ -1,27 +1,142 @@
+<style>
+.badge {
+	border-radius: 4px;
+}
+
+.text-black {
+	color: #333;
+}
+
+.order {
+	margin-top: 5px;
+	margin-bottom: 10px;
+	border-left: solid 1px #339999;
+	border-right: solid 1px #339999;
+	border-bottom: solid 2px #339999;
+	border-top: solid 2px #339999;
+	border-radius: 3px;
+	padding: 2px;
+	position: relative;
+}
+
+.changeItem {
+	margin-bottom: 5px;
+	border: solid 1px #999999;
+	border-radius: 0px 3px 3px 3px;
+	padding: 2px;
+	position: relative;
+}
+
+.triangle{
+    width:0;
+    height:0;
+    border-width:5px;
+    border-style:solid dashed dashed solid;
+    border-color:#e66161 transparent transparent #e66161;
+    position: absolute;
+    top: -2px;
+    left: -2px;
+}
+
+.line {
+	border-top: solid 1px #EEEEEE;
+}
+
+.confirm {
+	margin-top: 20px;
+	padding: 5px 0px;
+}
+</style>
+
 <div ng-controller="SaleChangeCtrl">
 	<div class="top padding5 bold">
 		<a href="#" class="f16 topText">&nbsp;<i class="fa fa-angle-left"></i>&nbsp;订单详情</a>
 		<div class="right"><i class="fa fa-reorder"></i>&nbsp;&nbsp;</div>
 	</div>
 	<div class="orderInfo padding5">
-		<div>--销售变更单--
+		<div class="blod">销售变更单
 		</div>
-		<div>订单号：<span ng-bind="purcOrder.code"></span>&nbsp;&nbsp;&nbsp;
-			<span class="">[{{purcOrder.status | status}}]</span>
+		<div><label class="text-black">变更流水号：</label><span ng-bind="purcChange.code"></span>&nbsp;&nbsp;&nbsp;
+			<span class="label label-warning">{{purcChange.status | status}}</span>
 		</div>
-		<div class="">客&nbsp;&nbsp;&nbsp;户：<a ng-bind="purcOrder.enterprise.enAddress"></a></div>
 		<div class="">
-			单据时间：<span ng-bind="purcOrder.date"></span>&nbsp;&nbsp;&nbsp;&nbsp;总额：<span ng-bind="purcOrder.currency"></span>&nbsp;
-			<span ng-bind="getOrderTotal(purcOrder.orderItems)"></span>
+			<label class="text-black">变更时间：</label><span ng-bind="purcChange.date | date:'yyyy-MM-dd'"></span>
+		</div>
+		<div class="">
+			<label class="text-black">录入人：</label><span ng-bind="purcChange.recorder"></span>
+		</div>
+		<div ng-show="purcChange.remark""><label class="text-black">备注：</label>
+			<span ng-bind="purcChange.remark"></span>
+		</div>	
+		<div ng-show="purcChange.description"><label class="text-black">描述：</label>
+			<span ng-bind="purcChange.description"></span>
+		</div>
+		<div ng-show="remark"><label class="text-black">回复内容：</label>
+			<span ng-bind="remark"></span>
 		</div>
-		<div ng-show="purcOrder.remark" ng-bind="purcOrder.remark"></div>	
 	</div>
-	<div class="f12 padding5" style="min-height: 400px; position: relative;">
+	<div class="padding5" style="min-height: 400px; position: relative;">
 		<div class="loading"  ng-class="{'in': loading}">
 			<i></i>
 		</div>
 		<div>
-			这是内容
+			<div class="order">
+				<div style="position: absolute;right: 4px;top: 0px;"><i class="fa fa-list-alt fa-lg"></i></div>
+				<div><i class="fa fa-barcode"></i>&nbsp;<span ng-bind="purcChange.order.code"></span>&nbsp;&nbsp;<span class="label label-info" ng-bind="purcChange.order.status | status"></span></div>
+				<div><i class="fa fa-user"></i>&nbsp;<span ng-bind="purcChange.order.enterprise.enName"></span></div>
+				<div class="line"><i class="fa fa-shopping-cart"></i>&nbsp;<span ng-bind="purcChange.order.shipAddress"></span></div>
+				<div class="line"><i class="fa fa-calendar"></i>&nbsp;<span ng-bind="purcChange.order.date | date: 'yyyy-MM-dd'"></span></div>
+			</div>
+			<div class="changeItems">
+				<div class="changeItem" ng-repeat="item in purcChange.orderChangeItems">
+					<div class="triangle"></div>
+					<div style="position: absolute;right: 4px;top: 0px;"><i class="fa fa-cogs fa-lg"></i></div>
+					<div><label>物料：</label><span class="ellipsis" ng-bind="item.newProduct.code"></span><span class="ellipsis right" ng-bind="item.newProduct.title"></span></div>
+					<div class="line"><label>规格：</label><span class="ellipsis" ng-bind="item.newProduct.spec"></span></div>
+					<div class="line">
+						<div style="display: inline-block; width: 50%">
+							<label>单价：</label>
+							<span ng-class="{'text-inverse': item.newPrice != item.orderItem.price}" class="text-num" ng-bind="item.newPrice | currency: purcChange.newCurrency + ' '"></span>
+							<s class="text-num text-muted" ng-show="item.newPrice != item.orderItem.price" ng-bind="item.orderItem.price | currency:purcChange.order.currency + ' '"></s>
+						</div>
+						<div style="display: inline-block; width: 45%">
+							<label>数量：</label>
+							<span ng-class="{'text-inverse': item.newQty != item.orderItem.qty}" class="text-num" ng-bind="item.newQty"></span>
+							<s class="text-num text-muted" ng-show="item.newQty != item.orderItem.qty" ng-bind="item.orderItem.qty"></s>
+							<span class="text-num text-muted" ng-bind="item.newProduct.unit"></span>
+						</div>
+					</div>
+					<div class="line"><label>交期：</label>
+						<span ng-class="{'text-inverse': item.newDelivery != item.orderItem.delivery}" class="text-num" ng-bind="item.newDelivery | date: 'yyyy-MM-dd'"></span>
+						<s class="text-num text-muted" ng-show="item.newDelivery != item.orderItem.delivery" ng-bind="item.orderItem.delivery | date: 'yyyy-MM-dd'"></s>
+					</div>
+					<div class="line" ng-show="item.remark"><label>回复内容：</label><span ng-bind="item.remark"></span></div>
+					<div class="line" ng-show="item.newTaxrate != item.orderItem.taxrate"><label>税率：</label>
+						<span ng-class="{'text-inverse': item.newTaxrate != item.orderItem.taxrate}" class="text-num" ng-bind="item.newTaxrate"></span>
+						<s class="text-num text-muted" ng-show="item.newTaxrate != item.orderItem.taxrate" ng-bind="item.orderItem.taxrate"></s>
+					</div>
+				</div>
+			</div>
+			<div class="confirm" style="border-top: solid 2px #449d44;">
+				<div>
+					<div class="btn-group left">
+						<label class="btn btn-sm btn-default" ng-class="{'btn-success': purcChange.agreed==1}">
+							<input type="radio" class="hidden" name="agreedRadio" ng-model="purcChange.agreed" ng-value="1"/>同意
+						</label>
+						<label class="btn btn-sm btn-default" ng-class="{'btn-warning': purcChange.agreed==0}">
+							<input type="radio" class="hidden" name="disAgreedRadio" ng-model="purcChange.agreed" ng-value="0"/>不同意
+						</label>
+					</div>
+					<div class="right">
+						<button ng-disabled="purcChange.status!=200" ng-click="onReplyClick(purcChange)" class="btn btn-sm btn-success"><i class="fa fa-share"></i>&nbsp;确认回复</button>
+					</div>
+				</div>
+			</div>
+			<div class="confirm">
+				<div>
+					<input type="text" ng-model="purcChange.replyRemark" class="form-control input-sm" style="margin-top: 5px;" placeholder="回复备注">
+				</div>
+			</div>
 		</div>
 	</div>
 </div>

src/main/webapp/resources/tpl/index_mobile/sale/saleOrder.html

@@ -11,7 +11,7 @@
 		</div>
 		<div class="">客&nbsp;&nbsp;&nbsp;户：<a ng-bind="purcOrder.enterprise.enAddress"></a></div>
 		<div class="">
-			单据时间：<span ng-bind="purcOrder.date"></span>&nbsp;&nbsp;&nbsp;&nbsp;总额：<span ng-bind="purcOrder.currency"></span>&nbsp;
+			单据时间：<span ng-bind="purcOrder.date | date:'yyyy年MM月dd日 HH:mm:ss'"></span>&nbsp;&nbsp;&nbsp;&nbsp;总额：<span ng-bind="purcOrder.currency"></span>&nbsp;
 			<span ng-bind="getOrderTotal(purcOrder.orderItems)"></span>
 		</div>
 		<div ng-show="purcOrder.remark" ng-bind="purcOrder.remark"></div>	
@@ -51,7 +51,7 @@
 				<tr>
 					<td class="text-center" width="20%" class="br-l">{{orderItem.price}}</td>
 					<td class="text-center" width="30%" class="br-l">{{orderItem.qty}}({{orderItem.product.unit}})</td>
-					<td class="text-center" width="35%" class="br-l">{{orderItem.delivery}}</td>
+					<td class="text-center" width="35%" class="br-l">{{orderItem.delivery | date:'yyyy年MM月dd日 HH:mm:ss'}}</td>
 				</tr>
 				<tr ng-show="orderItem.expand" class="expanding replyList br-b bg-info">
 					<td colspan="3">