From 04d121367a26e95332c87527e73d7568a0f7cae4 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Wed, 13 Apr 2022 20:45:23 +0800 Subject: [PATCH] no message --- app/Http/Controllers/Api/SystemController.php | 2 +- app/Http/Controllers/Api/UsersController.php | 27 +++++++++---- app/Models/File.php | 4 ++ app/Models/User.php | 2 +- app/Module/Base.php | 2 +- resources/assets/js/pages/index.vue | 4 +- .../manage/components/ProjectManagement.vue | 2 +- .../manage/components/TeamManagement.vue | 39 ++++++++++++++----- .../setting/components/SystemEmailSetting.vue | 4 +- .../assets/js/pages/single/validEmail.vue | 2 +- 10 files changed, 63 insertions(+), 25 deletions(-) diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php index 13d7e4c95..afca635bd 100755 --- a/app/Http/Controllers/Api/SystemController.php +++ b/app/Http/Controllers/Api/SystemController.php @@ -146,7 +146,7 @@ class SystemController extends AbstractController } /** - * @api {get} api/system/demo 03. 获取演示账号 + * @api {get} api/system/demo 03. 获取演示帐号 * * @apiVersion 1.0.0 * @apiGroup system diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 40b9fc26c..61830c8da 100755 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -3,9 +3,6 @@ namespace App\Http\Controllers\Api; use App\Models\AbstractModel; -use App\Models\File; -use App\Models\ProjectTaskUser; -use App\Models\ProjectUser; use App\Models\User; use App\Models\UserEmailVerification; use App\Models\UserTransfer; @@ -84,10 +81,10 @@ class UsersController extends AbstractController }; $user = User::whereEmail($email)->first(); if (empty($user)) { - return $retError('账号或密码错误'); + return $retError('帐号或密码错误'); } if ($user->password != Base::md52($password, $user->encrypt)) { - return $retError('账号或密码错误'); + return $retError('帐号或密码错误'); } // if (in_array('disable', $user->identity)) { @@ -436,7 +433,15 @@ class UsersController extends AbstractController * - keys.nickname 昵称 * - keys.profession 职位 * - keys.identity 身份（如：admin、noadmin） - * - keys.email_verity 邮箱是否认证（如：yes、no） + * - keys.disable 是否离职 + * - yes: 仅离职 + * - all: 全部 + * - 其他值: 仅在职（默认） + * - keys.email_verity 邮箱是否认证 + * - yes: 已认证 + * - no: 未认证 + * - 其他值: 全部（默认） + * * @apiParam {Number} [page] 当前页，默认:1 * @apiParam {Number} [pagesize] 每页显示数量，默认:20，最大:50 * @@ -480,11 +485,18 @@ class UsersController extends AbstractController $builder->where("identity", "like", "%,{$keys['identity']},%"); } } + if ($keys['disable'] === 'yes') { + $builder->whereNotNull('disable_at'); + } elseif ($keys['disable'] !== 'all') { + $builder->whereNull('disable_at'); + } if ($keys['email_verity'] === 'yes') { $builder->whereEmailVerity(1); } elseif ($keys['email_verity'] === 'no') { $builder->whereEmailVerity(0); } + } else { + $builder->whereNull('disable_at'); } $list = $builder->orderByDesc('userid')->paginate(Base::getPaginate(50, 20)); // @@ -546,7 +558,8 @@ class UsersController extends AbstractController $upArray['identity'] = array_diff($userInfo->identity, ['disable']); $upArray['identity'][] = 'disable'; $upArray['disable_at'] = Carbon::parse($data['disable_time']); - $transferUser = User::find(intval($data['transfer_userid'])); + $transferUserid = is_array($data['transfer_userid']) ? $data['transfer_userid'][0] : $data['transfer_userid']; + $transferUser = User::find(intval($transferUserid)); if (empty($transferUser)) { return Base::retError('请选择正确的交接人'); } diff --git a/app/Models/File.php b/app/Models/File.php index 0bf004d0a..207d47ca1 100644 --- a/app/Models/File.php +++ b/app/Models/File.php @@ -414,6 +414,10 @@ class File extends AbstractModel */ public static function transfer($originalUserid, $newUserid) { + if (!self::whereUserid($originalUserid)->exists()) { + return; + } + // 创建一个文件夹存放移交的文件 $name = User::userid2nickname($originalUserid) ?: ('ID:' . $originalUserid); $file = File::createInstance([ diff --git a/app/Models/User.php b/app/Models/User.php index ad54796cf..4164cd603 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -200,7 +200,7 @@ class User extends AbstractModel $user = self::whereUserid(User::email2userid($email))->first(); if ($isRegVerify && $user->email_verity === 0) { UserEmailVerification::userEmailSend($user); - throw new ApiException('您的账号已注册过，请验证邮箱', ['code' => 'email']); + throw new ApiException('您的帐号已注册过，请验证邮箱', ['code' => 'email']); } throw new ApiException('邮箱地址已存在'); } diff --git a/app/Module/Base.php b/app/Module/Base.php index bab4628bd..2c3644c12 100755 --- a/app/Module/Base.php +++ b/app/Module/Base.php @@ -1632,7 +1632,7 @@ class Base } /** - * 用户名、邮箱、手机账号、银行卡号中间字符串以*隐藏 + * 用户名、邮箱、手机帐号、银行卡号中间字符串以*隐藏 * @param $str * @return string */ diff --git a/resources/assets/js/pages/index.vue b/resources/assets/js/pages/index.vue index d6e4335c1..9d7949d75 100644 --- a/resources/assets/js/pages/index.vue +++ b/resources/assets/js/pages/index.vue @@ -37,7 +37,7 @@ -
{{ $L("注册账号") }}
+
{{ $L("注册帐号") }}
{{ $L("登录") }}
@@ -47,7 +47,7 @@ {{ $L("登录") }} - {{ $L("注册账号") }} + {{ $L("注册帐号") }} diff --git a/resources/assets/js/pages/manage/components/ProjectManagement.vue b/resources/assets/js/pages/manage/components/ProjectManagement.vue index 7abcd8041..0a09e108b 100644 --- a/resources/assets/js/pages/manage/components/ProjectManagement.vue +++ b/resources/assets/js/pages/manage/components/ProjectManagement.vue @@ -21,7 +21,7 @@ {{$L("项目状态")}}
- diff --git a/resources/assets/js/pages/manage/components/TeamManagement.vue b/resources/assets/js/pages/manage/components/TeamManagement.vue index f3c6016b8..02d9090b9 100644 --- a/resources/assets/js/pages/manage/components/TeamManagement.vue +++ b/resources/assets/js/pages/manage/components/TeamManagement.vue @@ -21,7 +21,7 @@ {{$L("身份")}}
- @@ -33,7 +33,7 @@ {{$L("在职状态")}}
- @@ -45,7 +45,7 @@ {{$L("邮箱认证")}}
- @@ -94,7 +94,7 @@ class="operate-left" :title="$L('操作离职')">
- {{$L(`正在进行帐号【ID:${disableData.userid}，${disableData.nickname}】离职操作。`)}} + {{$L(`正在进行帐号【ID:${disableData.userid}，${disableData.nickname}】离职操作。`)}}
- + +
+

{{$L('注意：离职操作不可逆！')}}

+
+ +
@@ -299,7 +309,7 @@ export default { style: { color: '#f90' } - }, [h('div', this.$L('恢复身份（已离职）'))])); + }, [h('div', this.$L('恢复帐号（已离职）'))])); } else { dropdownItems.push(h('EDropdownItem', { props: { @@ -454,20 +464,31 @@ export default { operationUser(data) { return new Promise((resolve) => { - this.loadIng++; + if (data.type == 'setdisable') { + this.disableLoading++; + } else { + this.loadIng++; + } this.$store.dispatch("call", { url: 'users/operation', data, }).then(({msg}) => { $A.messageSuccess(msg); - this.loadIng--; this.getLists(); resolve() + if (data.type == 'setdisable') { + this.disableShow = false; + } }).catch(({msg}) => { $A.modalError(msg, 301); - this.loadIng--; this.getLists(); resolve() + }).finally(_ => { + if (data.type == 'setdisable') { + this.disableLoading--; + } else { + this.loadIng--; + } }) }) } diff --git a/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue b/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue index 7b2a628b3..6bcec37d7 100644 --- a/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue +++ b/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue @@ -9,7 +9,7 @@ - + @@ -29,7 +29,7 @@ {{ $L('开启') }} {{ $L('关闭') }} -
{{$L('开启后账号需验证通过才可登录')}}
+
{{$L('开启后帐号需验证通过才可登录')}}
 diff --git a/resources/assets/js/pages/single/validEmail.vue b/resources/assets/js/pages/single/validEmail.vue index 38b8bdecd..a7578d1c6 100644 --- a/resources/assets/js/pages/single/validEmail.vue +++ b/resources/assets/js/pages/single/validEmail.vue @@ -5,7 +5,7 @@

{{$L('您的邮箱已通过验证')}}

-

{{$L('今后您可以通过此邮箱重置您的账号密码')}}

+

{{$L('今后您可以通过此邮箱重置您的帐号密码')}}

{{errorText}}