Browse Source

招标日期限制,保存方法修改

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7878 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
dongbw 9 years ago
parent
commit
2ba9ec5199
1 changed files with 11 additions and 9 deletions
  1. 11 9
      src/main/webapp/resources/js/index/app.js

+ 11 - 9
src/main/webapp/resources/js/index/app.js

@@ -11066,7 +11066,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
                 }
             }
         };
-        /*$scope.publishSaved = function(tender) {
+        $scope.publishSaved = function(tender) {
             var now = new Date() + 1; // 投标截止日为当天的均可以提交
             if (tender.endDate < now) {
                 toaster.pop('warning', '警告', '单据已过期,请重新设置日期');
@@ -11093,23 +11093,25 @@ 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');
         };
 
         $scope.getMinDate = function() {
-            var now = new Date();
-            now = now.setDate(now.getDate()+1);
-            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');
+            // var now = new Date();
+            // now = now.setDate(now.getDate()+1);
+            // var minDate = angular.copy($scope.tender.endDate);
+            // minDate = minDate.setDate(minDate.getDate() + 1);
+            var minDate = $scope.tender.endDate.getTime() + 24*60*60*1000 + 1; // 不能选相同一天
+            return $scope.tender.endDate ? $filter('date')(minDate, 'yyyy-MM-dd'):$filter('date')(new Date(), 'yyyy-MM-dd');
         };
 
         $scope.getMaxDate = function() {
-            var maxDate = angular.copy($scope.tender.publishDate);
-            maxDate = maxDate.setDate(maxDate.getDate() - 1);
+            // var maxDate = angular.copy($scope.tender.publishDate);
+            // maxDate = maxDate.setDate(maxDate.getDate() - 1);
+            var maxDate = $scope.tender.publishDate.getTime() - 1; // 不能选同一天
             return $scope.tender.publishDate ? $filter('date')(maxDate, 'yyyy-MM-dd'):"";
         };