修改奖金展示

frontendApi/modules/v1/controllers/BonusController.php

@@ -261,11 +261,21 @@ class BonusController extends BaseController {
                 // 销售奖金 就是 原来的推广奖
                 $data['ORI_BONUS_TG'] = ['name' => '销售奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_TG'])];
             }
+            $data['ORI_BONUS_TG_SWITCH'] = intval($sysConfig['openTG']['VALUE']);
+
             if ($sysConfig['openQY']['VALUE']) {
                 // 业绩奖金  就是原来的团队奖 并将业绩奖金改成绩效奖金
                 // $data[] = ['name' => '团队奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_QY'])];
                 $data['ORI_BONUS_QY'] = ['name' => '业绩奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_QY'])];
             }
+            $data['ORI_BONUS_QY_SWITCH'] = intval($sysConfig['openQY']['VALUE']);
+
+            //服务奖
+            if ($sysConfig['openFW']['VALUE']) {
+                $data['BONUS_BD'] = ['name' => '服务奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BD'])];
+            }
+            $data['BONUS_BD_SWITCH'] = intval($sysConfig['openFW']['VALUE']);
+
             // 管理奖金 就是新的蓝星奖
 //            $data[] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BS'])];
 //            if ($sysConfig['openGX']['VALUE']) {
@@ -367,6 +377,12 @@ class BonusController extends BaseController {
         //增加明细开关控制(0 只显示总奖金 1 全部显示)
         $flowBonusSwitch = Cache::getSystemConfig()['flowBonusSwitch']['VALUE'];
 
+        $bonusSwitch = [
+            'welcomeBonusSwitch' => intval($sysConfig['openTG']['VALUE']),
+            'teamBonusSwitch' => intval($sysConfig['openQY']['VALUE']),
+            'stockistCommissionSwitch' => intval($sysConfig['openFW']['VALUE']),
+        ];
+
         foreach ($calcBonus as $key => $data) {
             if($flowBonusSwitch) {
                 $calcBonus[$key]['PERIOD_NUM'] = ['name' => '期数', 'value' => $calcBonus[$key]['PERIOD_NUM']];
@@ -381,6 +397,7 @@ class BonusController extends BaseController {
                 if ($sysConfig['openQY']['VALUE']) {
                     $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'])];
                 //共享奖
@@ -391,6 +408,7 @@ class BonusController extends BaseController {
                 if ($sysConfig['openFW']['VALUE']) {
                     $calcBonus[$key]['BONUS_BD'] = ['name' => '服务奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BD'])];
                 }
+
                 // 管理奖金 就是新的蓝星奖
                 $calcBonus[$key]['ORI_BONUS_BS'] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BS'])];
                 $calcBonus[$key]['ORI_BONUS_BS_MNT'] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BS_MNT'])];
@@ -475,7 +493,7 @@ class BonusController extends BaseController {
 //            $tableKey[] = 'BONUS_TOTAL';
 //        }
 
-        return static::notice(['tableData' => $calcBonus, 'tableKey' => '']);
+        return static::notice(['tableData' => $calcBonus, 'tableKey' => '', 'bonusSwitch' => $bonusSwitch]);
     }
 
     /**

frontendEle/src/views/bonus/other.vue

@@ -4,15 +4,15 @@
       <el-table class="table-box" :data="tableData" style="width: 100%;">
         <el-table-column label="Pay cycle" prop="PERIOD_NUM.value" width="100"><!-- 期数 -->
         </el-table-column>
-        <el-table-column label="Welcome Bonus" prop="BONUS_TG.value" width="170"><!-- 销售奖金 -->
+        <el-table-column label="Welcome Bonus" prop="BONUS_TG.value" width="170" v-if="welcomeBonusSwitch === 1"><!-- 销售奖金 -->
         </el-table-column>
-        <el-table-column label="Team Bonus" prop="ORI_BONUS_QY.value" width="170"><!-- 绩效奖 -->
+        <el-table-column label="Team Bonus" prop="ORI_BONUS_QY.value" width="170" v-if="teamBonusSwitch === 1"><!-- 绩效奖 -->
         </el-table-column>
         <el-table-column label="Director Bonus" prop="ORI_BONUS_BS.value" width="170"><!-- 蓝星奖金/管理奖 -->
         </el-table-column>
         <el-table-column label="Quarterly Bonus" prop="ORI_BONUS_QUARTER.value" width="170"><!-- 季度分红 -->
         </el-table-column>
-        <el-table-column label="Stockist Commission" prop="ORI_BONUS_BD.value" width="170"><!-- 季度分红 -->
+        <el-table-column label="Stockist Commission" prop="BONUS_BD.value" width="170" v-if="stockistCommissionSwitch === 1"><!-- 服务中心 -->
         </el-table-column>
         <el-table-column label="Total Bonus" prop="BONUS_TOTAL.value" width="170"><!-- 合计 -->
         </el-table-column>
@@ -30,10 +30,11 @@
         <el-descriptions title="" class="bonus-list" v-if="newData" :column="2" border>
           <el-descriptions-item class="bonus-item" label="Pay cycle">{{newData.PERIOD_NUM.value}}</el-descriptions-item><!-- 期数 -->
           <el-descriptions-item class="bonus-item" label="Member Level">{{newData.LAST_DEC_LV.value}}</el-descriptions-item><!-- 会员等级 -->
-          <el-descriptions-item class="bonus-item" label="Welcome Bonus">{{newData.ORI_BONUS_TG.value}}</el-descriptions-item><!-- 销售奖金 -->
-          <el-descriptions-item class="bonus-item" label="Team Bonus">{{newData.ORI_BONUS_QY.value}}</el-descriptions-item><!-- 绩效奖 -->
+          <el-descriptions-item class="bonus-item" label="Welcome Bonus" v-if="newData.ORI_BONUS_TG_SWITCH === 1">{{newData.ORI_BONUS_TG.value}}</el-descriptions-item><!-- 销售奖金 -->
+          <el-descriptions-item class="bonus-item" label="Team Bonus" v-if="newData.ORI_BONUS_QY_SWITCH === 1">{{newData.ORI_BONUS_QY.value}}</el-descriptions-item><!-- 绩效奖 -->
           <el-descriptions-item class="bonus-item" label="Director Bonus">{{newData.ORI_BONUS_BS.value}}</el-descriptions-item><!-- 蓝星奖金/管理奖 -->
           <el-descriptions-item class="bonus-item" label="Quarterly Bonus">{{newData.ORI_BONUS_QUARTER.value}}</el-descriptions-item><!-- 季度分红 -->
+          <el-descriptions-item class="bonus-item" label="Stockist Commission" v-if="newData.BONUS_BD_SWITCH === 1">{{newData.BONUS_BD.value}}</el-descriptions-item><!-- 服务中心 -->
           <el-descriptions-item class="bonus-item" label="Total Bonus">{{newData.BONUS_TOTAL.value}}</el-descriptions-item><!-- 合计 -->
           <el-descriptions-item class="bonus-item" label="Actual bonus">{{newData.BONUS_REAL.value}}</el-descriptions-item><!-- 实发奖金 -->
           <el-descriptions-item class="bonus-item" label="Left newly increased performance">{{newData.PV_1L.value}}</el-descriptions-item><!-- 一市场新增 -->
@@ -66,6 +67,9 @@
         periodNum: '',
         dialogLoading: false,
         tool: tool,
+        welcomeBonusSwitch: false,
+        teamBonusSwitch: false,
+        stockistCommissionSwitch: false,
       }
     },
     methods: {
@@ -75,6 +79,9 @@
         network.getData('bonus/other').then(response => {
           vueObj.tableData = response.tableData
           vueObj.tableKey = response.tableKey
+          vueObj.welcomeBonusSwitch = response.bonusSwitch.welcomeBonusSwitch
+          vueObj.teamBonusSwitch = response.bonusSwitch.teamBonusSwitch
+          vueObj.stockistCommissionSwitch = response.bonusSwitch.stockistCommissionSwitch
           vueObj.loading = false
         }).catch(response => {
           vueObj.loading = false

frontendEle/src/views/finance/recharge-add.vue

@@ -8,7 +8,7 @@
                 <el-form-item label="Bank account">
                     <el-input v-model="form.bankNo"></el-input>
                 </el-form-item>
-                <el-form-item label="Remitting bank">
+                <el-form-item label="Bank name">
                     <el-select v-model="form.openBank" placeholder="Select Bank">
                         <el-option v-for="(item,index) in allOpenBank" :key="index" :label="item.BANK_NAME"
                                    :value="item.BANK_CODE"></el-option>

frontendEle/src/views/finance/recharge.vue

@@ -19,7 +19,7 @@
                         <el-tag :type="tool.statusType(scope.row.AUDIT_STATUS)">{{scope.row.STATUS_NAME}}</el-tag>
                         </template>
                     </el-table-column>
-                    <el-table-column label="Remitting bank" prop="OPEN_BANK_NAME">
+                    <el-table-column label="Bank name" prop="OPEN_BANK_NAME">
 
                     </el-table-column>