购物车删除时增加加载状态标志

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

src/main/webapp/resources/js/index/app.js

@@ -12892,6 +12892,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		
 		// 删除一条主记录
 		$scope.deleteCart = function(id) {
+			$scope.loading = true;
 			cartOperation.deleteCart({id: id}, {}, function(data) {
 				if(data.success) {
 					toaster.pop('success', '提示', data.success);
@@ -12904,7 +12905,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				if(data.error) {
 					toaster.pop('error', '提示', data.error);
 				}
+				$scope.loading = false;
 			}, function(response) {
+				$scope.loading = false;
 				toaster.pop('erroer', '提示', response.data);
 			});
 		};

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

@@ -89,7 +89,7 @@
 							<span> 
 								<select class="select01" ng-model="order.vendor"
 									ng-options="(contact.venduser + '' + contact.tel) for contact in contacts">
-										<option value="">{{order.venduser}}{{order.vendusertel}}</option>
+										<option value="">{{order.venduser}}</option>
 								</select> 
 								<a class="add-address" ng-if="order.vendUU != null" ng-click="addContact(venduu)">+增加联系人</a>
 							</span>
@@ -97,9 +97,10 @@
 					</li>
 					<li>
 						<div class="fl">
-							<em>付款方式：</em> <span> <input ng-model="order.payments"
-								list="paymentmethod" class="select02 wid152"
-								placeholder="选择付款方式" /> <datalist id="paymentmethod">
+							<em>付款方式：</em> 
+							<span> 
+								<input ng-model="order.payments" list="paymentmethod" class="select02 wid152" placeholder="选择付款方式" /> 
+								<datalist id="paymentmethod">
 									<option value="月结30天">月结30天</option>
 									<option value="月结60天">月结60天</option>
 									<option value="现金支付">现金支付</option>
@@ -180,19 +181,21 @@
 						</b> 
 						<b ng-if="item.id != null">{{item.product.unit}}</b> 
 						<b ng-if="item.id == null">{{item.unit}}</b> 
-						<b><input class="editable" type="text"
-							ng-model="item.qty" placeholder="数量" style="cursor: pointer;"
-							required="true"
-							ng-pattern="/^(([0-9]+\.[0-9]{1,2})|([0-9]*[1-9][0-9]*\.[0-9]{1,3})|([0-9]*[1-9][0-9]*))$/" /></b>
-						<b><input class="editable" type="text" ng-model="item.price"
-							placeholder="单价" style="cursor: pointer;" required="true"
-							ng-pattern="/^(([0-9]+\.[0-9]{1,6})|([0-9]*[1-9][0-9]*\.[0-9]{1,6})|([0-9]*[1-9][0-9]*))$/" /></b>
-						<b ng-if="order.currency == 'RMB'"><input class="editable"
-							type="text" ng-model="item.taxrate" placeholder="税率"
-							style="cursor: pointer;" ng-pattern="/^[0-9][0-9]{0,1}$/" /></b> <b
-							ng-if="order.currency != 'RMB'"><input class="editable"
-							type="text" style="cursor: pointer;" value="0"
-							readonly="readonly" /></b> <b> <input ng-model="item.delivery"
+						<b><input class="editable" type="text" ng-model="item.qty" placeholder="数量" style="cursor: pointer;" required="true"
+							ng-pattern="/^(([0-9]+\.[0-9]{1,2})|([0-9]*[1-9][0-9]*\.[0-9]{1,3})|([0-9]*[1-9][0-9]*))$/" />
+						</b>
+						<b><input class="editable" type="text" ng-model="item.price" placeholder="单价" style="cursor: pointer;" required="true"
+							ng-pattern="/^(([0-9]+\.[0-9]{1,6})|([0-9]*[1-9][0-9]*\.[0-9]{1,6})|([0-9]*[1-9][0-9]*))$/" />
+						</b>
+						<b ng-if="order.currency == 'RMB'">
+							<input class="editable" type="text" ng-model="item.taxrate" placeholder="税率"
+								style="cursor: pointer;" ng-pattern="/^[0-9][0-9]{0,1}$/" />
+						</b> 
+						<b ng-if="order.currency != 'RMB'">
+							<input class="editable" type="text" style="cursor: pointer;" value="0"
+							readonly="readonly" />
+						</b> 
+						<b><input ng-model="item.delivery"
 							type="text" class="editable" placeholder="选择时间"
 							datepicker-popup="yyyy-MM-dd" is-open="item.$endDateOpen"
 							min-date="getMinDate()" ng-required="true" current-text="今天"
@@ -202,16 +205,17 @@
 							readonly="readonly"
 							ng-click="openDatePicker($event, item.$endDateOpen, $index)">
 						</b> 
-						<b class="textMore"><input class="editable" type="text"
-							ng-model="item.remark" placeholder="备注" /></b> 
+						<b class="textMore">
+							<input class="editable" type="text" ng-model="item.remark" placeholder="备注" />
+						</b> 
 						<b class="wid02"><a ng-click="deleteProduct($index, item.id)"><i class="fa fa-close"></i></a></b>
 					</dd>
 				</dl>
 				<div class="save" ng-if="order.orderItems[0].code != null || order.orderItems[0].product.code != null ">
 					<button ng-click="addToOrder(order)"
-						ng-disabled="orderForm.$invalid || savetoOrder">立即购买</button>
+						ng-disabled="orderForm.$invalid">立即购买</button>
 					<button ng-click="addToCart(order)"
-						ng-disabled="orderForm.$invalid || savetoCart">添加购物车</button>
+						ng-disabled="orderForm.$invalid">添加购物车</button>
 				</div>
 			</form>
 			<!-- 搜索结果列表-->