Commit 4a7c7e29 authored by 前端-黄佳鑫's avatar 前端-黄佳鑫

修改需求报价等路由

parent 7ab14f51
...@@ -172,6 +172,13 @@ const TranactionRoute: RouterChild = { ...@@ -172,6 +172,13 @@ const TranactionRoute: RouterChild = {
path: '/memberCenter/tranactionAbility/enquirySubmit/enquirySearch', path: '/memberCenter/tranactionAbility/enquirySubmit/enquirySearch',
name: 'enquirySearch', name: 'enquirySearch',
component: '@/pages/transaction/enquirySubmit/enquirySearch' component: '@/pages/transaction/enquirySubmit/enquirySearch'
},
// 需求单查询详情
{
path: '/memberCenter/tranactionAbility/enquirySubmit/enquirySearch/detail',
name: 'enquirySearchDetail',
component: '@/pages/transaction/enquirySubmit/components/detail',
hideInMenu: true,
}, },
// 待新增需求单 // 待新增需求单
{ {
...@@ -193,7 +200,7 @@ const TranactionRoute: RouterChild = { ...@@ -193,7 +200,7 @@ const TranactionRoute: RouterChild = {
component: '@/pages/transaction/enquirySubmit/toAddSubmit/detail', component: '@/pages/transaction/enquirySubmit/toAddSubmit/detail',
hideInMenu: true, hideInMenu: true,
}, },
// 需求单详情 // 待新增需求单详情
{ {
path: '/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail', path: '/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail',
name: 'viewEnquiryDetail', name: 'viewEnquiryDetail',
...@@ -253,10 +260,17 @@ const TranactionRoute: RouterChild = { ...@@ -253,10 +260,17 @@ const TranactionRoute: RouterChild = {
name: 'enquirySearch', name: 'enquirySearch',
component: '@/pages/transaction/enquiryOffer/enquirySearch' component: '@/pages/transaction/enquiryOffer/enquirySearch'
}, },
// 报价单详情 // 需求单查询-详情
{ {
path: '/memberCenter/tranactionAbility/enquiryOffer/viewEnquiryDetail', path: '/memberCenter/tranactionAbility/enquiryOffer/enquirySearch/detail',
name: 'viewEnquiryDetail', name: 'enquirySearchDetail',
component: '@/pages/transaction/enquiryOffer/components/detail',
hideInMenu: true,
},
// 报价单查询详情
{
path: '/memberCenter/tranactionAbility/enquiryOffer/enquiryOfferSearchDetail',
name: 'enquiryOfferSearchDetail',
component: '@/pages/transaction/enquiryOffer/components/detail', component: '@/pages/transaction/enquiryOffer/components/detail',
hideInMenu: true, hideInMenu: true,
}, },
...@@ -286,6 +300,13 @@ const TranactionRoute: RouterChild = { ...@@ -286,6 +300,13 @@ const TranactionRoute: RouterChild = {
component: '@/pages/transaction/enquiryOffer/toAddSubmit/detail', component: '@/pages/transaction/enquiryOffer/toAddSubmit/detail',
hideInMenu: true, hideInMenu: true,
}, },
// 待新增报价单详情
{
path: '/memberCenter/tranactionAbility/enquiryOffer/viewEnquiryDetail',
name: 'viewEnquiryDetail',
component: '@/pages/transaction/enquiryOffer/components/detail',
hideInMenu: true,
},
// 待审核报价单(一级) // 待审核报价单(一级)
{ {
path: '/memberCenter/tranactionAbility/enquiryOffer/enquiryOne', path: '/memberCenter/tranactionAbility/enquiryOffer/enquiryOne',
...@@ -341,11 +362,18 @@ const TranactionRoute: RouterChild = { ...@@ -341,11 +362,18 @@ const TranactionRoute: RouterChild = {
}, },
// 报价单详情 // 报价单详情
{ {
path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/viewEnquiryDetail', path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferSearch/viewEnquiryDetail',
name: 'viewEnquiryDetail', name: 'viewEnquiryDetail',
component: '@/pages/transaction/enquiryOfferConfirm/components/detail', component: '@/pages/transaction/enquiryOfferConfirm/components/detail',
hideInMenu: true, hideInMenu: true,
}, },
// 需求单详情
{
path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferSearch/viewDemandDetail',
name: 'viewDemandDetail',
component: '@/pages/transaction/enquirySubmit/components/detail',
hideInMenu: true,
},
// 待提交报价单 // 待提交报价单
{ {
path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/toSubmit', path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/toSubmit',
...@@ -391,6 +419,20 @@ const TranactionRoute: RouterChild = { ...@@ -391,6 +419,20 @@ const TranactionRoute: RouterChild = {
name: 'enquiryOfferComfirmSearch', name: 'enquiryOfferComfirmSearch',
component: '@/pages/transaction/enquiryOfferConfirm/enquiryOfferComfirmSearch' component: '@/pages/transaction/enquiryOfferConfirm/enquiryOfferComfirmSearch'
}, },
// 报价单详情
{
path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferComfirmSearch/enquiryViewDetail',
name: 'enquiryViewDetail',
component: '@/pages/transaction/enquiryOfferConfirm/components/detail',
hideInMenu: true,
},
// 需求单详情
{
path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferComfirmSearch/demandViewDetail',
name: 'demandViewDetail',
component: '@/pages/transaction/enquirySubmit/components/detail',
hideInMenu: true,
},
// 待确认报价单-详情 // 待确认报价单-详情
{ {
path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferComfirmSearch/detail', path: '/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferComfirmSearch/detail',
......
...@@ -204,6 +204,7 @@ export default { ...@@ -204,6 +204,7 @@ export default {
// 需求发布 // 需求发布
'menu.tranactionAbility.enquirySubmit': '需求发布', 'menu.tranactionAbility.enquirySubmit': '需求发布',
'menu.tranactionAbility.enquirySubmit.enquirySearch': '需求单查询', 'menu.tranactionAbility.enquirySubmit.enquirySearch': '需求单查询',
'menu.tranactionAbility.enquirySubmit.enquirySearchDetail': '需求单查询详情',
'menu.tranactionAbility.enquirySubmit.toAddSubmitList': '待新建需求单', 'menu.tranactionAbility.enquirySubmit.toAddSubmitList': '待新建需求单',
'menu.tranactionAbility.enquirySubmit.addEnquiry': '新建需求单', 'menu.tranactionAbility.enquirySubmit.addEnquiry': '新建需求单',
'menu.tranactionAbility.enquirySubmit.editEnquiry': '编辑需求单', 'menu.tranactionAbility.enquirySubmit.editEnquiry': '编辑需求单',
...@@ -266,7 +267,9 @@ export default { ...@@ -266,7 +267,9 @@ export default {
// 需求报价 // 需求报价
'menu.tranactionAbility.enquiryOffer': '需求报价', 'menu.tranactionAbility.enquiryOffer': '需求报价',
'menu.tranactionAbility.enquiryOffer.enquirySearch': '需求单查询', 'menu.tranactionAbility.enquiryOffer.enquirySearch': '需求单查询',
'menu.tranactionAbility.enquiryOffer.enquirySearchDetail': '需求单查询详情',
'menu.tranactionAbility.enquiryOffer.enquiryOfferSearch': '报价单查询', 'menu.tranactionAbility.enquiryOffer.enquiryOfferSearch': '报价单查询',
'menu.tranactionAbility.enquiryOffer.enquiryOfferSearchDetail': '报价单查询详情',
'menu.tranactionAbility.enquiryOffer.toAddSubmitList': '待新建报价单', 'menu.tranactionAbility.enquiryOffer.toAddSubmitList': '待新建报价单',
'menu.tranactionAbility.enquiryOffer.addEnquiry': '新建报价单', 'menu.tranactionAbility.enquiryOffer.addEnquiry': '新建报价单',
'menu.tranactionAbility.enquiryOffer.editEnquiry': '编辑报价单', 'menu.tranactionAbility.enquiryOffer.editEnquiry': '编辑报价单',
...@@ -276,7 +279,7 @@ export default { ...@@ -276,7 +279,7 @@ export default {
'menu.tranactionAbility.enquiryOffer.enquiryTwo': '待审核报价单(二级)', 'menu.tranactionAbility.enquiryOffer.enquiryTwo': '待审核报价单(二级)',
'menu.tranactionAbility.enquiryOffer.enquiryTwoDetail': '待审核报价单(二级)详情', 'menu.tranactionAbility.enquiryOffer.enquiryTwoDetail': '待审核报价单(二级)详情',
'menu.tranactionAbility.enquiryOffer.toSubmit': '待提交报价单', 'menu.tranactionAbility.enquiryOffer.toSubmit': '待提交报价单',
'menu.tranactionAbility.enquiryOffer.toSubmitDetail': '待提交报价单', 'menu.tranactionAbility.enquiryOffer.toSubmitDetail': '待提交报价单详情',
// 确认报价 // 确认报价
'menu.tranactionAbility.enquiryOfferConfirm': '确认需求报价', 'menu.tranactionAbility.enquiryOfferConfirm': '确认需求报价',
......
...@@ -87,10 +87,12 @@ const List:React.FC<listParams> = (props) => { ...@@ -87,10 +87,12 @@ const List:React.FC<listParams> = (props) => {
const handleToDetail= (type,id) => { const handleToDetail= (type,id) => {
if(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}`) history.push(`/memberCenter/tranactionAbility/enquiryOffer/enquiryOne/detail?id=${id}`)
}else{ }else if(type === 2){
// 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}`) history.push(`/memberCenter/tranactionAbility/enquiryOffer/enquiryTwo/detail?id=${id}`)
} else {
history.push(`/memberCenter/tranactionAbility/enquiryOffer/toSubmit/detail?id=${id}`)
} }
} }
......
...@@ -72,10 +72,10 @@ const List:React.FC<{listParams}> = (props) => { ...@@ -72,10 +72,10 @@ const List:React.FC<{listParams}> = (props) => {
const handleToDetail= (type,id) => { const handleToDetail= (type,id) => {
if(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}`) history.push(`/memberCenter/tranactionAbility/enquiryOffer/enquiryOfferSearchDetail?id=${id}`)
}else{ }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}`) history.push(`/memberCenter/tranactionAbility/enquiryOffer/enquiryOfferSearchDetail?id=${id}`)
} }
} }
const fetchData = async (params: any) => { const fetchData = async (params: any) => {
......
...@@ -76,7 +76,7 @@ const List:React.FC<{listParams}> = (props) => { ...@@ -76,7 +76,7 @@ const List:React.FC<{listParams}> = (props) => {
*/ */
const handleToDetail= (id) => { 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}`) history.push(`/memberCenter/tranactionAbility/enquiryOffer/enquirySearch/details?id=${id}`)
} }
const columns : ColumnType<any>[] = [ const columns : ColumnType<any>[] = [
......
...@@ -75,18 +75,18 @@ const List: React.FC<listParams> = (props) => { ...@@ -75,18 +75,18 @@ const List: React.FC<listParams> = (props) => {
if(props.type === 1){ if(props.type === 1){
if (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}`) history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferSearch/viewEnquiryDetail?id=${id}`)
} else { } 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}`) history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferSearch/viewDemandDetail?id=${id}`)
} }
}else if(props.type === 2){ }else if(props.type === 2){
if (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}`) history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferComfirmSearch/enquiryViewDetail?id=${id}`)
} else { } 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}`) history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferComfirmSearch/demandViewDetail?id=${id}`)
} }
} }
} }
......
...@@ -87,10 +87,12 @@ const List:React.FC<listParams> = (props) => { ...@@ -87,10 +87,12 @@ const List:React.FC<listParams> = (props) => {
const handleToDetail= (type,id) => { const handleToDetail= (type,id) => {
if(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}`) history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOne/detail?&id=${id}`)
}else{ }else if(type === 2){
// 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}`) history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryTwo/detail?id=${id}`)
} else {
history.push(`/memberCenter/tranactionAbility/enquiryOfferConfirm/enquiryOfferComfirmSearch/detail?id=${id}`)
} }
} }
......
...@@ -87,7 +87,14 @@ const List:React.FC<listParams> = (props) => { ...@@ -87,7 +87,14 @@ const List:React.FC<listParams> = (props) => {
*/ */
const handleToDetail= (id) => { 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}`) if(props.type === 1) {
history.push(`/memberCenter/tranactionAbility/enquirySubmit/enquiryOne/detail?id=${id}`)
} else if(props.type === 2) {
history.push(`/memberCenter/tranactionAbility/enquirySubmit/enquiryTwo/detail?id=${id}`)
} else {
history.push(`/memberCenter/tranactionAbility/enquirySubmit/toSubmit/detail?id=${id}`)
}
} }
const columns : ColumnType<any>[] = [ const columns : ColumnType<any>[] = [
......
...@@ -76,7 +76,7 @@ const List:React.FC<{listParams}> = (props) => { ...@@ -76,7 +76,7 @@ const List:React.FC<{listParams}> = (props) => {
*/ */
const handleToDetail= (id) => { 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}`) history.push(`/memberCenter/tranactionAbility/enquirySubmit/enquirySearch/detail?id=${id}`)
} }
const columns : ColumnType<any>[] = [ const columns : ColumnType<any>[] = [
......
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