fix v2-manager.html perimission

master
luoyang 6 years ago
parent ec010193ce
commit e19685ad99

@ -387,7 +387,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
client.put("contact_email", "******");
}
} else {
client.put("rate_editable", ManagerRole.ADMIN.hasRole(role) || ManagerRole.OPERATOR.hasRole(role));
client.put("rate_editable",ManagerRole.OPERATOR.hasRole(role));
}
}
List<JSONObject> children = clientMapper.listChildClients(client.getIntValue("client_id"));

@ -274,178 +274,6 @@ margin-bottom: 10%;"/>
<aside class="main-sidebar" style="height: 100%;max-height: 100%;overflow: auto;padding-bottom: 50px;">
<!--sidebar: style can be found in sidebar.less -->
<section class="sidebar">
<ul class="sidebar-menu" data-widget="tree">
<li class="header">MAIN NAVIGATION</li>
<li class="active treeview">
<a href="#">
<i class="fa fa-dashboard"></i> <span>Dashboard</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<li class="active"><a href="index.html"><i class="fa fa-circle-o"></i> Dashboard v1</a></li>
<li><a href="index2.html"><i class="fa fa-circle-o"></i> Dashboard v2</a></li>
</ul>
</li>
<li class="treeview">
<a href="#">
<i class="fa fa-files-o"></i>
<span>Layout Options</span>
<span class="pull-right-container">
<span class="label label-primary pull-right">4</span>
</span>
</a>
<ul class="treeview-menu">
<li><a href="pages/layout/top-nav.html"><i class="fa fa-circle-o"></i> Top Navigation</a></li>
<li><a href="pages/layout/boxed.html"><i class="fa fa-circle-o"></i> Boxed</a></li>
<li><a href="pages/layout/fixed.html"><i class="fa fa-circle-o"></i> Fixed</a></li>
<li><a href="pages/layout/collapsed-sidebar.html"><i class="fa fa-circle-o"></i> Collapsed Sidebar</a></li>
</ul>
</li>
<li>
<a href="pages/widgets.html">
<i class="fa fa-th"></i> <span>Widgets</span>
<span class="pull-right-container">
<small class="label pull-right bg-green">new</small>
</span>
</a>
</li>
<li class="treeview">
<a href="#">
<i class="fa fa-pie-chart"></i>
<span>Charts</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<li><a href="pages/charts/chartjs.html"><i class="fa fa-circle-o"></i> ChartJS</a></li>
<li><a href="pages/charts/morris.html"><i class="fa fa-circle-o"></i> Morris</a></li>
<li><a href="pages/charts/flot.html"><i class="fa fa-circle-o"></i> Flot</a></li>
<li><a href="pages/charts/inline.html"><i class="fa fa-circle-o"></i> Inline charts</a></li>
</ul>
</li>
<li class="treeview">
<a href="#">
<i class="fa fa-laptop"></i>
<span>UI Elements</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<li><a href="pages/UI/general.html"><i class="fa fa-circle-o"></i> General</a></li>
<li><a href="pages/UI/icons.html"><i class="fa fa-circle-o"></i> Icons</a></li>
<li><a href="pages/UI/buttons.html"><i class="fa fa-circle-o"></i> Buttons</a></li>
<li><a href="pages/UI/sliders.html"><i class="fa fa-circle-o"></i> Sliders</a></li>
<li><a href="pages/UI/timeline.html"><i class="fa fa-circle-o"></i> Timeline</a></li>
<li><a href="pages/UI/modals.html"><i class="fa fa-circle-o"></i> Modals</a></li>
</ul>
</li>
<li class="treeview">
<a href="#">
<i class="fa fa-edit"></i> <span>Forms</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<li><a href="pages/forms/general.html"><i class="fa fa-circle-o"></i> General Elements</a></li>
<li><a href="pages/forms/advanced.html"><i class="fa fa-circle-o"></i> Advanced Elements</a></li>
<li><a href="pages/forms/editors.html"><i class="fa fa-circle-o"></i> Editors</a></li>
</ul>
</li>
<li class="treeview">
<a href="#">
<i class="fa fa-table"></i> <span>Tables</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<li><a href="pages/tables/simple.html"><i class="fa fa-circle-o"></i> Simple tables</a></li>
<li><a href="pages/tables/data.html"><i class="fa fa-circle-o"></i> Data tables</a></li>
</ul>
</li>
<li>
<a href="pages/calendar.html">
<i class="fa fa-calendar"></i> <span>Calendar</span>
<span class="pull-right-container">
<small class="label pull-right bg-red">3</small>
<small class="label pull-right bg-blue">17</small>
</span>
</a>
</li>
<li>
<a href="pages/mailbox/mailbox.html">
<i class="fa fa-envelope"></i> <span>Mailbox</span>
<span class="pull-right-container">
<small class="label pull-right bg-yellow">12</small>
<small class="label pull-right bg-green">16</small>
<small class="label pull-right bg-red">5</small>
</span>
</a>
</li>
<li class="treeview">
<a href="#">
<i class="fa fa-folder"></i> <span>Examples</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<li><a href="pages/examples/invoice.html"><i class="fa fa-circle-o"></i> Invoice</a></li>
<li><a href="pages/examples/profile.html"><i class="fa fa-circle-o"></i> Profile</a></li>
<li><a href="pages/examples/login.html"><i class="fa fa-circle-o"></i> Login</a></li>
<li><a href="pages/examples/register.html"><i class="fa fa-circle-o"></i> Register</a></li>
<li><a href="pages/examples/lockscreen.html"><i class="fa fa-circle-o"></i> Lockscreen</a></li>
<li><a href="pages/examples/404.html"><i class="fa fa-circle-o"></i> 404 Error</a></li>
<li><a href="pages/examples/500.html"><i class="fa fa-circle-o"></i> 500 Error</a></li>
<li><a href="pages/examples/blank.html"><i class="fa fa-circle-o"></i> Blank Page</a></li>
<li><a href="pages/examples/pace.html"><i class="fa fa-circle-o"></i> Pace Page</a></li>
</ul>
</li>
<li class="treeview">
<a href="#">
<i class="fa fa-share"></i> <span>Multilevel</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<li><a href="#"><i class="fa fa-circle-o"></i> Level One</a></li>
<li class="treeview">
<a href="#"><i class="fa fa-circle-o"></i> Level One
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<li><a href="#"><i class="fa fa-circle-o"></i> Level Two</a></li>
<li class="treeview">
<a href="#"><i class="fa fa-circle-o"></i> Level Two
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<li><a href="#"><i class="fa fa-circle-o"></i> Level Three</a></li>
<li><a href="#"><i class="fa fa-circle-o"></i> Level Three</a></li>
</ul>
</li>
</ul>
</li>
<li><a href="#"><i class="fa fa-circle-o"></i> Level One</a></li>
</ul>
</li>
<li><a href="https://adminlte.io/docs"><i class="fa fa-book"></i> <span>Documentation</span></a></li>
<li class="header">LABELS</li>
<li><a href="#"><i class="fa fa-circle-o text-red"></i> <span>Important</span></a></li>
<li><a href="#"><i class="fa fa-circle-o text-yellow"></i> <span>Warning</span></a></li>
<li><a href="#"><i class="fa fa-circle-o text-aqua"></i> <span>Information</span></a></li>
</ul>
<ul class="sidebar-menu">
<li ui-sref-active="active" ng-if="'dashboard'|withModule">
@ -583,7 +411,7 @@ margin-bottom: 10%;"/>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="clearingLogs.date_setting">
<a ui-sref="date_setting">
<i class="fa fa-balance-scale"></i> <span>清算日管理</span>
</a>
</li>
@ -851,8 +679,6 @@ margin-bottom: 10%;"/>
</a>
</li>
</ul>
</section>
<!-- /.sidebar -->
</aside>

@ -283,11 +283,11 @@ margin-bottom: 10%;"/>
ng-class="{'text-orange':!('1000'|withRole),'text-gray':('1000'|withRole)}"></i>
<i class="fa fa-tty" title="Service"
ng-class="{'text-orange':!('10000'|withRole),'text-gray':('10000'|withRole)}"></i>
<i class="fa fa-university" title="Account Manager"
ng-class="{'text-orange':!('100000'|withRole),'text-gray':('100000'|withRole)}"></i>
<!--<i class="fa fa-university" title="Account Manager"-->
<!--ng-class="{'text-orange':!('100000'|withRole),'text-gray':('100000'|withRole)}"></i>-->
<i class="fa fa-line-chart" title="Director"
ng-class="{'text-orange':!('1000000'|withRole),'text-gray':('1000000'|withRole)}"></i>
<i class="fa fa-map-o" title="Site Manager"
<i class="fa fa-map-o" title="Markting"
ng-class="{'text-orange':!('10000000'|withRole),'text-gray':('10000000'|withRole)}"></i>
<i class="fa fa-code" title="Developer"
ng-class="{'text-orange':!('100000000'|withRole),'text-gray':('100000000'|withRole)}"></i>
@ -295,8 +295,13 @@ margin-bottom: 10%;"/>
ng-class="{'text-orange':!('10000000000'|withRole),'text-gray':('10000000000'|withRole)}"></i>
<i class="fa fa-tripadvisor" title="GUEST"
ng-class="{'text-orange':!('100000000000'|withRole),'text-gray':('100000000000'|withRole)}"></i>
<i class="fa fa-user-plus" title="Org Manager"
ng-class="{'text-orange':!('1000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
<!--<i class="fa fa-user-plus" title="Org Manager"-->
<!--ng-class="{'text-orange':!('1000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>-->
<i class="fa fa-ticket" title="Sales Manager"
ng-class="{'text-orange':!('10000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
<!--<i class="fa fa-save" title="Data content"-->
<!--ng-class="{'text-orange':!('100000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>-->
</small>
</p>
</li>

@ -23,10 +23,10 @@
<i class="fa fa-weixin"></i>
WeChat Messages
</a>
<a class="btn btn-app" role="button" ui-sref=".config_operation">
<i class="fa fa-edit"></i>
Config Operation
</a>
<!--<a class="btn btn-app" role="button" ui-sref=".config_operation">-->
<!--<i class="fa fa-edit"></i>-->
<!--Config Operation-->
<!--</a>-->
</div>
</div>
</section>

@ -114,7 +114,7 @@
</div>
</div>
<div class="col-xs-4 col-sm-6" style="text-align: right">
<a role="button" class="btn btn-success" type="button" ui-sref=".new"><i
<a role="button" class="btn btn-success" type="button" ui-sref="newOrganizations"><i
class="fa fa-plus"></i>
Add Organization</a>
</div>

@ -59,7 +59,7 @@
<i class="fa fa-code"></i>
Developer
</a>
<a class="btn btn-app" role="button" ng-click="authorizeRole('1000000000')">
<a class="btn btn-app" role="button" ng-click="authorizeRole('10000000000')">
<i class="fa fa-user"></i>
Risk Manager
</a>

@ -78,7 +78,7 @@
</a>
</div>
<div class="box-items" ng-if="'1000000000'|withRole">
<div class="box-items" ng-if="'10000000000'|withRole">
<a ng-click="headerShow('riskmanager')" ui-sref="listMenu({role:'riskmanager'})" ui-sref-opts="{reload:true}">
<div class="boxs">
<img src="/static/images/manage/menu_2.png">

@ -29,7 +29,7 @@
</div>
</div>
-->
<div class="list-group" ng-if="role!='administrator' && role!='developer' && roll!='sitemanager'">
<div class="list-group" ng-if="role!='administrator' && role!='developer' && role!='sitemanager'">
<div class="row">
<div class="col-sm-2 col-lg-2 col-xs-6" id="partners">
<div class="description-block">
@ -48,7 +48,7 @@
</div>
</a>
</div>
<div ng-if="'11111'|withRole" class="col-sm-2 col-xs-6">
<div ng-if="'110'|withRole" class="col-sm-2 col-xs-6">
<a ui-sref="newPartners" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/merchant_apply.png"/>
@ -88,7 +88,7 @@
</div>
</a>
</div>
<div ng-if="('merchantAmount'|withModule) &&('1'|withRole)" class="col-sm-2 col-xs-6">
<div ng-if="('merchantAmount'|withModule)" class="col-sm-2 col-xs-6">
<a ui-sref="merchantAmountAnalysis" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/merchant_turnover.png"/>
@ -100,7 +100,7 @@
</div>
</div>
</div>
<div class="list-group" ng-if="role!='administrator' && role!='developer' && roll!='sitemanager'">
<div class="list-group" ng-if="role!='administrator' && role!='developer' && role!='sitemanager'">
<div class="row" >
<div class="col-sm-2 col-lg-2 col-xs-6" id="transaction">
<div class="description-block">
@ -119,7 +119,7 @@
</div>
</a>
</div>
<div ng-if="('10000000000'|withRole)" class="col-sm-2 col-xs-6">
<div ng-if="('1010'|withRole)" class="col-sm-2 col-xs-6">
<a ui-sref="refundReview" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/transaction_refund.png"/>
@ -129,7 +129,7 @@
</div>
</a>
</div>
<div ng-if="('monitor'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
<div ng-if="('100000000'|withRole)" class="col-sm-2 col-xs-6">
<a ui-sref="analysis_monitoring.pre_refund" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/transaction_arrears.png"/>
@ -162,7 +162,7 @@
</div>
</div>
<div class="list-group" ng-if="role=='riskmanager'">
<div class="row" ng-if="('clientrate'|withModule)||('monitor'|withModule) || ('customerRankingAnalysisApp'|withModule)">
<div class="row">
<div class="col-sm-2 col-lg-2 col-xs-6" id="risk">
<div class="description-block">
<label>风控管理</label>
@ -170,7 +170,7 @@
</div>
</div>
<div class="row">
<div ng-if="('monitor'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)" class="col-sm-2 col-xs-6">
<div class="col-sm-2 col-xs-6">
<a ui-sref="analysis_monitoring.monitor" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/risk_monitor.png"/>
@ -180,7 +180,7 @@
</div>
</a>
</div>
<div ng-if="('monitor'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
<div class="col-sm-2 col-xs-6">
<a ui-sref="analysis_monitoring.cheat" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/risk_early_warning.png"/>
@ -190,7 +190,7 @@
</div>
</a>
</div>
<div ng-if="('monitor'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
<div class="col-sm-2 col-xs-6">
<a ui-sref="analysis_monitoring.cheat_monitor" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/risk_configure.png"/>
@ -200,7 +200,7 @@
</div>
</a>
</div>
<div ng-if="('RiskManagement'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
<div class="col-sm-2 col-xs-6">
<a ui-sref="analysis_monitoring.risk_manager" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/risk_log.png"/>
@ -210,7 +210,7 @@
</div>
</a>
</div>
<div ng-if="('RiskManagement'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
<div class="col-sm-2 col-xs-6">
<a ui-sref="analysis_monitoring.attention" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/risk_blacklist.png"/>
@ -220,7 +220,7 @@
</div>
</a>
</div>
<div ng-if="'customerRankingAnalysisApp'|withModule" class="col-sm-2 col-xs-6">
<div class="col-sm-2 col-xs-6">
<a ui-sref="customerRankingAnalysis" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/risk_consumption_ranking.png"/>
@ -373,13 +373,13 @@
<div class="row" ng-if="('1000'|withRole)|| ('bdsale'|withModule) || ('bdprize'|withModule)">
<div class="col-sm-2 col-lg-2 col-xs-6" id="bd">
<div class="description-block">
<label>BD绩效管理</label>
<label>绩效管理</label>
</div>
</div>
</div>
<div class="row">
<div ng-if="'bdsale'|withModule" class="col-sm-2 col-xs-6">
<a ui-sref="bdanalysis" ui-sref-opts="{reload:true}">
<a ui-sref="analysis_bd.bdanalysis" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/bd_sales_volume.png"/>
<div class="description-text">
@ -389,7 +389,7 @@
</a>
</div>
<div ng-if="('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)" class="col-sm-2 col-xs-6">
<a ui-sref="bd_prizes" ui-sref-opts="{reload:true}">
<a ui-sref="analysis_bd.bd_prizes" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/bd_commission.png"/>
<div class="description-text">
@ -398,7 +398,7 @@
</div>
</a>
</div>
<div ng-if="'1000'|withRole" class="col-sm-2 col-xs-6">
<div ng-if="'10000000001000'|withRole" class="col-sm-2 col-xs-6">
<a ng-click="editRateConfig()" style="cursor: pointer">
<div class="description-block">
<img src="/static/images/main_menu/bd_performance_setting.png"/>
@ -408,7 +408,7 @@
</div>
</a>
</div>
<div ng-if="'1000'|withRole" class="col-sm-2 col-xs-6">
<div ng-if="'10000000001000'|withRole" class="col-sm-2 col-xs-6">
<a ng-click="editBDLevels()" style="cursor: pointer">
<div class="description-block">
<img src="/static/images/main_menu/bd_level_setting.png"/>
@ -418,7 +418,7 @@
</div>
</a>
</div>
<div ng-if="'dev'|withModule" class="col-sm-2 col-xs-6">
<div ng-if="'clientrate'|withModule" class="col-sm-2 col-xs-6">
<a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/bd_merchant_activity.png"/>
@ -612,7 +612,7 @@
</div>
</a>
</div>
<div ng-if="'1000'|withRole" class="col-sm-2 col-xs-6">
<div ng-if="'invoice'|withModule" class="col-sm-2 col-xs-6">
<a ui-sref="invoice" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/finance_merchant_invoice.png"/>
@ -651,7 +651,7 @@
</div>
</div>
</a></div>
<div ng-if="('orgcommission'|withModule)" class="col-sm-2 col-xs-6">
<div class="col-sm-2 col-xs-6">
<a ui-sref="analysis_org.commission" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/finance_partner_contribution.png"/>
@ -681,8 +681,8 @@
</div>
</div>
</a></div>
<div ng-if="'clearing'|withModule" class="col-sm-2 col-xs-6">
<a ui-sref="clearingLogs.date_setting" ui-sref-opts="{reload:true}">
<div ng-if="'clearing'|withModule && role!='director'" class="col-sm-2 col-xs-6">
<a ui-sref="date_setting" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/settle_day.png"/>
<div class="description-text">
@ -726,7 +726,7 @@
</div>
</div>
</a></div>
<div ng-if="'platformRevenue'|withModule" class="col-sm-2 col-xs-6">
<div ng-if="'platformRevenue'|withModule && role!='director'" class="col-sm-2 col-xs-6">
<a ui-sref="analysis_report.platformsettle" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/settle_verification.png"/>
@ -773,7 +773,7 @@
</div>
</div>
</a></div>
<div ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)" class="col-sm-2 col-xs-6">
<div ng-if="'manager_accounts'|withModule" class="col-sm-2 col-xs-6">
<a ui-sref="servantsConfig" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/to_be_treated_2.png"/>
@ -803,7 +803,7 @@
</div>
</div>
<div class="row">
<div ng-if="('10'|withRole)&&('merchantIdManage'|withModule)" class="col-sm-2 col-xs-6">
<div class="col-sm-2 col-xs-6">
<a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/configure_merchant_number.png"/>

@ -352,7 +352,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
};
}]);
app.controller('addPartnerCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone) {
app.controller('addPartnerCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone','businessStructuresMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap', function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, businessStructuresMap, industryMap, stateMap, sectorMap, countryMap) {
if ($scope.partner_application) {
$scope.partner = angular.copy($scope.partner_application);
delete $rootScope.partner_application;
@ -362,6 +362,17 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.partner.company_phone_c = 61;
$scope.partner.contact_phone_c = 61;
$scope.pagination = {};
$scope.industries = industryMap.configs();
$scope.states = stateMap.configs();
$scope.countries = countryMap.configs();
$scope.sectors = sectorMap.configs();
$scope.business_structures = businessStructuresMap.configs();
$scope.clean_days = angular.copy(clean_days_map);
$scope.bd_citys = angular.copy(bd_city_map);
$scope.params = {textType: 'all', org_name: 'ALL'};
function remove(arr, val) {
if (angular.isArray(arr)) {
for (var i = arr.length; i--;) {

Loading…
Cancel
Save