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
陈智峰
jinfa-platform
Commits
a90b5218
Commit
a90b5218
authored
Apr 20, 2021
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix: 修改支付策略bug
parent
a0b913b6
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
11 deletions
+23
-11
index.tsx
src/pages/logistics/addLogistics/index.tsx
+19
-4
orderSearchDetail.tsx
src/pages/logistics/components/orderSearchDetail.tsx
+2
-1
payWayTable.tsx
src/pages/payandSettle/paySetting/components/payWayTable.tsx
+2
-1
setUpModal.tsx
src/pages/payandSettle/paySetting/components/setUpModal.tsx
+0
-2
index.tsx
src/pages/payandSettle/paySetting/index.tsx
+0
-3
No files found.
src/pages/logistics/addLogistics/index.tsx
View file @
a90b5218
...
...
@@ -178,6 +178,7 @@ const AddLogistics: React.FC<{}> = () => {
}
})
}).
then
(
res
=>
{
console
.
log
(
res
,
10078
)
setListShipperAddress
(
res
)
}).
catch
(
error
=>
console
.
log
(
error
));
switch
(
Number
(
createType
))
{
...
...
@@ -363,6 +364,9 @@ const AddLogistics: React.FC<{}> = () => {
const
obj
=
{
...
query
};
obj
.
shipperAddressId
=
option
.
value
;
obj
.
shipperFullAddress
=
option
.
children
;
obj
.
shipperName
=
option
.
shipperName
obj
.
shipperPhone
=
option
.
shipperPhone
setQuery
(
obj
)
}
...
...
@@ -509,12 +513,17 @@ const AddLogistics: React.FC<{}> = () => {
const
selectRow
=
shippingRowCtl
.
selectRow
[
0
]
data
.
shipmentOrderId
=
selectRow
.
id
data
.
shipmentOrderCode
=
selectRow
.
invoicesNo
;
//发货单号
data
.
receiverMemberName
=
selectRow
.
memberName
;
data
.
receiverPhone
=
selectRow
.
phone
;
data
.
receiverName
=
selectRow
.
receiverName
;
//收货方名称
data
.
receiverFullAddress
=
selectRow
.
fullAddress
;
data
.
receiverMemberName
=
selectRow
.
memberName
;
data
.
relevanceOrderId
=
selectRow
.
relevanceInvoicesId
data
.
relevanceOrderCode
=
selectRow
.
relevanceInvoicesNo
form
.
setFieldsValue
({
shipmentOrderCode
:
selectRow
.
invoicesNo
shipmentOrderCode
:
selectRow
.
relevanceInvoicesId
,
relevanceOrderCode
:
selectRow
.
relevanceInvoicesId
})
setQuery
({
...
data
})
setId
(
selectRow
.
id
)
...
...
@@ -535,6 +544,7 @@ const AddLogistics: React.FC<{}> = () => {
}
data
.
relevanceOrderId
=
selectRow
.
applyId
data
.
relevanceOrderCode
=
selectRow
.
applyNo
form
.
setFieldsValue
({
relevanceOrderCode
:
selectRow
.
applyNo
})
...
...
@@ -560,7 +570,12 @@ const AddLogistics: React.FC<{}> = () => {
}
data
.
relevanceOrderId
=
selectRow
.
id
data
.
relevanceOrderCode
=
selectRow
.
orderNo
data
.
shipmentOrderId
=
''
data
.
shipmentOrderCode
=
''
;
//发货单号
form
.
setFieldsValue
({
shipmentOrderCode
:
undefined
,
relevanceOrderCode
:
selectRow
.
orderNo
})
setQuery
({
...
data
});
...
...
@@ -755,10 +770,10 @@ const AddLogistics: React.FC<{}> = () => {
<
div
>
{
query
.
receiverFullAddress
}
</
div
>
</
Form
.
Item
>
<
Form
.
Item
label=
"发货地址"
name=
"shipperAddressId"
rules=
{
[{
required
:
true
,
message
:
'请选择发货地址'
}]
}
>
<
Select
allowClear
onChange=
{
(
value
,
option
)
=>
handleSelectAddress
(
option
)
}
>
<
Select
allowClear
onChange=
{
(
value
,
option
)
=>
handleSelectAddress
(
option
)
}
>
{
listShipperAddress
.
map
((
item
:
any
,
idx
:
number
)
=>
(
<
Option
key=
{
item
.
id
}
value=
{
item
.
id
}
>
{
item
.
fullAddress
}
</
Option
>
<
Option
key=
{
item
.
id
}
value=
{
item
.
id
}
shipperName=
{
item
.
shipperName
}
shipperPhone=
{
item
.
phone
}
>
{
item
.
fullAddress
}
</
Option
>
))
}
</
Select
>
...
...
src/pages/logistics/components/orderSearchDetail.tsx
View file @
a90b5218
...
...
@@ -241,12 +241,13 @@ const detailInfo: React.FC<{}> = () => {
// 输入报价价格
const
inputOnchange
=
(
e
:
any
)
=>
{
console
.
log
(
e
.
target
.
value
)
const
value
=
e
.
target
.
value
;
setfreightPrice
(
value
);
}
const
handleAudit
=
()
=>
{
if
(
freightPrice
)
{
if
(
freightPrice
)
{
setvisible
(
true
)
}
else
{
message
.
error
(
'请输入运费'
)
...
...
src/pages/payandSettle/paySetting/components/payWayTable.tsx
View file @
a90b5218
...
...
@@ -44,13 +44,14 @@ const PayWayTable: React.FC<payWayTableParams> = (props) => {
key
:
'options'
,
dataIndex
:
'options'
,
render
:
(
text
:
any
,
record
:
any
,
index
:
number
)
=>
<>
<
Button
type=
'link'
onClick=
{
()
=>
{
setedit
(
record
);
setmodalvisible
(
true
);
setModifyIndex
(
index
);
setmodify
(
true
)
}
}
>
编辑
</
Button
>
<
Button
type=
'link'
onClick=
{
()
=>
{
setedit
(
record
);
setmodalvisible
(
true
);
setModifyIndex
(
index
);
setmodify
(
true
)
;
setType
(
id
)
}
}
>
编辑
</
Button
>
<
Button
type=
'link'
onClick=
{
()
=>
onDel
(
record
.
type
,
index
)
}
>
删除
</
Button
>
</>
}
]
const
handleOk
=
(
value
:
any
,
idx
:
number
)
=>
{
console
.
log
(
value
,
type
)
let
idType
=
null
;
switch
(
type
)
{
case
1
:
...
...
src/pages/payandSettle/paySetting/components/setUpModal.tsx
View file @
a90b5218
...
...
@@ -25,7 +25,6 @@ const SetUpModal: React.FC<setUpModalParams> = (props) => {
const
handleOk
=
()
=>
{
form
.
validateFields
().
then
(
res
=>
{
console
.
log
(
type
)
let
idType
=
null
;
switch
(
type
)
{
case
1
:
...
...
@@ -59,7 +58,6 @@ const SetUpModal: React.FC<setUpModalParams> = (props) => {
useEffect
(()
=>
{
if
(
Object
.
keys
(
edit
).
length
>
0
)
{
console
.
log
(
edit
,
10086
)
form
.
setFieldsValue
({
code
:
edit
.
payWayCodeTypeEnum
,
value
:
edit
.
value
,
...
...
src/pages/payandSettle/paySetting/index.tsx
View file @
a90b5218
...
...
@@ -56,7 +56,6 @@ const PayWaySetTemplate: React.FC<{}> = () => {
}
const
onGet
=
(
value
:
any
,
type
:
number
,
idx
:
number
)
=>
{
console
.
log
(
value
,
type
)
const
data
=
[...
payItem
];
if
(
type
===
2
)
{
data
[
idx
].
payParametersList
=
[...
data
[
idx
].
payParametersList
,
value
]
...
...
@@ -81,7 +80,6 @@ const PayWaySetTemplate: React.FC<{}> = () => {
}
/**编辑 */
const
onEdit
=
(
value
:
any
,
type
:
number
,
index
:
number
,
idx
:
number
)
=>
{
console
.
log
(
value
,
type
,
index
,
idx
)
const
data
=
[...
payItem
];
if
(
type
===
2
)
{
data
[
idx
].
payParametersList
[
index
]
=
{
...
value
};
...
...
@@ -90,7 +88,6 @@ const PayWaySetTemplate: React.FC<{}> = () => {
data
[
idx
].
payParametersAddListRequests
[
index
]
=
{
...
value
};
data
[
idx
].
payParametersAddListRequests
=
[...
data
[
idx
].
payParametersAddListRequests
]
}
console
.
log
(
data
,
10086
)
setPayItem
(
data
);
}
...
...
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