公开招标页面修改

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

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

@@ -243,7 +243,7 @@ public class PurchaseTenderController {
         sortList.add(new Sort("pt_id", false, Sort.Type.LONG, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
-        pageParams.getFilters().put("pt_ifopen", Constant.NO);
+//        pageParams.getFilters().put("pt_ifopen", Constant.NO);  // 现在公开的也在这个列表
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getEnName());
         return searchService.searchPurcTenderIds(keyword, pageParams);
     }
@@ -271,7 +271,7 @@ public class PurchaseTenderController {
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getEnName());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
-        pageParams.getFilters().put("pt_ifopen", Constant.NO);
+//        pageParams.getFilters().put("pt_ifopen", Constant.NO);
         pageParams.getFilters().put("pt_overdue", Constant.YES);
         pageParams.getFilters().put("pt_result", Constant.NO);
         return searchService.searchPurcTenderIds(keyword, pageParams);
@@ -303,7 +303,7 @@ public class PurchaseTenderController {
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getEnName());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
-        pageParams.getFilters().put("pt_ifopen", Constant.NO);
+//        pageParams.getFilters().put("pt_ifopen", Constant.NO);
         pageParams.getFilters().put("pt_overdue", Constant.NO);
         System.out.println("pageParams" + JSON.toJSONString(pageParams));
         System.out.println("return" + JSON.toJSONString(searchService.searchPurcTenderIds(keyword, pageParams)));
@@ -334,7 +334,7 @@ public class PurchaseTenderController {
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getEnName());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
-        pageParams.getFilters().put("pt_ifopen", Constant.NO);
+//        pageParams.getFilters().put("pt_ifopen", Constant.NO);
         pageParams.getFilters().put("pt_status", "待投标");
         pageParams.getFilters().put("pt_overdue", Constant.YES);
         return searchService.searchPurcTenderIds(keyword, pageParams);
@@ -363,78 +363,78 @@ public class PurchaseTenderController {
     }
 
 
-    /**
-     * 作为供应商，查看平台开放招标单（待评标）
-     *
-     * @param params
-     * @return
-     */
-    @RequestMapping(value = "/open", params = RequestState.DONE, method = RequestMethod.GET)
-    @ResponseBody
-    public SPage<PurchaseTender> getDoneOpenTenders(PageParams params, String searchFilter) {
-        logger.log("平台公开招标单", "查看平台公开招标单（待评标）");
-        JSONObject jsonObject = JSONObject.parseObject(searchFilter);
-        String keyword = jsonObject.getString("keyword");
-        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, new Long(1)));
-        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-        pageParams.getFilters().put("pt_ispublish", Constant.YES);
-        pageParams.getFilters().put("pt_ifopen", Constant.YES);
-        pageParams.getFilters().put("pt_overdue", Constant.YES);
-        pageParams.getFilters().put("pt_result", Constant.NO);
-        pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getEnName());
-        return searchService.searchPurcTenderIds(keyword, pageParams);
-    }
-
-
-    /**
-     * 作为供应商，查看平台开放招标单（待投标）
-     *
-     * @param params
-     * @return
-     */
-    @RequestMapping(value = "/open", params = RequestState.TODO, method = RequestMethod.GET)
-    @ResponseBody
-    public SPage<PurchaseTender> getTodoOpenTenders(PageParams params, String searchFilter) {
-        logger.log("平台公开招标单", "查看平台公开招标单（待投标）");
-        JSONObject jsonObject = JSONObject.parseObject(searchFilter);
-        String keyword = jsonObject.getString("keyword");
-        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, new Long(1)));
-        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-        pageParams.getFilters().put("pt_ispublish", Constant.YES);
-        pageParams.getFilters().put("pt_ifopen", Constant.YES);
-        pageParams.getFilters().put("pt_overdue", Constant.NO);
-        pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getEnName());
-        return searchService.searchPurcTenderIds(keyword, pageParams);
-    }
-
-
-    /**
-     * 作为供应商，查看平台开放招标单（过期）
-     *
-     * @param params
-     * @return
-     */
-    @RequestMapping(value = "/open", params = RequestState.END, method = RequestMethod.GET)
-    @ResponseBody
-    public SPage<PurchaseTender> getEndOpenTenders(PageParams params, String searchFilter) {
-        logger.log("平台公开招标单", "查看平台公开招标单（已过期）");
-        JSONObject jsonObject = JSONObject.parseObject(searchFilter);
-        String keyword = jsonObject.getString("keyword");
-        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, new Long(1)));
-        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-        pageParams.getFilters().put("pt_ispublish", Constant.YES);
-        pageParams.getFilters().put("pt_ifopen", Constant.YES);
-        pageParams.getFilters().put("pt_overdue", Constant.YES);
-        pageParams.getFilters().put("pt_result", Constant.YES);
-//        pageParams.getFilters().put("pt_status", "待投标");
-        return searchService.searchPurcTenderIds(keyword, pageParams);
-    }
+//    /**
+//     * 作为供应商，查看平台开放招标单（待评标）
+//     *
+//     * @param params
+//     * @return
+//     */
+//    @RequestMapping(value = "/open", params = RequestState.DONE, method = RequestMethod.GET)
+//    @ResponseBody
+//    public SPage<PurchaseTender> getDoneOpenTenders(PageParams params, String searchFilter) {
+//        logger.log("平台公开招标单", "查看平台公开招标单（待评标）");
+//        JSONObject jsonObject = JSONObject.parseObject(searchFilter);
+//        String keyword = jsonObject.getString("keyword");
+//        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
+//        List<Sort> sortList = new ArrayList<>();
+//        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, new Long(1)));
+//        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+//        pageParams.getFilters().put("pt_ispublish", Constant.YES);
+//        pageParams.getFilters().put("pt_ifopen", Constant.YES);
+//        pageParams.getFilters().put("pt_overdue", Constant.YES);
+//        pageParams.getFilters().put("pt_result", Constant.NO);
+//        pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getEnName());
+//        return searchService.searchPurcTenderIds(keyword, pageParams);
+//    }
+//
+//
+//    /**
+//     * 作为供应商，查看平台开放招标单（待投标）
+//     *
+//     * @param params
+//     * @return
+//     */
+//    @RequestMapping(value = "/open", params = RequestState.TODO, method = RequestMethod.GET)
+//    @ResponseBody
+//    public SPage<PurchaseTender> getTodoOpenTenders(PageParams params, String searchFilter) {
+//        logger.log("平台公开招标单", "查看平台公开招标单（待投标）");
+//        JSONObject jsonObject = JSONObject.parseObject(searchFilter);
+//        String keyword = jsonObject.getString("keyword");
+//        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
+//        List<Sort> sortList = new ArrayList<>();
+//        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, new Long(1)));
+//        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+//        pageParams.getFilters().put("pt_ispublish", Constant.YES);
+//        pageParams.getFilters().put("pt_ifopen", Constant.YES);
+//        pageParams.getFilters().put("pt_overdue", Constant.NO);
+//        pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getEnName());
+//        return searchService.searchPurcTenderIds(keyword, pageParams);
+//    }
+//
+//
+//    /**
+//     * 作为供应商，查看平台开放招标单（过期）
+//     *
+//     * @param params
+//     * @return
+//     */
+//    @RequestMapping(value = "/open", params = RequestState.END, method = RequestMethod.GET)
+//    @ResponseBody
+//    public SPage<PurchaseTender> getEndOpenTenders(PageParams params, String searchFilter) {
+//        logger.log("平台公开招标单", "查看平台公开招标单（已过期）");
+//        JSONObject jsonObject = JSONObject.parseObject(searchFilter);
+//        String keyword = jsonObject.getString("keyword");
+//        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
+//        List<Sort> sortList = new ArrayList<>();
+//        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, new Long(1)));
+//        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+//        pageParams.getFilters().put("pt_ispublish", Constant.YES);
+//        pageParams.getFilters().put("pt_ifopen", Constant.YES);
+//        pageParams.getFilters().put("pt_overdue", Constant.YES);
+//        pageParams.getFilters().put("pt_result", Constant.YES);
+////        pageParams.getFilters().put("pt_status", "待投标");
+//        return searchService.searchPurcTenderIds(keyword, pageParams);
+//    }
 
     /**
      * 作为采购方，查看发出的招标单

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

@@ -189,15 +189,15 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             url : "/tender",
             templateUrl : "static/tpl/index/sale/tenderlist.html",
             controller : 'SaleTenderCtrl'
-            /* 平台公开招标列表 */
-        }).state('sale.opentenderlist', {
-            url : "/opentender",
-            templateUrl : "static/tpl/index/sale/opentenderlist.html",
-            controller : 'SaleOpenTenderCtrl'
-        }).state('sale.todo.opentenderlist', {
-            url : "/opentender",
-            templateUrl : "static/tpl/index/sale/opentenderlist.html",
-            controller : 'SaleOpenTenderCtrl'
+        //     /* 平台公开招标列表 */
+        // }).state('sale.opentenderlist', {
+        //     url : "/opentender",
+        //     templateUrl : "static/tpl/index/sale/opentenderlist.html",
+        //     controller : 'SaleOpenTenderCtrl'
+        // }).state('sale.todo.opentenderlist', {
+        //     url : "/opentender",
+        //     templateUrl : "static/tpl/index/sale/opentenderlist.html",
+        //     controller : 'SaleOpenTenderCtrl'
             /* 公开招标单转投标单 */
         }).state('sale.opentender', {
             url : "/opentender/:id",
@@ -419,8 +419,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             url : "/enterpriseList",
             templateUrl : "static/tpl/index/baseInfo/enterpriseList.html",
             controller: 'EnterpriseListCtrl'
-        }).state('baseInfo.tenderDetail', {
-            url : "/tenderDetail",
+        }).state('baseInfo.openTenderList', {
+            url : "/openTenderList",
             templateUrl : "static/tpl/index/baseInfo/open_tender.html",
             controller: 'SaleOpenTenderCtrl'
         }).state('baseInfo.home', {
@@ -10470,6 +10470,10 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
         };
 
     }]);
+
+    /**
+     * 新增招标单
+     */
     app.controller('PurcNewTenderCtrl', ['$scope', '$filter', 'PurcTender', 'ngTableParams', 'toaster', 'BaseService', '$stateParams', '$modal', '$rootScope', '$upload', 'ShipAddress', '$http', 'AuthenticationService', 'KindAPI', 'BrandActiveAPI', 'Search', 'ComponentActiveAPI',function($scope, $filter, PurcTender, ngTableParams, toaster, BaseService, $stateParams, $modal, $rootScope, $upload, ShipAddress, $http, AuthenticationService, KindAPI, BrandActiveAPI, Search, ComponentActiveAPI) {
 
         // 录入人
@@ -11121,9 +11125,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             item[openParam] = !item[openParam];
         };
     }]);
-    /**
-     * 新增招标单
-     */
 
 
     //类目选择模态框(招标产品明细)
@@ -11486,21 +11487,23 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
      */
     app.controller('SaleOpenTenderCtrl', ['$scope', '$filter', 'PurcTender', 'ngTableParams', 'toaster', 'BaseService', '$stateParams', '$modal', '$rootScope', 'AccountEnterprise', function($scope, $filter, PurcTender, ngTableParams, toaster, BaseService, $stateParams, $modal, $rootScope, AccountEnterprise) {
     	BaseService.scrollBackToTop();
-    	$scope.active = 'todo';
+        $scope.active = 'all';
         $scope.condition = {dateZone: 1};
-        $scope.setActive = function(state) {
-            if($scope.active != state) {
-                $scope.active = state;
-                if($scope.tableParams.page() == 1)
-                    $scope.tableParams.reload();
-                else
-                    $scope.tableParams.page(1);
-            }
-        };
+        // $scope.setActive = function(state) {
+        //     if($scope.active != state) {
+        //         $scope.active = state;
+        //         if($scope.tableParams.page() == 1)
+        //             $scope.tableParams.reload();
+        //         else
+        //             $scope.tableParams.page(1);
+        //     }
+        // };
 
         var getOpenState = function(active) {
             var fn = 'getOpenAll';
             switch(active) {
+                case 'all':
+                    fn = 'getOpenAll';break;
                 // case 'done':
                 //     fn = 'getOpenDone';break;
                 case 'todo':
@@ -11513,10 +11516,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             return fn;
         };
 
-
         $scope.tableParams = new ngTableParams({
             page : 1,
-            count : 5,
+            count : 10,
             sorting: {
                 'tender.endDate': 'desc',
                 'tender.enterprise.enName': 'asc',
@@ -11524,7 +11526,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             }
         }, {
             total : 0,
-            counts: [5, 10, 25, 50],
+            counts: [10, 25, 50, 100],
             getData : function($defer, params) {
                 $scope.loading = true;
                 var pageParams = params.url();
@@ -11770,11 +11772,11 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
                 $scope.loading = false;
                 toaster.pop('info', '成功', '投标成功');
                 // $window.location.reload();
-                if (tender.ifOpen) { // 根据是否公开，选择跳转
-                    window.location.hash = '#/sale/opentender';
-                } else {
+                // if (tender.ifOpen) { // 根据是否公开，选择跳转
+                //     window.location.hash = '#/sale/opentender';
+                // } else {
                     window.location.hash = '#/sale/tender';
-                }
+                // }
             }, function(response){
                 $scope.loading = false;
                 toaster.pop('error', '投标失败', '出现异常，投标失败');
@@ -11937,11 +11939,11 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
                 $scope.loading = false;
                 toaster.pop('info', '成功', '投标成功');
                 // $window.location.reload();
-                if (tender.ifOpen) { // 根据是否公开，选择跳转
-                    window.location.hash = '#/sale/opentender';
-                } else {
+                // if (tender.ifOpen) { // 根据是否公开，选择跳转
+                //     window.location.hash = '#/sale/opentender';
+                // } else {
                     window.location.hash = '#/sale/tender';
-                }
+                // }
             }, function(response){
                 $scope.loading = false;
                 toaster.pop('error', '投标失败', '出现异常，投标失败');