Commit a8f8a714 authored by 前端-黄佳鑫's avatar 前端-黄佳鑫

🌈 style(营销能力): 列表状态颜色修改

parent 5149eb1a
export const OuterStatusColor = (type) => {
switch (type) {
case 1:
case 2:
case 3:
case 6:
return 'warning'
case 4:
return 'success'
case 5:
return 'error'
case 7:
return 'processing'
default:
return 'default'
}
}
export const InnerStatusColor = (type) => {
switch (type) {
case 1:
case 2:
case 4:
case 6:
return 'warning'
case 3:
case 5:
return 'error'
case 7:
return 'processing'
case 9:
return 'success'
default:
return 'default'
}
}
......@@ -4,12 +4,13 @@ import TableLayout from '../../../components/tableLayout';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { ColumnType } from 'antd/lib/table/interface';
import StatusTag from '@/components/StatusTag';
import { Button, Col, Row, Space } from 'antd'
import { Badge, Button, Col, Row, Space, Tag } from 'antd'
import EyePreview from '@/components/EyePreview';
import { format } from '@/pages/transaction/common/dateFormat';
import { useLinkageUtils } from '@/utils/formEffectUtils';
import { FormEffectHooks } from '@formily/antd';
import { PublicApi } from '@/services/api';
import { InnerStatusColor, OuterStatusColor } from '../../common/tagColor';
const { onFormMount$ } = FormEffectHooks;
const ReadyExamineOne = () => {
......@@ -64,7 +65,7 @@ const ReadyExamineOne = () => {
key: 'outerStatus',
dataIndex: 'outerStatus',
render: (_, record) => (
<StatusTag type="danger" title={record.outerStatusName} />
<Tag color={OuterStatusColor(_)}>{record.outerStatusName}</Tag>
)
},
{
......@@ -72,7 +73,7 @@ const ReadyExamineOne = () => {
key: 'innerStatus',
dataIndex: 'innerStatus',
render: (_, record) => (
<StatusTag type="danger" title={record.innerStatusName} />
<Badge status={InnerStatusColor(_)} text={record.innerStatusName} />
)
},
{
......
......@@ -4,12 +4,13 @@ import TableLayout from '../../../components/tableLayout';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { ColumnType } from 'antd/lib/table/interface';
import StatusTag from '@/components/StatusTag';
import { Button, Col, Row, Space } from 'antd'
import { Badge, Button, Col, Row, Space, Tag } from 'antd'
import { format } from '@/pages/transaction/common/dateFormat';
import { useLinkageUtils } from '@/utils/formEffectUtils';
import { FormEffectHooks } from '@formily/antd';
import { PublicApi } from '@/services/api';
import EyePreview from '@/components/EyePreview';
import { InnerStatusColor, OuterStatusColor } from '../../common/tagColor';
const { onFormMount$ } = FormEffectHooks;
const ReadyExamineTwo = () => {
......@@ -64,7 +65,7 @@ const ReadyExamineTwo = () => {
key: 'outerStatus',
dataIndex: 'outerStatus',
render: (_, record) => (
<StatusTag type="danger" title={record.outerStatusName} />
<Tag color={OuterStatusColor(_)}>{record.outerStatusName}</Tag>
)
},
{
......@@ -72,7 +73,7 @@ const ReadyExamineTwo = () => {
key: 'innerStatus',
dataIndex: 'innerStatus',
render: (_, record) => (
<StatusTag type="danger" title={record.innerStatusName} />
<Badge status={InnerStatusColor(_)} text={record.innerStatusName} />
)
},
{
......
......@@ -4,12 +4,13 @@ import TableLayout from '../../../components/tableLayout';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { ColumnType } from 'antd/lib/table/interface';
import StatusTag from '@/components/StatusTag';
import { Button, Space, Popconfirm } from 'antd';
import { Button, Space, Popconfirm, Tag, Badge } from 'antd';
import { format } from '@/pages/transaction/common/dateFormat';
import { useLinkageUtils } from '@/utils/formEffectUtils';
import { FormEffectHooks } from '@formily/antd';
import { PublicApi } from '@/services/api';
import EyePreview from '@/components/EyePreview';
import { InnerStatusColor, OuterStatusColor } from '../../common/tagColor';
const { onFormMount$ } = FormEffectHooks;
const ReadySubmit = () => {
......@@ -80,8 +81,8 @@ const ReadySubmit = () => {
title: '外部状态',
key: 'outerStatus',
dataIndex: 'outerStatus',
render: (text, record) => (
<StatusTag type="danger" title={record.outerStatusName} />
render: (_, record) => (
<Tag color={OuterStatusColor(_)}>{record.outerStatusName}</Tag>
)
},
{
......@@ -89,7 +90,7 @@ const ReadySubmit = () => {
key: 'innerStatus',
dataIndex: 'innerStatus',
render: (text, record) => (
<StatusTag type="danger" title={record.innerStatusName} />
<Badge status={InnerStatusColor(text)} text={record.innerStatusName} />
)
},
{
......
......@@ -4,12 +4,13 @@ import TableLayout from '../../../components/tableLayout';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { ColumnType } from 'antd/lib/table/interface';
import StatusTag from '@/components/StatusTag';
import { Button, Popconfirm, Row, Col } from 'antd'
import { Button, Popconfirm, Row, Col, Tag, Badge } from 'antd'
import EyePreview from '@/components/EyePreview';
import { format } from '@/pages/transaction/common/dateFormat';
import { useLinkageUtils } from '@/utils/formEffectUtils';
import { FormEffectHooks } from '@formily/antd';
import { PublicApi } from '@/services/api';
import { InnerStatusColor, OuterStatusColor } from '../../common/tagColor';
const { onFormMount$ } = FormEffectHooks;
const ReadySubmitExamine = () => {
......@@ -84,8 +85,8 @@ const ReadySubmitExamine = () => {
title: '外部状态',
key: 'outerStatus',
dataIndex: 'outerStatus',
render: (text, record) => (
<StatusTag type="danger" title={record.outerStatusName} />
render: (_, record) => (
<Tag color={OuterStatusColor(_)}>{record.outerStatusName}</Tag>
)
},
{
......@@ -93,7 +94,7 @@ const ReadySubmitExamine = () => {
key: 'innerStatus',
dataIndex: 'innerStatus',
render: (text, record) => (
<StatusTag type="danger" title={record.innerStatusName} />
<Badge status={InnerStatusColor(text)} text={record.innerStatusName} />
)
},
{
......
......@@ -9,6 +9,8 @@ import EyePreview from '@/components/EyePreview';
import { format } from '@/pages/transaction/common/dateFormat';
import { useLinkageUtils } from '@/utils/formEffectUtils';
import { FormEffectHooks } from '@formily/antd';
import { Badge, Tag } from 'antd';
import { InnerStatusColor, OuterStatusColor } from '../../common/tagColor';
const { onFormMount$ } = FormEffectHooks;
const Search = () => {
const columns: ColumnType<any>[] = [
......@@ -57,8 +59,8 @@ const Search = () => {
title: '外部状态',
key: 'outerStatus',
dataIndex: 'outerStatus',
render: (text, record) => (
<StatusTag type="danger" title={record.outerStatusName} />
render: (_, record) => (
<Tag color={OuterStatusColor(_)}>{record.outerStatusName}</Tag>
)
},
{
......@@ -66,7 +68,7 @@ const Search = () => {
key: 'innerStatus',
dataIndex: 'innerStatus',
render: (text, record) => (
<StatusTag type="danger" title={record.innerStatusName} />
<Badge status={InnerStatusColor(text)} text={record.innerStatusName} />
)
},
]
......
import React, { useRef, useState } from 'react';
import { history } from 'umi';
import { Button, Row, Col } from 'antd'
import { Button, Row, Col, Tag, Badge } from 'antd'
import TableLayout from '@/pages/transaction/components/tableLayout'
import { ColumnType } from 'antd/lib/table';
import EyePreview from '@/components/EyePreview';
......@@ -11,6 +11,7 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
import { PublicApi } from '@/services/api';
import { useLinkageUtils } from '@/utils/formEffectUtils';
import { FormEffectHooks } from '@formily/react';
import { InnerStatusColor, OuterStatusColor } from '../../common/tagColor';
const { onFormMount$ } = FormEffectHooks;
const ReadyExamineOne = () => {
......@@ -78,7 +79,7 @@ const ReadyExamineOne = () => {
key: 'outerStatus',
dataIndex: 'outerStatus',
render: (_text, record) => (
<StatusTag type="danger" title={record.outerStatusName} />
<Tag color={OuterStatusColor(_text)}>{record.outerStatusName}</Tag>
)
},
{
......@@ -86,7 +87,7 @@ const ReadyExamineOne = () => {
key: 'innerStatus',
dataIndex: 'innerStatus',
render: (_text, record) => (
<StatusTag type="danger" title={record.innerStatusName} />
<Badge status={InnerStatusColor(_text)} text={record.innerStatusName} />
)
},
{
......
import React, { useRef, useState } from 'react';
import { Button, Row, Col } from 'antd'
import { Button, Row, Col, Tag, Badge } from 'antd'
import { history } from 'umi';
import TableLayout from '@/pages/transaction/components/tableLayout'
import { ColumnType } from 'antd/lib/table';
......@@ -10,6 +10,7 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
import { PublicApi } from '@/services/api';
import { useLinkageUtils } from '@/utils/formEffectUtils';
import { FormEffectHooks } from '@formily/react';
import { InnerStatusColor, OuterStatusColor } from '../../common/tagColor';
const { onFormMount$ } = FormEffectHooks;
const ReadyExamineTwo = () => {
......@@ -78,7 +79,7 @@ const ReadyExamineTwo = () => {
key: 'outerStatus',
dataIndex: 'outerStatus',
render: (_text, record) => (
<StatusTag type="danger" title={record.outerStatusName} />
<Tag color={OuterStatusColor(_text)}>{record.outerStatusName}</Tag>
)
},
{
......@@ -86,7 +87,7 @@ const ReadyExamineTwo = () => {
key: 'innerStatus',
dataIndex: 'innerStatus',
render: (_text, record) => (
<StatusTag type="danger" title={record.innerStatusName} />
<Badge status={InnerStatusColor(_text)} text={record.innerStatusName} />
)
},
{
......
import React, { Fragment, useRef, useState } from 'react';
import { Button, Row, Col, Popconfirm } from 'antd'
import { Button, Row, Col, Popconfirm, Tag, Badge } from 'antd'
import TableLayout from '@/pages/transaction/components/tableLayout'
import { ColumnType } from 'antd/lib/table';
import EyePreview from '@/components/EyePreview';
......@@ -9,6 +9,7 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
import { PublicApi } from '@/services/api';
import { useLinkageUtils } from '@/utils/formEffectUtils';
import { FormEffectHooks } from '@formily/react';
import { InnerStatusColor, OuterStatusColor } from '../../common/tagColor';
const { onFormMount$ } = FormEffectHooks;
const ReadyLive = () => {
......@@ -82,7 +83,7 @@ const ReadyLive = () => {
key: 'outerStatus',
dataIndex: 'outerStatus',
render: (_text, record) => (
<StatusTag type="danger" title={record.outerStatusName} />
<Tag color={OuterStatusColor(_text)}>{record.outerStatusName}</Tag>
)
},
{
......@@ -90,7 +91,7 @@ const ReadyLive = () => {
key: 'innerStatus',
dataIndex: 'innerStatus',
render: (_text, record) => (
<StatusTag type="danger" title={record.innerStatusName} />
<Badge status={InnerStatusColor(_text)} text={record.innerStatusName} />
)
},
{
......
import React, { Fragment, useRef, useState } from 'react';
import { Button, Row, Col, Popconfirm } from 'antd'
import { Button, Row, Col, Popconfirm, Tag, Badge } from 'antd'
import TableLayout from '@/pages/transaction/components/tableLayout'
import { ColumnType } from 'antd/lib/table';
import EyePreview from '@/components/EyePreview';
......@@ -9,6 +9,7 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
import { PublicApi } from '@/services/api';
import { useLinkageUtils } from '@/utils/formEffectUtils';
import { FormEffectHooks } from '@formily/react';
import { InnerStatusColor, OuterStatusColor } from '../../common/tagColor';
const { onFormMount$ } = FormEffectHooks;
const ReadySubmit = () => {
......@@ -82,7 +83,7 @@ const ReadySubmit = () => {
key: 'outerStatus',
dataIndex: 'outerStatus',
render: (_text, record) => (
<StatusTag type="danger" title={record.outerStatusName} />
<Tag color={OuterStatusColor(_text)}>{record.outerStatusName}</Tag>
)
},
{
......@@ -90,7 +91,7 @@ const ReadySubmit = () => {
key: 'innerStatus',
dataIndex: 'innerStatus',
render: (_text, record) => (
<StatusTag type="danger" title={record.innerStatusName} />
<Badge status={InnerStatusColor(_text)} text={record.innerStatusName} />
)
},
{
......
import React, { Fragment, useRef, useState } from 'react';
import { history } from 'umi';
import { Button, Row, Col, Space, Popconfirm } from 'antd';
import { Button, Row, Col, Space, Popconfirm, Tag, Badge } from 'antd';
import TableLayout from '@/pages/transaction/components/tableLayout'
import { ColumnType } from 'antd/lib/table';
import EyePreview from '@/components/EyePreview';
......@@ -16,6 +16,7 @@ import {
DeleteOutlined,
PlusOutlined,
} from '@ant-design/icons'
import { InnerStatusColor, OuterStatusColor } from '../../common/tagColor';
const ReadySubmitExamine = () => {
const ref = useRef<any>({});
......@@ -92,7 +93,7 @@ const ReadySubmitExamine = () => {
key: 'outerStatus',
dataIndex: 'outerStatus',
render: (_text, record) => (
<StatusTag type="danger" title={record.outerStatusName} />
<Tag color={OuterStatusColor(_text)}>{record.outerStatusName}</Tag>
)
},
{
......@@ -100,7 +101,7 @@ const ReadySubmitExamine = () => {
key: 'innerStatus',
dataIndex: 'innerStatus',
render: (_text, record) => (
<StatusTag type="danger" title={record.innerStatusName} />
<Badge status={InnerStatusColor(_text)} text={record.innerStatusName} />
)
},
{
......
import React, { Fragment, useRef, useState } from 'react';
import { Button } from 'antd';
import { Badge, Button, Tag } from 'antd';
import { history } from 'umi';
import TableLayout from '@/pages/transaction/components/tableLayout'
import { ColumnType } from 'antd/lib/table';
......@@ -11,6 +11,7 @@ import { PublicApi } from '@/services/api';
import { useLinkageUtils } from '@/utils/formEffectUtils';
import { FormEffectHooks } from '@formily/react';
import DateModalLayout from '../../components/dateModal';
import { InnerStatusColor, OuterStatusColor } from '../../common/tagColor';
const { onFormMount$ } = FormEffectHooks;
type dateInfoProps = {
......@@ -80,7 +81,7 @@ const Search = () => {
key: 'outerStatus',
dataIndex: 'outerStatus',
render: (_text, record) => (
<StatusTag type="danger" title={record.outerStatusName} />
<Tag color={OuterStatusColor(_text)}>{record.outerStatusName}</Tag>
)
},
{
......@@ -88,7 +89,7 @@ const Search = () => {
key: 'innerStatus',
dataIndex: 'innerStatus',
render: (_text, record) => (
<StatusTag type="danger" title={record.innerStatusName} />
<Badge status={InnerStatusColor(_text)} text={record.innerStatusName} />
)
},
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment