|
|
|
@ -49,17 +49,17 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
controller: 'newOrgCtrl'
|
|
|
|
controller: 'newOrgCtrl'
|
|
|
|
})
|
|
|
|
})
|
|
|
|
}]);
|
|
|
|
}]);
|
|
|
|
app.controller('orgsCtrl', ['$scope', '$http','commonDialog', function ($scope, $http,commonDialog ) {
|
|
|
|
app.controller('orgsCtrl', ['$scope', '$http', 'commonDialog', function ($scope, $http, commonDialog) {
|
|
|
|
$scope.params = {};
|
|
|
|
$scope.params = {};
|
|
|
|
if(($scope.currentUser.role & parseInt('1000000000000', 2)) > 0 && $scope.currentUser.org_id) {
|
|
|
|
if (($scope.currentUser.role & parseInt('1000000000000', 2)) > 0 && $scope.currentUser.org_id) {
|
|
|
|
$scope.params.org_id = $scope.currentUser.org_id;
|
|
|
|
$scope.params.org_id = $scope.currentUser.org_id;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$scope.pagination = {};
|
|
|
|
$scope.pagination = {};
|
|
|
|
$scope.types = angular.copy(types);
|
|
|
|
$scope.types = angular.copy(types);
|
|
|
|
$scope.listOrgs = function (page) {
|
|
|
|
$scope.listOrgs = function (page) {
|
|
|
|
var params = angular.copy( $scope.params);
|
|
|
|
var params = angular.copy($scope.params);
|
|
|
|
params.page = page || $scope.pagination.page || 1;
|
|
|
|
params.page = page || $scope.pagination.page || 1;
|
|
|
|
$http.get('/sys/orgs/listsOrg',{params:params}).then(function (resp) {
|
|
|
|
$http.get('/sys/orgs/listsOrg', {params: params}).then(function (resp) {
|
|
|
|
$scope.orgs_detail = resp.data.data;
|
|
|
|
$scope.orgs_detail = resp.data.data;
|
|
|
|
$scope.pagination = resp.data.pagination;
|
|
|
|
$scope.pagination = resp.data.pagination;
|
|
|
|
})
|
|
|
|
})
|
|
|
|
@ -71,7 +71,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$scope.disableOrg = function (org) {
|
|
|
|
$scope.disableOrg = function (org) {
|
|
|
|
$scope.org =angular.copy(org);
|
|
|
|
$scope.org = angular.copy(org);
|
|
|
|
$scope.org.is_valid = 0;
|
|
|
|
$scope.org.is_valid = 0;
|
|
|
|
commonDialog.confirm({
|
|
|
|
commonDialog.confirm({
|
|
|
|
title: 'Confirm!',
|
|
|
|
title: 'Confirm!',
|
|
|
|
@ -86,7 +86,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
};
|
|
|
|
};
|
|
|
|
$scope.listOrgs(1);
|
|
|
|
$scope.listOrgs(1);
|
|
|
|
}]);
|
|
|
|
}]);
|
|
|
|
app.controller('orgDetailCtrl', ['$scope', '$http', '$state', 'Upload', '$filter','$uibModal','commonDialog','chartParser', 'org','stateMap', function ($scope, $http, $state, Upload,$filter,$uibModal,commonDialog, chartParser,org,stateMap) {
|
|
|
|
app.controller('orgDetailCtrl', ['$scope', '$http', '$state', 'Upload', '$filter', '$uibModal', 'commonDialog', 'chartParser', 'org', 'stateMap', function ($scope, $http, $state, Upload, $filter, $uibModal, commonDialog, chartParser, org, stateMap) {
|
|
|
|
$scope.analysis = {};
|
|
|
|
$scope.analysis = {};
|
|
|
|
$scope.today = new Date();
|
|
|
|
$scope.today = new Date();
|
|
|
|
$scope.chooseToday = function () {
|
|
|
|
$scope.chooseToday = function () {
|
|
|
|
@ -130,6 +130,24 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
$scope.params.begin = currentYearFirstDate;
|
|
|
|
$scope.params.begin = currentYearFirstDate;
|
|
|
|
$scope.loadTransactionAmountInOrg();
|
|
|
|
$scope.loadTransactionAmountInOrg();
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
$scope.loadClientProfile = function () {
|
|
|
|
|
|
|
|
$http.get('/sys/orgs/' + $scope.org.org_id + '/default_client_profile').then(function (res) {
|
|
|
|
|
|
|
|
$scope.clientProfileFields = res.data;
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
$scope.loadClientProfile();
|
|
|
|
|
|
|
|
$scope.submitClientProfile = function () {
|
|
|
|
|
|
|
|
let profile = {};
|
|
|
|
|
|
|
|
for (let field of $scope.clientProfileFields) {
|
|
|
|
|
|
|
|
profile[field.field] = field.value;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
$http.put('/sys/orgs/' + $scope.org.org_id + '/default_client_profile').then(function () {
|
|
|
|
|
|
|
|
commonDialog.alert({type: 'success', title: 'Success', content: 'Modify Success'});
|
|
|
|
|
|
|
|
$scope.loadClientProfile();
|
|
|
|
|
|
|
|
}, function (res) {
|
|
|
|
|
|
|
|
commonDialog.alert({type: 'error', title: 'Error', content: res.data.message});
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
};
|
|
|
|
$scope.scales = [
|
|
|
|
$scope.scales = [
|
|
|
|
{
|
|
|
|
{
|
|
|
|
key: 'today',
|
|
|
|
key: 'today',
|
|
|
|
@ -186,8 +204,8 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
params: function () {
|
|
|
|
params: function () {
|
|
|
|
var date = new Date();
|
|
|
|
var date = new Date();
|
|
|
|
date = date.setDate(1);
|
|
|
|
date = date.setDate(1);
|
|
|
|
var oneDay=1000*60*60*24;
|
|
|
|
var oneDay = 1000 * 60 * 60 * 24;
|
|
|
|
var end = $filter('date')(date-oneDay, 'yyyyMMdd');
|
|
|
|
var end = $filter('date')(date - oneDay, 'yyyyMMdd');
|
|
|
|
|
|
|
|
|
|
|
|
var date2 = new Date();
|
|
|
|
var date2 = new Date();
|
|
|
|
date2.setDate(1);
|
|
|
|
date2.setDate(1);
|
|
|
|
@ -211,8 +229,8 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
$scope.loadSeniorOrg = function () {
|
|
|
|
$scope.loadSeniorOrg = function () {
|
|
|
|
$http.get('/sys/orgs/senior').then(function (resp) {
|
|
|
|
$http.get('/sys/orgs/senior').then(function (resp) {
|
|
|
|
$scope.seniorOrgs = resp.data;
|
|
|
|
$scope.seniorOrgs = resp.data;
|
|
|
|
var senior = {org_id:0,name:'I\'m Senior'}
|
|
|
|
var senior = {org_id: 0, name: 'I\'m Senior'}
|
|
|
|
var noop = {org_id:-1,name:'noop'}
|
|
|
|
var noop = {org_id: -1, name: 'noop'}
|
|
|
|
$scope.seniorOrgs.unshift(noop);
|
|
|
|
$scope.seniorOrgs.unshift(noop);
|
|
|
|
$scope.seniorOrgs.unshift(senior);
|
|
|
|
$scope.seniorOrgs.unshift(senior);
|
|
|
|
})
|
|
|
|
})
|
|
|
|
@ -249,13 +267,14 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
for (var i = 0; i < resp.data.length; i++) {
|
|
|
|
for (var i = 0; i < resp.data.length; i++) {
|
|
|
|
$scope.legends[i] = resp.data[i].org_name;
|
|
|
|
$scope.legends[i] = resp.data[i].org_name;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if($scope.orgAmounts.length >= 1){
|
|
|
|
if ($scope.orgAmounts.length >= 1) {
|
|
|
|
$scope.chooseOrg = resp.data[0].org_name;
|
|
|
|
$scope.chooseOrg = resp.data[0].org_name;
|
|
|
|
loadPartnersByOrgId(resp.data[0].org_id);
|
|
|
|
loadPartnersByOrgId(resp.data[0].org_id);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$scope.future_loading = false;
|
|
|
|
$scope.future_loading = false;
|
|
|
|
});
|
|
|
|
});
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
function loadPartnersByOrgId(org_id) {
|
|
|
|
function loadPartnersByOrgId(org_id) {
|
|
|
|
var params = angular.copy($scope.params);
|
|
|
|
var params = angular.copy($scope.params);
|
|
|
|
if (params.begin) {
|
|
|
|
if (params.begin) {
|
|
|
|
@ -268,7 +287,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
params.end = $filter('date')(new Date(), 'yyyyMMdd');
|
|
|
|
params.end = $filter('date')(new Date(), 'yyyyMMdd');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$http.get('/analysis/org/'+org_id+'/partners', {params: params}).then(function (resp) {
|
|
|
|
$http.get('/analysis/org/' + org_id + '/partners', {params: params}).then(function (resp) {
|
|
|
|
$scope.salespartners = resp.data;
|
|
|
|
$scope.salespartners = resp.data;
|
|
|
|
$scope.partnerSales1 = [];
|
|
|
|
$scope.partnerSales1 = [];
|
|
|
|
$scope.partnerSales2 = [];
|
|
|
|
$scope.partnerSales2 = [];
|
|
|
|
@ -298,6 +317,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
$scope.chooseLast7Days();
|
|
|
|
$scope.chooseLast7Days();
|
|
|
|
|
|
|
|
|
|
|
|
//$scope.loadTransactionAmountInOrg();
|
|
|
|
//$scope.loadTransactionAmountInOrg();
|
|
|
|
|
|
|
|
|
|
|
|
function loadFeeAnalysis(params) {
|
|
|
|
function loadFeeAnalysis(params) {
|
|
|
|
@ -426,7 +446,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
var params = {};
|
|
|
|
var params = {};
|
|
|
|
params.page = $scope.paginationc.page || 1;
|
|
|
|
params.page = $scope.paginationc.page || 1;
|
|
|
|
params.org_id = $scope.org.org_id;
|
|
|
|
params.org_id = $scope.org.org_id;
|
|
|
|
$http.get('/sys/orgs/'+$scope.org.org_id + '/extract/search', {params: params}).then(function (resp) {
|
|
|
|
$http.get('/sys/orgs/' + $scope.org.org_id + '/extract/search', {params: params}).then(function (resp) {
|
|
|
|
$scope.client_extarct = resp.data.data;
|
|
|
|
$scope.client_extarct = resp.data.data;
|
|
|
|
$scope.paginationc = resp.data.pagination;
|
|
|
|
$scope.paginationc = resp.data.pagination;
|
|
|
|
|
|
|
|
|
|
|
|
@ -436,8 +456,6 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
$scope.loadCommission();
|
|
|
|
$scope.loadCommission();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$scope.uploadLogo = function (file) {
|
|
|
|
$scope.uploadLogo = function (file) {
|
|
|
|
if (file == null) {
|
|
|
|
if (file == null) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
@ -469,7 +487,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if($scope.org.type == 1){
|
|
|
|
if ($scope.org.type == 1) {
|
|
|
|
$scope.org.commission_type = 2;
|
|
|
|
$scope.org.commission_type = 2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$http.put('/sys/orgs/' + $scope.org.org_id, $scope.org).then(function () {
|
|
|
|
$http.put('/sys/orgs/' + $scope.org.org_id, $scope.org).then(function () {
|
|
|
|
@ -481,23 +499,23 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
$scope.toggleRateEditable = function () {
|
|
|
|
$scope.toggleRateEditable = function () {
|
|
|
|
if($scope.org.rate_editable==org.data.rate_editable){
|
|
|
|
if ($scope.org.rate_editable == org.data.rate_editable) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$http.put('/sys/orgs/'+$scope.org.org_id+'/enable_change_rate',{enabled:$scope.org.rate_editable}).then(function () {
|
|
|
|
$http.put('/sys/orgs/' + $scope.org.org_id + '/enable_change_rate', {enabled: $scope.org.rate_editable}).then(function () {
|
|
|
|
|
|
|
|
|
|
|
|
},function (resp) {
|
|
|
|
}, function (resp) {
|
|
|
|
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
|
|
|
|
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
|
|
|
|
})
|
|
|
|
})
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
$scope.params = {role:'1111111',org_id:$scope.org.org_id};
|
|
|
|
$scope.params = {role: '1111111', org_id: $scope.org.org_id};
|
|
|
|
$scope.paginationa = {};
|
|
|
|
$scope.paginationa = {};
|
|
|
|
$scope.listManagers = function (page) {
|
|
|
|
$scope.listManagers = function (page) {
|
|
|
|
var params = angular.copy($scope.params);
|
|
|
|
var params = angular.copy($scope.params);
|
|
|
|
params.page = page || $scope.paginationa.page || 1;
|
|
|
|
params.page = page || $scope.paginationa.page || 1;
|
|
|
|
|
|
|
|
|
|
|
|
$http.get('/sys/manager_accounts',{params:params}).then(function (resp) {
|
|
|
|
$http.get('/sys/manager_accounts', {params: params}).then(function (resp) {
|
|
|
|
$scope.managers = resp.data.data;
|
|
|
|
$scope.managers = resp.data.data;
|
|
|
|
$scope.paginationa = resp.data.pagination;
|
|
|
|
$scope.paginationa = resp.data.pagination;
|
|
|
|
})
|
|
|
|
})
|
|
|
|
@ -593,7 +611,11 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
content: 'This operation will refresh the gateway short id, Are you sure?'
|
|
|
|
content: 'This operation will refresh the gateway short id, Are you sure?'
|
|
|
|
}).then(function () {
|
|
|
|
}).then(function () {
|
|
|
|
$http.get('/sys/orgs/' + $scope.org.org_id + '/init/merchant_code').then(function (response) {
|
|
|
|
$http.get('/sys/orgs/' + $scope.org.org_id + '/init/merchant_code').then(function (response) {
|
|
|
|
commonDialog.alert({title: 'Success', content: "Gateway Short Id Refresh Successfully", type: 'success'})
|
|
|
|
commonDialog.alert({
|
|
|
|
|
|
|
|
title: 'Success',
|
|
|
|
|
|
|
|
content: "Gateway Short Id Refresh Successfully",
|
|
|
|
|
|
|
|
type: 'success'
|
|
|
|
|
|
|
|
})
|
|
|
|
$scope.org.gateway_short_id = response.data.partner_code;
|
|
|
|
$scope.org.gateway_short_id = response.data.partner_code;
|
|
|
|
}, function (resp) {
|
|
|
|
}, function (resp) {
|
|
|
|
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
|
|
|
|
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
|
|
|
|
@ -601,7 +623,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
})
|
|
|
|
})
|
|
|
|
};
|
|
|
|
};
|
|
|
|
}]);
|
|
|
|
}]);
|
|
|
|
app.controller('orgDetailParentCtrl', ['$scope', '$http', '$state', 'Upload', '$uibModal','commonDialog', 'org','stateMap', function ($scope, $http, $state, Upload,$uibModal,commonDialog, org,stateMap) {
|
|
|
|
app.controller('orgDetailParentCtrl', ['$scope', '$http', '$state', 'Upload', '$uibModal', 'commonDialog', 'org', 'stateMap', function ($scope, $http, $state, Upload, $uibModal, commonDialog, org, stateMap) {
|
|
|
|
$scope.merchantCodeChecked = true;
|
|
|
|
$scope.merchantCodeChecked = true;
|
|
|
|
$scope.merchantIsValid = true;
|
|
|
|
$scope.merchantIsValid = true;
|
|
|
|
$scope.types = angular.copy(types);
|
|
|
|
$scope.types = angular.copy(types);
|
|
|
|
@ -658,7 +680,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
var params = {};
|
|
|
|
var params = {};
|
|
|
|
params.page = $scope.paginationc.page || 1;
|
|
|
|
params.page = $scope.paginationc.page || 1;
|
|
|
|
params.org_id = $scope.org.org_id;
|
|
|
|
params.org_id = $scope.org.org_id;
|
|
|
|
$http.get('/sys/orgs/'+$scope.org.org_id + '/extract/search', {params: params}).then(function (resp) {
|
|
|
|
$http.get('/sys/orgs/' + $scope.org.org_id + '/extract/search', {params: params}).then(function (resp) {
|
|
|
|
$scope.client_extarct = resp.data.data;
|
|
|
|
$scope.client_extarct = resp.data.data;
|
|
|
|
$scope.paginationc = resp.data.pagination;
|
|
|
|
$scope.paginationc = resp.data.pagination;
|
|
|
|
|
|
|
|
|
|
|
|
@ -713,7 +735,11 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
content: 'This operation will refresh the gateway short id, Are you sure?'
|
|
|
|
content: 'This operation will refresh the gateway short id, Are you sure?'
|
|
|
|
}).then(function () {
|
|
|
|
}).then(function () {
|
|
|
|
$http.get('/sys/orgs/' + $scope.org.org_id + '/init/merchant_code').then(function (response) {
|
|
|
|
$http.get('/sys/orgs/' + $scope.org.org_id + '/init/merchant_code').then(function (response) {
|
|
|
|
commonDialog.alert({title: 'Success', content: "Gateway Short Id Refresh Successfully", type: 'success'})
|
|
|
|
commonDialog.alert({
|
|
|
|
|
|
|
|
title: 'Success',
|
|
|
|
|
|
|
|
content: "Gateway Short Id Refresh Successfully",
|
|
|
|
|
|
|
|
type: 'success'
|
|
|
|
|
|
|
|
})
|
|
|
|
$scope.org.gateway_short_id = response.data.partner_code;
|
|
|
|
$scope.org.gateway_short_id = response.data.partner_code;
|
|
|
|
}, function (resp) {
|
|
|
|
}, function (resp) {
|
|
|
|
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
|
|
|
|
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
|
|
|
|
@ -753,14 +779,14 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
})
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}]);
|
|
|
|
}]);
|
|
|
|
app.controller('newOrgCtrl', ['$scope', '$http', '$state', 'Upload', 'commonDialog','stateMap', function ($scope, $http, $state, Upload, commonDialog,stateMap) {
|
|
|
|
app.controller('newOrgCtrl', ['$scope', '$http', '$state', 'Upload', 'commonDialog', 'stateMap', function ($scope, $http, $state, Upload, commonDialog, stateMap) {
|
|
|
|
$scope.types = angular.copy(types);
|
|
|
|
$scope.types = angular.copy(types);
|
|
|
|
$scope.commission_types = angular.copy(commission_types);
|
|
|
|
$scope.commission_types = angular.copy(commission_types);
|
|
|
|
$scope.loadSeniorOrg = function () {
|
|
|
|
$scope.loadSeniorOrg = function () {
|
|
|
|
$http.get('/sys/orgs/senior').then(function (resp) {
|
|
|
|
$http.get('/sys/orgs/senior').then(function (resp) {
|
|
|
|
$scope.seniorOrgs = resp.data;
|
|
|
|
$scope.seniorOrgs = resp.data;
|
|
|
|
var senior = {org_id:0,name:'I\'m Senior'}
|
|
|
|
var senior = {org_id: 0, name: 'I\'m Senior'}
|
|
|
|
var noop = {org_id:-1,name:'noop'}
|
|
|
|
var noop = {org_id: -1, name: 'noop'}
|
|
|
|
$scope.seniorOrgs.unshift(noop);
|
|
|
|
$scope.seniorOrgs.unshift(noop);
|
|
|
|
$scope.seniorOrgs.unshift(senior);
|
|
|
|
$scope.seniorOrgs.unshift(senior);
|
|
|
|
})
|
|
|
|
})
|
|
|
|
@ -799,10 +825,10 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if($scope.org.type == 1){
|
|
|
|
if ($scope.org.type == 1) {
|
|
|
|
$scope.org.commission_type = 2;
|
|
|
|
$scope.org.commission_type = 2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(($scope.currentUser.role & parseInt('1000000000000', 2)) > 0 && $scope.currentUser.org_id) {
|
|
|
|
if (($scope.currentUser.role & parseInt('1000000000000', 2)) > 0 && $scope.currentUser.org_id) {
|
|
|
|
$scope.org.parent_org_id = angular.copy($scope.currentUser.org.org_id);
|
|
|
|
$scope.org.parent_org_id = angular.copy($scope.currentUser.org.org_id);
|
|
|
|
$scope.org.type = '0';
|
|
|
|
$scope.org.type = '0';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -812,8 +838,8 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
content: 'Creation of new organization succeeded',
|
|
|
|
content: 'Creation of new organization succeeded',
|
|
|
|
type: 'success'
|
|
|
|
type: 'success'
|
|
|
|
});
|
|
|
|
});
|
|
|
|
$state.go('organizations.detail',{orgId:resp.data.org_id},{reload:true});
|
|
|
|
$state.go('organizations.detail', {orgId: resp.data.org_id}, {reload: true});
|
|
|
|
},function (resp) {
|
|
|
|
}, function (resp) {
|
|
|
|
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
|
|
|
|
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
|
|
|
|
})
|
|
|
|
})
|
|
|
|
};
|
|
|
|
};
|
|
|
|
@ -869,7 +895,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
};
|
|
|
|
};
|
|
|
|
$scope.loadOrgs();
|
|
|
|
$scope.loadOrgs();
|
|
|
|
}]);
|
|
|
|
}]);
|
|
|
|
app.controller('newManagerCtrl', ['$scope', '$http','org',function ($scope, $http,org) {
|
|
|
|
app.controller('newManagerCtrl', ['$scope', '$http', 'org', function ($scope, $http, org) {
|
|
|
|
$scope.isOrg = true;
|
|
|
|
$scope.isOrg = true;
|
|
|
|
$scope.org = angular.copy(org);
|
|
|
|
$scope.org = angular.copy(org);
|
|
|
|
$scope.save = function (form) {
|
|
|
|
$scope.save = function (form) {
|
|
|
|
@ -883,7 +909,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(($scope.currentUser.role & parseInt('1000000000000', 2)) > 0 && $scope.currentUser.org_id){
|
|
|
|
if (($scope.currentUser.role & parseInt('1000000000000', 2)) > 0 && $scope.currentUser.org_id) {
|
|
|
|
$scope.manager.bd = true;
|
|
|
|
$scope.manager.bd = true;
|
|
|
|
/* if($scope.manager.org_id2 != "null") {
|
|
|
|
/* if($scope.manager.org_id2 != "null") {
|
|
|
|
$scope.manager.org_id = $scope.manager.org_id2;
|
|
|
|
$scope.manager.org_id = $scope.manager.org_id2;
|
|
|
|
@ -905,7 +931,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
|
|
|
|
return arr;
|
|
|
|
return arr;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return arr.filter(function (item) {
|
|
|
|
return arr.filter(function (item) {
|
|
|
|
return (filterObj.username==null || item.username.indexOf(filterObj.username) >= 0) && (item.role & parseInt(filterObj.role, 2)) > 0 && (!filterObj.org_id || item.org_id==filterObj.org_id)
|
|
|
|
return (filterObj.username == null || item.username.indexOf(filterObj.username) >= 0) && (item.role & parseInt(filterObj.role, 2)) > 0 && (!filterObj.org_id || item.org_id == filterObj.org_id)
|
|
|
|
})
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}]);
|
|
|
|
}]);
|
|
|
|
|
yixian
4 years ago