Compare commits
No commits in common. "077117de4b53031fc80f0bb6df3291fbf2d7c8ef" and "9d8eb74d9a1fb08b8da68fcc41c726aa247447f8" have entirely different histories.
077117de4b
...
9d8eb74d9a
@ -40,18 +40,10 @@ export const requestConfig: RequestConfig = {
|
|||||||
},
|
},
|
||||||
// 错误接收及处理
|
// 错误接收及处理
|
||||||
errorHandler: (error: any) => {
|
errorHandler: (error: any) => {
|
||||||
console.log('error2', error);
|
|
||||||
if (error) {
|
if (error) {
|
||||||
if (
|
message.error(error.errorMessage);
|
||||||
history.location.pathname !== '/login' ||
|
|
||||||
error.errorMessage !== '用户未登录'
|
|
||||||
) {
|
|
||||||
message.error(error.errorMessage);
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (error.errorCode) {
|
switch (error.errorCode) {
|
||||||
case 10000:
|
case 10000:
|
||||||
console.log('errorHandler', error);
|
|
||||||
if (history.location.pathname !== '/login') history.push('/login');
|
if (history.location.pathname !== '/login') history.push('/login');
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -80,7 +72,6 @@ export const requestConfig: RequestConfig = {
|
|||||||
(response: any) => {
|
(response: any) => {
|
||||||
stateActions.subLoading();
|
stateActions.subLoading();
|
||||||
const { headers } = response;
|
const { headers } = response;
|
||||||
console.log('headers', headers);
|
|
||||||
// console.log(headers['content-disposition'], 'response');
|
// console.log(headers['content-disposition'], 'response');
|
||||||
if (headers['content-disposition']) {
|
if (headers['content-disposition']) {
|
||||||
downloadFile(headers['content-disposition'], response.data);
|
downloadFile(headers['content-disposition'], response.data);
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
import { MyButtons, MyColumns, MyProTableProps } from '@/common';
|
import { MyColumns, MyProTableProps } from '@/common';
|
||||||
import { Apis } from '@/gen/Apis';
|
import { Apis } from '@/gen/Apis';
|
||||||
import { BannersRedirectTypeEnum, BannersTypeEnum } from '@/gen/Enums';
|
import { BannersRedirectTypeEnum, BannersTypeEnum } from '@/gen/Enums';
|
||||||
import BannerCreate from '@/pages/banner/modals/BannerCreate';
|
import BannerCreate from '@/pages/banner/modals/BannerCreate';
|
||||||
@ -76,13 +76,6 @@ export default function Index({ ...rest }) {
|
|||||||
<Space key={index}>
|
<Space key={index}>
|
||||||
<BannerShow item={item} reload={action?.reload} />
|
<BannerShow item={item} reload={action?.reload} />
|
||||||
<BannerUpdate item={item} reload={action?.reload} />
|
<BannerUpdate item={item} reload={action?.reload} />
|
||||||
<MyButtons.Delete
|
|
||||||
onConfirm={() =>
|
|
||||||
Apis.Banner.Banners.Delete({ id: item.id }).then(() =>
|
|
||||||
action?.reload(),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
</Space>
|
</Space>
|
||||||
),
|
),
|
||||||
}),
|
}),
|
||||||
|
|||||||
@ -4,6 +4,7 @@ import {
|
|||||||
MyImportModal,
|
MyImportModal,
|
||||||
MyPageContainer,
|
MyPageContainer,
|
||||||
MyProTableProps,
|
MyProTableProps,
|
||||||
|
usePageTabs,
|
||||||
} from '@/common';
|
} from '@/common';
|
||||||
import { Apis } from '@/gen/Apis';
|
import { Apis } from '@/gen/Apis';
|
||||||
import { ProTable } from '@ant-design/pro-components';
|
import { ProTable } from '@ant-design/pro-components';
|
||||||
@ -13,7 +14,13 @@ import EmployeeCreate from './modals/EmployeeCreate';
|
|||||||
import EmployeeUpdate from './modals/EmployeeUpdate';
|
import EmployeeUpdate from './modals/EmployeeUpdate';
|
||||||
|
|
||||||
export default function Index({ title = '员工管理' }) {
|
export default function Index({ title = '员工管理' }) {
|
||||||
console.log('title', btoa('#LY0123'));
|
// 使用多标签页功能
|
||||||
|
usePageTabs({
|
||||||
|
tabKey: 'employees-list',
|
||||||
|
tabLabel: title,
|
||||||
|
closable: true,
|
||||||
|
});
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<MyPageContainer
|
<MyPageContainer
|
||||||
enableTabs
|
enableTabs
|
||||||
|
|||||||
@ -29,7 +29,6 @@ export default function Create(props: MyBetaModalFormProps) {
|
|||||||
onFinish={async (values: any) =>
|
onFinish={async (values: any) =>
|
||||||
Apis.Company.CompanyEmployees.Store({
|
Apis.Company.CompanyEmployees.Store({
|
||||||
...values,
|
...values,
|
||||||
password: '#LY0123',
|
|
||||||
companies_id: values?.companies_id || props?.item?.id,
|
companies_id: values?.companies_id || props?.item?.id,
|
||||||
organizations_id:
|
organizations_id:
|
||||||
values?.organizations_id?.[values.organizations_id.length - 1],
|
values?.organizations_id?.[values.organizations_id.length - 1],
|
||||||
@ -101,16 +100,13 @@ export default function Create(props: MyBetaModalFormProps) {
|
|||||||
required: true,
|
required: true,
|
||||||
}),
|
}),
|
||||||
{
|
{
|
||||||
title: '初始登录密码',
|
title: '密码',
|
||||||
key: 'password',
|
key: 'password',
|
||||||
// formItemProps: { ...rulesHelper.text },
|
formItemProps: { ...rulesHelper.text },
|
||||||
tooltip: '初始登录密码:#LY0123',
|
tooltip: '请设置机构端登录密码',
|
||||||
colProps: { span: 24 },
|
colProps: { span: 24 },
|
||||||
fieldProps: {
|
|
||||||
disabled: true,
|
|
||||||
defaultValue: '#LY0123',
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
valueType: 'dependency',
|
valueType: 'dependency',
|
||||||
name: ['companies_id'],
|
name: ['companies_id'],
|
||||||
|
|||||||
@ -70,7 +70,7 @@ export default function Update(props: MyBetaModalFormProps) {
|
|||||||
required: true,
|
required: true,
|
||||||
}),
|
}),
|
||||||
{
|
{
|
||||||
title: '重置登录密码',
|
title: '密码',
|
||||||
key: 'password',
|
key: 'password',
|
||||||
colProps: { span: 24 },
|
colProps: { span: 24 },
|
||||||
},
|
},
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
export default function index() {
|
export default function index() {
|
||||||
return <div>欢迎登录</div>;
|
return <div>index</div>;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user