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
76fba132
Commit
76fba132
authored
Dec 18, 2020
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改物流单选择商品传错id的问题
parent
9ebed4c5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
8 deletions
+12
-8
index.tsx
src/pages/logistics/addLogistics/index.tsx
+5
-5
confirmModal.tsx
src/pages/logistics/components/confirmModal.tsx
+3
-0
addCompany.tsx
src/pages/logistics/list/addCompany.tsx
+1
-0
index.tsx
src/pages/transaction/inquiryQuote/schema/index.tsx
+2
-2
pendingReview.tsx
src/pages/transaction/inquiryQuote/schema/pendingReview.tsx
+1
-1
No files found.
src/pages/logistics/addLogistics/index.tsx
View file @
76fba132
...
@@ -186,7 +186,7 @@ const AddLogistics: React.FC<{}> = () => {
...
@@ -186,7 +186,7 @@ const AddLogistics: React.FC<{}> = () => {
relevanceOrderCode
:
res
.
data
.
orderNo
,
relevanceOrderCode
:
res
.
data
.
orderNo
,
voucherTime
:
res
.
data
.
transactionTime
,
voucherTime
:
res
.
data
.
transactionTime
,
externalState
:
res
.
data
.
state
,
externalState
:
res
.
data
.
state
,
shipmentOrderId
:
res
.
data
.
i
nvoicesTypeI
d
,
shipmentOrderId
:
res
.
data
.
id
,
relevanceOrderId
:
res
.
data
.
relevanceInvoicesId
,
relevanceOrderId
:
res
.
data
.
relevanceInvoicesId
,
}
}
form
.
setFieldsValue
(
obj
);
form
.
setFieldsValue
(
obj
);
...
@@ -332,7 +332,7 @@ const AddLogistics: React.FC<{}> = () => {
...
@@ -332,7 +332,7 @@ const AddLogistics: React.FC<{}> = () => {
case
1
:
case
1
:
case
2
:
case
2
:
case
3
:
case
3
:
PublicApi
.
getWarehouseInvoicesProductList
({
...
params
,
invoicesId
:
i
d
}).
then
((
res
:
any
)
=>
{
PublicApi
.
getWarehouseInvoicesProductList
({
...
params
,
invoicesId
:
query
.
shipmentOrderI
d
}).
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
res
.
data
.
data
.
forEach
(
item
=>
{
res
.
data
.
data
.
forEach
(
item
=>
{
item
.
category
=
item
.
categoryName
item
.
category
=
item
.
categoryName
...
@@ -344,21 +344,21 @@ const AddLogistics: React.FC<{}> = () => {
...
@@ -344,21 +344,21 @@ const AddLogistics: React.FC<{}> = () => {
})
})
break
;
break
;
case
4
:
case
4
:
PublicApi
.
getAsReplaceGoodsPageReturnCommodityByLogistics
({
...
params
,
dataId
:
i
d
}).
then
(
res
=>
{
PublicApi
.
getAsReplaceGoodsPageReturnCommodityByLogistics
({
...
params
,
dataId
:
query
.
relevanceOrderI
d
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}
}
})
})
break
;
break
;
case
5
:
case
5
:
PublicApi
.
getAsReplaceGoodsPageReplaceCommodityByLogistics
({
...
params
,
dataId
:
id
}).
then
(
res
=>
{
PublicApi
.
getAsReplaceGoodsPageReplaceCommodityByLogistics
({
...
params
,
dataId
:
query
.
relevanceOrderId
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}
}
})
})
break
;
break
;
case
6
:
case
6
:
PublicApi
.
getAsReturnGoodsPageCommodityByLogistics
({
...
params
,
dataId
:
i
d
}).
then
(
res
=>
{
PublicApi
.
getAsReturnGoodsPageCommodityByLogistics
({
...
params
,
dataId
:
query
.
relevanceOrderI
d
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}
}
...
...
src/pages/logistics/components/confirmModal.tsx
View file @
76fba132
...
@@ -32,6 +32,9 @@ const comfirmDialog: React.FC<Params> = (props) => {
...
@@ -32,6 +32,9 @@ const comfirmDialog: React.FC<Params> = (props) => {
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
props
.
onOK
()
props
.
onOK
()
}
}
}).
catch
(
error
=>
{
console
.
log
(
error
)
props
.
onOK
()
})
})
}
}
...
...
src/pages/logistics/list/addCompany.tsx
View file @
76fba132
...
@@ -180,6 +180,7 @@ const company: React.FC<parmas> = (props) => {
...
@@ -180,6 +180,7 @@ const company: React.FC<parmas> = (props) => {
let
{
memberId
,
roleId
,
name
}
=
selectRow
let
{
memberId
,
roleId
,
name
}
=
selectRow
menuForm
.
setFieldsValue
({
menuForm
.
setFieldsValue
({
companyMemberId
:
memberId
,
companyMemberId
:
memberId
,
companyRoleId
:
roleId
,
name
:
name
name
:
name
})
})
setsVisible
(
false
)
setsVisible
(
false
)
...
...
src/pages/transaction/inquiryQuote/schema/index.tsx
View file @
76fba132
...
@@ -173,7 +173,7 @@ export const enquierySearchSchema: ISchema = {
...
@@ -173,7 +173,7 @@ export const enquierySearchSchema: ISchema = {
inline
:
true
inline
:
true
},
},
properties
:{
properties
:{
inquiryListMemberName
:{
memberName
:{
type
:
'string'
,
type
:
'string'
,
"x-component-props"
:{
"x-component-props"
:{
placeholder
:
'询价会员'
placeholder
:
'询价会员'
...
@@ -458,7 +458,7 @@ export const quoteFormSearch: ISchema = {
...
@@ -458,7 +458,7 @@ export const quoteFormSearch: ISchema = {
placeholder
:
'询价单号'
placeholder
:
'询价单号'
}
}
},
},
inquiryListMemberName
:{
memberName
:{
type
:
'string'
,
type
:
'string'
,
"x-component-props"
:{
"x-component-props"
:{
placeholder
:
'询价会员'
placeholder
:
'询价会员'
...
...
src/pages/transaction/inquiryQuote/schema/pendingReview.tsx
View file @
76fba132
...
@@ -164,7 +164,7 @@ export const inquiryQuoteSchema: ISchema = {
...
@@ -164,7 +164,7 @@ export const inquiryQuoteSchema: ISchema = {
placeholder
:
'报价单摘要'
placeholder
:
'报价单摘要'
}
}
},
},
inquiryListMemberName
:
{
memberName
:
{
type
:
'string'
,
type
:
'string'
,
"x-component-props"
:
{
"x-component-props"
:
{
placeholder
:
'询价会员'
placeholder
:
'询价会员'
...
...
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