代采订单查看审批流给出提示

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

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

@@ -667,20 +667,24 @@ public class DeputyOrderController {
 			if (!res.isSuccess())
 				map.put("error", "暂未获取到相关数据");
 			JSONObject jsonObject = JSONObject.parseObject(res.getContent());
-			String nodeStr = URLDecoder.decode(jsonObject.getString("nodes"), "UTF-8");
-			String proStr = URLDecoder.decode(jsonObject.getString("processs"), "UTF-8");
-			List<UasNodes> nodes = JSONObject.parseArray(nodeStr, UasNodes.class);
-			List<UasProcess> process = JSONObject.parseArray(proStr, UasProcess.class);
-			List<UasProcess> pros = new ArrayList<UasProcess>();
-			if (!CollectionUtils.isEmpty(process)) {
-				for (UasProcess pro : pros) {
-					if (pro.getJp_status().equals("待审批")) {
-						pros.add(pro);
+			if (jsonObject != null) {
+				String nodeStr = URLDecoder.decode(jsonObject.getString("nodes"), "UTF-8");
+				String proStr = URLDecoder.decode(jsonObject.getString("processs"), "UTF-8");
+				List<UasNodes> nodes = JSONObject.parseArray(nodeStr, UasNodes.class);
+				List<UasProcess> process = JSONObject.parseArray(proStr, UasProcess.class);
+				List<UasProcess> pros = new ArrayList<UasProcess>();
+				if (!CollectionUtils.isEmpty(process)) {
+					for (UasProcess pro : pros) {
+						if (pro.getJp_status().equals("待审批")) {
+							pros.add(pro);
+						}
 					}
 				}
+				map.put("nodes", nodes);
+				map.put("process", pros);
+			} else {
+				map.put("error", "暂未获取到相关数据");
 			}
-			map.put("nodes", nodes);
-			map.put("process", pros);
 
 		}
 		return map;

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

@@ -15324,14 +15324,14 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
      // 查询代采定单在信扬中的审批情况
     app.controller('ViewApprovalDetailCtrl', ['$scope', 'toaster', '$modalInstance', 'DeputyOrder', 'BaseService', 'ngTableParams', 'uu', 'salecode', function ($scope, toaster, $modalInstance, DeputyOrder, BaseService, ngTableParams, uu, salecode) {
-        DeputyOrder.approve({uu: uu, code: 'SS16214340'}, {}, function (data) {
+        DeputyOrder.approve({uu: uu, code: salecode}, {}, function (data) {
             $scope.nodes = data.nodes;
             $scope.process = data.process;
             if(data.error) {
             	toaster.pop('error', '提示', data.error);
             }
         }, function (response) {
-            toaster.pop('error', '提示', response.data);
+            toaster.pop('error', '提示', '暂未获取到相关单据的信息');
         });
 
         $scope.cancel = function () {