token过期问题的处理

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

src/main/java/com/uas/platform/b2b/controller/SaleOrderController.java

@@ -537,9 +537,9 @@ public class SaleOrderController {
 			reply = purchaseOrderService.reply(reply);
 			// 清除token
 			tokenService.delete(token);
+			logger.log("客户采购单", "单个回复客户采购明细", reply.replyDescription(), reply.getOrderItem().getOrder().getCode(),
+					orderItemId);
 		}
-		logger.log("客户采购单", "单个回复客户采购明细", reply.replyDescription(), reply.getOrderItem().getOrder().getCode(),
-				orderItemId);
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}
 

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

@@ -1515,13 +1515,11 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             }, 5000);
         }
         var getToken = function() {
-        	if($scope.token == null) {
-        		token.info({userType: 'salenotice'}, {}, function(data) {
-        			$scope.token = data.token;
-        		}, function(response) {
-        			toaster.pop('error', '提示', response.data);
-        		});
-        	}
+    		token.info({userType: 'salenotice'}, {}, function(data) {
+    			$scope.token = data.token;
+    		}, function(response) {
+    			toaster.pop('error', '提示', response.data);
+    		});
         }
         getToken();
         $scope.send = function () {// 发货
@@ -3025,13 +3023,11 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         // 获取token信息
         $scope.getToken = function() {
-        	if($scope.token == null) {
-        		token.info({userType: 'sale'}, {}, function(data) {
-        			$scope.token = data.token;
-        		}, function(response) {
-        			toaster.pop('error', '提示', response.data);
-        		});
-        	}
+    		token.info({userType: 'sale'}, {}, function(data) {
+    			$scope.token = data.token;
+    		}, function(response) {
+    			toaster.pop('error', '提示', response.data);
+    		});
         }
         
         $scope.onReplyClick = function (item, inverse) {
@@ -3049,14 +3045,16 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 }
                 if (inverse && inverse == -1) reply.qty = -1 * reply.qty;// 取相反
                 $scope.loading = true;
-                PurcOrderItem.reply({orderItemId: item.id, token: $scope.token}, reply, function () {
-                    $scope.loading = false;
-                    toaster.pop('info', '提示', (inverse == -1 ? '撤销成功' : '回复成功'));
-                    $scope.tableParams.reload();
-                }, function (response) {
-                    $scope.loading = false;
-                    toaster.pop('error', '回复失败', response.data);
-                });
+                if($scope.token != null) {
+                	PurcOrderItem.reply({orderItemId: item.id, token: $scope.token}, reply, function () {
+                		$scope.loading = false;
+                		toaster.pop('info', '提示', (inverse == -1 ? '撤销成功' : '回复成功'));
+                		$scope.tableParams.reload();
+                	}, function (response) {
+                		$scope.loading = false;
+                		toaster.pop('error', '回复失败', response.data);
+                	});
+                }
             }
         };
 
@@ -3623,13 +3621,11 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         // 获取token信息
         $scope.getToken = function() {
-        	if($scope.token == null) {
-        		token.info({userType: 'salenotice'}, {}, function(data) {
-        			$scope.token = data.token;
-        		}, function(response) {
-        			toaster.pop('error', '提示', response.data);
-        		});
-        	}
+    		token.info({userType: 'salenotice'}, {}, function(data) {
+    			$scope.token = data.token;
+    		}, function(response) {
+    			toaster.pop('error', '提示', response.data);
+    		});
         }
         
         $scope.onReplyClick = function (item, withSteps) {
@@ -6144,13 +6140,11 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         
         // 获取token信息
         $scope.getToken = function() {
-        	if($scope.token == null) {
-        		token.info({userType: 'salenotice'}, {}, function(data) {
-        			$scope.token = data.token;
-        		}, function(response) {
-        			toaster.pop('error', '提示', response.data);
-        		});
-        	}
+    		token.info({userType: 'salenotice'}, {}, function(data) {
+    			$scope.token = data.token;
+    		}, function(response) {
+    			toaster.pop('error', '提示', response.data);
+    		});
         }
         
         //可送货日期

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

@@ -351,7 +351,7 @@
                             <div ng-if="order.entrystatus == '保存'">
                                 <a ng-click="clear(order.id)" title="只有新增的在录入的单据可以删除">删除</a>
                             </div>
-                            <div ng-if="order.downloadstatus=='已下载'">
+                            <div >
                             	<a ng-click="viewApprove(order.salecode, order.deputyuu)">审批流程</a>
                             </div>
                         </div>