bd类型修改

src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java

@@ -420,6 +420,7 @@ public class BDPrizeServiceImpl implements BDPrizeService {
             config.put("manager_id", bdId);
             config.put("bd_name", bdUser.getString("display_name"));
             config.put("bd_level", info.getIntValue("bd_level"));
+            config.put("bd_type", info.getIntValue("bd_type"));
             config.put("city", info.getString("city"));
             config.put("get_prize", info.getBooleanValue("get_prize"));
             config.put("bd_group", info.getString("bd_group"));
@@ -431,6 +432,7 @@ public class BDPrizeServiceImpl implements BDPrizeService {
             config.put("city", info.getString("city"));
             config.put("get_prize", info.getBooleanValue("get_prize"));
             config.put("bd_group", info.getString("bd_group"));
+            config.put("bd_type", info.getIntValue("bd_type"));
             config.put("last_update_by", manager.getString("display_name"));
             config.put("last_update_date", new Date());
             financialBDConfigMapper.updateBDConfig(config);

src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.xml

@@ -11,6 +11,7 @@
             c.get_prize,
             c.bd_group,
             c.kpi_amount,
+            c.bd_type,
             m.is_valid
         FROM sys_managers m
             LEFT JOIN financial_bd_config c ON c.manager_id = m.manager_id

src/main/ui/static/config/bdprize/bdprize.js

@@ -127,6 +127,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
         $scope.editBDLevels = function () {
             $uibModal.open({
                 templateUrl: '/static/config/bdprize/templates/bd_level_config_dialog.html',
+                size: 'lg',
                 controller: 'bdLevelConfigCtrl'
             })
         };
@@ -194,7 +195,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
         }
     }]);
     app.controller('bdLevelConfigCtrl', ['$scope', '$http', function ($scope, $http) {
-
+        $scope.bdtypes = [{id: 1, label: 'BD Manager(Sydney)'}, {id: 2, label: 'KA Manager(Sydney)'},{id: 6, label: 'BD Manager(Melbourne)'}, {id: 7, label: 'KA Manager(Melbourne)'}];
         $scope.getBDGroups = function () {
             $http.get('/sys/manager_accounts/roles/bd_leader').then(function (resp) {
                 $scope.bdgroups = resp.data;
@@ -220,7 +221,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
     app.controller('bdCommissionConfigCtrl', ['$scope', '$state', '$http', '$filter', 'monModal', function ($scope, $state, $http, $filter, monModal) {
         $scope.monModal = monModal;
         $scope.params = {year: new Date().getFullYear()};
-        $scope.bdtypes = [{id: 1, label: 'BD Manager'}, {id: 2, label: 'KA Manager'}, {id: 3, label: 'Sydney GM'},{id: 4, label: 'COO'},{id: 5, label: 'NJ Department'}];
+        $scope.bdtypes = [{id: 1, label: 'BD Manager(Sydney)'}, {id: 2, label: 'KA Manager(Sydney)'}, {id: 6, label: 'BD Manager(Melbourne)'}, {id: 7, label: 'KA Manager(Melbourne)'}];//, {id: 3, label: 'Sydney GM'},{id: 4, label: 'COO'},{id: 5, label: 'NJ Department'}];
         // $scope.bdmon;
         // $scope.newSwitch;
         $scope.initMonth = function (year) {

src/main/ui/static/config/bdprize/templates/bd_commission_config_dialog.html

@@ -82,7 +82,7 @@
                             <li>未完成月度指标，当月部门提成为该部门总流水的 0.005%；</li>
                         </ul>
                     </div>
-                    <div class="box-header with-border">
+                    <!--<div class="box-header with-border">
                         <h6 class="intro_color">悉尼分公司总经理</h6>
                     </div>
                     <div class="box-body">
@@ -107,7 +107,7 @@
                         <ul class="small">
                             <li>完成 KPI 按照 0.03%提取；未完成 KPI 按照 0.02%提取</li>
                         </ul>
-                    </div>
+                    </div>-->
                 </div>
 
             </div>

src/main/ui/static/config/bdprize/templates/bd_level_config_dialog.html

@@ -10,6 +10,7 @@
             <th>BD Level</th>
             <th>Get Prize</th>
             <th>BD Group</th>
+            <th>BD Type</th>
         </tr>
         </thead>
         <tbody>
@@ -32,6 +33,9 @@
                 <select class="form-control" ng-options="bdleader.manager_id as bdleader.display_name for bdleader in bdgroups" ng-model="bd.bd_group"
                         ng-change="updateBDLevel(bd)"></select>
             </td>
+            <td ng-if="bdleader.manager_id == bd.manager_id" ng-repeat="bdleader in bdgroups">
+                <select class="form-control"ng-options="bdtype.id as bdtype.label for bdtype in bdtypes" ng-model="bd.bd_type" ng-change="updateBDLevel(bd)"></select>
+            </td>
         </tr>
         </tbody>
     </table>

src/main/ui/static/config/bdprize/templates/bd_prize_root.html

@@ -12,14 +12,14 @@
                 <div class="box box-default">
                     <div class="box-body">
                         <div class="form-inline">
-                            <div class="form-group">
-                                <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="generateReport()" ng-disabled="!generate.month">
-                                Generate Report
-                            </button>
+                            <!--<div class="form-group">-->
+                                <!--<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="generateReport()" ng-disabled="!generate.month">-->
+                                <!--Generate Report-->
+                            <!--</button>-->
                             <button class="btn btn-primary" ng-click="editRateConfig()"><i class="fa fa-cog"></i> Edit Rate Config</button>
                             <button class="btn btn-primary" ng-click="editBDLevels()"><i class="fa fa-user"></i> Edit BD Level</button>
                             <loadingbar ng-if="generate.status"></loadingbar>