Commit 408bd4ff authored by XieZhiXiong's avatar XieZhiXiong

调整完毕交易相关路由

parent dfb74a3d
This diff is collapsed.
......@@ -2,7 +2,7 @@
* @Author: LeeJiancong
* @Date: 2020-07-13 14:08:50
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-10-12 19:50:43
* @LastEditTime: 2020-10-13 16:11:50
*/
export default {
......@@ -122,12 +122,17 @@ export default {
'menu.tranactionAbility.electronicContracts.classSearch': '合同模板参数查询',
'menu.tranactionAbility.electronicContracts.template': '合同模板',
'menu.tranactionAbility.electronicContracts.addContract': '新建合同模板',
'menu.tranactionAbility.electronicContracts.addTemplate': '新建合同模板',
'menu.tranactionAbility.electronicContracts.editTemplate': '编辑合同模板',
'menu.tranactionAbility.electronicContracts.templateDetail': '查看合同模板',
// 商品询价
'menu.tranactionAbility.goodsOffer': '商品询价',
'menu.tranactionAbility.goodsOffer.enquiryOrder': '询价单查询',
'menu.tranactionAbility.goodsOffer.addEnquiryOrder': '待新增询价单',
'menu.tranactionAbility.goodsOffer.add': '新建询价单',
'menu.tranactionAbility.goodsOffer.edit': '编辑询价单',
'menu.tranactionAbility.goodsOffer.detail': '查看询价单',
'menu.tranactionAbility.goodsOffer.details': '新建询价单',
'menu.tranactionAbility.goodsOffer.pendingReviewOne': '待审核询价单(一级)',
'menu.tranactionAbility.goodsOffer.pendingReviewTwo': '待审核询价单(二级)',
......@@ -137,10 +142,16 @@ export default {
'menu.tranactionAbility.stockSellStorage': '进销存',
'menu.tranactionAbility.stockSellStorage.warehouse': '仓库',
'menu.tranactionAbility.stockSellStorage.addWarehouse': '新增仓库',
'menu.tranactionAbility.stockSellStorage.editWarehouse': '编辑仓库',
'menu.tranactionAbility.stockSellStorage.warehouseDetail': '查看仓库',
'menu.tranactionAbility.stockSellStorage.billsType': '单据类型',
'menu.tranactionAbility.stockSellStorage.addBillsType': '新增单据类型',
'menu.tranactionAbility.stockSellStorage.editBillsType': '编辑单据类型',
'menu.tranactionAbility.stockSellStorage.billsTypeDetail': '查看单据类型',
'menu.tranactionAbility.stockSellStorage.bills': '单据',
'menu.tranactionAbility.stockSellStorage.addBills': '新增单据',
'menu.tranactionAbility.stockSellStorage.editBills': '编辑单据',
'menu.tranactionAbility.stockSellStorage.billsDetail': '查看单据',
'menu.tranactionAbility.stockSellStorage.inventory': '库存',
'menu.tranactionAbility.transactionRules': '交易规则',
'menu.tranactionAbility.addRule': '新增交易规则',
......@@ -148,13 +159,16 @@ export default {
// 需求发布
'menu.tranactionAbility.enquirySubmit': '需求发布',
'menu.tranactionAbility.enquirySubmit.enquirySearch': '需求单查询',
'menu.tranactionAbility.enquirySubmit.toAddSubmitList': '待新增需求单',
'menu.tranactionAbility.enquirySubmit.addEnquiry': '新增需求单',
'menu.tranactionAbility.enquirySubmit.editEnquiry': '编辑需求单',
'menu.tranactionAbility.enquirySubmit.viewEnquiryDetail': '需求单详情',
'menu.tranactionAbility.enquirySubmit.enquiryOne': '待审核需求单(一级)',
'menu.tranactionAbility.enquirySubmit.enquiryOneDetail': '待审核需求单(一级)详情',
'menu.tranactionAbility.enquirySubmit.enquiryTwo': '待审核需求单(二级)',
'menu.tranactionAbility.enquirySubmit.enquiryTwoDetail': '待审核需求单(二级)详情',
'menu.tranactionAbility.enquirySubmit.toSubmit': '待提交需求单',
'menu.tranactionAbility.enquirySubmit.toSubmitDetail': '待提交需求单详情',
// 采购订单
'menu.tranactionAbility.purchaseOrder': '采购订单',
......@@ -209,20 +223,28 @@ export default {
'menu.tranactionAbility.enquiryOffer.enquirySearch': '需求单查询',
'menu.tranactionAbility.enquiryOffer.enquiryOfferSearch': '报价单查询',
'menu.tranactionAbility.enquiryOffer.toAddSubmitList': '待新增报价单',
'menu.tranactionAbility.enquiryOffer.addEnquiry': '新增报价',
'menu.tranactionAbility.enquiryOffer.addEnquiry': '新增报价单',
'menu.tranactionAbility.enquiryOffer.editEnquiry': '编辑报价单',
'menu.tranactionAbility.enquiryOffer.viewEnquiryDetail': '报价单详情',
'menu.tranactionAbility.enquiryOffer.enquiryOne': '待审核报价单(一级)',
'menu.tranactionAbility.enquiryOffer.enquiryOneDetail': '待审核报价单(一级)详情',
'menu.tranactionAbility.enquiryOffer.enquiryTwo': '待审核报价单(二级)',
'menu.tranactionAbility.enquiryOffer.enquiryTwoDetail': '待审核报价单(二级)详情',
'menu.tranactionAbility.enquiryOffer.toSubmit': '待提交报价单',
'menu.tranactionAbility.enquiryOffer.toSubmitDetail': '待提交报价单',
// 确认报价
'menu.tranactionAbility.enquiryOfferConfirm': '确认需求报价',
'menu.tranactionAbility.enquiryOfferConfirm.enquiryOfferSearch': '报价单查询',
'menu.tranactionAbility.enquiryOfferConfirm.toSubmit': '待提交审核报价单',
'menu.tranactionAbility.enquiryOfferConfirm.toSubmitDetail': '待提交审核报价单详情',
'menu.tranactionAbility.enquiryOfferConfirm.enquiryOne': '待审核报价单(一级)',
'menu.tranactionAbility.enquiryOfferConfirm.enquiryOneDetail': '待审核报价单(一级)详情',
'menu.tranactionAbility.enquiryOfferConfirm.enquiryTwo': '待审核报价单(二级)',
'menu.tranactionAbility.enquiryOfferConfirm.enquiryTwoDetail': '待审核报价单(二级)详情',
'menu.tranactionAbility.enquiryOfferConfirm.viewEnquiryDetail':'报价单详情',
'menu.tranactionAbility.enquiryOfferConfirm.enquiryOfferComfirmSearch':'待确认报价单',
'menu.tranactionAbility.enquiryOfferConfirm.enquiryOfferComfirmSearchDetail':'待确认报价单详情',
// 供应商评价
'menu.tranactionAbility.supplierEvaluation': '供应会员评价管理',
......
......@@ -36,7 +36,7 @@ const QuickNav: React.FC<QuickNavPropsType> = (props) => {
icon: require('@/assets/mallHomeIcon/upload_icon.png')
},
{
path: '/memberCenter/tranactionAbility/enquiryOffer/addEnquiry',
path: '/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/add',
title: '报价',
icon: require('@/assets/mallHomeIcon/offer_icon.png')
},
......@@ -50,7 +50,7 @@ const QuickNav: React.FC<QuickNavPropsType> = (props) => {
// 买家服务快捷导航
const buy_quick_nav_list = [
{
path: '/memberCenter/tranactionAbility/enquirySubmit/addEnquiry',
path: '/memberCenter/tranactionAbility/enquirySubmit/toAddSubmitList/add',
title: '我要求购',
icon: require('@/assets/mallHomeIcon/buy_icon.png')
},
......
......@@ -50,7 +50,7 @@ const CommodityList: React.FC<CommodityListPropsType> = (props) => {
<span className="credit_text">1288</span>
</div>
<div className="quoted_price_btn">
<a href={`/memberCenter/tranactionAbility/enquiryOffer/addEnquiry`}> 立即报价 </a>
<a href={`/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/add`}> 立即报价 </a>
</div>
</div>
</div>
......
......@@ -53,14 +53,14 @@ const Apply = () => {
await PublicApi.postOrderSignatureAuthApply({}).then(res => {
setSignatureAuthLogId(res.data.signatureAuthLogId);
sessionStorage.setItem('signatureAuthLogId', res.data.signatureAuthLogId.toString())
history.push(`/memberCenter/tranactionAbility/electronicContracts/enterpriseCertified?authTypeEdit=${authType}`)
history.push(`/memberCenter/tranactionAbility/electronicContracts/apply/enterpriseCertified?authTypeEdit=${authType}`)
})
}
} else {
await PublicApi.postOrderSignatureAuthApply({}).then(res => {
setSignatureAuthLogId(res.data.signatureAuthLogId);
sessionStorage.setItem('signatureAuthLogId', res.data.signatureAuthLogId.toString())
history.push(`/memberCenter/tranactionAbility/electronicContracts/enterpriseCertified?authTypeEdit=${authType}`)
history.push(`/memberCenter/tranactionAbility/electronicContracts/apply/enterpriseCertified?authTypeEdit=${authType}`)
})
}
}
......
......@@ -25,7 +25,7 @@ const Template: React.FC<{}> = () => {
render: (text: any, record: any) => {
return (
<EyePreview
url={`/memberCenter/tranactionAbility/electronicContracts/addContract?id=${record.id}`}
url={`/memberCenter/tranactionAbility/electronicContracts/template/detail?id=${record.id}`}
>
{text}
</EyePreview>
......@@ -68,7 +68,7 @@ const Template: React.FC<{}> = () => {
let component: ReactNode = null
component = (
<>
<Button disabled={record.state === 1} style={{padding: '0px', marginRight: '24px'}} type='link'><Link to={`/memberCenter/tranactionAbility/electronicContracts/addContract?page_type=edit&id=${record.id}`}>编辑</Link></Button>
<Button disabled={record.state === 1} style={{padding: '0px', marginRight: '24px'}} type='link'><Link to={`/memberCenter/tranactionAbility/electronicContracts/template/edit?page_type=edit&id=${record.id}`}>编辑</Link></Button>
<Popconfirm
title="确定要执行这个操作?"
onConfirm={() => confirmDel(record)}
......@@ -102,7 +102,7 @@ const Template: React.FC<{}> = () => {
const handleJumpAdd = () => {
history.push({
pathname:
'/memberCenter/tranactionAbility/electronicContracts/addContract',
'/memberCenter/tranactionAbility/electronicContracts/template/add',
query: {
page_type: 'add',
},
......
......@@ -144,9 +144,6 @@ const List:React.FC<listParams> = (props) => {
useEffect(()=> {
},[])
const toEdit = (id:number | string) => {
history.push(`/memberCenter/tranactionAbility/enquirySubmit/addEnquiry?id=${id}`)
}
/**
* @description: 删除
* @param {type}
......
/*
* @Author: LeeJiancong
* @Date: 2020-08-24 11:39:11
* @LastEditors: LeeJiancong
* @LastEditors: XieZhiXiong
* @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-09-28 16:09:11
* @LastEditTime: 2020-10-13 16:59:56
*/
/**
* @description: 组件描述: 一级 二级 待提交报价单
......@@ -86,9 +86,11 @@ const List:React.FC<listParams> = (props) => {
*/
const handleToDetail= (type,id) => {
if(type === 1){
history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${4}&id=${id}`)
// history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${4}&id=${id}`)
history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?id=${id}`)
}else{
history.push(`/memberCenter/tranactionAbility/enquiryOffer/viewEnquiryDetail?page_type=${props.type}&id=${id}`)
// history.push(`/memberCenter/tranactionAbility/enquiryOffer/viewEnquiryDetail?page_type=${props.type}&id=${id}`)
history.push(`/memberCenter/tranactionAbility/enquiryOffer/viewEnquiryDetail?id=${id}`)
}
}
......@@ -173,33 +175,65 @@ 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}`)}>
审核
</Button>
:
<>
{
(props.type === 3 && record.externalState === 1) &&
<Button type="link" onClick={() =>
history.push(`/memberCenter/tranactionAbility/enquiryOffer/viewEnquiryDetail?page_type=${props.type}&id=${record.id}`)}>
提交</Button>
}
{
(record.externalState === 1 && record.interiorState === 1) &&
(props.type === 1 || props.type === 2) ? (
<>
<Popconfirm title="确定要删除吗?" okText="是" cancelText="否" onConfirm={() => handleDelete([record.id])}>
<Button type='link'>
删除
{/* 待审核一级 */}
{props.type === 1 && (
<Button
type="link"
onClick={() =>
// history.push(`/memberCenter/tranactionAbility/enquiryOffer/viewEnquiryDetail?page_type=${props.type}&id=${record.id}`)
history.push(`/memberCenter/tranactionAbility/enquiryOffer/enquiryOne/detail?id=${record.id}`)
}
>
审核
</Button>
</Popconfirm>
<Popconfirm title="确定要提交吗?" okText="是" cancelText="否" onConfirm={() => handleSubmit(record.id)}>
<Button type='link'>提交</Button>
</Popconfirm>
)}
{/* 待审核二级 */}
{props.type === 2 && (
<Button
type="link"
onClick={() =>
// history.push(`/memberCenter/tranactionAbility/enquiryOffer/viewEnquiryDetail?page_type=${props.type}&id=${record.id}`)
history.push(`/memberCenter/tranactionAbility/enquiryOffer/enquiryTwo/detail?id=${record.id}`)
}
>
审核
</Button>
)}
</>
) : (
<>
{/* 待提交 */}
{
(props.type === 3 && record.externalState === 1) && (
<Button
type="link"
onClick={() =>
// history.push(`/memberCenter/tranactionAbility/enquiryOffer/viewEnquiryDetail?page_type=${props.type}&id=${record.id}`)
history.push(`/memberCenter/tranactionAbility/enquiryOffer/toSubmit/detail?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>
</>
)
}
</>
}
</>
)
}
</>
)
......@@ -213,9 +247,6 @@ const List:React.FC<listParams> = (props) => {
useEffect(()=> {
},[])
const toEdit = (id:number | string) => {
history.push(`/memberCenter/tranactionAbility/enquirySubmit/addEnquiry?id=${id}`)
}
/**
* @description: 删除
* @param {type}
......
/*
* @Author: LeeJiancong
* @Date: 2020-08-24 11:39:11
* @LastEditors: LeeJiancong
* @LastEditors: XieZhiXiong
* @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-09-28 17:21:23
* @LastEditTime: 2020-10-13 15:57:42
*/
/**
* @description: 组件描述:
......@@ -71,9 +71,11 @@ const List:React.FC<{listParams}> = (props) => {
*/
const handleToDetail= (type,id) => {
if(type === 1){
history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${4}&id=${id}`)
// history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${4}&id=${id}`)
history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?id=${id}`)
}else{
history.push(`/memberCenter/tranactionAbility/enquiryOffer/viewEnquiryDetail?page_type=${4}&id=${id}`)
// history.push(`/memberCenter/tranactionAbility/enquiryOffer/viewEnquiryDetail?page_type=${4}&id=${id}`)
history.push(`/memberCenter/tranactionAbility/enquiryOffer/viewEnquiryDetail?id=${id}`)
}
}
const fetchData = async (params: any) => {
......@@ -160,9 +162,6 @@ const List:React.FC<{listParams}> = (props) => {
useEffect(()=> {
},[])
const toEdit = (id:number | string) => {
history.push(`/memberCenter/tranactionAbility/enquirySubmit/addEnquiry?id=${id}`)
}
/**
* @description: 删除
* @param {type}
......
import React from 'react';
const AddReadyAddOrder: React.FC = () => {
const EnquiryOneDetail: React.FC = () => {
return (
<div>
新增采购订单
待审核报价单(一级)详情
</div>
);
};
export default AddReadyAddOrder;
\ No newline at end of file
export default EnquiryOneDetail;
\ No newline at end of file
/*
* @Author: LeeJiancong
* @Date: 2020-08-24 11:39:11
* @LastEditors: LeeJiancong
* @LastEditors: XieZhiXiong
* @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-09-12 14:20:26
* @LastEditTime: 2020-10-13 15:49:20
*/
/**
* @description: 组件描述:
......@@ -75,7 +75,8 @@ const List:React.FC<{listParams}> = (props) => {
* @return {type}
*/
const handleToDetail= (id) => {
history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${6}&id=${id}`)
// history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${6}&id=${id}`)
history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?id=${id}`)
}
const columns : ColumnType<any>[] = [
......@@ -139,9 +140,6 @@ const List:React.FC<{listParams}> = (props) => {
useEffect(()=> {
},[])
const toEdit = (id:number | string) => {
history.push(`/memberCenter/tranactionAbility/enquirySubmit/addEnquiry?id=${id}`)
}
/**
* @description: 删除
* @param {type}
......
import React from 'react';
const EditReadyAddOrder: React.FC = () => {
const EnquiryTwoDetail: React.FC = () => {
return (
<div>
编辑采购订单
待审核报价单(二级)详情
</div>
);
};
export default EditReadyAddOrder;
\ No newline at end of file
export default EnquiryTwoDetail;
\ No newline at end of file
......@@ -151,7 +151,7 @@ const List:React.FC<{}> = () => {
},[])
const toEdit = (id:number | string) => {
history.push(`/memberCenter/tranactionAbility/enquiryOffer/addEnquiry?id=${id}`)
history.push(`/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/edit?id=${id}`)
}
/**
* @description: 删除
......@@ -207,7 +207,7 @@ const List:React.FC<{}> = () => {
const controllerBtns = <Row>
<Col span={24}>
<Space direction="horizontal" size={16}>
<Button type="primary" onClick={() => history.push('/memberCenter/tranactionAbility/enquiryOffer/addEnquiry')} icon={<PlusOutlined/>}>新建</Button>
<Button type="primary" onClick={() => history.push('/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/add')} icon={<PlusOutlined/>}>新建</Button>
<Button onClick={() => handleSubmitAll(selectedRowKeys)}>批量提交审核</Button>
<Dropdown.Button
overlay={menu}
......
import React from 'react';
const ToSubmitDetail: React.FC = () => {
return (
<div>
待提交报价单详情
</div>
);
};
export default ToSubmitDetail;
\ No newline at end of file
......@@ -144,9 +144,6 @@ const List:React.FC<listParams> = (props) => {
useEffect(()=> {
},[])
const toEdit = (id:number | string) => {
history.push(`/memberCenter/tranactionAbility/enquirySubmit/addEnquiry?id=${id}`)
}
/**
* @description: 删除
* @param {type}
......
......@@ -74,15 +74,19 @@ const List: React.FC<listParams> = (props) => {
const handleToDetail = (type, id) => {
if(props.type === 1){
if (type === 1) {
history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${4}&id=${id}`)
// history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${4}&id=${id}`)
history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?id=${id}`)
} else {
history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/viewEnquiryDetail?page_type=${4}&id=${id}`)
// history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/viewEnquiryDetail?page_type=${4}&id=${id}`)
history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/viewEnquiryDetail?id=${id}`)
}
}else if(props.type === 2){
if (type === 1) {
history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${4}&id=${id}`)
// history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${4}&id=${id}`)
history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?id=${id}`)
} else {
history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/viewEnquiryDetail?page_type=${5}&id=${id}`)
// history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/viewEnquiryDetail?page_type=${5}&id=${id}`)
history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/viewEnquiryDetail?id=${id}`)
}
}
}
......@@ -174,9 +178,6 @@ const List: React.FC<listParams> = (props) => {
useEffect(() => {
}, [])
const toEdit = (id: number | string) => {
history.push(`/memberCenter/tranactionAbility/enquirySubmit/addEnquiry?id=${id}`)
}
/**
* @description: 删除
* @param {type}
......
/*
* @Author: LeeJiancong
* @Date: 2020-08-24 11:39:11
* @LastEditors: LeeJiancong
* @LastEditors: XieZhiXiong
* @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-09-28 14:35:22
* @LastEditTime: 2020-10-13 17:36:02
*/
/**
* @description: 组件描述: 一级 二级 待提交报价单
......@@ -86,9 +86,11 @@ const List:React.FC<listParams> = (props) => {
*/
const handleToDetail= (type,id) => {
if(type === 1){
history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${4}&id=${id}`)
// history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${4}&id=${id}`)
history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?&id=${id}`)
}else{
history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/viewEnquiryDetail?page_type=${props.type}&id=${id}`)
// history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/viewEnquiryDetail?page_type=${props.type}&id=${id}`)
history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/viewEnquiryDetail?id=${id}`)
}
}
......@@ -170,20 +172,47 @@ const List:React.FC<listParams> = (props) => {
<>
{
(props.type === 1 || props.type === 2) ?
<Button type="link" onClick={() =>
history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/viewEnquiryDetail?page_type=${props.type}&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}`)}>
提交</Button>
}
</>
(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>
)
}
</>
)
}
</>
)
......@@ -197,9 +226,6 @@ const List:React.FC<listParams> = (props) => {
useEffect(()=> {
},[])
const toEdit = (id:number | string) => {
history.push(`/memberCenter/tranactionAbility/enquirySubmit/addEnquiry?id=${id}`)
}
/**
* @description: 删除
* @param {type}
......
import React from 'react';
const EnquiryOfferComfirmSearchDetail: React.FC = () => {
return (
<div>
待确认报价单详情
</div>
);
};
export default EnquiryOfferComfirmSearchDetail;
\ No newline at end of file
import React from 'react';
const EnquiryOneDetail: React.FC = () => {
return (
<div>
待审核报价单(一级)详情
</div>
);
};
export default EnquiryOneDetail;
\ No newline at end of file
import React from 'react';
const EnquiryTwoDetail: React.FC = () => {
return (
<div>
待审核报价单(二级)详情
</div>
);
};
export default EnquiryTwoDetail;
\ No newline at end of file
import React from 'react';
const ToSubmitDetail: React.FC = () => {
return (
<div>
待提交审核报价单详情
</div>
);
};
export default ToSubmitDetail;
\ No newline at end of file
......@@ -144,9 +144,6 @@ const List:React.FC<listParams> = (props) => {
useEffect(()=> {
},[])
const toEdit = (id:number | string) => {
history.push(`/memberCenter/tranactionAbility/enquirySubmit/addEnquiry?id=${id}`)
}
/**
* @description: 删除
* @param {type}
......
/*
* @Author: LeeJiancong
* @Date: 2020-08-24 11:39:11
* @LastEditors: LeeJiancong
* @LastEditors: XieZhiXiong
* @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-09-10 15:47:17
* @LastEditTime: 2020-10-13 15:43:50
*/
/**
* @description: 组件描述: 一级 二级 待提交需求单
......@@ -86,7 +86,8 @@ const List:React.FC<listParams> = (props) => {
* @return {type}
*/
const handleToDetail= (id) => {
history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${props.type}&id=${id}`)
// history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${props.type}&id=${id}`)
history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?id=${id}`)
}
const columns : ColumnType<any>[] = [
......@@ -167,33 +168,69 @@ const List:React.FC<listParams> = (props) => {
<>
{
(props.type === 1 || props.type === 2) ?
<Button type="link" onClick={() =>
history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${props.type}&id=${record.id}`)}>
审核
</Button>
:
<>
{
(props.type === 3 && record.externalState === 1) &&
<Button type="link" onClick={() =>
history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${props.type}&id=${record.id}`)}>
提交</Button>
}
{
(record.externalState === 1 && record.interiorState === 1) &&
(props.type === 1 || props.type === 2) ? (
<>
<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>
{/* 待一级审核 */}
{
props.type === 1 && (
<Button
type="link"
onClick={() =>
// history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${props.type}&id=${record.id}`)
history.push(`/memberCenter/tranactionAbility/enquirySubmit/enquiryOne/detail?id=${record.id}`)
}
>
审核
</Button>
)
}
{/* 待二级审核 */}
{
props.type === 2 && (
<Button
type="link"
onClick={() =>
// history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${props.type}&id=${record.id}`)
history.push(`/memberCenter/tranactionAbility/enquirySubmit/enquiryTwo/detail?id=${record.id}`)
}
>
审核
</Button>
)
}
</>
}
</>
) : (
<>
{/* 待提交 */}
{
(props.type === 3 && record.externalState === 1) && (
<Button
type="link"
onClick={() =>
// history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${props.type}&id=${record.id}`)
history.push(`/memberCenter/tranactionAbility/enquirySubmit/toSubmit/detail?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>
</>
)
}
</>
)
}
</>
)
......@@ -207,9 +244,6 @@ const List:React.FC<listParams> = (props) => {
useEffect(()=> {
},[])
const toEdit = (id:number | string) => {
history.push(`/memberCenter/tranactionAbility/enquirySubmit/addEnquiry?id=${id}`)
}
/**
* @description: 删除
* @param {type}
......@@ -279,7 +313,7 @@ const List:React.FC<listParams> = (props) => {
<Space direction="horizontal" size={16}>
{
(props.type !== 1 && props.type !== 2 && props.type !== 3)&&
<Button type="primary" onClick={() => history.push('/memberCenter/tranactionAbility/enquirySubmit/addEnquiry')} icon={<PlusOutlined/>}>新建</Button>
<Button type="primary" onClick={() => history.push('/memberCenter/tranactionAbility/enquirySubmit/toAddSubmitList/add')} icon={<PlusOutlined/>}>新建</Button>
}
<Button onClick={() => handleSubmitAll(selectedRowKeys)}>
{ (props.type == 1 || props.type == 2) ? '批量提交审核' :'批量审核通过'}
......
import React from 'react';
const EnquiryOneDetail: React.FC = () => {
return (
<div>
待审核需求单(一级)详情
</div>
);
};
export default EnquiryOneDetail;
\ No newline at end of file
/*
* @Author: LeeJiancong
* @Date: 2020-08-24 11:39:11
* @LastEditors: LeeJiancong
* @LastEditors: XieZhiXiong
* @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-09-10 16:02:00
* @LastEditTime: 2020-10-13 14:45:01
*/
/**
* @description: 组件描述: 一级 二级 待提交需求单
......@@ -75,7 +75,8 @@ const List:React.FC<{listParams}> = (props) => {
* @return {type}
*/
const handleToDetail= (id) => {
history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${4}&id=${id}`)
// history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${4}&id=${id}`)
history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?id=${id}`)
}
const columns : ColumnType<any>[] = [
......@@ -150,9 +151,6 @@ const List:React.FC<{listParams}> = (props) => {
useEffect(()=> {
},[])
const toEdit = (id:number | string) => {
history.push(`/memberCenter/tranactionAbility/enquirySubmit/addEnquiry?id=${id}`)
}
/**
* @description: 删除
* @param {type}
......
import React from 'react';
const EnquiryTwoDetail: React.FC = () => {
return (
<div>
待审核需求单(二级)详情
</div>
);
};
export default EnquiryTwoDetail;
\ No newline at end of file
......@@ -159,7 +159,7 @@ const List:React.FC<{}> = () => {
},[])
const toEdit = (id:number | string) => {
history.push(`/memberCenter/tranactionAbility/enquirySubmit/addEnquiry?id=${id}`)
history.push(`/memberCenter/tranactionAbility/enquirySubmit/toAddSubmitList/edit?id=${id}`)
}
/**
* @description: 删除
......@@ -215,7 +215,7 @@ const List:React.FC<{}> = () => {
const controllerBtns = <Row>
<Col span={24}>
<Space direction="horizontal" size={16}>
<Button type="primary" onClick={() => history.push('/memberCenter/tranactionAbility/enquirySubmit/addEnquiry')} icon={<PlusOutlined/>}>新建</Button>
<Button type="primary" onClick={() => history.push('/memberCenter/tranactionAbility/enquirySubmit/toAddSubmitList/add')} icon={<PlusOutlined/>}>新建</Button>
<Button onClick={() => handleSubmitAll(selectedRowKeys)}>批量提交审核</Button>
<Dropdown.Button
overlay={menu}
......
import React from 'react';
const ToSubmitDetail: React.FC = () => {
return (
<div>
待提交需求单详情
</div>
);
};
export default ToSubmitDetail;
\ No newline at end of file
......@@ -124,7 +124,7 @@ export const useSelfTable = () => {
}
const handleAdd = async (record) => {
history.push(`/memberCenter/tranactionAbility/stockSellStorage/addBills?relevanceInvoicesId=${record.id}&invoicesTypeId=${DOC_TYPE_PURCHASE_RECEIPT}&relevanceInvoices=1`)
history.push(`/memberCenter/tranactionAbility/stockSellStorage/bills/add?relevanceInvoicesId=${record.id}&invoicesTypeId=${DOC_TYPE_PURCHASE_RECEIPT}&relevanceInvoices=1`)
}
return {
......
import React from 'react';
const ReadyAddOrderForm: React.FC = () => {
return (
<div>
新增/编辑采购订单
</div>
);
};
export default ReadyAddOrderForm;
\ No newline at end of file
......@@ -125,7 +125,7 @@ export const useSelfTable = () => {
}
const handleAdd = async (record) => {
history.push(`/memberCenter/tranactionAbility/stockSellStorage/addBills?relevanceInvoicesId=${record.id}&invoicesTypeId=${DOC_TYPE_SALES_INVOICE}&relevanceInvoices=1`)
history.push(`/memberCenter/tranactionAbility/stockSellStorage/bills/add?relevanceInvoicesId=${record.id}&invoicesTypeId=${DOC_TYPE_SALES_INVOICE}&relevanceInvoices=1`)
}
return {
......
......@@ -178,7 +178,7 @@ const Bills: React.FC<{}> = () => {
align: 'center',
render: (text: any, record: any) => (
<EyePreview
url={`/memberCenter/tranactionAbility/stockSellStorage/addBills?id=${record.id}&preview=1`}
url={`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?id=${record.id}&preview=1`}
>
{text}
</EyePreview>
......@@ -244,7 +244,7 @@ const Bills: React.FC<{}> = () => {
<>
{record.state === DOC_STATUS_UNREVIEWED && (
<>
<Button type="link" onClick={() => history.push(`/memberCenter/tranactionAbility/stockSellStorage/addBills?id=${record.id}`)}>修改</Button>
<Button type="link" onClick={() => history.push(`/memberCenter/tranactionAbility/stockSellStorage/bills/edit?id=${record.id}`)}>修改</Button>
<Button type="link" onClick={() => handleAudit(record.id)}>审核</Button>
<Popconfirm
title="确定要删除吗?"
......@@ -284,7 +284,7 @@ const Bills: React.FC<{}> = () => {
icon={<PlusOutlined />}
onClick={() =>
history.push(
'/memberCenter/tranactionAbility/stockSellStorage/addBills',
'/memberCenter/tranactionAbility/stockSellStorage/bills/add',
)
}
>
......
......@@ -41,7 +41,7 @@ const billsType: React.FC<{}> = () => {
render: (text: any, record: any) => {
return (
<EyePreview
url={`/memberCenter/tranactionAbility/stockSellStorage/addBillsType?id=${record.id}&preview=1`}
url={`/memberCenter/tranactionAbility/stockSellStorage/billsType/detail?id=${record.id}&preview=1`}
>
{text}
</EyePreview>
......@@ -81,7 +81,7 @@ const billsType: React.FC<{}> = () => {
type="link"
onClick={() =>
history.push(
`/memberCenter/tranactionAbility/stockSellStorage/addBillsType?id=${record.id}`,
`/memberCenter/tranactionAbility/stockSellStorage/billsType/edit?id=${record.id}`,
)
}
>
......@@ -139,7 +139,7 @@ const billsType: React.FC<{}> = () => {
};
const handleJumpAdd = () => {
history.push(`/memberCenter/tranactionAbility/stockSellStorage/addBillsType`);
history.push(`/memberCenter/tranactionAbility/stockSellStorage/billsType/add`);
};
const Actions = (
......
......@@ -37,7 +37,7 @@ const WareHouse: React.FC<{}> = () => {
render: (text: any, record: any) => {
return (
<EyePreview
url={`/memberCenter/tranactionAbility/stockSellStorage/addWarehouse?id=${record.id}&preview=1`}
url={`/memberCenter/tranactionAbility/stockSellStorage/warehouse/detail?id=${record.id}&preview=1`}
>
{text}
</EyePreview>
......@@ -86,7 +86,7 @@ const WareHouse: React.FC<{}> = () => {
type="link"
onClick={() =>
history.push(
`/memberCenter/tranactionAbility/stockSellStorage/addWarehouse?id=${record.id}`,
`/memberCenter/tranactionAbility/stockSellStorage/warehouse/edit?id=${record.id}`,
)
}
>
......@@ -144,13 +144,7 @@ const WareHouse: React.FC<{}> = () => {
};
const handleJumpAdd = () => {
history.push({
pathname:
'/memberCenter/tranactionAbility/stockSellStorage/addWarehouse',
query: {
type: 'add',
},
});
history.push('/memberCenter/tranactionAbility/stockSellStorage/warehouse/add');
};
const Actions = (
......
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