招标信息投标截止日期和公布结果日期填写限制

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

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

@@ -422,7 +422,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
         }).state('baseInfo.tenderDetail', {
             url : "/tenderDetail",
             templateUrl : "static/tpl/index/baseInfo/open_tender.html",
-            // controller: 'EnterpriseListCtrl'
+            controller: 'SaleOpenTenderCtrl'
         }).state('baseInfo.home', {
             url : "/enterpriseList",
             templateUrl : "static/tpl/index/baseInfo/enterpriseList.html",
@@ -2598,6 +2598,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             $scope.vendors.splice(index, 1);
         };
 
+
 		// 物料信息
 		$scope.tableParams = new ngTableParams({
 			page : 1, 
@@ -10777,9 +10778,19 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             PurcTender.getOne({id: $stateParams.id}, function(data){
                 data.$editing = false;
                 $scope.tender = data;
+                $scope.tenderProd = data.purchaseTenderProds;
                 parseCertificate($scope.tender.certificate);
                 $scope.firstProd = data.purchaseTenderProds[0];
-                console.log($scope.tender);
+                angular.forEach(data.purchaseTenderProds[0].saleTenderItems, function(item) {
+                    if (!$scope.tenderProd.enterpriseBaseInfo) {// 不存在就先创建
+                        $scope.tenderProd.enterpriseBaseInfo = [{}];
+                        $scope.tenderProd.enterpriseBaseInfo.splice(0, 1, item.saleTender.enterpriseBaseInfo);
+                    } else {
+                        $scope.tenderProd.enterpriseBaseInfo.push(item.saleTender.enterpriseBaseInfo);
+                    }
+                });
+                $rootScope.tenderVendor = $scope.tenderProd.enterpriseBaseInfo;
+                console.log($scope.tenderProd.enterpriseBaseInfo);
                 $scope.loading  = false;
 
                 $scope.attaches = $scope.tender.tenderAttaches;
@@ -10855,6 +10866,24 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             $scope.tenderProd.enterpriseBaseInfo.splice(index, 1);
         };
 
+        // 删除供应商时，后台删除投标单
+        $scope.removeSaleTender = function (tender, vendUU) {
+            PurcTender.removeSaleTender ({}, {tender : tender, vendUU : vendUU}, function(data) {
+
+            }, function(response) {
+                toaster.pop('error', '提示', response.data);
+            });
+        };
+
+        // 删除产品明细时，后台删除产品明细
+        $scope.deleteProd = function (tenderProdId) {
+            PurcTender.deleteProd ({}, {tenderProdId : tenderProdId}, function(data) {
+
+            }, function(response) {
+                toaster.pop('error', '提示', response.data);
+            });
+        };
+
         // // 查找客户物料
         // $scope.dbfindCustProd = function(){
         //     if($scope.item.$editing) {
@@ -10979,8 +11008,62 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             });
         };
 
-        // 发布（在录入状态）
-        $scope.publishSaved = function(tender) {
+        // 更新和发布（在录入状态）
+        $scope.updateSaved = function(isPublish){
+            if (!$scope.tender.ifOpen && (!$scope.tenderProd.enterpriseBaseInfo || $scope.tenderProd.enterpriseBaseInfo.length === 0)) { // 指定供应商招标，而未选择供应商时
+                toaster.pop('info','提示','请先指定供应商');
+            } else {
+                $scope.loading = true;
+                // --组装证照要求
+                var myCertificate = [];
+                angular.forEach($scope.certificates, function(certificate) {
+                    if (certificate.checked) {
+                        myCertificate.push(certificate.name);
+                    }
+                });
+                $scope.tender.certificate = myCertificate.join(',');
+
+                if($scope.tender.endDate instanceof Date) {
+                    $scope.tender.endDate = $scope.tender.endDate.getTime();
+                }
+                if($scope.tender.publishDate instanceof Date) {
+                    $scope.tender.publishDate = $scope.tender.publishDate.getTime();
+                }
+
+                $scope.tender.purchaseTenderProds = $scope.tenderProd;
+                for (var i = 0; i < $scope.tender.purchaseTenderProds.length; i++) {
+                    $scope.tender.purchaseTenderProds[i].index = i + 1;
+                }
+                $scope.tender.tenderAttaches = $scope.attaches;
+                if ($scope.tender.shipAddress.address !== null && $scope.tender.shipAddress.addressdet !== null && $scope.tender.shipAddress.receriver !== null && $scope.tender.shipAddress.usertel !== null) {
+                    $scope.tender.shipAddress = $scope.tender.shipAddress.address + $scope.tender.shipAddress.addressdet + ' ' + $scope.tender.shipAddress.receiver + ' ' + $scope.tender.shipAddress.usertel;
+                }
+                if (isPublish) { // 发布
+                    toaster.pop('info', '提示', '正在发布，请稍候');
+                    PurcTender.publishSaved({tender: $scope.tender, enterpriseBaseInfo: $scope.tenderProd.enterpriseBaseInfo}, {},  function(data){
+                        sleep(1500); //当前方法暂停1.5秒
+                        $scope.loading = false;
+                        toaster.pop('success', '成功', '发布成功');
+                        window.location.hash = '#/purc/tender';
+                    }, function(response){
+                        $scope.loading = false;
+                        toaster.pop('error', '发布失败', response.data);
+                    });
+                } else { // 保存
+                    toaster.pop('info', '提示', '正在保存，请稍候');
+                    PurcTender.updateSaved({tender: $scope.tender, enterpriseBaseInfo: $scope.tenderProd.enterpriseBaseInfo}, {},  function(data) {
+                        $scope.loading = false;
+                        sleep(1500); //当前方法暂停1.5秒  给更新索引留点时间
+                        toaster.pop('success', '成功', '保存成功');
+                        window.location.hash = '#/purc/tender';
+                    }, function(response){
+                        $scope.loading = false;
+                        toaster.pop('error', '保存失败', response.data);
+                    });
+                }
+            }
+        };
+        /*$scope.publishSaved = function(tender) {
             var now = new Date() + 1; // 投标截止日为当天的均可以提交
             if (tender.endDate < now) {
                 toaster.pop('warning', '警告', '单据已过期，请重新设置日期');
@@ -11007,7 +11090,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
                     window.location.hash = '#/purc/tender';
                 });
             }
-        };
+        };*/
 
         $scope.currentDay = function() {
             return $filter('date')(new Date(), 'yyyy-MM-dd');
@@ -11016,7 +11099,15 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
         $scope.getMinDate = function() {
             var now = new Date();
             now = now.setDate(now.getDate()+1);
-            return $scope.tender.endDate ? $filter('date')($scope.tender.endDate, 'yyyy-MM-dd'):$filter('date')(now, 'yyyy-MM-dd');
+            var minDate = angular.copy($scope.tender.endDate);
+            minDate = minDate.setDate(minDate.getDate() + 1);
+            return $scope.tender.endDate ? $filter('date')(minDate, 'yyyy-MM-dd'):$filter('date')(now, 'yyyy-MM-dd');
+        };
+
+        $scope.getMaxDate = function() {
+            var maxDate = angular.copy($scope.tender.publishDate);
+            maxDate = maxDate.setDate(maxDate.getDate() - 1);
+            return $scope.tender.publishDate ? $filter('date')(maxDate, 'yyyy-MM-dd'):"";
         };
 
         $scope.openDatePicker = function($event, item, openParam) {
@@ -11339,15 +11430,13 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
                         // $scope.keywordXls = angular.copy($scope.keyword); // 保存当前取值的关键词  做导出时需要的字段
                         angular.forEach(page.content, function(purcTender) {
                             angular.forEach(purcTender.purchaseTenderProds[0].saleTenderItems, function(saleTenderItem) {
+                                purcTender.vendorHasBid = false; // 未投标
                                 if ($scope.currentEn.uu === saleTenderItem.saleTender.vendUU && saleTenderItem.price !== null) { // 存在本企业投标明细，且价格已填，判定为已投标
-                                    purcTender.vendorHasBid = true; // 是否投标
+                                    purcTender.vendorHasBid = true; // 已投标
+                                    purcTender.applyVendor = false;  // 未中标
                                     if (saleTenderItem.applyStatus === 1) {
                                         purcTender.applyVendor = true;  // 是否中标
-                                    } else {
-                                        purcTender.applyVendor = false;  // 是否中标
                                     }
-                                } else {
-                                    purcTender.vendorHasBid = false; // 是否投标
                                 }
                             });
                         });