root пре 3 година
родитељ
комит
8ccc532b4e

+ 5 - 5
backendApi/config/menu.php

@@ -42,7 +42,7 @@ return [
             // 新添加的商品操作 ---stop
             ['name'=>'商品列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'goods-list-export', 'routePath'=>'shop/goods-list-export', 'show'=>0,],
             ['name'=>' Kitting products manage', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'package', 'routePath'=>'shop/package', 'show'=>1,],//套餐管理
-            ['name'=>'报单列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', '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'=>'订单列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list-export', 'routePath'=>'shop/order-list-export', 'show'=>0,],
@@ -53,7 +53,7 @@ return [
         ]
     ],
     'user'=>[
-        'name'=>'会员管理',
+        'name'=>'Member management',//会员管理
         'class' => '',
         'icon'=>'el-icon-user',
         'controller'=>'user',
@@ -61,7 +61,7 @@ return [
         'routePath'=>'user',
         'show'=>1,
         'child'=>[
-            ['name'=>'会员列表', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'index', 'routePath'=>'user/index', 'show'=>1,],
+            ['name'=>'Member list', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'index', 'routePath'=>'user/index', 'show'=>1,],//会员列表
             ['name'=>'登录到前台', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'login-to-frontend', 'routePath'=>'user/login-to-frontend', 'show'=>0,],
 //            ['name'=>'指定会员管理登录管理', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'batch-close-login', 'routePath'=>'user/batch-close-login', 'show'=>0,],
 //            ['name'=>'按条件登录管理', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'close-login', 'routePath'=>'user/close-login', 'show'=>0,],
@@ -82,9 +82,9 @@ return [
             ['name'=>'修改个人资料', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'modify-profile', 'routePath'=>'user/modify-profile', 'show'=>0,],
             ['name'=>'会员状态', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'modify-status', 'routePath'=>'user/modify-status', 'show'=>0,],
             ['name'=>'密码修改状态', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'is-modify-password-status', 'routePath'=>'user/is-modify-password-status', 'show'=>0,],
-            ['name'=>'空单操作', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'user-add-opt', 'routePath'=>'user/user-add-opt', 'show'=>1,],
+            ['name'=>'Empty order operation', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'user-add-opt', 'routePath'=>'user/user-add-opt', 'show'=>1,],//空单操作
             ['name'=>'空单添加', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'user-add', 'routePath'=>'user/user-add', 'show'=>0,],
-            ['name'=>'空单列表', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'empty-list', 'routePath'=>'user/empty-list', 'show'=>1,],
+            ['name'=>'Empty list', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'empty-list', 'routePath'=>'user/empty-list', 'show'=>1,],//空单列表
 //            ['name'=>'空单批量1导入', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'import-users-to-excel-table', 'routePath'=>'user/import-users-to-excel-table', 'show'=>0,],
 //            ['name'=>'空单批量2添加', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'import-users-add', 'routePath'=>'user/import-users-add', 'show'=>0,],
 //            ['name'=>'空单删除', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'user-del', 'routePath'=>'user/user-del', 'show'=>0,],

+ 31 - 31
backendApi/modules/v1/controllers/UserController.php

@@ -890,7 +890,7 @@ class UserController extends BaseController
             $userInfo['HOUSE_POINTS'] = Balance::getAccountBalance($userInfo['ID'], 'house_points');
             return static::notice($userInfo);
         }else{
-            return static::notice('会员编号不存在', 400);
+            return static::notice('Member number does not exist', 400);//会员编号不存在
         }
     }
 
@@ -1071,7 +1071,7 @@ class UserController extends BaseController
     public function actionUserAdd()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(AdminAddUserForm::class, '添加成功', null, null, null, function ($form, $result) {
+            return parent::edit(AdminAddUserForm::class, 'Successfully added', null, null, null, function ($form, $result) {//添加成功
                 // Log::adminHandle('后台添加会员:' . $result['USER_NAME'], 1, $result['ID'], $result['USER_NAME']);
             });
         }
@@ -1082,7 +1082,7 @@ class UserController extends BaseController
         // 所有开户行
         $allOpenBank = OpenBank::findAllAsArray('STATUS=1');
         if (!$userName = Info::generateUserName('NG')) {
-            return static::notice('会员编号生成失败', 400);
+            return static::notice('Failed to generate member number', 400);//会员编号生成失败
         }
         return static::notice(['allDecRole' => $allDecRole, 'allNation' => $allNation, 'allOpenBank' => $allOpenBank, 'userName' => $userName]);
     }
@@ -1114,7 +1114,7 @@ class UserController extends BaseController
             } elseif ($result === 0) {
                 return static::notice(['finish' => true]);
             } else {
-                return static::notice('发生错误:' . $errorMsg, 400);
+                return static::notice('An error occurred:' . $errorMsg, 400);//发生错误
             }
         }
     }
@@ -1123,7 +1123,7 @@ class UserController extends BaseController
         $form = new UserBasicForm();
         $form->scenario = 'modifyPassword';
         if(Yii::$app->request->isPost && $form->load(Yii::$app->request->post(), '') && $result = $form->edit()){
-            return static::notice('密码修改成功');
+            return static::notice('Password modified successfully');//密码修改成功
         } else {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -1138,7 +1138,7 @@ class UserController extends BaseController
         $id = Yii::$app->request->get('id');
         $userInfo = User::findOneAsArray('ID=:ID', [':ID' => $id]);
         if (!$userInfo) {
-            return static::notice('数据不存在', 400);
+            return static::notice('Data does not exist', 400);//数据不存在
         }
         $allNation = \Yii::$app->params['nation'];
         $allOpenBank = OpenBank::findAllAsArray('STATUS=1');
@@ -1162,7 +1162,7 @@ class UserController extends BaseController
         $form = new UserBasicForm();
         $form->scenario = 'modifyProfile';
         if(Yii::$app->request->isPost && $form->load(Yii::$app->request->post(), '') && $result = $form->modifyProfile()){
-            return static::notice('个人资料修改成功');
+            return static::notice('Personal data modified successfully');//个人资料修改成功
         } else {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -1172,7 +1172,7 @@ class UserController extends BaseController
         $form = new UserBasicForm();
         $form->scenario = 'modifyStatus';
         if(Yii::$app->request->isPost && $form->load(Yii::$app->request->post(), '') && $result = $form->modifyStatus()){
-            return static::notice('会员状态修改成功');
+            return static::notice('Member status modified successfully');//会员状态修改成功
         } else {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -1187,7 +1187,7 @@ class UserController extends BaseController
         $form = new UserBasicForm();
         $form->scenario = 'isModifyPasswordStatus';
         if(Yii::$app->request->isPost && $form->load(Yii::$app->request->post(), '') && $result = $form->isModifyPasswordStatus()){
-            return static::notice('状态修改成功');
+            return static::notice('Status modified successfully');//状态修改成功
         } else {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -1218,7 +1218,7 @@ class UserController extends BaseController
             } elseif ($result === 0) {
                 return static::notice(['finish' => true]);
             } else {
-                return static::notice('发生错误:' . $errorMsg, 400);
+                return static::notice('An error occurred:' . $errorMsg, 400);//发生错误
             }
         }
     }
@@ -1232,42 +1232,42 @@ class UserController extends BaseController
     {
         $userName = Yii::$app->request->get('userName');
         if (!$uid = Info::getUserIdByUserName($userName)) {
-            return static::notice('用户不存在' . $userName, 400);
+            return static::notice('user does not exist' . $userName, 400);//用户不存在
         }
         if (UserInfo::findOneAsArray('REC_UID=:REC_UID AND DELETED=0', [':REC_UID' => $uid], 'USER_ID')) {
-            return static::notice('此会员已开拓其它会员不可以删除', 400);
+            return static::notice('This member has developed other members and cannot be deleted', 400);//此会员已开拓其它会员不可以删除
         }
         if (UserInfo::findOneAsArray('CON_UID=:CON_UID AND DELETED=0', [':CON_UID' => $uid], 'USER_ID')) {
-            return static::notice('此会员已安置其它会员不可以删除', 400);
+            return static::notice('This member has been placed with other members and cannot be deleted', 400);//此会员已安置其它会员不可以删除
         }
         if (User::findOneAsArray('DEC_ID=:DEC_ID AND DELETED=0', [':DEC_ID' => $uid], 'ID')) {
-            return static::notice('此会员已报单其它会员不可以删除', 400);
+            return static::notice('This member has submitted a bill and other members cannot delete it', 400);//此会员已报单其它会员不可以删除
         }
         if (DecOrder::findOneAsArray('USER_ID=:TO_USER_ID OR TO_USER_ID=:TO_USER_ID', [':TO_USER_ID' => $uid], 'ID')) {
-            return static::notice('此会员已报单不可以删除', 400);
+            return static::notice('This member has submitted a bill and cannot be deleted', 400);//此会员已报单不可以删除
         }
         $info = Info::baseInfoWithNet($uid);
         if ($info['REG_FROM'] == 1) {
-            return static::notice('此会员不是空单无法删除', 400);
+            return static::notice('This member is not empty and cannot be deleted', 400);//此会员不是空单无法删除
         }
         $sentMaxPeriodNum = Period::sentMaxPeriodNum();
         if ($info['PERIOD_AT'] <= $sentMaxPeriodNum) {
-            return static::notice('此会员加入期数小于等于已挂网期数', 400);
+            return static::notice('The number of enrollment periods of this member is less than or equal to the number of online periods', 400);//此会员加入期数小于等于已挂网期数
         }
         if (User::find()->where('ID=:ID AND VERIFIED=1', [':ID' => $uid])->exists()) {
-            return static::notice('此会员已实名认证无法删除', 400);
+            return static::notice('This member has been authenticated by real name and cannot be deleted', 400);//此会员已实名认证无法删除
         }
         if (User::find()->where('ID=:ID AND SUB_COM_LEADER=1', [':ID' => $uid])->exists()) {
-            return static::notice('此会员是分公司领导人无法删除', 400);
+            return static::notice('This member is a branch leader and cannot be deleted', 400);//此会员是分公司领导人无法删除
         }
         if (UserInfo::find()->where('USER_ID=:USER_ID AND (IS_GROUP_LEADER=1 OR IS_SYSTEM_LEADER=1 OR IS_BIND=1 OR IS_TEAM=1)', [':USER_ID' => $uid])->exists()) {
-            return static::notice('此会员存在以下情况无法删除,团队领导人/体系领导人/点位绑定/点位合作', 400);
+            return static::notice('This member cannot be deleted due to the following conditions: Team Leader / system leader / point binding / point cooperation', 400);//此会员存在以下情况无法删除,团队领导人/体系领导人/点位绑定/点位合作
         }
         if (FlowBonus::findOneAsArray('USER_ID=:USER_ID', [':USER_ID' => $uid], 'ID')) {
-            return static::notice('该会员产生过余额流水无法删除', 400);
+            return static::notice('This member has generated a balance flow, which cannot be deleted', 400);//该会员产生过余额流水无法删除
         }
         if (UserMove::findOneAsArray('USER_ID=:USER_ID', [':USER_ID' => $uid], 'ID')) {
-            return static::notice('该会员发生过移网无法删除', 400);
+            return static::notice('The member cannot be deleted due to network migration', 400);//该会员发生过移网无法删除
         }
         return static::notice($info);
     }
@@ -1286,7 +1286,7 @@ class UserController extends BaseController
             $user = User::getBaseInfoFromRedis($result);
             //// Log::adminHandle('删除空单会员' . $user['USER_NAME'], 1, $result, $user['USER_NAME']);
             // Log::adminHandle('删除空单会员' . $user['USER_NAME'], 1);
-            return static::notice('删除空单会员完成');
+            return static::notice('Delete empty member');//删除空单会员完成
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -1429,7 +1429,7 @@ class UserController extends BaseController
     public function actionChangeUserDecLevel()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(DecLevelLogForm::class, '修改会员级别成功', 'adminChange', [
+            return parent::edit(DecLevelLogForm::class, 'Member level modified successfully', 'adminChange', [//修改会员级别成功
                 'adminChange',
             ], null, function ($form, $result) {
                 //$userName = Info::getUserNameByUserId($result['ID']);
@@ -1446,7 +1446,7 @@ class UserController extends BaseController
     public function actionChangeUserDecRole()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(DecRoleLogForm::class, '修改报单中心级别成功', 'adminChange', [
+            return parent::edit(DecRoleLogForm::class, 'Successfully modified the document entry center level', 'adminChange', [//修改报单中心级别成功
                 'adminChange',
             ], null, function ($form, $result) {
                 //$userName = Info::getUserNameByUserId($result['ID']);
@@ -1463,7 +1463,7 @@ class UserController extends BaseController
     public function actionChangeShowEmpLevel()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(ChangeShowEmpLvForm::class, '修改会员前台显示聘级成功', 'adminChange', [
+            return parent::edit(ChangeShowEmpLvForm::class, 'Succeeded in modifying the member foreground display level', 'adminChange', [//修改会员前台显示聘级成功
                 'adminChange',
             ], null, function ($form, $result) {
                 //$userName = Info::getUserNameByUserId($result['ID']);
@@ -1507,7 +1507,7 @@ class UserController extends BaseController
     public function actionRegInfoEdit()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(RegInfoAuditForm::class, '注册信息修改提交成功,审核后生效', 'editRegInfo', ['editRegInfo'], null, function ($form, $result) {
+            return parent::edit(RegInfoAuditForm::class, 'The registration information modification has been submitted successfully and will take effect after approval', 'editRegInfo', ['editRegInfo'], null, function ($form, $result) {//注册信息修改提交成功,审核后生效
                 $user = User::getBaseInfoFromRedis($result['USER_ID']);
                 // Log::adminHandle('申请为' . $user['USER_NAME'] . '注册信息修改', 1, $result['USER_ID'], $user['USER_NAME']);
             });
@@ -1557,7 +1557,7 @@ class UserController extends BaseController
     public function actionRegInfoAuditAdd()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(RegInfoAuditForm::class, '注册信息录入成功', 'add', ['add'], null, function ($form, $result) {
+            return parent::edit(RegInfoAuditForm::class, 'Registration information entered successfully', 'add', ['add'], null, function ($form, $result) {//注册信息录入成功
                 $user = User::getBaseInfoFromRedis($result['USER_ID']);
                 // Log::adminHandle('申请为' . $user['USER_NAME'] . '注册信息录入', 1, $result['USER_ID'], $user['USER_NAME']);
             });
@@ -1586,7 +1586,7 @@ class UserController extends BaseController
         $id = Yii::$app->request->get('id');
         $regInfo = RegInfoAudit::findOneAsArray('ID=:ID', [':ID' => $id]);
         if (!$regInfo) {
-            return static::notice('数据不存在', 400);
+            return static::notice('Data does not exist', 400);//数据不存在
         }
         $regInfo['BASE_INFO'] = Info::baseInfoZh($regInfo['USER_ID']);
         $regInfo['REG_EXPIRES'] = Date::convert($regInfo['REG_EXPIRES']);
@@ -1610,7 +1610,7 @@ class UserController extends BaseController
         if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->edit()) {
             $user = User::getBaseInfoFromRedis($result['USER_ID']);
             // Log::adminHandle('修改' . $user['USER_NAME'] . '注册信息录入数据', 1, $result['USER_ID'], $user['USER_NAME']);
-            return static::notice('修改注册信息录入数据完成');
+            return static::notice('Completion of modifying registration information and entering data');//修改注册信息录入数据完成
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -1628,7 +1628,7 @@ class UserController extends BaseController
         if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->audit()) {
             $user = User::getBaseInfoFromRedis($result['USER_ID']);
             // Log::adminHandle('审核' . $user['USER_NAME'] . '注册信息', 1, $result['USER_ID'], $user['USER_NAME']);
-            return static::notice('审核注册信息完成');
+            return static::notice('Audit registration information completed');//审核注册信息完成
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }

+ 7 - 7
backendApi/modules/v1/models/lists/shop/DecOrderList.php

@@ -149,37 +149,37 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'REC_USER_NAME' => [
-                    'header' => '报单时开拓者',//报单时开拓者
+                    'header' => 'Entry pioneer',//报单时开拓者
                     'headerOther' => ['width' => '150'],
                 ],
                 'REC_REAL_NAME' => [
-                    'header' => '报单时开拓者姓名',
+                    'header' => 'Entry pioneer name',//报单时开拓者姓名
                     'headerOther' => ['width' => '150'],
                 ],
                 'CON_USER_NAME' => [
-                    'header' => '报单时上级',
+                    'header' => 'Entry superior',//报单时上级
                     'headerOther' => ['width' => '150'],
                 ],
                 'CON_REAL_NAME' => [
-                    'header' => '报单时上级姓名',
+                    'header' => 'Entry superior name',//报单时上级姓名
                     'headerOther' => ['width' => '150'],
                 ],
                 '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'] ?? '';

+ 62 - 61
backendApi/modules/v1/models/lists/user/IndexList.php

@@ -90,11 +90,11 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                 'USER_ID' => null, // 这种传输方式主要是用于索引,因为过滤后的字段可能没有这种ID,但是一些功能的操作还需要用这种ID去关联,例如前台会员列表中的勾选批量状态管理,这里需要的就是USER_ID
                 'BTF_URL' => null,
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code',//会员编号
                     'headerOther' => ['width' => '150'],
                 ],
                 'REAL_NAME' => [
-                    'header' => '会员姓名',
+                    'header' => 'Member name',//会员姓名
                     'headerOther' => [
                         'width' => '120',
                     ],
@@ -103,22 +103,22 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                 ],
                 'LOGIN_STATUS_NAME' => [
-                    'header' => '登录状态',
+                    'header' => 'Login status',//登录状态
                     'value' => function($row) {
-                        return $row['ALLOW_LOGIN'] == 1 ? '允许登录' : '禁止登录';
+                        return $row['ALLOW_LOGIN'] == 1 ? 'allow Login': 'prohibit Login';//'允许登录' : '禁止登录'
                     },
                     'headerOther' => ['width' => '110'],
                 ],
                 'STATUS' => [
-                    'header' => '状态',
+                    'header' => 'status',//状态
                     'value' => function($row) {
-                        return $row['STATUS'] == 1 ? '激活' : '锁定';
+                        return $row['STATUS'] == 1 ? 'activate': 'lock';//'激活' : '锁定'
                     },
                     'headerOther' => ['width' => '110'],
                 ],
-                'ALLOW_LOGIN' => ['header' => '筛选允许登录','hidden'=>true],
+                'ALLOW_LOGIN' => ['header' => 'Filter allow login','hidden'=>true],//筛选允许登录
                 'CREATED_AT' => [
-                    'header' => '加入日期',
+                    'header' => 'Date of accession',//加入日期
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -126,9 +126,9 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                     'headerOther' => ['width' => '170'],
                 ],
-                'PERIOD_AT' => '加入期数',
+                'PERIOD_AT' => 'Number of joining periods',//加入期数
                 'DEC_LV_NAME' => [
-                    'header' => '实时会员级别',
+                    'header' => 'Real time membership level',//实时会员级别
                     'headerOther' => [
                         'width' => '110',
                     ],
@@ -140,7 +140,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                 ],
                 'DEC_LV_UPDATED_AT' => [
-                    'header' => '实时调整日期',
+                    'header' => 'Real time adjustment date',//实时调整日期
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['DEC_LV_UPDATED_AT'],
@@ -149,7 +149,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '170'],
                 ],
                 'LAST_DEC_LV_NAME' => [
-                    'header' => '结算时会员级别',
+                    'header' => 'Member level at settlement',//结算时会员级别
                     'headerOther' => [
                         'width' => '120',
                     ],
@@ -165,7 +165,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                 ],
                 'EMP_LV_NAME' => [
-                    'header' => '实时聘级',
+                    'header' => 'Real time employment',//实时聘级
                     'headerOther' => [
                         'width' => '130',
                     ],
@@ -192,33 +192,33 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
 //                    'headerOther' => ['width' => '210'],
 //                ],
                 'REC_USER_NAME' => [
-                    'header' => '推荐编号',
+                    'header' => 'Recommendation No',//推荐编号
                     'headerOther' => ['width' => '150'],
                 ],
                 'REC_REAL_NAME' => [
-                    'header' => '推荐姓名',
+                    'header' => 'Recommended name',//推荐姓名
                     'headerOther' => ['width' => '100'],
                 ],
                 'CON_USER_NAME' => [
-                    'header' => '安置编号',
+                    'header' => 'Placement No',//安置编号
                     'headerOther' => ['width' => '150'],
                 ],
                 'CON_REAL_NAME' => [
-                    'header' => '安置姓名',
+                    'header' => 'Placement name',//安置姓名
                     'headerOther' => ['width' => '100'],
                 ],
                 'RELATIVE_LOCATION' => [
-                    'header' => '安置区域',
+                    'header' => 'Resettlement area',//安置区域
                     'headerOther' => ['width' => '100'],
                 ],
                 'ID_TYPE' => [
-                    'header' => '证件类型',
+                    'header' => 'Document type',//证件类型
                     'value' => function($row) {
-                        return $row['ID_TYPE'] == 0 ? '身份证' : '';
+                        return $row['ID_TYPE'] == 0 ? 'ID' : '';//'身份证' : ''
                     },
                 ],
                 'ID_CARD' => [
-                    'header' => '证件号码',
+                    'header' => 'Identification Number',//证件号码
                     'value' => function($row) {
                         return "\t".$row['ID_CARD'];
                     },
@@ -243,25 +243,25 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
 //                    },
 //                ],
                 'MOBILE' => [
-                    'header' => '手机号码',
+                    'header' => 'phone number',//手机号码
                     'value' => function($row) {
                         return "\t".$row['MOBILE'];
                     },
                     'headerOther' => ['width' => '120'],
                 ],
                 'TEL' => [
-                    'header' => '备用手机号码',
+                    'header' => 'Alternate mobile number',//备用手机号码
                     'value' => function($row) {
                         return "\t".$row['TEL'];
                     },
                     'headerOther' => ['width' => '120'],
                 ],
                 'DEC_USER_NAME' => [
-                    'header' => '所属报单中心编号',
+                    'header' => 'No. of reporting center',//所属报单中心编号
                     'headerOther' => ['width' => '150'],
                 ],
                 'IS_DEC' => [
-                    'header' => '是否报单中心',
+                    'header' => 'Declaration center or not',//是否报单中心
                     'value' => function($row) {
                         return (new YesNo([
                             'value' => $row['IS_DEC'],
@@ -279,7 +279,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'IS_STUDIO' => [
-                    'header' => '是否工作室',
+                    'header' => 'Studio or not',//是否工作室
                     'value' => function($row) {
                         return (new YesNo([
                             'value' => $row['IS_STUDIO'],
@@ -297,7 +297,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'IS_ATLAS' => [
-                    'header' => '是否显示图谱',
+                    'header' => 'Whether the atlas is displayed',//是否显示图谱
                     'value' => function($row) {
                         return (new YesNo([
                             'value' => $row['IS_ATLAS'],
@@ -315,7 +315,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'IS_RECHARGE' => [
-                    'header' => '是否显示充值',
+                    'header' => 'Whether to display recharge',//是否显示充值
                     'value' => function($row) {
                         return (new YesNo([
                             'value' => $row['IS_RECHARGE'],
@@ -333,21 +333,21 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'DEC_ROLE_NAME' => [
-                    'header' => '报单中心级别',
+                    'header' => 'Entry center level',//报单中心级别
                     'headerOther' => ['width' => '110'],
                     'value' => function($row) use($decRoleConfig) {
                         return $decRoleConfig[$row['DEC_ROLE_ID']]['ROLE_NAME'] ?? '';
                     },
                 ],
                 'OPEN_BANK_NAME' => [
-                    'header' => '开户银行',
+                    'header' => 'Deposit bank',//开户银行
                     'headerOther' => ['width' => '110'],
                     'value' => function($row) use($openBankConfig) {
                         return $openBankConfig[$row['OPEN_BANK']]['BANK_NAME'] ?? '';
                     },
                 ],
                 'BANK_AREA' => [
-                    'header' => '银行地区',
+                    'header' => 'Banking region',//银行地区
                     'value' => function($row) use($regionConfig) {
                         $province = $regionConfig[$row['BANK_PROVINCE']]['REGION_NAME'] ?? '';
                         $city = $regionConfig[$row['BANK_CITY']]['REGION_NAME'] ?? '';
@@ -365,28 +365,28 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                 ],
                 'BANK_ADDRESS' => [
-                    'header' => '开户地址',
+                    'header' => 'Account opening address',//开户地址
                     'headerOther' => ['width' => '250'],
                     'showValue' => function($row) {
                         return '<div class="addr" title='.$row['BANK_ADDRESS'].'>'.$row['BANK_ADDRESS'].'</div>';
                     },
                 ],
                 'BANK_NO' => [
-                    'header' => '银行帐号',
+                    'header' => 'Bank account number',//银行帐号
                     'headerOther' => ['width' => '220'],
                     'value' => function($row) {
                         return "\t".$row['BANK_NO'];
                     },
                 ],
-                'SEX' => '性别',
+                'SEX' => 'Gender',//性别
                 'NATION_NAME' => [
-                    'header' => '民族',
+                    'header' => 'nation',//民族
                     'value' => function($row) {
                         return \Yii::$app->params['nation'][$row['NATION']]['name'] ?? '';
                     },
                 ],
                 'AREA' => [
-                    'header' => '常用地址',
+                    'header' => 'Common address',//常用地址
                     'value' => function($row) use($regionConfig) {
                         $province = $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
                         $city = $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
@@ -404,7 +404,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                 ],
                 'ADDRESS' => [
-                    'header' => '身份证地址',
+                    'header' => 'ID card address',//身份证地址
                     'value' => function($row) {
                         return $row['ADDRESS'];
                     },
@@ -420,7 +420,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
 //                    },
 //                ],
                 'VERIFIED' => [
-                    'header' => '实名认证',
+                    'header' => 'Real name authentication',//实名认证
                     'value' => function($row) {
                         return (new YesNo([
                             'value' => $row['VERIFIED'],
@@ -438,7 +438,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'VERIFIED_AT' => [
-                    'header' => '实名认证日期',
+                    'header' => 'Real name certification date',//实名认证日期
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['VERIFIED_AT'],
@@ -501,16 +501,16 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
 //                    },
 //                ],
                 'BIRTHDAY' => [
-                    'header' => '生日',
+                    'header' => 'birthday',//生日
                     'value' => function($row) {
                         return date('Y-m-d', strtotime($row['BIRTHDAY']));
                     },
                     'headerOther' => ['width' => '110'],
                 ],
                 'ALLOW_TRANSFER' => [
-                    'header' => '转账功能开启',
+                    'header' => 'Transfer function enabled',//转账功能开启
                     'value' => function($row) {
-                        return $row['ALLOW_TRANSFER'] == 1 ? '开启' : '关闭';
+                        return $row['ALLOW_TRANSFER'] == 1 ? 'on': 'off';//'开启' : '关闭'
                     },
                     'headerOther' => function($row) {
                         return [
@@ -524,7 +524,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'DEC_CLOSED' => [
-                    'header' => '是否关闭报单',
+                    'header' => 'Close entry',//是否关闭报单
                     'value' => function($row) {
                         return (new YesNo([
                             'value' => $row['DEC_CLOSED'],
@@ -542,9 +542,9 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'IS_MODIFY_PASSWORD' => [
-                    'header' => '密码修改状态',
+                    'header' => 'Password modification status',//密码修改状态
                     'value' => function($row) {
-                        return $row['IS_MODIFY_PASSWORD'] == 1 ? '开启' : '关闭';
+                        return $row['IS_MODIFY_PASSWORD'] == 1 ? 'on': 'off';//'开启' : '关闭'
                     },
                     'headerOther' => function($row) {
                         return [
@@ -570,39 +570,40 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'USER_NAME'=> ['name'=> '会员编号'],
-                'REAL_NAME'=> ['name'=> '会员姓名'],
+                'USER_NAME'=> ['name'=> 'Member code'],//会员编号
+                'REAL_NAME'=> ['name'=> 'Member name'],//会员姓名
 //                'ALLOW_LOGIN'=> ['name'=> '允许登录', 'other'=> 'yesOrNo'],
-                'CREATED_AT'=> ['name'=> '加入日期', 'other'=> 'date'],
-                'PERIOD_AT'=> ['name'=> '加入期数'],
-                'DEC_LV_NAME'=> ['name'=> '实时会员级别', 'other'=> 'decLevel'],
+                'CREATED_AT'=> ['name'=> 'Date of accession', 'other'=> 'date'],//加入日期
+                'PERIOD_AT'=> ['name'=> 'Number of joining periods'],//加入期数
+                'DEC_LV_NAME'=> ['name'=> 'Real time membership level', 'other'=> 'decLevel'],//实时会员级别
 //                'DEC_LV_UPDATED_AT'=> ['name'=> '实时调整日期', 'other'=> 'date'],
 //                'LAST_DEC_LV_NAME'=> ['name'=> '结算时会员级别', 'other'=> 'decLevel'],
-                'EMP_LV_NAME'=> ['name'=> '实时聘级', 'other'=> 'empLevel'],
+                'EMP_LV_NAME'=> ['name'=> 'Real time employment', 'other'=> 'empLevel'],//实时聘级
 //                'HIGHEST_EMP_LV_NAME'=> ['name'=> '历史最高聘级', 'other'=> 'empLevel'],
 //                'HIGHEST_EMP_LV_PERIOD'=> ['name'=> '首次达到历史最高聘级的期数'],
-                'REC_USER_NAME'=> ['name'=> '推荐编号'],
-                'CON_USER_NAME'=> ['name'=> '安置编号'],
+                'REC_USER_NAME'=> ['name'=> 'Recommendation No'],//推荐编号
+                'CON_USER_NAME'=> ['name'=> 'Placement No'],//安置编号
                 //'ID_TYPE'=> ['name'=> '证件类型', 'other'=> 'select', 'selectData'=> [['id'=> 0, 'name'=> '身份证']]],
-                'ID_CARD'=> ['name'=> '证件号码'],
+                'ID_CARD'=> ['name'=> 'Identification Number'],//证件号码
 //                'SPOUSE_NAME'=> ['name'=> '配偶姓名'],
 //                'SPOUSE_IDCARD'=> ['name'=> '配偶身份证号'],
 //                'SYSTEM_NAME'=> ['name'=> '体系名称', 'other'=> 'systems'],
 //                'SUB_COM_NAME'=> ['name'=> '所属分公司', 'other'=> 'subCompany'],
-                'MOBILE'=> ['name'=> '手机号码'],
+                'MOBILE'=> ['name'=> 'phone number'],//手机号码
 //                'TEL'=> ['name'=> '备用手机号码'],
-                'DEC_USER_NAME'=> ['name'=> '所属报单中心编号'],
-                'IS_DEC'=> ['name'=> '是否报单中心', 'other'=> 'yesOrNo'],
-                'IS_STUDIO'=> ['name'=> '是否工作室', 'other'=> 'yesOrNo'],
-                'DEC_ROLE_NAME'=> ['name'=> '报单中心级别', 'other'=> 'decRole'],
+                'DEC_USER_NAME'=> ['name'=> 'No. of reporting center'],//所属报单中心编号
+                'IS_DEC'=> ['name'=> 'Declaration center or not', 'other'=> 'yesOrNo'],//是否报单中心
+                'IS_STUDIO'=> ['name'=> 'Studio or not', 'other'=> 'yesOrNo'],//是否工作室
+                'DEC_ROLE_NAME'=> ['name'=> 'Entry center level', 'other'=> 'decRole'],//报单中心级别
 //                'OPEN_BANK_NAME'=> ['name'=> '开户银行', 'other'=> 'banks'],
 //                'BANK_AREA'=> ['name'=> '银行地区', 'other'=> 'area'],
 //                'BANK_ADDRESS'=> ['name'=> '开户地址'],
 //                'BANK_NO'=> ['name'=> '银行账号'],
 //                'SEX'=> ['name'=> '性别', 'other'=> 'sex'],
 //                'NATION_NAME'=> ['name'=> '民族', 'other'=> 'nations'],
-                'AREA'=> ['name'=> '常用地址', 'other'=> 'area'],
-                'STATUS'=> ['name'=> '激活状态', 'other'=> 'select', 'selectData'=> [['id'=> 0, 'name'=> '锁定'],['id'=> 1, 'name'=> '激活']]],
+                'AREA'=> ['name'=> 'Common address', 'other'=> 'area'],//常用地址
+                'STATUS'=> ['name'=> 'Active status', 'other'=> 'select', 'selectData'=> [['id'=> 0, 'name'=> 'locking'],['id'=> 1, 'name'=> 'activation']]],
+//                'STATUS'=> ['name'=> '激活状态', 'other'=> 'select', 'selectData'=> [['id'=> 0, 'name'=> '锁定'],['id'=> 1, 'name'=> '激活']]],
 //                'ADDRESS'=> ['name'=> '身份证地址'],
 //                'IS_AUTO_WITHDRAW'=> [
 //                    'isUserTable'=> false,

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

@@ -46,10 +46,10 @@ export const constantRouterMap = [
         component: _import('shop/dec-order-list'),
         name: 'shop_dec-order-list',
         meta: {
-          title: '报单列表',
+          title: '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'},//商城管理
           ],
         },
       },
@@ -181,10 +181,10 @@ export const constantRouterMap = [
         component: _import('user/user-add-opt'),
         name: 'user_user-add-opt',
         meta: {
-          title: '空单操作',
+          title: 'Empty order operation',//空单操作
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '会员管理', path: '/user/index'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Member management', path: '/user/index'},//会员管理
           ],
         },
       },
@@ -193,10 +193,10 @@ export const constantRouterMap = [
             component: _import('user/empty-list'),
             name: 'user_empty_list',
             meta: {
-                title: '空单列表',
+                title: 'Empty list',//空单列表
                 breadcrumb: [
-                    {title: '首页', path: '/dashboard/index'},
-                    {title: '会员管理', path: '/user/index'},
+                    {title: 'Dashboard', path: '/dashboard/index'},//首页
+                    {title: 'Member management', path: '/user/index'},//会员管理
                 ],
             },
         },

+ 32 - 32
backendEle/src/views/user/empty-list.vue

@@ -41,21 +41,21 @@
             </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 @click.native="handleModifyPassword(scope.row)"
-                                  v-if="permission.hasPermission(`user/modify-password`)">修改密码
+                                  v-if="permission.hasPermission(`user/modify-password`)">Change Password<!-- 修改密码 -->
                 </el-dropdown-item>
                 <el-dropdown-item @click.native="handleModifyProfile(scope.row)"
-                                  v-if="permission.hasPermission(`user/modify-profile`)">修改个人资料
+                                  v-if="permission.hasPermission(`user/modify-profile`)">Modify personal data<!-- 修改个人资料 -->
                 </el-dropdown-item>
-                <el-dropdown-item @click.native="handleStatusActive(scope.row)">状态激活 </el-dropdown-item>
-                <el-dropdown-item @click.native="handleStatusLock(scope.row)">状态锁定 </el-dropdown-item>
+                <el-dropdown-item @click.native="handleStatusActive(scope.row)">Status activation<!-- 状态激活 --> </el-dropdown-item>
+                <el-dropdown-item @click.native="handleStatusLock(scope.row)">Status lock<!-- 状态锁定 --> </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -93,53 +93,53 @@
     </div>
     <el-dialog :title="formModifyPassword.typeName" :visible.sync="dialogModifyPasswordVisible" width="50%">
       <el-form ref="form" :model="formModifyPassword" label-width="120px" class="form-dialog">
-        <el-form-item label="类型">
-          <el-select v-model="formModifyPassword.passwordType" placeholder="请选择类型">
+        <el-form-item label="type"><!-- 类型 -->
+          <el-select v-model="formModifyPassword.passwordType" placeholder="Please select a type"><!-- 请选择类型 -->
             <el-option v-for="(item,key) in passwordType" :label="item.label" :value="item.type"
                        :key="key"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="密码">
-          <el-input placeholder="密码" v-model="formModifyPassword.password">
+        <el-form-item label="password"><!-- 密码 -->
+          <el-input placeholder="password" v-model="formModifyPassword.password"><!-- 密码 -->
           </el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleModifyPasswordSubmit" :loading="submitPasswordButtonStat">提交</el-button>
+          <el-button type="primary" @click="handleModifyPasswordSubmit" :loading="submitPasswordButtonStat">Submit<!-- 提交 --></el-button>
         </el-form-item>
       </el-form>
     </el-dialog>
 
     <el-dialog :title="formModifyProfile.typeName" :visible.sync="dialogModifyProfileVisible" width="50%">
       <el-form ref="form" :model="formModifyProfile" label-width="120px" class="form-dialog">
-        <el-form-item label="民族">
-          <el-select v-model="formModifyProfile.nation" placeholder="请选择民族">
+        <el-form-item label="nation"><!-- 民族 -->
+          <el-select v-model="formModifyProfile.nation" placeholder="Please select nationality"><!-- 请选择民族 -->
             <el-option v-for="(item,index) in allNation" :key="index" :label="item.name"
                        :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="会员姓名">
+        <el-form-item label="Member name"><!-- 会员姓名 -->
           <el-input v-model="formModifyProfile.realName"></el-input>
         </el-form-item>
-        <el-form-item label="身份证号">
+        <el-form-item label="ID"><!-- 身份证号 -->
           <el-input v-model="formModifyProfile.idCard"></el-input>
         </el-form-item>
-        <el-form-item label="手机号">
+        <el-form-item label="phone number"><!-- 手机号 -->
           <el-input v-model="formModifyProfile.mobile"></el-input>
         </el-form-item>
-        <el-form-item label="银行名称">
-          <el-select v-model="formModifyProfile.openBank" placeholder="请选择银行名称">
+        <el-form-item label="Bank name"><!-- 银行名称 -->
+          <el-select v-model="formModifyProfile.openBank" placeholder="Please select a bank name"><!-- 请选择银行名称 -->
             <el-option v-for="(item,index) in allOpenBank" :key="index" :label="item.BANK_NAME"
                        :value="item.BANK_CODE"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="开户行地址">
+        <el-form-item label="Bank Address"><!-- 开户行地址 -->
           <el-input v-model="formModifyProfile.bankAddress"></el-input>
         </el-form-item>
-        <el-form-item label="银行帐号">
+        <el-form-item label="Bank account number"><!-- 银行帐号 -->
           <el-input v-model="formModifyProfile.bankNo"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleModifyProfileSubmit" :loading="submitProfileButtonStat">提交</el-button>
+          <el-button type="primary" @click="handleModifyProfileSubmit" :loading="submitProfileButtonStat">Submit<!-- 提交 --></el-button>
         </el-form-item>
       </el-form>
     </el-dialog>
@@ -210,7 +210,7 @@
         dialogVisible: false,
         formCloseLogin: {
           userName: null,
-          typeName: '登录管理',
+          typeName: 'Login management',//登录管理
           type: null,
           isClose: 0,
           remark: '',
@@ -225,7 +225,7 @@
         dialogModifyProfileVisible: false,
         formCloseDec: {
           userName: null,
-          typeName: '管理报单',
+          typeName: 'Manage entry',//管理报单
           type: null,
           isClose: 0,
           remark: '',
@@ -234,13 +234,13 @@
         formModifyPassword: {
             userId:'',
             password: '',
-            typeName: '修改密码',
+            typeName: 'Change Password',//修改密码
             passwordType: 'password',
             // remark: '',
         },
         formModifyProfile: {
             userId:'',
-            typeName: '修改个人资料',
+            typeName: 'Modify personal data',//修改个人资料
             nation: '',
             realName: '',
             idCard: '',
@@ -252,11 +252,11 @@
         passwordType: [
             {
                 type:"password",
-                label:"登录密码"
+                label:"Login password"//登录密码
             },
             {
                 type:"payPassword",
-                label:"支付密码"
+                label:"Payment password"//支付密码
             },
         ],
         allOpenBank:null,
@@ -301,15 +301,15 @@
       handleGroupManage(isGroup) {
         if (this.multipleSelection.length < 1) {
           this.$message({
-            message: '请勾选要操作的会员',
+            message: 'Please check the member to be operated',//请勾选要操作的会员
             type: 'warning'
           })
           return
         }
-        let groupTip = isGroup === true ? '设为团队领导人' : '取消团队领导人'
-        this.$confirm(`确定要对所选会员【${groupTip}】吗?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        let groupTip = isGroup === true ? 'set as team leader ':' Cancel team leader '//'设为团队领导人' : '取消团队领导人'
+        this.$confirm(`Are you sure you want to【${groupTip}】?`, 'Hint', {//`确定要对所选会员【${groupTip}】吗?`, '提示'
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           let selectedIds = []

+ 88 - 88
backendEle/src/views/user/index.vue

@@ -27,7 +27,7 @@
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item command="login" v-show="scope.row.BTF_URL !== null">
                       <a :href="`${frontendServer}/#/login-by-backend?${scope.row.BTF_URL}`" target="_blank"
-                         style="color:#606266;">快速登录</a>
+                         style="color:#606266;">Quick logon<!-- 快速登录 --></a>
                     </el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
@@ -41,23 +41,23 @@
             </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 @click.native="handleModifyPassword(scope.row)"
-                                  v-if="permission.hasPermission(`user/modify-password`)">修改密码
+                                  v-if="permission.hasPermission(`user/modify-password`)">Change Password<!-- 修改密码 -->
                 </el-dropdown-item>
                 <el-dropdown-item @click.native="handleModifyProfile(scope.row)"
-                                  v-if="permission.hasPermission(`user/modify-profile`)">修改个人资料
+                                  v-if="permission.hasPermission(`user/modify-profile`)">Modify personal data<!-- 修改个人资料 -->
                 </el-dropdown-item>
-                <el-dropdown-item @click.native="handleStatusActive(scope.row)" v-if="permission.hasPermission(`user/modify-status`)">状态激活 </el-dropdown-item>
-                <el-dropdown-item @click.native="handleStatusLock(scope.row)" v-if="permission.hasPermission(`user/modify-status`)">状态锁定 </el-dropdown-item>
-                <el-dropdown-item @click.native="handleIsModifyPassword(scope.row, 1)" v-if="permission.hasPermission(`user/is-modify-password-status`)">开启密码修改</el-dropdown-item>
-                <el-dropdown-item @click.native="handleIsModifyPassword(scope.row, 0)" v-if="permission.hasPermission(`user/is-modify-password-status`)">关闭密码修改</el-dropdown-item>
+                <el-dropdown-item @click.native="handleStatusActive(scope.row)" v-if="permission.hasPermission(`user/modify-status`)">Status activation<!-- 状态激活 --> </el-dropdown-item>
+                <el-dropdown-item @click.native="handleStatusLock(scope.row)" v-if="permission.hasPermission(`user/modify-status`)">Status lock<!-- 状态锁定 --> </el-dropdown-item>
+                <el-dropdown-item @click.native="handleIsModifyPassword(scope.row, 1)" v-if="permission.hasPermission(`user/is-modify-password-status`)">Open password modification<!-- 开启密码修改 --></el-dropdown-item>
+                <el-dropdown-item @click.native="handleIsModifyPassword(scope.row, 0)" v-if="permission.hasPermission(`user/is-modify-password-status`)">Turn off password modification<!-- 关闭密码修改 --></el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -111,44 +111,44 @@
         <!--</el-dropdown>-->
         <el-dropdown size="small" trigger="click" v-show="permission.hasPermission(`user/is-dec`)">
           <el-button type="primary" size="small" @click.stop="">
-            报单中心管理<i class="el-icon-arrow-down el-icon--right"></i>
+            Declaration Center Management<!-- 报单中心管理 --><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="isDec" @click.native="handleIsDecManage(true)">设为报单中心</el-dropdown-item>
-            <el-dropdown-item command="notDec" @click.native="handleIsDecManage(false)">取消报单中心
+            <el-dropdown-item command="isDec" @click.native="handleIsDecManage(true)">Set as declaration Center<!-- 设为报单中心 --></el-dropdown-item>
+            <el-dropdown-item command="notDec" @click.native="handleIsDecManage(false)">Cancel entry Center<!-- 取消报单中心 -->
             </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
 
         <el-dropdown size="small" trigger="click" v-show="permission.hasPermission(`user/is-studio`)">
           <el-button type="primary" size="small" @click.stop="">
-            工作室管理<i class="el-icon-arrow-down el-icon--right"></i>
+            Studio management<!-- 工作室管理 --><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="isStudio" @click.native="handleIsStudioManage(true)">设为工作室</el-dropdown-item>
-            <el-dropdown-item command="notStudio" @click.native="handleIsStudioManage(false)">取消工作室
+            <el-dropdown-item command="isStudio" @click.native="handleIsStudioManage(true)">Set as studio<!-- 设为工作室 --></el-dropdown-item>
+            <el-dropdown-item command="notStudio" @click.native="handleIsStudioManage(false)">Cancel room<!-- 取消工作室 -->
             </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
 
         <el-dropdown size="small" trigger="click" v-show="permission.hasPermission(`user/is-atlas`)">
           <el-button type="primary" size="small" @click.stop="">
-            图谱管理<i class="el-icon-arrow-down el-icon--right"></i>
+            Atlas management<!-- 图谱管理 --><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="isAtlas" @click.native="handleIsAtlasManage(true)">显示图谱</el-dropdown-item>
-            <el-dropdown-item command="notAtlas" @click.native="handleIsAtlasManage(false)">隐藏图谱
+            <el-dropdown-item command="isAtlas" @click.native="handleIsAtlasManage(true)">Display Atlas<!-- 显示图谱 --></el-dropdown-item>
+            <el-dropdown-item command="notAtlas" @click.native="handleIsAtlasManage(false)">Hidden Atlas<!-- 隐藏图谱 -->
             </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
 
         <el-dropdown size="small" trigger="click" v-show="permission.hasPermission(`user/is-recharge`)">
           <el-button type="primary" size="small" @click.stop="">
-            充值管理<i class="el-icon-arrow-down el-icon--right"></i>
+            Recharge management<!-- 充值管理 --><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="isAtlas" @click.native="handleIsRechargeManage(true)">显示充值</el-dropdown-item>
-            <el-dropdown-item command="notAtlas" @click.native="handleIsRechargeManage(false)">隐藏充值
+            <el-dropdown-item command="isAtlas" @click.native="handleIsRechargeManage(true)">Display recharge<!-- 显示充值 --></el-dropdown-item>
+            <el-dropdown-item command="notAtlas" @click.native="handleIsRechargeManage(false)">Hide recharge<!-- 隐藏充值 -->
             </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
@@ -176,7 +176,7 @@
           <!--</el-dropdown-menu>-->
         <!--</el-dropdown>-->
         <el-button type="success" size="small" @click="handleExport"
-                   v-show="permission.hasPermission(`user/index-export`)">导出Excel
+                   v-show="permission.hasPermission(`user/index-export`)">Export Excel
         </el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange"
                     @current-change="handleCurrentChange"></pagination>
@@ -184,14 +184,14 @@
     </div>
     <el-dialog :title="formModifyPassword.typeName" :visible.sync="dialogModifyPasswordVisible" width="50%">
       <el-form ref="form" :model="formModifyPassword" label-width="120px" class="form-dialog">
-        <el-form-item label="类型">
-          <el-select v-model="formModifyPassword.passwordType" placeholder="请选择类型">
+        <el-form-item label="type"><!-- 类型 -->
+          <el-select v-model="formModifyPassword.passwordType" placeholder="Please select a type"><!-- 请选择类型 -->
             <el-option v-for="(item,key) in passwordType" :label="item.label" :value="item.type"
                        :key="key"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="密码">
-          <el-input placeholder="密码" v-model="formModifyPassword.password">
+        <el-form-item label="password"><!-- 密码 -->
+          <el-input placeholder="password" v-model="formModifyPassword.password"><!-- 密码 -->
           </el-input>
         </el-form-item>
         <!--<el-form-item label="备注">-->
@@ -199,42 +199,42 @@
           <!--</el-input>-->
         <!--</el-form-item>-->
         <el-form-item>
-          <el-button type="primary" @click="handleModifyPasswordSubmit" :loading="submitPasswordButtonStat">提交</el-button>
+          <el-button type="primary" @click="handleModifyPasswordSubmit" :loading="submitPasswordButtonStat">Submit<!-- 提交 --></el-button>
         </el-form-item>
       </el-form>
     </el-dialog>
 
     <el-dialog :title="formModifyProfile.typeName" :visible.sync="dialogModifyProfileVisible" width="50%">
       <el-form ref="form" :model="formModifyProfile" label-width="120px" class="form-dialog">
-        <el-form-item label="民族">
-          <el-select v-model="formModifyProfile.nation" placeholder="请选择民族">
+        <el-form-item label="nation"><!-- 民族 -->
+          <el-select v-model="formModifyProfile.nation" placeholder="Please select nationality"><!-- 请选择民族 -->
             <el-option v-for="(item,index) in allNation" :key="index" :label="item.name"
                        :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="会员姓名">
+        <el-form-item label="Member name"><!-- 会员姓名 -->
           <el-input v-model="formModifyProfile.realName"></el-input>
         </el-form-item>
-        <el-form-item label="身份证号">
+        <el-form-item label="ID"><!-- 身份证号 -->
           <el-input v-model="formModifyProfile.idCard"></el-input>
         </el-form-item>
-        <el-form-item label="手机号">
+        <el-form-item label="phone number"><!-- 手机号 -->
           <el-input v-model="formModifyProfile.mobile"></el-input>
         </el-form-item>
-        <el-form-item label="银行名称">
-          <el-select v-model="formModifyProfile.openBank" placeholder="请选择银行名称">
+        <el-form-item label="Bank name"><!-- 银行名称 -->
+          <el-select v-model="formModifyProfile.openBank" placeholder="Please select a bank name"><!-- 请选择银行名称 -->
             <el-option v-for="(item,index) in allOpenBank" :key="index" :label="item.BANK_NAME"
                        :value="item.BANK_CODE"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="开户行地址">
+        <el-form-item label="Bank Address"><!-- 开户行地址 -->
           <el-input v-model="formModifyProfile.bankAddress"></el-input>
         </el-form-item>
-        <el-form-item label="银行帐号">
+        <el-form-item label="Bank account number"><!-- 银行帐号 -->
           <el-input v-model="formModifyProfile.bankNo"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleModifyProfileSubmit" :loading="submitProfileButtonStat">提交</el-button>
+          <el-button type="primary" @click="handleModifyProfileSubmit" :loading="submitProfileButtonStat">Submit<!-- 提交 --></el-button>
         </el-form-item>
       </el-form>
     </el-dialog>
@@ -305,7 +305,7 @@
         dialogVisible: false,
         formCloseLogin: {
           userName: null,
-          typeName: '登录管理',
+          typeName: 'Login management',//登录管理
           type: null,
           isClose: 0,
           remark: '',
@@ -320,7 +320,7 @@
         dialogModifyProfileVisible: false,
         formCloseDec: {
           userName: null,
-          typeName: '管理报单',
+          typeName: 'Manage entry',//管理报单
           type: null,
           isClose: 0,
           remark: '',
@@ -329,13 +329,13 @@
         formModifyPassword: {
             userId:'',
             password: '',
-            typeName: '修改密码',
+            typeName: 'Change Password',//修改密码
             passwordType: 'password',
             // remark: '',
         },
         formModifyProfile: {
             userId:'',
-            typeName: '修改个人资料',
+            typeName: 'Modify personal data',//修改个人资料
             nation: '',
             realName: '',
             idCard: '',
@@ -347,11 +347,11 @@
         passwordType: [
             {
                 type:"password",
-                label:"登录密码"
+                label:"login password"//登录密码
             },
             {
                 type:"payPassword",
-                label:"支付密码"
+                label:"Payment password"//支付密码
             },
         ],
         allOpenBank:null,
@@ -396,15 +396,15 @@
       handleGroupManage(isGroup) {
         if (this.multipleSelection.length < 1) {
           this.$message({
-            message: '请勾选要操作的会员',
+            message: 'Please check the member to be operated',//请勾选要操作的会员
             type: 'warning'
           })
           return
         }
-        let groupTip = isGroup === true ? '设为团队领导人' : '取消团队领导人'
-        this.$confirm(`确定要对所选会员【${groupTip}】吗?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        let groupTip = isGroup === true ? 'Set as team leader' : 'Cancel team leader' //'设为团队领导人' : '取消团队领导人'
+        this.$confirm(`Are you sure you want to【${groupTip}】?`, 'Hint', {//`确定要对所选会员【${groupTip}】吗?`, '提示'
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           let selectedIds = []
@@ -425,15 +425,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 declaration Center' : 'Cancel entry Center'//'设为报单中心' : '取消报单中心'
+          this.$confirm(`Are you sure you want to【${isDecTip}】?`, 'Hint', {//确定要对所选会员【${isDecTip}】吗?`, '提示'
+              confirmButtonText: 'confirm',//确定
+              cancelButtonText: 'cancel',//取消
               type: 'warning'
           }).then(() => {
               let selectedIds = []
@@ -454,15 +454,15 @@
         handleIsStudioManage(isStudio) {
             if (this.multipleSelection.length < 1) {
                 this.$message({
-                    message: '请勾选要操作的会员',
+                    message: 'Please check the member to be operated',//请勾选要操作的会员
                     type: 'warning'
                 })
                 return
             }
-            let isStudioTip = isStudio === true ? '设为工作室' : '取消工作室'
-            this.$confirm(`确定要对所选会员【${isStudioTip}】吗?`, '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+            let isStudioTip = isStudio === true ? 'Set as studio' : 'Cancel room'//'设为工作室' : '取消工作室'
+            this.$confirm(`Are you sure you want to【${isStudioTip}】?`, 'Hint', {
+                confirmButtonText: 'confirm',//确定
+                cancelButtonText: 'cancel',//取消
                 type: 'warning'
             }).then(() => {
                 let selectedIds = []
@@ -483,15 +483,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 ? 'Display Atlas' : 'Hidden Atlas'//'显示图谱' : '隐藏图谱'
+            this.$confirm(`Are you sure you want to【${isAtlasTip}】?`, 'Hint', {//`确定要对所选会员【${isAtlasTip}】吗?`, '提示'
+                confirmButtonText: 'confirm',//确定
+                cancelButtonText: 'cancel',//取消
                 type: 'warning'
             }).then(() => {
                 let selectedIds = []
@@ -512,15 +512,15 @@
         handleIsRechargeManage(isRecharge) {
             if (this.multipleSelection.length < 1) {
                 this.$message({
-                    message: '请勾选要操作的会员',
+                    message: 'Please check the member to be operated',//请勾选要操作的会员
                     type: 'warning'
                 })
                 return
             }
-            let isRechargeTip = isRecharge === true ? '显示充值' : '隐藏充值'
-            this.$confirm(`确定要对所选会员【${isRechargeTip}】吗?`, '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+            let isRechargeTip = isRecharge === true ? 'Display recharge' : 'Hide recharge'// '显示充值' : '隐藏充值'
+            this.$confirm(`Are you sure you want to【${isRechargeTip}】?`, 'Hint', {//`确定要对所选会员【${isRechargeTip}】吗?`, '提示'
+                confirmButtonText: 'confirm',//确定
+                cancelButtonText: 'cancel',//取消
                 type: 'warning'
             }).then(() => {
                 let selectedIds = []
@@ -541,15 +541,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 ''
         }
@@ -558,13 +558,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;
@@ -572,27 +572,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
       },
@@ -662,9 +662,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)
@@ -684,13 +684,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;
@@ -698,27 +698,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 member',//按照地区关闭报单无需勾选会员
             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
       },

+ 38 - 38
backendEle/src/views/user/user-add-opt.vue

@@ -2,46 +2,46 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-tabs v-model="tabActiveName">
-        <el-tab-pane label="手动添加" name="first" v-if="permission.hasPermission(`user/user-add`)">
+        <el-tab-pane label="Add manually" name="first" v-if="permission.hasPermission(`user/user-add`)"><!-- 手动添加 -->
           <el-form ref="form" :model="form" label-width="250px" class="form-page">
 
-            <div class="hr-tip"><span>账号信息</span></div>
+            <div class="hr-tip"><span>account information<!-- 账号信息 --></span></div>
 
             <el-form-item>
               <template slot="label">
                 <span class="text-danger">*</span>
-                会员编号
+                Member code<!-- 会员编号 -->
               </template>
               <el-input v-model="form.userName"></el-input>
             </el-form-item>
             <el-form-item>
               <template slot="label">
                 <span class="text-danger">*</span>
-                实时报单级别
+                Real time declaration level<!-- 实时报单级别 -->
               </template>
-              <el-select v-model="form.decLv" placeholder="请选择报单级别">
+              <el-select v-model="form.decLv" placeholder="Please select the entry level"><!-- 请选择报单级别 -->
                 <el-option v-for="(item,index) in allDecLevel" :key="index" :label="item.LEVEL_NAME"
                            :value="item.ID"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="是否报单中心">
+            <el-form-item label="Declaration center or not"><!-- 是否报单中心 -->
               <el-switch v-model="form.isDec"></el-switch>
             </el-form-item>
-            <el-form-item label="报单中心级别" v-show="form.isDec">
-              <el-select v-model="form.decRoleId" placeholder="请选择报单中心级别">
+            <el-form-item label="Entry center level" v-show="form.isDec"><!-- 报单中心级别 -->
+              <el-select v-model="form.decRoleId" placeholder="Please select the entry center level"><!-- 请选择报单中心级别 -->
                 <el-option v-for="(item,index) in allDecRole" :key="index" :label="item.ROLE_NAME"
                            :value="item.ID"></el-option>
               </el-select>
             </el-form-item>
 
-            <div class="hr-tip"><span>网络信息</span></div>
+            <div class="hr-tip"><span>network information<!-- 网络信息 --></span></div>
 
             <el-form-item>
               <template slot="label">
                 <span class="text-danger">*</span>
-                报单中心编号
+                Entry Center No<!-- 报单中心编号 -->
               </template>
-              <el-tooltip class="item" effect="dark" content="输入编号后点击空白处,可检测该编号的会员姓名" placement="top-start">
+              <el-tooltip class="item" effect="dark" content="After entering the number, click the blank space to detect the member name of the number" placement="top-start"><!-- 输入编号后点击空白处,可检测该编号的会员姓名 -->
                 <el-input v-model="form.decUserName" @change="handleChkDecUser">
                   <template slot="append">【{{decRealName}}】</template>
                 </el-input>
@@ -50,7 +50,7 @@
             <el-form-item>
               <template slot="label">
                 <span class="text-danger">*</span>
-                接点人
+                Contact person<!-- 接点人 -->
               </template>
               <el-input v-model="form.conUserName" @change="handleChkConUser">
                 <template slot="append">【{{conRealName}}】</template>
@@ -59,55 +59,55 @@
             <el-form-item>
               <template slot="label">
                 <span class="text-danger">*</span>
-                安置区位
+                Resettlement location<!-- 安置区位 -->
               </template>
               <el-radio-group v-model="form.location">
-                <el-radio-button :label="1">左区</el-radio-button>
-                <el-radio-button :label="2">中区</el-radio-button>
-                <el-radio-button :label="3">右区</el-radio-button>
+                <el-radio-button :label="1">left<!-- 左区 --></el-radio-button>
+                <el-radio-button :label="2">right<!-- 中区 --></el-radio-button>
+              <!--  <el-radio-button :label="3">右区</el-radio-button> -->
               </el-radio-group>
             </el-form-item>
             <el-form-item>
               <template slot="label">
                 <span class="text-danger">*</span>
-                开拓人
+                Pioneer<!-- 开拓人 -->
               </template>
               <el-input v-model="form.recUserName" @change="handleChkRecUser">
                 <template slot="append">【{{recRealName}}】</template>
               </el-input>
             </el-form-item>
 
-            <div class="hr-tip"><span>个人资料</span></div>
+            <div class="hr-tip"><span>personal data<!-- 个人资料 --></span></div>
 
             <el-form-item>
               <template slot="label">
                 <span class="text-danger">*</span>
-                会员姓名
+                Member name<!-- 会员姓名 -->
               </template>
               <el-input v-model="form.realName"></el-input>
             </el-form-item>
             <el-form-item>
               <template slot="label">
                 <span class="text-danger">*</span>
-                身份证号
+                ID<!-- 身份证号 -->
               </template>
               <el-input v-model="form.idCard" maxlength="18" @change="handleChkBirth"></el-input>
             </el-form-item>
             <el-form-item>
               <template slot="label">
-                身份证地址
+                ID card address<!-- 身份证地址 -->
               </template>
               <el-input v-model="form.address"></el-input>
             </el-form-item>
             <el-form-item>
               <template slot="label">
-                手机号
+                phone number<!-- 手机号 -->
               </template>
               <el-input v-model="form.mobile" maxlength="11"></el-input>
             </el-form-item>
             <el-form-item prop="areaSelected">
               <template slot="label">
-                常用地区
+                Common areas<!-- 常用地区 -->
               </template>
               <el-cascader
                   size="large"
@@ -116,45 +116,45 @@
               </el-cascader>
             </el-form-item>
             <el-collapse style="margin-bottom: 20px;">
-              <el-collapse-item title="其他信息" name="1">
-                <el-form-item label="生日" v-show="false">
+              <el-collapse-item title="Other information" name="1"><!-- 其他信息 -->
+                <el-form-item label="birthday" v-show="false"><!-- 生日 -->
                   <el-date-picker
                       v-model="form.birthday"
                       type="date"
-                      placeholder="根据身份证获取" :readonly="true">
+                      placeholder="Obtained according to ID card" :readonly="true"><!-- 根据身份证获取 -->
                   </el-date-picker>
                 </el-form-item>
 
-                <el-form-item label="备用手机号" v-show="false">
+                <el-form-item label="Alternate mobile number" v-show="false"><!-- 备用手机号 -->
                   <el-input v-model="form.tel" maxlength="11"></el-input>
                 </el-form-item>
 
-                <div class="hr-tip"><span>银行信息</span></div>
+                <div class="hr-tip"><span>Bank information<!-- 银行信息 --></span></div>
 
-                <el-form-item label="开户行">
-                  <el-select v-model="form.openBank" placeholder="请选择开户行">
+                <el-form-item label="Bank of deposit"><!-- 开户行 -->
+                  <el-select v-model="form.openBank" placeholder="Please select the Bank of deposit"><!-- 请选择开户行 -->
                     <el-option v-for="(item,index) in allOpenBank" :key="index" :label="item.BANK_NAME"
                                :value="item.BANK_CODE"></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="银行所在地区" prop="bankAreaSelected">
+                <el-form-item label="Bank region" prop="bankAreaSelected"><!-- 银行所在地区 -->
                   <el-cascader
                       size="large"
                       :options="regionData"
                       v-model="form.bankAreaSelected">
                   </el-cascader>
                 </el-form-item>
-                <el-form-item label="开户支行">
+                <el-form-item label="Account opening sub branch"><!-- 开户支行 -->
                   <el-input v-model="form.bankAddress"></el-input>
                 </el-form-item>
-                <el-form-item label="银行账号">
+                <el-form-item label="bank account"><!-- 银行账号 -->
                   <el-input v-model="form.bankNo" maxlength="19"></el-input>
                 </el-form-item>
 
               </el-collapse-item>
             </el-collapse>
             <el-form-item>
-              <el-button type="primary" @click="onSubmit" :loading="submitButtonStat">保存</el-button>
+              <el-button type="primary" @click="onSubmit" :loading="submitButtonStat">SAVE<!-- 保存 --></el-button>
             </el-form-item>
           </el-form>
         </el-tab-pane>
@@ -276,7 +276,7 @@
     methods: {
       getData() {
         this.$message({
-          message: '正在获取数据,请稍后',
+          message: 'Getting data, please wait',//正在获取数据,请稍后
         })
         if (permission.hasPermission(`user/user-del`)) {
           this.tabActiveName = 'third'
@@ -377,9 +377,9 @@
       },
       onDel() {
         let _this = this
-        _this.$confirm('确定要删除该会员?此操作不可撤销!', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        _this.$confirm('Are you sure you want to delete this member? This action cannot be undone!', 'Hint', {//'确定要删除该会员?此操作不可撤销!', '提示',
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           _this._handleDel()

+ 45 - 45
common/models/forms/AdminAddUserForm.php

@@ -101,26 +101,26 @@ class AdminAddUserForm extends Model {
 
     public function attributeLabels() {
         return [
-            'userName' => '会员编号',
-            'nation' => '民族',
-            'realName' => '会员姓名',
-            'idCard' => '身份证号',
-            'mobile' => '手机号',
-            'address' => '地址',
-            'openBank' => '开户行',
-            'bankAddress' => '开户支行',
-            'bankNo' => '银行账号',
-            'bankAreaSelected' => '银行地区',
-            'decLv' => '实时报单级别',
-            'areaSelected' => '所在地区',
-            'tel' => '电话',
-            'isDec' => '是否报单中心',
-            'decUserName' => '报单中心编号',
-            'birthday' => '生日',
-            'decRoleId' => '报单中心级别',
-            'conUserName' => '接点人会员编号',
-            'recUserName' => '开拓人会员编号',
-            'location' => '安置区域',
+            'userName' => 'Member code',//会员编号
+            'nation' => 'nation',//民族
+            'realName' => 'Member name',//会员姓名
+            'idCard' => 'ID',//身份证号
+            'mobile' => 'phone number',//手机号
+            'address' => 'address',//地址
+            'openBank' => 'Bank of deposit',//开户行
+            'bankAddress' => 'Account opening sub branch',//开户支行
+            'bankNo' => 'bank account',//银行账号
+            'bankAreaSelected' => 'Banking region',//银行地区
+            'decLv' => 'Real time declaration level',//实时报单级别
+            'areaSelected' => 'Location',//所在地区
+            'tel' => 'Telephone',//电话
+            'isDec' => 'Declaration center or not',//是否报单中心
+            'decUserName' => 'Entry Center No',//报单中心编号
+            'birthday' => 'birthday',//生日
+            'decRoleId' => 'Entry center level',//报单中心级别
+            'conUserName' => 'Contact person Member No',//接点人会员编号
+            'recUserName' => 'Pioneer Member No',
+            'location' => 'Resettlement area',//安置区域
         ];
     }
 
@@ -130,7 +130,7 @@ class AdminAddUserForm extends Model {
      */
     public function issetDec($attribute) {
         if (!$decUser = User::find()->select('ID')->where('IS_DEC=1 AND USER_NAME=:USER_NAME', [':USER_NAME' => $this->decUserName])->asArray()->one()) {
-            $this->addError($attribute, '报单中心不存在');
+            $this->addError($attribute, 'Entry center does not exist');//报单中心不存在
         } else {
             $this->_decId = $decUser['ID'];
         }
@@ -142,13 +142,13 @@ class AdminAddUserForm extends Model {
      */
     public function issetDecRoleId($attribute) {
         if ($this->isDec && !$this->decRoleId) {
-            $this->addError($attribute, '报单中心级别不能为空');
+            $this->addError($attribute, 'Entry center level cannot be empty');//报单中心级别不能为空
         }
     }
 
     public function isLocation($attribute) {
         if (!in_array($this->location, ['1', '2', '3'])) {
-            $this->addError($attribute, '区位错误');
+            $this->addError($attribute, 'Location error');//区位错误
         }
     }
 
@@ -158,45 +158,45 @@ class AdminAddUserForm extends Model {
      */
     public function isDelUserName($attribute) {
         if (!$this->_delUserId = Info::getUserIdByUserName($this->delUserName)) {
-            $this->addError($attribute, '用户不存在');
+            $this->addError($attribute, 'user does not exist');//用户不存在
         }
         if (UserInfo::findOneAsArray('REC_UID=:REC_UID AND DELETED=0', [':REC_UID' => $this->_delUserId], 'USER_ID')) {
-            $this->addError($attribute, '此会员已开拓其它会员不可以删除');
+            $this->addError($attribute, 'This member has developed other members and cannot be deleted');//此会员已开拓其它会员不可以删除
         }
         if (UserInfo::findOneAsArray('CON_UID=:CON_UID AND DELETED=0', [':CON_UID' => $this->_delUserId], 'USER_ID')) {
-            $this->addError($attribute, '此会员已安置其它会员不可以删除');
+            $this->addError($attribute, 'This member has been placed with other members and cannot be deleted');//此会员已安置其它会员不可以删除
         }
         if (User::findOneAsArray('DEC_ID=:DEC_ID AND DELETED=0', [':DEC_ID' => $this->_delUserId], 'ID')) {
-            $this->addError($attribute, '此会员已报单其它会员不可以删除');
+            $this->addError($attribute, 'This member has submitted a bill and other members cannot delete it');//此会员已报单其它会员不可以删除
         }
         if (DecOrder::findOneAsArray('USER_ID=:TO_USER_ID OR TO_USER_ID=:TO_USER_ID', [':TO_USER_ID' => $this->_delUserId], 'ID')) {
-            $this->addError($attribute, '此会员已报单不可以删除');
+            $this->addError($attribute, 'This member has submitted a bill and cannot be deleted');//此会员已报单不可以删除
         }
         $info = Info::baseInfoWithNet($this->_delUserId);
         if ($info['REG_FROM'] == 1) {
-            $this->addError($attribute, '此会员不是空单无法删除');
+            $this->addError($attribute, 'This member is not empty and cannot be deleted');//此会员不是空单无法删除
         }
         $sentMaxPeriodNum = Period::sentMaxPeriodNum();
         if ($info['PERIOD_AT'] <= $sentMaxPeriodNum) {
-            $this->addError($attribute, '此会员加入期数小于等于已挂网期数');
+            $this->addError($attribute, 'The number of enrollment periods of this member is less than or equal to the number of online periods');//此会员加入期数小于等于已挂网期数
         }
         if (User::find()->where('ID=:ID AND VERIFIED=1', [':ID' => $this->_delUserId])->exists()) {
-            $this->addError($attribute, '此会员已实名认证无法删除');
+            $this->addError($attribute, 'This member has been authenticated by real name and cannot be deleted');//此会员已实名认证无法删除
         }
         if (User::find()->where('ID=:ID AND SUB_COM_LEADER=1', [':ID' => $this->_delUserId])->exists()) {
-            $this->addError($attribute, '此会员是分公司领导人无法删除');
+            $this->addError($attribute, 'This member is a branch leader and cannot be deleted');//此会员是分公司领导人无法删除
         }
         if (UserInfo::find()->where('USER_ID=:USER_ID AND (IS_GROUP_LEADER=1 OR IS_SYSTEM_LEADER=1 OR IS_BIND=1 OR IS_TEAM=1)', [':USER_ID' => $this->_delUserId])->exists()) {
-            $this->addError($attribute, '此会员存在以下情况无法删除,团队领导人/体系领导人/点位绑定/点位合作');
+            $this->addError($attribute, 'This member cannot be deleted due to the following conditions: Team Leader / system leader / point binding / point cooperation');//此会员存在以下情况无法删除,团队领导人/体系领导人/点位绑定/点位合作
         }
         if (Balance::hasBonus($this->_delUserId)) {
-            $this->addError($attribute, '此会员有余额无法删除');
+            $this->addError($attribute, 'This member has balance and cannot be deleted');//此会员有余额无法删除
         }
         if (FlowBonus::findOneAsArray('USER_ID=:USER_ID', [':USER_ID' => $this->_delUserId], 'ID')) {
-            $this->addError($attribute, '该会员产生过余额流水无法删除');
+            $this->addError($attribute, 'This member has generated a balance flow, which cannot be deleted');//该会员产生过余额流水无法删除
         }
         if (UserMove::findOneAsArray('USER_ID=:USER_ID', [':USER_ID' => $this->_delUserId], 'ID')) {
-            $this->addError($attribute, '该会员发生过移网无法删除');
+            $this->addError($attribute, 'The member cannot be deleted due to network migration');//该会员发生过移网无法删除
         }
     }
 
@@ -224,8 +224,8 @@ class AdminAddUserForm extends Model {
             $user->REAL_NAME = $this->realName;
             $user->ID_CARD = $this->idCard;
             $user->MOBILE = $this->mobile;
-            $user->ADDRESS = '无';
-            $user->ADDRESS = $this->address ? $this->address : '无';
+            $user->ADDRESS = 'nothing';//无
+            $user->ADDRESS = $this->address ? $this->address : 'nothing';//无
             $user->OPEN_BANK = $this->openBank;
             $user->BANK_ADDRESS = $this->bankAddress;
             $user->BANK_NO = $this->bankNo;
@@ -287,7 +287,7 @@ class AdminAddUserForm extends Model {
         $this->adminOperateLogger->saveAfterContent=array_merge($userData,$infoData);
 
         $this->adminOperateLogger->clean()->save([
-            'optType' => '空单录入',
+            'optType' => 'Blank document entry',//空单录入
             'userId' => $user->ID,
             'userName' => $user->USER_NAME,
         ]);
@@ -335,22 +335,22 @@ class AdminAddUserForm extends Model {
             $userInfo = UserInfo::findOneAsArray('USER_ID=:USER_ID', [':USER_ID'=>$this->_delUserId]);
             // 调整上级会员的CON_NUM和REC_NUM
             if(!UserInfo::updateAllCounters(['CON_NUM'=> -1], "USER_ID=:USER_ID", [':USER_ID'=>$userInfo['CON_UID']])){
-                throw new Exception('减少上级会员接点数量失败');
+                throw new Exception('Failed to reduce the number of superior member contacts');//减少上级会员接点数量失败
             }
             if(!UserInfo::updateAllCounters(['REC_NUM'=> -1], "USER_ID=:USER_ID", [':USER_ID'=>$userInfo['REC_UID']])){
-                throw new Exception('减少开拓人推荐数量失败');
+                throw new Exception('Failed to reduce the number of recommended pioneers');//减少开拓人推荐数量失败
             }
             // 删除会员信息
             if(!UserInfo::deleteAll('USER_ID=:USER_ID', [':USER_ID' => $this->_delUserId])){
-                throw new Exception('删除会员信息失败');
+                throw new Exception('Failed to delete member information');//删除会员信息失败
             }
             //删除安置
             if(!UserNetwork::deleteAll('USER_ID=:USER_ID', [':USER_ID' => $this->_delUserId])){
-                throw new Exception('删除会员安置数据失败');
+                throw new Exception('Failed to delete member placement data');//删除会员安置数据失败
             }
             //删除开拓
             if(!UserRelation::deleteAll('USER_ID=:USER_ID', [':USER_ID' => $this->_delUserId])){
-                throw new Exception('删除会员开拓数据失败');
+                throw new Exception('Failed to delete member development data');//删除会员开拓数据失败
             }
             //删除点位绑定
             UserBind::deleteAll('USER_ID=:USER_ID', [':USER_ID' => $this->_delUserId]);
@@ -366,7 +366,7 @@ class AdminAddUserForm extends Model {
         }
 
         $this->adminOperateLogger->clean()->save([
-            'optType' => '删除空单会员',
+            'optType' => 'Delete empty member',//删除空单会员
         ]);
         return $this->_delUserId;
     }

+ 1 - 1
frontendApi/modules/v1/controllers/UserController.php

@@ -437,7 +437,7 @@ class UserController extends BaseController {
             $userInfo['isLocation'] = '('.implode(',',$isLocation).')';
             return static::notice($userInfo);
         }else{
-            return static::notice('会员编号不存在', 400);
+            return static::notice('Member number does not exist', 400);//会员编号不存在
         }
     }