msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
master
yixian 4 years ago
parent d689788a26 1d62c2cad3
commit 473dd17283
4 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File

16
src/main/ui/manage.html
Unescape View File

@ -553,7 +553,8 @@ margin-bottom: 10%;"/>
<i class="fa fa-balance-scale"></i> <span>交易对账|Order Validation</span> <i class="fa fa-balance-scale"></i> <span>交易对账|Order Validation</span>
</a> </a>
</li> </li>
<li ui-sref-active="active" ng-if="('clearing'|withModule) && (roleNow!='director') && !('1000000000'|withRole) && roleNow !='compliance'"> <li ui-sref-active="active"
ng-if="('clearing'|withModule) && (roleNow!='director') && !('1000000000'|withRole) && roleNow !='compliance'">
<a ui-sref="date_setting"> <a ui-sref="date_setting">
<i class="fa fa-balance-scale"></i> <span>清算日管理</span> <i class="fa fa-balance-scale"></i> <span>清算日管理</span>
</a> </a>
@ -563,13 +564,20 @@ margin-bottom: 10%;"/>
<i class="fa fa-line-chart"></i> <span>清算统计|Settlement Logs</span> <i class="fa fa-line-chart"></i> <span>清算统计|Settlement Logs</span>
</a> </a>
</li> </li>
<li ui-sref-active="active"
<li ui-sref-active="active" ng-if="('estimateAnalysisApp'|withModule)&&((currentUser.org_id==null)||((currentUser.org_id==1)&&('1000000000'|withRole))) && roleNow !='compliance'"> ng-if="('settleTasks'|withModule)&&((currentUser.org_id==null)||((currentUser.org_id==1)&&('1000000000'|withRole))) && roleNow !='compliance'">
<a ui-sref="estimateAnalysis" ui-sref-opts="{reload:true}">
<i class="fa fa fa-money"></i> <span>清算任务|Settle Tasks</span>
</a>
</li>
<li ui-sref-active="active"
ng-if="('estimateAnalysisApp'|withModule)&&((currentUser.org_id==null)||((currentUser.org_id==1)&&('1000000000'|withRole))) && roleNow !='compliance'">
<a ui-sref="estimateAnalysis" ui-sref-opts="{reload:true}"> <a ui-sref="estimateAnalysis" ui-sref-opts="{reload:true}">
<i class="fa fa fa-money"></i> <span>清算预估|Estimate</span> <i class="fa fa fa-money"></i> <span>清算预估|Estimate</span>
</a> </a>
</li> </li>
<li ui-sref-active="active" ng-if="('settleReport'|withModule) && (roleNow=='accountant' || roleNow=='director') && roleNow !='compliance'"> <li ui-sref-active="active"
ng-if="('settleReport'|withModule) && (roleNow=='accountant' || roleNow=='director') && roleNow !='compliance'">
<a ui-sref="analysis_report.settle_report" ui-sref-opts="{reload:true}"> <a ui-sref="analysis_report.settle_report" ui-sref-opts="{reload:true}">
<i class="fa fa fa-tv"></i> <span>清算月报</span> <i class="fa fa fa-tv"></i> <span>清算月报</span>
</a> </a>

2
src/main/ui/static/analysis/settle_tasks.js
Unescape View File

@ -30,7 +30,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
} }
$scope.checkProgressStatus = function () { $scope.checkProgressStatus = function () {
let defer = $q.defer(); let defer = $q.defer();
$http.get('/sys/settle_tasks/curent_progress').then(function (res) { $http.get('/sys/settle_tasks/current_progress').then(function (res) {
$scope.progress = res.data; $scope.progress = res.data;
defer.resolve(); defer.resolve();
if (!$scope.progress.processing) { if (!$scope.progress.processing) {

2
src/main/ui/static/analysis/templates/settlement_detail.html
Unescape View File

@ -43,7 +43,7 @@
<button class="btn btn-success pull-right" ng-click="reloadPage()"> <button class="btn btn-success pull-right" ng-click="reloadPage()">
<i class="fa fa-refresh"></i>Reload <i class="fa fa-refresh"></i>Reload
</button> </button>
<a ui-sref="settle_tasks">Settle Tasks</a> <a ui-sref="settle_tasks" class="btn btn-primary">Settle Tasks</a>
</div> </div>
</div> </div>

19
src/main/ui/static/menu/templates/main_menu.html
Unescape View File

@ -950,7 +950,7 @@
<!--<span class="description-text">清算记录</span>--> <!--<span class="description-text">清算记录</span>-->
<!--</div>--> <!--</div>-->
<!--</div>--> <!--</div>-->
<!--</a></div>--> <!--</a></div>-->
<div ng-if="'clearing'|withModule" class="col-sm-2 col-xs-6"> <div ng-if="'clearing'|withModule" class="col-sm-2 col-xs-6">
<a ui-sref="clearingLogs" ui-sref-opts="{reload:true}"> <a ui-sref="clearingLogs" ui-sref-opts="{reload:true}">
<div class="description-block"> <div class="description-block">
@ -960,7 +960,19 @@
</div> </div>
</div> </div>
</a></div> </a></div>
<div ng-if="('estimateAnalysisApp'|withModule)&&((currentUser.org_id==null)||((currentUser.org_id==1)&&('1000000000'|withRole))) && role !='compliance' " class="col-sm-2 col-xs-6"> <div ng-if="('settleTasks'|withModule)&&((currentUser.org_id==null)||((currentUser.org_id==1)&&('1000000000'|withRole))) && role !='compliance'"
class="col-sm-2 col-xs-6">
<a ui-sref="settle_tasks" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/settle_prediction.png"/>
<div class="description-text">
<span class="description-text">清算任务</span>
</div>
</div>
</a>
</div>
<div ng-if="('estimateAnalysisApp'|withModule)&&((currentUser.org_id==null)||((currentUser.org_id==1)&&('1000000000'|withRole))) && role !='compliance' "
class="col-sm-2 col-xs-6">
<a ui-sref="estimateAnalysis" ui-sref-opts="{reload:true}"> <a ui-sref="estimateAnalysis" ui-sref-opts="{reload:true}">
<div class="description-block"> <div class="description-block">
<img src="/static/images/main_menu/settle_prediction.png"/> <img src="/static/images/main_menu/settle_prediction.png"/>
@ -968,7 +980,8 @@
<span class="description-text">清算预估</span> <span class="description-text">清算预估</span>
</div> </div>
</div> </div>
</a></div> </a>
</div>
<div ng-if="('settleReport'|withModule) && (role !='compliance')" class="col-sm-2 col-xs-6"> <div ng-if="('settleReport'|withModule) && (role !='compliance')" class="col-sm-2 col-xs-6">
<a ui-sref="analysis_report.settle_report" ui-sref-opts="{reload:true}"> <a ui-sref="analysis_report.settle_report" ui-sref-opts="{reload:true}">
<div class="description-block"> <div class="description-block">

Write Preview
Loading…
Cancel
Save