Skip to content

J
jinfa-platform
Commit 340555a9 authored by 前端-黄佳鑫's avatar 前端-黄佳鑫
Browse files
Options

🐞 fix: 修改采购询价等状态

parent 8b9bff2b
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 38 deletions
src/pages/transaction/purchaseAbility/components/detail/components/contrastLyout/index.tsx
View file @ 340555a9
...@@ -17,7 +17,7 @@ import { useBidTable } from '../../../effects/useBidTable'; ...@@ -17,7 +17,7 @@ import { useBidTable } from '../../../effects/useBidTable';
export interface ContrastProps { export interface ContrastProps {
effect?: any, effect?: any,
redux?(e: any), redux?(e: any),
preview?: string preview?: boolean
} }
const chNum: { [key: number]: string } = { const chNum: { [key: number]: string } = {
......
src/pages/transaction/purchaseAbility/confirmOffer/demand/index.tsx
View file @ 340555a9
...@@ -56,8 +56,8 @@ const DemandDetailed = () => { ...@@ -56,8 +56,8 @@ const DemandDetailed = () => {
{ {
col: [ col: [
{ label: '需求单号', extra: data.purchaseInquiryNo }, { label: '需求单号', extra: data.purchaseInquiryNo },
{ label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState]}>{OFFTER_EXTERNALSTATE[data.externalState]}</Tag> }, { label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState] || 'default'}>{data.externalStateName}</Tag> },
{ label: '内部状态', extra: <Badge status={OFFTER_INTERNALSTATE_COLOR[data.interiorState]} text={OFFTER_INTERNALSTATE[data.interiorState]} /> }, { label: '内部状态', extra: <Badge status={OFFTER_INTERNALSTATE_COLOR[data.interiorState] || 'default'} text={data.interiorStateName} /> },
{ label: '单据时间', extra: format(data.createTime) }, { label: '单据时间', extra: format(data.createTime) },
] ]
}, },
......
src/pages/transaction/purchaseAbility/confirmOffer/offerInquire/index.tsx
View file @ 340555a9
...@@ -12,6 +12,7 @@ import { ...@@ -12,6 +12,7 @@ import {
OFFTER_CONFIRMINTERIORSTATE_COLOR, OFFTER_CONFIRMINTERIORSTATE_COLOR,
OFFTER_EXTERNALSTATE_TYPE, OFFTER_EXTERNALSTATE_TYPE,
CHNUM_TYPE, CHNUM_TYPE,
BUTTONAUTHORITY
} from '../../constants'; } from '../../constants';
import ModalOperate from '../../components/modalOperate'; import ModalOperate from '../../components/modalOperate';
...@@ -100,7 +101,8 @@ const OfferInquire = () => { ...@@ -100,7 +101,8 @@ const OfferInquire = () => {
dataIndex: 'operate', dataIndex: 'operate',
render: (text: any, record: any) => ( render: (text: any, record: any) => (
<> <>
{ record.externalState === OFFTER_EXTERNALSTATE_TYPE.WAITSUBMIOFFER_TYPE {
record.button === BUTTONAUTHORITY.FOUR
&& ( && (
<Button <Button
type='link' type='link'
...@@ -112,7 +114,8 @@ const OfferInquire = () => { ...@@ -112,7 +114,8 @@ const OfferInquire = () => {
> >
调整截止时间 调整截止时间
</Button> </Button>
)} )
}
<Button type='link' onClick={() => history.push(`/memberCenter/procurementAbility/confirmOffer/offerInquire/preview?id=${record.id}&turn=${record.turn}`)}>查看</Button> <Button type='link' onClick={() => history.push(`/memberCenter/procurementAbility/confirmOffer/offerInquire/preview?id=${record.id}&turn=${record.turn}`)}>查看</Button>
</> </>
) )
......
src/pages/transaction/purchaseAbility/confirmOffer/preview/index.tsx
View file @ 340555a9
...@@ -47,8 +47,8 @@ const ContrastPreview = () => { ...@@ -47,8 +47,8 @@ const ContrastPreview = () => {
col: [ col: [
{ label: '需求单号', extra: data.purchaseInquiryNo }, { label: '需求单号', extra: data.purchaseInquiryNo },
{ label: '需求摘要', extra: data.details }, { label: '需求摘要', extra: data.details },
{ label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState]}>{OFFTER_EXTERNALSTATE[data.externalState]}</Tag> }, { label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState] || 'default'}>{data.externalStateName}</Tag> },
{ label: '内部状态', extra: <Badge status={OFFTER_INTERNALSTATE_COLOR[data.interiorState]} text={OFFTER_INTERNALSTATE[data.interiorState]} /> }, { label: '内部状态', extra: <Badge status={OFFTER_INTERNALSTATE_COLOR[data.interiorState] || 'default'} text={data.interiorStateName} /> },
] ]
}, },
{ {
......
src/pages/transaction/purchaseAbility/confirmOffer/quote/index.tsx
View file @ 340555a9
...@@ -10,7 +10,6 @@ import OtherLayout from '../../components/detail/components/otherLayout'; ...@@ -10,7 +10,6 @@ import OtherLayout from '../../components/detail/components/otherLayout';
import BidInfoLayout from '../../components/detail/components/bidInfoLayout'; import BidInfoLayout from '../../components/detail/components/bidInfoLayout';
import { import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR, OFFTER_EXTERNALSTATE_COLOR,
} from '../../constants'; } from '../../constants';
import { LinkOutlined } from '@ant-design/icons'; import { LinkOutlined } from '@ant-design/icons';
...@@ -38,7 +37,7 @@ const QuoteDetails = () => { ...@@ -38,7 +37,7 @@ const QuoteDetails = () => {
{ label: '报价单号', extra: data.quotedPriceNo }, { label: '报价单号', extra: data.quotedPriceNo },
{ label: '报价摘要', extra: data.quotedDetails }, { label: '报价摘要', extra: data.quotedDetails },
{ label: '报价会员', extra: data.createMemberName }, { label: '报价会员', extra: data.createMemberName },
{ label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState]}>{OFFTER_EXTERNALSTATE[data.externalState]}</Tag> } { label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState] || 'default'}>{data.externalStateName}</Tag> }
] ]
}, },
{ {
......
src/pages/transaction/purchaseAbility/confirmOffer/toComparePrices/index.tsx
View file @ 340555a9
...@@ -13,6 +13,7 @@ import { ...@@ -13,6 +13,7 @@ import {
OFFTER_EXTERNALSTATE_TYPE, OFFTER_EXTERNALSTATE_TYPE,
OFFTER_CONFIRMINTERNALSTATE_TYPE, OFFTER_CONFIRMINTERNALSTATE_TYPE,
CHNUM_TYPE, CHNUM_TYPE,
BUTTONAUTHORITY,
} from '../../constants'; } from '../../constants';
const { Text } = Typography const { Text } = Typography
...@@ -94,7 +95,7 @@ const ToComparePrices = () => { ...@@ -94,7 +95,7 @@ const ToComparePrices = () => {
dataIndex: 'operate', dataIndex: 'operate',
render: (text: any, record: any) => render: (text: any, record: any) =>
<> <>
{ record.confirmInteriorState === OFFTER_CONFIRMINTERNALSTATE_TYPE.WAITSTHAN_TYPE && { record.button === BUTTONAUTHORITY.SIX &&
<Button <Button
type='link' type='link'
onClick={() => history.push(`/memberCenter/procurementAbility/confirmOffer/contrast?id=${record.id}&turn=${record.turn}`)} onClick={() => history.push(`/memberCenter/procurementAbility/confirmOffer/contrast?id=${record.id}&turn=${record.turn}`)}
...@@ -103,8 +104,7 @@ const ToComparePrices = () => { ...@@ -103,8 +104,7 @@ const ToComparePrices = () => {
</Button> </Button>
} }
{ {
( record.confirmInteriorState === OFFTER_CONFIRMINTERNALSTATE_TYPE.AUDITNOPASS1_TYPE && (record.button === BUTTONAUTHORITY.SEVEN
record.confirmInteriorState === OFFTER_CONFIRMINTERNALSTATE_TYPE.AUDITNOPASS2_TYPE
) && <Button type='link'>修改授标结果</Button> ) && <Button type='link'>修改授标结果</Button>
} }
<Button type='link' onClick={() => history.push(`/memberCenter/procurementAbility/confirmOffer/toComparePrices/preview?id=${record.id}&turn=${record.turn}`)}>查看</Button> <Button type='link' onClick={() => history.push(`/memberCenter/procurementAbility/confirmOffer/toComparePrices/preview?id=${record.id}&turn=${record.turn}`)}>查看</Button>
......
src/pages/transaction/purchaseAbility/offter/addOffter/index.tsx
View file @ 340555a9
...@@ -7,12 +7,11 @@ import moment from 'moment' ...@@ -7,12 +7,11 @@ import moment from 'moment'
import { PublicApi } from '@/services/api'; import { PublicApi } from '@/services/api';
import { Row, Col, Space, Button, Typography, Popconfirm, Rate } from 'antd'; import { Row, Col, Space, Button, Typography, Popconfirm, Rate } from 'antd';
import { import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR, OFFTER_EXTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE,
OFFTER_INTERNALSTATE_COLOR, OFFTER_INTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE_TYPE, OFFTER_INTERNALSTATE_TYPE,
CHNUM_TYPE CHNUM_TYPE,
BUTTONAUTHORITY
} from '../../constants'; } from '../../constants';
import { Badge, Tag } from 'antd'; import { Badge, Tag } from 'antd';
const { Text } = Typography; const { Text } = Typography;
...@@ -91,24 +90,32 @@ const AddOffter = () => { ...@@ -91,24 +90,32 @@ const AddOffter = () => {
dataIndex: 'operate', dataIndex: 'operate',
render: (text: any, record: any) => <> render: (text: any, record: any) => <>
{ {
record.interiorState === OFFTER_INTERNALSTATE_TYPE.WAITSUBMITAUDIT_TYPE record.button === BUTTONAUTHORITY.ONE
&& ( && (
<> <Popconfirm title="确定要提交审核吗？" okText="是" cancelText="否" onConfirm={() => fetchSubmitBatch(record.id)}>
<Popconfirm title="确定要提交审核吗？" okText="是" cancelText="否" onConfirm={() => fetchSubmitBatch(record.id)}> <Button type='link'>
<Button type='link'>
提交审核 提交审核
</Button> </Button>
</Popconfirm> </Popconfirm>
<Button )
onClick={() => history.push(`/memberCenter/procurementAbility/offter/edit?id=${record.id}&number=${record.quotedPriceNo}`)} }
type='link' {
>修改</Button> (record.button === BUTTONAUTHORITY.ONE || record.button === BUTTONAUTHORITY.TWO)
<Popconfirm title="确定要删除吗？" okText="是" cancelText="否" onConfirm={() => fetchDeleteBatch(record.id)}> && (
<Button type='link'> <Button
删除 onClick={() => history.push(`/memberCenter/procurementAbility/offter/edit?id=${record.id}&number=${record.quotedPriceNo}`)}
</Button> type='link'
</Popconfirm> >修改</Button>
</> )
}
{
record.button === BUTTONAUTHORITY.ONE
&& (
<Popconfirm title="确定要删除吗？" okText="是" cancelText="否" onConfirm={() => fetchDeleteBatch(record.id)}>
<Button type='link'>
删除
</Button>
</Popconfirm>
) )
} }
</> </>
......
src/pages/transaction/purchaseAbility/offter/demand/index.tsx
View file @ 340555a9
...@@ -11,14 +11,11 @@ import RecordLyout from '../../components/detail/components/recordLyout'; ...@@ -11,14 +11,11 @@ import RecordLyout from '../../components/detail/components/recordLyout';
import moment from 'moment'; import moment from 'moment';
import { import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR, OFFTER_EXTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE,
OFFTER_INTERNALSTATE_COLOR OFFTER_INTERNALSTATE_COLOR
} from '../../constants'; } from '../../constants';
import { LinkOutlined, QuestionCircleOutlined } from '@ant-design/icons'; import { LinkOutlined, QuestionCircleOutlined } from '@ant-design/icons';
import MaterialLayout from '../../components/detail/components/materialLayout'; import MaterialLayout from '../../components/detail/components/materialLayout';
import DemandLayout from '../../components/detail/components/demandLayout';
const ICON_STYLE: any = { const ICON_STYLE: any = {
color: '#C0C4CC', color: '#C0C4CC',
...@@ -53,8 +50,8 @@ const DemandDetailed = () => { ...@@ -53,8 +50,8 @@ const DemandDetailed = () => {
{ {
col: [ col: [
{ label: '需求单号', extra: data.purchaseInquiryNo }, { label: '需求单号', extra: data.purchaseInquiryNo },
{ label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState]}>{OFFTER_EXTERNALSTATE[data.externalState]}</Tag> }, { label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState] || 'default'}>{data.externalStateName}</Tag> },
{ label: '内部状态', extra: <Badge status={OFFTER_INTERNALSTATE_COLOR[data.interiorState]} text={OFFTER_INTERNALSTATE[data.interiorState]} /> }, { label: '内部状态', extra: <Badge status={OFFTER_INTERNALSTATE_COLOR[data.interiorState] || 'default'} text={data.interiorStateName} /> },
{ label: '单据时间', extra: format(data.createTime) }, { label: '单据时间', extra: format(data.createTime) },
] ]
}, },
......
src/pages/transaction/purchaseAbility/offter/detail/index.tsx
View file @ 340555a9
...@@ -68,8 +68,8 @@ const QuoteDetails = () => { ...@@ -68,8 +68,8 @@ const QuoteDetails = () => {
col: [ col: [
{ label: '报价单号', extra: data.quotedPriceNo }, { label: '报价单号', extra: data.quotedPriceNo },
{ label: '报价摘要', extra: data.quotedDetails }, { label: '报价摘要', extra: data.quotedDetails },
{ label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState]}>{OFFTER_EXTERNALSTATE[data.externalState]}</Tag> }, { label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState] || 'default'}>{data.externalStateName}</Tag> },
{ label: '内部状态', extra: <Badge status={OFFTER_INTERNALSTATE_COLOR[data.interiorState]} text={OFFTER_INTERNALSTATE[data.interiorState]} /> }, { label: '内部状态', extra: <Badge status={OFFTER_INTERNALSTATE_COLOR[data.interiorState] || 'default'} text={data.interiorStateName} /> },
] ]
}, },
{ {
......
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