Skip to content

J
jinfa-platform
Commit fb377d62 authored by XieZhiXiong's avatar XieZhiXiong
Browse files
Options

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

parents e8975995 ef9b14db
Hide whitespace changes
Inline Side-by-side
Showing with 425 additions and 132 deletions
config/routes/tranactionRoute/confirmInquiryQuote.ts 0 → 100644
View file @ fb377d62
/**
* @description: 确认询价报价
* @param {type}
* @return {type}
*/
export default [
{
path: '/memberCenter/tranactionAbility/confirmInquiryQuote',
name: 'confirmInquiryQuote',
routes: [
// 报价单查询
{
path: '/memberCenter/tranactionAbility/confirmInquiryQuote/quoteOrder',
name: 'quoteOrder',
component: '@/pages/transaction/confirmInquiryQuote/quoteOrder'
},
// 报价单查询详情
{
path: '/memberCenter/tranactionAbility/confirmInquiryQuote/quoteOrder/details',
name: 'quoteOrderDetails',
hideInMenu: true,
component: '@/pages/transaction/confirmInquiryQuote/components/details'
},
// 待提交审核报价单
{
path: '/memberCenter/tranactionAbility/confirmInquiryQuote/pendingSubmitReview',
name: 'pendingSubmitReview',
component: '@/pages/transaction/confirmInquiryQuote/pendingSubmitReview'
},
// 待提交审核报价单详情
{
path: '/memberCenter/tranactionAbility/confirmInquiryQuote/pendingSubmitReview/details',
name: 'pendingSubmitReviewDetails',
hideInMenu: true,
component: '@/pages/transaction/confirmInquiryQuote/components/details'
},
// 待审核询价单（一级）
{
path: '/memberCenter/tranactionAbility/confirmInquiryQuote/pendingReviewOne',
name: 'pendingReviewOne',
component: '@/pages/transaction/confirmInquiryQuote/pendingReviewOne'
},
// 待审核询价单（一级）详情
{
path: '/memberCenter/tranactionAbility/confirmInquiryQuote/pendingReviewOne/details',
name: 'pendingReviewOneDetails',
hideInMenu: true,
component: '@/pages/transaction/confirmInquiryQuote/components/details'
},
// 待审核询价单（二级）
{
path: '/memberCenter/tranactionAbility/confirmInquiryQuote/pendingReviewTwo',
name: 'pendingReviewTwo',
component: '@/pages/transaction/confirmInquiryQuote/pendingReviewTwo'
},
// 待审核询价单（二级）详情
{
path: '/memberCenter/tranactionAbility/confirmInquiryQuote/pendingReviewTwo/details',
name: 'pendingReviewTwoDetails',
hideInMenu: true,
component: '@/pages/transaction/confirmInquiryQuote/components/details'
},
// 待提交报价单
{
path: '/memberCenter/tranactionAbility/confirmInquiryQuote/pendingSubmit',
name: 'pendingSubmit',
component: '@/pages/transaction/confirmInquiryQuote/pendingSubmit'
},
// 待提交报价单详情
{
path: '/memberCenter/tranactionAbility/confirmInquiryQuote/pendingSubmit/details',
name: 'pendingSubmitDetails',
hideInMenu: true,
component: '@/pages/transaction/confirmInquiryQuote/components/details'
},
]
},
]
\ No newline at end of file
config/routes/tranactionRoute/goodsOffer.ts 0 → 100644
View file @ fb377d62
/**
* @description: 商品询价
* @param {type}
* @return {type}
*/
export default [
{
path:'/memberCenter/tranactionAbility/goodsOffer',
name:'goodsOffer',
routes:[
// 询价单查询
{
path: '/memberCenter/tranactionAbility/goodsOffer/enquiryOrder',
name: 'enquiryOrder',
component: '@/pages/transaction/goodsOffer/enquiryOrder'
},
// 询价单查询详情
{
path: '/memberCenter/tranactionAbility/goodsOffer/enquiryOrder/details',
name: 'quoteOrderDetails',
hideInMenu: true,
component: '@/pages/transaction/goodsOffer/components/details'
},
// 待新增询价单
{
path: '/memberCenter/tranactionAbility/goodsOffer/addEnquiryOrder',
name: 'addEnquiryOrder',
component: '@/pages/transaction/goodsOffer/addEnquiryOrder'
},
// 新建报价单
{
path: '/memberCenter/tranactionAbility/goodsOffer/addEnquiryOrder/add',
name: 'add',
hideInMenu: true,
component: '@/pages/transaction/goodsOffer/addEnquiryOrder/add'
},
// 编辑报价单
{
path: '/memberCenter/tranactionAbility/goodsOffer/addEnquiryOrder/edit',
name: 'edit',
hideInMenu: true,
component: '@/pages/transaction/goodsOffer/addEnquiryOrder/add'
},
// 待新增询价单详情
{
path: '/memberCenter/tranactionAbility/goodsOffer/addEnquiryOrder/details',
name: 'addEnquiryOrderDetails',
hideInMenu: true,
component: '@/pages/transaction/goodsOffer/components/details'
},
// 待审核询价单（一级）
{
path: '/memberCenter/tranactionAbility/goodsOffer/pendingReviewOne',
name: 'pendingReviewOne',
component: '@/pages/transaction/goodsOffer/pendingReviewOne'
},
// 待审核询价单（一级）详情
{
path: '/memberCenter/tranactionAbility/goodsOffer/pendingReviewOne/details',
name: 'pendingReviewOneDetails',
hideInMenu: true,
component: '@/pages/transaction/goodsOffer/components/details'
},
// 待审核询价单（二级）
{
path: '/memberCenter/tranactionAbility/goodsOffer/pendingReviewTwo',
name: 'pendingReviewTwo',
component: '@/pages/transaction/goodsOffer/pendingReviewTwo'
},
// 待审核询价单（二级）详情
{
path: '/memberCenter/tranactionAbility/goodsOffer/pendingReviewTwo/details',
name: 'pendingReviewTwoDetails',
hideInMenu: true,
component: '@/pages/transaction/goodsOffer/components/details'
},
// 待提交询价单
{
path: '/memberCenter/tranactionAbility/goodsOffer/pendingSubmit',
name: 'pendingSubmit',
component: '@/pages/transaction/goodsOffer/pendingSubmit'
},
// 待提交询价单详情
{
path: '/memberCenter/tranactionAbility/goodsOffer/pendingSubmit/details',
name: 'pendingSubmitDetails',
hideInMenu: true,
component: '@/pages/transaction/goodsOffer/components/details'
}
]
}
]
\ No newline at end of file
config/routes/tranactionRoute/index.ts
View file @ fb377d62
import { RouterChild } from '../../utils';
import goodsOffer from './goodsOffer';
import inquiryQuote from './inquiryQuote';
import confirmInquiryQuote from './confirmInquiryQuote';
import purchaseOrder from './purchaseOrder';
import saleOrder from './saleOrder';
......@@ -397,76 +400,14 @@ const TranactionRoute: RouterChild = {
}
]
},
// 商品询价
{
path: '/memberCenter/tranactionAbility/goodsOffer',
name: 'goodsOffer',
routes: [
// 询价单查询
{
path: '/memberCenter/tranactionAbility/goodsOffer/enquiryOrder',
name: 'enquiryOrder',
component: '@/pages/transaction/goodsOffer/enquiryOrder'
},
// 待新增询价单
{
path: '/memberCenter/tranactionAbility/goodsOffer/addEnquiryOrder',
name: 'addEnquiryOrder',
component: '@/pages/transaction/goodsOffer/addEnquiryOrder'
},
// 待新增询价单-新增
{
path: '/memberCenter/tranactionAbility/goodsOffer/addEnquiryOrder/add',
name: 'add',
component: '@/pages/transaction/goodsOffer/addEnquiryOrder/add',
hideInMenu: true,
},
// 待新增询价单-编辑
{
path: '/memberCenter/tranactionAbility/goodsOffer/addEnquiryOrder/edit',
name: 'edit',
component: '@/pages/transaction/goodsOffer/addEnquiryOrder/add',
hideInMenu: true,
},
// 待新增询价单-详情
{
path: '/memberCenter/tranactionAbility/goodsOffer/addEnquiryOrder/detail',
name: 'detail',
component: '@/pages/transaction/goodsOffer/addEnquiryOrder/add',
hideInMenu: true,
},
// 待审核询价单（一级）
{
path: '/memberCenter/tranactionAbility/goodsOffer/pendingReviewOne',
name: 'pendingReviewOne',
component: '@/pages/transaction/goodsOffer/pendingReviewOne'
},
// 待审核询价单（二级）
{
path: '/memberCenter/tranactionAbility/goodsOffer/pendingReviewTwo',
name: 'pendingReviewTwo',
component: '@/pages/transaction/goodsOffer/pendingReviewTwo'
},
// 待提交询价单
{
path: '/memberCenter/tranactionAbility/goodsOffer/pendingSubmit',
name: 'pendingSubmit',
component: '@/pages/transaction/goodsOffer/pendingSubmit'
},
// 新建询价单
{
path: '/memberCenter/tranactionAbility/goodsOffer/components/details',
name: 'details',
hideInMenu: true,
component: '@/pages/transaction/goodsOffer/components/details'
}
]
},
...goodsOffer,
// 询价报价
...inquiryQuote,
// 确认询价报价
...confirmInquiryQuote,
// 采购订单
...purchaseOrder,
// 销售订单
...saleOrder,
......
config/routes/tranactionRoute/inquiryQuote.ts 0 → 100644
View file @ fb377d62
/**
* @description: 询价报价
* @param {type}
* @return {type}
*/
export default [
{
path: '/memberCenter/tranactionAbility/inquiryQuote',
name: 'inquiryQuote',
routes: [
//询价单查询
{
path: '/memberCenter/tranactionAbility/inquiryQuote/enquiryOrder',
name: 'enquiryOrder',
component: '@/pages/transaction/inquiryQuote/enquiryOrder'
},
// 询价单查询详情
{
path: '/memberCenter/tranactionAbility/inquiryQuote/enquiryOrder/details',
name: 'enquiryOrder',
hideInMenu: true,
component: '@/pages/transaction/inquiryQuote/components/details'
},
//报价单查询
{
path: '/memberCenter/tranactionAbility/inquiryQuote/quoteOrder',
name: 'quoteOrder',
component: '@/pages/transaction/inquiryQuote/quoteOrder'
},
// 报价单查询详情
{
path: '/memberCenter/tranactionAbility/inquiryQuote/quoteOrder/details',
name: 'quoteOrderDetails',
hideInMenu: true,
component: '@/pages/transaction/inquiryQuote/components/details'
},
//待新增报价单
{
path: '/memberCenter/tranactionAbility/inquiryQuote/addInquiryOrder',
name: 'addInquiryOrder',
component: '@/pages/transaction/inquiryQuote/addInquiryOrder'
},
// 新建报价单
{
path: '/memberCenter/tranactionAbility/inquiryQuote/addInquiryOrder/add',
name: 'add',
hideInMenu: true,
component: '@/pages/transaction/inquiryQuote/addInquiryOrder/add'
},
// 新建报价单编辑
{
path: '/memberCenter/tranactionAbility/inquiryQuote/addInquiryOrder/edit',
name: 'edit',
hideInMenu: true,
component: '@/pages/transaction/inquiryQuote/addInquiryOrder/add'
},
// 新建报价单详情
{
path: '/memberCenter/tranactionAbility/inquiryQuote/addInquiryOrder/details',
name: 'details',
hideInMenu: true,
component: '@/pages/transaction/inquiryQuote/components/details'
},
// 待审核报价单（一级）
{
path: '/memberCenter/tranactionAbility/inquiryQuote/pendingReviewOne',
name: 'pendingReviewOne',
component: '@/pages/transaction/inquiryQuote/pendingReviewOne'
},
// 待审核报价单（一级）详情
{
path: '/memberCenter/tranactionAbility/inquiryQuote/pendingReviewOne/details',
name: 'pendingReviewOneDetails',
hideInMenu: true,
component: '@/pages/transaction/inquiryQuote/components/details'
},
// 待审核报价单（二级）
{
path: '/memberCenter/tranactionAbility/inquiryQuote/pendingReviewTwo',
name: 'pendingReviewTwo',
component: '@/pages/transaction/inquiryQuote/pendingReviewTwo'
},
// 待审核报价单（二级）详情
{
path: '/memberCenter/tranactionAbility/inquiryQuote/pendingReviewTwo/details',
name: 'pendingReviewTwoDetails',
hideInMenu: true,
component: '@/pages/transaction/inquiryQuote/components/details'
},
// 待提交报价单
{
path: '/memberCenter/tranactionAbility/inquiryQuote/pendingSubmit',
name: 'pendingSubmit',
component: '@/pages/transaction/inquiryQuote/pendingSubmit'
},
// 待提交报价单详情
{
path: '/memberCenter/tranactionAbility/inquiryQuote/pendingSubmit/details',
name: 'pendingSubmitDetails',
hideInMenu: true,
component: '@/pages/transaction/inquiryQuote/components/details'
},
]
}
]
\ No newline at end of file
src/locales/zh-CN/menu.ts
View file @ fb377d62
......@@ -139,34 +139,48 @@ export default {
// 确认询价报价
'menu.tranactionAbility.confirmInquiryQuote': '确认询价报价',
'menu.tranactionAbility.confirmInquiryQuote.quoteOrder': '报价单查询',
'menu.tranactionAbility.confirmInquiryQuote.details': '新建报价单',
'menu.tranactionAbility.confirmInquiryQuote.quoteOrderDetails': '报价单查询详情',
'menu.tranactionAbility.confirmInquiryQuote.pendingSubmitReview': '待提交审核报价单',
'menu.tranactionAbility.confirmInquiryQuote.pendingSubmitReviewDetails': '待提交审核报价单详情',
'menu.tranactionAbility.confirmInquiryQuote.pendingReviewOne': '待审核报价单（一级）',
'menu.tranactionAbility.confirmInquiryQuote.pendingReviewOneDetails': '待审核报价单（一级）详情',
'menu.tranactionAbility.confirmInquiryQuote.pendingReviewTwo': '待审核报价单（二级）',
'menu.tranactionAbility.confirmInquiryQuote.pendingReviewTwoDetails': '待审核报价单（二级）详情',
'menu.tranactionAbility.confirmInquiryQuote.pendingSubmit': '待确认报价单',
'menu.tranactionAbility.confirmInquiryQuote.pendingSubmitDetails': '待确认报价单详情',
// 商品询价
'menu.tranactionAbility.goodsOffer': '商品询价',
'menu.tranactionAbility.goodsOffer.enquiryOrder': '询价单查询',
'menu.tranactionAbility.goodsOffer.enquiryOrderDetails': '询价单查询详情',
'menu.tranactionAbility.goodsOffer.addEnquiryOrder': '待新增询价单',
'menu.tranactionAbility.goodsOffer.add': '新建询价单',
'menu.tranactionAbility.goodsOffer.edit': '编辑询价单',
'menu.tranactionAbility.goodsOffer.detail': '查看询价单',
'menu.tranactionAbility.goodsOffer.details': '新建询价单',
'menu.tranactionAbility.goodsOffer.addEnquiryOrderDetails': '待新增询价详情',
'menu.tranactionAbility.goodsOffer.pendingReviewOne': '待审核询价单（一级）',
'menu.tranactionAbility.goodsOffer.pendingReviewOneDetails': '待审核询价单（一级）详情',
'menu.tranactionAbility.goodsOffer.pendingReviewTwo': '待审核询价单（二级）',
'menu.tranactionAbility.goodsOffer.pendingReviewTwoDetails': '待审核询价单（二级）详情',
'menu.tranactionAbility.goodsOffer.pendingSubmit': '待提交询价单',
'menu.tranactionAbility.goodsOffer.pendingSubmitDetails': '待提交询价单详情',
// 询价报价
'menu.tranactionAbility.inquiryQuote': '询价报价',
'menu.tranactionAbility.inquiryQuote.enquiryOrder': '询价单查询',
'menu.tranactionAbility.inquiryQuote.enquiryOrderDetails': '询价单查询详情',
'menu.tranactionAbility.inquiryQuote.quoteOrder': '报价单查询',
'menu.tranactionAbility.inquiryQuote.quoteOrderDetails': '报价单查询详情',
'menu.tranactionAbility.inquiryQuote.addInquiryOrder': '待新增报价单',
'menu.tranactionAbility.inquiryQuote.add': '新建报价单',
'menu.tranactionAbility.inquiryQuote.edit': '编辑报价单',
'menu.tranactionAbility.inquiryQuote.details': '新建报价单',
'menu.tranactionAbility.inquiryQuote.addInquiryOrderDetails': '待新增报价单详情',
'menu.tranactionAbility.inquiryQuote.pendingReviewOne': '待审核报价单（一级）',
'menu.tranactionAbility.inquiryQuote.pendingReviewOneDetails': '待审核报价单（一级）详情',
'menu.tranactionAbility.inquiryQuote.pendingReviewTwo': '待审核报价单（二级）',
'menu.tranactionAbility.inquiryQuote.pendingReviewTwoDetails': '待审核报价单（二级）详情',
'menu.tranactionAbility.inquiryQuote.pendingSubmit': '待提交报价单',
'menu.tranactionAbility.inquiryQuote.pendingSubmitDetails': '待提交报价单详情',
//进销存
'menu.tranactionAbility.stockSellStorage': '进销存',
......
src/pages/transaction/components/orderDetailSection/index.tsx
View file @ fb377d62
......@@ -3,10 +3,10 @@ import AuditProcess from '@/components/AuditProcess'
import { findLastIndexFlowState } from '../../_public/order/utils'
import OrderProductTable from '../../components/orderProductTable'
import SaleOrderProductTable from '../../components/saleOrderProductTable'
import OrderPayTabs from '../../components/OrderPayTabs'
import OrderMergeInfo from '../../components/OrderMergeInfo'
import OrderDeleveRecord from '../../components/OrderDeleveRecord'
import OrderTransformRecord from '../../components/OrderTransformRecord'
import OrderPayTabs from '../../components/orderPayTabs'
import OrderMergeInfo from '../../components/orderMergeInfo'
import OrderDeleveRecord from '../../components/orderDeleveRecord'
import OrderTransformRecord from '../../components/orderTransformRecord'
export interface OrderDetailSectionProps {
formContext: any,
......
src/pages/transaction/confirmInquiryQuote/components/reviewList.tsx
View file @ fb377d62
......@@ -25,11 +25,12 @@ export interface parmas {
batchAction?: Function,
reloadRef?: any,
type?: number,
column?: any
}
const ReviewList: React.FC<parmas> = (props) => {
const ref = useRef<any>({});
const { fetchData, selectAll, batchAction, reloadRef, type } = props;
const { fetchData, selectAll, batchAction, reloadRef, type, column } = props;
const [selectRow, setSelectRow] = useState([])
const [selectedRowKeys, setSelectedRowKeys] = useState<Array<number>>([]);
const [id, setId] = useState<number>();
......@@ -50,20 +51,7 @@ const ReviewList: React.FC<parmas> = (props) => {
})
const columns: ColumnType<any>[] = [
{
title: '报价单号',
key: 'quotationNo',
dataIndex: 'quotationNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/components/details?id=${record.id}&page_type=${type}&view=2`}>{text}</EyePreview>
},
{
title: '询价单号',
key: 'inquiryListNo',
dataIndex: 'inquiryListNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/components/details?id=${record.id}&page_type=${type}&view=1`}>{text}</EyePreview>
},
...column,
{
title: '询价单摘要',
key: 'details',
......
src/pages/transaction/confirmInquiryQuote/pendingReviewOne/index.tsx
View file @ fb377d62
......@@ -3,6 +3,8 @@ import { message } from 'antd';
import ReviewList from '../components/reviewList';
import { timeRange } from '@/utils/index';
import { PublicApi } from '@/services/api';
import { ColumnType } from 'antd/lib/table/interface';
import EyePreview from '@/components/EyePreview';
const PendingReviewOne: React.FC<{}> = () => {
const [selectRow, setSelectRow] = useState<Array<number>>([]);
......@@ -65,6 +67,21 @@ const PendingReviewOne: React.FC<{}> = () => {
message.error('请选择要操作的询价单！')
}
}
const column: ColumnType<any>[] = [{
title: '报价单号',
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>
}, {
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>
}]
return (
<ReviewList
reloadRef={ref}
......@@ -72,6 +89,7 @@ const PendingReviewOne: React.FC<{}> = () => {
selectAll={selectAll}
batchAction={batchAction}
type={2}
column={column}
/>
)
}
......
src/pages/transaction/confirmInquiryQuote/pendingReviewTwo/index.tsx
View file @ fb377d62
......@@ -3,6 +3,8 @@ import { message } from 'antd';
import ReviewList from '../components/reviewList';
import { timeRange } from '@/utils/index';
import { PublicApi } from '@/services/api';
import { ColumnType } from 'antd/lib/table/interface';
import EyePreview from '@/components/EyePreview';
const PendingReviewTwo: React.FC<{}> = () => {
const [selectRow, setSelectRow] = useState<Array<number>>([]);
......@@ -65,6 +67,21 @@ const PendingReviewTwo: React.FC<{}> = () => {
message.error('请选择要操作的询价单！')
}
}
const column: ColumnType<any>[] = [{
title: '报价单号',
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>
}, {
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>
}]
return (
<ReviewList
reloadRef={ref}
......@@ -72,6 +89,7 @@ const PendingReviewTwo: React.FC<{}> = () => {
selectAll={selectAll}
batchAction={batchAction}
type={3}
column={column}
/>
)
}
......
src/pages/transaction/confirmInquiryQuote/pendingSubmit/index.tsx
View file @ fb377d62
......@@ -30,13 +30,13 @@ const PendingSubmit: React.FC<{}> = () => {
key: 'quotationNo',
dataIndex: 'quotationNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/components/details?id=${record.id}&page_type=1&view=2`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/pendingSubmit/details?id=${record.id}&page_type=1&view=2`}>{text}</EyePreview>
}, {
title: '询价单号',
key: 'inquiryListNo',
dataIndex: 'inquiryListNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/components/details?id=${record.id}&page_type=1&view=1`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/pendingSubmit/details?id=${record.id}&page_type=1&view=1`}>{text}</EyePreview>
}, {
title: '询价单摘要',
key: 'details',
......
src/pages/transaction/confirmInquiryQuote/pendingSubmitReview/index.tsx
View file @ fb377d62
......@@ -29,13 +29,13 @@ const PendingSubmitReview: React.FC<{}> = () => {
key: 'quotationNo',
dataIndex: 'quotationNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/components/details?id=${record.id}&page_type=5&view=2`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/pendingSubmitReview/details?id=${record.id}&page_type=5&view=2`}>{text}</EyePreview>
},{
title: '询价单号',
key: 'inquiryListNo',
dataIndex: 'inquiryListNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/components/details?id=${record.id}&page_type=5&view=1`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/pendingSubmitReview/details?id=${record.id}&page_type=5&view=1`}>{text}</EyePreview>
}, {
title: '报价单摘要',
key: 'details',
......
src/pages/transaction/confirmInquiryQuote/quoteOrder/index.tsx
View file @ fb377d62
......@@ -23,13 +23,13 @@ const EnquiryOrder: React.FC<{}> = (props) => {
key: 'quotationNo',
dataIndex: 'quotationNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/components/details?id=${record.id}&page_type=4&view=2`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/quoteOrder/details?id=${record.id}&page_type=4&view=2`}>{text}</EyePreview>
},{
title: '询价单号',
key: 'inquiryListNo',
dataIndex: 'inquiryListNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/components/details?id=${record.id}&page_type=4&view=1`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/confirmInquiryQuote/quoteOrder/details?id=${record.id}&page_type=4&view=1`}>{text}</EyePreview>
}, {
title: '报价单摘要',
key: 'details',
......
src/pages/transaction/goodsOffer/addEnquiryOrder/index.tsx
View file @ fb377d62
......@@ -28,7 +28,7 @@ const AddEnquiryOrder: React.FC<{}> = () => {
key: 'inquiryListNo',
dataIndex: 'inquiryListNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/goodsOffer/components/details?id=${record.id}&page_type=6&view=1`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/goodsOffer/addEnquiryOrder/details?id=${record.id}&page_type=6&view=1`}>{text}</EyePreview>
},
{
title: '询价单摘要',
......@@ -89,7 +89,7 @@ const AddEnquiryOrder: React.FC<{}> = () => {
return (
<>
<Button type='link' disabled={record.interiorState !== 1}>提交审核</Button>
<Button type="link" disabled={record.interiorState !== 4 && record.externalState !== 1 }><Link to={`/memberCenter/tranactionAbility/goodsOffer/addEnquiryOrder/add?id=${record.id}`}>编辑</Link></Button>
<Button type="link" disabled={record.interiorState !== 4 && record.externalState !== 1 }><Link to={`/memberCenter/tranactionAbility/goodsOffer/addEnquiryOrder/edit?id=${record.id}`}>编辑</Link></Button>
<Popconfirm
title="确定要删除吗?"
okText="是"
......
src/pages/transaction/goodsOffer/components/reviewList.tsx
View file @ fb377d62
......@@ -23,11 +23,12 @@ export interface parmas {
batchAction?: Function,
reloadRef?: any,
type?: number,
column?: any
}
const ReviewList: React.FC<parmas> = (props) => {
const ref = useRef<any>({});
const { fetchData, selectAll, batchAction, reloadRef, type } = props;
const { fetchData, selectAll, batchAction, reloadRef, type, column} = props;
const [selectRow, setSelectRow] = useState([])
const [selectedRowKeys, setSelectedRowKeys] = useState<Array<number>>([]);
const [id, setId] = useState<number>();
......@@ -48,13 +49,7 @@ const ReviewList: React.FC<parmas> = (props) => {
})
const columns: ColumnType<any>[] = [
{
title: '询价单号',
key: 'inquiryListNo',
dataIndex: 'inquiryListNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/goodsOffer/components/details?id=${record.id}&page_type=${type}&view=1`}>{text}</EyePreview>
},
column,
{
title: '询价单摘要',
key: 'details',
......
src/pages/transaction/goodsOffer/enquiryOrder/index.tsx
View file @ fb377d62
......@@ -23,7 +23,7 @@ const EnquiryOrder: React.FC<{}> = (props) => {
key: 'inquiryListNo',
dataIndex: 'inquiryListNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/goodsOffer/components/details?id=${record.id}&page_type=4&view=1`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/goodsOffer/enquiryOrder/details?id=${record.id}&page_type=4&view=1`}>{text}</EyePreview>
}, {
title: '询价单摘要',
key: 'details',
......
src/pages/transaction/goodsOffer/pendingReviewOne/index.tsx
View file @ fb377d62
......@@ -3,6 +3,7 @@ import { message } from 'antd';
import ReviewList from '../components/reviewList';
import { timeRange } from '@/utils/index';
import { PublicApi } from '@/services/api';
import EyePreview from '@/components/EyePreview';
const PendingReviewOne: React.FC<{}> = () => {
const [selectRow, setSelectRow] = useState<Array<number>>([]);
......@@ -42,7 +43,7 @@ const PendingReviewOne: React.FC<{}> = () => {
const fetchData = (params?: any) => {
console.log(params)//可以直接打印参数
return new Promise((resolve, reject) => {
PublicApi.getOrderInquiryToAuditList({...params}).then(res => {
PublicApi.getOrderInquiryToAuditList({ ...params }).then(res => {
resolve(res.data)
})
// setTimeout(() => {
......@@ -65,6 +66,13 @@ const PendingReviewOne: React.FC<{}> = () => {
message.error('请选择要操作的询价单！')
}
}
const column = {
title: '询价单号',
key: 'inquiryListNo',
dataIndex: 'inquiryListNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/goodsOffer/pendingReviewOne/details?id=${record.id}&page_type=2&view=1`}>{text}</EyePreview>
}
return (
<ReviewList
reloadRef={ref}
......@@ -72,6 +80,7 @@ const PendingReviewOne: React.FC<{}> = () => {
selectAll={selectAll}
batchAction={batchAction}
type={2}
column={column}
/>
)
}
......
src/pages/transaction/goodsOffer/pendingReviewTwo/index.tsx
View file @ fb377d62
......@@ -3,6 +3,7 @@ import { message } from 'antd';
import ReviewList from '../components/reviewList';
import { timeRange } from '@/utils/index';
import { PublicApi } from '@/services/api';
import EyePreview from '@/components/EyePreview';
const PendingReviewTwo: React.FC<{}> = () => {
const [selectRow, setSelectRow] = useState<Array<number>>([]);
......@@ -12,7 +13,7 @@ const PendingReviewTwo: React.FC<{}> = () => {
setSelectRow(values);
console.log(values, '我是多选的id')
}
// 列表数据
//列表数据
// const data = { // 模拟的数据
// totalCount: 6,
// data: [{
......@@ -65,6 +66,14 @@ const PendingReviewTwo: React.FC<{}> = () => {
message.error('请选择要操作的询价单！')
}
}
const column = {
title: '询价单号',
key: 'inquiryListNo',
dataIndex: 'inquiryListNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/goodsOffer/pendingReviewTwo/details?id=${record.id}&page_type=3&view=1`}>{text}</EyePreview>
}
return (
<ReviewList
reloadRef={ref}
......@@ -72,6 +81,7 @@ const PendingReviewTwo: React.FC<{}> = () => {
selectAll={selectAll}
batchAction={batchAction}
type={3}
column={column}
/>
)
}
......
src/pages/transaction/goodsOffer/pendingSubmit/index.tsx
View file @ fb377d62
......@@ -30,7 +30,7 @@ const PendingSubmit: React.FC<{}> = () => {
key: 'inquiryListNo',
dataIndex: 'inquiryListNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/goodsOffer/components/details?id=${record.id}&page_type=1&view=1`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/goodsOffer/pendingSubmit/details?id=${record.id}&page_type=1&view=1`}>{text}</EyePreview>
},
{
title: '询价单摘要',
......
src/pages/transaction/inquiryQuote/addInquiryOrder/index.tsx
View file @ fb377d62
......@@ -27,13 +27,13 @@ const AddInquiryOrder: React.FC<{}> = () => {
key: 'quotationNo',
dataIndex: 'quotationNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/inquiryQuote/components/details?id=${record.id}&page_type=6&view=2`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/inquiryQuote/addInquiryOrder/details?id=${record.id}&page_type=6&view=2`}>{text}</EyePreview>
}, {
title: '询价单号',
key: 'inquiryListNo',
dataIndex: 'inquiryListNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/inquiryQuote/components/details?id=${record.id}&page_type=6&view=1`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/inquiryQuote/addInquiryOrder/details?id=${record.id}&page_type=6&view=1`}>{text}</EyePreview>
}, {
title: '询价单摘要',
key: 'details',
......@@ -78,7 +78,7 @@ const AddInquiryOrder: React.FC<{}> = () => {
return (
<>
<Button type='link' >提交审核</Button>
<Button type="link"><Link to={`/memberCenter/tranactionAbility/inquiryQuote/addInquiryOrder/add?id=${record.id}`}>编辑</Link></Button>
<Button type="link"><Link to={`/memberCenter/tranactionAbility/inquiryQuote/addInquiryOrder/edit?id=${record.id}`}>编辑</Link></Button>
<Popconfirm
destroyTooltipOnHide
title="确定要删除吗?"
......
src/pages/transaction/inquiryQuote/components/reviewList.tsx
View file @ fb377d62
......@@ -23,11 +23,12 @@ export interface parmas {
batchAction?: Function,
reloadRef?: any,
type?: number,
column?: any
}
const ReviewList: React.FC<parmas> = (props) => {
const ref = useRef<any>({});
const { fetchData, selectAll, batchAction, reloadRef, type } = props;
const { fetchData, selectAll, batchAction, reloadRef, type, column } = props;
const [selectRow, setSelectRow] = useState([])
const [selectedRowKeys, setSelectedRowKeys] = useState<Array<number>>([]);
const [id, setId] = useState<number>();
......@@ -48,20 +49,7 @@ const ReviewList: React.FC<parmas> = (props) => {
})
const columns: ColumnType<any>[] = [
{
title: '报价单号',
key: 'quotationNo',
dataIndex: 'quotationNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/inquiryQuote/components/details?id=${record.id}&page_type=${type}&view=2`}>{text}</EyePreview>
},
{
title: '询价单号',
key: 'inquiryListNo',
dataIndex: 'inquiryListNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/inquiryQuote/components/details?id=${record.id}&page_type=${type}&view=1`}>{text}</EyePreview>
},
...column,
{
title: '询价单摘要',
key: 'details',
......
src/pages/transaction/inquiryQuote/enquiryOrder/index.tsx
View file @ fb377d62
......@@ -23,7 +23,7 @@ const EnquiryOrder: React.FC<{}> = (props) => {
key: 'inquiryListNo',
dataIndex: 'inquiryListNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/inquiryQuote/components/details?id=${record.id}&page_type=4&view=1`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/inquiryQuote/enquiryOrder/details?id=${record.id}&page_type=4&view=1`}>{text}</EyePreview>
}, {
title: '询价单摘要',
key: 'details',
......
src/pages/transaction/inquiryQuote/pendingReviewOne/index.tsx
View file @ fb377d62
......@@ -3,6 +3,8 @@ import { message } from 'antd';
import ReviewList from '../components/reviewList';
import { timeRange } from '@/utils/index';
import { PublicApi } from '@/services/api';
import { ColumnType } from 'antd/lib/table/interface';
import EyePreview from '@/components/EyePreview';
const PendingReviewOne: React.FC<{}> = () => {
const [selectRow, setSelectRow] = useState<Array<number>>([]);
......@@ -65,6 +67,20 @@ const PendingReviewOne: React.FC<{}> = () => {
message.error('请选择要操作的询价单！')
}
}
const column: ColumnType<any>[] = [{
title: '报价单号',
key: 'quotationNo',
dataIndex: 'quotationNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/inquiryQuote/pendingReviewOne/details?id=${record.id}&page_type=2&view=2`}>{text}</EyePreview>
},
{
title: '询价单号',
key: 'inquiryListNo',
dataIndex: 'inquiryListNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/inquiryQuote/pendingReviewOne/details?id=${record.id}&page_type=2&view=1`}>{text}</EyePreview>
}]
return (
<ReviewList
reloadRef={ref}
......@@ -72,6 +88,7 @@ const PendingReviewOne: React.FC<{}> = () => {
selectAll={selectAll}
batchAction={batchAction}
type={2}
column={column}
/>
)
}
......
src/pages/transaction/inquiryQuote/pendingReviewTwo/index.tsx
View file @ fb377d62
......@@ -3,6 +3,8 @@ import { message } from 'antd';
import ReviewList from '../components/reviewList';
import { timeRange } from '@/utils/index';
import { PublicApi } from '@/services/api';
import { ColumnType } from 'antd/lib/table/interface';
import EyePreview from '@/components/EyePreview';
const PendingReviewTwo: React.FC<{}> = () => {
const [selectRow, setSelectRow] = useState<Array<number>>([]);
......@@ -65,6 +67,20 @@ const PendingReviewTwo: React.FC<{}> = () => {
message.error('请选择要操作的询价单！')
}
}
const column: ColumnType<any>[] = [{
title: '报价单号',
key: 'quotationNo',
dataIndex: 'quotationNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/inquiryQuote/pendingReviewOne/details?id=${record.id}&page_type=2&view=2`}>{text}</EyePreview>
},
{
title: '询价单号',
key: 'inquiryListNo',
dataIndex: 'inquiryListNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/inquiryQuote/pendingReviewOne/details?id=${record.id}&page_type=2&view=1`}>{text}</EyePreview>
}]
return (
<ReviewList
reloadRef={ref}
......@@ -72,6 +88,7 @@ const PendingReviewTwo: React.FC<{}> = () => {
selectAll={selectAll}
batchAction={batchAction}
type={3}
column={column}
/>
)
}
......
src/pages/transaction/inquiryQuote/pendingSubmit/index.tsx
View file @ fb377d62
......@@ -29,13 +29,13 @@ const PendingSubmit: React.FC<{}> = () => {
key: 'quotationNo',
dataIndex: 'quotationNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/inquiryQuote/components/details?id=${record.id}&page_type=1&view=2`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/inquiryQuote/pendingSubmit/details?id=${record.id}&page_type=1&view=2`}>{text}</EyePreview>
}, {
title: '询价单号',
key: 'inquiryListNo',
dataIndex: 'inquiryListNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/inquiryQuote/components/details?id=${record.id}&page_type=1&view=1`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/inquiryQuote/pendingSubmit/details?id=${record.id}&page_type=1&view=1`}>{text}</EyePreview>
}, {
title: '询价单摘要',
key: 'details',
......
src/pages/transaction/inquiryQuote/quoteOrder/index.tsx
View file @ fb377d62
......@@ -23,13 +23,13 @@ const EnquiryOrder: React.FC<{}> = (props) => {
key: 'quotationNo',
dataIndex: 'quotationNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/inquiryQuote/components/details?id=${record.id}&page_type=5&view=2`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/inquiryQuote/quoteOrder/details?id=${record.id}&page_type=5&view=2`}>{text}</EyePreview>
},{
title: '询价单号',
key: 'inquiryListNo',
dataIndex: 'inquiryListNo',
render: (text: any, record: any) => <EyePreview
url={`/memberCenter/tranactionAbility/inquiryQuote/components/details?id=${record.id}&page_type=5&view=1`}>{text}</EyePreview>
url={`/memberCenter/tranactionAbility/inquiryQuote/quoteOrder/details?id=${record.id}&page_type=5&view=1`}>{text}</EyePreview>
}, {
title: '询价单摘要',
key: 'details',
......
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