Browse Source

优化界面

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@920 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
suntg 11 years ago
parent
commit
ec6cf5ecf9

+ 2 - 2
src/main/webapp/resources/js/index/mobile.index.app.js

@@ -240,7 +240,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 		PurcInquiry.getItem({itemId: $stateParams.itemId}, function(data){
 			$scope.purcInquiry = data;
 			$scope.loading = false;
-		}, function(data){
+		}, function(response){
 			toaster.pop('error', '加载失败', response.data);
 		});
 		
@@ -274,7 +274,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
   				PurcInquiry.getItem({itemId: $stateParams.itemId}, function(data){
 					$scope.purcInquiry = data;
 					$scope.loading = false;
-				}, function(data){
+				}, function(response){
 					$scope.loading = false;
 					toaster.pop('error', '加载失败', response.data);
 				});

+ 2 - 2
src/main/webapp/resources/tpl/index_mobile/sale/saleInquiry.html

@@ -84,7 +84,7 @@
 	<div class="orderInfo padding5">
 		<table>
 			<tr>
-				<td class="va-top text-right"><label class="text-black">客户:</label></td>
+				<td class="va-top text-right" width="50px"><label class="text-black">客户:</label></td>
 				<td>
 					<span ng-bind="purcInquiry.inquiry.enterprise.enName"></span><br>
 					<span class="text-help">{{purcInquiry.inquiry.enterprise.enAddress}} 
@@ -181,7 +181,7 @@
 						<div ng-if="reply.editing" class=" input-group input-group-sm">
 							<span class="input-group-addon input-group-addon-sm">≥</span>
 							<input type="number" ng-disabled="$first || purchInqiry.custLap" 
-								class="form-control" ng-model="reply.lapQty" required min="0">
+								class="form-control input-sm" ng-model="reply.lapQty" required min="0">
 		              	</div>
 					</td>
 					<td>

+ 41 - 15
src/main/webapp/resources/tpl/index_mobile/sale/saleOrder.html

@@ -3,10 +3,14 @@
 		width: 100%;
 	}
 	
-	tr {
+	.va-top {
+		vertical-align: top;
+	}
+	
+	.orderItems tr {
 		border-bottom: solid 1px #999999;
 	}
-	td {
+	.orderItems td {
 		padding: 5px;
 	}
 </style>
@@ -17,24 +21,46 @@
 		<div class="right"><i class="fa fa-reorder"></i>&nbsp;&nbsp;</div>
 	</div>
 	<div class="orderInfo padding5">
-		<div>-销售订单-
-		</div>
-		<div>订单号:<span ng-bind="purcOrder.code"></span>&nbsp;&nbsp;&nbsp;
-			<span class="">[{{purcOrder.status | status}}]</span>
-		</div>
-		<div class="">客&nbsp;&nbsp;&nbsp;户:<a ng-bind="purcOrder.enterprise.enName"></a></div>
-		<div class="">收货地址:<a ng-bind="purcOrder.enterprise.enAddress"></a></div>
-		<div class="">
-			单据时间:<span ng-bind="purcOrder.date | date:'yyyy-MM-dd'"></span>&nbsp;&nbsp;&nbsp;&nbsp;
-			总额:<span ng-bind="getOrderTotal(purcOrder.orderItems) | currency:symbol(purcOrder.currency)"></span>
-		</div>
-		<div ng-show="purcOrder.remark" ng-bind="purcOrder.remark"></div>	
+		<table>
+			<tr>
+				<td class="va-top text-right" width="88px"><label class="text-black">订单号:</label></td>
+				<td>
+					<span ng-bind="purcOrder.code"></span>&nbsp;&nbsp;&nbsp;
+					<span class="">[{{purcOrder.status | status}}]</span>
+				</td>
+			</tr>
+			<tr>
+				<td class="va-top text-right"><label class="text-black">客户:</label></td>
+				<td>
+					<span ng-bind="purcOrder.enterprise.enName"></span>
+				</td>
+			</tr>
+			<tr>
+				<td class="va-top text-right"><label class="text-black">收货地址:</label></td>
+				<td>
+					<span ng-bind="purcOrder.enterprise.enAddress"></span>
+				</td>
+			</tr>
+			<tr>
+				<td class="va-top text-right"><label class="text-black">单据时间:</label></td>
+				<td>
+					<span ng-bind="purcOrder.date | date:'yyyy-MM-dd'"></span>&nbsp;&nbsp;&nbsp;&nbsp;
+					总额:<span ng-bind="getOrderTotal(purcOrder.orderItems) | currency:symbol(purcOrder.currency)"></span>
+				</td>
+			</tr>
+			<tr>
+				<td class="va-top text-right"><label class="text-black">备注:</label></td>
+				<td>
+					<span ng-bind="::purcOrder.remark"></span>
+				</td>
+			</tr>
+		</table>
 	</div>
 	<div class="f12 padding5" style="min-height: 400px; position: relative;">
 		<div class="loading"  ng-class="{'in': loading}">
 			<i></i>
 		</div>
-		<table>
+		<table class="orderItems">
 			<thead class="text-center bold">
 				<td width="15%">序号</td>
 				<td width="50%" colspan=2>商品</td>