Skip to content

J
jinfa-platform
Commit 1a1cab3f authored by 前端-钟卫鹏's avatar 前端-钟卫鹏
Browse files
Options

Merge branch 'dev-srm' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev-srm

parents 9f399a89 6ff2d931
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 280 additions and 137 deletions
config/routes/procurementRoute/offter.ts
View file @ 1a1cab3f
......@@ -31,6 +31,22 @@ export const offterRoute = [
component: '@/pages/transaction/purchaseAbility/offter/offter'
},
{
// 报价单详情
path: '/memberCenter/procurementAbility/offter/preview',
name: '报价单 详情',
component: '@/pages/transaction/purchaseAbility/offter/detail',
hideInMenu: true,
noMargin: true,
},
{
// 报价单操作
path: '/memberCenter/procurementAbility/offter/detail',
name: '报价单 详情',
component: '@/pages/transaction/purchaseAbility/offter/detail',
hideInMenu: true,
noMargin: true,
},
{
// 采购需求单详情
path: '/memberCenter/procurementAbility/offter/offter/preview',
name: '采购需求单详情',
......@@ -45,6 +61,22 @@ export const offterRoute = [
component: '@/pages/transaction/purchaseAbility/offter/addOffter'
},
{
// 待新增报价单详情
path: '/memberCenter/procurementAbility/addOffter/preview',
name: '待新增报价单 详情',
component: '@/pages/transaction/purchaseAbility/offter/detail',
hideInMenu: true,
noMargin: true,
},
{
// 待新增报价单操作
path: '/memberCenter/procurementAbility/addOffter/detail',
name: '待新增报价单 详情',
component: '@/pages/transaction/purchaseAbility/offter/detail',
hideInMenu: true,
noMargin: true,
},
{
// 采购需求单详情
path: '/memberCenter/procurementAbility/offter/addOffter/preview',
name: '采购需求单详情',
......@@ -59,6 +91,22 @@ export const offterRoute = [
component: '@/pages/transaction/purchaseAbility/offter/auditOffterOne'
},
{
// 待审核报价单(一级)详情
path: '/memberCenter/procurementAbility/auditOffterOne/preview',
name: '待审核报价单(一级) 详情',
component: '@/pages/transaction/purchaseAbility/offter/detail',
hideInMenu: true,
noMargin: true,
},
{
// 待审核报价单(一级)操作
path: '/memberCenter/procurementAbility/auditOffterOne/detail',
name: '待审核报价单(一级) 详情',
component: '@/pages/transaction/purchaseAbility/offter/detail',
hideInMenu: true,
noMargin: true,
},
{
// 采购需求单详情
path: '/memberCenter/procurementAbility/offter/auditOffterOne/preview',
name: '采购需求单详情',
......@@ -73,6 +121,22 @@ export const offterRoute = [
component: '@/pages/transaction/purchaseAbility/offter/auditOffterTwo'
},
{
// 待审核报价单(二级)详情
path: '/memberCenter/procurementAbility/auditOffterTwo/preview',
name: '待审核报价单(二级) 详情',
component: '@/pages/transaction/purchaseAbility/offter/detail',
hideInMenu: true,
noMargin: true,
},
{
// 待审核报价单(二级)操作
path: '/memberCenter/procurementAbility/auditOffterTwo/detail',
name: '待审核报价单(二级) 详情',
component: '@/pages/transaction/purchaseAbility/offter/detail',
hideInMenu: true,
noMargin: true,
},
{
// 采购需求单详情
path: '/memberCenter/procurementAbility/offter/auditOffterTwo/preview',
name: '采购需求单详情',
......@@ -87,6 +151,22 @@ export const offterRoute = [
component: '@/pages/transaction/purchaseAbility/offter/submitOffter'
},
{
// 待提交报价单详情
path: '/memberCenter/procurementAbility/submitOffter/preview',
name: '待提交报价单 详情',
component: '@/pages/transaction/purchaseAbility/offter/detail',
hideInMenu: true,
noMargin: true,
},
{
// 待提交报价单操作
path: '/memberCenter/procurementAbility/submitOffter/detail',
name: '待提交报价单 详情',
component: '@/pages/transaction/purchaseAbility/offter/detail',
hideInMenu: true,
noMargin: true,
},
{
// 采购需求单详情
path: '/memberCenter/procurementAbility/offter/submitOffter/preview',
name: '采购需求单详情',
......
src/pages/transaction/purchaseAbility/components/modalOperate/index.tsx
View file @ 1a1cab3f
......@@ -35,7 +35,7 @@ const ModalOperate: React.FC<IProps> = (props: any) => {
const { setFieldState } = createFormActions()
if (modalType === 'audit') {
onFieldChange$('state').subscribe(({ value }) => {
setFieldState('cause', state => {
setFieldState('auditOpinion', state => {
if (value == 1) {
state.visible = false
} else {
......@@ -79,7 +79,7 @@ const ModalOperate: React.FC<IProps> = (props: any) => {
let params: any = {}
if (modalType === 'audit') {
params.state = value.state;
params.auditOpinion = value.auditOpinion;
value.state !== 1 && (params.auditOpinion = value.auditOpinion);
} else {
params.reason = value.reason
params.reasonTime = new Date(value.reasonTime).getTime();
......
src/pages/transaction/purchaseAbility/offter/addOffter/index.tsx
View file @ 1a1cab3f
......@@ -5,8 +5,7 @@ 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, Dropdown, Menu } from 'antd';
import { DeleteOutlined, DownOutlined, PlusOutlined } from '@ant-design/icons';
import { Row, Col, Space, Button, Typography } from 'antd';
import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
......@@ -14,6 +13,7 @@ import {
OFFTER_INTERNALSTATE_COLOR
} from '../../constants';
import { Badge, Tag } from 'antd';
const { Text } = Typography;
const AddOffter = () => {
console.log('待新增采购需求单');
......@@ -25,22 +25,22 @@ const AddOffter = () => {
key: 'quotedPriceNo',
dataIndex: 'quotedPriceNo',
render: (text: any, record: any) => (
<>
<EyePreview url={`/1`}>{text}</EyePreview>
<div>{record.details}</div>
</>
<Space direction='vertical'>
<EyePreview url={`/memberCenter/procurementAbility/addOffter/preview`}>{text}</EyePreview>
<Text type='secondary'>{record.details}</Text>
</Space>
)
}, {
title: '需求单号/会员',
key: 'purchaseInquiryNo',
dataIndex: 'purchaseInquiryNo',
render: (text: any, record: any) => (
<>
<Space direction='vertical'>
<EyePreview
url={`/memberCenter/procurementAbility/offter/addOffter/preview?id=${record.purchaseInquiryId}&number=${record.purchaseInquiryNo}`}
>{text}</EyePreview>
<div>{record.memberName}</div>
</>
<Text type='secondary'>{record.memberName}</Text>
</Space>
)
}, {
title: '报价截止时间',
......@@ -57,10 +57,6 @@ const AddOffter = () => {
key: 'turn',
dataIndex: 'turn',
}, {
title: '是否中标',
key: 'iSprize',
dataIndex: 'iSprize',
}, {
title: '外部状态',
key: 'externalState',
dataIndex: 'externalState',
......@@ -80,26 +76,9 @@ const AddOffter = () => {
controllerBtns={
<Row>
<Col span={24}>
<Space direction="horizontal" size={16}>
<Button
onClick={() => history.push('/memberCenter/procurementAbility/purchaseInquiry/add')}
type="primary"
icon={<PlusOutlined />}
>新建</Button>
<Space size={16}>
<Button>批量提交审核</Button>
<Dropdown.Button
overlay={
<Menu>
<Menu.Item key='1' icon={<DeleteOutlined />}>
批量删除
</Menu.Item>
</Menu>
}
trigger={['click']}
icon={<DownOutlined />}
>
更多
</Dropdown.Button>
<Button>批量删除</Button>
</Space>
</Col>
</Row>
......
src/pages/transaction/purchaseAbility/offter/auditOffterOne/index.tsx
View file @ 1a1cab3f
......@@ -4,13 +4,15 @@ 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 } from 'antd';
import { Row, Col, Button, Badge, Tag, Space, Typography } from 'antd';
import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE,
OFFTER_INTERNALSTATE_COLOR
} from '../../constants';
const { Text } = Typography;
const AuditOffterOne = () => {
console.log('待新增采购需求单');
const format = (text) => {
......@@ -21,22 +23,22 @@ const AuditOffterOne = () => {
key: 'quotedPriceNo',
dataIndex: 'quotedPriceNo',
render: (text: any, record: any) => (
<>
<EyePreview url={`/1`}>{text}</EyePreview>
<div>{record.details}</div>
</>
<Space direction='vertical'>
<EyePreview url={`/memberCenter/procurementAbility/auditOffterOne/preview`}>{text}</EyePreview>
<Text type='secondary'>{record.details}</Text>
</Space>
)
}, {
title: '需求单号/会员',
key: 'purchaseInquiryNo',
dataIndex: 'purchaseInquiryNo',
render: (text: any, record: any) => (
<>
<Space direction='vertical'>
<EyePreview
url={`/memberCenter/procurementAbility/offter/auditOffterOne/preview?id=${record.purchaseInquiryId}&number=${record.purchaseInquiryNo}`}
>{text}</EyePreview>
<div>{record.memberName}</div>
</>
<Text type='secondary'>{record.memberName}</Text>
</Space>
)
}, {
title: '报价截止时间',
......@@ -53,10 +55,6 @@ const AuditOffterOne = () => {
key: 'turn',
dataIndex: 'turn',
}, {
title: '是否中标',
key: 'iSprize',
dataIndex: 'iSprize',
}, {
title: '外部状态',
key: 'externalState',
dataIndex: 'externalState',
......
src/pages/transaction/purchaseAbility/offter/auditOffterTwo/index.tsx
View file @ 1a1cab3f
......@@ -4,7 +4,7 @@ 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 } from 'antd';
import { Row, Col, Button, Badge, Tag, Space, Typography } from 'antd';
import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
......@@ -12,6 +12,8 @@ import {
OFFTER_INTERNALSTATE_COLOR
} from '../../constants';
const { Text } = Typography
const AuditOffterTwo = () => {
console.log('待新增采购需求单');
const format = (text) => {
......@@ -22,22 +24,22 @@ const AuditOffterTwo = () => {
key: 'quotedPriceNo',
dataIndex: 'quotedPriceNo',
render: (text: any, record: any) => (
<>
<EyePreview url={`/1`}>{text}</EyePreview>
<div>{record.details}</div>
</>
<Space direction='vertical'>
<EyePreview url={`/memberCenter/procurementAbility/auditOffterTwo/preview`}>{text}</EyePreview>
<Text type='secondary'>{record.details}</Text>
</Space>
)
}, {
title: '需求单号/会员',
key: 'purchaseInquiryNo',
dataIndex: 'purchaseInquiryNo',
render: (text: any, record: any) => (
<>
<Space direction='vertical'>
<EyePreview
url={`/memberCenter/procurementAbility/offter/auditOffterTwo/preview?id=${record.purchaseInquiryId}&number=${record.purchaseInquiryNo}`}
>{text}</EyePreview>
<div>{record.memberName}</div>
</>
<Text type='secondary'>{record.memberName}</Text>
</Space>
)
}, {
title: '报价截止时间',
......@@ -54,10 +56,6 @@ const AuditOffterTwo = () => {
key: 'turn',
dataIndex: 'turn',
}, {
title: '是否中标',
key: 'iSprize',
dataIndex: 'iSprize',
}, {
title: '外部状态',
key: 'externalState',
dataIndex: 'externalState',
......
src/pages/transaction/purchaseAbility/offter/demand/index.tsx
View file @ 1a1cab3f
......@@ -4,7 +4,7 @@ import { history } from 'umi';
import style from './index.less';
import { ArrowLeftOutlined, QuestionCircleOutlined } from '@ant-design/icons';
import { StandardTable } from 'god';
import { GetPurchasePurchaseInquiryDetailsResponse } from '@/services/PurchaseApi/id4172';
import { GetPurchasePurchaseInquiryDetailsResponse } from '@/services/PurchaseApi/id4801';
import { PublicApi } from '@/services/api';
import DetailDrawer from '../../components/detailDrawer';
import EyePreview from '@/components/EyePreview';
......@@ -55,7 +55,7 @@ const Detail: React.FC<{}> = () => {
current: '1',
pageSize: '1',
}
PublicApi.getPurchaseQuotedPricePurchaseInquiryDetails(parmas).then(res => {
PublicApi.getPurchasePurchaseInquiryDetails(parmas).then(res => {
if (res.code === 1000) {
setData(res.data)
}
......
src/pages/transaction/purchaseAbility/offter/detail/index.less 0 → 100644
View file @ 1a1cab3f
.anchorWrap {
:global {
.ant-anchor {
display: flex;
.ant-anchor-ink {
display: none;
}
.ant-anchor-link {
padding: 14px 0 !important;
margin: 0 16px;
.ant-anchor-link-title {
font-size: 14px;
color: #909399;
}
}
.ant-anchor-link-active {
position: relative;
border-bottom: 2px solid #00B37A;
box-sizing: border-box;
.ant-anchor-link-title {
font-weight: 500;
color: #303133;
}
}
}
}
.titleBox {
padding: 8px 16px;
}
.anchorBox {
display: flex;
padding: 0 16px;
}
}
/** 卡片样式 */
.card {
margin: 24px;
:global {
.ant-card {
margin-bottom: 24px;
.ant-card-head {
> .ant-card-head-wrapper {
padding: 12px 0;
}
}
.ant-card-extra {
padding: 0 0;
.ant-radio-button-wrapper {
height: 24px;
line-height: 23px;
}
.ant-radio-button-wrapper:hover {
color: #606266;
}
.ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
color: #fff;
background: #6B778C;
border-color: #6B778C;
}
}
}
.god-table-control {
margin-bottom: 0;
}
}
.list {
display: flex;
h5 {
margin-bottom: 2em;
}
.listLable {
flex: 0 0 25%;
color: #909399;
}
}
}
src/pages/transaction/purchaseAbility/offter/detail/index.tsx 0 → 100644
View file @ 1a1cab3f
This diff is collapsed.
src/pages/transaction/purchaseAbility/offter/inquiry/index.tsx
View file @ 1a1cab3f
import React from 'react';
import Table from '../../components/table'
import { Button } from 'antd';
import { Button, Space, Typography, Tag } from 'antd';
import { ColumnType } from 'antd/lib/table/interface';
import EyePreview from '@/components/EyePreview';
import moment from 'moment';
import { PublicApi } from '@/services/api';
import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
} from '../../constants';
const { Text } = Typography
const Inquiry = () => {
console.log('采购需求单查询');
const format = (text) => {
return <>{moment(text).format("YYYY-MM-DD HH:mm:ss")}</>
}
......@@ -15,12 +20,17 @@ const Inquiry = () => {
title: '需求单号',
key: 'purchaseInquiryNo',
dataIndex: 'purchaseInquiryNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/procurementAbility/purchaseInquiry/inquiry/preview?id=${record.id}&number=${record.purchaseInquiryNo}`}>{text}</EyePreview>
render: (text: any, record: any) => (
<Space direction='vertical'>
<EyePreview
url={`/memberCenter/procurementAbility/purchaseInquiry/inquiry/preview?id=${record.id}&number=${record.purchaseInquiryNo}`}>{text}</EyePreview>
<Text type='secondary'>{record.details}</Text>
</Space>
)
}, {
title: '需求摘要',
key: 'details',
dataIndex: 'details',
title: '需求会员',
key: 'memberName',
dataIndex: 'memberName',
}, {
title: '交付日期',
key: 'deliveryTime',
......@@ -40,15 +50,12 @@ const Inquiry = () => {
title: '外部状态',
key: 'externalState',
dataIndex: 'externalState',
}, {
title: '内部状态',
key: 'interiorState',
dataIndex: 'interiorState',
render: (text: any, record: any) => <Tag color={OFFTER_EXTERNALSTATE_COLOR[text]}>{OFFTER_EXTERNALSTATE[text]}</Tag>
}, {
title: '操作',
key: 'operate',
dataIndex: 'operate',
render: (text: any, record: any) => <Button type='link'>作废</Button>
render: (text: any, record: any) => <Button type='link'>报价</Button>
}];
return (
<Table
......
src/pages/transaction/purchaseAbility/offter/offter/index.tsx
View file @ 1a1cab3f
......@@ -10,7 +10,8 @@ import {
OFFTER_INTERNALSTATE,
OFFTER_INTERNALSTATE_COLOR
} from '../../constants';
import { Badge, Tag } from 'antd';
import { Badge, Tag, Space, Typography, Button } from 'antd';
const { Text } = Typography;
const Offter = () => {
console.log('采购需求单查询');
......@@ -22,22 +23,22 @@ const Offter = () => {
key: 'quotedPriceNo',
dataIndex: 'quotedPriceNo',
render: (text: any, record: any) => (
<>
<EyePreview url={`/1`}>{text}</EyePreview>
<div>{record.details}</div>
</>
<Space direction='vertical'>
<EyePreview url={`/memberCenter/procurementAbility/offter/preview?id=${record.id}&number=${record.quotedPriceNo}`}>{text}</EyePreview>
<Text type='secondary'>{record.details}</Text>
</Space>
)
}, {
title: '需求单号/会员',
key: 'purchaseInquiryNo',
dataIndex: 'purchaseInquiryNo',
render: (text: any, record: any) => (
<>
<Space direction='vertical'>
<EyePreview
url={`/memberCenter/procurementAbility/offter/offter/preview?id=${record.purchaseInquiryId}&number=${record.purchaseInquiryNo}`}
>{text}</EyePreview>
<div>{record.memberName}</div>
</>
<Text type='secondary'>{record.memberName}</Text>
</Space>
)
}, {
title: '报价截止时间',
......
src/pages/transaction/purchaseAbility/offter/submitOffter/index.tsx
View file @ 1a1cab3f
......@@ -4,7 +4,7 @@ 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 } from 'antd';
import { Row, Col, Button, Badge, Tag, Space, Typography } from 'antd';
import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
......@@ -12,6 +12,8 @@ import {
OFFTER_INTERNALSTATE_COLOR
} from '../../constants';
const { Text } = Typography
const SubmitOffter = () => {
console.log('待新增采购需求单');
const format = (text) => {
......@@ -22,22 +24,22 @@ const SubmitOffter = () => {
key: 'quotedPriceNo',
dataIndex: 'quotedPriceNo',
render: (text: any, record: any) => (
<>
<EyePreview url={`/1`}>{text}</EyePreview>
<div>{record.details}</div>
</>
<Space direction='vertical'>
<EyePreview url={`/memberCenter/procurementAbility/submitOffter/preview`}>{text}</EyePreview>
<Text type='secondary'>{record.details}</Text>
</Space>
)
}, {
title: '需求单号/会员',
key: 'purchaseInquiryNo',
dataIndex: 'purchaseInquiryNo',
render: (text: any, record: any) => (
<>
<Space direction='vertical'>
<EyePreview
url={`/memberCenter/procurementAbility/offter/submitOffter/preview?id=${record.purchaseInquiryId}&number=${record.purchaseInquiryNo}`}
>{text}</EyePreview>
<div>{record.memberName}</div>
</>
<Text type='secondary'>{record.memberName}</Text>
</Space>
)
}, {
title: '报价截止时间',
......@@ -54,10 +56,6 @@ const SubmitOffter = () => {
key: 'turn',
dataIndex: 'turn',
}, {
title: '是否中标',
key: 'iSprize',
dataIndex: 'iSprize',
}, {
title: '外部状态',
key: 'externalState',
dataIndex: 'externalState',
......
src/pages/transaction/purchaseAbility/purchaseInquiry/addInquiry/index.tsx
View file @ 1a1cab3f
......@@ -5,7 +5,7 @@ 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, Dropdown, Menu, Tag, Badge, Popconfirm } from 'antd';
import { Row, Col, Space, Button, Dropdown, Menu, Tag, Badge, Popconfirm, Typography } from 'antd';
import { DeleteOutlined, DownOutlined, PlusOutlined } from '@ant-design/icons';
import {
OFFTER_EXTERNALSTATE,
......@@ -14,22 +14,23 @@ import {
OFFTER_INTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE_TYPE
} from '../../constants';
const { Text } = Typography;
const AddInquiry = () => {
const ref = useRef<any>({});
const format = (text) => {
return <>{moment(text).format("YYYY-MM-DD HH:mm:ss")}</>
}
const columns: ColumnType<any>[] = [{
title: '需求单号',
title: '需求单号/摘要',
key: 'purchaseInquiryNo',
dataIndex: 'purchaseInquiryNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/procurementAbility/purchaseInquiry/addInquiry/preview?id=${record.id}&number=${record.purchaseInquiryNo}`}>{text}</EyePreview>
}, {
title: '需求摘要',
key: 'details',
dataIndex: 'details',
render: (text: any, record: any) => (
<Space direction='vertical'>
<EyePreview
url={`/memberCenter/procurementAbility/purchaseInquiry/addInquiry/preview?id=${record.id}&number=${record.purchaseInquiryNo}`}>{text}</EyePreview>
<Text type="secondary">{record.details}</Text>
</Space>
)
}, {
title: '交付日期',
key: 'deliveryTime',
......
src/pages/transaction/purchaseAbility/purchaseInquiry/auditInquiryOne/index.tsx
View file @ 1a1cab3f
......@@ -5,14 +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, Button, Tag, Badge } from 'antd';
import { Row, Col, Button, Tag, Badge, Typography, Space } from 'antd';
import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE,
OFFTER_INTERNALSTATE_COLOR
} from '../../constants';
const { Text } = Typography;
const AuditInquiryOne = () => {
const ref = useRef<any>({});
const format = (text) => {
......@@ -27,15 +27,16 @@ const AuditInquiryOne = () => {
}
}
const columns: ColumnType<any>[] = [{
title: '需求单号',
title: '需求单号/摘要',
key: 'purchaseInquiryNo',
dataIndex: 'purchaseInquiryNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/procurementAbility/purchaseInquiry/auditInquiryOne/preview?id=${record.id}&number=${record.purchaseInquiryNo}`}>{text}</EyePreview>
}, {
title: '需求摘要',
key: 'details',
dataIndex: 'details',
render: (text: any, record: any) => (
<Space direction='vertical'>
<EyePreview
url={`/memberCenter/procurementAbility/purchaseInquiry/auditInquiryOne/preview?id=${record.id}&number=${record.purchaseInquiryNo}`}>{text}</EyePreview>
<Text type="secondary">{record.details}</Text>
</Space>
)
}, {
title: '交付日期',
key: 'deliveryTime',
......
src/pages/transaction/purchaseAbility/purchaseInquiry/auditInquiryTwo/index.tsx
View file @ 1a1cab3f
......@@ -5,14 +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, Button, Tag, Badge } from 'antd';
import { Row, Col, Button, Tag, Badge, Typography, Space } from 'antd';
import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE,
OFFTER_INTERNALSTATE_COLOR
} from '../../constants';
const { Text } = Typography;
const AuditInquiryTwo = () => {
const ref = useRef<any>({});
const format = (text) => {
......@@ -27,15 +27,16 @@ const AuditInquiryTwo = () => {
}
}
const columns: ColumnType<any>[] = [{
title: '需求单号',
title: '需求单号/摘要',
key: 'purchaseInquiryNo',
dataIndex: 'purchaseInquiryNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/procurementAbility/purchaseInquiry/auditInquiryTwo/preview?id=${record.id}&number=${record.purchaseInquiryNo}`}>{text}</EyePreview>
}, {
title: '需求摘要',
key: 'details',
dataIndex: 'details',
render: (text: any, record: any) => (
<Space direction='vertical'>
<EyePreview
url={`/memberCenter/procurementAbility/purchaseInquiry/auditInquiryTwo/preview?id=${record.id}&number=${record.purchaseInquiryNo}`}>{text}</EyePreview>
<Text type="secondary">{record.details}</Text>
</Space>
)
}, {
title: '交付日期',
key: 'deliveryTime',
......
src/pages/transaction/purchaseAbility/purchaseInquiry/inquiry/index.tsx
View file @ 1a1cab3f
import React, { useRef, useState } from 'react';
import Table from '../../components/table'
import { history } from 'umi';
import { Button, Tag, Badge } from 'antd';
import { Button, Tag, Badge, Typography, Space } from 'antd';
import { ColumnType } from 'antd/lib/table/interface';
import EyePreview from '@/components/EyePreview';
import moment from 'moment';
......@@ -14,6 +13,8 @@ import {
} from '../../constants';
import ModalOperate from '../../components/modalOperate';
const { Text } = Typography;
const Inquiry = () => {
const ref = useRef<any>({});
const [id, setId] = useState<number>();
......@@ -22,15 +23,16 @@ const Inquiry = () => {
return <>{moment(text).format("YYYY-MM-DD HH:mm:ss")}</>
}
const columns: ColumnType<any>[] = [{
title: '需求单号',
title: '需求单号/摘要',
key: 'purchaseInquiryNo',
dataIndex: 'purchaseInquiryNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/procurementAbility/purchaseInquiry/inquiry/preview?id=${record.id}&number=${record.purchaseInquiryNo}`}>{text}</EyePreview>
}, {
title: '需求摘要',
key: 'details',
dataIndex: 'details',
render: (text: any, record: any) => (
<Space direction='vertical'>
<EyePreview
url={`/memberCenter/procurementAbility/purchaseInquiry/inquiry/preview?id=${record.id}&number=${record.purchaseInquiryNo}`}>{text}</EyePreview>
<Text type="secondary">{record.details}</Text>
</Space>
)
}, {
title: '交付日期',
key: 'deliveryTime',
......
src/pages/transaction/purchaseAbility/purchaseInquiry/submitInquiry/index.tsx
View file @ 1a1cab3f
......@@ -5,14 +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, Button, Tag, Badge } from 'antd';
import { Row, Col, Button, Tag, Badge, Typography, Space } from 'antd';
import {
OFFTER_EXTERNALSTATE,
OFFTER_EXTERNALSTATE_COLOR,
OFFTER_INTERNALSTATE,
OFFTER_INTERNALSTATE_COLOR
} from '../../constants';
const { Text } = Typography;
const SubmitInquiry = () => {
const ref = useRef<any>({});
const format = (text) => {
......@@ -27,15 +27,16 @@ const SubmitInquiry = () => {
}
}
const columns: ColumnType<any>[] = [{
title: '需求单号',
title: '需求单号/摘要',
key: 'purchaseInquiryNo',
dataIndex: 'purchaseInquiryNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/procurementAbility/purchaseInquiry/submitInquiry/preview?id=${record.id}&number=${record.purchaseInquiryNo}`}>{text}</EyePreview>
}, {
title: '需求摘要',
key: 'details',
dataIndex: 'details',
render: (text: any, record: any) => (
<Space direction='vertical'>
<EyePreview
url={`/memberCenter/procurementAbility/purchaseInquiry/submitInquiry/preview?id=${record.id}&number=${record.purchaseInquiryNo}`}>{text}</EyePreview>
<Text type="secondary">{record.details}</Text>
</Space>
)
}, {
title: '交付日期',
key: 'deliveryTime',
......
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