Browse Source

菜单项修改等

theo 3 năm trước cách đây
mục cha
commit
a47b41426f

+ 4 - 4
backendApi/config/menu.php

@@ -209,9 +209,9 @@ return [
 //            ['name'=>'领袖分红奖流水导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-lx-export', 'routePath'=>'bonus/flow-lx-export', 'show'=>0,],
 //            ['name'=>'复消积分流水', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-rp', 'routePath'=>'bonus/flow-rp', 'show'=>1,],
 //            ['name'=>'复消积分流水导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-rp-export', 'routePath'=>'bonus/flow-rp-export', 'show'=>0,],
-            ['name'=>'兑换积分流水', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-exchange', 'routePath'=>'bonus/flow-exchange', 'show'=>1,],
+//            ['name'=>'兑换积分流水', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-exchange', 'routePath'=>'bonus/flow-exchange', 'show'=>1,],
             ['name'=>'兑换积分流水导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-exchange-export', 'routePath'=>'bonus/flow-exchange-export', 'show'=>0,],
-            ['name'=>'会员余额流水', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-balance', 'routePath'=>'bonus/flow-balance', 'show'=>1,],
+//            ['name'=>'会员余额流水', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-balance', 'routePath'=>'bonus/flow-balance', 'show'=>1,],
             ['name'=>'会员余额流水导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-balance-export', 'routePath'=>'bonus/flow-balance-export', 'show'=>0,],
 //            ['name'=>'区域津贴核算', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'calc-qy', 'routePath'=>'bonus/calc-qy', 'show'=>1,],
 //            ['name'=>'区域津贴补发列表', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'resend-qy-list', 'routePath'=>'bonus/resend-qy-list', 'show'=>1,],
@@ -253,7 +253,7 @@ return [
 //            ['name'=>'管理奖向下追溯导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'trace-down-gl-export', 'routePath'=>'bonus/trace-down-gl-export', 'show'=>0,],
 //            ['name'=>'管理奖贴向上追溯', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'trace-up-gl', 'routePath'=>'bonus/trace-up-gl', 'show'=>1,],
 //            ['name'=>'管理奖向上追溯导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'trace-up-gl-export', 'routePath'=>'bonus/trace-up-gl-export', 'show'=>0,],
-            ['name'=>'User performance', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'user-perf', 'routePath'=>'bonus/user-perf', 'show'=>1,],//用户业绩
+            ['name'=>'Member performance', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'user-perf', 'routePath'=>'bonus/user-perf', 'show'=>1,],//用户业绩
 //            ['name'=>'荣衔业绩', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'yc-perf', 'routePath'=>'bonus/yc-perf', 'show'=>1,],
 //            ['name'=>'达标业绩', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-standard', 'routePath'=>'bonus/perf-standard', 'show'=>1,],
 //            ['name'=>'达标业绩导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-standard-export', 'routePath'=>'bonus/perf-standard-export', 'show'=>0,],
@@ -274,7 +274,7 @@ return [
             ['name'=>'期业绩导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-period-list-export', 'routePath'=>'bonus/perf-period-list-export', 'show'=>0,],
             ['name'=>'Monthly performance', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-month', 'routePath'=>'bonus/perf-month', 'show'=>1,],//月业绩
             ['name'=>'月业绩导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-month-export', 'routePath'=>'bonus/perf-month-export', 'show'=>0,],
-            ['name'=>'Score-month', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'score-month', 'routePath'=>'bonus/score-month', 'show'=>1,],//月积分
+//            ['name'=>'Score-month', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'score-month', 'routePath'=>'bonus/score-month', 'show'=>1,],//月积分
             ['name'=>'月积分导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'score-month-export', 'routePath'=>'bonus/score-month-export', 'show'=>0,],
         ]
     ],

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

@@ -78,7 +78,7 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
                 'DEC_TYPE' => [
                     'header' => 'Performance sheet type',//业绩单类型
                     'headerOther' => [
-                        'width' => '110',
+                        'width' => '130',
                     ],
                     'value' => function($row){
                         $decTypes = [

+ 52 - 52
backendApi/modules/v1/models/lists/bonus/UserPerfList.php

@@ -51,19 +51,19 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                 'USER_NAME' => [
                     'header' => 'Member code',//会员编号
                     'headerOther' => [
-                        'width' => '110',
+                        'width' => '200',
                     ],
                 ],
                 'REAL_NAME' => [
                     'header' => 'Member name',//会员姓名
                     'headerOther' => [
-                        'width' => '150',
+                        'width' => '200',
                     ],
                 ],
                 'PV_PCS' => [
                     'header' => 'Personal performance',//个人业绩
                     'headerOther' => [
-                        'width' => '150',
+                        'width' => '180',
                     ],
                     'value' => function($row) {
                         return (new Price([
@@ -72,9 +72,9 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'SURPLUS_1L' => [
-                    'header' => 'I. remaining market performance',//一市场剩余业绩
+                    'header' => 'Left market residual performance',//一市场剩余业绩
                     'headerOther' => [
-                        'width' => '150',
+                        'width' => '240',
                     ],
                     'value' => function($row) {
                         return (new Price([
@@ -83,9 +83,9 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'SURPLUS_2L' => [
-                    'header' => 'II. remaining market performance',//二市场剩余业绩
+                    'header' => 'Right market residual performance',//二市场剩余业绩
                     'headerOther' => [
-                        'width' => '150',
+                        'width' => '240',
                     ],
                     'value' => function($row) {
                         return (new Price([
@@ -104,28 +104,28 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
 //                        ]))->result();
 //                    },
 //                ],
-                'SURPLUS_1L_ZC' => [
-                    'header' => 'I. remaining performance of market declaration',//一市场报单剩余业绩
-                    'headerOther' => [
-                        'width' => '150',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['SURPLUS_1L_ZC'],
-                        ]))->result();
-                    },
-                ],
-                'SURPLUS_2L_ZC' => [
-                    'header' => 'II. remaining performance of market declaration',//二市场报单剩余业绩
-                    'headerOther' => [
-                        'width' => '150',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['SURPLUS_2L_ZC'],
-                        ]))->result();
-                    },
-                ],
+//                'SURPLUS_1L_ZC' => [
+//                    'header' => 'I. remaining performance of market declaration',//一市场报单剩余业绩
+//                    'headerOther' => [
+//                        'width' => '150',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['SURPLUS_1L_ZC'],
+//                        ]))->result();
+//                    },
+//                ],
+//                'SURPLUS_2L_ZC' => [
+//                    'header' => 'II. remaining performance of market declaration',//二市场报单剩余业绩
+//                    'headerOther' => [
+//                        'width' => '150',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['SURPLUS_2L_ZC'],
+//                        ]))->result();
+//                    },
+//                ],
 //                'SURPLUS_3L_ZC' => [
 //                    'header' => '三市场报单剩余业绩',
 //                    'headerOther' => [
@@ -137,28 +137,28 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
 //                        ]))->result();
 //                    },
 //                ],
-                'VIP_SURPLUS_1L_ZC' => [
-                    'header' => 'I. remaining performance of VIP declaration in the market',//一市场VIP报单剩余业绩
-                    'headerOther' => [
-                        'width' => '150',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['VIP_SURPLUS_1L_ZC'],
-                        ]))->result();
-                    },
-                ],
-                'VIP_SURPLUS_2L_ZC' => [
-                    'header' => 'II. remaining performance of VIP declaration in the market',//二市场VIP报单剩余业绩
-                    'headerOther' => [
-                        'width' => '150',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['VIP_SURPLUS_2L_ZC'],
-                        ]))->result();
-                    },
-                ],
+//                'VIP_SURPLUS_1L_ZC' => [
+//                    'header' => 'I. remaining performance of VIP declaration in the market',//一市场VIP报单剩余业绩
+//                    'headerOther' => [
+//                        'width' => '150',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['VIP_SURPLUS_1L_ZC'],
+//                        ]))->result();
+//                    },
+//                ],
+//                'VIP_SURPLUS_2L_ZC' => [
+//                    'header' => 'II. remaining performance of VIP declaration in the market',//二市场VIP报单剩余业绩
+//                    'headerOther' => [
+//                        'width' => '150',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['VIP_SURPLUS_2L_ZC'],
+//                        ]))->result();
+//                    },
+//                ],
 //                'VIP_SURPLUS_3L_ZC' => [
 //                    'header' => '三市场VIP报单剩余业绩',
 //                    'headerOther' => [
@@ -173,7 +173,7 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                 'PV_PSS_TOTAL' => [
                     'header' => 'Cumulative team performance',//累计团队业绩
                     'headerOther' => [
-                        'width' => '150',
+                        'width' => '250',
                     ],
                     'value' => function($row) {
                         return (new Price([

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

@@ -1181,10 +1181,10 @@ export const constantRouterMap = [
         component: _import('bonus/user-perf'),
         name: 'leo-user-perf-table',
         meta: {
-          title: 'User performance',//用户业绩
+          title: 'Member performance', // 用户业绩
           breadcrumb: [
-            {title: 'Dashboard', path: '/dashboard/index'},//Dashboard
-            {title: 'Bonus management', path: '/bonus/period'},//奖金管理
+            {title: 'Dashboard', path: '/dashboard/index'}, // Dashboard
+            {title: 'Bonus management', path: '/bonus/period'}, // 奖金管理
           ],
         },
       },