From cc5212d1bfbe62e4440b48328ee325313f1c6dc6 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 20 Apr 2020 10:09:35 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=90=88=E8=A7=84=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=B8=85=E7=AE=97=E7=BB=9F=E8=AE=A1=E7=9A=84=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/manage.html                          | 12 ++++++------
 src/main/ui/static/menu/templates/main_menu.html | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 675f83d0b..5657acef7 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -540,20 +540,20 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <li class="menu-group" ng-if="roleNow=='accountant' || roleNow=='director' || ('1000000010'|withRole)">
+                <li class="menu-group" ng-if="roleNow=='accountant' || roleNow=='director' || ('1000000000'|withRole) || roleNow=='compliance'">
                     <p role="button" ng-class="{'active': Settlement,'is-hide':hideSideBar}" ng-click="Settlement = !Settlement">
                         <span>清算管理|Settlement</span>
                         <span class="pull-right-container">
                             <i class="fa fa-angle-down pull-right"></i>
                         </span>
                     </p>
-                    <ul class="sidebar-menu" ng-class="{'active':Settlement}">
+                    <ul class="sidebar-menu" ng-class="{'active':Settlement}" ng-if="roleNow !='compliance'">
                         <li ui-sref-active="active" ng-if="'ordervalid'|withModule">
                             <a ui-sref="order_valid">
                                 <i class="fa fa-balance-scale"></i> <span>交易对账|Order Validation</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active"  ng-if="('clearing'|withModule) && (roleNow!='director') && !('1000000000'|withRole)">
+                        <li ui-sref-active="active"  ng-if="('clearing'|withModule) && (roleNow!='director') && !('1000000000'|withRole) && roleNow !='compliance'">
                             <a ui-sref="date_setting">
                                 <i class="fa fa-balance-scale"></i> <span>清算日管理</span>
                             </a>
@@ -564,17 +564,17 @@ margin-bottom: 10%;"/>
                             </a>
                         </li>
 
-                        <li ui-sref-active="active" ng-if="('estimateAnalysisApp'|withModule)&&((currentUser.org_id==null)||((currentUser.org_id==1)&&('1000000000'|withRole)))">
+                        <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}">
                                 <i class="fa fa fa-money"></i> <span>清算预估|Estimate</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'settleReport'|withModule">
+                        <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}">
                                 <i class="fa fa fa-tv"></i> <span>清算月报</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="('platformRevenue'|withModule) && (roleNow!='director')">
+                        <li ui-sref-active="active" ng-if="('platformRevenue'|withModule) && (roleNow!='director') && roleNow !='compliance'">
                             <a ui-sref="analysis_report.platformsettle" ui-sref-opts="{reload:true}">
                                 <i class="fa fa fa-money"></i> <span>清算验证|Validation</span>
                             </a>
diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
index f0f60958c..94c64444b 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -915,7 +915,7 @@
                 </div>
             </div>
         </div>
-        <div class="list-group" ng-if="role=='accountant' || role=='director' || ('1000000010'|withRole)">
+        <div class="list-group" ng-if="role=='accountant' || role=='director' || role=='compliance' || ('1000000000'|withRole)">
             <div class="row" >
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="clearing">
                     <div class="description-block">
@@ -924,7 +924,7 @@
                 </div>
             </div>
             <div class="row">
-                <div ng-if="'ordervalid'|withModule" class="col-sm-2 col-xs-6">
+                <div ng-if="'ordervalid'|withModule && role !='compliance'" class="col-sm-2 col-xs-6" >
                     <a ui-sref="order_valid" ui-sref-opts="{reload:true}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/settle_transaction_reconciliation.png"/>
@@ -933,7 +933,7 @@
                             </div>
                         </div>
                     </a></div>
-                <div ng-if="('clearing'|withModule) && (role!='director') && !('1000000000'|withRole)" class="col-sm-2 col-xs-6">
+                <div ng-if="('clearing'|withModule) && (role!='director') && !('1000000000'|withRole) && role !='compliance'" 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"/>
@@ -960,7 +960,7 @@
                             </div>
                         </div>
                     </a></div>
-                <div ng-if="('estimateAnalysisApp'|withModule)&&((currentUser.org_id==null)||((currentUser.org_id==1)&&('1000000000'|withRole)))" class="col-sm-2 col-xs-6">
+                <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}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/settle_prediction.png"/>
@@ -969,7 +969,7 @@
                             </div>
                         </div>
                     </a></div>
-                <div ng-if="'settleReport'|withModule" 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}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/settle_report.png"/>
@@ -978,7 +978,7 @@
                             </div>
                         </div>
                     </a></div>
-                <div ng-if="('platformRevenue'|withModule) && (role!='director')" class="col-sm-2 col-xs-6">
+                <div ng-if="('platformRevenue'|withModule) && (role!='director') && role !='compliance'" 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"/>