修改了单据选择日期会刷新数据的bug

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

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

@@ -2298,11 +2298,17 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
   			$event.preventDefault();
   		    $event.stopPropagation();
   		    item[openParam] = !item[openParam];
+  		};
+
+  		$scope.openFilterDatePicker = function($event, item, openParam) {
+  			$event.preventDefault();
+  		    $event.stopPropagation();
+  		    item[openParam] = !item[openParam];
             if($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]){
                 $scope.tableParams.reload();
             }
   		};
-  		
+
   		$scope.parseDate = function(dateStr) {
   			if(dateStr)
   				return Date.parse(dateStr, 'yyyy-MM-dd');
@@ -2525,6 +2531,12 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		$scope.openDatePicker = function($event, item, openParam) {
             $event.preventDefault();
             $event.stopPropagation();
+            item[openParam] = !item[openParam];
+		};
+
+		$scope.openFilterDatePicker = function($event, item, openParam) {
+            $event.preventDefault();
+            $event.stopPropagation();
             item[openParam] = !item[openParam];
             if($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]){
                 $scope.tableParams.reload();
@@ -2828,11 +2840,17 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$event.preventDefault();
 		    $event.stopPropagation();
 		    item[openParam] = !item[openParam];
+		};
+
+		$scope.openFilterDatePicker = function($event, item, openParam) {
+			$event.preventDefault();
+		    $event.stopPropagation();
+		    item[openParam] = !item[openParam];
             if($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]){
                 $scope.tableParams.reload();
             }
 		};
-		
+
 		$scope.onReplyClick = function(change) {
 			if(change.$agreed) {
 				var reply = {id: change.id, agreed: Number(change.$agreed), replyRemark: change.replyRemark};
@@ -3876,11 +3894,17 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$event.preventDefault();
 		    $event.stopPropagation();
 		    item[openParam] = !item[openParam];
+		};
+
+		$scope.openFilterDatePicker = function($event, item, openParam) {
+			$event.preventDefault();
+		    $event.stopPropagation();
+		    item[openParam] = !item[openParam];
             if($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]){
                 $scope.tableParams.reload();
             }
 		};
-		
+
 		// 搜索框回车
 		$scope.onSearch = function() {
 			$scope.tableParams.page(1);
@@ -5667,11 +5691,17 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$event.preventDefault();
 		    $event.stopPropagation();
 		    item[openParam] = !item[openParam];
+		};
+
+		$scope.openFilterDatePicker = function($event, item, openParam) {
+			$event.preventDefault();
+		    $event.stopPropagation();
+		    item[openParam] = !item[openParam];
             if($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]){
                 $scope.tableParams.reload();
             }
 		};
-		
+
 		// 搜索框回车
 		$scope.onSearch = function() {
 			$scope.tableParams.page(1);
@@ -6297,11 +6327,17 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$event.preventDefault();
 		    $event.stopPropagation();
 		    item[openParam] = !item[openParam];
+		};
+
+		$scope.openFilterDatePicker = function($event, item, openParam) {
+			$event.preventDefault();
+		    $event.stopPropagation();
+		    item[openParam] = !item[openParam];
             if($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]){
                 $scope.tableParams.reload();
             }
 		};
-		
+
 		$scope.openSend = function(index, sample) {
 			var modalInstance = $modal.open({
 				animation: true,
@@ -6468,11 +6504,17 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$event.preventDefault();
 		    $event.stopPropagation();
 		    item[openParam] = !item[openParam];
+		};
+
+		$scope.openFilterDatePicker = function($event, item, openParam) {
+			$event.preventDefault();
+		    $event.stopPropagation();
+		    item[openParam] = !item[openParam];
             if($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]){
                 $scope.tableParams.reload();
             }
 		};
-		
+
 		$scope.parseDate = function(dateStr) {
 			if(dateStr)
 				return Date.parse(dateStr, 'yyyy-MM-dd');
@@ -6649,11 +6691,17 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$event.preventDefault();
 		    $event.stopPropagation();
 		    item[openParam] = !item[openParam];
+		};
+
+		$scope.openFilterDatePicker = function($event, item, openParam) {
+			$event.preventDefault();
+		    $event.stopPropagation();
+		    item[openParam] = !item[openParam];
             if($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]){
                 $scope.tableParams.reload();
             }
 		};
-		
+
   		$scope.parseDate = function(dateStr) {
   			if(dateStr)
   				return Date.parse(dateStr, 'yyyy-MM-dd');
@@ -6782,11 +6830,17 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$event.preventDefault();
 		    $event.stopPropagation();
 		    item[openParam] = !item[openParam];
+		};
+
+		$scope.openFilterDatePicker = function($event, item, openParam) {
+			$event.preventDefault();
+		    $event.stopPropagation();
+		    item[openParam] = !item[openParam];
             if($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]){
                 $scope.tableParams.reload();
             }
 		};
-		
+
 		// 搜索框回车
 		$scope.onSearch = function() {
 			$scope.tableParams.page(1);
@@ -6896,11 +6950,17 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$event.preventDefault();
 		    $event.stopPropagation();
 		    item[openParam] = !item[openParam];
+		};
+
+		$scope.openFilterDatePicker = function($event, item, openParam) {
+			$event.preventDefault();
+		    $event.stopPropagation();
+		    item[openParam] = !item[openParam];
             if($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]){
                 $scope.tableParams.reload();
             }
 		};
-		
+
 		// 搜索框回车
 		$scope.onSearch = function(keyword) {
             $scope.keyword = keyword;
@@ -6990,11 +7050,17 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$event.preventDefault();
 		    $event.stopPropagation();
 		    item[openParam] = !item[openParam];
+		};
+
+		$scope.openFilterDatePicker = function($event, item, openParam) {
+			$event.preventDefault();
+		    $event.stopPropagation();
+		    item[openParam] = !item[openParam];
             if($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]){
                 $scope.tableParams.reload();
             }
 		};
-		
+
 		// 搜索框回车
 		$scope.onSearch = function() {
 			$scope.tableParams.page(1);
@@ -7083,11 +7149,17 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$event.preventDefault();
 		    $event.stopPropagation();
 		    item[openParam] = !item[openParam];
+		};
+
+		$scope.openFilterDatePicker = function($event, item, openParam) {
+			$event.preventDefault();
+		    $event.stopPropagation();
+		    item[openParam] = !item[openParam];
             if($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]){
                 $scope.tableParams.reload();
             }
 		};
-		
+
 		// 搜索框回车
 		$scope.onSearch = function() {
 			$scope.tableParams.page(1);
@@ -7174,11 +7246,17 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$event.preventDefault();
 		    $event.stopPropagation();
 		    item[openParam] = !item[openParam];
+		};
+
+		$scope.openFilterDatePicker = function($event, item, openParam) {
+			$event.preventDefault();
+		    $event.stopPropagation();
+		    item[openParam] = !item[openParam];
             if($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]){
                 $scope.tableParams.reload();
             }
 		};
-		
+
 		$scope.parseDate = function(dateStr) {
 			if(dateStr)
 				return Date.parse(dateStr, 'yyyy-MM-dd');
@@ -7291,11 +7369,17 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$event.preventDefault();
 		    $event.stopPropagation();
 		    item[openParam] = !item[openParam];
+		};
+
+		$scope.openFilterDatePicker = function($event, item, openParam) {
+			$event.preventDefault();
+		    $event.stopPropagation();
+		    item[openParam] = !item[openParam];
             if($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]){
                 $scope.tableParams.reload();
             }
 		};
-		
+
 		// 计算单据的商品总数
 		$scope.getTotalProd = function(check) {
 			var total = 0;
@@ -7440,11 +7524,17 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$event.preventDefault();
 		    $event.stopPropagation();
 		    item[openParam] = !item[openParam];
+		};
+
+		$scope.openFilterDatePicker = function($event, item, openParam) {
+			$event.preventDefault();
+		    $event.stopPropagation();
+		    item[openParam] = !item[openParam];
             if($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]){
                 $scope.tableParams.reload();
             }
 		};
-		
+
 		// 计算单据的商品总数
 		$scope.getTotalProd = function(check) {
 			var total = 0;
@@ -9515,6 +9605,12 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 $event.preventDefault();
                 $event.stopPropagation();
                 item[openParam] = !item[openParam];
+            };
+
+            $scope.openFilterDatePicker = function ($event, item, openParam) {
+                $event.preventDefault();
+                $event.stopPropagation();
+                item[openParam] = !item[openParam];
                 if ($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]) {
                     $scope.tableParams.reload();
                 }
@@ -9755,11 +9851,17 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$event.preventDefault();
 		    $event.stopPropagation();
 		    item[openParam] = !item[openParam];
+		};
+
+		$scope.openFilterDatePicker = function($event, item, openParam) {
+			$event.preventDefault();
+		    $event.stopPropagation();
+		    item[openParam] = !item[openParam];
             if($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]){
                 $scope.tableParams.reload();
             }
 		};
-		
+
 		// 搜索框回车
 		$scope.onSearch = function() {
 			$scope.tableParams.page(1);
@@ -9854,11 +9956,17 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$event.preventDefault();
 		    $event.stopPropagation();
 		    item[openParam] = !item[openParam];
+		};
+
+		$scope.openFilterDatePicker = function($event, item, openParam) {
+			$event.preventDefault();
+		    $event.stopPropagation();
+		    item[openParam] = !item[openParam];
             if($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]){
                 $scope.tableParams.reload();
             }
 		};
-		
+
 		// 搜索框回车
 		$scope.onSearch = function() {
 			$scope.tableParams.page(1);
@@ -9951,11 +10059,17 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$event.preventDefault();
 		    $event.stopPropagation();
 		    item[openParam] = !item[openParam];
+		};
+
+		$scope.openFilterDatePicker = function($event, item, openParam) {
+			$event.preventDefault();
+		    $event.stopPropagation();
+		    item[openParam] = !item[openParam];
             if($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]){
                 $scope.tableParams.reload();
             }
 		};
-		
+
 		// 打开回复
 		$scope.openReply = function(change) {
 			change.$editing = true;
@@ -10100,11 +10214,17 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$event.preventDefault();
 		    $event.stopPropagation();
 		    item[openParam] = !item[openParam];
+		};
+
+		$scope.openFilterDatePicker = function($event, item, openParam) {
+			$event.preventDefault();
+		    $event.stopPropagation();
+		    item[openParam] = !item[openParam];
             if($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]){
                 $scope.tableParams.reload();
             }
 		};
-		
+
 		// 打开回复
 		$scope.openReply = function(change) {
 			change.$editing = true;
@@ -13095,6 +13215,12 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $event.preventDefault();
             $event.stopPropagation();
             item[openParam] = !item[openParam];
+        };
+
+        $scope.openFilterDatePicker = function($event, item, openParam) {
+            $event.preventDefault();
+            $event.stopPropagation();
+            item[openParam] = !item[openParam];
             if($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]){
                 $scope.tableParams.reload();
             }
@@ -14139,6 +14265,12 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $event.preventDefault();
             $event.stopPropagation();
             item[openParam] = !item[openParam];
+        };
+
+        $scope.openFilterDatePicker = function($event, item, openParam) {
+            $event.preventDefault();
+            $event.stopPropagation();
+            item[openParam] = !item[openParam];
             if($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]){
                 $scope.tableParams.reload();
             }
@@ -15345,6 +15477,12 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $event.preventDefault();
             $event.stopPropagation();
             item[openParam] = !item[openParam];
+        };
+
+        $scope.openFilterDatePicker = function($event, item, openParam) {
+            $event.preventDefault();
+            $event.stopPropagation();
+            item[openParam] = !item[openParam];
             if($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]){
                 $scope.tableParams.reload();
             }

src/main/webapp/resources/tpl/index/fa/apBill.html

@@ -149,10 +149,10 @@
 								   ng-required="true" max-date = "condition.dateTo"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$fromOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -164,10 +164,10 @@
 								   ng-required="true" min-date = "condition.dateFrom"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$toOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/fa/apCheck.html

@@ -176,10 +176,10 @@
 								   ng-required="true" max-date = "condition.dateTo"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$fromOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -191,10 +191,10 @@
 								   ng-required="true" min-date = "condition.dateFrom"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$toOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/fa/arCheck.html

@@ -143,10 +143,10 @@
 								   ng-required="true" max-date = "condition.dateTo"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$fromOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -158,10 +158,10 @@
 								   ng-required="true" min-date = "condition.dateFrom"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$toOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/make/accept.html

@@ -142,10 +142,10 @@
 								   ng-required="true" max-date = "condition.dateTo"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$fromOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -157,10 +157,10 @@
 								   ng-required="true" min-date = "condition.dateFrom"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$toOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/make/change.html

@@ -141,10 +141,10 @@
                                    ng-required="true" max-date = "condition.dateTo"
                                    current-text="今天" clear-text="清除" close-text="关闭"
                                    datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                                   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+                                   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
                             <span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-                                    ng-click="openDatePicker($event, condition, '$fromOpened')">
+                                    ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -156,10 +156,10 @@
                                    ng-required="true" max-date = "condition.dateFrom"
                                    current-text="今天" clear-text="清除" close-text="关闭"
                                    datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                                   ng-focus="openDatePicker($event, condition, '$toOpened')">
+                                   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
                             <span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-                                    ng-click="openDatePicker($event, condition, '$toOpened')">
+                                    ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/make/order.html

@@ -176,10 +176,10 @@
 								   ng-required="true" max-date = "condition.dateTo"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$fromOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -191,10 +191,10 @@
 								   ng-required="true" min-date = "condition.dateFrom"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$toOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/make/outorder.html

@@ -144,10 +144,10 @@
 								   ng-required="true" max-date = "condition.dateTo"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$fromOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -159,10 +159,10 @@
 								   ng-required="true" min-date = "condition.dateFrom"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$toOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/make/returns.html

@@ -147,10 +147,10 @@
 								   ng-required="true" max-date = "condition.dateTo"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$fromOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -162,10 +162,10 @@
 								   ng-required="true" min-date = "condition.dateFrom"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$toOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/purc/deputyOrder.html

@@ -252,10 +252,10 @@
                                            ng-required="true" max-date = "condition.dateTo"
                                            current-text="今天" clear-text="清除" close-text="关闭"
                                            datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                                           ng-focus="openDatePicker($event, condition, '$fromOpened')">
+                                           ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
                                     <span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-                                    ng-click="openDatePicker($event, condition, '$fromOpened')">
+                                    ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -267,10 +267,10 @@
                                            ng-required="true" min-date = "condition.dateFrom"
                                            current-text="今天" clear-text="清除" close-text="关闭"
                                            datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                                           ng-focus="openDatePicker($event, condition, '$toOpened')">
+                                           ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
                                     <span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-                                    ng-click="openDatePicker($event, condition, '$toOpened')">
+                                    ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/purc/inquiry.html

@@ -363,10 +363,10 @@ margin-left: 55px;
 								   ng-required="true" max-date = "condition.dateTo"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$fromOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -378,10 +378,10 @@ margin-left: 55px;
 								   ng-required="true" min-date = "condition.dateFrom"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$toOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/purc/order.html

@@ -224,10 +224,10 @@
 								   ng-required="true" max-date = "condition.dateTo"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$fromOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -239,10 +239,10 @@
 								   ng-required="true" min-date = "condition.dateFrom"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$toOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/purc/tenderlist.html

@@ -227,10 +227,10 @@
                                            ng-required="true" max-date = "condition.dateTo"
                                            current-text="今天" clear-text="清除" close-text="关闭"
                                            datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                                           ng-focus="openDatePicker($event, condition, '$fromOpened')">
+                                           ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
                                     <span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-                                    ng-click="openDatePicker($event, condition, '$fromOpened')">
+                                    ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -242,10 +242,10 @@
                                            ng-required="true" min-date = "condition.dateFrom"
                                            current-text="今天" clear-text="清除" close-text="关闭"
                                            datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                                           ng-focus="openDatePicker($event, condition, '$toOpened')">
+                                           ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
                                     <span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-                                    ng-click="openDatePicker($event, condition, '$toOpened')">
+                                    ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/qc/MRB.html

@@ -147,10 +147,10 @@
 								   ng-required="true" max-date = "condition.dateTo"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$fromOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -162,10 +162,10 @@
 								   ng-required="true" min-date = "condition.dateFrom"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$toOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/qc/badIn.html

@@ -146,10 +146,10 @@
                                    ng-required="true" max-date = "condition.dateTo"
                                    current-text="今天" clear-text="清除" close-text="关闭"
                                    datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                                   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+                                   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
                             <span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-                                    ng-click="openDatePicker($event, condition, '$fromOpened')">
+                                    ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -161,10 +161,10 @@
                                    ng-required="true" min-date = "condition.dateFrom"
                                    current-text="今天" clear-text="清除" close-text="关闭"
                                    datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                                   ng-focus="openDatePicker($event, condition, '$toOpened')">
+                                   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
                             <span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-                                    ng-click="openDatePicker($event, condition, '$toOpened')">
+                                    ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/qc/badOut.html

@@ -146,10 +146,10 @@
                                    ng-required="true" max-date = "condition.dateTo"
                                    current-text="今天" clear-text="清除" close-text="关闭"
                                    datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                                   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+                                   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
                             <span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-                                    ng-click="openDatePicker($event, condition, '$fromOpened')">
+                                    ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -161,10 +161,10 @@
                                    ng-required="true" min-date = "condition.dateFrom"
                                    current-text="今天" clear-text="清除" close-text="关闭"
                                    datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                                   ng-focus="openDatePicker($event, condition, '$toOpened')">
+                                   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
                             <span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-                                    ng-click="openDatePicker($event, condition, '$toOpened')">
+                                    ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/sale/accept.html

@@ -147,10 +147,10 @@
 								   ng-required="true" max-date = "condition.dateTo"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$fromOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -162,10 +162,10 @@
 								   ng-required="true" min-date = "condition.dateFrom"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$toOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/sale/approval.html

@@ -194,10 +194,10 @@
 								   ng-required="true" max-date = "condition.dateTo"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$fromOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -209,10 +209,10 @@
 								   ng-required="true" min-date = "condition.dateFrom"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$toOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/sale/change.html

@@ -174,10 +174,10 @@
 								   ng-required="true" max-date = "condition.dateTo"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$fromOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -189,10 +189,10 @@
 								   ng-required="true" min-date = "condition.dateFrom"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$toOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/sale/inquiry_mould.html

@@ -252,10 +252,10 @@ tbody td div.text-mould {
 								   ng-required="true" max-date = "condition.dateTo"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$fromOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -267,10 +267,10 @@ tbody td div.text-mould {
 								   ng-required="true" min-date = "condition.dateFrom"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$toOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/sale/order.html

@@ -262,10 +262,10 @@
 								   ng-required="true" max-date = "condition.dateTo"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$fromOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -277,10 +277,10 @@
 								   ng-required="true" min-date = "condition.dateFrom"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$toOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/sale/quotation_list.html

@@ -95,10 +95,10 @@
 								   ng-required="true" max-date = "condition.dateTo"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$fromOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -110,10 +110,10 @@
 								   ng-required="true" min-date = "condition.dateFrom"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$toOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/sale/returns.html

@@ -147,10 +147,10 @@
 								   ng-required="true" max-date = "condition.dateTo"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$fromOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -162,10 +162,10 @@
 								   ng-required="true" min-date = "condition.dateFrom"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$toOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/sale/sample.html

@@ -192,10 +192,10 @@
 								   ng-required="true" max-date = "condition.dateTo"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$fromOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -207,10 +207,10 @@
 								   ng-required="true" min-date = "condition.dateFrom"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$toOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/sale/send.html

@@ -192,10 +192,10 @@
 								   ng-required="true" max-date = "condition.dateTo"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$fromOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -207,10 +207,10 @@
 								   ng-required="true" min-date = "condition.dateFrom"
 								   current-text="今天" clear-text="清除" close-text="关闭"
 								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+								   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
 							<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$toOpened')">
+									ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>

src/main/webapp/resources/tpl/index/sale/tenderlist.html

@@ -271,10 +271,10 @@
                                            ng-required="true" max-date = "condition.dateTo"
                                            current-text="今天" clear-text="清除" close-text="关闭"
                                            datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                                           ng-focus="openDatePicker($event, condition, '$fromOpened')">
+                                           ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
                                     <span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-                                    ng-click="openDatePicker($event, condition, '$fromOpened')">
+                                    ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
@@ -286,10 +286,10 @@
                                            ng-required="true" min-date = "condition.dateFrom"
                                            current-text="今天" clear-text="清除" close-text="关闭"
                                            datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                                           ng-focus="openDatePicker($event, condition, '$toOpened')">
+                                           ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
                                     <span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-                                    ng-click="openDatePicker($event, condition, '$toOpened')">
+                                    ng-click="openFilterDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>