From 8a2e77687f920dae3b3dec6baaf344ddfceb3ad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=98=B1=E8=BE=BE?= Date: Thu, 14 Aug 2025 15:25:51 +0800 Subject: [PATCH] =?UTF-8?q?feat(system):=20=E5=AE=9E=E7=8E=B0=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=97=B6=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E5=8A=9F?= =?UTF-8?q?=E8=83=BD-=20=E6=96=B0=E5=A2=9E=20externalUpdatePassword=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=94=A8=E4=BA=8E=E7=99=BB=E5=BD=95=E6=97=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81-=20=E4=BF=AE=E6=94=B9=20Re?= =?UTF-8?q?setPasswordDialog=20=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=99=BB=E5=BD=95=E6=97=B6=E5=92=8C=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E4=B8=8D=E5=90=8C=E4=BF=AE=E6=94=B9=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E6=B5=81=E7=A8=8B-=E4=BC=98=E5=8C=96=20login=20?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=AF=86=E7=A0=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A4=84=E7=90=86=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E7=9A=84=E6=83=85=E5=86=B5-=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20rule=20=E6=8E=A5=E5=8F=A3=E5=92=8C?= =?UTF-8?q?=E8=A7=84=E5=88=99=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/generatedApi/system.js | 9 ++ src/api/riskCheck/rule.js | 2 +- src/store/modules/user.js | 7 + src/views/app/login/index.vue | 14 +- .../employRule/components/RuleEditDialog.vue | 4 +- .../employRule/index.vue | 48 +++++++ .../user/components/ResetPasswordDialog.vue | 120 +++++++++++------- 7 files changed, 152 insertions(+), 52 deletions(-) diff --git a/src/api/generatedApi/system.js b/src/api/generatedApi/system.js index 10e3167..5e87406 100644 --- a/src/api/generatedApi/system.js +++ b/src/api/generatedApi/system.js @@ -66,6 +66,15 @@ export function updatePassword(data) { back: true }) } + +export function externalUpdatePassword(data) { + return request({ + url: getUrl(`/sysUserEx/externalUpdatePassword`), + method: 'post', + data + // back: true + }) +} export function verifyUpdatePassword(data) { return request({ url: getUrl(`/sysUserEx/verifyUpdatePassword`), diff --git a/src/api/riskCheck/rule.js b/src/api/riskCheck/rule.js index e3c5db1..3a1bdf4 100644 --- a/src/api/riskCheck/rule.js +++ b/src/api/riskCheck/rule.js @@ -4,7 +4,7 @@ import getUrl from '@/assets/js/utils/get-url' // 分页查询 export function getRulePage(data) { return request({ - url: getUrl('/risk/check/rule/page'), + url: getUrl('/riskCheckRuleEx/page'), method: 'post', data }) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 27731e4..4fd0540 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -70,6 +70,13 @@ const actions = { message: res.content.resultMessage }) break + case 51004: + // 需要验证码 + resolve({ + ...res.content, + code: numberResult + }) + break default: reject(res.content) break diff --git a/src/views/app/login/index.vue b/src/views/app/login/index.vue index 8964655..e89eeee 100644 --- a/src/views/app/login/index.vue +++ b/src/views/app/login/index.vue @@ -121,6 +121,8 @@ @@ -299,11 +301,13 @@ export default { this.$store .dispatch('user/login', this.loginForm) .then(res => { - if (res.code === 0) { - sessionStorage.setItem( - 'tipMessage', - res.content.resultEnMessage ? res.content.resultEnMessage : '' - ) + if (res.code === 0 || res.code === 51004) { + if (res.code === 51004) { + sessionStorage.setItem( + 'tipMessage', + res.content.resultMessage ? res.content.resultMessage : '' + ) + } this.$router.push({ path: '/home' }) this.loading = false return diff --git a/src/views/applicationManagement/employRule/components/RuleEditDialog.vue b/src/views/applicationManagement/employRule/components/RuleEditDialog.vue index ac41bc6..2b98689 100644 --- a/src/views/applicationManagement/employRule/components/RuleEditDialog.vue +++ b/src/views/applicationManagement/employRule/components/RuleEditDialog.vue @@ -183,9 +183,9 @@ export default { { required: true, message: '请输入规则描述', trigger: 'blur' }, { min: 1, - max: 300, + max: 1000, message: - '规则描述支持录入汉字、大写字母、小写字母、数字、符号，不超过300个字，请重新输入', + '规则描述支持录入汉字、大写字母、小写字母、数字、符号，不超过1000个字，请重新输入', trigger: 'blur' } ], diff --git a/src/views/applicationManagement/employRule/index.vue b/src/views/applicationManagement/employRule/index.vue index c358759..0c3ce6a 100644 --- a/src/views/applicationManagement/employRule/index.vue +++ b/src/views/applicationManagement/employRule/index.vue @@ -501,6 +501,54 @@ export default { }, { prop: 'ruleDesc', key: '规则描述' }, { prop: 'riskScript', key: '风险提示话术' }, + { + prop: 'hitCount', + key: '触发次数', + render: (h, params) => { + return h( + 'el-tag', + { + props: { + type: 'info', + size: 'small' + } + }, + params.row.hitCount ? params.row.hitCount + '次' : '0次' + ) + } + }, + { + prop: 'approvedCount', + key: '审批通过次数', + render: (h, params) => { + return h( + 'el-tag', + { + props: { + type: 'success', + size: 'small' + } + }, + params.row.approvedCount ? params.row.approvedCount + '次' : '0次' + ) + } + }, + { + prop: 'refusedCount', + key: '审批不通过次数', + render: (h, params) => { + return h( + 'el-tag', + { + props: { + type: 'danger', + size: 'small' + } + }, + params.row.refusedCount ? params.row.refusedCount + '次' : '0次' + ) + } + }, { prop: 'ruleStatus', key: '规则状态', diff --git a/src/views/system/user/components/ResetPasswordDialog.vue b/src/views/system/user/components/ResetPasswordDialog.vue index 7b69f85..5f7ec06 100644 --- a/src/views/system/user/components/ResetPasswordDialog.vue +++ b/src/views/system/user/components/ResetPasswordDialog.vue @@ -59,14 +59,18 @@