拆分显示完成

backendApi/modules/v1/models/lists/bonus/PeriodBonusList.php

@@ -335,6 +335,32 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                         'prop'=>'ORI_BONUS_QY_BD',
                     ],
                 ],
+
+                'BONUS_BS' => [
+                    'header' => '蓝星管理奖',
+                    'value' => function($row) {
+                        return (new Price([
+                            'value' => $row['BONUS_BS'],
+                        ]))->result();
+                    },
+                    'headerOther' => [
+                        'width' => '120',
+                        'prop'=>'BONUS_BS',
+                    ],
+                ],
+                'ORI_BONUS_BS' => [
+                    'header' => '蓝星管理奖原金额',
+                    'value' => function($row) {
+                        return (new Price([
+                            'value' => $row['ORI_BONUS_BS'],
+                        ]))->result();
+                    },
+                    'headerOther' => [
+                        'width' => '120',
+                        'prop'=>'ORI_BONUS_BS',
+                    ],
+                ],
+
                 'ORI_BONUS_BU_YJ' => [
                     'header' => '蓝星业绩奖(原奖金)',
                     'value' => function($row) {

frontendApi/modules/v1/controllers/BonusController.php

@@ -362,7 +362,12 @@ class BonusController extends BaseController {
                 $data[] = ['name' => '绩效奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_QY'])];
             }
             // 管理奖金 就是新的蓝星奖
-            $data[] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BS'])];
+           // $data[] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BS'])];
+            //蓝星业绩奖
+            $data[] = ['name' => '业绩奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BU_YJ'])];
+            //蓝星管理奖
+            $data[] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BU_GL'])];
+
             if ($sysConfig['openGX']['VALUE']) {
                 $data[] = ['name' => '共享奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_GX'])];
             }
@@ -444,7 +449,7 @@ class BonusController extends BaseController {
         $calcBonus = CalcBonus::find()->where('USER_ID=:USER_ID AND IS_SENT=1', [':USER_ID' => \Yii::$app->user->id])
         ->select('PERIOD_NUM,ORI_BONUS_QY,ORI_BONUS_YC,ORI_BONUS_VIP,ORI_BONUS_STANDARD,ORI_BONUS_BD,ORI_BONUS_TG,
         ORI_BONUS_XF,BONUS_TOTAL,MANAGE_TAX,BONUS_REAL,BONUS_INCOME,ORI_BONUS_YJ,ORI_BONUS_GX,ORI_BONUS_GL,RECONSUME_POINTS,
-        LAST_DEC_LV,LAST_EMP_LV,EXCHANGE_POINTS,ORI_BONUS_BS')
+        LAST_DEC_LV,LAST_EMP_LV,EXCHANGE_POINTS,ORI_BONUS_BS,ORI_BONUS_BU_GL,ORI_BONUS_BU_YJ')
         ->limit($showBonusPeriodNum)
         ->orderBy('PERIOD_NUM DESC')
         ->asArray()
@@ -469,7 +474,14 @@ class BonusController extends BaseController {
                     $calcBonus[$key]['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'])];
+
+                // 蓝星业绩奖
+                $calcBonus[$key]['ORI_BONUS_BU_YJ'] = ['name' => '业绩奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BU_YJ'])];
+
+                // 蓝星管理奖
+                $calcBonus[$key]['ORI_BONUS_BU_GL'] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BU_GL'])];
+
                 //共享奖
                 if ($sysConfig['openGX']['VALUE']) {
                     $calcBonus[$key]['BONUS_GX'] = ['name' => '共享奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_GX'])];
@@ -517,7 +529,11 @@ class BonusController extends BaseController {
             if ($sysConfig['openQY']['VALUE']) {
                 $tableKey[] = 'BONUS_QY';
             }
-            $tableKey[] = 'BONUS_BS';
+            //$tableKey[] = 'BONUS_BS';
+
+            $tableKey[] = 'ORI_BONUS_BU_YJ';
+            $tableKey[] = 'ORI_BONUS_BU_GL';
+
             if ($sysConfig['openGX']['VALUE']) {
                 $tableKey[] = 'BONUS_GX';
             }

frontendEle/src/views/bonus/other.vue

@@ -58,7 +58,7 @@
         let vueObj = this
         vueObj.loading = true
         network.getData('bonus/other').then(response => {
-          //console.log(response);
+          console.log(response);
           vueObj.tableData = response.tableData
           vueObj.tableKey = response.tableKey
           vueObj.loading = false