Merge branch 'develop'

master
yangkai 6 years ago
commit df3159e98a

@ -50,7 +50,7 @@
<div class="box-body"> <div class="box-body">
<div class="row"> <div class="row">
<div class="col-xs-2" ng-repeat="mon in months"> <div class="col-xs-2" ng-repeat="mon in months">
<a ng-if="hasReport(mon) && ('10000000000000'|withRole)"> <a ng-if="hasReport(mon) && (('10000000000000'|withRole)||('1000'|withRole))">
<h2 ROLE="button" class="text-success" ui-sref=".month_report({month:mon})" ng-bind="mon.substring(5,7)"></h2> <h2 ROLE="button" class="text-success" ui-sref=".month_report({month:mon})" ng-bind="mon.substring(5,7)"></h2>
<span class="fa fa-edit btn" ng-click="editCommissionConfig(mon)">Commission</span> <span class="fa fa-edit btn" ng-click="editCommissionConfig(mon)">Commission</span>
</a> </a>

Loading…
Cancel
Save