From 6cd45c9ac23ab89b248c77476f43913aa70f6039 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Tue, 16 Jan 2018 09:07:48 +0800
Subject: [PATCH 1/5] tmp

---
 .../ui/static/config/orgcommission/orgcommission.js | 13 +++++++++++++
 .../templates/org_commission_root.html              | 11 ++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/main/ui/static/config/orgcommission/orgcommission.js b/src/main/ui/static/config/orgcommission/orgcommission.js
index 3171ff7a7..d064e8a40 100644
--- a/src/main/ui/static/config/orgcommission/orgcommission.js
+++ b/src/main/ui/static/config/orgcommission/orgcommission.js
@@ -92,6 +92,19 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) {
                 var monthStr = $scope.params.year.getFullYear() + '-' + (('0' + mon).substr(-2));
                 $state.go('analysis_org.orgcommission.month', {monthStr: monthStr})
             };
+
+            $scope.gotoMonth = function (mon) {
+                alert($scope.mon.monthstr);
+                var monthStr = $scope.params.year.getFullYear() + '-' + (('0' + mon).substr(-2));
+                $state.go('analysis_org.orgcommission.month', {monthStr: monthStr})
+            };
+
+
+            $scope.gotoReferrerMonth = function (mon) {
+                alert($scope.mon.monthstr);
+                var monthStr = $scope.params.year.getFullYear() + '-' + (('0' + mon).substr(-2));
+                $state.go('analysis_agent.agentcommission.month', {monthStr: monthStr})
+            };
         }]);
     app.controller('orgCommissionMonthViewCtrl', ['$scope', 'monthData','$filter', function ($scope, monthData) {
         $scope.monthData = monthData.data;
diff --git a/src/main/ui/static/config/orgcommission/templates/org_commission_root.html b/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
index 27478cb97..b9d6e610c 100644
--- a/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
+++ b/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
@@ -13,7 +13,6 @@
                     <input type="text" class="form-control" uib-datepicker-popup="yyyy-MM" ng-model="generate.month"
                            is-open="ctrl.genmonth" datepicker-options="{minMode: 'month'}"
                            ng-click="ctrl.genmonth=true" placeholder="Select Month"/>
-
                 </div>
                 <button class="btn btn-primary" ng-click="generateOrgCommission()" ng-disabled="!generate.month">
                     Generate
@@ -54,7 +53,17 @@
                 </div>
             </div>
         </div>
+    </div>
 
+    <div is-open="ctrl.viewyear">
+    <ul id="myTab" class="nav nav-tabs">
+        <li class="active">
+            <a ng-click="gotoMonth(mon.monthstr)" data-toggle="tab">
+                合伙人提成
+            </a>
+        </li>
+        <li><a ng-click = "gotoReferrerMonth(mon.monthstr)" data-toggle="tab">推荐人提成</a></li>
+    </ul>
     </div>
     <div ui-view></div>
 </section>
\ No newline at end of file

From c95568e56563f764149a687ce28054f468dd587e Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Tue, 16 Jan 2018 15:14:03 +0800
Subject: [PATCH 2/5] tmp

---
 .../analysis/org/templates/analysis_org.html  |  2 +-
 .../config/orgcommission/orgcommission.js     | 82 +++++++++++++++----
 .../templates/org_commission_root.html        | 17 ++--
 .../templates/referrer_commission_month.html  |  2 +-
 4 files changed, 71 insertions(+), 32 deletions(-)

diff --git a/src/main/ui/static/analysis/org/templates/analysis_org.html b/src/main/ui/static/analysis/org/templates/analysis_org.html
index 6b7efb47f..8c6029ad3 100644
--- a/src/main/ui/static/analysis/org/templates/analysis_org.html
+++ b/src/main/ui/static/analysis/org/templates/analysis_org.html
@@ -6,7 +6,7 @@
                 <a ui-sref="analysis_org.organlasis"><i class="fa fa-hand-peace-o"></i>合伙人销售量|City Partner Sale</a>
             </li>
             <li ui-sref-active-eq="active" ng-if="('orgcommission'|withModule)">
-                <a ui-sref="analysis_org.orgcommission"><i class="fa fa-users"></i></i>合伙人提成|City Partner Commissions</a>
+                <a ui-sref="analysis_org.commission"><i class="fa fa-users"></i></i>合伙人提成|City Partner Commissions</a>
             </li>
             <li ui-sref-active-eq="active">
                 <a ui-sref="analysis_org.referrercommission"><i class="fa fa-users"></i></i>推荐人提成|Referrer Commissions</a>
diff --git a/src/main/ui/static/config/orgcommission/orgcommission.js b/src/main/ui/static/config/orgcommission/orgcommission.js
index d064e8a40..63d0d48b9 100644
--- a/src/main/ui/static/config/orgcommission/orgcommission.js
+++ b/src/main/ui/static/config/orgcommission/orgcommission.js
@@ -20,11 +20,15 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) {
     'use strict';
     var app = angular.module('orgcommission', ['ui.router']);
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('analysis_org.orgcommission', {
+        $stateProvider.state('analysis_org.commission', {
             url: '/org_commissions',
             templateUrl: '/static/config/orgcommission/templates/org_commission_root.html',
             controller: 'orgCommissionRootCtrl'
-        }).state('analysis_org.orgcommission.month', {
+        }).state('analysis_org.commission.month', {
+            url: '/commissionorg',
+            template: '<div ui-view></div>',
+            controller: ''
+        }).state('analysis_org.commission.month.org', {
             url: '/months/{monthStr}',
             templateUrl: '/static/config/orgcommission/templates/org_commission_month.html',
             controller: 'orgCommissionMonthViewCtrl',
@@ -33,7 +37,16 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) {
                     return $http.get('/sys/citypartner_prizes/months/' + $stateParams.monthStr);
                 }]
             }
-        }).state('analysis_org.orgcommission.month.orgdetail', {
+        }).state('analysis_org.commission.month.referrer', {
+            url: '/referrer_commissions/months/{monthStr}',
+            templateUrl: '/static/config/referrercommission/templates/referrer_commission_month.html',
+            controller: 'referrerCommissionMonthViewCtrl',
+            resolve: {
+                monthData: ['$http', '$stateParams', function ($http, $stateParams) {
+                    return $http.get('/sys/citypartner_prizes/referrer/months/' + $stateParams.monthStr);
+                }]
+            }
+        }).state('analysis_org.commission.org.month.orgdetail', {
             url: '/citypartners/{orgId}',
             templateUrl: '/static/config/orgcommission/templates/org_commission_detail.html',
             controller: 'orgCommissionOrgDetailCtrl',
@@ -42,9 +55,22 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) {
                     return $http.get('/sys/citypartner_prizes/months/' + $stateParams.monthStr + '/orgs/' + $stateParams.orgId);
                 }]
             }
+        }).state('analysis_org.commission.referrer.month.detail', {
+            url: '/referrer_commissions/citypartners/{orgId}',
+            templateUrl: '/static/config/referrercommission/templates/referrer_commission_detail.html',
+            controller: 'referrerCommissionOrgDetailCtrl',
+            resolve: {
+                detail: ['$http', '$stateParams', function ($http, $stateParams) {
+                    return $http.get('/sys/citypartner_prizes/referrer/months/' + $stateParams.monthStr + '/orgs/' + $stateParams.orgId);
+                }]
+            }
         })
     }]);
-
+    app.controller('loginLogRootCtrl', ['$scope', '$state', function ($scope, $state) {
+        if ($state.is('logview.login_history')) {
+            $state.go('.managers')
+        }
+    }]);
     app.controller('orgCommissionRootCtrl', ['$scope', '$http', '$filter', '$state', 'commonDialog',
         function ($scope, $http, $filter, $state, commonDialog) {
             $scope.generate = {};
@@ -63,7 +89,7 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) {
                 }).then(function () {
                     var params = {month: $filter('date')($scope.generate.month, 'yyyy-MM')};
                     $http.post('/sys/citypartner_prizes/generate', params).then(function () {
-                        $state.go('analysis_org.orgcommission.month', {monthStr: params.month})
+                        $state.go('.org.month', {monthStr: params.month})
                         $scope.generate.status = null;
                     }, function (resp) {
                         commonDialog.alert({type: 'error', title: 'Error', content: resp.data.message});
@@ -89,21 +115,18 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) {
                 return has;
             };
             $scope.gotoMonth = function (mon) {
-                var monthStr = $scope.params.year.getFullYear() + '-' + (('0' + mon).substr(-2));
-                $state.go('analysis_org.orgcommission.month', {monthStr: monthStr})
-            };
-
-            $scope.gotoMonth = function (mon) {
-                alert($scope.mon.monthstr);
-                var monthStr = $scope.params.year.getFullYear() + '-' + (('0' + mon).substr(-2));
-                $state.go('analysis_org.orgcommission.month', {monthStr: monthStr})
+                if($state.is('analysis_org.commission.month')){
+                    if(mon){
+                        $scope.params.month = mon;
+                    }
+                    var monthStr = $scope.params.year.getFullYear() + '-' + $scope.params.month;
+                    $state.go('.org', {monthStr: monthStr})
+                }
             };
 
-
-            $scope.gotoReferrerMonth = function (mon) {
-                alert($scope.mon.monthstr);
-                var monthStr = $scope.params.year.getFullYear() + '-' + (('0' + mon).substr(-2));
-                $state.go('analysis_agent.agentcommission.month', {monthStr: monthStr})
+            $scope.gotoReferrerMonth = function () {
+                var monthStr = $scope.params.year.getFullYear() + '-' + $scope.params.month ;
+                    $state.go('analysis_org.commission.referrer.month', {monthStr: monthStr})
             };
         }]);
     app.controller('orgCommissionMonthViewCtrl', ['$scope', 'monthData','$filter', function ($scope, monthData) {
@@ -131,6 +154,29 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) {
         }
     }]);
 
+    app.controller('referrerCommissionMonthViewCtrl', ['$scope', 'monthData', function ($scope, monthData) {
+        $scope.monthData = monthData.data;
+        $scope.ctrl = {};
+        $scope.active = function (log) {
+            if($scope.ctrl.activeLog && $scope.ctrl.activeLog.org_id==log.org_id){
+                $scope.ctrl.activeLog=null;
+                return;
+            }
+            $scope.ctrl.activeLog=log;
+        }
+    }]);
+
+    app.controller('referrerCommissionOrgDetailCtrl', ['$scope', 'detail', function ($scope, detail) {
+        $scope.detail = detail.data;
+        $scope.ctrl = {};
+        $scope.active = function (log) {
+            if($scope.ctrl.activeLog && $scope.ctrl.activeLog.client_moniker==log.client_moniker){
+                $scope.ctrl.activeLog=null;
+                return;
+            }
+            $scope.ctrl.activeLog=log;
+        }
+    }]);
 
     app.filter('commission_type_filter', function () {
         return function (sectorValue) {
diff --git a/src/main/ui/static/config/orgcommission/templates/org_commission_root.html b/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
index b9d6e610c..a73fc8e34 100644
--- a/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
+++ b/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
@@ -1,11 +1,4 @@
-<!--<section class="content-header">-->
-    <!--<h1>City Partner Commissions</h1>-->
-    <!--<ol class="breadcrumb">-->
-        <!--<li><i class="fa fa-users"></i> Analysis</li>-->
-        <!--<li class="active">City Partner Commissions</li>-->
-    <!--</ol>-->
-<!--</section>-->
-<section class="content">
+<div class="content">
     <div class="box box-default">
         <div class="box-body">
             <div class="form-inline">
@@ -31,7 +24,7 @@
         <div class="row">
             <div class="col-md-3 col-sm-6 col-xs-12" ng-repeat="mon in availableMonths">
                 <div class="info-box">
-                    <div class="info-box-icon bg-aqua" ng-bind="mon.month" ng-click="gotoMonth(mon.monthstr)" role="button">
+                    <div class="info-box-icon bg-aqua" ng-bind="mon.month" ng-click="gotoMonth(mon.month)" role="button">
                     </div>
                     <div class="info-box-content">
                         <!--<div class="info-box-text text-bold text-red" ng-bind="r.charge_date"></div>-->
@@ -58,12 +51,12 @@
     <div is-open="ctrl.viewyear">
     <ul id="myTab" class="nav nav-tabs">
         <li class="active">
-            <a ng-click="gotoMonth(mon.monthstr)" data-toggle="tab">
+            <a ng-click="gotoMonth(mon.month)" data-toggle="tab">
                 合伙人提成
             </a>
         </li>
-        <li><a ng-click = "gotoReferrerMonth(mon.monthstr)" data-toggle="tab">推荐人提成</a></li>
+        <li><a ng-click = "gotoReferrerMonth(mon.month)" data-toggle="tab">推荐人提成</a></li>
     </ul>
     </div>
     <div ui-view></div>
-</section>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/src/main/ui/static/config/referrercommission/templates/referrer_commission_month.html b/src/main/ui/static/config/referrercommission/templates/referrer_commission_month.html
index b2c28ee8e..0553ffaeb 100644
--- a/src/main/ui/static/config/referrercommission/templates/referrer_commission_month.html
+++ b/src/main/ui/static/config/referrercommission/templates/referrer_commission_month.html
@@ -1,4 +1,4 @@
-<div ui-view>
+<div>
     <div class="box box-warning">
         <div class="box-header">Analysis</div>
         <div class="box-body">

From 9d72ee8451175859771f493f290977b66ad9e5ec Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Tue, 16 Jan 2018 18:03:21 +0800
Subject: [PATCH 3/5] tmp

---
 .../config/orgcommission/orgcommission.js       | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/ui/static/config/orgcommission/orgcommission.js b/src/main/ui/static/config/orgcommission/orgcommission.js
index 63d0d48b9..ec058f76c 100644
--- a/src/main/ui/static/config/orgcommission/orgcommission.js
+++ b/src/main/ui/static/config/orgcommission/orgcommission.js
@@ -27,7 +27,12 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) {
         }).state('analysis_org.commission.month', {
             url: '/commissionorg',
             template: '<div ui-view></div>',
-            controller: ''
+            controller: 'commissionMonthRootCtrl',
+            resolve: {
+                monthStr: ['$stateParams', function ($stateParams) {
+                    return $stateParams.monthStr;
+                }]
+            }
         }).state('analysis_org.commission.month.org', {
             url: '/months/{monthStr}',
             templateUrl: '/static/config/orgcommission/templates/org_commission_month.html',
@@ -66,9 +71,9 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) {
             }
         })
     }]);
-    app.controller('loginLogRootCtrl', ['$scope', '$state', function ($scope, $state) {
-        if ($state.is('logview.login_history')) {
-            $state.go('.managers')
+    app.controller('commissionMonthRootCtrl', ['$scope', '$state','monthStr', function ($scope, $state,monthStr) {
+        if($state.is('analysis_org.commission.month')){
+            $state.go('.org',{'monthStr':monthStr});
         }
     }]);
     app.controller('orgCommissionRootCtrl', ['$scope', '$http', '$filter', '$state', 'commonDialog',
@@ -115,13 +120,11 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) {
                 return has;
             };
             $scope.gotoMonth = function (mon) {
-                if($state.is('analysis_org.commission.month')){
                     if(mon){
                         $scope.params.month = mon;
                     }
                     var monthStr = $scope.params.year.getFullYear() + '-' + $scope.params.month;
-                    $state.go('.org', {monthStr: monthStr})
-                }
+                    $state.go('analysis_org.commission.month', {monthStr: monthStr})
             };
 
             $scope.gotoReferrerMonth = function () {

From 902ee0aa3febedfa525580037f0edf139a7b793a Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Tue, 16 Jan 2018 19:10:42 +0800
Subject: [PATCH 4/5] tmp

---
 .../config/orgcommission/orgcommission.js     | 27 ++++++-------------
 .../templates/org_commission_month_root.html  | 13 +++++++++
 .../templates/org_commission_root.html        | 10 -------
 3 files changed, 21 insertions(+), 29 deletions(-)
 create mode 100644 src/main/ui/static/config/orgcommission/templates/org_commission_month_root.html

diff --git a/src/main/ui/static/config/orgcommission/orgcommission.js b/src/main/ui/static/config/orgcommission/orgcommission.js
index ec058f76c..3f8e07b0f 100644
--- a/src/main/ui/static/config/orgcommission/orgcommission.js
+++ b/src/main/ui/static/config/orgcommission/orgcommission.js
@@ -14,8 +14,6 @@ var commissionTypeMap = [{
         "value": "收益比例"
     }
 ];
-
-
 define(['angular','../../analysis/org/analysis-org'], function (angular) {
     'use strict';
     var app = angular.module('orgcommission', ['ui.router']);
@@ -25,16 +23,11 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) {
             templateUrl: '/static/config/orgcommission/templates/org_commission_root.html',
             controller: 'orgCommissionRootCtrl'
         }).state('analysis_org.commission.month', {
-            url: '/commissionorg',
-            template: '<div ui-view></div>',
-            controller: 'commissionMonthRootCtrl',
-            resolve: {
-                monthStr: ['$stateParams', function ($stateParams) {
-                    return $stateParams.monthStr;
-                }]
-            }
+            url: '/commissionorg/months/{monthStr}',
+            templateUrl: '/static/config/orgcommission/templates/org_commission_month_root.html',
+            controller: 'commissionMonthRootCtrl'
         }).state('analysis_org.commission.month.org', {
-            url: '/months/{monthStr}',
+            url: '/org',
             templateUrl: '/static/config/orgcommission/templates/org_commission_month.html',
             controller: 'orgCommissionMonthViewCtrl',
             resolve: {
@@ -43,7 +36,7 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) {
                 }]
             }
         }).state('analysis_org.commission.month.referrer', {
-            url: '/referrer_commissions/months/{monthStr}',
+            url: '/referrer',
             templateUrl: '/static/config/referrercommission/templates/referrer_commission_month.html',
             controller: 'referrerCommissionMonthViewCtrl',
             resolve: {
@@ -71,15 +64,14 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) {
             }
         })
     }]);
-    app.controller('commissionMonthRootCtrl', ['$scope', '$state','monthStr', function ($scope, $state,monthStr) {
+    app.controller('commissionMonthRootCtrl', ['$scope', '$state', function ($scope, $state) {
         if($state.is('analysis_org.commission.month')){
-            $state.go('.org',{'monthStr':monthStr});
+            $state.go('.org');
         }
     }]);
     app.controller('orgCommissionRootCtrl', ['$scope', '$http', '$filter', '$state', 'commonDialog',
         function ($scope, $http, $filter, $state, commonDialog) {
             $scope.generate = {};
-
             $scope.generateOrgCommission = function () {
                 $scope.generate.status = {};
                 if (!$scope.generate.month) {
@@ -127,10 +119,7 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) {
                     $state.go('analysis_org.commission.month', {monthStr: monthStr})
             };
 
-            $scope.gotoReferrerMonth = function () {
-                var monthStr = $scope.params.year.getFullYear() + '-' + $scope.params.month ;
-                    $state.go('analysis_org.commission.referrer.month', {monthStr: monthStr})
-            };
+
         }]);
     app.controller('orgCommissionMonthViewCtrl', ['$scope', 'monthData','$filter', function ($scope, monthData) {
         $scope.monthData = monthData.data;
diff --git a/src/main/ui/static/config/orgcommission/templates/org_commission_month_root.html b/src/main/ui/static/config/orgcommission/templates/org_commission_month_root.html
new file mode 100644
index 000000000..26248c37f
--- /dev/null
+++ b/src/main/ui/static/config/orgcommission/templates/org_commission_month_root.html
@@ -0,0 +1,13 @@
+<div is-open="ctrl.viewyear">
+    <ul id="myTab" class="nav nav-tabs">
+        <li ui-sref-active="active">
+            <a ui-sref=".org" data-toggle="tab">
+                合伙人提成
+            </a>
+        </li>
+        <li ui-sref-active="active"><a ui-sref=".referrer" data-toggle="tab">推荐人提成</a></li>
+    </ul>
+    <div class="tab-content" ui-view>
+
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/main/ui/static/config/orgcommission/templates/org_commission_root.html b/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
index a73fc8e34..b51901666 100644
--- a/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
+++ b/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
@@ -48,15 +48,5 @@
         </div>
     </div>
 
-    <div is-open="ctrl.viewyear">
-    <ul id="myTab" class="nav nav-tabs">
-        <li class="active">
-            <a ng-click="gotoMonth(mon.month)" data-toggle="tab">
-                合伙人提成
-            </a>
-        </li>
-        <li><a ng-click = "gotoReferrerMonth(mon.month)" data-toggle="tab">推荐人提成</a></li>
-    </ul>
-    </div>
     <div ui-view></div>
 </div>
\ No newline at end of file

From e734b44f9ab9c49b574d4d8375584115de541271 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Wed, 17 Jan 2018 10:11:25 +0800
Subject: [PATCH 5/5] finish merge referrer & cityPartner

---
 src/main/ui/static/analysis/org/templates/analysis_org.html | 4 ----
 src/main/ui/static/config/orgcommission/orgcommission.js    | 6 +++---
 .../templates/referrer_commission_detail.html               | 1 -
 .../templates/referrer_commission_month.html                | 4 ++--
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/main/ui/static/analysis/org/templates/analysis_org.html b/src/main/ui/static/analysis/org/templates/analysis_org.html
index 8c6029ad3..c1a6666b3 100644
--- a/src/main/ui/static/analysis/org/templates/analysis_org.html
+++ b/src/main/ui/static/analysis/org/templates/analysis_org.html
@@ -8,10 +8,6 @@
             <li ui-sref-active-eq="active" ng-if="('orgcommission'|withModule)">
                 <a ui-sref="analysis_org.commission"><i class="fa fa-users"></i></i>合伙人提成|City Partner Commissions</a>
             </li>
-            <li ui-sref-active-eq="active">
-                <a ui-sref="analysis_org.referrercommission"><i class="fa fa-users"></i></i>推荐人提成|Referrer Commissions</a>
-            </li>
-
         </ul>
     </div>
 </div>
diff --git a/src/main/ui/static/config/orgcommission/orgcommission.js b/src/main/ui/static/config/orgcommission/orgcommission.js
index 3f8e07b0f..448e79b29 100644
--- a/src/main/ui/static/config/orgcommission/orgcommission.js
+++ b/src/main/ui/static/config/orgcommission/orgcommission.js
@@ -44,7 +44,7 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) {
                     return $http.get('/sys/citypartner_prizes/referrer/months/' + $stateParams.monthStr);
                 }]
             }
-        }).state('analysis_org.commission.org.month.orgdetail', {
+        }).state('analysis_org.commission.month.org.orgdetail', {
             url: '/citypartners/{orgId}',
             templateUrl: '/static/config/orgcommission/templates/org_commission_detail.html',
             controller: 'orgCommissionOrgDetailCtrl',
@@ -53,8 +53,8 @@ define(['angular','../../analysis/org/analysis-org'], function (angular) {
                     return $http.get('/sys/citypartner_prizes/months/' + $stateParams.monthStr + '/orgs/' + $stateParams.orgId);
                 }]
             }
-        }).state('analysis_org.commission.referrer.month.detail', {
-            url: '/referrer_commissions/citypartners/{orgId}',
+        }).state('analysis_org.commission.month.referrer.referrerdetail', {
+            url: '/referrer_commissions/{orgId}',
             templateUrl: '/static/config/referrercommission/templates/referrer_commission_detail.html',
             controller: 'referrerCommissionOrgDetailCtrl',
             resolve: {
diff --git a/src/main/ui/static/config/referrercommission/templates/referrer_commission_detail.html b/src/main/ui/static/config/referrercommission/templates/referrer_commission_detail.html
index 1b4d4a8b6..986b21930 100644
--- a/src/main/ui/static/config/referrercommission/templates/referrer_commission_detail.html
+++ b/src/main/ui/static/config/referrercommission/templates/referrer_commission_detail.html
@@ -5,7 +5,6 @@
     }
 
 </style>
-
 <div class="box box-warning" ng-if="detail">
     <div class="box-header">Analysis</div>
     <div class="box-body nowrap">
diff --git a/src/main/ui/static/config/referrercommission/templates/referrer_commission_month.html b/src/main/ui/static/config/referrercommission/templates/referrer_commission_month.html
index 0553ffaeb..a405a1425 100644
--- a/src/main/ui/static/config/referrercommission/templates/referrer_commission_month.html
+++ b/src/main/ui/static/config/referrercommission/templates/referrer_commission_month.html
@@ -1,4 +1,4 @@
-<div>
+<div ui-view>
     <div class="box box-warning">
         <div class="box-header">Analysis</div>
         <div class="box-body">
@@ -34,7 +34,7 @@
                     <td ng-bind="log.gross_amount|currency:'AUD'"></td>
                     <td ng-bind="log.org_charge|currency:'AUD'"></td>
                     <td>
-                        <a ui-sref=".orgdetail({orgId:log.org_id})">
+                        <a ui-sref=".referrerdetail({orgId:log.org_id})">
                             <i class="fa fa-search"></i>
                         </a>
                     </td>