Преглед изворни кода

feature/york-1365-i18n-inpro-0613

root пре 3 година
родитељ
комит
56d9f8cb4a

+ 11 - 11
backendApi/config/menu.php

@@ -44,12 +44,12 @@ return [
             ['name'=>' Kitting products manage', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'package', 'routePath'=>'shop/package', 'show'=>1,],//套餐管理
             ['name'=>'Entry list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,],//报单列表
             ['name'=>'报单列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list-export', 'routePath'=>'shop/dec-order-list-export', 'show'=>0,],
-            ['name'=>'订单列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list', 'routePath'=>'shop/order-list', 'show'=>1,],
+            ['name'=>'order list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list', 'routePath'=>'shop/order-list', 'show'=>1,],//订单列表
             ['name'=>'订单列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list-export', 'routePath'=>'shop/order-list-export', 'show'=>0,],
             ['name'=>'订单发货', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-delivery', 'routePath'=>'shop/order-delivery', 'show'=>0,],
-            ['name'=>'外部商城订单列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-shop-list', 'routePath'=>'shop/order-shop-list', 'show'=>1,],
-            ['name'=>'外部商城报单列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-dec-list', 'routePath'=>'shop/order-dec-list', 'show'=>1,],
-            ['name'=>'外部商城达标订单列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-standard-list', 'routePath'=>'shop/order-standard-list', 'show'=>1,],
+            ['name'=>'External mall order list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-shop-list', 'routePath'=>'shop/order-shop-list', 'show'=>1,],//外部商城订单列表
+            ['name'=>'External mall entry list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-dec-list', 'routePath'=>'shop/order-dec-list', 'show'=>1,],//外部商城报单列表
+            ['name'=>'List of qualified orders of external mall', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-standard-list', 'routePath'=>'shop/order-standard-list', 'show'=>1,],//外部商城达标订单列表
         ]
     ],
     'user'=>[
@@ -105,7 +105,7 @@ return [
             //['name'=>'体系导出', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'system-export', 'routePath'=>'user/system-export', 'show'=>0,],
             //['name'=>'团队领导人列表', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'group', 'routePath'=>'user/group', 'show'=>1,],
             //['name'=>'团队领导人列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'group-export', 'routePath'=>'user/group-export', 'show'=>0,],
-            ['name'=>'移网管理', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'move', 'routePath'=>'user/move', 'show'=>1,],
+            ['name'=>'Mobile network management', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'move', 'routePath'=>'user/move', 'show'=>1,],//移网管理
             ['name'=>'申请移网', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'move-add', 'routePath'=>'user/move-add', 'show'=>0,],
             ['name'=>'移网修改并审核', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'move-pass', 'routePath'=>'user/move-pass', 'show'=>0,],
             ['name'=>'移网审核', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'move-audit', 'routePath'=>'user/move-audit', 'show'=>0,],
@@ -135,7 +135,7 @@ return [
         ]
     ],
     'atlas'=>[
-        'name'=>'网络图谱',
+        'name'=>'Network Atlas',//网络图谱
         'class' => '',
         'icon'=>'el-icon-data-line',
         'controller'=>'atlas',
@@ -143,11 +143,11 @@ return [
         'routePath'=>'atlas',
         'show'=>1,
         'child'=>[
-            ['name'=>'开拓网络', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation-opt', 'routePath'=>'atlas/relation-opt', 'show'=>1,],
+            ['name'=>'Expand network', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation-opt', 'routePath'=>'atlas/relation-opt', 'show'=>1,],//开拓网络
             ['name'=>'开拓网络图', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation', 'routePath'=>'atlas/relation', 'show'=>0,],
             ['name'=>'开拓网络列表', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation-list', 'routePath'=>'atlas/relation-list', 'show'=>0,],
             ['name'=>'开拓网络列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation-list-export', 'routePath'=>'atlas/relation-list-export', 'show'=>0,],
-            ['name'=>'安置网络', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network-opt', 'routePath'=>'atlas/network-opt', 'show'=>1,],
+            ['name'=>'Resettlement network', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network-opt', 'routePath'=>'atlas/network-opt', 'show'=>1,],//安置网络
             ['name'=>'安置网络图', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network', 'routePath'=>'atlas/network', 'show'=>0,],
             ['name'=>'安置网络列表', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network-list', 'routePath'=>'atlas/network-list', 'show'=>0,],
             ['name'=>'安置网络列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network-list-export', 'routePath'=>'atlas/network-list-export', 'show'=>0,],
@@ -176,7 +176,7 @@ return [
 //        ]
 //    ],
     'bonus'=>[
-        'name'=>'奖金管理',
+        'name'=>'Bonus management',//奖金管理
         'class' => '',
         'icon'=>'el-icon-coin',
         'controller'=>'bonus',
@@ -251,7 +251,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'=>'用户业绩', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'user-perf', 'routePath'=>'bonus/user-perf', 'show'=>1,],
+            ['name'=>'User 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,],
@@ -265,7 +265,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'=>'业绩单', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-order', 'routePath'=>'bonus/perf-order', 'show'=>1,],
+            ['name'=>'Performance sheet', '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'=>'期业绩', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-period-list', 'routePath'=>'bonus/perf-period-list', 'show'=>1,],

+ 4 - 4
backendApi/modules/v1/controllers/AtlasController.php

@@ -51,7 +51,7 @@ class AtlasController extends BaseController {
         $deep = Yii::$app->request->get('deep', 2);
         $periodNum = Yii::$app->request->get('periodNum', null);
         if ($deep > 23) {
-            return static::notice('最多查看会员的前23层子会员', 400);
+            return static::notice('Top 23 sub members of members can be viewed at most', 400);//最多查看会员的前23层子会员
         }
         $allData = UserRelation::getChildrenWithDeepAndLayer($userId, $deep, 1, $periodNum);
         return static::notice(['allData' => $allData, 'periodNum' => $periodNum]);
@@ -115,7 +115,7 @@ class AtlasController extends BaseController {
             $userId = Yii::$app->params['mainUserId'];
         } else {
             if (!$userId = Info::getUserIdByUserName($userName)) {
-                return static::notice('会员不存在', 400);
+                return static::notice('Member does not exist', 400);//会员不存在
             }
         }
         $listObj = new RelationList();
@@ -159,7 +159,7 @@ class AtlasController extends BaseController {
         $periodNum = Yii::$app->request->get('periodNum', null);
         $deep = Yii::$app->request->get('deep', 2);
         if ($deep > 20) {
-            return static::notice('最多查看会员的前20层子会员', 400);
+            return static::notice('View the top 20 sub members of the member at most', 400);//最多查看会员的前20层子会员
         }
         $allData = UserNetwork::getChildrenWithDeepAndLayer($userId, $deep, 1, $periodNum);
         return static::notice(['allData' => $allData, 'periodNum' => $periodNum]);
@@ -180,7 +180,7 @@ class AtlasController extends BaseController {
             $userId = Yii::$app->params['mainUserId'];
         } else {
             if (!$userId = Info::getUserIdByUserName($userName)) {
-                return static::notice('会员不存在', 400);
+                return static::notice('Member does not exist', 400);//会员不存在
             }
         }
         $listObj = new NetworkList();

+ 9 - 9
backendApi/modules/v1/models/lists/atlas/NetworkList.php

@@ -72,15 +72,15 @@ class NetworkList extends \common\libs\dataList\DataList implements DataListInte
                 'USER_ID' => null, // 这种传输方式主要是用于索引,因为过滤后的字段可能没有这种ID,但是一些功能的操作还需要用这种ID去关联,例如前台会员列表中的勾选批量状态管理,这里需要的就是USER_ID
                 'SEE_USER_NAME' => null,
                 'COUNT_DEEP' => [
-                    'header' => '层数',
+                    'header' => 'Number of layers',//层数
                     'headerOther' => ['width' => '100'],
                 ],
                 'USER_NAME' => [
-                    'header' => '安置会员编号',
+                    'header' => 'Placement member number',//安置会员编号
 //                    'headerOther' => ['width' => '150'],
                 ],
                 'REAL_NAME' => [
-                    'header' => '安置会员姓名',
+                    'header' => 'Placement member name',//安置会员姓名
 //                    'headerOther' => [
 //                        'width' => '120',
 //                    ],
@@ -93,19 +93,19 @@ class NetworkList extends \common\libs\dataList\DataList implements DataListInte
 //                    'headerOther' => ['width' => '110'],
 //                ],
                 'DEC_LV_NAME' => [
-                    'header' => '推荐会员级别',
+                    'header' => 'Recommended member level',//推荐会员级别
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'EMP_LV_NAME' => [
-                    'header' => '推荐会员聘级',
+                    'header' => 'Recommended member Rank',//推荐会员聘级
                     'headerOther' => [
                         'width' => '130',
                     ],
                 ],
                 'PERIOD_AT' => [
-                    'header' => '加入期数',
+                    'header' => 'Number of joining periods',//加入期数
                     'headerOther' => ['width' => '110'],
                 ],
             ];
@@ -120,9 +120,9 @@ class NetworkList extends \common\libs\dataList\DataList implements DataListInte
     public function getFilterTypes() {
         if (!$this->filterTypes) {
             $this->filterTypes = [
-                'userName' => ['isUserTable' => false, 'name' => '会员编号'],
-                'deep' => ['isUserTable' => false, 'name' => '深度'],
-                'periodNum' => ['isUserTable' => false, 'name' => '期数'],
+                'userName' => ['isUserTable' => false, 'name' => 'Member code'],//会员编号
+                'deep' => ['isUserTable' => false, 'name' => 'depth'],//深度
+                'periodNum' => ['isUserTable' => false, 'name' => 'Number of periods'],//期数
             ];
         }
         return $this->filterTypes;

+ 9 - 9
backendApi/modules/v1/models/lists/atlas/RelationList.php

@@ -73,33 +73,33 @@ class RelationList extends \common\libs\dataList\DataList implements DataListInt
 //                    'headerOther' => ['width' => '110'],
 //                ],
                 'COUNT_DEEP' => [
-                    'header' => '层数',
+                    'header' => 'Number of layers',//层数
                     'headerOther' => ['width' => '100'],
                 ],
                 'USER_NAME' => [
-                    'header' => '推荐会员编号',
+                        'header' => 'Recommended member No',//推荐会员编号
 //                    'headerOther' => ['width' => '150'],
                 ],
                 'REAL_NAME' => [
-                    'header' => '推荐会员姓名',
+                    'header' => 'Name of recommended member',//推荐会员姓名
 //                    'headerOther' => [
 //                        'width' => '120',
 //                    ],
                 ],
                 'DEC_LV_NAME' => [
-                    'header' => '推荐会员级别',
+                    'header' => 'Recommended member level',//推荐会员级别
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'EMP_LV_NAME' => [
-                    'header' => '推荐会员聘级',
+                    'header' => 'Recommended member Rank',//推荐会员聘级
                     'headerOther' => [
                         'width' => '130',
                     ],
                 ],
                 'PERIOD_AT' => [
-                    'header' => '加入期数',
+                    'header' => 'Number of joining periods',//加入期数
                     'headerOther' => ['width' => '110'],
                 ],
             ];
@@ -114,9 +114,9 @@ class RelationList extends \common\libs\dataList\DataList implements DataListInt
     public function getFilterTypes() {
         if (!$this->filterTypes) {
             $this->filterTypes = [
-                'userName' => ['isUserTable' => false, 'name' => '会员编号'],
-                'deep' => ['isUserTable' => false, 'name' => '深度'],
-                'periodNum' => ['isUserTable' => false, 'name' => '期数'],
+                'userName' => ['isUserTable' => false, 'name' => 'Member code'],//会员编号
+                'deep' => ['isUserTable' => false, 'name' => 'depth'],//深度
+                'periodNum' => ['isUserTable' => false, 'name' => 'Number of periods'],//期数
             ];
         }
         return $this->filterTypes;

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

@@ -61,13 +61,13 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
         if(!$this->columns){
             $this->columns = [
                 'PERIOD_NUM' => [
-                    'header' => '结算期数',
+                    'header' => 'Number of settlement periods',//结算期数
                     'headerOther' => [
                         'width' => '100',
                     ],
                 ],
                 'SN' => [
-                    'header' => '业绩单编号',
+                    'header' => 'Performance sheet No',//业绩单编号
                     'value' => function($row) {
                         return "\t".$row['SN'];
                     },
@@ -76,53 +76,53 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'DEC_TYPE' => [
-                    'header' => '业绩单类型',
+                    'header' => 'Performance sheet type',//业绩单类型
                     'headerOther' => [
                         'width' => '110',
                     ],
                     'value' => function($row){
                         $decTypes = [
-                            'ZC'=> '首购单',
-                            'YH'=> '优惠单',
-                            'ZG'=> '增购单',
-                            'LS'=> '零售单',
-                            'FX'=> '复销单',
+                            'ZC'=> 'First purchase order',//首购单
+                            'YH'=> 'Coupon',//优惠单
+                            'ZG'=> 'Additional purchase order',//增购单
+                            'LS'=> 'Retail order',//零售单
+                            'FX'=> 'Re sales order',//复销单
                         ];
                         return $decTypes[strtoupper($row['DEC_TYPE'])];
                     },
                 ],
                 'DEC_STATUS_NAME' => [
-                    'header' => '业绩单状态',
+                    'header' => 'Performance sheet status',//业绩单状态
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code',//会员编号
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'REAL_NAME' => [
-                    'header' => '会员姓名',
+                    'header' => 'Member name',//会员姓名
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'LAST_REC_USER_NAME' => [
-                    'header' => '结算时开拓者编号',
+                    'header' => 'Pioneer No. at settlement',//结算时开拓者编号
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'LAST_REC_REAL_NAME' => [
-                    'header' => '结算时开拓者姓名',
+                    'header' => 'Pioneer name at settlement',//结算时开拓者姓名
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'PV' => [
-                    'header' => '报单BV',
+                    'header' => 'Entry BV',//报单BV
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -133,7 +133,7 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'DEC_AMOUNT' => [
-                    'header' => '报单金额',
+                    'header' => 'Entry amount',//报单金额
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -144,13 +144,13 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'DEC_SN' => [
-                    'header' => '报单编号',
+                    'header' => 'Entry No',//报单编号
                     'headerOther' => [
                         'width' => '250',
                     ],
                 ],
                 'CREATED_AT' => [
-                    'header' => '创建时间',
+                    'header' => 'Creation time',//创建时间
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -171,18 +171,18 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'PERIOD_NUM'=> ['isUserTable'=> false, 'name'=> '结算期数'],
-                'SN'=> ['isUserTable'=> false, 'name'=> '业绩单编号'],
-                'DEC_STATUS_NAME'=> ['isUserTable'=> false, 'name'=> '业绩单状态','other'=> 'select',
-                 'selectData'=> [['id'=> 1, 'name'=> '已审核'], ['id'=> 2, 'name'=> '置废']],],
-                'USER_NAME'=> ['isUserTable'=> false, 'name'=> '会员编号'],
-                'REAL_NAME'=> ['isUserTable'=> false, 'name'=> '会员姓名'],
-                'LAST_REC_USER_NAME'=> ['isUserTable'=> false, 'name'=> '结算时开拓者编号'],
-                'LAST_REC_REAL_NAME'=> ['isUserTable'=> false, 'name'=> '结算时开拓者姓名'],
-                'PV'=> ['isUserTable'=> false, 'name'=> '报单BV'],
-                'DEC_AMOUNT'=> ['isUserTable'=> false, 'name'=> '报单金额'],
-                'DEC_SN'=> ['isUserTable'=> false, 'name'=> '报单编号'],
-                'CREATED_AT'=> ['isUserTable'=> true, 'name'=> '创建时间', 'other'=> 'date'],
+                'PERIOD_NUM'=> ['isUserTable'=> false, 'name'=> 'Number of settlement periods'],//结算期数
+                'SN'=> ['isUserTable'=> false, 'name'=> 'Performance sheet No'],//业绩单编号
+                'DEC_STATUS_NAME'=> ['isUserTable'=> false, 'name'=> 'Performance sheet status','other'=> 'select',
+                 'selectData'=> [['id'=> 1, 'name'=> 'Reviewed'], ['id'=> 2, 'name'=> 'Waste disposal']],],//业绩单状态,已审核,置废
+                'USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Member code'],//会员编号
+                'REAL_NAME'=> ['isUserTable'=> false, 'name'=> 'Member name'],//会员姓名
+                'LAST_REC_USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Pioneer No. at settlement'],//结算时开拓者编号
+                'LAST_REC_REAL_NAME'=> ['isUserTable'=> false, 'name'=> 'Pioneer name at settlement'],//结算时开拓者姓名
+                'PV'=> ['isUserTable'=> false, 'name'=> 'Entry BV'],//报单BV
+                'DEC_AMOUNT'=> ['isUserTable'=> false, 'name'=> 'Entry amount'],//报单金额
+                'DEC_SN'=> ['isUserTable'=> false, 'name'=> 'Entry No'],//报单编号
+                'CREATED_AT'=> ['isUserTable'=> true, 'name'=> 'Creation time', 'other'=> 'date'],//创建时间
             ];
         }
         return $this->filterTypes;

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

@@ -49,19 +49,19 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
         if(!$this->columns){
             $this->columns = [
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code',//会员编号
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'REAL_NAME' => [
-                    'header' => '会员姓名',
+                    'header' => 'Member name',//会员姓名
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'PV_PCS' => [
-                    'header' => '个人业绩',
+                    'header' => 'Personal performance',//个人业绩
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -72,7 +72,7 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'SURPLUS_1L' => [
-                    'header' => '一市场剩余业绩',
+                    'header' => 'I. remaining market performance',//一市场剩余业绩
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -83,7 +83,7 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'SURPLUS_2L' => [
-                    'header' => '二市场剩余业绩',
+                    'header' => 'II. remaining market performance',//二市场剩余业绩
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -93,19 +93,19 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                         ]))->result();
                     },
                 ],
-                'SURPLUS_3L' => [
-                    'header' => '三市场剩余业绩',
-                    'headerOther' => [
-                        'width' => '150',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['SURPLUS_3L'],
-                        ]))->result();
-                    },
-                ],
+//                'SURPLUS_3L' => [
+//                    'header' => '三市场剩余业绩',
+//                    'headerOther' => [
+//                        'width' => '150',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['SURPLUS_3L'],
+//                        ]))->result();
+//                    },
+//                ],
                 'SURPLUS_1L_ZC' => [
-                    'header' => '一市场报单剩余业绩',
+                    'header' => 'I. remaining performance of market declaration',//一市场报单剩余业绩
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -116,7 +116,7 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'SURPLUS_2L_ZC' => [
-                    'header' => '二市场报单剩余业绩',
+                    'header' => 'II. remaining performance of market declaration',//二市场报单剩余业绩
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -126,19 +126,19 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                         ]))->result();
                     },
                 ],
-                'SURPLUS_3L_ZC' => [
-                    'header' => '三市场报单剩余业绩',
-                    'headerOther' => [
-                        'width' => '150',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['SURPLUS_3L_ZC'],
-                        ]))->result();
-                    },
-                ],
+//                'SURPLUS_3L_ZC' => [
+//                    'header' => '三市场报单剩余业绩',
+//                    'headerOther' => [
+//                        'width' => '150',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['SURPLUS_3L_ZC'],
+//                        ]))->result();
+//                    },
+//                ],
                 'VIP_SURPLUS_1L_ZC' => [
-                    'header' => '一市场VIP报单剩余业绩',
+                    'header' => 'I. remaining performance of VIP declaration in the market',//一市场VIP报单剩余业绩
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -149,7 +149,7 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'VIP_SURPLUS_2L_ZC' => [
-                    'header' => '二市场VIP报单剩余业绩',
+                    'header' => 'II. remaining performance of VIP declaration in the market',//二市场VIP报单剩余业绩
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -159,19 +159,19 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                         ]))->result();
                     },
                 ],
-                'VIP_SURPLUS_3L_ZC' => [
-                    'header' => '三市场VIP报单剩余业绩',
-                    'headerOther' => [
-                        'width' => '150',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['VIP_SURPLUS_3L_ZC'],
-                        ]))->result();
-                    },
-                ],
+//                'VIP_SURPLUS_3L_ZC' => [
+//                    'header' => '三市场VIP报单剩余业绩',
+//                    'headerOther' => [
+//                        'width' => '150',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['VIP_SURPLUS_3L_ZC'],
+//                        ]))->result();
+//                    },
+//                ],
                 'PV_PSS_TOTAL' => [
-                    'header' => '累计团队业绩',
+                    'header' => 'Cumulative team performance',//累计团队业绩
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -194,7 +194,7 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'USER_NAME'=> ['isUserTable'=> false, 'name'=> '会员编号'],
+                'USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Member code'],//会员编号
             ];
         }
         return $this->filterTypes;

+ 26 - 26
backendApi/modules/v1/models/lists/shop/OrderDecList.php

@@ -44,63 +44,63 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
         if(!$this->columns){
             $this->columns = [
                 'PERIOD_NUM' => [
-                    'header' => '期数',
+                    'header' => 'Number of periods',//期数
                 ],
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code',//会员编号
                     'headerOther' => ['width' => '120'],
                 ],
                 'SN' => [
-                    'header' => '订单号',
+                    'header' => 'SN',//订单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'CONSIGNEE' => [
-                    'header' => '收货人',
+                    'header' => 'consignee',//收货人
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'MOBILE' => [
-                    'header' => '联系方式1',
+                    'header' => 'Contact 1',//联系方式1
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'TEL' => [
-                    'header' => '联系方式2',
+                    'header' => 'Contact 2',//联系方式2
                 ],
                 'PROVINCE' => [
-                    'header' => '省',
+                    'header' => 'state',//州
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'CITY' => [
-                    'header' => '市',
+                    'header' => 'local government area',//地方政府
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'COUNTY' => [
-                    'header' => '区',
+                    'header' => 'city',//市
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['COUNTY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'ADDRESS' => [
-                    'header' => '详细地址',
+                    'header' => 'Detailed address',//详细地址
                     'headerOther' => [
                         'width' => '300',
                     ],
                 ],
                 'WAREHOUSE' => [
-                    'header' => '发货仓',
+                    'header' => 'Delivery warehouse',//发货仓
                 ],
                 'CREATED_AT' => [
-                    'header' => '创建时间',
+                    'header' => 'Creation time',//创建时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -109,7 +109,7 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     'headerOther' => ['width' => '190'],
                 ],
                 'PAY_AMOUNT' => [
-                    'header' => '支付金额',
+                    'header' => 'Payment amount',//支付金额
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -121,7 +121,7 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     ],
                 ],
                 'PAY_PV' => [
-                    'header' => '支付BV',
+                    'header' => 'Pay BV',//支付BV
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -133,7 +133,7 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     ],
                 ],
                 'PAY_AT' => [
-                    'header' => '支付时间',
+                    'header' => 'Payment time',//支付时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['PAY_AT'],
@@ -142,7 +142,7 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     'headerOther' => ['width' => '190'],
                 ],
                 'DELIVERY_AT' => [
-                    'header' => '发货时间',
+                    'header' => 'Delivery time',//发货时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['DELIVERY_AT'],
@@ -151,7 +151,7 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     'headerOther' => ['width' => '190'],
                 ],
                 'PAY_FREIGHT' => [
-                    'header' => '运费',
+                    'header' => 'freight',//运费
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -165,22 +165,22 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'EXPRESS_COMPANY' => [
-                    'header' => '快递公司',
+                    'header' => 'Courier Services Company',//快递公司
                     'headerOther' => ['width' => '150'],
                 ],
                 'ORDER_TRACK_NO' => [
-                    'header' => '快递单号',
+                    'header' => 'courier number',//快递单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'EXPRESS_TYPE' => [
-                    'header' => '发货方式',
+                    'header' => 'Shipping method',//发货方式
                     'headerOther' => ['width' => '150'],
                     'value' => function ($row) {
-                        return $row['EXPRESS_TYPE']==0 ? '邮寄' : '自提';
+                        return $row['EXPRESS_TYPE']==0 ? 'mailing ':' auto pick ';//'邮寄' : '自提'
                     },
                 ],
                 'FRONT_REMARK' => [
-                    'header' => '会员备注',
+                    'header' => 'Member notes',//会员备注
                     'headerOther' => [
                         'width' => '200',
                     ],
@@ -204,10 +204,10 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'SN'=> ['name'=> '订单编号'],
-                'USER_NAME'=> ['name'=> '会员编号'],
-                'PERIOD_NUM'=> ['name'=> '期数'],
-                'CREATED_AT'=> ['name'=> '创建时间', 'other'=>'date'],
+                'SN'=> ['name'=> 'Order No'],//订单编号
+                'USER_NAME'=> ['name'=> 'Member code'],//会员编号
+                'PERIOD_NUM'=> ['name'=> 'Number of periods'],//期数
+                'CREATED_AT'=> ['name'=> 'Creation time', 'other'=>'date'],//创建时间
             ];
         }
         return $this->filterTypes;

+ 38 - 38
backendApi/modules/v1/models/lists/shop/OrderList.php

@@ -53,28 +53,28 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
         if(!$this->columns){
             $this->columns = [
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code',//会员编号
                     'headerOther' => ['width' => '120'],
                 ],
                 'DEC_USER_NAME' => [
-                    'header' => '报单中心',
+                    'header' => 'Entry Center',//报单中心
                     'headerOther' => ['width' => '120'],
                 ],
                 'CREATE_USER' => [
-                    'header' => '创建人编号',
+                    'header' => 'Creator No',//创建人编号
                     'headerOther' => ['width' => '120'],
                 ],
                 'CREATE_USER_NAME' => [
-                    'header' => '创建人姓名',
+                    'header' => 'Creator name',//创建人姓名
                     'headerOther' => ['width' => '120'],
                 ],
                 'SN' => [
-                    'header' => '订单号',
+                    'header' => 'SN',//订单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'STATUS' => null,
                 'STATUS_NAME' => [
-                    'header' => '订单状态',
+                    'header' => 'Order status',//订单状态
                     'headerOther' => [
                         'width' => '110',
                     ],
@@ -83,48 +83,48 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'SKU_CODE' => [
-                    'header' => '存货编码',
+                    'header' => 'Inventory code',//存货编码
                     'headerOther' => ['width' => '150'],
                 ],
                 'GOODS_TITLE' => [
-                    'header' => '存货名称',
+                    'header' => 'Inventory name',//存货名称
                     'headerOther' => ['width' => '200'],
                 ],
                 'BUY_NUMS' => [
-                    'header' => '数量',
+                    'header' => 'quantity',//数量
                     'headerOther' => ['width' => '100'],
                 ],
                 'CONSIGNEE' => [
-                    'header' => '收货人',
+                    'header' => 'consignee',//收货人
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'MOBILE' => [
-                    'header' => '联系方式1',
+                    'header' => 'Contact 1',//联系方式1
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'TEL' => [
-                    'header' => '联系方式2',
+                    'header' => 'Contact 2',//联系方式2
                 ],
                 'PROVINCE' => [
-                    'header' => '省',
+                    'header' => 'state',//州
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'CITY' => [
-                    'header' => '市',
+                    'header' => 'local government area',//地方政府
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'COUNTY' => [
-                    'header' => '区',
+                    'header' => 'city',//市
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['COUNTY']]['REGION_NAME'] ?? '';
@@ -151,31 +151,31 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
 //                    ],
 //                ],
                 'ADDRESS' => [
-                    'header' => '详细地址',
+                    'header' => 'Detailed address',//详细地址
                     'headerOther' => [
                         'width' => '300',
                     ],
                 ],
                 'PERIOD_NUM' => [
-                    'header' => '期数',
+                    'header' => 'Number of periods',//期数
                 ],
                 'ORDER_TYPE' => [
-                    'header' => '订单类型',
+                    'header' => 'Order type',//订单类型
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) {
                             if($row['ORDER_TYPE']=='ZC'){
-                                $orderType = '报单';
+                                $orderType = 'declaration form';
                             }else{
-                                $orderType = ($row['PAY_TYPE']=='cash') ? '重消' : '积分';
+                                $orderType = ($row['PAY_TYPE']=='cash') ? 'Cancel again': 'integral';//'重消' : '积分'
                             }
                         return $orderType;
                     },
                 ],
                 'WAREHOUSE' => [
-                    'header' => '发货仓',
+                    'header' => 'Delivery warehouse',//发货仓
                 ],
                 'CREATED_AT' => [
-                    'header' => '创建时间',
+                    'header' => 'Creation time',//创建时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -184,7 +184,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '190'],
                 ],
                 'PAY_AT' => [
-                    'header' => '支付时间',
+                    'header' => 'Payment time',//支付时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['PAY_AT'],
@@ -193,7 +193,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '190'],
                 ],
                 'DELIVERY_AT' => [
-                    'header' => '发货时间',
+                    'header' => 'Delivery time',//发货时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['DELIVERY_AT'],
@@ -203,7 +203,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                 ],
                 'PAY_TYPE' => null,
                 'REAL_PRICE' => [
-                    'header' => '商品单价',
+                    'header' => 'item pricing',//商品单价
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -217,7 +217,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'REAL_PV' => [
-                    'header' => '商品金额',
+                    'header' => 'Commodity amount',//商品金额
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -231,7 +231,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'PAY_FREIGHT' => [
-                    'header' => '运费',
+                    'header' => 'freight',//运费
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -245,22 +245,22 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'EXPRESS_COMPANY' => [
-                    'header' => '快递公司',
+                    'header' => 'Courier Services Company',//快递公司
                     'headerOther' => ['width' => '150'],
                 ],
                 'ORDER_TRACK_NO' => [
-                    'header' => '快递单号',
+                    'header' => 'courier number',//快递单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'EXPRESS_TYPE' => [
-                    'header' => '发货方式',
+                    'header' => 'Shipping method',//发货方式
                     'headerOther' => ['width' => '150'],
                     'value' => function ($row) {
-                        return $row['EXPRESS_TYPE']==0 ? '邮寄' : '自提';
+                        return $row['EXPRESS_TYPE']==0 ? 'mailing ':' auto pick ';//'邮寄' : '自提'
                     },
                 ],
                 'FRONT_REMARK' => [
-                    'header' => '会员备注',
+                    'header' => 'Member notes',//会员备注
                     'headerOther' => [
                         'width' => '200',
                     ],
@@ -273,7 +273,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                 ],
                 'DELIVERY_STATUS' => null,
                 'DELIVERY_STATUS_NAME' => [
-                    'header' => '发货状态',
+                    'header' => 'Shipment status',//发货状态
                     'headerOther' => [
                         'width' => '110',
                     ],
@@ -294,11 +294,11 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'SN'=> ['name'=> '订单编号'],
-                'USER_NAME'=> ['name'=> '会员编号'],
-                'MOBILE'=> ['name'=> '联系方式1'],
-                'PERIOD_NUM'=> ['name'=> '期数'],
-                'CREATED_AT'=> ['name'=> '创建时间', 'other'=>'date'],
+                'SN'=> ['name'=> 'Order No'],//订单编号
+                'USER_NAME'=> ['name'=> 'Member code'],//会员编号
+                'MOBILE'=> ['name'=> 'Contact 1'],//联系方式1
+                'PERIOD_NUM'=> ['name'=> 'Number of periods'],//期数
+                'CREATED_AT'=> ['name'=> 'Creation time', 'other'=>'date'],//创建时间
             ];
         }
         return $this->filterTypes;

+ 28 - 28
backendApi/modules/v1/models/lists/shop/OrderShopList.php

@@ -47,70 +47,70 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
         if(!$this->columns){
             $this->columns = [
                 'PERIOD_NUM' => [
-                    'header' => '期数',
+                    'header' => 'Number of periods',//期数
                 ],
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code',//会员编号
                     'headerOther' => ['width' => '120'],
                 ],
                 'SN' => [
-                    'header' => '订单号',
+                    'header' => 'SN',//订单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'PAY_TYPE' => [
-                    'header' => '订单类型',
+                    'header' => 'Order type',//订单类型
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) {
-                        return $row['PAY_TYPE']=='cash' ? '重消订单' : '积分订单';
+                        return $row['PAY_TYPE']=='cash' ? 'cancel order again': 'point order';//'重消订单' : '积分订单'
                     },
                 ],
                 'CONSIGNEE' => [
-                    'header' => '收货人',
+                    'header' => 'consignee',//收货人
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'MOBILE' => [
-                    'header' => '联系方式1',
+                    'header' => 'Contact 1',//联系方式1
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'TEL' => [
-                    'header' => '联系方式2',
+                    'header' => 'Contact 2',//联系方式1
                 ],
                 'PROVINCE' => [
-                    'header' => '省',
+                    'header' => 'state',//州
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'CITY' => [
-                    'header' => '市',
+                    'header' => 'local government area',//地方政府
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'COUNTY' => [
-                    'header' => '区',
+                    'header' => 'city',//市
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['COUNTY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'ADDRESS' => [
-                    'header' => '详细地址',
+                    'header' => 'Detailed address',//详细地址
                     'headerOther' => [
                         'width' => '300',
                     ],
                 ],
                 'WAREHOUSE' => [
-                    'header' => '发货仓',
+                    'header' => 'Delivery warehouse',//发货仓
                 ],
                 'CREATED_AT' => [
-                    'header' => '创建时间',
+                    'header' => 'Creation time',//创建时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -119,7 +119,7 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     'headerOther' => ['width' => '190'],
                 ],
                 'PAY_AMOUNT' => [
-                    'header' => '支付金额',
+                    'header' => 'Payment amount',//支付金额
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -131,7 +131,7 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'PAY_PV' => [
-                    'header' => '支付BV',
+                    'header' => 'Pay BV',//支付BV
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -143,7 +143,7 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'PAY_AT' => [
-                    'header' => '支付时间',
+                    'header' => 'Payment time',//支付时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['PAY_AT'],
@@ -152,7 +152,7 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     'headerOther' => ['width' => '190'],
                 ],
                 'DELIVERY_AT' => [
-                    'header' => '发货时间',
+                    'header' => 'Delivery time',//发货时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['DELIVERY_AT'],
@@ -161,7 +161,7 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     'headerOther' => ['width' => '190'],
                 ],
                 'PAY_FREIGHT' => [
-                    'header' => '运费',
+                    'header' => 'freight',//运费
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -175,22 +175,22 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'EXPRESS_COMPANY' => [
-                    'header' => '快递公司',
+                    'header' => 'Courier Services Company',//快递公司
                     'headerOther' => ['width' => '150'],
                 ],
                 'ORDER_TRACK_NO' => [
-                    'header' => '快递单号',
+                    'header' => 'courier number',//快递单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'EXPRESS_TYPE' => [
-                    'header' => '发货方式',
+                        'header' => 'Shipping method',//发货方式
                     'headerOther' => ['width' => '150'],
                     'value' => function ($row) {
-                        return $row['EXPRESS_TYPE']==0 ? '邮寄' : '自提';
+                        return $row['EXPRESS_TYPE']==0 ? 'mailing ':' auto pick ' ;//'邮寄' : '自提'
                     },
                 ],
                 'FRONT_REMARK' => [
-                    'header' => '会员备注',
+                    'header' => 'Member notes',//会员备注
                     'headerOther' => [
                         'width' => '200',
                     ],
@@ -214,10 +214,10 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'SN'=> ['name'=> '订单编号'],
-                'USER_NAME'=> ['name'=> '会员编号'],
-                'PERIOD_NUM'=> ['name'=> '期数'],
-                'CREATED_AT'=> ['name'=> '创建时间', 'other'=>'date'],
+                'SN'=> ['name'=> 'Order No'],//订单编号
+                'USER_NAME'=> ['name'=> 'Member number'],//会员编号
+                'PERIOD_NUM'=> ['name'=> 'Number of periods'],//期数
+                'CREATED_AT'=> ['name'=> 'Creation time', 'other'=>'date'],//创建时间
             ];
         }
         return $this->filterTypes;

+ 28 - 28
backendApi/modules/v1/models/lists/shop/OrderStandardList.php

@@ -48,70 +48,70 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
         if(!$this->columns){
             $this->columns = [
                 'CALC_MONTH' => [
-                    'header' => '结算月',
+                    'header' => 'Settlement month',//结算月
                 ],
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code',//会员编号
                     'headerOther' => ['width' => '120'],
                 ],
                 'SN' => [
-                    'header' => '订单号',
+                    'header' => 'SN',//订单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'PAY_TYPE' => [
-                    'header' => '订单类型',
+                    'header' => 'order type',//订单类型
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) {
-                        return $row['PAY_TYPE']=='cash' ? '重消订单' : '积分订单';
+                        return $row['PAY_TYPE']=='cash' ? 'Cancel order again' : 'Points order';//'重消订单' : '积分订单'
                     },
                 ],
                 'CONSIGNEE' => [
-                    'header' => '收货人',
+                    'header' => 'consignee',//收货人
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'MOBILE' => [
-                    'header' => '联系方式1',
+                    'header' => 'Contact 1',//联系方式1
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'TEL' => [
-                    'header' => '联系方式2',
+                    'header' => 'Contact 2',//联系方式2
                 ],
                 'PROVINCE' => [
-                    'header' => '',
+                    'header' => 'state',
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'CITY' => [
-                    'header' => '市',
+                    'header' => 'local government area',//地方行政区
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'COUNTY' => [
-                    'header' => '区',
+                    'header' => 'city',//市
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['COUNTY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'ADDRESS' => [
-                    'header' => '详细地址',
+                    'header' => 'Detailed address',//详细地址
                     'headerOther' => [
                         'width' => '300',
                     ],
                 ],
                 'WAREHOUSE' => [
-                    'header' => '发货仓',
+                    'header' => 'Delivery warehouse',//发货仓
                 ],
                 'CREATED_AT' => [
-                    'header' => '创建时间',
+                    'header' => 'Creation time',//创建时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -120,7 +120,7 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
                     'headerOther' => ['width' => '190'],
                 ],
                 'PAY_AMOUNT' => [
-                    'header' => '支付金额',
+                    'header' => 'Payment amount',//支付金额
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -132,7 +132,7 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
                     ],
                 ],
                 'PAY_PV' => [
-                    'header' => '支付BV',
+                    'header' => 'Pay BV',//支付BV
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -144,7 +144,7 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
                     ],
                 ],
                 'PAY_AT' => [
-                    'header' => '支付时间',
+                    'header' => 'Payment time',//支付时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['PAY_AT'],
@@ -153,7 +153,7 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
                     'headerOther' => ['width' => '190'],
                 ],
                 'DELIVERY_AT' => [
-                    'header' => '发货时间',
+                    'header' => 'Delivery time',//发货时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['DELIVERY_AT'],
@@ -162,7 +162,7 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
                     'headerOther' => ['width' => '190'],
                 ],
                 'PAY_FREIGHT' => [
-                    'header' => '运费',
+                    'header' => 'freight',//运费
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -176,22 +176,22 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
                     },
                 ],
                 'EXPRESS_COMPANY' => [
-                    'header' => '快递公司',
+                    'header' => 'Courier Services Company',//快递公司
                     'headerOther' => ['width' => '150'],
                 ],
                 'ORDER_TRACK_NO' => [
-                    'header' => '快递单号',
+                    'header' => 'courier number',//快递单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'EXPRESS_TYPE' => [
-                    'header' => '发货方式',
+                    'header' => 'Shipping method',//发货方式
                     'headerOther' => ['width' => '150'],
                     'value' => function ($row) {
-                        return $row['EXPRESS_TYPE']==0 ? '邮寄' : '自提';
+                        return $row['EXPRESS_TYPE']==0 ? 'mailing ':' auto pick ';//'邮寄' : '自提'
                     },
                 ],
                 'FRONT_REMARK' => [
-                    'header' => '会员备注',
+                    'header' => 'Member notes',//会员备注
                     'headerOther' => [
                         'width' => '200',
                     ],
@@ -215,10 +215,10 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'SN'=> ['name'=> '订单编号'],
-                'USER_NAME'=> ['name'=> '会员编号'],
-                'PERIOD_NUM'=> ['name'=> '期数'],
-                'CREATED_AT'=> ['name'=> '创建时间', 'other'=>'date'],
+                'SN'=> ['name'=> 'Order No'],//订单编号
+                'USER_NAME'=> ['name'=> 'Member code'],//会员编号
+                'PERIOD_NUM'=> ['name'=> 'Number of periods'],//期数
+                'CREATED_AT'=> ['name'=> 'Creation time', 'other'=>'date'],//创建时间
             ];
         }
         return $this->filterTypes;

+ 22 - 22
backendApi/modules/v1/models/lists/user/MoveList.php

@@ -61,11 +61,11 @@ class MoveList extends \common\libs\dataList\DataList implements DataListInterfa
                 'ID' => null,
                 'USER_ID' => null,
                 'MOVE_USER_NAME' => [
-                    'header' => '移动的会员',
+                    'header' => 'Mobile members',//移动的会员
                     'headerOther' => ['width' => '150'],
                 ],
                 'MOVE_REAL_NAME' => [
-                    'header' => '移动的会员姓名',
+                    'header' => 'Mobile members name',//移动的会员名字
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -74,40 +74,40 @@ class MoveList extends \common\libs\dataList\DataList implements DataListInterfa
                     ],
                 ],
                 'FROM_USER_NAME' => [
-                    'header' => '移动前接点',
+                    'header' => 'Move front contact',//移动前接点
                     'headerOther' => ['width' => '150'],
                 ],
                 'TO_USER_NAME' => [
-                    'header' => '移动后接点',
+                    'header' => 'Moving rear contact',//移动后接点
                     'headerOther' => ['width' => '150'],
                 ],
                 'TYPE' => [
-                    'header' => '移网类型',
+                    'header' => 'Network transfer type',//移网类型
                     'headerOther' => [
                         'width' => '120',
                     ],
                     'value' => function($row) {
-                        return $row['TYPE'] == UserMove::TYPE_NETWORK ? '安置网络' : '开拓网络';
+                        return $row['TYPE'] == UserMove::TYPE_NETWORK ? 'placement network':'development network';//'安置网络' : '开拓网络'
                     },
                 ],
                 'LOCATION' => [
-                    'header' => '移动到位置',
+                    'header' => 'Move to position',//移动到位置
                     'headerOther' => ['width' => '150'],
                 ],
-                'PERIOD_NUM' => '移动时的期数',
+                'PERIOD_NUM' => 'Number of periods when moving',//移动时的期数
                 'IS_MOVING' => [
-                    'header' => '是否正在移动',
+                    'header' => 'Are you moving',//是否正在移动
                     'headerOther' => ['width' => '100'],
                 ],
                 'MOVE_PERCENT' => [
-                    'header' => '移动百分比',
+                    'header' => 'Movement percentage',//移动百分比
                 ],
                 'MOVE_ADMIN_NAME' => [
-                    'header' => '移网管理员',
+                    'header' => 'Mobile administrator',//移网管理员
                     'headerOther' => ['width' => '120'],
                 ],
                 'CREATED_AT' => [
-                    'header' => '加入日期',
+                    'header' => 'Date of accession',//加入日期
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -117,18 +117,18 @@ class MoveList extends \common\libs\dataList\DataList implements DataListInterfa
                 ],
                 'AUDIT_STATUS' => null,
                 'AUDIT_STATUS_NAME' => [
-                    'header' => '审核状态',
+                    'header' => 'Audit status',//审核状态
                     'headerOther' => ['width' => '100'],
                     'value' => function ($row) {
                         return UserMove::STATUS_NAME[$row['AUDIT_STATUS']];
                     },
                 ],
                 'AUDIT_ADMIN_NAME' => [
-                    'header' => '审核管理员',
+                    'header' => 'Audit administrator',//审核管理员
                     'headerOther' => ['width' => '100'],
                 ],
                 'AUDITED_AT' => [
-                    'header' => '审核时间',
+                    'header' => 'Audit time',//审核时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['AUDITED_AT'],
@@ -149,17 +149,17 @@ class MoveList extends \common\libs\dataList\DataList implements DataListInterfa
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'MOVE_USER_NAME'=> ['isUserTable' => false,'name'=> '移动的会员'],
-                'MOVE_REAL_NAME'=> ['isUserTable' => false,'name'=> '移动的会员姓名'],
-                'filterStatus'=> ['isUserTable' => false,'name'=> '审核状态'],
+                'MOVE_USER_NAME'=> ['isUserTable' => false,'name'=> 'Mobile members'],//移动的会员
+                'MOVE_REAL_NAME'=> ['isUserTable' => false,'name'=> 'Mobile members name'],//移动的会员姓名
+                'filterStatus'=> ['isUserTable' => false,'name'=> 'Audit status'],//审核状态
 //                'moveType'=> ['isUserTable' => false,'name'=> '移网类型', 'other'=> 'select','selectData'=>UserMove::TYPE_NAME],
 //                'FROM_USER_NAME'=> ['isUserTable' => false,'name'=> '移动前接点'],
 //                'TO_USER_NAME'=> ['isUserTable' => false,'name'=> '移动后接点', 'other'=> 'decLevel'],
-                'PERIOD_NUM'=> ['isUserTable' => false,'name'=> '移动时的期数'],
-                'MOVE_ADMIN_NAME'=> ['isUserTable' => false,'name'=> '移网管理员'],
-                'AUDIT_ADMIN_NAME'=> ['isUserTable' => false,'name'=> '审核管理员'],
+                'PERIOD_NUM'=> ['isUserTable' => false,'name'=> 'Number of periods when moving'],//移动时的期数
+                'MOVE_ADMIN_NAME'=> ['isUserTable' => false,'name'=> 'Mobile administrator'],//移网管理员
+                'AUDIT_ADMIN_NAME'=> ['isUserTable' => false,'name'=> 'Audit administrator'],//审核管理员
 //                'CREATED_AT' => ['isUserTable' => false, 'name' => '申请时间', 'other' => 'date'],
-                'AUDITED_AT' => ['isUserTable' => false, 'name' => '审核时间', 'other' => 'date'],
+                'AUDITED_AT' => ['isUserTable' => false, 'name' => 'Audit time', 'other' => 'date'],//审核时间
             ];
         }
         return $this->filterTypes;

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

@@ -58,10 +58,10 @@ export const constantRouterMap = [
         component: _import('shop/order-list'),
         name: 'shop_order-list',
         meta: {
-          title: '订单列表',
+          title: 'order list',//订单列表
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '商城管理', path: '/shop/dec-order-list'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Products Management', path: '/shop/dec-order-list'},//商城管理
           ],
         },
 
@@ -71,10 +71,10 @@ export const constantRouterMap = [
         component: _import('shop/order-shop-list'),
         name: 'shop_order_shop-list',
         meta: {
-          title: '外部商城订单列表',
+          title: 'External mall order list',//外部商城订单列表
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '商城管理', path: '/shop/dec-order-list'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Products Management', path: '/shop/dec-order-list'},//商城管理
           ],
         },
 
@@ -84,10 +84,10 @@ export const constantRouterMap = [
             component: _import('shop/order-dec-list'),
             name: 'shop_order_dec-list',
             meta: {
-                title: '外部商城报单列表',
+                title: 'External mall entry list',//外部商城报单列表
                 breadcrumb: [
-                    {title: '首页', path: '/dashboard/index'},
-                    {title: '商城管理', path: '/shop/dec-order-list'},
+                    {title: 'Dashboard', path: '/dashboard/index'},//首页
+                    {title: 'Products Management', path: '/shop/dec-order-list'},//商城管理
                 ],
             },
 
@@ -97,10 +97,10 @@ export const constantRouterMap = [
         component: _import('shop/order-standard-list'),
         name: 'shop_order_standard-list',
         meta: {
-          title: '外部商城达标订单列表',
+          title: 'List of qualified orders of external mall',//外部商城达标订单列表
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '商城管理', path: '/shop/dec-order-list'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Products Management', path: '/shop/dec-order-list'},//商城管理
           ],
         },
 
@@ -337,10 +337,10 @@ export const constantRouterMap = [
         component: _import('user/move'),
         name: 'user_move',
         meta: {
-          title: '移网管理',
+          title: 'Mobile network management',//移网管理
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '会员管理', path: '/user/index'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Member management', path: '/user/index'},//会员管理
           ],
         },
       },
@@ -508,10 +508,10 @@ export const constantRouterMap = [
         component: _import('atlas/relation-opt'),
         name: 'atlas_relation-opt',
         meta: {
-          title: '开拓网络',
+          title: 'Expand network',//开拓网络
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '网络图谱', path: '/atlas/relation-opt'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Network Atlas', path: '/atlas/relation-opt'},//网络图谱
           ],
         },
       },
@@ -520,10 +520,10 @@ export const constantRouterMap = [
         component: _import('atlas/network-opt'),
         name: 'atlas_network-opt',
         meta: {
-          title: '安置网络',
+          title: 'Resettlement network',//安置网络
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '网络图谱', path: '/atlas/relation-opt'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Network Atlas', path: '/atlas/relation-opt'},//网络图谱
           ],
         },
       },
@@ -1097,10 +1097,10 @@ export const constantRouterMap = [
         component: _import('bonus/perf-order'),
         name: 'bonus_perf-order',
         meta: {
-          title: '业绩单',
+          title: 'Performance sheet',//业绩单
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '奖金管理', path: '/bonus/period'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Bonus management', path: '/bonus/period'},//奖金管理
           ],
         },
       },
@@ -1181,10 +1181,10 @@ export const constantRouterMap = [
         component: _import('bonus/user-perf'),
         name: 'leo-user-perf-table',
         meta: {
-          title: '用户业绩',
+          title: 'User performance',//用户业绩
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '奖金管理', path: '/bonus/period'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Bonus management', path: '/bonus/period'},//奖金管理
           ],
         },
       },

+ 19 - 19
backendEle/src/views/atlas/network-opt.vue

@@ -2,18 +2,18 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-tabs v-model="tabActiveName">
-        <el-tab-pane label="安置网络图" name="first" v-if="permission.hasPermission(`atlas/network`)">
+        <el-tab-pane label="Resettlement network diagram" name="first" v-if="permission.hasPermission(`atlas/network`)"><!-- 安置网络图 -->
           <div class="filter-user" @keyup.enter="enterToGetData()">
             <el-input v-model="mainUserName" size="small" style="width:300px;">
-              <template slot="prepend">顶级会员</template>
+              <template slot="prepend">Top member<!-- 顶级会员 --></template>
             </el-input>
-            <el-input v-model="expandDeep" size="small" style="width:150px;">
-              <template slot="prepend">展开深度</template>
+            <el-input v-model="expandDeep" size="small" style="width:200px;">
+              <template slot="prepend">Spread depth<!-- 展开深度 --></template>
             </el-input>
             <el-input v-model="periodNum" size="small" style="width:150px;" v-show="false">
-              <template slot="prepend">期数</template>
+              <template slot="prepend">Number of periods<!-- 期数 --></template>
             </el-input>
-            <el-button type="primary" size="small" @click="getMainData()">确定</el-button>
+            <el-button type="primary" size="small" @click="getMainData()">confirm<!-- 确定 --></el-button>
           </div>
           <el-tree :props="props" :data="treeData" node-key="USER_ID" @node-click="getChildData" ref="tree" :indent="0"
                    default-expand-all :height="tool.getTableHeight(true)">
@@ -22,22 +22,22 @@
                     <span :class="'el-icon-loading '+ data.displayNone"></span>
                     <span :class="data.icon"></span>
                     <span>
-                      <el-tag type="danger">层数:{{countTopDeep(data.TOP_NETWORK_DEEP,topDeep)}}</el-tag> <el-tag>会员编号:{{ node.label }}</el-tag> <el-tag>姓名:{{data.REAL_NAME}}</el-tag> <el-tag type="danger">区位:{{data.RELATIVE_LOCATION}}</el-tag> <el-tag type="success">级别:{{data.DEC_LV_NAME}}</el-tag> <el-tag type="warning">聘级:{{data.EMP_LV_NAME}}</el-tag> <el-tag>加入期数:{{data.PERIOD_AT}}</el-tag></span>
+                      <el-tag type="danger">层数:{{countTopDeep(data.TOP_NETWORK_DEEP,topDeep)}}</el-tag> <el-tag><!-- 会员编号 -->Member code:{{ node.label }}</el-tag> <el-tag>Name<!-- 姓名 -->:{{data.REAL_NAME}}</el-tag> <el-tag type="danger"><!-- 区位 -->Location:{{data.RELATIVE_LOCATION}}</el-tag> <el-tag type="success"><!-- 级别 -->Level:{{data.DEC_LV_NAME}}</el-tag> <el-tag type="warning"><!-- 聘级 -->Rank:{{data.EMP_LV_NAME}}</el-tag> <el-tag><!-- 加入期数 -->Number of joining periods:{{data.PERIOD_AT}}</el-tag></span>
                 </span>
           </el-tree>
         </el-tab-pane>
-        <el-tab-pane label="安置网络列表" name="two" v-if="permission.hasPermission(`user/network-list`)">
+        <el-tab-pane label="Placement network list" name="two" v-if="permission.hasPermission(`user/network-list`)"><!-- 安置网络列表 -->
           <div class="filter-user">
             <el-input v-model="filterForm.userName" size="small" style="width:300px;">
-              <template slot="prepend">会员编号</template>
+              <template slot="prepend"><!-- 会员编号 -->Member code</template>
             </el-input>
             <el-input v-model="filterForm.deep" size="small" style="width:150px;">
-              <template slot="prepend">深度</template>
+              <template slot="prepend"><!-- 深度 -->depth</template>
             </el-input>
             <el-input v-model="filterForm.periodNum" size="small" style="width:150px;" v-show="false">
-              <template slot="prepend">期数</template>
+              <template slot="prepend"><!-- 期数 -->Number of periods</template>
             </el-input>
-            <el-button type="primary" size="small" @click="handleFilter">确定</el-button>
+            <el-button type="primary" size="small" @click="handleFilter">confirm<!-- 确定 --></el-button>
           </div>
 
           <el-table :data="tableData" stripe style="width: 100%;" :height="tool.getTableHeight(true)">
@@ -53,7 +53,7 @@
                 </template>
                 <template v-else>
                   <template v-if="tableHeader.index === 'USER_NAME'">
-                    <el-tooltip class="item" effect="dark" content="查看该会员的下级" placement="top">
+                    <el-tooltip class="item" effect="dark" content="View the subordinates of this member" placement="top"><!-- 查看该会员的下级 -->
                     <el-button @click.native="handleShow(scope.row)" size="small" type="primary">
                       {{scope.row[tableHeader.index].value}}
                     </el-button>
@@ -68,7 +68,7 @@
           </el-table>
           <div class="white-box-footer">
             <el-button type="success" size="small" @click="handleExport"
-                       v-show="permission.hasPermission(`atlas/network-list-export`)">导出Excel
+                       v-show="permission.hasPermission(`atlas/network-list-export`)">Export Excel<!-- 导出Excel -->
             </el-button>
             <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
           </div>
@@ -130,7 +130,7 @@
     methods: {
       getData() {
         this.$message({
-          message: '正在获取数据,请稍后',
+          message: 'Getting data, please wait',//正在获取数据,请稍后
         })
         this.periodNum = baseInfo.nowPeriodNum()
         this.filterForm.periodNum = baseInfo.nowPeriodNum()
@@ -150,7 +150,7 @@
       getMainData (userName = null, getList = false) {
         this.$message.closeAll()
         this.$message({
-          message: '正在获取数据,请稍后',
+          message: 'Getting data, please wait',//正在获取数据,请稍后
         })
         let thisObj = this
         let requestData = {
@@ -224,9 +224,9 @@
         //this.getData(this.currentPage, this.pageSize, false)
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`Are you sure you want to export the current data?`, 'Hint', {//`确定要导出当前数据吗?`, '提示'
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           return network.getData(`atlas/network-list-export`, this.filterForm)

+ 20 - 20
backendEle/src/views/atlas/relation-opt.vue

@@ -2,18 +2,18 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-tabs v-model="tabActiveName">
-        <el-tab-pane label="开拓网络图" name="first" v-if="permission.hasPermission(`atlas/relation`)">
+        <el-tab-pane label="Development network diagram" name="first" v-if="permission.hasPermission(`atlas/relation`)"><!-- 开拓网络图 -->
           <div class="filter-user">
             <el-input v-model="mainUserName" size="small" style="width:300px;">
-              <template slot="prepend">顶级会员</template>
+              <template slot="prepend">Top member<!-- 顶级会员 --></template>
             </el-input>
-            <el-input v-model="expandDeep" size="small" style="width:150px;">
-              <template slot="prepend">展开深度</template>
+            <el-input v-model="expandDeep" size="small" style="width:200px;">
+              <template slot="prepend">Spread depth<!-- 展开深度 --></template>
             </el-input>
             <el-input v-model="periodNum" size="small" style="width:150px;" v-show="false">
-              <template slot="prepend">期数</template>
+              <template slot="prepend">Number of periods<!-- 期数 --></template>
             </el-input>
-            <el-button type="primary" size="small" @click="getMainData()">确定</el-button>
+            <el-button type="primary" size="small" @click="getMainData()">confirm<!-- 确定 --></el-button>
           </div>
           <el-tree :props="props" :data="treeData" node-key="USER_ID" @node-click="getChildData" ref="tree" :indent="0"
                    default-expand-all>
@@ -21,22 +21,22 @@
                       slot-scope="{ node, data }">
                     <span :class="'el-icon-loading '+ data.displayNone"></span>
                     <span :class="data.icon"></span>
-                  <span><el-tag type="danger">代数:{{countTopDeep(data.TOP_RELATION_DEEP,topDeep)}}</el-tag> <el-tag>会员编号:{{ node.label }}</el-tag> <el-tag type="success">姓名:{{data.REAL_NAME}}</el-tag> <el-tag type="warning">级别:{{data.DEC_LV_NAME}}</el-tag> <el-tag type="warning">聘级:{{data.EMP_LV_NAME}}</el-tag></span>
+                  <span><el-tag type="danger"><!-- 代数 -->Algebra:{{countTopDeep(data.TOP_RELATION_DEEP,topDeep)}}</el-tag> <el-tag><!-- 会员编号 -->Member code:{{ node.label }}</el-tag> <el-tag type="success">Name<!-- 姓名 -->:{{data.REAL_NAME}}</el-tag> <el-tag type="warning">Level<!-- 级别 -->:{{data.DEC_LV_NAME}}</el-tag> <el-tag type="warning"><!-- 聘级 -->Rank:{{data.EMP_LV_NAME}}</el-tag></span>
                 </span>
           </el-tree>
         </el-tab-pane>
-        <el-tab-pane label="开拓网络列表" name="two" v-if="permission.hasPermission(`user/relation-list`)">
+        <el-tab-pane label="Development network list" name="two" v-if="permission.hasPermission(`user/relation-list`)"><!-- 开拓网络列表 -->
           <div class="filter-user">
             <el-input v-model="filterForm.userName" size="small" style="width:300px;">
-              <template slot="prepend">会员编号</template>
+              <template slot="prepend"><!-- 会员编号 -->Member code</template>
             </el-input>
             <el-input v-model="filterForm.deep" size="small" style="width:150px;">
-              <template slot="prepend">深度</template>
+              <template slot="prepend"><!-- 深度 -->depth</template>
             </el-input>
             <el-input v-model="filterForm.periodNum" size="small" style="width:150px;" v-show="false">
-              <template slot="prepend">期数</template>
+              <template slot="prepend"><!-- 期数 -->Number of periods</template>
             </el-input>
-            <el-button type="primary" size="small" @click="handleFilter">确定</el-button>
+            <el-button type="primary" size="small" @click="handleFilter">confirm<!-- 确定 --></el-button>
           </div>
 
           <el-table :data="tableData" stripe style="width: 100%;" :height="tool.getTableHeight(true)">
@@ -53,7 +53,7 @@
                 </template>
                 <template v-else>
                   <template v-if="tableHeader.index === 'USER_NAME'">
-                    <el-tooltip class="item" effect="dark" content="查看该会员的下级" placement="top">
+                    <el-tooltip class="item" effect="dark" content="View the subordinates of this member" placement="top"><!-- 查看该会员的下级 -->
                       <el-button @click.native="handleShow(scope.row)" size="small" type="primary">
                         {{scope.row[tableHeader.index].value}}
                       </el-button>
@@ -83,7 +83,7 @@
           </el-table>
           <div class="white-box-footer">
             <el-button type="success" size="small" @click="handleExport"
-                       v-show="permission.hasPermission(`atlas/relation-list-export`)">导出Excel
+                       v-show="permission.hasPermission(`atlas/relation-list-export`)">Export Excel<!-- 导出Excel -->
             </el-button>
             <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
           </div>
@@ -145,7 +145,7 @@
     methods: {
       getData() {
         this.$message({
-          message: '正在获取数据,请稍后',
+          message: 'Getting data, please wait',//正在获取数据,请稍后
           duration:0
         })
         this.periodNum = baseInfo.nowPeriodNum()
@@ -166,7 +166,7 @@
       getMainData (userName = null, getList = false) {
         this.$message.closeAll()
         this.$message({
-          message: '正在获取数据,请稍后',
+          message: 'Getting data, please wait',//正在获取数据,请稍后
         })
         let thisObj = this
         let requestData = {
@@ -199,7 +199,7 @@
           return ''
         }
         this.$message({
-          message: '正在获取数据,请稍后',
+          message: 'Getting data, please wait',//正在获取数据,请稍后
         })
         thisData.displayNone = ''
         network.getData('atlas/relation', {
@@ -245,9 +245,9 @@
         //this.getData(this.currentPage, this.pageSize, false)
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`Are you sure you want to export the current data?`, 'Hint', {//`确定要导出当前数据吗?`, '提示'
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           return network.getData(`atlas/relation-list-export`, this.filterForm)

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

@@ -2,8 +2,8 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-tabs v-model="filterStatus" @tab-click="handleFilterStatusClick">
-        <el-tab-pane label="全部" name="ALL" :lazy="true"></el-tab-pane>
-        <el-tab-pane label="首购单" name="ZC" :lazy="true"></el-tab-pane>
+        <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="增购单" 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>-->
@@ -26,7 +26,7 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/perf-order-export`)">导出Excel</el-button>
+        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/perf-order-export`)">Export Excel<!-- 导出Excel --></el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
@@ -98,9 +98,9 @@ export default {
       if(window.location.href.indexOf('filter') === -1){
         filterData.filterType = this.filterStatus !== 'ALL' ? `=,${this.filterStatus}` : ''
       }
-      this.$confirm('确定要导出当前表格中的数据吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm('Are you sure you want to export the data in the current table?', 'Hint', {//'确定要导出当前表格中的数据吗?', '提示'
+        confirmButtonText: 'confirm',//确定
+        cancelButtonText: 'cancel',//取消
         type: 'warning'
       }).then(() => {
         return network.getData('bonus/perf-order-export', filterData)

+ 4 - 4
backendEle/src/views/bonus/user-perf.vue

@@ -18,7 +18,7 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/user-perf-export`)">导出Excel</el-button>
+        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/user-perf-export`)">Export Excel<!-- 导出Excel --></el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
@@ -87,9 +87,9 @@
         if(window.location.href.indexOf('filter') === -1){
           filterData.filterType = this.filterStatus !== 'ALL' ? `=,${this.filterStatus}` : ''
         }
-        this.$confirm('确定要导出当前表格中的数据吗?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm('Are you sure you want to export the data in the current table?', 'Hint', {//'确定要导出当前表格中的数据吗?', '提示',
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           return network.getData('bonus/user-perf-export', filterData)

+ 8 - 8
backendEle/src/views/shop/order-dec-list.vue

@@ -20,22 +20,22 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="success" size="small" @click="handleImport" v-show="permission.hasPermission(`shop/order-dec-list-import`)">订单导入</el-button>
+        <el-button type="success" size="small" @click="handleImport" v-show="permission.hasPermission(`shop/order-dec-list-import`)">Order import<!-- 订单导入 --></el-button>
 
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange"
                     @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
-    <el-dialog title="订单导入" :visible.sync="importDialogVisible" width="50%">
+    <el-dialog title="Order import" :visible.sync="importDialogVisible" width="50%"><!-- 订单导入 -->
       <el-form ref="form" :model="excelForm" style="width: 100%;" class="form-page">
-        <el-form-item label="当前导入订单日期">
-          <el-date-picker  v-model="excelForm.orderDay" type="date" placeholder="选择日期"  value-format="yyyy-MM-dd">
+        <el-form-item label="Current import order date"><!-- 当前导入订单日期 -->
+          <el-date-picker  v-model="excelForm.orderDay" type="date" placeholder="Select date"  value-format="yyyy-MM-dd"><!-- 选择日期 -->
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="false" label="当前导入订单期数">
+        <el-form-item v-show="false" label="Current import order periods"><!-- 当前导入订单期数 -->
           <el-input v-model="excelForm.periodNum"></el-input>
         </el-form-item>
-        <el-form-item label="Excel 文件总行数">
+        <el-form-item label="Total rows of Excel file"><!-- Excel 文件总行数 -->
           <el-input v-model="excelForm.rowCount"></el-input>
         </el-form-item>
         <el-form-item>
@@ -47,9 +47,9 @@
                   :other-params="excelForm"
                   :finish-callback-func="uploadFinishFunc"
                   excel-option="addUser"
-                  upload-btn-title="Excel导入"
+                  upload-btn-title="Excel import"
                   style="float: left;"
-          ></leo-excel-uploader>
+          ></leo-excel-uploader><!-- Excel导入 -->
           <!--          <el-button type="primary" @click="handleExcel" style="float: left; margin-left: 10px;">下载模板</el-button>-->
         </el-form-item>
       </el-form>

+ 23 - 23
backendEle/src/views/shop/order-list.vue

@@ -18,41 +18,41 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="180">
+        <el-table-column fixed="right" label="operation" width="180"><!-- 操作 -->
           <template slot-scope="scope">
             <el-dropdown size="small" trigger="click">
               <el-button type="primary" size="small" @click.stop="">
-                操作该数据<i class="el-icon-arrow-down el-icon--right"></i>
+                Operate on this data<!-- 操作该数据 --><i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="edit" @click.native="handleEdit(scope.row)" v-if="permission.hasPermission(`shop/edit`)">编辑订单</el-dropdown-item>
-                <el-dropdown-item command="delivery" @click.native="handleShowDeliveryDialog(scope.row)" v-if="permission.hasPermission(`shop/order-delivery`) && scope.row['STATUS'] === '1' && scope.row['DELIVERY_STATUS'] === '0' ">发货</el-dropdown-item>
-                <el-dropdown-item command="refund" @click.native="handleRefund(scope.row.SN)" v-if="permission.hasPermission(`shop/order-delivery`) && scope.row['PAY_TYPE'] === 'pay_stack' && scope.row['STATUS'] === '1' && scope.row['DELIVERY_STATUS'] === '0' ">退款</el-dropdown-item>
+                <el-dropdown-item command="edit" @click.native="handleEdit(scope.row)" v-if="permission.hasPermission(`shop/edit`)">Edit order<!-- 编辑订单 --></el-dropdown-item>
+                <el-dropdown-item command="delivery" @click.native="handleShowDeliveryDialog(scope.row)" v-if="permission.hasPermission(`shop/order-delivery`) && scope.row['STATUS'] === '1' && scope.row['DELIVERY_STATUS'] === '0' ">deliver goods<!-- 发货 --></el-dropdown-item>
+                <el-dropdown-item command="refund" @click.native="handleRefund(scope.row.SN)" v-if="permission.hasPermission(`shop/order-delivery`) && scope.row['PAY_TYPE'] === 'pay_stack' && scope.row['STATUS'] === '1' && scope.row['DELIVERY_STATUS'] === '0' ">Refund<!-- 退款 --></el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`shop/order-list-export`)">导出Excel</el-button>
-        <el-button type="primary" size="small" @click="handleExportPDF" v-show="permission.hasPermission(`shop/order-list-export`)">导出PDF</el-button>
+        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`shop/order-list-export`)">Export Excel</el-button>
+        <el-button type="primary" size="small" @click="handleExportPDF" v-show="permission.hasPermission(`shop/order-list-export`)">Export PDF</el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange"
                     @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
 
-    <el-dialog title="发货" :visible.sync="dialogDeliveryVisible">
+    <el-dialog title="deliver goods" :visible.sync="dialogDeliveryVisible"><!-- 发货 -->
       <el-form :model="deliveryForm" label-width="150px" class="form-dialog">
-        <el-form-item label="快递公司">
+        <el-form-item label="Courier Services Company"><!-- 快递公司 -->
           <el-input v-model="deliveryForm.expressCompany"></el-input>
         </el-form-item>
-        <el-form-item label="快递单号">
+        <el-form-item label="courier number"><!-- 快递单号 -->
           <el-input v-model="deliveryForm.orderTrackNo"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogDeliveryVisible = false">取 消</el-button>
-        <el-button type="primary" @click.native="handleDelivery">发货</el-button>
+        <el-button @click="dialogDeliveryVisible = false">Cancel<!-- 取 消 --></el-button>
+        <el-button type="primary" @click.native="handleDelivery">deliver goods<!-- 发货 --></el-button>
       </div>
     </el-dialog>
   </div>
@@ -117,9 +117,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`Are you sure you want to export the current data?`, 'Hint', {//`确定要导出当前数据吗?`, '提示'
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           return network.getData(`shop/order-list-export`, this.filterModel)
@@ -135,7 +135,7 @@
         handleExportPDF() {
             if (this.multipleSelection.length === 0) {
                 this.$message({
-                    message: '请选择一条订单导出',
+                    message: 'Please select an order to export',//请选择一条订单导出
                     type: 'error'
                 })
                 return false
@@ -147,15 +147,15 @@
             let orderSnSet = Array.from(new Set(orderSnList))
             if (orderSnSet.length !== 1) {
                 this.$message({
-                    message: '每次只能导出一条订单',
+                    message: 'Only one order can be exported at a time',//每次只能导出一条订单
                     type: 'error'
                 })
                 return false
             }
 
-            this.$confirm(`确定要导出当前数据吗?`, '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+            this.$confirm(`Are you sure you want to export the current data?`, 'Hint', {//`确定要导出当前数据吗?`, '提示'
+                confirmButtonText: 'confirm',//确定
+                cancelButtonText: 'cancel',//取消
                 type: 'info'
             }).then(() => {
                 // 导出时只需要订单ID即可
@@ -196,9 +196,9 @@
       },
         // 退款
         handleRefund(orderSn) {
-            this.$confirm(`确定要将此订单退款吗?`, '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+            this.$confirm(`Are you sure you want to refund this order?`, 'Hint', {//`确定要将此订单退款吗?`, '提示',
+                confirmButtonText: 'confirm',//确定
+                cancelButtonText:  'cancel',//取消
                 type: 'warning'
             }).then(() => {
                 return network.postData(`shop/order-refund`, { sn: orderSn.value })

+ 12 - 12
backendEle/src/views/shop/order-shop-list.vue

@@ -20,28 +20,28 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="success" size="small" @click="handleImport" v-show="permission.hasPermission(`shop/order-shop-list-import`)">订单导入</el-button>
+        <el-button type="success" size="small" @click="handleImport" v-show="permission.hasPermission(`shop/order-shop-list-import`)">Order import<!-- 订单导入 --></el-button>
 
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange"
                     @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
-    <el-dialog title="订单导入" :visible.sync="importDialogVisible" width="50%">
+    <el-dialog title="Order import" :visible.sync="importDialogVisible" width="50%"><!-- 订单导入 -->
       <el-form ref="form" :model="excelForm" style="width: 100%;" class="form-page">
-        <el-form-item label="当前导入订单日期">
-          <el-date-picker  v-model="excelForm.orderDay" type="date" placeholder="选择日期"  value-format="yyyy-MM-dd">
+        <el-form-item label="Current import order date"><!-- 当前导入订单日期 -->
+          <el-date-picker  v-model="excelForm.orderDay" type="date" placeholder="Select date"  value-format="yyyy-MM-dd"><!-- 选择日期 -->
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="当前导入订单类型">
-          <el-select v-model="excelForm.orderType" placeholder="请选择订单类型" style="width: 400px;">
-            <el-option label="复销订单" value="cash" :key="1"></el-option>
-            <el-option label="积分订单" value="point" :key="2"></el-option>
+        <el-form-item label="Current import order type"><!-- 当前导入订单类型 -->
+          <el-select v-model="excelForm.orderType" placeholder="Please select order type" style="width: 400px;"><!-- 请选择订单类型 -->
+            <el-option label="Resale order" value="cash" :key="1"></el-option><!-- 复销订单 -->
+            <el-option label="Points order" value="point" :key="2"></el-option><!-- 积分订单 -->
           </el-select>
         </el-form-item>
-        <el-form-item v-show="false" label="当前导入订单期数">
+        <el-form-item v-show="false" label="Current import order periods"><!-- 当前导入订单期数 -->
           <el-input v-model="excelForm.periodNum"></el-input>
         </el-form-item>
-        <el-form-item label="Excel 文件总行数">
+        <el-form-item label="Total rows of Excel file"><!-- Excel 文件总行数 -->
           <el-input v-model="excelForm.rowCount"></el-input>
         </el-form-item>
         <el-form-item>
@@ -53,9 +53,9 @@
             :other-params="excelForm"
             :finish-callback-func="uploadFinishFunc"
             excel-option="addUser"
-            upload-btn-title="Excel导入"
+            upload-btn-title="Excel import"
             style="float: left;"
-          ></leo-excel-uploader>
+          ></leo-excel-uploader><!-- Excel导入 -->
 <!--          <el-button type="primary" @click="handleExcel" style="float: left; margin-left: 10px;">下载模板</el-button>-->
         </el-form-item>
       </el-form>

+ 6 - 6
backendEle/src/views/shop/order-standard-list.vue

@@ -19,16 +19,16 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="success" size="small" @click="handleImport" v-show="permission.hasPermission(`shop/order-standard-list-import`)">订单导入</el-button>
+        <el-button type="success" size="small" @click="handleImport" v-show="permission.hasPermission(`shop/order-standard-list-import`)">Order import<!-- 订单导入 --></el-button>
 
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange"
                     @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
-    <el-dialog title="订单导入" :visible.sync="importDialogVisible" width="50%">
+    <el-dialog title="Order import" :visible.sync="importDialogVisible" width="50%"><!-- 订单导入 -->
       <el-form ref="form" :model="excelForm" style="width: 100%;" class="form-page">
         <el-form-item label="当前导入订单日期">
-          <el-date-picker  v-model="excelForm.orderMonth" type="month" placeholder="选择月"  value-format="yyyy-MM">
+          <el-date-picker  v-model="excelForm.orderMonth" type="month" placeholder="Select month"  value-format="yyyy-MM"><!-- 选择月 -->
           </el-date-picker>
         </el-form-item>
 <!--        <el-form-item label="当前导入订单类型">-->
@@ -40,7 +40,7 @@
 <!--        <el-form-item v-show="false" label="当前导入订单期数">-->
 <!--          <el-input v-model="excelForm.periodNum"></el-input>-->
 <!--        </el-form-item>-->
-        <el-form-item label="Excel 文件总行数">
+        <el-form-item label="Total rows of Excel file"><!-- Excel 文件总行数 -->
           <el-input v-model="excelForm.rowCount"></el-input>
         </el-form-item>
         <el-form-item>
@@ -52,9 +52,9 @@
             :other-params="excelForm"
             :finish-callback-func="uploadFinishFunc"
             excel-option="addUser"
-            upload-btn-title="Excel导入"
+            upload-btn-title="Excel import"
             style="float: left;"
-          ></leo-excel-uploader>
+          ></leo-excel-uploader><!-- Excel导入 -->
 <!--          <el-button type="primary" @click="handleExcel" style="float: left; margin-left: 10px;">下载模板</el-button>-->
         </el-form-item>
       </el-form>

+ 30 - 31
backendEle/src/views/user/empty-list.vue

@@ -330,15 +330,15 @@
       handleIsDecManage(isDec) {
           if (this.multipleSelection.length < 1) {
               this.$message({
-                  message: '请勾选要操作的会员',
+                  message: 'Please check the member to be operated',//请勾选要操作的会员
                   type: 'warning'
               })
               return
           }
-          let isDecTip = isDec === true ? '设为报单中心' : '取消报单中心'
-          this.$confirm(`确定要对所选会员【${isDecTip}】吗?`, '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
+          let isDecTip = isDec === true ? 'set as entry center ':' Cancel entry center ' //'设为报单中心' : '取消报单中心'
+          this.$confirm(`Are you sure you want to【${isDecTip}】?`, 'Hint', {//`确定要对所选会员【${isDecTip}】吗?`, '提示'
+              confirmButtonText: 'confirm',//确定
+              cancelButtonText: 'cancel',//取消
               type: 'warning'
           }).then(() => {
               let selectedIds = []
@@ -359,15 +359,15 @@
         handleIsAtlasManage(isAtlas) {
             if (this.multipleSelection.length < 1) {
                 this.$message({
-                    message: '请勾选要操作的会员',
+                    message: 'Please check the member to be operated',//请勾选要操作的会员
                     type: 'warning'
                 })
                 return
             }
-            let isAtlasTip = isAtlas === true ? '显示图谱' : '隐藏图谱'
-            this.$confirm(`确定要对所选会员【${isAtlasTip}】吗?`, '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+            let isAtlasTip = isAtlas === true ? 'show atlas': 'hide atlas'//'显示图谱' : '隐藏图谱'
+            this.$confirm(`Are you sure you want to【${isAtlasTip}】?`, 'Hint', {//`确定要对所选会员【${isAtlasTip}】吗?`, '提示'
+                confirmButtonText: 'confirm',//确定
+                cancelButtonText: 'cancel',//取消
                 type: 'warning'
             }).then(() => {
                 let selectedIds = []
@@ -388,15 +388,15 @@
       getTypeName(type) {
         switch (type) {
           case 1:
-            return '按指定会员'
+            return 'By designated member'//按指定会员
           case 2:
-            return '按开拓网络'
+            return 'Expand network by'//按开拓网络
           case 3:
-            return '按安置网络'
+            return 'By placement network'//按安置网络
           case 4:
-            return '按会员体系'
+            return 'By membership system'//按会员体系
           case 5:
-            return '按省份地区'
+            return 'By province and region'//按省份地区
           default:
             return ''
         }
@@ -405,13 +405,13 @@
         if (type === 2 || type === 3 || type === 4) {
           if (this.multipleSelection.length > 1) {
             this.$message({
-              message: '此登录管理不允许勾选多名会员',
+              message: 'Multiple members are not allowed to be checked in this login management',//此登录管理不允许勾选多名会员
               type: 'warning'
             })
             return;
           } else if (this.multipleSelection.length < 1) {
             this.$message({
-              message: '请选择会员编号',
+              message: 'Please select a member number',//请选择会员编号
               type: 'warning'
             })
             return;
@@ -419,27 +419,27 @@
         }
         if (type === 1 && this.multipleSelection.length <= 0) {
           this.$message({
-            message: '请选择会员编号',
+            message: 'Please select a member number',//请选择会员编号
             type: 'warning'
           })
           return;
         }
         if (type === 5 && this.multipleSelection.length > 0) {
           this.$message({
-            message: '按照地区关闭登录无需勾选会员',
+            message: 'Closing login by region without checking member',//按照地区关闭登录无需勾选会员
             type: 'warning'
           })
           return;
         }
         this.formCloseLogin = {
           userName: null,
-          typeName: '登录管理',
+          typeName: 'Login management',//登录管理
           type: null,
           isClose: 0,
           remark: '',
           areaSelected: null,
         },
-          this.formCloseLogin.typeName = this.getTypeName(type) + '管理登录'
+          this.formCloseLogin.typeName = this.getTypeName(type) + 'Manage logins'//管理登录
         this.formCloseLogin.type = type
         this.dialogVisible = true
       },
@@ -509,9 +509,9 @@
         // })
       },
       handleExport() {
-        this.$confirm(`确定要导出当前数据吗?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`Are you sure you want to export the current data?`, 'Hint', {//`确定要导出当前数据吗?`, '提示'
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           return network.getData(`user/index-export`, this.filterModel)
@@ -531,13 +531,13 @@
         if (type === 2 || type === 3 || type === 4) {
           if (this.multipleSelection.length > 1) {
             this.$message({
-              message: '此报单管理不允许勾选多名会员',
+              message: 'Multiple members are not allowed to be checked in this entry management',//此报单管理不允许勾选多名会员
               type: 'warning'
             })
             return;
           } else if (this.multipleSelection.length < 1) {
             this.$message({
-              message: '请勾选要管理报单的会员',
+              message: 'Please check the member to manage the entry',//请勾选要管理报单的会员
               type: 'warning'
             })
             return;
@@ -545,27 +545,27 @@
         }
         if (type === 1 && this.multipleSelection.length <= 0) {
           this.$message({
-            message: '请勾选要管理报单的会员',
+            message: 'Please check the member to manage the entry',//请勾选要管理报单的会员
             type: 'warning'
           })
           return;
         }
         if (type === 5 && this.multipleSelection.length > 0) {
           this.$message({
-            message: '按照地区关闭报单无需勾选会员',
+            message: 'Closing entry by region without checking memberManage entry',//按照地区关闭报单无需勾选会员
             type: 'warning'
           })
           return;
         }
         this.formCloseDec = {
           userName: null,
-          typeName: '管理报单',
+          typeName: 'Manage entry',//管理报单
           type: null,
           isClose: 0,
           remark: '',
           areaSelected: null,
         },
-          this.formCloseDec.typeName = this.getTypeName(type) + '管理报单'
+          this.formCloseDec.typeName = this.getTypeName(type) + 'Manage entry'//管理报单
         this.formCloseDec.type = type
         this.dialogDecVisible = true
       },
@@ -682,4 +682,3 @@
   }
 
 </script>
-

+ 74 - 74
backendEle/src/views/user/move.vue

@@ -2,10 +2,10 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-tabs v-model="filterStatus" @tab-click="handleFilterStatusClick">
-        <el-tab-pane label="全部" name="-1" :lazy="true"></el-tab-pane>
-        <el-tab-pane label="待审核" name="0" :lazy="true"></el-tab-pane>
-        <el-tab-pane label="审核通过" name="1" :lazy="true"></el-tab-pane>
-        <el-tab-pane label="审核拒绝" name="3" :lazy="true"></el-tab-pane>
+        <el-tab-pane label="whole" name="-1" :lazy="true"></el-tab-pane><!-- 全部 -->
+        <el-tab-pane label="To be reviewed" name="0" :lazy="true"></el-tab-pane><!-- 待审核 -->
+        <el-tab-pane label="Approved" name="1" :lazy="true"></el-tab-pane><!-- 审核通过 -->
+        <el-tab-pane label="Audit reject" name="3" :lazy="true"></el-tab-pane><!-- 审核拒绝 -->
       </el-tabs>
       <div class="filter-box">
         <filter-user ref="filterUser" :filter-types.sync="filterTypes" @select-value="handleFilterUser"></filter-user>
@@ -28,22 +28,22 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="180" v-if="tableHeaders">
+        <el-table-column fixed="right" label="operation" width="180" v-if="tableHeaders"><!-- 操作 -->
           <template slot-scope="scope"
                     v-if="scope.row.AUDIT_STATUS==='0' && (permission.hasPermission(`user/move-pass`)||permission.hasPermission(`user/move-audit`)||permission.hasPermission(`user/move-delete`))">
             <el-dropdown size="small" trigger="click">
               <el-button type="primary" size="small" @click.stop="">
-                操作该数据<i class="el-icon-arrow-down el-icon--right"></i>
+                Operate on this data<!-- 操作该数据 --><i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="pass" @click.native="handleAuditShow(scope.row)"
-                                  v-show="permission.hasPermission(`user/move-pass`)">审核通过
+                                  v-show="permission.hasPermission(`user/move-pass`)">Approved<!-- 审核通过 -->
                 </el-dropdown-item>
                 <el-dropdown-item command="refuse" @click.native="handleAudit(scope.row, 'reject')"
-                                  v-show="permission.hasPermission(`user/move-audit`)">审核拒绝
+                                  v-show="permission.hasPermission(`user/move-audit`)">Audit reject<!-- 审核拒绝 -->
                 </el-dropdown-item>
                 <el-dropdown-item command="del" @click.native="handleDel(scope.row.ID)"
-                                  v-show="permission.hasPermission(`user/move-delete`)">删除数据
+                                  v-show="permission.hasPermission(`user/move-delete`)">Delete data<!-- 删除数据 -->
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -53,145 +53,145 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click" @command="handleMuli" v-if="(filterStatus==='0') && permission.hasPermission(`user/move-delete`)">
           <el-button type="primary" size="small">
-            所选数据<i class="el-icon-arrow-down el-icon--right"></i>
+            Selected data<!-- 所选数据 --><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="del" @click.native="handleDel()">批量删除</el-dropdown-item>
+            <el-dropdown-item command="del" @click.native="handleDel()">Batch delete<!-- 批量删除 --></el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
         <el-button type="primary" size="small" @click="handleAdd" icon="el-icon-plus"
-                   v-show="permission.hasPermission(`user/move-add`)">新建移网申请
+                   v-show="permission.hasPermission(`user/move-add`)">New network transfer application<!-- 新建移网申请 -->
         </el-button>
         <el-button type="success" size="small" @click="handleExport"
-                   v-show="permission.hasPermission(`user/move-export`)">导出Excel
+                   v-show="permission.hasPermission(`user/move-export`)">Export Excel
         </el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
-    <el-dialog title="修改移网信息" :visible.sync="dialogEditFormVisible">
+    <el-dialog title="Modify network transfer information" :visible.sync="dialogEditFormVisible"><!-- 修改移网信息 -->
       <el-form :model="form" label-width="250px" class="form-dialog" v-loading="dialogEditLoading">
-        <el-form-item label="移网类型">
-          <el-select v-model="form.type" placeholder="请选择移网类型">
+        <el-form-item label="Network transfer type"><!-- 移网类型 -->
+          <el-select v-model="form.type" placeholder="Please select a network transfer type"><!-- 请选择移网类型 -->
             <el-option v-for="(item,key) in netType" :label="item.name" :value="item.id" :key="key"></el-option>
           </el-select>
         </el-form-item>
         <div v-if="form.type==='network'">
-          <el-form-item label="移动会员编号">
+          <el-form-item label="Mobile member code"><!-- 移动会员编号 -->
             <el-input v-model="form.baseInfo.USER_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="移动会员姓名">
+          <el-form-item label="Mobile member name"><!-- 移动会员姓名 -->
             <el-input v-model="form.baseInfo.REAL_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="原上级编号">
+          <el-form-item label="Original superior No"><!-- 原上级编号 -->
             <el-input v-model="form.baseInfo.CON_USER_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="原上级姓名">
+          <el-form-item label="Original superior name"><!-- 原上级姓名 -->
             <el-input v-model="form.baseInfo.CON_REAL_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="移动到节点会员编号">
+          <el-form-item label="Move to node member code"><!-- 移动到节点会员编号 -->
             <el-input v-model="form.toConUserName"></el-input>
           </el-form-item>
-          <el-form-item label="移动到节点会员姓名">
+          <el-form-item label="Move to node member name"><!-- 移动到节点会员姓名 -->
             <el-input v-model="form.toConRealName"></el-input>
           </el-form-item>
         </div>
         <div v-if="form.type==='relation'">
-          <el-form-item label="移动会员编号">
+          <el-form-item label="Mobile member code"><!-- 移动会员编号 -->
             <el-input v-model="form.baseInfo.USER_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="移动会员姓名">
+          <el-form-item label="Mobile member name"><!-- 移动会员姓名 -->
             <el-input v-model="form.baseInfo.REAL_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="原开拓人编号">
+          <el-form-item label="Original developer No"><!-- 原开拓人编号 -->
             <el-input v-model="form.baseInfo.REC_USER_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="原开拓人姓名">
+          <el-form-item label="Name of original developer"><!-- 原开拓人姓名 -->
             <el-input v-model="form.baseInfo.REC_REAL_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="移动到开拓会员编号">
+          <el-form-item label="Move to development member code"><!-- 移动到开拓会员编号 -->
             <el-input v-model="form.toConUserName"></el-input>
           </el-form-item>
-          <el-form-item label="移动到开拓会员姓名">
+          <el-form-item label="Move to development member name"><!-- 移动到开拓会员姓名 -->
             <el-input v-model="form.toConRealName"></el-input>
           </el-form-item>
         </div>
-        <el-form-item v-if="form.type==='network'" label="移动到区位">
-          <el-select v-model="form.location" placeholder="移动到区位">
-            <el-option label="一市场" value="1" key="location_1"></el-option>
-            <el-option label="二市场" value="2" key="location_2"></el-option>
-            <el-option label="三市场" value="3" key="location_3"></el-option>
+        <el-form-item v-if="form.type==='network'" label="Move to location"><!-- 移动到区位 -->
+          <el-select v-model="form.location" placeholder="Move to location"><!-- 移动到区位 -->
+            <el-option label="I. Market" value="1" key="location_1"></el-option><!-- 一市场 -->
+            <el-option label="II. Market" value="2" key="location_2"></el-option><!-- 二市场 -->
+            <el-option label="III. Market" value="3" key="location_3"></el-option><!-- 三市场 -->
           </el-select>
         </el-form-item>
-        <el-form-item label="备注">
+        <el-form-item label="note"><!-- 备注 -->
           <el-input v-model="form.remark"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogEditFormVisible = false">取 消</el-button>
-        <el-button type="primary" @click.native="handleEdit">修 改</el-button>
+        <el-button @click="dialogEditFormVisible = false">Cancel<!-- 取 消 --></el-button>
+        <el-button type="primary" @click.native="handleEdit">edit<!-- 修 改 --></el-button>
       </div>
     </el-dialog>
-    <el-dialog title="审核移网信息" :visible.sync="dialogAuditFormVisible">
+    <el-dialog title="Review network transfer information" :visible.sync="dialogAuditFormVisible"><!-- 审核移网信息 -->
       <el-form :model="form" label-width="250px" class="form-dialog" v-loading="dialogAuditLoading">
-        <el-form-item label="移网类型">
-          <el-select v-model="form.type" placeholder="请选择移网类型">
+        <el-form-item label="Network transfer type"><!-- 移网类型 -->
+          <el-select v-model="form.type" placeholder="Please select a network transfer type"><!-- 请选择移网类型 -->
             <el-option v-for="(item,key) in netType" :label="item.name" :value="item.id" :key="key"></el-option>
           </el-select>
         </el-form-item>
         <div v-if="form.type==='network'">
-          <el-form-item label="移动会员编号">
+          <el-form-item label="Mobile member code"><!-- 移动会员编号 -->
             <el-input v-model="form.baseInfo.USER_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="移动会员姓名">
+          <el-form-item label="Mobile member name"><!-- 移动会员姓名 -->
             <el-input v-model="form.baseInfo.REAL_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="原上级编号">
+          <el-form-item label="Original superior No"><!-- 原上级编号 -->
             <el-input v-model="form.baseInfo.CON_USER_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="原上级姓名">
+          <el-form-item label="Original superior name"><!-- 原上级姓名 -->
             <el-input v-model="form.baseInfo.CON_REAL_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="移动到节点会员编号">
+          <el-form-item label="Move to node member code"><!-- 移动到节点会员编号 -->
             <el-input v-model="form.toConUserName"></el-input>
           </el-form-item>
-          <el-form-item label="移动到节点会员姓名">
+          <el-form-item label="Move to node member name"><!-- 移动到节点会员姓名 -->
             <el-input v-model="form.toConRealName"></el-input>
           </el-form-item>
         </div>
         <div v-if="form.type==='relation'">
-          <el-form-item label="移动会员编号">
+          <el-form-item label="Mobile member code"><!-- 移动会员编号 -->
             <el-input v-model="form.baseInfo.USER_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="移动会员姓名">
+          <el-form-item label="Mobile member name"><!-- 移动会员姓名 -->
             <el-input v-model="form.baseInfo.REAL_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="原开拓人编号">
+          <el-form-item label="Original developer No"><!-- 原开拓人编号 -->
             <el-input v-model="form.baseInfo.REC_USER_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="原开拓人姓名">
+          <el-form-item label="Name of original developer"><!-- 原开拓人姓名 -->
             <el-input v-model="form.baseInfo.REC_REAL_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="移动到开拓会员编号">
+          <el-form-item label="Move to development member code"><!-- 移动到开拓会员编号 -->
             <el-input v-model="form.toConUserName"></el-input>
           </el-form-item>
-          <el-form-item label="移动到开拓会员姓名">
+          <el-form-item label="Move to development member name"><!-- 移动到开拓会员姓名 -->
             <el-input v-model="form.toConRealName"></el-input>
           </el-form-item>
         </div>
-        <el-form-item v-if="form.type==='network'" label="移动到区位">
-          <el-select v-model="form.location" placeholder="移动到区位">
-            <el-option label="一市场" value="1" key="location_1"></el-option>
-            <el-option label="二市场" value="2" key="location_2"></el-option>
-            <el-option label="三市场" value="3" key="location_3"></el-option>
+        <el-form-item v-if="form.type==='network'" label="Move to location"><!-- 移动到区位 -->
+          <el-select v-model="form.location" placeholder="Move to location"><!-- 移动到区位 -->
+            <el-option label="I. Market" value="1" key="location_1"></el-option><!-- 一市场 -->
+            <el-option label="II. Market" value="2" key="location_2"></el-option><!-- 二市场 -->
+            <el-option label="III. Market" value="3" key="location_3"></el-option><!-- 三市场 -->
           </el-select>
         </el-form-item>
-        <el-form-item label="备注">
+        <el-form-item label="note"><!-- 备注 -->
           <el-input v-model="form.remark"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogAuditFormVisible = false">取 消</el-button>
-        <el-button type="primary" @click.native="handleAuditPass">通 过</el-button>
+        <el-button @click="dialogAuditFormVisible = false">Cancel<!-- 取 消 --></el-button>
+        <el-button type="primary" @click.native="handleAuditPass">Adopted<!-- 通 过 --></el-button>
       </div>
     </el-dialog>
   </div>
@@ -259,7 +259,7 @@
       handleMuli(command) {
         if (this.multipleSelection.length < 1) {
           this.$message({
-            message: '请选择要操作的记录',
+            message: 'Please select the record to operate',//请选择要操作的记录
             type: 'warning'
           })
           return;
@@ -293,7 +293,7 @@
       handleEdit() {
         this.dialogEditFormVisible = false
         this.$message({
-          message: '正在修改数据',
+          message: 'Modifying data',//正在修改数据
           type: 'info'
         })
         let path = 'user/move-edit'
@@ -322,7 +322,7 @@
       handleAuditPass() {
         this.dialogAuditFormVisible = false
         this.$message({
-          message: '正在通过审核',
+          message: 'Passing audit',//正在通过审核
           type: 'info'
         })
         this.form.auditStatus = 'true'
@@ -338,19 +338,19 @@
       },
       handleAudit(row = null, status) {
         let obj = this
-        let title = '确定要通过审核?备注:'
+        let title = 'Are you sure you want to pass the audit? note:'//确定要通过审核?备注:
         if (status === 'reject') {
-          title = '确定要拒绝审核?备注:'
+          title = 'Are you sure you want to reject the approval? note:'//确定要拒绝审核?备注:
         }
 
-        this.$prompt(title, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$prompt(title, 'Hint', {//提示
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           inputValue: '',
           //type: 'warning',
         }).then(({value}) => {
           this.$message({
-            message: '正在操作,请稍后',
+            message: 'Operation in progress, please wait',//正在操作,请稍后
             type: 'info'
           })
           let selectedIds = []
@@ -378,9 +378,9 @@
       },
       handleDel(id = null) {
         let obj = this
-        this.$confirm('确定删除选定的数据?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm('are you sure to delete the selected data?', 'Hint', {//'确定删除选定的数据?', '提示'
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           let selectedIds = []
@@ -433,9 +433,9 @@
       //   }, null, ['MOVE_PERCENT'])
       // },
       handleExport() {
-        this.$confirm(`确定要导出当前数据吗?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`Are you sure you want to export the current data?`, 'Hint', {//`确定要导出当前数据吗?`, '提示',
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           return network.getData(`user/move-export`, this.filterModel)