批量修改物料产品时，空值不允许点击更新

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

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

@@ -10142,7 +10142,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
      // 一键匹配
 		$scope.matchall = function() {
 			Products.matchall({}, function(data) {
-				toaster.pop('info', '提示', '匹配成功'+data.size+'标准器件');
+				toaster.pop('info', '提示', '匹配成功'+data.size+'个标准器件');
 				window.location.href = "#/sale/productmatches";
 			}, function(response) {
 				toaster.pop('error', '提示', response.data);
@@ -10186,7 +10186,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		loadData();
 		
 		$scope.okay = function() {
-			console.log($scope.parameter);
 			Products.alterByBatch({parameter: $scope.parameter}, {}, function(data) {
 				$modalInstance.close(data);
 			}, function(response) {
@@ -15965,7 +15964,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		// 一键匹配
 		$scope.matchall = function() {
 			Products.matchall({}, function(data) {
-				toaster.pop('info', '提示', '匹配成功'+data.size+'标准器件');
+				toaster.pop('info', '提示', '匹配成功'+data.size+'个标准器件');
 				window.location.href = "#/approvalFlow/productmatches";
 			}, function(response) {
 				toaster.pop('error', '提示', response.data);
@@ -16679,7 +16678,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
      // 一键匹配
 		$scope.matchall = function() {
 			Products.matchall({}, function(data) {
-				toaster.pop('info', '提示', '匹配成功'+data.size+'标准器件');
+				toaster.pop('info', '提示', '匹配成功'+data.size+'个标准器件');
 				window.location.href = "#/purc/productmatches";
 			}, function(response) {
 				toaster.pop('error', '提示', response.data);

src/main/webapp/resources/tpl/index/baseInfo/modal/updateByBatch_modal.html

@@ -65,6 +65,6 @@
 	</div> -->
 </div>
 <div class="modal-footer">
-	<button class="btn btn-primary" ng-click="okay()" type="button">确定</button>
+	<button class="btn btn-primary" ng-click="okay()" type="button" ng-disabled="parameter.newvalue == null">确定</button>
 	<button class="btn btn-default" ng-click="cancel()" type="button" ng-if="!changed">取消</button>
 </div>