Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
zhangzhonghua
/
BoneHouse_Business_APP
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
ad256431
authored
Aug 04, 2021
by
peii
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
无法选择同一个组织同一个客户同一个地点下的第二个医生bug修复
parent
7c2c75a0
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
12 deletions
app/containers/quickOrder/QuickOrderPage.js
app/containers/selfOrder/SelfOrderPage.js
app/containers/quickOrder/QuickOrderPage.js
View file @
ad256431
...
...
@@ -734,7 +734,6 @@ class EquipConsuPage extends Component {
customer_name
:
cus
.
customer_name
,
}))(
customers
)
}
that
.
setState
({
localCustomersOption
:
customers
})
...
...
@@ -1210,13 +1209,15 @@ class EquipConsuPage extends Component {
const
billSite
=
R
.
find
(
R
.
propEq
(
'bill_to_site_code'
,
listOptionData
[
3
].
value
))(
customer
.
bill_to_sites
)
if
(
isNotBlank
(
billSite
)
&&
isNotBlank
(
billSite
.
ship_to_sites
)
&&
listOptionData
[
4
].
value
)
{
const
ship
=
R
.
find
(
R
.
propEq
(
'ship_to_site_code'
,
listOptionData
[
4
].
value
))(
billSite
.
ship_to_sites
)
const
ship
=
R
.
filter
(
R
.
propEq
(
'ship_to_site_code'
,
listOptionData
[
4
].
value
))(
billSite
.
ship_to_sites
)
if
(
isNotBlank
(
ship
))
{
tempOption
=
R
.
prepend
({
value
:
ship
.
customer_doctor
,
name
:
ship
.
customer_doctor
},
tempOption
)
tempOption
=
R
.
compose
(
R
.
concat
(
R
.
__
,
tempOption
),
R
.
map
(
R
.
applySpec
({
value
:
R
.
prop
(
'customer_doctor'
),
name
:
R
.
prop
(
'customer_doctor'
)
}))
)(
ship
)
}
}
}
...
...
app/containers/selfOrder/SelfOrderPage.js
View file @
ad256431
...
...
@@ -1103,13 +1103,16 @@ class SelfOrderPage extends Component {
const
billSite
=
R
.
find
(
R
.
propEq
(
'bill_to_site_code'
,
listOptionData
[
3
].
value
))(
customer
.
bill_to_sites
)
if
(
isNotBlank
(
billSite
)
&&
isNotBlank
(
billSite
.
ship_to_sites
)
&&
listOptionData
[
4
].
value
)
{
const
ship
=
R
.
fi
nd
(
R
.
propEq
(
'ship_to_site_code'
,
listOptionData
[
4
].
value
))(
billSite
.
ship_to_sites
)
const
ship
=
R
.
fi
lter
(
R
.
propEq
(
'ship_to_site_code'
,
listOptionData
[
4
].
value
))(
billSite
.
ship_to_sites
)
if
(
isNotBlank
(
ship
))
{
tempOption
=
R
.
prepend
({
value
:
ship
.
customer_doctor
,
name
:
ship
.
customer_doctor
},
tempOption
)
tempOption
=
R
.
compose
(
R
.
concat
(
R
.
__
,
tempOption
),
R
.
map
(
R
.
applySpec
({
value
:
R
.
prop
(
'customer_doctor'
),
name
:
R
.
prop
(
'customer_doctor'
)
}))
)(
ship
)
}
}
}
...
...
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