Skip to content

J
jinfa-platform
Commit 344799e0 authored by GuanHua's avatar GuanHua
Browse files
Options

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

parents 52830ee3 48d68d2b
Hide whitespace changes
Inline Side-by-side
Showing with 182 additions and 122 deletions
config/routes/tranactionRoute.ts
View file @ 344799e0
......@@ -3,7 +3,7 @@
* @Date: 2020-07-31 19:56:22
* @LastEditors: LeeJiancong
* @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-09-26 16:41:58
* @LastEditTime: 2020-09-28 11:27:23
*/
const TranactionRoute = {
......@@ -236,24 +236,24 @@ const TranactionRoute = {
component: '@/pages/transaction/enquiryOfferConfirm/components/detail',
hideInMenu: true,
},
//报价一级
//待提交报价单
{
path:'/memberCenter/tranactionAbility/enquiryOfferConfirm/toSubmit',
name:'toSubmit',
component: '@/pages/transaction/enquiryOfferConfirm/toSubmit'
},
//审核报价一级
{
path:'/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOne',
name:'enquiryOne',
component: '@/pages/transaction/enquiryOfferConfirm/enquiryOne'
},
//报价二级
//审核报价二级
{
path:'/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryTwo',
name:'enquiryTwo',
component: '@/pages/transaction/enquiryOfferConfirm/enquiryTwo'
},
// //待提交报价单
// {
// path:'/memberCenter/tranactionAbility/enquiryOfferConfirm/toSubmit',
// name:'toSubmit',
// component: '@/pages/transaction/enquiryOfferConfirm/toSubmit'
// }
}
]
},
......
src/locales/zh-CN/menu.ts
View file @ 344799e0
/*
* @Author: LeeJiancong
* @Date: 2020-07-13 14:08:50
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-09-27 17:42:44
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-09-28 17:37:59
*/
export default {
......@@ -194,6 +194,7 @@ export default {
//确认报价
'menu.tranactionAbility.enquiryOfferConfirm': '确认需求报价',
'menu.tranactionAbility.enquiryOfferConfirm.enquiryOfferSearch': '报价单查询',
'menu.tranactionAbility.enquiryOfferConfirm.toSubmit': '待提交审核报价单',
'menu.tranactionAbility.enquiryOfferConfirm.enquiryOne': '待审核报价单（一级）',
'menu.tranactionAbility.enquiryOfferConfirm.enquiryTwo': '待审核报价单（二级）',
'menu.tranactionAbility.enquiryOfferConfirm.viewEnquiryDetail':'报价单详情',
......
src/pages/transaction/common/colorTag.ts
View file @ 344799e0
......@@ -2,7 +2,7 @@
* @Author: LeeJiancong
* @Date: 2020-07-30 17:23:48
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-07-30 17:24:49
* @LastEditTime: 2020-09-28 16:12:37
*/
export default {
default: {
......@@ -22,10 +22,22 @@ export default {
background: 'rgba(235,247,242,1)',
borderRadius: '4px'
},
// warn: {
// color: '#E63F3B',
// padding: '2px 5px',
// background: 'rgba(255,235,230,1)',
// borderRadius: '4px'
// }
warn: {
color: '#E63F3B',
padding: '2px 5px',
background: 'rgba(255,235,230,1)',
background: 'rgb(255, 235, 230)',
borderRadius: '4px'
},
Error: {
color: 'red',
padding: '2px 5px',
background: 'rgba(255,247,227,1)',
borderRadius: '4px'
}
}
\ No newline at end of file
src/pages/transaction/common/tableStatusList.tsx
View file @ 344799e0
import React, { Component,ReactNode } from 'react';
import {Badge} from 'antd'
import statuStyle from './colorTag'
/****** *********************** 需求单 ************************** */
/**
* @description: 需求提交一级
......@@ -66,6 +67,62 @@ export const enquirySearchexternalState = (text:any) => {
/****** *********************** 报价单 ************************** */
//内部
export const enquiryOfferSearchInteriorState = (text:any) => {
let component: ReactNode = null;
text === 1 ? component = <Badge status='default' text="新增报价单" />:
text === 2 ? component = <Badge color="#FFC400" text="审核报价单一级" />:
text === 3 ? component = <Badge color="#FFC400" 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="default" text="取消报价单" />
return component;
}
//外部
export const enquiryOfferSearchexternalState = (text:any) => {
let component: ReactNode = null;
// text === 1 ? component = <Badge status='default' text="提交需求单" />:
// text === 2 ? component = <Badge color="#FFC400" text="审核需求单" />:
// text === 3 ? component = <Badge status='default' 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="default" text="取消报价单" />
text === 1 ? component = <span style={statuStyle.default}>待提交需求单</span>:
text === 2 ? component = <span style={statuStyle.default}>审核需求单</span>:
text === 3 ? component = <span style={statuStyle.confirm}>待提交报价单</span>:
text === 4 ? component = <span style={statuStyle.confirm}>确认报价单</span>:
text === 5 ? component = <span style={statuStyle.success}>完成</span>:
text === 6 ? component = <span style={statuStyle.Error}>审核不通过</span>:
component = <span style={statuStyle.default}>取消报价单</span>
return component;
}
/****** *********************** 确认报价单 ************************** */
/**
* @description: 专用需求发布的需求单查询
* @param {type}
* @return {type} 外
*/
export const enquiryOfferConfirmSearchexternalState = (text:any) => {
let component: ReactNode = null;
text === 1 ? component = <Badge status='default' text="提交需求单" />:
text === 2 ? component = <Badge status='processing' text="待提交报价单" />:
component = <Badge status='default' text="提交报价单" />
return component;
}
export const enquiryOfferConfirmSearchInteriorState = (text:any) => {
let component: ReactNode = null;
text === 1 ? component = <Badge status='default' text="待审核" />:
text === 2 ? component = <Badge status='success' text="一级审核通过" />:
text === 3? component = <Badge status="success" text="二级审核通过" />:
component = <Badge status='processing' text="提交报价单" />
return component;
}
\ No newline at end of file
src/pages/transaction/enquiryOffer/components/confirmModal.tsx
View file @ 344799e0
......@@ -29,14 +29,12 @@ const comfirmDialog: React.FC<Params> = (props) => {
if(props.type == 1){
PublicApi.postOrderRequisitionFormAudit(value).then(res => {
if (res.code === 1000) {
console.log(123123)
props.onOK()
}
})
}else if(props.type == 2){
PublicApi.postOrderRequisitionFormAuditTwo(value).then(res => {
if (res.code === 1000) {
console.log(123123)
props.onOK()
}
})
......@@ -74,6 +72,7 @@ const comfirmDialog: React.FC<Params> = (props) => {
cancelText={`取消`}
>
<SchemaForm
layout="vertical"
labelCol={4}
components={{
Input, Radio: Radio.Group, TextArea: Input.TextArea
......
src/pages/transaction/enquiryOffer/components/detail.tsx
View file @ 344799e0
......@@ -3,7 +3,7 @@
* @Date: 2020-08-24 11:32:05
* @LastEditors: LeeJiancong
* @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-09-24 17:45:13
* @LastEditTime: 2020-09-28 16:05:49
*/
import React, { Component, useEffect, useState, ReactNode, useRef } from 'react';
import { Row, Col, Modal, Table, Tooltip, Input, Select,Switch, Button, Popconfirm, Card, Tag, Badge, Steps, Tabs, } from 'antd'
......@@ -20,8 +20,8 @@ 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,enquirySearchInteriorState,
enquirySearchexternalState} from '../../common/tableStatusList'
import {enquiryOfferSearchInteriorState,
enquiryOfferSearchexternalState} from '../../common/tableStatusList'
import statuStyle from '../../common/colorTag'
import RroductModal from '../components/productModal'
......@@ -570,7 +570,7 @@ const detailInfo: React.FC<{}> = () => {
<div><Button type="link">{dataInfo.requisitionFormNo}</Button> </div>
</div>
<div className={style['headerMain-left-option']}>
<div>需求摘要：</div>
<div>报价单摘要：</div>
<div>{dataInfo.quotationSummary}</div>
</div>
......@@ -598,9 +598,7 @@ const detailInfo: React.FC<{}> = () => {
<div>
{
dataInfo.externalState == 1 ? <><span style={statuStyle.default}>待提交需求单</span></> :
dataInfo.externalState == 3 ? <><span style={statuStyle.warn}>审核不通过需求单</span></> :
''
enquiryOfferSearchexternalState(dataInfo.externalState)
}
</div>
</div>
......@@ -608,7 +606,7 @@ const detailInfo: React.FC<{}> = () => {
<div>内部状态：</div>
<div>
{
enquirySearchInteriorState(dataInfo.interiorState)//4
enquiryOfferSearchInteriorState(dataInfo.interiorState)//4
}
</div>
......@@ -627,7 +625,7 @@ const detailInfo: React.FC<{}> = () => {
<Steps
style={{ padding: '34px 0' }}
progressDot
current={0}
current={Number(dataInfo.externalState) - 1}
>
{detailData.externalStateStep.items.map((item, index) => {
return (
......
src/pages/transaction/enquiryOffer/components/index.tsx
View file @ 344799e0
......@@ -3,7 +3,7 @@
* @Date: 2020-08-24 11:39:11
* @LastEditors: LeeJiancong
* @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-09-26 14:10:04
* @LastEditTime: 2020-09-28 16:09:11
*/
/**
* @description: 组件描述: 一级 二级 待提交报价单
......@@ -34,7 +34,7 @@ import {
} from 'god/dist/src/standard-table/TableController';
import EyePreview from '@/components/EyePreview';
import StatusSwitch from '@/components/StatusSwitch';
import {interiorState,interiorStateTwo,enquirySearchInteriorState} from '../../common/tableStatusList'
import {enquiryOfferSearchInteriorState,enquiryOfferSearchexternalState} from '../../common/tableStatusList'
import statuStyle from '../../common/colorTag'
import NiceForm from '@/components/NiceForm';
import {timeRange} from '@/utils/index'
......@@ -142,15 +142,18 @@ 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, reconds) =>
enquiryOfferSearchexternalState(text)
// {
// 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
// }
},
{
title:'内部状态',
......@@ -158,9 +161,7 @@ const List:React.FC<listParams> = (props) => {
dataIndex:'interiorState',
align:'center',
render:(text:any) =>
// props.type === 1 ? interiorState(text) :
// props.type === 2 || props.type == 3? interiorStateTwo(text) : ''
enquirySearchInteriorState(text)
enquiryOfferSearchInteriorState(text)
},
{
title:'操作',
......
src/pages/transaction/enquiryOffer/enquiryOfferSearch/index.tsx
View file @ 344799e0
......@@ -3,7 +3,7 @@
* @Date: 2020-08-24 11:39:11
* @LastEditors: LeeJiancong
* @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-09-26 16:21:45
* @LastEditTime: 2020-09-28 17:21:23
*/
/**
* @description: 组件描述:
......@@ -35,7 +35,7 @@ import {
import EyePreview from '@/components/EyePreview';
import StatusSwitch from '@/components/StatusSwitch';
import {interiorState,interiorStateTwo,
enquirySearchInteriorState,enquirySearchexternalState} from '../../common/tableStatusList'
enquirySearchInteriorState,enquirySearchexternalState,enquiryOfferSearchexternalState} from '../../common/tableStatusList'
import statuStyle from '../../common/colorTag'
import NiceForm from '@/components/NiceForm';
import {timeRange} from '@/utils/index'
......@@ -133,15 +133,17 @@ 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, reconds) =>
enquiryOfferSearchexternalState(text)
// {
// 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
// }
},
{
title:'内部状态',
......
src/pages/transaction/enquiryOffer/toAddSubmit/index.tsx
View file @ 344799e0
......@@ -3,7 +3,7 @@
* @Date: 2020-08-24 11:39:11
* @LastEditors: LeeJiancong
* @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-09-16 16:14:31
* @LastEditTime: 2020-09-28 17:33:36
*/
import React, { ReactNode, useRef, useState,useEffect } from 'react';
import { history } from 'umi';
......@@ -29,7 +29,7 @@ import {
} from 'god/dist/src/standard-table/TableController';
import EyePreview from '@/components/EyePreview';
import StatusSwitch from '@/components/StatusSwitch';
import {interiorState} from '../../common/tableStatusList'
import {enquiryOfferSearchInteriorState,enquiryOfferSearchexternalState} from '../../common/tableStatusList'
import statuStyle from '../../common/colorTag'
import NiceForm from '@/components/NiceForm';
import {timeRange} from '@/utils/index'
......@@ -100,22 +100,15 @@ const List:React.FC<{}> = () => {
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, reconds) =>
enquiryOfferSearchexternalState(text)
},
{
title:'内部状态',
key:'interiorState',
dataIndex:'interiorState',
align:'center',
render:(text:any) => interiorState(text)
render:(text:any) => enquiryOfferSearchInteriorState(text)
},
{
title:'操作',
......
src/pages/transaction/enquiryOfferConfirm/components/confirmModal.tsx
View file @ 344799e0
......@@ -10,7 +10,7 @@ import { PublicApi } from '@/services/api'
import {PATTERN_MAPS} from '@/constants/regExp'
export interface Params {
id: number | string;
type: number|string;//1是一级 2是二级
type: number|string;//1是一级 2是二级 3是待提交审核
dialogVisible: boolean;
onCancel: Function;
onOK?: Function;
......@@ -27,16 +27,20 @@ const comfirmDialog: React.FC<Params> = (props) => {
value.id = props.id
console.log('value',value)
if(props.type == 1){
PublicApi.postOrderRequisitionFormAudit(value).then(res => {
PublicApi.postOrderQuotationBeReviewed(value).then(res => {
if (res.code === 1000) {
console.log(123123)
props.onOK()
}
})
}else if(props.type == 2){
PublicApi.postOrderRequisitionFormAuditTwo(value).then(res => {
PublicApi.postOrderQuotationBeReviewedTwo(value).then(res => {
if (res.code === 1000) {
props.onOK()
}
})
}else if(props.type == 3){//待提交审核报价单
PublicApi.postOrderSubmitAudit(value).then(res => {
if (res.code === 1000) {
console.log(123123)
props.onOK()
}
})
......@@ -63,8 +67,9 @@ const comfirmDialog: React.FC<Params> = (props) => {
return (
<>
<Modal
title='审核确认'
title={props.type == 3 ? '单据审核': '审核确认'}
width={800}
visible={props.dialogVisible}
onOk={() => actions.submit()}
onCancel={() => props.onCancel()}
......@@ -75,6 +80,7 @@ const comfirmDialog: React.FC<Params> = (props) => {
>
<SchemaForm
labelCol={4}
layout="vertical"
components={{
Input, Radio: Radio.Group, TextArea: Input.TextArea
}}
......
src/pages/transaction/enquiryOfferConfirm/components/detail.tsx
View file @ 344799e0
......@@ -3,7 +3,7 @@
* @Date: 2020-08-24 11:32:05
* @LastEditors: LeeJiancong
* @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-09-24 17:45:13
* @LastEditTime: 2020-09-28 15:56:00
*/
import React, { Component, useEffect, useState, ReactNode, useRef } from 'react';
import { Row, Col, Modal, Table, Tooltip, Input, Select,Switch, Button, Popconfirm, Card, Tag, Badge, Steps, Tabs, } from 'antd'
......@@ -20,7 +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,enquirySearchInteriorState,
import {interiorState,interiorStateTwo,enquiryOfferConfirmSearchInteriorState,
enquirySearchexternalState} from '../../common/tableStatusList'
import statuStyle from '../../common/colorTag'
import RroductModal from '../components/productModal'
......@@ -322,27 +322,27 @@ const detailInfo: React.FC<{}> = () => {
init()
}, [])
const init = () => {
PublicApi.getOrderQuotationDetails({ id: id }).then(res => {
PublicApi.getOrderAuditQuotationDetails({ id: id }).then(res => {
let {data} = res
// if(pagetype == 2){
// if(data.interiorState === 3){//一级的审核通过变为2级的待审核
// data.interiorState = 2
// }
// }
if(pagetype == 2){
if(data.interiorState === 3){//一级的审核通过变为2级的待审核
data.interiorState = 2
}
}
setdataInfo(data)
getOrderProductAll(data.requisitionFormId)
// interiorStateList = [...data.interiorRequisitionFormStateResponses]
// if(pagetype == 1 || pagetype == 2){
// if(data.interiorState === 2){
// setIsextraOption(true)
// }
// }else if(pagetype == 3){
// if(data.externalState == 1){
// setIsextraOption(true)
// }
// }
if(pagetype == 1 || pagetype == 2){
if(data.interiorState === 2){
setIsextraOption(true)
}
}else if(pagetype == 3){
if(data.externalState == 1){
setIsextraOption(true)
}
}
// PublicApi.getLogisticsSelectListShipperAddress().then(res => {
// res.data.forEach(item => {
......@@ -482,14 +482,8 @@ const detailInfo: React.FC<{}> = () => {
}
]
const handlediaSubmit = (type:number) => {
if(type == 1){//提交需求单
PublicApi.postOrderSubmitRequisitionForm({id: id}).then(res => {
if(res.code === 1000){
setTimeout(()=> {
history.goBack()
},1000)
}
})
if(type == 1){//提交审核报价单
setvisible(true) //调用同一二级弹框
}
}
......@@ -553,7 +547,7 @@ const detailInfo: React.FC<{}> = () => {
(pagetype == 3) &&
<Button type="primary" onClick={() => handlediaSubmit(1)}>
<CheckSquareOutlined />
提交
提交审核
</Button>
}
......@@ -570,7 +564,7 @@ const detailInfo: React.FC<{}> = () => {
<div><Button type="link">{dataInfo.requisitionFormNo}</Button> </div>
</div>
<div className={style['headerMain-left-option']}>
<div>需求摘要：</div>
<div> 报价单摘要：</div>
<div>{dataInfo.quotationSummary}</div>
</div>
......@@ -608,7 +602,7 @@ const detailInfo: React.FC<{}> = () => {
<div>内部状态：</div>
<div>
{
enquirySearchInteriorState(dataInfo.interiorState)//4
enquiryOfferConfirmSearchInteriorState(dataInfo.interiorState)//4
}
</div>
......@@ -627,7 +621,7 @@ const detailInfo: React.FC<{}> = () => {
<Steps
style={{ padding: '34px 0' }}
progressDot
current={0}
current={Number(dataInfo.externalState) - 1}
>
{detailData.externalStateStep.items.map((item, index) => {
return (
......
src/pages/transaction/enquiryOfferConfirm/components/index.tsx
View file @ 344799e0
......@@ -3,7 +3,7 @@
* @Date: 2020-08-24 11:39:11
* @LastEditors: LeeJiancong
* @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-09-26 16:47:34
* @LastEditTime: 2020-09-28 14:35:22
*/
/**
* @description: 组件描述: 一级 二级 待提交报价单
......@@ -34,7 +34,7 @@ import {
} from 'god/dist/src/standard-table/TableController';
import EyePreview from '@/components/EyePreview';
import StatusSwitch from '@/components/StatusSwitch';
import {interiorState,interiorStateTwo,enquirySearchInteriorState} from '../../common/tableStatusList'
import {enquiryOfferConfirmSearchexternalState,enquiryOfferConfirmSearchInteriorState} from '../../common/tableStatusList'
import statuStyle from '../../common/colorTag'
import NiceForm from '@/components/NiceForm';
import {timeRange} from '@/utils/index'
......@@ -67,14 +67,14 @@ const List:React.FC<listParams> = (props) => {
}
const fetchData = async (params: any) => {
if(props.type === 1){//一级
const res = await PublicApi.getOrderQuotationToAuditList(params);
const res = await PublicApi.getOrderToAuditQuotationList(params);
return res.data
}else if(props.type === 2){//二级
const res = await PublicApi.getOrderQuotationToAuditTwoList(params);
const res = await PublicApi.getOrderToAuditQuotationTwoList(params);
return res.data
}
else if(props.type === 3){//待提交报价单
const res = await PublicApi.getOrderQuotationReviewedoList(params);
else if(props.type === 3){//待提交审核报价单
const res = await PublicApi.getOrderPendingReviewListList(params);
return res.data
}
}
......@@ -158,9 +158,7 @@ const List:React.FC<listParams> = (props) => {
dataIndex:'interiorState',
align:'center',
render:(text:any) =>
// props.type === 1 ? interiorState(text) :
// props.type === 2 || props.type == 3? interiorStateTwo(text) : ''
enquirySearchInteriorState(text)
enquiryOfferConfirmSearchInteriorState(text)
},
{
title:'操作',
......@@ -174,7 +172,7 @@ const List:React.FC<listParams> = (props) => {
{
(props.type === 1 || props.type === 2) ?
<Button type="link" onClick={() =>
history.push(`/memberCenter/tranactionAbility/enquiryOffer/viewEnquiryDetail?page_type=${props.type}&id=${record.id}`)}>
history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/viewEnquiryDetail?page_type=${props.type}&id=${record.id}`)}>
审核
</Button>
:
......@@ -185,19 +183,6 @@ const List:React.FC<listParams> = (props) => {
history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/viewEnquiryDetail?page_type=${props.type}&id=${record.id}`)}>
提交</Button>
}
{
(record.externalState === 1 && record.interiorState === 1) &&
<>
<Popconfirm title="确定要删除吗？" okText="是" cancelText="否" onConfirm={() => handleDelete([record.id])}>
<Button type='link'>
删除
</Button>
</Popconfirm>
<Popconfirm title="确定要提交吗？" okText="是" cancelText="否" onConfirm={() => handleSubmit(record.id)}>
<Button type='link'>提交</Button>
</Popconfirm>
</>
}
</>
}
</>
......@@ -232,11 +217,11 @@ const List:React.FC<listParams> = (props) => {
return
}
if(props.type === 1){//一级
PublicApi.postOrderQuotationDocumentsBulkReview({ ids: ids }).then(res => {
PublicApi.postOrderQuotationBeReviewedAll({ ids: ids }).then(res => {
ref.current.reload()
})
}else if(props.type === 2){//二级
PublicApi.postOrderQuotationDocumentsBulkReviewTwo({ ids: ids }).then(res => {
PublicApi.postOrderQuotationBeReviewedTwoAll({ ids: ids }).then(res => {
ref.current.reload()
})
}else if(props.type === 3){//待提交审核
......
src/pages/transaction/enquiryOfferConfirm/toSubmit/index.tsx 0 → 100644
View file @ 344799e0
import React, { Component } from 'react'
import OrderList from "../components/index"
const List = () => {
return (
<OrderList des='待提交报价单' type={3}/>
)
}
export default List
\ No newline at end of file
src/pages/transaction/enquirySubmit/components/confirmModal.tsx
View file @ 344799e0
......@@ -75,6 +75,7 @@ const comfirmDialog: React.FC<Params> = (props) => {
>
<SchemaForm
labelCol={4}
layout="vertical"
components={{
Input, Radio: Radio.Group, TextArea: Input.TextArea
}}
......
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