Skip to content

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

修改报价搜索

parent ff3fc969
Hide whitespace changes
Inline Side-by-side
Showing with 546 additions and 81 deletions
src/pages/transaction/purchaseAbility/components/table/index.tsx
View file @ f6895bd0
......@@ -13,6 +13,9 @@ import {
PurchaseDemandPublicSchema,
INQUIRYDEMANDORDER_SCHEMA,
INQUIRYWAITORDER_SCHEMA,
OFFERDEMANDSERAH_SCHEMA,
OFFERSERAH_SCHEMA,
OFFERSERAHAUDIT_SCHEMA,
CONFIRMOFFERSERAH_SCHEMA,
CONFIRMOFFERSUBMITAPRICE_SCHEMA,
CONFIRMOFFERAUDIT_SCHEMA,
......@@ -27,6 +30,9 @@ interface Iprops {
'PurchaseDemandPublic' |
'INQUIRYDEMANDORDER_SCHEMA' |
'INQUIRYWAITORDER_SCHEMA' |
'OFFERDEMANDSERAH_SCHEMA' |
'OFFERSERAH_SCHEMA' |
'OFFERSERAHAUDIT_SCHEMA' |
'CONFIRMOFFERSERAH_SCHEMA' |
'CONFIRMOFFERSUBMITAPRICE_SCHEMA' |
'CONFIRMOFFERAUDIT_SCHEMA',
......@@ -59,6 +65,12 @@ const Table: React.FC<Iprops> = (props:any) => {
return INQUIRYDEMANDORDER_SCHEMA;
case 'INQUIRYWAITORDER_SCHEMA':
return INQUIRYWAITORDER_SCHEMA;
case 'OFFERDEMANDSERAH_SCHEMA':
return OFFERDEMANDSERAH_SCHEMA;
case 'OFFERSERAH_SCHEMA':
return OFFERSERAH_SCHEMA;
case 'OFFERSERAHAUDIT_SCHEMA':
return OFFERSERAHAUDIT_SCHEMA;
case 'CONFIRMOFFERSERAH_SCHEMA':
return CONFIRMOFFERSERAH_SCHEMA;
case 'CONFIRMOFFERSUBMITAPRICE_SCHEMA':
......
src/pages/transaction/purchaseAbility/confirmOffer/auditResultsOne/index.tsx
View file @ f6895bd0
......@@ -8,8 +8,8 @@ import { Row, Col, Button, Tag, Space, Typography, Rate } from 'antd';
import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE,
OFFTER_INTERNALSTATE_COLOR,
OFFTER_CONFIRMINTERIORSTATE,
OFFTER_CONFIRMINTERIORSTATE_COLOR,
CHNUM_TYPE
} from '../../constants';
const { Text } = Typography;
......@@ -78,7 +78,7 @@ const AuditResultsOne = () => {
title: '内部状态',
key: 'interiorState',
dataIndex: 'interiorState',
render: (text: any, record: any) => <Tag color={OFFTER_INTERNALSTATE_COLOR[text]}>{OFFTER_INTERNALSTATE[text]}</Tag>
render: (text: any, record: any) => <Tag color={OFFTER_CONFIRMINTERIORSTATE_COLOR[text]}>{OFFTER_CONFIRMINTERIORSTATE[text]}</Tag>
}, {
title: '操作',
key: 'operate',
......
src/pages/transaction/purchaseAbility/confirmOffer/auditResultsTwo/index.tsx
View file @ f6895bd0
......@@ -8,8 +8,8 @@ import { Row, Col, Button, Tag, Space, Typography, Rate } from 'antd';
import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE,
OFFTER_INTERNALSTATE_COLOR,
OFFTER_CONFIRMINTERIORSTATE,
OFFTER_CONFIRMINTERIORSTATE_COLOR,
CHNUM_TYPE
} from '../../constants';
const { Text } = Typography;
......@@ -78,7 +78,7 @@ const AuditResultsTwo = () => {
title: '内部状态',
key: 'interiorState',
dataIndex: 'interiorState',
render: (text: any, record: any) => <Tag color={OFFTER_INTERNALSTATE_COLOR[text]}>{OFFTER_INTERNALSTATE[text]}</Tag>
render: (text: any, record: any) => <Tag color={OFFTER_CONFIRMINTERIORSTATE_COLOR[text]}>{OFFTER_CONFIRMINTERIORSTATE[text]}</Tag>
}, {
title: '操作',
key: 'operate',
......
src/pages/transaction/purchaseAbility/confirmOffer/confirmResults/index.tsx
View file @ f6895bd0
......@@ -9,8 +9,8 @@ import { PublicApi } from '@/services/api';
import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE,
OFFTER_INTERNALSTATE_COLOR,
OFFTER_CONFIRMINTERIORSTATE,
OFFTER_CONFIRMINTERIORSTATE_COLOR,
CHNUM_TYPE
} from '../../constants';
......@@ -79,7 +79,7 @@ const ConfirmResults = () => {
title: '内部状态',
key: 'interiorState',
dataIndex: 'interiorState',
render: (text: any, record: any) => <Tag color={OFFTER_INTERNALSTATE_COLOR[text]}>{OFFTER_INTERNALSTATE[text]}</Tag>
render: (text: any, record: any) => <Tag color={OFFTER_CONFIRMINTERIORSTATE_COLOR[text]}>{OFFTER_CONFIRMINTERIORSTATE[text]}</Tag>
}, {
title: '操作',
key: 'operate',
......
src/pages/transaction/purchaseAbility/confirmOffer/detail/index.tsx
View file @ f6895bd0
......@@ -95,9 +95,9 @@ const Detail = () => {
current: '1',
pageSize: '10'
}
await PublicApi.getPurchaseConfirmQuotedPriceMaterielDetailed(params).then(res => {
await PublicApi.getPurchaseConfirmQuotedPriceQuotedPriceInfo(params).then(res => {
if (res.code === 1000) {
console.log(res.data)
console.log(res.data, 10086)
}
})
}
......
src/pages/transaction/purchaseAbility/confirmOffer/offerInquire/index.tsx
View file @ f6895bd0
......@@ -9,8 +9,8 @@ import { PublicApi } from '@/services/api';
import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE,
OFFTER_INTERNALSTATE_COLOR,
OFFTER_CONFIRMINTERIORSTATE,
OFFTER_CONFIRMINTERIORSTATE_COLOR,
CHNUM_TYPE,
OFFTER_EXTERNALSTATE_TYPE
} from '../../constants';
......@@ -86,7 +86,7 @@ const OfferInquire = () => {
title: '内部状态',
key: 'interiorState',
dataIndex: 'interiorState',
render: (text: any, record: any) => <Tag color={OFFTER_INTERNALSTATE_COLOR[text]}>{OFFTER_INTERNALSTATE[text]}</Tag>
render: (text: any, record: any) => <Tag color={OFFTER_CONFIRMINTERIORSTATE_COLOR[text]}>{OFFTER_CONFIRMINTERIORSTATE[text]}</Tag>
}, {
title: '操作',
key: 'operate',
......
src/pages/transaction/purchaseAbility/confirmOffer/toComparePrices/index.tsx
View file @ f6895bd0
......@@ -9,8 +9,8 @@ import { PublicApi } from '@/services/api';
import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE,
OFFTER_INTERNALSTATE_COLOR,
OFFTER_CONFIRMINTERIORSTATE,
OFFTER_CONFIRMINTERIORSTATE_COLOR,
CHNUM_TYPE
} from '../../constants';
......@@ -79,7 +79,7 @@ const ToComparePrices = () => {
title: '内部状态',
key: 'interiorState',
dataIndex: 'interiorState',
render: (text: any, record: any) => <Tag color={OFFTER_INTERNALSTATE_COLOR[text]}>{OFFTER_INTERNALSTATE[text]}</Tag>
render: (text: any, record: any) => <Tag color={OFFTER_CONFIRMINTERIORSTATE_COLOR[text]}>{OFFTER_CONFIRMINTERIORSTATE[text]}</Tag>
}, {
title: '操作',
key: 'operate',
......
src/pages/transaction/purchaseAbility/constants/index.ts
View file @ f6895bd0
......@@ -213,3 +213,27 @@ export const FILTERINTERNALSTATE = [
},
]
/** 确认报价内部状态 */
export const OFFTER_CONFIRMINTERIORSTATE = {
99: '已完成',
1: '待比价',
2: '待审核授标结果(一级)',
3: '待审核授标结果(二级)',
4: '待确认授标结果',
5: '审核授标结果通过(一级)',
6: '审核授标结果通过(二级)',
7: '审核授标结果不通过(一级)',
8: '审核授标结果不通过(二级)',
}
export const OFFTER_CONFIRMINTERIORSTATE_COLOR = {
99: 'success',
1: 'warning',
2: 'warning',
3: 'warning',
4: 'warning',
5: 'success',
6: 'success',
7: 'error',
8: 'error',
}
src/pages/transaction/purchaseAbility/offter/addOffter/index.tsx
View file @ f6895bd0
......@@ -5,13 +5,14 @@ import { ColumnType } from 'antd/lib/table/interface';
import EyePreview from '@/components/EyePreview';
import moment from 'moment'
import { PublicApi } from '@/services/api';
import { Row, Col, Space, Button, Typography, Popconfirm } from 'antd';
import { Row, Col, Space, Button, Typography, Popconfirm, Rate } from 'antd';
import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE,
OFFTER_INTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE_TYPE,
CHNUM_TYPE
} from '../../constants';
import { Badge, Tag } from 'antd';
const { Text } = Typography;
......@@ -57,7 +58,23 @@ const AddOffter = () => {
title: '报价轮次',
key: 'count',
dataIndex: 'count',
render: (text: any, record: any) => text && <Text strong>第{text}轮</Text>
render: (text: any, record: any) => (
<>
<Rate
count={3}
character='▌'
disabled
className='rate_style'
style={{
fontSize: '12px',
color: '#00B37A',
}}
value={text}
allowHalf
/>
<Text>第{CHNUM_TYPE[text]}轮</Text>
</>
)
}, {
title: '外部状态',
key: 'externalState',
......@@ -136,9 +153,9 @@ const AddOffter = () => {
selectedRow
reload={ref}
fetchRowkeys={(e) => setRowKeys(e)}
schemaType="PurchaseDemandPublic"
schemaType="OFFERSERAHAUDIT_SCHEMA"
columns={columns}
effects="requisitionFormNo"
effects="quotedPriceNo"
fetch={PublicApi.getPurchaseQuotedPriceAddList}
controllerBtns={
<Row>
......
src/pages/transaction/purchaseAbility/offter/addOffter/modal/selectProduct.tsx
View file @ f6895bd0
......@@ -53,7 +53,12 @@ const SelectProduct: React.FC<Iprops> = (props: any) => {
]
const fetchGoodsData = (params: any) => {
return new Promise(resolve => {
PublicApi.getProductCommodityCommonGetCommodityListBySeller({ ...params, environment: 1, shopType: 1 }).then(res => {
const data = {
environment: 1,
shopType: 1,
// priceTypeList: [1]
}
PublicApi.getProductCommodityCommonGetCommodityListBySeller({ ...params, ...data}).then(res => {
resolve(res.data)
})
})
......
src/pages/transaction/purchaseAbility/offter/auditOffterOne/index.tsx
View file @ f6895bd0
......@@ -5,12 +5,13 @@ import { ColumnType } from 'antd/lib/table/interface';
import EyePreview from '@/components/EyePreview';
import moment from 'moment';
import { PublicApi } from '@/services/api';
import { Row, Col, Button, Badge, Tag, Space, Typography } from 'antd';
import { Row, Col, Button, Badge, Tag, Space, Typography, Rate } from 'antd';
import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE,
OFFTER_INTERNALSTATE_COLOR
OFFTER_INTERNALSTATE_COLOR,
CHNUM_TYPE
} from '../../constants';
const { Text } = Typography;
......@@ -53,8 +54,25 @@ const AuditOffterOne = () => {
render: (text: any, record: any) => format(text)
}, {
title: '报价轮次',
key: 'turn',
dataIndex: 'turn',
key: 'count',
dataIndex: 'count',
render: (text: any, record: any) => (
<>
<Rate
count={3}
character='▌'
disabled
className='rate_style'
style={{
fontSize: '12px',
color: '#00B37A',
}}
value={text}
allowHalf
/>
<Text>第{CHNUM_TYPE[text]}轮</Text>
</>
)
}, {
title: '外部状态',
key: 'externalState',
......@@ -104,9 +122,9 @@ const AuditOffterOne = () => {
selectedRow
reload={ref}
fetchRowkeys={(e) => setRowKeys(e)}
schemaType="PurchaseDemandPublic"
schemaType="OFFERSERAHAUDIT_SCHEMA"
columns={columns}
effects="requisitionFormNo"
effects="quotedPriceNo"
fetch={PublicApi.getPurchaseQuotedPriceStayExamineList1}
controllerBtns={
<Row>
......
src/pages/transaction/purchaseAbility/offter/auditOffterTwo/index.tsx
View file @ f6895bd0
......@@ -5,12 +5,13 @@ import { ColumnType } from 'antd/lib/table/interface';
import EyePreview from '@/components/EyePreview';
import moment from 'moment';
import { PublicApi } from '@/services/api';
import { Row, Col, Button, Badge, Tag, Space, Typography } from 'antd';
import { Row, Col, Button, Badge, Tag, Space, Typography, Rate } from 'antd';
import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE,
OFFTER_INTERNALSTATE_COLOR
OFFTER_INTERNALSTATE_COLOR,
CHNUM_TYPE
} from '../../constants';
const { Text } = Typography
......@@ -54,8 +55,25 @@ const AuditOffterTwo = () => {
render: (text: any, record: any) => format(text)
}, {
title: '报价轮次',
key: 'turn',
dataIndex: 'turn',
key: 'count',
dataIndex: 'count',
render: (text: any, record: any) => (
<>
<Rate
count={3}
character='▌'
disabled
className='rate_style'
style={{
fontSize: '12px',
color: '#00B37A',
}}
value={text}
allowHalf
/>
<Text>第{CHNUM_TYPE[text]}轮</Text>
</>
)
}, {
title: '外部状态',
key: 'externalState',
......@@ -105,9 +123,9 @@ const AuditOffterTwo = () => {
selectedRow
reload={ref}
fetchRowkeys={(e) => setRowKeys(e)}
schemaType="PurchaseDemandPublic"
schemaType="OFFERSERAHAUDIT_SCHEMA"
columns={columns}
effects="requisitionFormNo"
effects="quotedPriceNo"
fetch={PublicApi.getPurchaseQuotedPriceStayExamineList2}
controllerBtns={
<Row>
......
src/pages/transaction/purchaseAbility/offter/demand/index.tsx
View file @ f6895bd0
import React, { useEffect, useState, useRef } from 'react';
import { Anchor, Radio, Steps, Row, Col, Table } from 'antd';
import {
Anchor,
Radio,
Steps,
Row,
Col,
Table,
Tag,
Badge,
Tooltip,
} from 'antd';
import { history } from 'umi';
import style from './index.less';
import { ArrowLeftOutlined } from '@ant-design/icons';
import { ArrowLeftOutlined, QuestionCircleOutlined } from '@ant-design/icons';
import { StandardTable } from 'god';
import { GetPurchaseQuotedPricePurchaseInquiryDetailsResponse } from '@/services/PurchaseApi/id4897';
import { PublicApi } from '@/services/api';
import DetailDrawer from '../../components/detailDrawer';
import EyePreview from '@/components/EyePreview';
import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE,
OFFTER_INTERNALSTATE_COLOR
} from '../../constants';
import {
EXTERNALLOGS,
INTERNALLOGS,
} from '../../constants/columns';
import moment from 'moment';
const { Link } = Anchor;
const { Step } = Steps;
......@@ -29,7 +50,16 @@ const TYPE = {
2: '指定会员',
}
const iconStyle: any = {
color: '#C0C4CC',
fontSize: '14px',
marginLeft: '5px'
}
const Detail: React.FC<{}> = () => {
const format = (text) => {
return <>{moment(text).format("YYYY-MM-DD HH:mm:ss")}</>
}
const ref = useRef({});
const { id, number } = history.location.query;
const [data, setData] = useState<GetPurchaseQuotedPricePurchaseInquiryDetailsResponse | any>({})
......@@ -176,13 +206,27 @@ const Detail: React.FC<{}> = () => {
col1: [
{ label: '需求单号', extra: data.purchaseInquiryNo },
{ label: '外部状态', extra: data.externalState },
{ label: '内部状态', extra: data.interiorState },
{ label: '单据时间', extra: data.createTime },
{ label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState]}>{OFFTER_EXTERNALSTATE[data.externalState]}</Tag> },
{ label: '内部状态', extra: <Badge status={OFFTER_INTERNALSTATE_COLOR[data.interiorState]} text={OFFTER_INTERNALSTATE[data.interiorState]} /> },
],
col2: [
{ label: '需求摘要', extra: data.details },
{ label: '招标采购类型', extra: data.purchaseType },
{ label: '比价方式', extra: data.priceContrast },
{
label: '采购类型',
extra: (
<Tooltip placement="top" title='有固定采购金额：采购金额固定，合同期内不可超过采购金额，无固定采购金额：采购金额不固定，可在合同期内按需采购'>
{data.purchaseType === 1 ? '有固定采购金额' : '无固定采购金额'}<QuestionCircleOutlined style={iconStyle} />
</Tooltip>
)
},
{
label: '比价方式',
extra: (
<Tooltip placement="top" title='密封比价：只能看到供应商是否有报价，不能看到供应商的报价明细，只能解封后才能看到报价明细，非密封比价：可以在供应商报完价后立即看到报价明细，无须解封'>
{data.priceContrast === 1 ? '密封比价' : '非密封比价'}<QuestionCircleOutlined style={iconStyle} />
</Tooltip>
)
},
{ label: '会员名称', extra: data.memberName },
],
col3: [
......@@ -192,9 +236,9 @@ const Detail: React.FC<{}> = () => {
/** 交易条件 */
const dealCondition = {
col1: [
{ label: '交付日期', extra: data.deliveryTime },
{ label: '交付日期', extra: format(data.deliveryTime) },
{ label: '交付地址', extra: data.address },
{ label: '截止日期', extra: data.offerEndTime },
{ label: '截止日期', extra: format(data.offerEndTime) },
],
col2: [
{ label: '报价要求', extra: data.offer },
......@@ -444,13 +488,16 @@ const Detail: React.FC<{}> = () => {
</div>
<div className='ant-card-body'>
<Table
columns={logColums}
columns={logStatus === LogType.externalLogs ? EXTERNALLOGS : INTERNALLOGS}
dataSource={
logStatus === LogType.externalLogs ?
data.externalLogs :
data.interiorLogs
}
rowKey={(record) => record.id}
pagination={{
hideOnSinglePage: true
}}
/>
</div>
</div>
......
src/pages/transaction/purchaseAbility/offter/detail/index.tsx
View file @ f6895bd0
......@@ -9,15 +9,26 @@ import {
Typography,
Tabs,
Table,
Button
Button,
Tag,
Badge,
} from 'antd';
import style from './index.less';
import { history } from 'umi';
import moment from 'moment';
import { ArrowLeftOutlined, CaretDownOutlined, CaretRightOutlined, CheckCircleOutlined } from '@ant-design/icons';
import { GetPurchaseQuotedPriceDetailsResponse } from '@/services/PurchaseApi/id4517';
import { PublicApi } from '@/services/api';
import ModalOperate from '../../components/modalOperate';
import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE,
OFFTER_INTERNALSTATE_COLOR
} from '../../constants';
import {
EXTERNALLOGS,
INTERNALLOGS,
} from '../../constants/columns';
const { Link } = Anchor;
const { Step } = Steps;
......@@ -58,7 +69,7 @@ const Detail = () => {
const [links] = useState(pathname.split('/')[pathname.split('/').length - 2]);
const [currLink, setCurrLink] = useState(activeAnchorClassName);
const [modalVisible, setModalVisible] = useState<boolean>(false);
const [data, setData] = useState<GetPurchaseQuotedPriceDetailsResponse>({})
const [data, setData] = useState<any>({})
const [logStatesStatus, setLogStatesStatus] = useState<number>(LogStatesType.externalLogStates);
const [logStatus, setLogStatus] = useState<number>(LogType.externalLogs);
const [tabPane] = useState([
......@@ -172,8 +183,8 @@ const Detail = () => {
col1: [
{ label: '报价单号', extra: data.quotedPriceNo },
{ label: '报价摘要', extra: data.quotedDetails },
{ label: '外部状态', extra: data.externalState },
{ label: '内部状态', extra: data.interiorState },
{ label: '外部状态', extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState]}>{OFFTER_EXTERNALSTATE[data.externalState]}</Tag> },
{ label: '内部状态', extra: <Badge status={OFFTER_INTERNALSTATE_COLOR[data.interiorState]} text={OFFTER_INTERNALSTATE[data.interiorState]} /> },
],
col2: [
{ label: '对应需求单号', extra: data.purchaseInquiryNo },
......@@ -510,13 +521,16 @@ const Detail = () => {
</div>
<div className='ant-card-body'>
<Table
columns={logColums}
columns={logStatus === LogType.externalLogs ? EXTERNALLOGS : INTERNALLOGS}
dataSource={
logStatus === LogType.externalLogs ?
data.externalLogs :
data.interiorLogs
}
rowKey={(record) => record.id}
pagination={{
hideOnSinglePage: true
}}
/>
</div>
</div>
......
src/pages/transaction/purchaseAbility/offter/inquiry/index.tsx
View file @ f6895bd0
......@@ -66,9 +66,9 @@ const Inquiry = () => {
}];
return (
<Table
schemaType="PurchaseDemand"
schemaType="OFFERDEMANDSERAH_SCHEMA"
columns={columns}
effects="requisitionFormNo"
effects="purchaseInquiryNo"
fetch={PublicApi.getPurchaseQuotedPricePurchaseInquiryList}
/>
)
......
src/pages/transaction/purchaseAbility/offter/offter/index.tsx
View file @ f6895bd0
......@@ -8,9 +8,10 @@ import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE,
OFFTER_INTERNALSTATE_COLOR
OFFTER_INTERNALSTATE_COLOR,
CHNUM_TYPE
} from '../../constants';
import { Badge, Tag, Space, Typography, Button } from 'antd';
import { Badge, Tag, Space, Typography, Rate } from 'antd';
const { Text } = Typography;
const Offter = () => {
......@@ -55,7 +56,23 @@ const Offter = () => {
title: '报价轮次',
key: 'count',
dataIndex: 'count',
render: (text: any, record: any) => text && <Text strong>第{text}轮</Text>
render: (text: any, record: any) => (
<>
<Rate
count={3}
character='▌'
disabled
className='rate_style'
style={{
fontSize: '12px',
color: '#00B37A',
}}
value={text}
allowHalf
/>
<Text>第{CHNUM_TYPE[text]}轮</Text>
</>
)
}, {
title: '是否中标',
key: 'iSprize',
......@@ -74,9 +91,9 @@ const Offter = () => {
}];
return (
<Table
schemaType="PurchaseDemand"
schemaType="OFFERSERAH_SCHEMA"
columns={columns}
effects="requisitionFormNo"
effects="purchaseInquiryNo"
fetch={PublicApi.getPurchaseQuotedPriceList}
/>
)
......
src/pages/transaction/purchaseAbility/offter/submitOffter/index.tsx
View file @ f6895bd0
......@@ -5,12 +5,13 @@ import { ColumnType } from 'antd/lib/table/interface';
import EyePreview from '@/components/EyePreview';
import moment from 'moment';
import { PublicApi } from '@/services/api';
import { Row, Col, Button, Badge, Tag, Space, Typography, Popconfirm } from 'antd';
import { Row, Col, Button, Badge, Tag, Space, Typography, Popconfirm, Rate } from 'antd';
import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE,
OFFTER_INTERNALSTATE_COLOR
OFFTER_INTERNALSTATE_COLOR,
CHNUM_TYPE
} from '../../constants';
const { Text } = Typography
......@@ -54,8 +55,25 @@ const SubmitOffter = () => {
render: (text: any, record: any) => format(text)
}, {
title: '报价轮次',
key: 'turn',
dataIndex: 'turn',
key: 'count',
dataIndex: 'count',
render: (text: any, record: any) => (
<>
<Rate
count={3}
character='▌'
disabled
className='rate_style'
style={{
fontSize: '12px',
color: '#00B37A',
}}
value={text}
allowHalf
/>
<Text>第{CHNUM_TYPE[text]}轮</Text>
</>
)
}, {
title: '外部状态',
key: 'externalState',
......@@ -109,9 +127,9 @@ const SubmitOffter = () => {
selectedRow
reload={ref}
fetchRowkeys={(e) => setRowKeys(e)}
schemaType="PurchaseDemandPublic"
schemaType="OFFERSERAHAUDIT_SCHEMA"
columns={columns}
effects="requisitionFormNo"
effects="quotedPriceNo"
fetch={PublicApi.getPurchaseQuotedPriceStayCommitList}
controllerBtns={
<Row>
......
src/pages/transaction/purchaseAbility/purchaseInquiry/addInquiry/components/condition.tsx
View file @ f6895bd0
......@@ -61,8 +61,8 @@ const Condition: React.FC<Iprops> = (props: any) => {
state: true,
name: 'condition',
data: {
deliveryTime: moment(res.deliveryTime).format('x'),
offerEndTime: moment(res.offerEndTime).format('x'),
deliveryTime: res.deliveryTime ? moment(res.deliveryTime).format('x') : undefined,
offerEndTime: res.offerEndTime ? moment(res.offerEndTime).format('x') : undefined,
logistics: res.logistics,
offer: res.offer,
otherRequire: res.otherRequire,
......
src/pages/transaction/purchaseAbility/purchaseInquiry/addInquiry/components/material.tsx
View file @ f6895bd0
......@@ -208,7 +208,6 @@ const Material: React.FC<Iprops> = (props: any) => {
/** 添加列表 */
const fetchTableList = (data: any) => {
if (Object.keys(data).length > 0) {
console.log(data, 1000)
setDataSource([...dataSource, data]);
setFlag(false);
}
......@@ -236,12 +235,11 @@ const Material: React.FC<Iprops> = (props: any) => {
})
})
}
}, [dataSource])
})
useEffect(() => {
/**编辑回显数据 */
console.log(fetchdata, 10086)
if (fetchdata) {
if (Object.keys(fetchdata).length > 0) {
form.setFieldsValue({
materielMode: fetchdata.materielMode
})
......
src/pages/transaction/purchaseAbility/purchaseInquiry/addInquiry/index.tsx
View file @ f6895bd0
......@@ -37,8 +37,8 @@ const AddInquiry = () => {
render: (text: any, record: any) => format(text)
}, {
title: '报价截止时间',
key: 'quotationAsTime',
dataIndex: 'quotationAsTime',
key: 'offerEndTime',
dataIndex: 'offerEndTime',
render: (text: any, record: any) => format(text)
}, {
title: '单据时间',
......
src/pages/transaction/purchaseAbility/purchaseInquiry/addInquiry/modal/drawerWrite.tsx
View file @ f6895bd0
......@@ -92,10 +92,10 @@ const DrawerWrite: React.FC<Iprops> = (props: any) => {
}
/** 提交表单 */
const handleSubmit = () => {
form.validateFields().then(res => {
form.validateFields().then((res: any) => {
const data = {
goodsId: product.id,
itemNo: product.code || res.numbe,
itemNo: product.code || res.number,
number: product.code || res.number,
name: product.name || res.name,
category: product.customerCategory.name,
......@@ -104,7 +104,7 @@ const DrawerWrite: React.FC<Iprops> = (props: any) => {
model: res.model,
purchaseCount: res.purchaseCount,
unit: res.unit,
urls: files
// urls: files
}
onConfirm(data)
form.resetFields();
......
src/pages/transaction/purchaseAbility/purchaseInquiry/auditInquiryOne/index.tsx
View file @ f6895bd0
......@@ -42,8 +42,8 @@ const AuditInquiryOne = () => {
render: (text: any, record: any) => format(text)
}, {
title: '报价截止时间',
key: 'quotationAsTime',
dataIndex: 'quotationAsTime',
key: 'offerEndTime',
dataIndex: 'offerEndTime',
render: (text: any, record: any) => format(text)
}, {
title: '单据时间',
......
src/pages/transaction/purchaseAbility/purchaseInquiry/auditInquiryTwo/index.tsx
View file @ f6895bd0
......@@ -44,8 +44,8 @@ const AuditInquiryTwo = () => {
render: (text: any, record: any) => format(text)
}, {
title: '报价截止时间',
key: 'quotationAsTime',
dataIndex: 'quotationAsTime',
key: 'offerEndTime',
dataIndex: 'offerEndTime',
render: (text: any, record: any) => format(text)
}, {
title: '单据时间',
......
src/pages/transaction/purchaseAbility/purchaseInquiry/inquiry/index.tsx
View file @ f6895bd0
......@@ -38,8 +38,8 @@ const Inquiry = () => {
render: (text: any, record: any) => format(text)
}, {
title: '报价截止时间',
key: 'quotationAsTime',
dataIndex: 'quotationAsTime',
key: 'offerEndTime',
dataIndex: 'offerEndTime',
render: (text: any, record: any) => format(text)
}, {
title: '单据时间',
......
src/pages/transaction/purchaseAbility/purchaseInquiry/submitInquiry/index.tsx
View file @ f6895bd0
......@@ -42,8 +42,8 @@ const SubmitInquiry = () => {
render: (text: any, record: any) => format(text)
}, {
title: '报价截止时间',
key: 'quotationAsTime',
dataIndex: 'quotationAsTime',
key: 'offerEndTime',
dataIndex: 'offerEndTime',
render: (text: any, record: any) => format(text)
}, {
title: '单据时间',
......
src/pages/transaction/purchaseAbility/schema/index.ts
View file @ f6895bd0
......@@ -789,3 +789,280 @@ export const CONFIRMOFFERAUDIT_SCHEMA: ISchema = {
}
}
/** 采购报价 - 采购需求单查询 */
export const OFFERDEMANDSERAH_SCHEMA: ISchema = {
type: 'object',
properties: {
megalayout: {
type: 'object',
"x-component": 'mega-layout',
properties: {
purchaseInquiryNo: {
type: 'string',
"x-component": "Search",
"x-mega-props": {
},
"x-component-props": {
placeholder: '需求单号',
align: 'flex-left',
}
}
}
},
[FORM_FILTER_PATH]: {
type: 'object',
"x-component": "flex-layout",
"x-component-props": {
rowStyle: {
justifyContent: 'flex-start',
flexWrap: 'nowrap'
},
colStyle: {//改变间隔
marginRight: 20
}
},
properties: {
PRO_LAYOUT: {
type: 'object',
"x-component": 'mega-layout',
"x-mega-props": {
span: 5
},
"x-component-props": {
inline: true
},
properties: {
details: {
type: 'string',
"x-component-props": {
placeholder: '需求摘要',
}
},
memberName: {
type: 'string',
"x-component-props": {
placeholder: '需求会员',
}
},
"[startTime,endTime]": {
type: 'string',
"x-component": "dateSelect",
"x-component-props": {
placeholder: '单据时间（全部）',
}
},
}
},
sumbit: {
"x-component": 'Submit',
"x-mega-props": {
span: 1
},
"x-component-props": {
children: '查询'
}
}
}
}
}
}
/** 采购报价 - 采购报价单查询 */
export const OFFERSERAH_SCHEMA: ISchema = {
type: 'object',
properties: {
megalayout: {
type: 'object',
"x-component": 'mega-layout',
properties: {
purchaseInquiryNo: {
type: 'string',
"x-component": "Search",
"x-mega-props": {
},
"x-component-props": {
placeholder: '需求单号',
align: 'flex-left',
}
}
}
},
[FORM_FILTER_PATH]: {
type: 'object',
"x-component": "flex-layout",
"x-component-props": {
rowStyle: {
justifyContent: 'flex-start',
flexWrap: 'nowrap'
},
colStyle: {//改变间隔
marginRight: 20
}
},
properties: {
PRO_LAYOUT: {
type: 'object',
"x-component": 'mega-layout',
"x-mega-props": {
span: 5
},
"x-component-props": {
inline: true
},
properties: {
quotedPriceNo: {
type: 'string',
"x-component-props": {
placeholder: '报价单号',
}
},
details: {
type: 'string',
"x-component-props": {
placeholder: '需求摘要',
}
},
memberName: {
type: 'string',
"x-component-props": {
placeholder: '需求会员',
}
},
"[startTime,endTime]": {
type: 'string',
"x-component": "dateSelect",
"x-component-props": {
placeholder: '单据时间（全部）',
}
},
externalState: {
type: 'string',
"x-component-props": {
placeholder: '外部状态',
style: {
width: 160
}
},
enum: FILTEREXTERNALSTATE
},
interiorState: {
type: 'string',
"x-component-props": {
placeholder: '内部状态',
style: {
width: 160
}
},
enum: FILTERINTERNALSTATE
},
}
},
sumbit: {
"x-component": 'Submit',
"x-mega-props": {
span: 1
},
"x-component-props": {
children: '查询'
}
}
}
}
}
}
/** 采购报价 - 待新增报价单&待审核报价1|2级&待提交报价单 */
export const OFFERSERAHAUDIT_SCHEMA: ISchema = {
type: 'object',
properties: {
megalayout: {
type: 'object',
"x-component": 'mega-layout',
"x-component-props": {
grid: true
},
properties: {
ctl: {
type: 'object',
"x-component": "Children",
"x-component-props": {
children: "{{controllerBtns}}"
}
},
quotedPriceNo: {
type: 'string',
"x-component": "Search",
"x-mega-props": {
},
"x-component-props": {
placeholder: '报价单号'
}
}
}
},
[FORM_FILTER_PATH]: {
type: 'object',
"x-component": "flex-layout",
"x-component-props": {
rowStyle: {
flexWrap: 'nowrap'
},
colStyle: {
marginLeft: 20
}
},
properties: {
PRO_LAYOUT: {
type: 'object',
"x-component": 'mega-layout',
"x-mega-props": {
span: 5
},
"x-component-props": {
inline: true
},
properties: {
purchaseInquiryNo: {
type: 'string',
"x-component-props": {
placeholder: '需求单号'
}
},
details: {
type: 'string',
"x-component-props": {
placeholder: '需求单摘要'
}
},
"[startTime,endTime]": {
type: 'string',
"x-component": "dateSelect",
"x-component-props": {
placeholder: '单据时间（全部）',
}
},
memberName: {
type: 'string',
"x-component-props": {
placeholder: '需求会员'
}
},
}
},
sumbit: {
"x-component": 'Submit',
"x-mega-props": {
span: 1
},
"x-component-props": {
children: '查询'
}
}
}
}
}
}
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