feat: NG-74: 奖金计算调整

src/components/TreeChart/index.vue

@@ -183,8 +183,6 @@ export default {
               "</span>" +
               '<span style="color: #000000;">' +
               params.data.EMP_LV_NAME +
-              "，" +
-              params.data.CROWN_LV_NAME +
               "</span>" +
               "</div>" +
               "<div>" +

src/views/atlas/relation-opt.vue

@@ -26,8 +26,7 @@
                         <el-tag><!-- 会员编号 -->{{ $t('atlas.memberCode') }}：{{ node.label }}</el-tag>
                         <el-tag type="success">{{ $t('atlas.name') }}<!-- 姓名 -->：{{data.REAL_NAME}}</el-tag>
                         <el-tag type="warning">{{ $t('atlas.level') }}<!-- 级别 -->：{{data.DEC_LV_NAME}}</el-tag>
-                        <el-tag type="warning">{{ $t('atlas.highest') }}：<!-- 聘级 -->{{data.EMP_LV_NAME}}, {{data.CROWN_LV_NAME}}</el-tag>
-  <!--                      <el-tag type="warning">Star：&lt;!&ndash; 星级 &ndash;&gt;{{data.CROWN_LV_NAME}}</el-tag>-->
+                        <el-tag type="warning">{{ $t('atlas.highest') }}：<!-- 聘级 -->{{data.EMP_LV_NAME}}</el-tag>
                       </span>
                   </span>
             </el-tree>
@@ -45,7 +44,7 @@
               </el-input>
               <el-button type="primary" size="small" @click="handleFilter">{{ $t('common.confirm') }}<!-- 确定 --></el-button>
             </div>
-  
+
             <el-table :data="tableData" stripe style="width: 100%;" :height="tool.getTableHeight(true)">
               <!--<el-table-column type="selection" width="55" v-if="tableHeaders"></el-table-column>-->
               <el-table-column v-for="(tableHeader, key) in tableHeaders" :key="key" :label="tableHeader.header" :width="tableHeader.other.width ? tableHeader.other.width : ''">
@@ -84,7 +83,7 @@
       </div>
     </div>
   </template>
-  
+
   <script>
     import tool from '@/utils/tool'
     import store from '@/utils/vuexStore'
@@ -92,7 +91,7 @@
     import Pagination from '@/components/Pagination'
     import baseInfo from '@/utils/baseInfo'
     import { mainUserInfo, getRelation, relationList, relationListExport } from '@/api/atlas'
-  
+
     export default {
       name: 'atlas_relation-opt',
       components: {Pagination},
@@ -286,7 +285,7 @@
       }
     }
   </script>
-  
+
   <style>
     .filter-user{font-size: 14px;margin-bottom: 20px;}
     .filter-user:after{content: '';display: table;
@@ -297,23 +296,23 @@
       font-size: 14px;
       overflow-x: auto;
     }
-  
+
     .el-tree .el-tag {
       height: 20px;
       line-height: 18px;vertical-align: middle;
     }
     .el-tree-node{position: relative;}
-  
+
     .el-tree-node__content {
       height: 30px;
       line-height: 30px;
     }
-  
+
     .el-tree-node__children {
       position: relative;
       padding: 0 0 0 16px;
     }
-  
+
     .el-tree-node:before {
       position: absolute;
       content: '';
@@ -323,16 +322,16 @@
       border-left: 1px solid #ccc;
     }
     .el-tree-node:last-child:before{height: 15px;}
-  
+
     .custom-tree-node {
       position: relative;
       padding-left: 5px;
     }
-  
+
     .first-node:before {
       display: none;
     }
-  
+
     .custom-tree-node:before {
       position: absolute;
       width: 8px;
@@ -341,9 +340,8 @@
       left: -4px;
       border-bottom: 1px solid #ccc;
     }
-  
+
     .el-tree-node__expand-icon {
       display: none !important;
     }
   </style>
-  

src/views/config/bonus-config.vue

@@ -67,7 +67,7 @@
       </div>
     </div>
 
-    <div v-if="permission.hasPermission(`config/bonus-dec-level`)" class="panel">
+    <div v-if="false" class="panel">
       <div class="panel-heading">{{ $t('config.teamBonusConfig') }}</div>
       <div class="panel-wrapper">
         <div class="panel-body">
@@ -95,7 +95,7 @@
       </div>
     </div>
 
-    <div v-if="permission.hasPermission(`config/bonus-emp-level`)" class="panel">
+    <div v-if="false" class="panel">
       <div class="panel-heading">{{ $t('config.manageStarConfig') }}</div>
       <div class="panel-wrapper">
         <div class="panel-body">
@@ -145,7 +145,7 @@
       </div>
     </div>
 
-    <div v-if="permission.hasPermission(`config/bonus-star-level`)" class="panel">
+    <div v-if="false" class="panel">
       <div class="panel-heading">{{ $t('config.crownStarConfig') }}</div>
       <div class="panel-wrapper">
         <div class="panel-body">
@@ -243,9 +243,9 @@ export default {
       this.loading = true
       fetchBonusConfig().then(response => {
         this.configData = response.data.config
-        this.decLevelTableData = Object.values(response.data.decLevel)
-        this.empLevelTableData = Object.values(response.data.empLevel)
-        this.crownLevelTableData = Object.values(response.data.crownLevel)
+        // this.decLevelTableData = Object.values(response.data.decLevel)
+        // this.empLevelTableData = Object.values(response.data.empLevel)
+        // this.crownLevelTableData = Object.values(response.data.crownLevel)
 
         setTimeout(() => {
           this.loading = false