平台UI更新，导航调整

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

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

@@ -146,12 +146,20 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             url : "/vendor",
             templateUrl : "static/tpl/index/purc/vendor.html",
             controller : 'PurcVendorCtrl'
-            /* 采购供应商资料 */
+            /* 采购供应商资料 详情*/
         }).state('purc.vendordetail', {
             url : "/vendor/:id",
             templateUrl : "static/tpl/index/purc/vendor_detail.html",
             controller : 'PurcVendorDetailCtrl'
             /* 客户指定招标列表 */
+        }).state('sale.makeoutorder', {
+            url : "/makeoutorder",
+            templateUrl : "static/tpl/index/make/outorder.html",
+            controller: 'MakeOutOrderCtrl'
+        }).state('sale.outorder_detail', {
+            url : "/makeoutorder/:id",
+            templateUrl : "static/tpl/index/make/outorder_detail.html",
+            controller: 'MakeOutOrderDetailCtrl'
         }).state('sale.tenderlist', {
             url : "/tender",
             templateUrl : "static/tpl/index/sale/tenderlist.html",
@@ -298,6 +306,57 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             url : "/approval",
             templateUrl : "static/tpl/index/sale/approval.html",
             controller: 'SaleApprovalCtrl'
+        }).state('sale.prodList', {
+            url : "/prodList",
+            templateUrl : "static/tpl/index/baseInfo/prodList.html",
+            controller : 'ProductListCtrl'
+        }).state('sale.newProdInfo', {
+            url : "/newProdInfo",
+            templateUrl : "static/tpl/index/baseInfo/newProdInfo.html",
+            controller : 'NewProdInfoCtrl'
+        }).state('sale.uploadByBatch', {
+            url : "/uploadByBatch",
+            templateUrl : "static/tpl/index/baseInfo/uploadByBatch.html",
+            controller : 'UploadByBatchCtrl'
+        }).state('sale.productDetail', {
+            url : "/prodList/:id",
+            templateUrl : "static/tpl/index/baseInfo/productDetail.html",
+            controller : 'ProductDetailCtrl'
+        }).state('sale.maketodo', {
+            url : "/maketodo",
+            templateUrl : "static/tpl/index/make/todo.html"
+        }).state('sale.maketodo.order', {
+            url : "/makeorder",
+            templateUrl : "static/tpl/index/make/order.html",
+            controller: 'MakeOrderCtrl'
+        }).state('sale.makeorder', {
+            url : "/makeorder",
+            templateUrl : "static/tpl/index/make/order.html",
+            controller: 'MakeOrderCtrl'
+        }).state('sale.makeorder_detail', {
+            url : "/makeorder/:id",
+            templateUrl : "static/tpl/index/make/order_detail.html",
+            controller: 'MakeOrderDetailCtrl'
+        }).state('sale.badOut', {
+            url : "/badOut",
+            templateUrl : "static/tpl/index/qc/badOut.html",
+            controller: 'SaleBadOutCtrl'
+        }).state('sale.MRB', {
+            url : "/MRB",
+            templateUrl : "static/tpl/index/qc/MRB.html",
+            controller: 'SaleMRBCtrl'
+        }).state('sale.badIn', {
+            url : "/badIn",
+            templateUrl : "static/tpl/index/qc/badIn.html",
+            controller: 'SaleBadInCtrl'
+        }).state('sale.makeaccept', {
+            url : "/makeaccept",
+            templateUrl : "static/tpl/index/make/accept.html",
+            controller: 'MakeAcceptCtrl'
+        }).state('sale.makereturns', {
+            url : "/makereturns",
+            templateUrl : "static/tpl/index/make/returns.html",
+            controller: 'MakeReturnCtrl'
         }).state('account', {
             url : "/account",
             views : {
@@ -317,32 +376,10 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             url : "/",
             templateUrl : "static/tpl/index/account/index.html",
             controller: 'RightCtrl'
-        }).state('account.enterprise', {
-            url : "/enterprise",
-            templateUrl : "static/tpl/index/account/enterprise.html",
-            controller: 'EnterpriseCtrl'
-        }).state('account.user', {
-            url : "/user",
-            templateUrl : "static/tpl/index/account/user.html",
-            controller: 'UserCtrl'
-        }).state('account.log', {
-            url : "/log",
-            templateUrl : "static/tpl/index/account/log.html",
-            controller: 'LogCtrl'
-        }).state('account.resource', {
-            url : "/resource",
-            templateUrl : "static/tpl/index/account/resource.html",
-            controller: 'ResourceCtrl'
-        }).state('account.role', {
-            url : "/role",
-            templateUrl : "static/tpl/index/account/role.html",
-            controller: 'RoleCtrl'
         }).state('baseInfo', {//基础资料
             url : "/baseInfo",
             views : {
                 "left-view" : {
-                    templateUrl : "static/tpl/index/baseInfo/left.html",
-                    controller: 'LeftCtrl'
 
                 },
                 "right-view" : {
@@ -357,22 +394,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             url : "/enterpriseList",
             templateUrl : "static/tpl/index/baseInfo/enterpriseList.html",
             controller: 'EnterpriseListCtrl'
-        }).state('baseInfo.prodList', {
-            url : "/prodList",
-            templateUrl : "static/tpl/index/baseInfo/prodList.html",
-            controller : 'ProductListCtrl'
-        }).state('baseInfo.uploadByBatch', {
-            url : "/uploadByBatch",
-            templateUrl : "static/tpl/index/baseInfo/uploadByBatch.html",
-            controller : 'UploadByBatchCtrl'
-        }).state('baseInfo.productDetail', {
-            url : "/prodList/:id",
-            templateUrl : "static/tpl/index/baseInfo/productDetail.html",
-            controller : 'ProductDetailCtrl'
-        }).state('baseInfo.newProdInfo', {
-            url : "/newProdInfo",
-            templateUrl : "static/tpl/index/baseInfo/newProdInfo.html",
-            controller : 'NewProdInfoCtrl'
         }).state('baseInfo.enterpriseList', {
             url : "/enterpriseList",
             templateUrl : "static/tpl/index/baseInfo/enterpriseList.html",
@@ -416,18 +437,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
         }).state('qc.home', {
             url : "/",
             templateUrl : "static/tpl/index/qc/index.html"
-        }).state('qc.badIn', {
-            url : "/badIn",
-            templateUrl : "static/tpl/index/qc/badIn.html",
-            controller: 'SaleBadInCtrl'
-        }).state('qc.badOut', {
-            url : "/badOut",
-            templateUrl : "static/tpl/index/qc/badOut.html",
-            controller: 'SaleBadOutCtrl'
-        }).state('qc.MRB', {
-            url : "/MRB",
-            templateUrl : "static/tpl/index/qc/MRB.html",
-            controller: 'SaleMRBCtrl'
         }).state('fa', {
             url : "/fa",
             views : {
@@ -487,21 +496,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
         }).state('make.home', {
             url : "/",
             templateUrl : "static/tpl/index/make/index.html"
-        }).state('make.todo', {
-            url : "/todo",
-            templateUrl : "static/tpl/index/make/todo.html"
-        }).state('make.todo.order', {
-            url : "/order",
-            templateUrl : "static/tpl/index/make/order.html",
-            controller: 'MakeOrderCtrl'
-        }).state('make.order', {
-            url : "/order",
-            templateUrl : "static/tpl/index/make/order.html",
-            controller: 'MakeOrderCtrl'
-        }).state('make.order_detail', {
-            url : "/order/:id",
-            templateUrl : "static/tpl/index/make/order_detail.html",
-            controller: 'MakeOrderDetailCtrl'
         }).state('make.change', {
             url : "/change",
             templateUrl : "static/tpl/index/make/change.html",
@@ -510,22 +504,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             url : "/change/:id",
             templateUrl : "static/tpl/index/make/change_detail.html",
             controller: 'MakeChangeDetailCtrl'
-        }).state('make.outorder', {
-            url : "/outorder",
-            templateUrl : "static/tpl/index/make/outorder.html",
-            controller: 'MakeOutOrderCtrl'
-        }).state('make.outorder_detail', {
-            url : "/outorder/:id",
-            templateUrl : "static/tpl/index/make/outorder_detail.html",
-            controller: 'MakeOutOrderDetailCtrl'
-        }).state('make.accept', {
-            url : "/accept",
-            templateUrl : "static/tpl/index/make/accept.html",
-            controller: 'MakeAcceptCtrl'
-        }).state('make.returns', {
-            url : "/returns",
-            templateUrl : "static/tpl/index/make/returns.html",
-            controller: 'MakeReturnCtrl'
         }).state('cs', {// 客户服务
             url : "/cs",
             views : {
@@ -560,11 +538,34 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 					templateUrl : "static/tpl/index/approvalFlow/left.html"
 				},
 				"right-view" : {
-					templateUrl: "static/tpl/index/approvalFlow/home.html",
-					controller: 'approvalFlowCtrl'
+					templateUrl: "static/tpl/index/approvalFlow/right.html",
 				}
 			}
-		});
+		}).state('approvalflow.flow', {
+            url : "/flow",
+            templateUrl : "static/tpl/index/approvalFlow/home.html",
+            controller: 'approvalFlowCtrl'
+        }).state('approvalflow.enterprise', {
+            url : "/enterprise",
+            templateUrl : "static/tpl/index/approvalFlow/enterprise.html",
+            controller: 'EnterpriseCtrl'
+        }).state('approvalflow.user', {
+            url : "/user",
+            templateUrl : "static/tpl/index/approvalFlow/user.html",
+            controller: 'UserCtrl'
+        }).state('approvalflow.log', {
+            url : "/log",
+            templateUrl : "static/tpl/index/approvalFlow/log.html",
+            controller: 'LogCtrl'
+        }).state('approvalflow.resource', {
+            url : "/resource",
+            templateUrl : "static/tpl/index/approvalFlow/resource.html",
+            controller: 'ResourceCtrl'
+        }).state('approvalflow.role', {
+            url : "/role",
+            templateUrl : "static/tpl/index/approvalFlow/role.html",
+            controller: 'RoleCtrl'
+        });
         $urlRouterProvider.otherwise('/index');
 	}]);
 	
@@ -5836,7 +5837,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 		$scope.editUserRole = function(user) {
 			var modalInstance = $modal.open({
 				animation: true,
-				templateUrl: 'static/tpl/index/account/user_role.html',
+				templateUrl: 'static/tpl/index/approvalFlow/user_role.html',
 				controller: 'UserRoleCtrl',
 				resolve: {
 					user: function() {
@@ -6380,7 +6381,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 		$scope.editRole = function(role){
 			var modalInstance = $modal.open({
 				animation: true,
-				templateUrl: 'static/tpl/index/account/role_detail.html',
+				templateUrl: 'static/tpl/index/approvalFlow/role_detail.html',
 				controller: 'RoleEditCtrl',
 				resolve: {
 					role: function() {
@@ -7905,6 +7906,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 				$scope.loading = true;
 				var pageParams = params.url();
 				pageParams.keyword = $scope.keyword;
+				$scope.tip = $scope.keyword;
 				getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page) {
 					$scope.loading = false;
 					if(page) {
@@ -8514,6 +8516,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 				$scope.loading = true;
 				var pageParams = params.url();
 				pageParams.keyword = $scope.keyword;
+				$scope.tip = $scope.keyword;
 				getService()[getRequestStatus($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
 					$scope.loading = false;
 					if(page) {
@@ -8967,9 +8970,6 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 			
 		});
 		
-		console.log($scope.vacation);
-		console.log($scope.workovertime);
-		console.log($scope.workdaily);
 		$scope.NoteSet = function() {
 			var modalInstance = $modal.open({
 				templateUrl: 'static/tpl/index/approvalFlow/step1.html',