diff --git a/src/components/CompanyInfo/component/QualificationFormModal.tsx b/src/components/CompanyInfo/component/QualificationFormModal.tsx index 2f6bbf6..6994913 100644 --- a/src/components/CompanyInfo/component/QualificationFormModal.tsx +++ b/src/components/CompanyInfo/component/QualificationFormModal.tsx @@ -54,7 +54,7 @@ const QualificationFormModal: React.FC = ({ termOfValidity: data.termOfValidity ? moment(data.termOfValidity) : undefined, attachment: data.accessory - ? [{ uid: '-1', name: data.accessory, url: data.accessory, status: 'done', response: { url: data.accessory } }] + ? [{ uid: '-1', name: '附件', url: data.accessory, status: 'done', response: { url: data.accessory } }] : [], }; console.log(fields, 'fields'); @@ -166,7 +166,7 @@ const QualificationFormModal: React.FC = ({ {viewData.attachment?.[0]?.url ? ( - {viewData.attachment[0].name || '查看附件'} + 查看附件 ) : '无'} diff --git a/src/pages/login/login.tsx b/src/pages/login/login.tsx index ef08489..b012e48 100644 --- a/src/pages/login/login.tsx +++ b/src/pages/login/login.tsx @@ -39,7 +39,7 @@ const LoginPage: React.FC = () => { }) } - form.setFieldsValue( { password: 'cosco2025', identifying: '1' } ) + form.setFieldsValue({ password: 'cosco2025', identifying: '1' }) }, [activeKey]); @@ -56,26 +56,26 @@ const LoginPage: React.FC = () => { // }); // } }, [form]); - - // 修改密码确认回调 - const handleChangePwd = async (values: { userId: string; newPassword: string; confirmPassword: string; }) => { - try { - await changePasswordOnFirstLogin({ - userId: userId, - newPassword: encryptWithRsa(values.newPassword, false), - confirmPassword: encryptWithRsa(values.confirmPassword, false) - }).then((res) => { - if(res.data) { - setShowChangePwd(false); - message.success('修改成功,请重新登录'); - } else { - message.success('修改密码失败'); - } - }) - } catch (e: any) { - message.error(e?.message || '修改密码失败'); - } - }; + + // 修改密码确认回调 + const handleChangePwd = async (values: { userId: string; newPassword: string; confirmPassword: string; }) => { + try { + await changePasswordOnFirstLogin({ + userId: userId, + newPassword: encryptWithRsa(values.newPassword, false), + confirmPassword: encryptWithRsa(values.confirmPassword, false) + }).then((res) => { + if (res.data) { + setShowChangePwd(false); + message.success('修改成功,请重新登录'); + } else { + message.success('修改密码失败'); + } + }) + } catch (e: any) { + message.error(e?.message || '修改密码失败'); + } + }; const onFinish = async (values: any) => { setLoading(true); try { @@ -100,34 +100,29 @@ const LoginPage: React.FC = () => { //存入供应商用户id if (activeKey === 'supplierLogin') { sessionStorage.setItem('userId', loginRes.data.supplierUser.userId); + if (loginRes.data?.supplierUser?.firstLogin === 1) { + setUserId(loginRes.data.supplierUser.userId) + setShowChangePwd(true); + return + } } else if (activeKey === 'expertLogin') { //存入专家用户id // sessionStorage.setItem('userId', loginRes.data.expertUser.userId); } else if (activeKey === 'accountLogin') { //存入招标代理用户id sessionStorage.setItem('userId', loginRes.data.user.userId); - //部门 - // queryUserOrgAll().then((res) => { - // const { code, data } = res; - // if (code == 200) { - // sessionStorage.setItem('userOrgAll', JSON.stringify(data) ); - // } - // }) } sessionStorage.setItem('currentUser', JSON.stringify(loginRes.data)); + await getUserinfo().then(async (res) => { const roleIdList = res.authorityList.map((item: any) => item.roleId); - console.log(res); - - setUserId(res.userId) sessionStorage.setItem('Userinfo', JSON.stringify(res)); const menuList: any = await findMenuList({ roleIdList }); sessionStorage.setItem('menuList', JSON.stringify(menuList.data)); - //新用户需要修改一次密码 - if (loginRes.data?.supplierUser?.firstLogin === 1) { - setShowChangePwd(true); + message.success('登录成功'); + if (activeKey === 'supplierLogin') { + history.push('/backend/workbenches'); } else { - message.success('登录成功'); history.push('/index'); } }); @@ -191,99 +186,99 @@ const LoginPage: React.FC = () => { return ( <> - - -
-
- {/*
+ +
+
+ {/* */} -
{intl.formatMessage({ id: 'login.title' })}
+
{intl.formatMessage({ id: 'login.title' })}
-
- - - {/* */} - - -
+
+ + + {/* */} + + +
-
- - } - placeholder={intl.formatMessage({ id: 'login.username.placeholder' })} - size="large" - /> - + + } + placeholder={intl.formatMessage({ id: 'login.username.placeholder' })} + size="large" + /> + - - } - placeholder={intl.formatMessage({ id: 'login.password.placeholder' })} - iconRender={visible => (visible ? : )} - size="large" - /> - - - - } - /> - + + } + placeholder={intl.formatMessage({ id: 'login.password.placeholder' })} + iconRender={visible => (visible ? : )} + size="large" + /> + + + + } + /> + - -
- - {intl.formatMessage({ id: 'login.remember' })} - - +
+
+ + + -
- - - - - {activeKey !== 'accountLogin' && renderRegisterLink()} - - + {activeKey !== 'accountLogin' && renderRegisterLink()} + + +
-
); };