|
|
@@ -5408,6 +5408,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
$scope.remind = false;
|
|
|
} else if ($scope.active == 'remind') {
|
|
|
$scope.remind = true;
|
|
|
+ } else if ($scope.active == 'all') {
|
|
|
+ $scope.distribute = null;
|
|
|
+ $scope.remind = false;
|
|
|
}
|
|
|
if ($scope.tableParams.page() == 1) {
|
|
|
$scope.tableParams.reload();
|
|
|
@@ -5425,9 +5428,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
page: 1,
|
|
|
count: 20,
|
|
|
sorting: {
|
|
|
-// 'tender.endDate': 'desc',
|
|
|
-// 'tender.enterprise.enName': 'asc',
|
|
|
-// 'tender.code': 'asc'
|
|
|
}
|
|
|
}, {
|
|
|
total: 0,
|
|
|
@@ -5435,7 +5435,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
getData: function ($defer, params) {
|
|
|
$scope.loading = true;
|
|
|
var pageParams = params.url();
|
|
|
-// var realActive = {};
|
|
|
pageParams.searchFilter = { // 筛选条件
|
|
|
keyword: $scope.keyword,
|
|
|
fromDate: getDateTime($scope.condition.dateFrom),
|
|
|
@@ -5446,7 +5445,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
$scope.currentEn = data;
|
|
|
publicInquiry.getUrl({}, function(data) {
|
|
|
$scope.url = data.url;
|
|
|
- if (!$scope.remind) {// 企业商机
|
|
|
+ if ($scope.active == 'enterprise') {// 企业商机
|
|
|
AuthenticationService.getAuthentication().success(function (data) {
|
|
|
$scope.loading = false;
|
|
|
$scope.thisUser = data;
|
|
|
@@ -5475,7 +5474,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
toaster.pop('error', '数据加载失败', err);
|
|
|
});
|
|
|
});
|
|
|
- } else {// 推荐报价信息
|
|
|
+ } else if ($scope.active == 'remind') {// 推荐报价信息
|
|
|
AuthenticationService.getAuthentication().success(function (data) {
|
|
|
$scope.loading = false;
|
|
|
$scope.thisUser = data;
|
|
|
@@ -5497,6 +5496,24 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
toaster.pop('error', '数据加载失败', err);
|
|
|
});
|
|
|
});
|
|
|
+ } else if ($scope.active == 'all') {// 全部
|
|
|
+ $http({
|
|
|
+ method: 'get',
|
|
|
+ dataType: 'json',
|
|
|
+ url: $scope.url + '/inquiry/public',
|
|
|
+ params: {pageNumber: pageParams.page, pageSize: pageParams.count, enUU: $scope.currentEn.uu, keyword: $scope.keyword,
|
|
|
+ fromDate: getDateTime($scope.condition.dateFrom), endDate: getDateTime($scope.condition.dateTo), distribute: $scope.distribute, remind: $scope.remind}
|
|
|
+ }).success(function (response) {
|
|
|
+ $scope.loading = false;
|
|
|
+ if (response) {
|
|
|
+ params.total(response.totalElements);
|
|
|
+ $defer.resolve(response.content);
|
|
|
+ $scope.searchFilterXls = angular.copy(pageParams.searchFilter);//保存当前取值的关键词
|
|
|
+ }
|
|
|
+ }).error(function (err) {
|
|
|
+ $scope.loading = false;
|
|
|
+ toaster.pop('error', '数据加载失败', err);
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
// 顶部滚动消息
|
|
|
@@ -11397,7 +11414,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
};
|
|
|
$scope.updatePassword = function () {
|
|
|
var newPage = window.open("about:black");
|
|
|
- AccountUser.getUpdatePasswordUrl({}, function (data) {
|
|
|
+ AccountUser.getUpdatePasswordUrl({returnUrl: window.location.href}, function (data) {
|
|
|
newPage.location.href = data.url;
|
|
|
});
|
|
|
};
|
hejq