theo před 3 roky
rodič
revize
53f37960e1

+ 1 - 1
backendApi/config/menu.php

@@ -269,7 +269,7 @@ return [
 //            ['name'=>'报单中心货补追溯导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'trace-fl-export', 'routePath'=>'bonus/trace-fl-export', 'show'=>0,],
 //            ['name'=>'区域业绩提成追溯', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'trace-fw', 'routePath'=>'bonus/trace-fw', 'show'=>1,],
 //            ['name'=>'区域业绩提成追溯导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'trace-fw-export', 'routePath'=>'bonus/trace-fw-export', 'show'=>0,],
-            ['name'=>'Performance sheet', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-order', 'routePath'=>'bonus/perf-order', 'show'=>1,],//业绩单
+            ['name'=>'Sales Record', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-order', 'routePath'=>'bonus/perf-order', 'show'=>1,],//业绩单
             ['name'=>'业绩单导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-order-export', 'routePath'=>'bonus/perf-order-export', 'show'=>0,],
 //            ['name'=>'会员实时业绩', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'real-time-perf', 'routePath'=>'bonus/real-time-perf', 'show'=>1,],
             ['name'=>'Period performance', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-period-list', 'routePath'=>'bonus/perf-period-list', 'show'=>1,],//期业绩

+ 2 - 2
backendApi/modules/v1/models/lists/bonus/PerfOrderList.php

@@ -82,7 +82,7 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                     'value' => function($row){
                         $decTypes = [
-                            'ZC'=> 'First purchase order',//首购单
+                            'ZC'=> 'Welcome Pack order',//首购单
                             'YH'=> 'Coupon',//优惠单
                             'ZG'=> 'Additional purchase order',//增购单
                             'LS'=> 'Retail order',//零售单
@@ -150,7 +150,7 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'FROM_TABLES' => [
-                    'header' => '订单来源',
+                    'header' => 'Order Source',
                     'headerOther' => [
                         'width' => '250',
                     ],

+ 15 - 1
backendApi/modules/v1/models/lists/user/IndexList.php

@@ -81,6 +81,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
     public function getColumn(){
         $decLevelConfig = Cache::getDecLevelConfig();
         $empLevelConfig = Cache::getEmpLevelConfig();
+        $starLevelConfig = Cache::getStarCrownLevelConfig();
         $decRoleConfig = DecRole::getAllData();
         $systemConfig = UserSystem::getAllSystems();
         $openBankConfig = OpenBank::getAllOpenBank();
@@ -176,6 +177,18 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                         'tag'=>['type'=>'warning', 'size' => 'small', 'class'=>'no-border']
                     ],
                 ],
+                'STAR_LV_NAME' => [
+                    'header' => 'Real time crown', // 实时星级
+                    'headerOther' => [
+                        'width' => '130',
+                    ],
+                    'value' => function($row) use($starLevelConfig) {
+                        return isset($starLevelConfig[$row['STAR_LV']])?$starLevelConfig[$row['STAR_LV']]['LEVEL_NAME']:'';
+                    },
+                    'valueOther' => [
+                        'tag'=>['type'=>'warning', 'size' => 'small', 'class'=>'no-border']
+                    ],
+                ],
 //                'HIGHEST_EMP_LV_NAME' => [
 //                    'header' => '历史最高聘级',
 //                    'value' => function($row) use($empLevelConfig) {
@@ -578,7 +591,8 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                 'DEC_LV_NAME'=> ['name'=> 'Real time membership level', 'other'=> 'decLevel'], // 实时会员级别
 //                'DEC_LV_UPDATED_AT'=> ['name'=> '实时调整日期', 'other'=> 'date'],
 //                'LAST_DEC_LV_NAME'=> ['name'=> '结算时会员级别', 'other'=> 'decLevel'],
-                'EMP_LV_NAME'=> ['name'=> 'Real time employment', 'other'=> 'empLevel'],//实时聘级
+                'EMP_LV_NAME'=> ['name'=> 'Real time employment', 'other'=> 'empLevel'], // 实时聘级
+                'STAR_LV_NAME'=> ['name'=> 'Real time Crown', 'other'=> 'starLevel'], // 实时聘级
 //                'HIGHEST_EMP_LV_NAME'=> ['name'=> '历史最高聘级', 'other'=> 'empLevel'],
 //                'HIGHEST_EMP_LV_PERIOD'=> ['name'=> '首次达到历史最高聘级的期数'],
                 'REC_USER_NAME'=> ['name'=> 'Recommendation No'],//推荐编号

+ 1 - 1
backendEle/src/router/index.js

@@ -1091,7 +1091,7 @@ export const constantRouterMap = [
         component: _import('bonus/perf-order'),
         name: 'bonus_perf-order',
         meta: {
-          title: 'Performance sheet', // 业绩单
+          title: 'Sales Record', // 业绩单
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'}, // Dashboard
             {title: 'Bonus management', path: '/bonus/period'}, // 奖金管理

+ 1 - 1
backendEle/src/views/bonus/perf-order.vue

@@ -3,7 +3,7 @@
     <div class="white-box">
       <el-tabs v-model="filterStatus" @tab-click="handleFilterStatusClick">
         <el-tab-pane label="All" name="ALL" :lazy="true"></el-tab-pane><!-- 全部 -->
-        <el-tab-pane label="First purchase order" name="ZC" :lazy="true"></el-tab-pane><!-- 首购单 -->
+        <el-tab-pane label="Welcome Pack order" name="ZC" :lazy="true"></el-tab-pane><!-- 首购单 -->
         <!--<el-tab-pane label="增购单" name="ZG" :lazy="true"></el-tab-pane>-->
         <!--<el-tab-pane label="零售单" name="LS" :lazy="true"></el-tab-pane>-->
         <!--<el-tab-pane label="复销单" name="FX" :lazy="true"></el-tab-pane>-->