Skip to content

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

修改确认需求报价 审核按钮没出现问题

parent 74768ba0
Hide whitespace changes
Inline Side-by-side
Showing with 250 additions and 207 deletions
config/routes/tranactionRoute/comfirmDemandPosts.ts
View file @ 421a335b
......@@ -48,6 +48,13 @@ export default [
component: '@/pages/transaction/enquirySubmit/components/detail',
hideInMenu: true,
},
// 待提交审核报价单 - 查看详情
{
path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/toSubmit/detail',
name: 'toSubmitInquiryPreview',
component: '@/pages/transaction/enquiryOfferConfirm/toSubmit/detail',
hideInMenu: true,
},
// 待审核报价单（一级） - 列表
{
path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOne',
......@@ -70,7 +77,7 @@ export default [
},
// 待审核报价单（一级） - 详情
{
path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOne/datail',
path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOne/detail',
name: 'enquiryOneDatail',
component: '@/pages/transaction/enquiryOfferConfirm/enquiryOne/detail',
hideInMenu: true,
......@@ -97,7 +104,7 @@ export default [
},
// 待审核报价单（二级） - 详情
{
path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryTwo/datail',
path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryTwo/detail',
name: 'enquiryTwoDatail',
component: '@/pages/transaction/enquiryOfferConfirm/enquiryTwo/detail',
hideInMenu: true,
......@@ -124,7 +131,7 @@ export default [
},
// 待确认报价单 - 详情
{
path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferComfirmSearch/datail',
path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferComfirmSearch/detail',
name: 'enquiryOfferComfirmSearchDatail',
component: '@/pages/transaction/enquiryOfferConfirm/enquiryOfferComfirmSearch/detail',
hideInMenu: true,
......
config/routes/tranactionRoute/demandQduote.ts
View file @ 421a335b
......@@ -53,6 +53,13 @@ export default [{
component: '@/pages/transaction/enquiryOffer/toAddSubmit/detail',
hideInMenu: true,
},
// 待新增报价单-报价
{
path: '/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/quote',
name: 'addEnquiry',
component: '@/pages/transaction/enquiryOffer/toAddSubmit/detail',
hideInMenu: true,
},
// 待新增报价单-编辑
{
path: '/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/edit',
......
src/pages/transaction/common/statusList.ts
View file @ 421a335b
......@@ -33,8 +33,8 @@ export const TimeList = [
/**
* @description: 需求单发布状态筛选
* @param {type}
* @return {type} 内
* @param {type} 外部
* @return {type} 1.提交需求单 2.审核需求单 3.提交报价单 4.确认报价单 5.完成 6.审核不通过 7.取消报价单
*/
export const filterExternalStateList = [
{
......
src/pages/transaction/common/tableStatusList.tsx
View file @ 421a335b
......@@ -157,6 +157,7 @@ export const inquiryQuoteOuterState = (text:any) => {
/************************************确认询价报价************************************ */
/**
* @description: 外部状态查询
* @author: HJX
* @param {type}
* @return {type} 1.待提交询价单 2.待提交报价单 3.待确认报价单 4.报价通过 5.报价不通过
*/
......@@ -171,6 +172,7 @@ export const confirmExternalState = (text:any) => {
}
/**
* @description: 确认询价报价-报价单查询-内部状态查询
* @author: HJX
* @param {type}
* @return {type} 1.待提交审核 2.待审核 3.待审核 4.审核通过 5.完成 6.审核不通过
*/
......@@ -183,5 +185,75 @@ export const confirmInteriorState = (text:any) => {
text === 5 ? component = <Badge status='processing' text="完成" />:
component = <Badge status='error' text="审核不通过" />
return component;
}
/***************************确认需求报价************************** */
/**
* @description: 确认需求报价-外部状态查询
* @author: HJX
* @param {type}
* @return {type} 1.待提交需求单 2.待审核需求单 3.待提交报价单 4.待确认报价单 5.确认通过 6.确认不通过
*/
export const demandExternalState = (text:any) => {
let component: ReactNode = null;
text === 1 ? component = <Tag color="default">待提交需求单</Tag>:
text === 2 ? component = <Tag color="default">待审核需求单</Tag>:
text === 3 ? component = <Tag color="processing">待提交报价单</Tag>:
text === 4 ? component = <Tag color="warning">待确认报价单</Tag>:
text === 4 ? component = <Tag color="success">确认通过</Tag>:
component = <Tag color="error">报价不通过</Tag>
return component;
}
/**
* @description: 确认需求报价-内部状态查询
* @author: HJX
* @param {type}
* @return {type} 1.待提交审核 2.待审核报价单 3.待审核报价单 4.待提交报价单 5.完成（审核通过） 6.审核不通过
*/
export const demandInteriorState = (text:any) => {
let component: ReactNode = null;
text === 1 ? component = <Badge status='default' text="待提交审核" />:
text === 2 ? component = <Badge status='warning' text="待审核报价单" />:
text === 3 ? component = <Badge status='warning' text="待审核报价单" />:
text === 4 ? component = <Badge status='processing' text="待提交报价单" />:
text === 5 ? component = <Badge status='processing' text="完成（审核通过）" />:
component = <Badge status='error' text="审核不通过" />
return component;
}
/********************************需求报价********************************* */
/**
* @description: 需求报价-外部状态查询
* @author: HJX
* @param {type}
* @return {type} 1.提交需求单 2.审核需求单 3.提交报价单 4.确认报价单 5.完成 6.审核不通过 7.取消报价单
*/
export const demandQuoteExternalState = (text:any) => {
let component: ReactNode = null;
text === 1 ? component = <Tag color="default">待提交需求单</Tag>:
text === 2 ? component = <Tag color="default">待审核需求单</Tag>:
text === 3 ? component = <Tag color="processing">待提交报价单</Tag>:
text === 4 ? component = <Tag color="warning">待确认报价单</Tag>:
text === 4 ? component = <Tag color="success">确认通过</Tag>:
component = <Tag color="error">报价不通过</Tag>
return component;
}
/**
* @description: 需求报价-内部状态查询
* @author: HJX
* @param {type}
* @return {type} 1.新增需求单 2.审核需求单一级 3.审核需求单二级 4.提交需求单 5.完成 6.审核不通过 7.取消报价单
*/
export const demandQuoteInteriorState = (text:any) => {
let component: ReactNode = null;
text === 1 ? component = <Badge status='default' text="新增需求单" />:
text === 2 ? component = <Badge status='warning' text="审核需求单一级" />:
text === 3 ? component = <Badge status='warning' text="审核需求单二级" />:
text === 4 ? component = <Badge status='processing' text="提交需求单" />:
text === 5 ? component = <Badge status='success' text="完成" />:
text === 6 ? component = <Badge status='error' text="审核不通过" />:
component = <Badge status='error' text="审核不通过" />
return component;
}
\ No newline at end of file
src/pages/transaction/confirmInquiryQuote/components/details.tsx
View file @ 421a335b
......@@ -91,62 +91,7 @@ const Details: React.FC<parmas> = (props) => {
}
})
// 模拟数据
const [data, setdata] = useState<any>({
id: 91,
inquiryListNo: 'SD2015PPLJ',
quotationNo: 'BPTY12',
details: '阿珍爱上阿强',
memberName: 'wutiaoren',
deliveryTime: '2020-10-14 15:37:00',
quotationAsTime: '2020-10-13 15:37:00',
voucherTime: '2020-10-13 15:37:00',
externalState: 1,
interiorState: 1,
fullAddress: '东莞市石龙镇西葫芦53号',
offer: '报价要求',
paymentType: '付款方式',
taxes: '税费要求',
logistics: '物流要求',
packRequire: '包装要求',
otherRequire: '其他要求',
minimumOrder: 1000,
inquiryListProductRequests: [{
id: 1,
productId: 10,
productName: 'APPLE Pro Max 12',
inquiryListNo: '智能手机',
brand: 'APPLE',
nuit: '台',
purchaseQuantity: 1,
productQuotationId: 20,
money: 8699,
pric: 8699
}],
externalInquiryListLogResponses: [{
id: 200,
inquiryListId: 63,
roleName: '管理员',
state: 1,
operation: '操作',
operationTime: '2020-10-13 15:37:00',
auditOpinion: '通过'
}],
interiorInquiryListLogResponses: [{
id: 200,
inquiryListId: 63,
roleName: '管理员',
state: 1,
operation: '操作',
operationTime: '2020-10-13 15:37:00',
auditOpinion: '通过',
department: '销售部',
position: '经理'
}],
enclosureUrls: [{
name: '我是附件.doc',
url: 'http://www.hao123.com'
}]
});
const [data, setdata] = useState<any>({});
// 询价商品
const inquiryGoods: ColumnType<any>[] = [{
title: 'ID',
......@@ -512,7 +457,7 @@ const Details: React.FC<parmas> = (props) => {
</Card>
<Card className={style.item_wrap}>
<div className={style.mainCol_title}>附件</div>
{/* <div className={style.upload_data}>
<div className={style.upload_data}>
{
data.enclosureUrls &&
data.enclosureUrls.map((v,i) => (
......@@ -524,7 +469,7 @@ const Details: React.FC<parmas> = (props) => {
</div>
))
}
</div> */}
</div>
</Card>
<Card className={style.item_wrap}>
{
......
src/pages/transaction/confirmInquiryQuote/components/reviewList.tsx
View file @ 421a335b
......@@ -61,7 +61,6 @@ const ReviewList: React.FC<parmas> = (props) => {
title: '被询价会员',
key: 'memberName',
dataIndex: 'memberName',
render: (text: any, record: any) => format(text)
},
{
title: '报价截止时间',
......
src/pages/transaction/confirmInquiryQuote/pendingReviewTwo/index.tsx
View file @ 421a335b
......@@ -73,13 +73,13 @@ const PendingReviewTwo: React.FC<{}> = () => {
key: 'quotationNo',
dataIndex: 'quotationNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/pendingSubmit/details?id=${record.id}&page_type=1&view=2`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/pendingSubmit/details?id=${record.id}&view=2`}>{text}</EyePreview>
}, {
title: '询价单号',
key: 'inquiryListNo',
dataIndex: 'inquiryListNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/pendingSubmit/details?id=${record.id}&page_type=1&view=1`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/pendingSubmit/details?id=${record.id}&view=1`}>{text}</EyePreview>
}]
return (
......
src/pages/transaction/confirmInquiryQuote/pendingSubmit/index.tsx
View file @ 421a335b
......@@ -30,13 +30,13 @@ const PendingSubmit: React.FC<{}> = () => {
key: 'quotationNo',
dataIndex: 'quotationNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/pendingSubmit/details?id=${record.id}&page_type=1&view=2`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/pendingSubmit/details?id=${record.id}&view=2`}>{text}</EyePreview>
}, {
title: '询价单号',
key: 'inquiryListNo',
dataIndex: 'inquiryListNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/pendingSubmit/details?id=${record.id}&page_type=1&view=1`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/pendingSubmit/details?id=${record.id}&view=1`}>{text}</EyePreview>
}, {
title: '询价单摘要',
key: 'details',
......
src/pages/transaction/confirmInquiryQuote/pendingSubmitReview/index.tsx
View file @ 421a335b
......@@ -29,13 +29,13 @@ const PendingSubmitReview: React.FC<{}> = () => {
key: 'quotationNo',
dataIndex: 'quotationNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/pendingSubmitReview/details?id=${record.id}&page_type=5&view=2`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/pendingSubmitReview/details?id=${record.id}&view=2`}>{text}</EyePreview>
},{
title: '询价单号',
key: 'inquiryListNo',
dataIndex: 'inquiryListNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/pendingSubmitReview/details?id=${record.id}&page_type=5&view=1`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/pendingSubmitReview/details?id=${record.id}&view=1`}>{text}</EyePreview>
}, {
title: '报价单摘要',
key: 'details',
......
src/pages/transaction/confirmInquiryQuote/quoteOrder/index.tsx
View file @ 421a335b
......@@ -27,13 +27,13 @@ const EnquiryOrder: React.FC<{}> = (props) => {
key: 'quotationNo',
dataIndex: 'quotationNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/quoteOrder/details?id=${record.id}&page_type=4&view=2`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/quoteOrder/details?id=${record.id}&view=2`}>{text}</EyePreview>
},{
title: '询价单号',
key: 'inquiryListNo',
dataIndex: 'inquiryListNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/quoteOrder/details?id=${record.id}&page_type=4&view=1`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/quoteOrder/details?id=${record.id}&view=1`}>{text}</EyePreview>
}, {
title: '报价单摘要',
key: 'details',
......
src/pages/transaction/enquiryOffer/enquirySearch/index.tsx
View file @ 421a335b
......@@ -34,8 +34,7 @@ import {
} from 'god/dist/src/standard-table/TableController';
import EyePreview from '@/components/EyePreview';
import StatusSwitch from '@/components/StatusSwitch';
import {interiorState,interiorStateTwo,
enquirySearchInteriorState,enquirySearchexternalState} from '../../common/tableStatusList'
import {demandQuoteExternalState} from '../../common/tableStatusList'
import statuStyle from '../../common/colorTag'
import NiceForm from '@/components/NiceForm';
import {timeRange} from '@/utils/index'
......@@ -130,11 +129,27 @@ const List:React.FC<{listParams}> = (props) => {
filterMultiple: false,
onFilter: (value, record) => record.externalState === value,
render: (text: any, reconds) =>
enquirySearchexternalState(text)
demandQuoteExternalState(text)
},
{
title:'操作',
key:'option',
dataIndex:'option',
align:'center',
render: (text: any, reconds) =>
<Button
type='link'
disabled={reconds.externalState !== 3 && reconds.externalState !== 6}
onClick={() => handleQuote(reconds.externalState, reconds.id)}
>报价
</Button>
}
]
]
// 提交报价
const handleQuote = (recordId: number, id: any) => {
history.push(`/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/add?id=${id}`);
}
useEffect(()=> {
},[])
......
src/pages/transaction/enquiryOfferConfirm/components/detail.tsx
View file @ 421a335b
......@@ -20,8 +20,7 @@ import {PageStatus,usePageStatus} from '@/hooks/usePageStatus'
import { dockingColumn,externalColumn,interiorColumn } from '../../common/detailFormColumnType'
import moment from 'moment'
import style from './index.less'
import {interiorState,interiorStateTwo,enquiryOfferConfirmSearchInteriorState,
enquirySearchexternalState} from '../../common/tableStatusList'
import {demandExternalState, demandInteriorState} from '../../common/tableStatusList'
import statuStyle from '../../common/colorTag'
import RroductModal from '../components/productModal'
......@@ -50,12 +49,14 @@ interface dataInfoType {
totalVolume: number,
totalWeight: number,
freightPrice: number,
settlementWay: string
settlementWay: string,
pagetype?: number,
operation?: number // 用于显示操作按钮
}
const detailInfo: React.FC<{}> = () => {
const detailInfo: React.FC<dataInfoType> = (props) => {
const ref = useRef<any>({})
const [pagetype, setpagetype] = useState(history.location.query.page_type)
const { pagetype, operation } = props
let interiorStateList = []
let [isextraOption, setIsextraOption] = useState(false)
const [platType, setplatType] = useState(1) //需求对接类型
......@@ -529,34 +530,38 @@ const detailInfo: React.FC<{}> = () => {
</>
}
extra={
(isextraOption &&
<>
{
(pagetype == 1 || pagetype == 2 || pagetype == 5) &&
{(operation === 1 && (pagetype === 1 || pagetype === 2 || pagetype === 5)) &&
<>
<Button onClick={() => setvisible(true)}>
<StopOutlined />
pagetype == 5 ? '不接受报价':'审核不通过'
</Button>
<Button onClick={() => setvisible(true)} className={style['saveBtn']}>
<CheckSquareOutlined />
pagetype == 5 ? '接受报价':'审核通过'
</Button>
<Button type="primary" onClick={() => setvisible(true)}><CheckSquareOutlined />审核</Button>
</>
}
{
(pagetype == 3) &&
<Button type="primary" onClick={() => handlediaSubmit(1)}>
<CheckSquareOutlined />
提交审核
</Button>
}
{(operation === 1 && pagetype === 3) && <Button type="primary" onClick={() => handlediaSubmit(1)}><CheckSquareOutlined />提交审核</Button>}
</>
// (isextraOption &&
// <>
// {
// (pagetype == 1 || pagetype == 2 || pagetype == 5) &&
// <>
// <Button onClick={() => setvisible(true)}>
// <StopOutlined />
// pagetype == 5 ? '不接受报价':'审核不通过'
// </Button>
// <Button onClick={() => setvisible(true)} className={style['saveBtn']}>
// <CheckSquareOutlined />
// pagetype == 5 ? '接受报价':'审核通过'
// </Button>
// </>
// }
// {
// (pagetype == 3) &&
// <Button type="primary" onClick={() => handlediaSubmit(1)}>
// <CheckSquareOutlined />
// 提交审核
// </Button>
// }
</>)
// </>)
}
content={
<div className={style['headerMain']}>
......@@ -592,21 +597,13 @@ const detailInfo: React.FC<{}> = () => {
<div className={style['headerMain-left-option']}>
<div>外部状态：</div>
<div>
{
dataInfo.externalState == 1 ? <><span style={statuStyle.default}>待提交需求单</span></> :
dataInfo.externalState == 3 ? <><span style={statuStyle.warn}>审核不通过需求单</span></> :
''
}
{demandExternalState(dataInfo.externalState)}
</div>
</div>
<div className={style['headerMain-left-option']}>
<div>内部状态：</div>
<div>
{
enquiryOfferConfirmSearchInteriorState(dataInfo.interiorState)//4
}
{demandInteriorState(dataInfo.interiorState)}
</div>
</div>
......
src/pages/transaction/enquiryOfferConfirm/components/formleftIndex.tsx
View file @ 421a335b
......@@ -34,10 +34,7 @@ import {
} from 'god/dist/src/standard-table/TableController';
import EyePreview from '@/components/EyePreview';
import StatusSwitch from '@/components/StatusSwitch';
import {
interiorState, interiorStateTwo,
enquirySearchInteriorState, enquirySearchexternalState
} from '../../common/tableStatusList'
import { demandExternalState, demandInteriorState } from '../../common/tableStatusList'
import statuStyle from '../../common/colorTag'
import NiceForm from '@/components/NiceForm';
import { timeRange } from '@/utils/index'
......@@ -72,13 +69,13 @@ const List: React.FC<listParams> = (props) => {
* @return {type}
*/
const handleToDetail = (type, id) => {
if(props.type === 1){
if (props.type === 1) {
if (type === 1) {
history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferSearch/rfq/preview?id=${id}`)
} else {
history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferSearch/inquiry/preview?id=${id}`)
}
}else if(props.type === 2){
} else if (props.type === 2) {
if (type === 1) {
history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferComfirmSearch/enquiryViewDetail?id=${id}`)
} else {
......@@ -87,18 +84,53 @@ const List: React.FC<listParams> = (props) => {
}
}
const fetchData = async (params: any) => {
if(props.type === 1){
if (props.type === 1) {
const res = await PublicApi.getOrderConfirmationQuotationList(params);
return res.data
}else if(props.type === 2){//待确认
const res = await PublicApi.getOrderPendingReviewListList(params);
} else if (props.type === 2) {//待确认
const res = await PublicApi.getOrderPendingReviewListList(params);
return res.data
}
}
// 确认报价
const hendleSubmitQuote = (id: any) => {
PublicApi.postOrderToBeConfirmed({id, state: 1}).then(res => {
if(res.code === 1000) {
ref.current.reload();
}
})
}
const column: ColumnType<any> = {
title: '操作',
key: 'option',
dataIndex: 'option',
align: 'center',
render: (text: any, record: any) =>
<Popconfirm
title="确定通过报价吗？"
okText="是"
cancelText="否"
disabled={record.interiorState !== 4}
onConfirm={() => hendleSubmitQuote(record.id)}
>
<Button
disabled={record.interiorState !== 4}
type='link'
>确认报价</Button>
</Popconfirm>
}
const columnsFn = () => {
let obje: ColumnType<any> = {}
if (props.type === 2) {
obje = column
}
return obje
}
const columns: ColumnType<any>[] = [
{
title: '报价单号',
......@@ -115,7 +147,7 @@ const List: React.FC<listParams> = (props) => {
dataIndex: 'requisitionFormNo',
align: 'center',
render: (text: any, records: any) => <EyePreview type="button" handleClick={() => {
handleToDetail(1, records.requisitionId)//需求单id
handleToDetail(1, records.id)//需求单id
}}>{text}</EyePreview>
},
{
......@@ -149,15 +181,8 @@ const List: React.FC<listParams> = (props) => {
key: 'externalState',
dataIndex: 'externalState',
align: 'center',
render: (text: any, reconds) => {
let component: ReactNode = null
if (text == 3) {
component = <><span style={statuStyle.warn}>审核不通过需求单</span></>
} else if (text == 1) {
component = <><span style={statuStyle.default}>待提交需求单</span></>
}
return component
}
render: (text: any) =>
demandExternalState(text)
},
{
title: '内部状态',
......@@ -165,10 +190,9 @@ const List: React.FC<listParams> = (props) => {
dataIndex: 'interiorState',
align: 'center',
render: (text: any) =>
enquirySearchInteriorState(text)
}
demandInteriorState(text)
},
columnsFn()
]
useEffect(() => {
......
src/pages/transaction/enquiryOfferConfirm/components/index.tsx
View file @ 421a335b
......@@ -34,7 +34,7 @@ import {
} from 'god/dist/src/standard-table/TableController';
import EyePreview from '@/components/EyePreview';
import StatusSwitch from '@/components/StatusSwitch';
import {enquiryOfferConfirmSearchexternalState,enquiryOfferConfirmSearchInteriorState} from '../../common/tableStatusList'
import {demandExternalState, demandInteriorState} from '../../common/tableStatusList'
import statuStyle from '../../common/colorTag'
import NiceForm from '@/components/NiceForm';
import {timeRange} from '@/utils/index'
......@@ -74,7 +74,7 @@ const List:React.FC<listParams> = (props) => {
return res.data
}
else if(props.type === 3){//待提交审核报价单
const res = await PublicApi.getOrderPendingReviewListList(params);
const res = await PublicApi.getOrderAuditQuotationList(params);
return res.data
}
}
......@@ -157,15 +157,8 @@ const List:React.FC<listParams> = (props) => {
key:'externalState',
dataIndex:'externalState',
align:'center',
render: (text: any, reconds) => {
let component: ReactNode = null
if (text == 3) {
component = <><span style={statuStyle.warn}>审核不通过需求单</span></>
}else if (text == 1) {
component = <><span style={statuStyle.default}>待提交需求单</span></>
}
return component
}
render:(text:any) =>
demandExternalState(text)
},
{
title:'内部状态',
......@@ -173,7 +166,7 @@ const List:React.FC<listParams> = (props) => {
dataIndex:'interiorState',
align:'center',
render:(text:any) =>
enquiryOfferConfirmSearchInteriorState(text)
demandInteriorState(text)
},
{
title:'操作',
......@@ -182,52 +175,27 @@ const List:React.FC<listParams> = (props) => {
align:'center',
render: (_: any, record: any) => {
return (
<>
{
(props.type === 1 || props.type === 2) ? (
<>
{/* 待审核报价单（一级） */}
<Button
type="link"
onClick={() =>
// history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/viewEnquiryDetail?page_type=${props.type}&id=${record.id}`)
history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOne/detail?id=${record.id}`)
}
>
审核
</Button>
{/* 待审核报价单（二级） */}
<Button
type="link"
onClick={() =>
// history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/viewEnquiryDetail?page_type=${props.type}&id=${record.id}`)
history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryTwo/detail?id=${record.id}`)
}
>
审核
</Button>
</>
) : (
<>
{/* 待提交审核报价单 */}
{
(props.type === 3 && record.externalState === 1) && (
<Button
type="link"
onClick={() =>
// history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/viewEnquiryDetail?page_type=${props.type}&id=${record.id}`)
history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/toSubmit/detail?id=${record.id}`)
}
>
提交
</Button>
)
}
</>
)
}
{props.type === 1 &&
<Button
disabled={record.interiorState !== 2 && record.interiorState !== 6}
type='link'
onClick={() => history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOne/detail?id=${record.id}`)}
>审核</Button>}
{props.type === 2 &&
<Button
disabled={record.interiorState !== 3 && record.interiorState !== 6}
type='link'
onClick={() => history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryTwo/detail?id=${record.id}`)}
>审核</Button>}
{props.type === 3 &&
<Button
disabled={record.interiorState !== 1}
type='link'
onClick={() => history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/toSubmit/detail?id=${record.id}`)}
>提交审核</Button>}
</>
)
}
},
......
src/pages/transaction/enquiryOfferConfirm/enquiryOfferComfirmSearch/detail/index.tsx
View file @ 421a335b
import React from 'react';
import AuditComponents from '../../components/detail';
const EnquiryOfferComfirmSearchDetail: React.FC = () => {
return (
<div>
待确认报价单详情
</div>
<AuditComponents
pagetype={2}
operation={1}
/>
);
};
......
src/pages/transaction/enquiryOfferConfirm/enquiryOne/detail/index.tsx
View file @ 421a335b
import React from 'react';
import AuditComponents from '../../components/detail';
const EnquiryOneDetail: React.FC = () => {
return (
<div>
待审核报价单（一级）详情
</div>
<AuditComponents
pagetype={1}
operation={1}
/>
);
};
......
src/pages/transaction/enquiryOfferConfirm/enquiryTwo/detail/index.tsx
View file @ 421a335b
import React from 'react';
import AuditComponents from '../../components/detail';
const EnquiryTwoDetail: React.FC = () => {
return (
<div>
待审核报价单（二级）详情
</div>
<AuditComponents
pagetype={2}
operation={1}
/>
);
};
......
src/pages/transaction/enquiryOfferConfirm/toSubmit/detail/index.tsx
View file @ 421a335b
import React from 'react';
import AuditComponents from '../../components/detail';
const ToSubmitDetail: React.FC = () => {
return (
<div>
待提交审核报价单详情
</div>
<AuditComponents
pagetype={3}
operation={1}
/>
);
};
......
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