Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linweijiong
jinfa-platform
Commits
740dd305
Commit
740dd305
authored
Jan 11, 2021
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改新建物流公司没传id, 询价报价内外序号问题
parent
ec79aa54
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
50 additions
and
43 deletions
+50
-43
addCompany.tsx
src/pages/logistics/list/addCompany.tsx
+12
-24
details.tsx
...es/transaction/confirmInquiryQuote/components/details.tsx
+27
-13
details.tsx
src/pages/transaction/goodsOffer/components/details.tsx
+3
-1
addForm.tsx
...ages/transaction/inquiryQuote/addInquiryOrder/addForm.tsx
+4
-3
details.tsx
src/pages/transaction/inquiryQuote/components/details.tsx
+4
-2
No files found.
src/pages/logistics/list/addCompany.tsx
View file @
740dd305
...
@@ -10,14 +10,6 @@ import ModalTable from '@/components/ModalTable'
...
@@ -10,14 +10,6 @@ import ModalTable from '@/components/ModalTable'
import
{
PublicApi
}
from
'@/services/api'
import
{
PublicApi
}
from
'@/services/api'
import
{
PageStatus
}
from
'@/hooks/usePageStatus'
import
{
PageStatus
}
from
'@/hooks/usePageStatus'
import
{
useRowSelectionTable
}
from
'@/hooks/useRowSelectionTable'
import
{
useRowSelectionTable
}
from
'@/hooks/useRowSelectionTable'
import
{
ISchema
}
from
'@formily/antd'
;
export
interface
companyProps
{
}
export
interface
companyState
{
}
interface
Item
{
interface
Item
{
key
:
string
;
key
:
string
;
}
}
...
@@ -76,12 +68,9 @@ const company: React.FC<parmas> = (props) => {
...
@@ -76,12 +68,9 @@ const company: React.FC<parmas> = (props) => {
const
[
productRowSelection
,
productRowCtl
]
=
useRowSelectionTable
({
type
:
'radio'
,
customKey
:
'memberId'
})
const
[
productRowSelection
,
productRowCtl
]
=
useRowSelectionTable
({
type
:
'radio'
,
customKey
:
'memberId'
})
const
[
menuForm
]
=
Form
.
useForm
();
const
[
menuForm
]
=
Form
.
useForm
();
const
[
headerTitle
,
setHeaderTitle
]
=
useState
(
'新建物流公司'
)
const
[
headerTitle
,
setHeaderTitle
]
=
useState
(
'新建物流公司'
)
const
[
Code
,
setCode
]
=
useState
(
''
)
const
[
loading
,
setLoading
]
=
useState
<
boolean
>
(
false
)
const
[
loading
,
setLoading
]
=
useState
<
boolean
>
(
false
)
const
[
roleList
,
setroleList
]
=
useState
([])
const
[
codeDisabled
,
setCodeDisabled
]
=
useState
(
false
)
const
[
companyType
,
setCompanyType
]
=
useState
<
number
>
(
null
)
const
[
companyType
,
setCompanyType
]
=
useState
<
number
>
(
null
)
const
[
memberI
d
,
setMemberId
]
=
useState
<
number
>
(
null
)
const
[
memberI
nfon
,
setMemberInfo
]
=
useState
<
any
>
({});
const
[
visible
,
setsVisible
]
=
useState
(
false
)
//state hook写法
const
[
visible
,
setsVisible
]
=
useState
(
false
)
//state hook写法
const
[
selectRow
,
setSelectRow
]
=
useState
<
Item
[]
>
([])
// 模态框选择的行数据
const
[
selectRow
,
setSelectRow
]
=
useState
<
Item
[]
>
([])
// 模态框选择的行数据
const
[
selectedRowKeys
,
setSelectedRowKeys
]
=
useState
<
Array
<
string
>>
([])
const
[
selectedRowKeys
,
setSelectedRowKeys
]
=
useState
<
Array
<
string
>>
([])
...
@@ -101,10 +90,14 @@ const company: React.FC<parmas> = (props) => {
...
@@ -101,10 +90,14 @@ const company: React.FC<parmas> = (props) => {
const
handleSubmitAllSetting
=
()
=>
{
const
handleSubmitAllSetting
=
()
=>
{
menuForm
.
validateFields
().
then
((
values
:
any
)
=>
{
menuForm
.
validateFields
().
then
((
values
:
any
)
=>
{
const
query
=
{
...
values
,
...
memberInfon
,
}
if
(
id
)
{
if
(
id
)
{
values
.
id
=
id
query
.
id
=
id
setLoading
(
true
)
setLoading
(
true
)
PublicApi
.
postLogisticsCompanyUpdate
(
values
).
then
(
res
=>
{
PublicApi
.
postLogisticsCompanyUpdate
(
query
).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
menuForm
.
resetFields
()
menuForm
.
resetFields
()
setLoading
(
false
)
setLoading
(
false
)
...
@@ -113,7 +106,7 @@ const company: React.FC<parmas> = (props) => {
...
@@ -113,7 +106,7 @@ const company: React.FC<parmas> = (props) => {
})
})
}
else
{
}
else
{
setLoading
(
true
)
setLoading
(
true
)
PublicApi
.
postLogisticsCompanyAdd
(
values
).
then
(
res
=>
{
PublicApi
.
postLogisticsCompanyAdd
(
query
).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
setLoading
(
false
)
setLoading
(
false
)
menuForm
.
resetFields
()
menuForm
.
resetFields
()
...
@@ -133,23 +126,14 @@ const company: React.FC<parmas> = (props) => {
...
@@ -133,23 +126,14 @@ const company: React.FC<parmas> = (props) => {
setsVisible
(
true
)
setsVisible
(
true
)
}
}
//改变code
const
onCodeChange
=
(
e
:
any
)
=>
{
const
value
=
e
.
target
.
value
setCode
(
value
)
console
.
log
(
value
);
}
const
onChangeType
=
(
value
:
any
)
=>
{
const
onChangeType
=
(
value
:
any
)
=>
{
setCompanyType
(
value
)
setCompanyType
(
value
)
if
(
value
==
2
)
{
if
(
value
==
2
)
{
setCodeDisabled
(
true
)
menuForm
.
setFieldsValue
({
menuForm
.
setFieldsValue
({
companyMemberId
:
''
,
companyMemberId
:
''
,
name
:
''
name
:
''
})
})
}
else
{
}
else
{
setCodeDisabled
(
false
)
PublicApi
.
getLogisticsSelectListMemberCompanySelected
().
then
(
res
=>
{
PublicApi
.
getLogisticsSelectListMemberCompanySelected
().
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
setExcludeList
(
res
.
data
)
setExcludeList
(
res
.
data
)
...
@@ -168,6 +152,10 @@ const company: React.FC<parmas> = (props) => {
...
@@ -168,6 +152,10 @@ const company: React.FC<parmas> = (props) => {
companyRoleId
:
roleId
,
companyRoleId
:
roleId
,
name
:
name
name
:
name
})
})
setMemberInfo
({
companyMemberId
:
memberId
,
companyRoleId
:
roleId
,
})
setsVisible
(
false
)
setsVisible
(
false
)
}
}
}
}
...
...
src/pages/transaction/confirmInquiryQuote/components/details.tsx
View file @
740dd305
...
@@ -102,9 +102,9 @@ const Details: React.FC<parmas> = (props) => {
...
@@ -102,9 +102,9 @@ const Details: React.FC<parmas> = (props) => {
// 模拟数据
// 模拟数据
const
[
data
,
setdata
]
=
useState
<
any
>
({});
const
[
data
,
setdata
]
=
useState
<
any
>
({});
// 询价商品
// 询价商品
const
handleJump
=
(
data
:
any
)
=>
{
const
handleJump
=
(
data
:
any
)
=>
{
console
.
log
(
data
)
console
.
log
(
data
)
history
.
push
(
`/shop/commodity/detail?id=
${
data
.
productId
}
&shopId=
${
btoa
(
JSON
.
stringify
({
roleId
:
data
.
memberRoleId
,
memberId
:
data
.
memberId
}))}
`
)
window
.
open
(
`/shop/commodity/detail?id=
${
data
.
productId
}
&type=2
&shopId=
${
btoa
(
JSON
.
stringify
({
roleId
:
data
.
memberRoleId
,
memberId
:
data
.
memberId
}))}
`
)
}
}
const
inquiryGoods
:
ColumnType
<
any
>
[]
=
[{
const
inquiryGoods
:
ColumnType
<
any
>
[]
=
[{
title
:
'ID'
,
title
:
'ID'
,
...
@@ -183,6 +183,7 @@ const Details: React.FC<parmas> = (props) => {
...
@@ -183,6 +183,7 @@ const Details: React.FC<parmas> = (props) => {
title
:
'序号'
,
title
:
'序号'
,
key
:
'inquiryListId'
,
key
:
'inquiryListId'
,
dataIndex
:
'inquiryListId'
,
dataIndex
:
'inquiryListId'
,
render
:
(
text
:
any
,
record
:
any
,
index
:
number
)
=>
<>
{
index
+
1
}
</>
},
{
},
{
title
:
'操作角色'
,
title
:
'操作角色'
,
key
:
'roleName'
,
key
:
'roleName'
,
...
@@ -207,9 +208,10 @@ const Details: React.FC<parmas> = (props) => {
...
@@ -207,9 +208,10 @@ const Details: React.FC<parmas> = (props) => {
dataIndex
:
'auditOpinion'
,
dataIndex
:
'auditOpinion'
,
}],
}],
interior
:
[{
interior
:
[{
title
:
'
流转记录
'
,
title
:
'
序号
'
,
key
:
'id'
,
key
:
'id'
,
dataIndex
:
'id'
,
dataIndex
:
'id'
,
render
:
(
text
:
any
,
record
:
any
,
index
:
number
)
=>
<>
{
index
+
1
}
</>
},
{
},
{
title
:
'操作人'
,
title
:
'操作人'
,
key
:
'roleName'
,
key
:
'roleName'
,
...
@@ -403,13 +405,32 @@ const Details: React.FC<parmas> = (props) => {
...
@@ -403,13 +405,32 @@ const Details: React.FC<parmas> = (props) => {
Object
.
keys
(
data
).
length
>
0
&&
Object
.
keys
(
data
).
length
>
0
&&
<>
<>
{
type
===
'quote'
?
{
type
===
'quote'
?
<>
<
TabPane
tab=
"外部流转"
key=
"1"
>
<
TabPane
tab=
"外部流转"
key=
"1"
>
<
Steps
<
Steps
style=
{
{
padding
:
'20px 0'
}
}
style=
{
{
padding
:
'20px 0'
}
}
progressDot
progressDot
current=
{
data
.
externalState
-
1
}
current=
{
data
.
externalState
-
1
}
>
>
{
Object
.
keys
(
data
).
length
>
0
&&
data
.
externalQuotationStateResponses
.
map
((
item
,
index
)
=>
{
{
(
Object
.
keys
(
data
).
length
>
0
&&
data
.
externalQuotationStateResponses
)
&&
data
.
externalQuotationStateResponses
.
map
((
item
,
index
)
=>
{
return
(
<
Step
key=
{
index
}
title=
{
item
.
roleName
}
description=
{
item
.
operationalProcess
}
status=
{
item
.
isExecute
?
'finish'
:
'wait'
}
/>
);
})
}
</
Steps
>
</
TabPane
>
<
TabPane
tab=
"内部流转"
key=
"2"
>
<
Steps
style=
{
{
padding
:
'20px 0'
}
}
progressDot
current=
{
data
.
externalState
-
1
}
>
{
(
Object
.
keys
(
data
).
length
>
0
&&
data
.
interiorQuotationStateResponses
)
&&
data
.
interiorQuotationStateResponses
.
map
((
item
,
index
)
=>
{
return
(
return
(
<
Step
<
Step
key=
{
index
}
key=
{
index
}
...
@@ -421,6 +442,7 @@ const Details: React.FC<parmas> = (props) => {
...
@@ -421,6 +442,7 @@ const Details: React.FC<parmas> = (props) => {
})
}
})
}
</
Steps
>
</
Steps
>
</
TabPane
>
</
TabPane
>
</>
:
:
<>
<>
<
TabPane
tab=
"外部流转"
key=
"1"
>
<
TabPane
tab=
"外部流转"
key=
"1"
>
...
@@ -447,7 +469,7 @@ const Details: React.FC<parmas> = (props) => {
...
@@ -447,7 +469,7 @@ const Details: React.FC<parmas> = (props) => {
progressDot
progressDot
current=
{
Number
(
data
.
interiorState
-
1
)
}
current=
{
Number
(
data
.
interiorState
-
1
)
}
>
>
{
(
Object
.
keys
(
data
).
length
>
0
&&
data
.
interiorRequisitionFormStateResponses
)
&&
data
.
interiorRequisitionFormStateResponses
.
map
((
item
,
index
)
=>
{
{
(
Object
.
keys
(
data
).
length
>
0
&&
data
.
interiorRequisitionFormStateResponses
)
&&
data
.
interiorRequisitionFormStateResponses
.
map
((
item
,
index
)
=>
{
return
(
return
(
<
Step
<
Step
key=
{
index
}
key=
{
index
}
...
@@ -546,20 +568,12 @@ const Details: React.FC<parmas> = (props) => {
...
@@ -546,20 +568,12 @@ const Details: React.FC<parmas> = (props) => {
</
div
>
</
div
>
<
div
className=
{
style
.
item_wrap
}
>
<
div
className=
{
style
.
item_wrap
}
>
<
Tabs
>
<
Tabs
>
{
type
===
'quote'
?
<
TabPane
tab=
"外部流转记录"
key=
"1"
>
<
Table
columns=
{
flowRecord
.
external
}
rowKey=
'id'
pagination=
{
false
}
dataSource=
{
view
===
2
?
data
.
externalRequisitionFormResponses
:
data
.
externalInquiryListLogResponses
}
/>
</
TabPane
>
:
<>
<
TabPane
tab=
"外部流转记录"
key=
"1"
>
<
TabPane
tab=
"外部流转记录"
key=
"1"
>
<
Table
columns=
{
flowRecord
.
external
}
rowKey=
'id'
pagination=
{
false
}
dataSource=
{
view
===
2
?
data
.
externalRequisitionFormResponses
:
data
.
externalInquiryListLogResponses
}
/>
<
Table
columns=
{
flowRecord
.
external
}
rowKey=
'id'
pagination=
{
false
}
dataSource=
{
view
===
2
?
data
.
externalRequisitionFormResponses
:
data
.
externalInquiryListLogResponses
}
/>
</
TabPane
>
</
TabPane
>
<
TabPane
tab=
"内部流转记录"
key=
"2"
>
<
TabPane
tab=
"内部流转记录"
key=
"2"
>
<
Table
columns=
{
flowRecord
.
interior
}
rowKey=
'id'
pagination=
{
false
}
dataSource=
{
view
===
2
?
data
.
interiorQuotationLogResponses
:
data
.
interiorInquiryListLogResponses
}
/>
<
Table
columns=
{
flowRecord
.
interior
}
rowKey=
'id'
pagination=
{
false
}
dataSource=
{
view
===
2
?
data
.
interiorQuotationLogResponses
:
data
.
interiorInquiryListLogResponses
}
/>
</
TabPane
>
</
TabPane
>
</>
}
</
Tabs
>
</
Tabs
>
</
div
>
</
div
>
<
AuditModal
<
AuditModal
...
...
src/pages/transaction/goodsOffer/components/details.tsx
View file @
740dd305
...
@@ -124,6 +124,7 @@ const Details: React.FC<parmas> = (props) => {
...
@@ -124,6 +124,7 @@ const Details: React.FC<parmas> = (props) => {
title
:
'序号'
,
title
:
'序号'
,
key
:
'inquiryListId'
,
key
:
'inquiryListId'
,
dataIndex
:
'inquiryListId'
,
dataIndex
:
'inquiryListId'
,
render
:
(
text
:
any
,
record
:
any
,
index
:
number
)
=>
<>
{
index
+
1
}
</>
},
{
},
{
title
:
'操作角色'
,
title
:
'操作角色'
,
key
:
'roleName'
,
key
:
'roleName'
,
...
@@ -148,9 +149,10 @@ const Details: React.FC<parmas> = (props) => {
...
@@ -148,9 +149,10 @@ const Details: React.FC<parmas> = (props) => {
dataIndex
:
'auditOpinion'
,
dataIndex
:
'auditOpinion'
,
}],
}],
interior
:
[{
interior
:
[{
title
:
'
流转记录
'
,
title
:
'
序号
'
,
key
:
'inquiryListId'
,
key
:
'inquiryListId'
,
dataIndex
:
'inquiryListId'
,
dataIndex
:
'inquiryListId'
,
render
:
(
text
:
any
,
record
:
any
,
index
:
number
)
=>
<>
{
index
+
1
}
</>
},
{
},
{
title
:
'操作人'
,
title
:
'操作人'
,
key
:
'roleName'
,
key
:
'roleName'
,
...
...
src/pages/transaction/inquiryQuote/addInquiryOrder/addForm.tsx
View file @
740dd305
...
@@ -26,7 +26,8 @@ const AddQuotes: React.FC<parmas> = (props) => {
...
@@ -26,7 +26,8 @@ const AddQuotes: React.FC<parmas> = (props) => {
const
tradingConditionsRef
=
useRef
<
any
>
({});
const
tradingConditionsRef
=
useRef
<
any
>
({});
const
[
editData
,
setEditData
]
=
useState
<
any
>
({});
const
[
editData
,
setEditData
]
=
useState
<
any
>
({});
const
[
loading
,
setloading
]
=
useState
<
boolean
>
(
false
);
const
[
loading
,
setloading
]
=
useState
<
boolean
>
(
false
);
const
{
pathname
}
=
history
.
location
;
const
pathType
=
pathname
.
split
(
'/'
)[
pathname
.
split
(
'/'
).
length
-
1
];
useEffect
(()
=>
{
useEffect
(()
=>
{
if
(
id
&&
type
===
2
)
{
if
(
id
&&
type
===
2
)
{
PublicApi
.
getOrderProductQuotationDetails
({
id
}).
then
(
res
=>
{
PublicApi
.
getOrderProductQuotationDetails
({
id
}).
then
(
res
=>
{
...
@@ -145,12 +146,12 @@ const AddQuotes: React.FC<parmas> = (props) => {
...
@@ -145,12 +146,12 @@ const AddQuotes: React.FC<parmas> = (props) => {
<
TabPane
tab=
"其他说明"
key=
"3"
forceRender
>
<
TabPane
tab=
"其他说明"
key=
"3"
forceRender
>
<
TradingConditions
<
TradingConditions
currentRef=
{
tradingConditionsRef
}
currentRef=
{
tradingConditionsRef
}
editData=
{
editData
}
editData=
{
pathType
!==
'quote'
?
editData
:
{}
}
/>
/>
</
TabPane
>
</
TabPane
>
<
TabPane
tab=
"附件"
key=
"4"
forceRender
>
<
TabPane
tab=
"附件"
key=
"4"
forceRender
>
<
Attached
<
Attached
editData=
{
editData
}
editData=
{
pathType
!==
'quote'
?
editData
:
{}
}
handleGetEnclosureUrls=
{
handleGetEnclosureUrls
}
handleGetEnclosureUrls=
{
handleGetEnclosureUrls
}
/>
/>
</
TabPane
>
</
TabPane
>
...
...
src/pages/transaction/inquiryQuote/components/details.tsx
View file @
740dd305
...
@@ -134,7 +134,7 @@ const Details: React.FC<parmas> = (props) => {
...
@@ -134,7 +134,7 @@ const Details: React.FC<parmas> = (props) => {
// 询价商品
// 询价商品
const
handleJump
=
(
data
:
any
)
=>
{
const
handleJump
=
(
data
:
any
)
=>
{
console
.
log
(
data
)
console
.
log
(
data
)
history
.
push
(
`/shop/commodity/detail?id=
${
data
.
productId
}
&shopId=
${
btoa
(
JSON
.
stringify
({
roleId
:
data
.
memberRoleId
,
memberId
:
data
.
memberId
}))}
`
)
window
.
open
(
`/shop/commodity/detail?id=
${
data
.
productId
}
&type=2
&shopId=
${
btoa
(
JSON
.
stringify
({
roleId
:
data
.
memberRoleId
,
memberId
:
data
.
memberId
}))}
`
)
}
}
const
inquiryGoods
:
ColumnType
<
any
>
[]
=
[{
const
inquiryGoods
:
ColumnType
<
any
>
[]
=
[{
title
:
'ID'
,
title
:
'ID'
,
...
@@ -205,6 +205,7 @@ const Details: React.FC<parmas> = (props) => {
...
@@ -205,6 +205,7 @@ const Details: React.FC<parmas> = (props) => {
title
:
'序号'
,
title
:
'序号'
,
key
:
'id'
,
key
:
'id'
,
dataIndex
:
'id'
,
dataIndex
:
'id'
,
render
:
(
text
:
any
,
record
:
any
,
index
:
number
)
=>
<>
{
index
+
1
}
</>
},
{
},
{
title
:
'操作角色'
,
title
:
'操作角色'
,
key
:
'roleName'
,
key
:
'roleName'
,
...
@@ -229,9 +230,10 @@ const Details: React.FC<parmas> = (props) => {
...
@@ -229,9 +230,10 @@ const Details: React.FC<parmas> = (props) => {
dataIndex
:
'auditOpinion'
,
dataIndex
:
'auditOpinion'
,
}],
}],
interior
:
[{
interior
:
[{
title
:
'
流转记录
'
,
title
:
'
序号
'
,
key
:
'id'
,
key
:
'id'
,
dataIndex
:
'id'
,
dataIndex
:
'id'
,
render
:
(
text
:
any
,
record
:
any
,
index
:
number
)
=>
<>
{
index
+
1
}
</>
},
{
},
{
title
:
'操作人'
,
title
:
'操作人'
,
key
:
'roleName'
,
key
:
'roleName'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment