Просмотр исходного кода

【商务平台】 财务对账,更新关键词拼接方法,将“,”改为“|”

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@6793 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 9 лет назад
Родитель
Сommit
5f6761baed
1 измененных файлов с 5 добавлено и 4 удалено
  1. 5 4
      src/main/webapp/resources/js/index/app.js

+ 5 - 4
src/main/webapp/resources/js/index/app.js

@@ -4595,11 +4595,12 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 				$scope.condition.dateTo = ($scope.sdateTo || 0);
 				$scope.condition.dateTo = ($scope.sdateTo || 0);
 			}
 			}
 			$scope.condition.venduuorname = $scope.vuuorname;
 			$scope.condition.venduuorname = $scope.vuuorname;
+			//物料名称和物料规格存在特殊符号,用|作分割符
 			$scope.keywordXls = angular.copy(($scope.condition.uuorname == null ? "" : $scope.condition.uuorname)
 			$scope.keywordXls = angular.copy(($scope.condition.uuorname == null ? "" : $scope.condition.uuorname)
-							+ ","+ ($scope.condition.venduuorname == null ? "" : $scope.condition.venduuorname)
-							+ ","+ ($scope.condition.factory == null ? "" : $scope.condition.factory)
-							+ ","+ ($scope.condition.prodTitle == null ? "" : $scope.condition.prodTitle)
-							+ ","+ ($scope.condition.prodSpec == null ? "" : $scope.condition.prodSpec));//保存当前取值的关键词
+							+ "|"+ ($scope.condition.venduuorname == null ? "" : $scope.condition.venduuorname)
+							+ "|"+ ($scope.condition.factory == null ? "" : $scope.condition.factory)
+							+ "|"+ ($scope.condition.prodTitle == null ? "" : $scope.condition.prodTitle)
+							+ "|"+ ($scope.condition.prodSpec == null ? "" : $scope.condition.prodSpec));//保存当前取值的关键词
 			console.log($scope.keywordXls);
 			console.log($scope.keywordXls);
 			$scope.fromDateXls = angular.copy($scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null);//保存当前取值的起始日期
 			$scope.fromDateXls = angular.copy($scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null);//保存当前取值的起始日期
 			$scope.endDateXls = angular.copy($scope.condition.dateTo ? $scope.condition.dateTo.getTime() : null);//保存当前取值的截止日期
 			$scope.endDateXls = angular.copy($scope.condition.dateTo ? $scope.condition.dateTo.getTime() : null);//保存当前取值的截止日期