会员端奖金管理详细列表

frontendApi/config/menu.php

@@ -73,7 +73,7 @@ return [
         'show'=>1,
         'child'=>[
             ['name'=>'我的账户', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'index', 'routePath'=>'bonus/index', 'show'=>1,],
-            ['name'=>'最新奖金', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'new', 'routePath'=>'bonus/new', 'show'=>1,'allow'=>'newBonusSwitch'],
+//            ['name'=>'最新奖金', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'new', 'routePath'=>'bonus/new', 'show'=>1,'allow'=>'newBonusSwitch'],
             ['name'=>'往期奖金', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'other', 'routePath'=>'bonus/other', 'show'=>1,'allow'=>'pastBonusSwitch'],
             //['name'=>'实时业绩', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'real-time-perf', 'routePath'=>'bonus/real-time-perf', 'show'=>1,],
            // ['name'=>'房产积分', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'fc-point', 'routePath'=>'bonus/fc-point', 'show'=>1,],

frontendApi/modules/v1/controllers/BonusController.php

@@ -270,37 +270,45 @@ class BonusController extends BaseController {
         $sysConfig = Cache::getSystemConfig();
 
         if($detailSwitch) {
-            $data[] = ['name' => '期数', 'value' => $periodNum];
-            $data[] = ['name' => '级别', 'value' => Cache::getDecLevelConfig()[$calcBonus['LAST_DEC_LV']]['LEVEL_NAME']];
-            $data[] = ['name' => '荣誉', 'value' => Cache::getEmpLevelConfig()[$calcBonus['LAST_EMP_LV']]['LEVEL_NAME']];
+            $data['PERIOD_NUM'] = ['name' => '期数', 'value' => $periodNum];
+            $data['LAST_DEC_LV'] = ['name' => '级别', 'value' => Cache::getDecLevelConfig()[$calcBonus['LAST_DEC_LV']]['LEVEL_NAME']];
+            $data['LAST_EMP_LV'] = ['name' => '荣誉', 'value' => Cache::getEmpLevelConfig()[$calcBonus['LAST_EMP_LV']]['LEVEL_NAME']];
             if ($sysConfig['openTG']['VALUE']) {
                 // 销售奖金 就是 原来的推广奖
-                $data[] = ['name' => '销售奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_TG'])];
+                $data['ORI_BONUS_TG'] = ['name' => '销售奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_TG'])];
             }
             if ($sysConfig['openQY']['VALUE']) {
                 // 业绩奖金  就是原来的团队奖 并将业绩奖金改成绩效奖金
                 // $data[] = ['name' => '团队奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_QY'])];
-                $data[] = ['name' => '绩效奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_QY'])];
+                $data['ORI_BONUS_QY'] = ['name' => '业绩奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_QY'])];
             }
             // 管理奖金 就是新的蓝星奖
-            $data[] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BS'])];
-            if ($sysConfig['openGX']['VALUE']) {
-                $data[] = ['name' => '共享奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_GX'])];
-            }
-            if ($sysConfig['openFW']['VALUE']) {
-                $data[] = ['name' => '服务奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BD'])];
-            }
-            $data[] = ['name' => '总奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_TOTAL'])];
-            $data[] = ['name' => '管理费', 'value' => Tool::formatPrice($calcBonus['MANAGE_TAX'])];
-            $data[] = ['name' => '实发奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_REAL'])];
-            $data[] = ['name' => '复消积分', 'value' => Tool::formatPrice($calcBonus['RECONSUME_POINTS'])];
-            $data[] = ['name' => '兑换积分', 'value' => Tool::formatPrice($calcBonus['EXCHANGE_POINTS'])];
-            $data[] = ['name' => '一市场新增业绩', 'value' => Tool::formatFrontPerf($calcBonus['PV_1L'])];
-            $data[] = ['name' => '二市场新增业绩', 'value' => Tool::formatFrontPerf($calcBonus['PV_2L'])];
-            $data[] = ['name' => '三市场新增业绩', 'value' => Tool::formatFrontPerf($calcBonus['PV_3L'])];
-            $data[] = ['name' => '一市场结余业绩', 'value' => Tool::formatFrontPerf($calcBonus['SURPLUS_1L'])];
-            $data[] = ['name' => '二市场结余业绩', 'value' => Tool::formatFrontPerf($calcBonus['SURPLUS_2L'])];
-            $data[] = ['name' => '三市场结余业绩', 'value' => Tool::formatFrontPerf($calcBonus['SURPLUS_3L'])];
+//            $data[] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BS'])];
+//            if ($sysConfig['openGX']['VALUE']) {
+//                $data[] = ['name' => '共享奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_GX'])];
+//            }
+//            if ($sysConfig['openFW']['VALUE']) {
+//                $data[] = ['name' => '服务奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BD'])];
+//            }
+            // 管理奖金 就是新的蓝星奖
+            $data['ORI_BONUS_BS_MNT'] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BS_MNT'])];
+            $data['ORI_BONUS_BS_ABBR'] = ['name' => '绩效奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BS_ABBR'])];
+
+            $data['ORI_BONUS_QUARTER'] = ['name' => '季度奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_QUARTER'])];
+            $data['BONUS_TRAVEL'] = ['name' => '旅游奖', 'value' => Tool::formatPrice($calcBonus['BONUS_TRAVEL'])];
+            $data['BONUS_CAR'] = ['name' => '名车奖', 'value' => Tool::formatPrice($calcBonus['BONUS_CAR'])];
+            $data['BONUS_HOUSE'] = ['name' => '豪宅奖', 'value' => Tool::formatPrice($calcBonus['BONUS_HOUSE'])];
+            $data['BONUS_TOTAL'] = ['name' => '合计', 'value' => Tool::formatPrice($calcBonus['BONUS_TOTAL'])];
+//            $data[] = ['name' => '管理费', 'value' => Tool::formatPrice($calcBonus['MANAGE_TAX'])];
+            $data['BONUS_REAL'] = ['name' => '实发奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_REAL'])];
+//            $data[] = ['name' => '复消积分', 'value' => Tool::formatPrice($calcBonus['RECONSUME_POINTS'])];
+//            $data[] = ['name' => '兑换积分', 'value' => Tool::formatPrice($calcBonus['EXCHANGE_POINTS'])];
+            $data['PV_1L'] = ['name' => '一市场新增业绩', 'value' => Tool::formatFrontPerf($calcBonus['PV_1L'])];
+            $data['PV_2L'] = ['name' => '二市场新增业绩', 'value' => Tool::formatFrontPerf($calcBonus['PV_2L'])];
+            $data['PV_3L'] = ['name' => '三市场新增业绩', 'value' => Tool::formatFrontPerf($calcBonus['PV_3L'])];
+            $data['SURPLUS_1L'] = ['name' => '一市场结余业绩', 'value' => Tool::formatFrontPerf($calcBonus['SURPLUS_1L'])];
+            $data['SURPLUS_2L'] = ['name' => '二市场结余业绩', 'value' => Tool::formatFrontPerf($calcBonus['SURPLUS_2L'])];
+            $data['SURPLUS_3L'] = ['name' => '三市场结余业绩', 'value' => Tool::formatFrontPerf($calcBonus['SURPLUS_3L'])];
 
 
 
@@ -387,23 +395,31 @@ class BonusController extends BaseController {
                 }
                 // 业绩奖金,就是原来的团队奖  并将业绩奖金改成绩效奖金
                 if ($sysConfig['openQY']['VALUE']) {
-                    $calcBonus[$key]['BONUS_QY'] = ['name' => '绩效奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_QY'])];
+                    $calcBonus[$key]['ORI_BONUS_QY'] = ['name' => '业绩奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_QY'])];
                 }
                 // 管理奖金 就是新的蓝星奖金
-                $calcBonus[$key]['BONUS_BS'] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BS'])];
+//                $calcBonus[$key]['BONUS_BS'] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BS'])];
                 //共享奖
-                if ($sysConfig['openGX']['VALUE']) {
-                    $calcBonus[$key]['BONUS_GX'] = ['name' => '共享奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_GX'])];
-                }
+//                if ($sysConfig['openGX']['VALUE']) {
+//                    $calcBonus[$key]['BONUS_GX'] = ['name' => '共享奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_GX'])];
+//                }
                 //服务奖
-                if ($sysConfig['openFW']['VALUE']) {
-                    $calcBonus[$key]['BONUS_BD'] = ['name' => '服务奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BD'])];
-                }
+//                if ($sysConfig['openFW']['VALUE']) {
+//                    $calcBonus[$key]['BONUS_BD'] = ['name' => '服务奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BD'])];
+//                }
+                // 管理奖金 就是新的蓝星奖
+                $calcBonus[$key]['ORI_BONUS_BS_MNT'] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BS_MNT'])];
+                $calcBonus[$key]['ORI_BONUS_BS_ABBR'] = ['name' => '绩效奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BS_ABBR'])];
+
+                $calcBonus[$key]['ORI_BONUS_QUARTER'] = ['name' => '季度奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_QUARTER'])];
+                $calcBonus[$key]['BONUS_TRAVEL'] = ['name' => '旅游奖', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_TRAVEL'])];
+                $calcBonus[$key]['BONUS_CAR'] = ['name' => '名车奖', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_CAR'])];
+                $calcBonus[$key]['BONUS_HOUSE'] = ['name' => '豪宅奖', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_HOUSE'])];
                 // 总奖金
-                $calcBonus[$key]['BONUS_TOTAL'] = ['name' => '总奖金', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_TOTAL'])];
-                $calcBonus[$key]['RECONSUME_POINTS'] = ['name' => '复销积分', 'value' => Tool::formatPrice($calcBonus[$key]['RECONSUME_POINTS'])];
-                $calcBonus[$key]['EXCHANGE_POINTS'] = ['name' => '兑换积分', 'value' => Tool::formatPrice($calcBonus[$key]['EXCHANGE_POINTS'])];
-                $calcBonus[$key]['MANAGE_TAX'] = ['name' => '管理费', 'value' => Tool::formatPrice($calcBonus[$key]['MANAGE_TAX'])];
+                $calcBonus[$key]['BONUS_TOTAL'] = ['name' => '合计', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_TOTAL'])];
+//                $calcBonus[$key]['RECONSUME_POINTS'] = ['name' => '复销积分', 'value' => Tool::formatPrice($calcBonus[$key]['RECONSUME_POINTS'])];
+//                $calcBonus[$key]['EXCHANGE_POINTS'] = ['name' => '兑换积分', 'value' => Tool::formatPrice($calcBonus[$key]['EXCHANGE_POINTS'])];
+//                $calcBonus[$key]['MANAGE_TAX'] = ['name' => '管理费', 'value' => Tool::formatPrice($calcBonus[$key]['MANAGE_TAX'])];
                 $calcBonus[$key]['BONUS_REAL'] = ['name' => '实发奖金', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_REAL'])];
                 // if ($sysConfig['openYC']['VALUE']) {
                 //     $calcBonus[$key]['BONUS_YC'] = ['name' => '荣衔奖', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_YC'])];
@@ -430,50 +446,50 @@ class BonusController extends BaseController {
             }
         }
 
-        if($flowBonusSwitch) {
-            $tableKey[] = 'PERIOD_NUM';
-            if ($sysConfig['openTG']['VALUE']) {
-                $tableKey[] = 'BONUS_TG';
-            }
-            if ($sysConfig['openQY']['VALUE']) {
-                $tableKey[] = 'BONUS_QY';
-            }
-            $tableKey[] = 'BONUS_BS';
-            if ($sysConfig['openGX']['VALUE']) {
-                $tableKey[] = 'BONUS_GX';
-            }
-            // if ($sysConfig['openYC']['VALUE']) {
-            //     $tableKey[] = 'BONUS_YC';
-            // }
-            // if ($sysConfig['openVIP']['VALUE']) {
-            //     $tableKey[] = 'BONUS_VIP';
-            // }
-            if ($sysConfig['openFW']['VALUE']) {
-                $tableKey[] = 'BONUS_BD';
-            }
-            
-            // if ($sysConfig['openXF']['VALUE']) {
-            //     $tableKey[] = 'BONUS_XF';
-            // }
-            // if ($sysConfig['openYJ']['VALUE']) {
-            //     $tableKey[] = 'BONUS_YJ';
-            // }
-            
-            // if ($sysConfig['openGL']['VALUE']) {
-            //     $tableKey[] = 'BONUS_GL';
-            // }
-            // if ($sysConfig['openJXS']['VALUE']) {
-            //     $tableKey[] = 'BONUS_STANDARD';
-            // }
-           
-            $tableKey[] = 'BONUS_TOTAL';
-            $tableKey[] = 'RECONSUME_POINTS';
-            $tableKey[] = 'EXCHANGE_POINTS';
-            $tableKey[] = 'MANAGE_TAX';
-            $tableKey[] = 'BONUS_REAL';
-        }else{
-            $tableKey[] = 'BONUS_TOTAL';
-        }
+//        if($flowBonusSwitch) {
+//            $tableKey[] = 'PERIOD_NUM';
+//            if ($sysConfig['openTG']['VALUE']) {
+//                $tableKey[] = 'BONUS_TG';
+//            }
+//            if ($sysConfig['openQY']['VALUE']) {
+//                $tableKey[] = 'BONUS_QY';
+//            }
+//            $tableKey[] = 'BONUS_BS';
+//            if ($sysConfig['openGX']['VALUE']) {
+//                $tableKey[] = 'BONUS_GX';
+//            }
+//            // if ($sysConfig['openYC']['VALUE']) {
+//            //     $tableKey[] = 'BONUS_YC';
+//            // }
+//            // if ($sysConfig['openVIP']['VALUE']) {
+//            //     $tableKey[] = 'BONUS_VIP';
+//            // }
+//            if ($sysConfig['openFW']['VALUE']) {
+//                $tableKey[] = 'BONUS_BD';
+//            }
+//
+//            // if ($sysConfig['openXF']['VALUE']) {
+//            //     $tableKey[] = 'BONUS_XF';
+//            // }
+//            // if ($sysConfig['openYJ']['VALUE']) {
+//            //     $tableKey[] = 'BONUS_YJ';
+//            // }
+//
+//            // if ($sysConfig['openGL']['VALUE']) {
+//            //     $tableKey[] = 'BONUS_GL';
+//            // }
+//            // if ($sysConfig['openJXS']['VALUE']) {
+//            //     $tableKey[] = 'BONUS_STANDARD';
+//            // }
+//
+//            $tableKey[] = 'BONUS_TOTAL';
+//            $tableKey[] = 'RECONSUME_POINTS';
+//            $tableKey[] = 'EXCHANGE_POINTS';
+//            $tableKey[] = 'MANAGE_TAX';
+//            $tableKey[] = 'BONUS_REAL';
+//        }else{
+//            $tableKey[] = 'BONUS_TOTAL';
+//        }
 
         return static::notice(['tableData' => $calcBonus, 'tableKey' => $tableKey]);
     }

frontendEle/src/views/bonus/other.vue

@@ -1,15 +1,29 @@
 <template>
   <div v-loading="loading">
     <div class="white-box">
-      <el-table class="table-box other-table-box" :data="tableData" style="width: 100%;">
-        <el-table-column v-for="(item,key) in tableKey" :key="key">
-          <template slot-scope="scope">
-            <el-tooltip effect="dark" :content="scope.row[item].name" placement="top">
-            <div class="bonus-item">{{scope.row[item].value}}</div>
-            </el-tooltip>
-          </template>
+      <el-table class="table-box" :data="tableData" style="width: 100%;">
+        <el-table-column label="期数" prop="PERIOD_NUM.value">
+        </el-table-column>
+        <el-table-column label="销售奖金" prop="BONUS_TG.value">
+        </el-table-column>
+        <el-table-column label="业绩奖金" prop="ORI_BONUS_QY.value">
+        </el-table-column>
+        <el-table-column label="管理奖金" prop="ORI_BONUS_BS_MNT.value">
+        </el-table-column>
+        <el-table-column label="绩效奖金" prop="ORI_BONUS_BS_ABBR.value">
+        </el-table-column>
+        <el-table-column label="季度分红" prop="ORI_BONUS_QUARTER.value">
+        </el-table-column>
+        <el-table-column label="旅游奖" prop="BONUS_TRAVEL.value">
+        </el-table-column>
+        <el-table-column label="名车奖" prop="BONUS_CAR.value">
+        </el-table-column>
+        <el-table-column label="豪宅奖" prop="BONUS_HOUSE.value">
+        </el-table-column>
+        <el-table-column label="合计" prop="BONUS_TOTAL.value">
+        </el-table-column>
+        <el-table-column label="实发" prop="BONUS_REAL.value">
         </el-table-column>
-
         <el-table-column >
           <template slot-scope="scope">
             <el-button type="primary" size="small" @click.native="showFlow(scope.row.PERIOD_NUM.value)">查看全部</el-button>
@@ -18,14 +32,28 @@
 
       </el-table>
     </div>
-    <el-dialog :title="`${periodNum}期奖金`" :visible.sync="dialogFlowVisible" width="80%">
-      <div class="bonus-list" v-loading="dialogLoading">
-        <div class="bonus-item" v-for="(item,key) in newData" :key="key">
-          <el-tooltip effect="dark" :content="item.name" placement="top-end">
-            <div>{{item.value}}</div>
-          </el-tooltip>
-        </div>
-      </div>
+    <el-dialog :title="`${periodNum}期奖金`" :visible.sync="dialogFlowVisible" width="70%">
+
+        <el-descriptions title="" class="bonus-list" v-if="newData" :column="2">
+          <el-descriptions-item class="bonus-item" label="期数">{{newData.PERIOD_NUM.value}}</el-descriptions-item>
+          <el-descriptions-item class="bonus-item" label="会员等级">{{newData.LAST_DEC_LV.value}}</el-descriptions-item>
+          <el-descriptions-item class="bonus-item" label="销售奖金">{{newData.ORI_BONUS_TG.value}}</el-descriptions-item>
+          <el-descriptions-item class="bonus-item" label="业绩奖金">{{newData.ORI_BONUS_QY.value}}</el-descriptions-item>
+          <el-descriptions-item class="bonus-item" label="管理奖金">{{newData.ORI_BONUS_BS_MNT.value}}</el-descriptions-item>
+          <el-descriptions-item class="bonus-item" label="绩效奖金">{{newData.ORI_BONUS_BS_ABBR.value}}</el-descriptions-item>
+          <el-descriptions-item class="bonus-item" label="季度分红">{{newData.ORI_BONUS_QUARTER.value}}</el-descriptions-item>
+          <el-descriptions-item class="bonus-item" label="旅游奖">{{newData.BONUS_TRAVEL.value}}</el-descriptions-item>
+          <el-descriptions-item class="bonus-item" label="名车奖">{{newData.BONUS_CAR.value}}</el-descriptions-item>
+          <el-descriptions-item class="bonus-item" label="豪宅奖">{{newData.BONUS_HOUSE.value}}</el-descriptions-item>
+          <el-descriptions-item class="bonus-item" label="合计">{{newData.BONUS_TOTAL.value}}</el-descriptions-item>
+          <el-descriptions-item class="bonus-item" label="实发奖金">{{newData.BONUS_REAL.value}}</el-descriptions-item>
+          <el-descriptions-item class="bonus-item" label="一市场新增">{{newData.PV_1L.value}}</el-descriptions-item>
+          <el-descriptions-item class="bonus-item" label="一市场结余">{{newData.SURPLUS_1L.value}}</el-descriptions-item>
+          <el-descriptions-item class="bonus-item" label="二市场新增">{{newData.PV_2L.value}}</el-descriptions-item>
+          <el-descriptions-item class="bonus-item" label="二市场结余">{{newData.SURPLUS_2L.value}}</el-descriptions-item>
+          <el-descriptions-item class="bonus-item" label="三市场新增">{{newData.PV_3L.value}}</el-descriptions-item>
+          <el-descriptions-item class="bonus-item" label="三市场结余">{{newData.SURPLUS_3L.value}}</el-descriptions-item>
+        </el-descriptions>
     </el-dialog>
   </div>
 </template>
@@ -95,7 +123,8 @@
   .other-table-box .el-table__body tr:hover>td{background-color: #fff!important;}
   .other-table-box .el-table__body tr td:not(:last-child):hover{background-color: #f5f5f5!important;}
   .bonus-list:after{content: '';clear: both;display: table;}
+  .bonus-list{width: 360px;}
   .bonus-list .bonus-item{float: left;width: 33.333%;background: #fff;height:36px;line-height:36px;border: 1px solid #ddd;margin: -1px 0 0 -1px;box-sizing: border-box;}
   .bonus-item{text-align: center;}
   .bonus-item:hover{background: #f5f5f5;cursor: pointer;}
-</style>
+</style>