Browse Source

新增注册与密码修改功能

hetong_dev
zhouhaibin 2 days ago
parent
commit
46d9d26885
  1. 2
      public/configs/contractTaskConfigs.json
  2. 45
      src/api/auth/index.ts
  3. 150
      src/views/auth/login/ForgetPasswordForm.vue
  4. 4
      src/views/auth/login/LoginForm.vue
  5. 117
      src/views/auth/login/RegisterForm.vue
  6. 4
      src/views/auth/login/useLogin.ts
  7. 4
      src/views/tenderReview/TenderTask/TenderTask.data.ts
  8. 2
      src/views/tenderReview/TenderTask/index.vue

2
public/configs/contractTaskConfigs.json

@ -89,7 +89,7 @@
"dataType": "json",
"displayType": "markdown",
"jsonConfig": {
"extractFields": ["review_points"],
"extractFields": ["relevant_articles"],
"separator": ":",
"fieldProcessors": {
"review_points": "arrayJoin"

45
src/api/auth/index.ts

@ -13,6 +13,8 @@ import { useGlobSetting } from '@/hooks/setting';
enum Api {
Login = '/auth/login',
Logout = '/auth/logout',
Register = '/auth/register',
ResetPassword = '/auth/resetPassword',
TenantList = '/auth/tenant/list',
authBinding = '/auth/binding',
authUnbinding = '/auth/unlock',
@ -88,6 +90,49 @@ export function authCallback(data: OAuthLoginParams) {
return defHttp.post<void>({ url: Api.authCallback, data });
}
/**
*
* @param params
* @returns
*/
export function registerApi(params: {
username: string;
password: string;
mobile: string;
code: string;
uuid?: string;
tenantId?: string;
userType?: string;
}) {
return defHttp.post<void>({
url: Api.Register,
data: params,
}, {
encrypt: true,
});
}
/**
*
* @param params
* @returns
*/
export function resetPasswordApi(params: {
username: string;
password: string;
mobile: string;
code: string;
uuid?: string;
tenantId?: string;
}) {
return defHttp.post<void>({
url: Api.ResetPassword,
data: params,
}, {
encrypt: true,
});
}
/**
*
* @returns

150
src/views/auth/login/ForgetPasswordForm.vue

@ -2,6 +2,17 @@
<template v-if="getShow">
<LoginFormTitle class="enter-x" />
<Form class="p-4 enter-x" :model="formData" :rules="getFormRules" ref="formRef">
<FormItem name="tenantId" class="enter-x" v-if="tenant.tenantEnabled">
<Select v-model:value="formData.tenantId" size="large" @change="handleTenantChange">
<template #suffixIcon>
<Icon icon="mdi:company" />
</template>
<SelectOption v-for="item in tenant.voList" :key="item.tenantId" :value="item.tenantId">{{
item.companyName
}}</SelectOption>
</Select>
</FormItem>
<FormItem name="account" class="enter-x">
<Input
size="large"
@ -18,14 +29,31 @@
size="large"
v-model:value="formData.sms"
:placeholder="t('sys.login.smsCode')"
:sendCodeApi="handleSendSmsCode"
/>
</FormItem>
<FormItem name="password" class="enter-x">
<StrengthMeter
size="large"
v-model:value="formData.password"
:placeholder="t('sys.login.password')"
/>
</FormItem>
<FormItem name="confirmPassword" class="enter-x">
<InputPassword
size="large"
visibilityToggle
v-model:value="formData.confirmPassword"
:placeholder="t('sys.login.confirmPassword')"
/>
</FormItem>
<FormItem class="enter-x">
<Button type="primary" size="large" block @click="handleReset" :loading="loading">
<Button type="primary" size="large" block class="enter-x" @click="handleReset" :loading="loading">
{{ t('common.resetText') }}
</Button>
<Button size="large" block class="mt-4" @click="handleBackLogin">
<Button size="large" block class="mt-4 enter-x" @click="handleBackLogin">
{{ t('sys.login.backSignIn') }}
</Button>
</FormItem>
@ -33,32 +61,136 @@
</template>
</template>
<script lang="ts" setup>
import { reactive, ref, computed, unref } from 'vue';
import { reactive, ref, computed, unref, onMounted } from 'vue';
import { message } from 'ant-design-vue';
import LoginFormTitle from './LoginFormTitle.vue';
import { Form, Input, Button } from 'ant-design-vue';
import { Form, Input, Button, Select, SelectOption } from 'ant-design-vue';
import { CountdownInput } from '@/components/CountDown';
import { StrengthMeter } from '@/components/StrengthMeter';
import { useI18n } from '@/hooks/web/useI18n';
import { useLoginState, useFormRules, LoginStateEnum } from './useLogin';
import { useLoginState, useFormRules, useFormValid, LoginStateEnum } from './useLogin';
import { sendSmsCode } from '@/api/auth/captcha';
import { resetPasswordApi, tenantList } from '@/api/auth';
import { TenantResp } from '@/api/auth/model';
import { useLocalStorage } from '@vueuse/core';
import { SelectValue } from 'ant-design-vue/es/select';
import Icon from '@/components/Icon/Icon.vue';
const FormItem = Form.Item;
const InputPassword = Input.Password;
const { t } = useI18n();
const { handleBackLogin, getLoginState } = useLoginState();
const { getFormRules } = useFormRules();
const formRef = ref();
const loading = ref(false);
// ID
const defaultTenantId = '000000';
const localTenantId = useLocalStorage('tenantId', defaultTenantId);
const formData = reactive({
account: '',
mobile: '',
sms: '',
password: '',
confirmPassword: '',
tenantId: defaultTenantId,
});
//
const tenant = reactive<TenantResp & { loadSuccess: boolean }>({
tenantEnabled: false,
voList: [],
loadSuccess: false,
});
const { getFormRules } = useFormRules(formData);
const { validForm } = useFormValid(formRef);
const getShow = computed(() => unref(getLoginState) === LoginStateEnum.RESET_PASSWORD);
//
function handleTenantChange(tenantId: SelectValue) {
localTenantId.value = tenantId as string;
}
//
async function tenantSelectInit() {
try {
const ret = await tenantList();
const { tenantEnabled, voList } = ret;
if (tenantEnabled) {
const currentTenantId = voList.length ? voList[0].tenantId : defaultTenantId;
formData.tenantId = currentTenantId;
localTenantId.value = currentTenantId;
}
Object.assign(tenant, ret);
tenant.loadSuccess = true;
} catch (e) {
console.error('租户选择异常');
tenant.loadSuccess = false;
}
}
//
const handleSendSmsCode = async (): Promise<boolean> => {
//
if (!formData.mobile) {
message.error('请先填写手机号码');
return false;
}
//
const mobileRegex = /^1[3-9]\d{9}$/;
if (!mobileRegex.test(formData.mobile)) {
message.error('请输入正确的手机号码');
return false;
}
try {
await sendSmsCode(formData.mobile);
message.success('验证码发送成功');
return true;
} catch (error) {
message.error('验证码发送失败,请重试');
return false;
}
};
async function handleReset() {
const form = unref(formRef);
if (!form) return;
await form.resetFields();
const data = await validForm();
if (!data) return;
//
if (formData.password !== formData.confirmPassword) {
message.error('两次输入的密码不一致');
return;
}
loading.value = true;
try {
const res = await resetPasswordApi({
username: formData.account,
password: formData.password,
mobile: formData.mobile,
code: formData.sms,
uuid: formData.mobile, // 使uuid
tenantId: formData.tenantId,
});
console.log(res);
message.success('密码重置成功!');
//
handleBackLogin();
} catch (error) {
console.error('密码重置失败:', error);
message.error('密码重置失败,请重试');
} finally {
loading.value = false;
}
}
onMounted(async () => {
//
await tenantSelectInit();
});
</script>

4
src/views/auth/login/LoginForm.vue

@ -57,7 +57,7 @@
<FormItem :style="{ 'text-align': 'right' }">
<!-- No logic, you need to deal with it yourself -->
<Button
:disabled="true"
:disabled="false"
type="link"
size="small"
@click="setLoginState(LoginStateEnum.RESET_PASSWORD)"
@ -95,7 +95,7 @@
</Button>
</ACol>
<ACol :md="8" :xs="24">
<Button block @click="setLoginState(LoginStateEnum.REGISTER)" disabled>
<Button block @click="setLoginState(LoginStateEnum.REGISTER)" >
{{ t('sys.login.registerButton') }}
</Button>
</ACol>

117
src/views/auth/login/RegisterForm.vue

@ -2,6 +2,17 @@
<div v-if="getShow">
<LoginFormTitle class="enter-x" />
<Form class="p-4 enter-x" :model="formData" :rules="getFormRules" ref="formRef">
<FormItem name="tenantId" class="enter-x" v-if="tenant.tenantEnabled">
<Select v-model:value="formData.tenantId" size="large" @change="handleTenantChange">
<template #suffixIcon>
<Icon icon="mdi:company" />
</template>
<SelectOption v-for="item in tenant.voList" :key="item.tenantId" :value="item.tenantId">{{
item.companyName
}}</SelectOption>
</Select>
</FormItem>
<FormItem name="account" class="enter-x">
<Input
class="fix-auto-fill"
@ -24,6 +35,7 @@
class="fix-auto-fill"
v-model:value="formData.sms"
:placeholder="t('sys.login.smsCode')"
:sendCodeApi="handleSendSmsCode"
/>
</FormItem>
<FormItem name="password" class="enter-x">
@ -66,13 +78,20 @@
</div>
</template>
<script lang="ts" setup>
import { reactive, ref, unref, computed } from 'vue';
import { reactive, ref, unref, computed, onMounted } from 'vue';
import { message } from 'ant-design-vue';
import LoginFormTitle from './LoginFormTitle.vue';
import { Form, Input, Button, Checkbox } from 'ant-design-vue';
import { Form, Input, Button, Checkbox, Select, SelectOption } from 'ant-design-vue';
import { StrengthMeter } from '@/components/StrengthMeter';
import { CountdownInput } from '@/components/CountDown';
import Icon from '@/components/Icon/Icon.vue';
import { useI18n } from '@/hooks/web/useI18n';
import { useLoginState, useFormRules, useFormValid, LoginStateEnum } from './useLogin';
import { sendSmsCode } from '@/api/auth/captcha';
import { registerApi, tenantList } from '@/api/auth';
import { TenantResp } from '@/api/auth/model';
import { useLocalStorage } from '@vueuse/core';
import { SelectValue } from 'ant-design-vue/es/select';
const FormItem = Form.Item;
const InputPassword = Input.Password;
@ -82,6 +101,10 @@
const formRef = ref();
const loading = ref(false);
// ID
const defaultTenantId = '000000';
const localTenantId = useLocalStorage('tenantId', defaultTenantId);
const formData = reactive({
account: '',
password: '',
@ -89,6 +112,14 @@
mobile: '',
sms: '',
policy: false,
tenantId: defaultTenantId,
});
//
const tenant = reactive<TenantResp & { loadSuccess: boolean }>({
tenantEnabled: false,
voList: [],
loadSuccess: false,
});
const { getFormRules } = useFormRules(formData);
@ -96,9 +127,89 @@
const getShow = computed(() => unref(getLoginState) === LoginStateEnum.REGISTER);
//
function handleTenantChange(tenantId: SelectValue) {
localTenantId.value = tenantId as string;
}
//
async function tenantSelectInit() {
try {
const ret = await tenantList();
const { tenantEnabled, voList } = ret;
if (tenantEnabled) {
const currentTenantId = voList.length ? voList[0].tenantId : defaultTenantId;
formData.tenantId = currentTenantId;
localTenantId.value = currentTenantId;
}
Object.assign(tenant, ret);
tenant.loadSuccess = true;
} catch (e) {
console.error('租户选择异常');
tenant.loadSuccess = false;
}
}
//
const handleSendSmsCode = async (): Promise<boolean> => {
//
if (!formData.mobile) {
message.error('请先填写手机号码');
return false;
}
//
const mobileRegex = /^1[3-9]\d{9}$/;
if (!mobileRegex.test(formData.mobile)) {
message.error('请输入正确的手机号码');
return false;
}
try {
await sendSmsCode(formData.mobile);
message.success('验证码发送成功');
return true;
} catch (error) {
message.error('验证码发送失败,请重试');
return false;
}
};
async function handleRegister() {
const data = await validForm();
if (!data) return;
console.log(data);
//
if (!formData.policy) {
message.error('请先同意隐私政策');
return;
}
loading.value = true;
try {
await registerApi({
username: formData.account,
password: formData.password,
mobile: formData.mobile,
code: formData.sms,
uuid: formData.mobile, // 使uuid
tenantId: formData.tenantId,
userType: 'sys_user',
});
message.success('注册成功!');
//
handleBackLogin();
} catch (error) {
console.error('注册失败:', error);
// message.error('');
} finally {
loading.value = false;
}
}
onMounted(async () => {
//
await tenantSelectInit();
});
</script>

4
src/views/auth/login/useLogin.ts

@ -105,6 +105,10 @@ export function useFormRules(formData?: Recordable) {
case LoginStateEnum.RESET_PASSWORD:
return {
account: accountFormRule,
password: passwordFormRule,
confirmPassword: [
{ validator: validateConfirmPassword(formData?.password), trigger: 'change' },
],
...mobileRule,
};

4
src/views/tenderReview/TenderTask/TenderTask.data.ts

@ -110,7 +110,7 @@ export const modalSchemas: FormSchema[] = [
component: 'Upload',
componentProps: {
accept: ['.docx', '.pdf'],
maxSize: 1000,
maxSize: 10000,
multiple: false,
resultField: 'ossId',
// api: uploadTenderDocument,
@ -123,7 +123,7 @@ export const modalSchemas: FormSchema[] = [
component: 'Upload',
componentProps: {
accept: ['.zip','.docx', '.pdf'],
maxSize: 1000,
maxSize: 10000,
multiple: false,
resultField: 'ossId',
// api: uploadTenderDocument,

2
src/views/tenderReview/TenderTask/index.vue

@ -28,7 +28,7 @@
<a-button
type="primary"
@click="handleAdd"
v-auth="'productManagement:TenderTask:add'"
v-auth="'tender:tasks:add'"
>新增</a-button
>
</div>

Loading…
Cancel
Save