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
89116767
authored
May 07, 2021
by
wong.peiyi
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
修复自助下单耗材会变2倍问题
parent
30835c4d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
20 deletions
app/containers/common/listDataComponent/PicTitDetaiCalcu.js
app/containers/selfOrder/SelfOrderPage.js
app/containers/selfOrder/module/ChooseProductPage.js
app/containers/selfOrder/module/EditThirdLevelPage.js
app/containers/common/listDataComponent/PicTitDetaiCalcu.js
View file @
89116767
...
...
@@ -359,4 +359,4 @@ const mapDispatchToProps = (dispatch) => {
}
}
export
default
connect
(
mapStateToProps
,
mapDispatchToProps
)(
PicTitDetaiCalcu
);
\ No newline at end of file
export
default
connect
(
mapStateToProps
,
mapDispatchToProps
)(
PicTitDetaiCalcu
);
app/containers/selfOrder/SelfOrderPage.js
View file @
89116767
...
...
@@ -1548,7 +1548,8 @@ class SelfOrderPage extends Component {
local_lines
.
forEach
(
sup_item
=>
{
if
(
sup_item
[
LocalVariable
.
SELECTED_QUQNTITY
]
>
0
&&
sup_item
.
leftOptionList
&&
sup_item
.
leftOptionList
.
length
>
0
)
{
sup_item
.
leftOptionList
.
map
(
lef_item
=>
{
let
select_arr
=
lef_item
[
LocalVariable
.
SELECTED_DATA_ARR
]
// let select_arr = lef_item[LocalVariable.SELECTED_DATA_ARR]
let
select_arr
=
lef_item
.
selectedArr
||
[]
if
(
lef_item
[
LocalVariable
.
SELECTED_QUQNTITY
]
>
0
&&
select_arr
&&
select_arr
.
length
>
0
)
{
if
(
lef_item
.
category_code
===
LocalVariable
.
SURGICAL_TEMPLATE
)
{
// 手术套包
...
...
app/containers/selfOrder/module/ChooseProductPage.js
View file @
89116767
...
...
@@ -12,6 +12,7 @@ import { reqPurSupplierSearch, reqProCategorySearch, reqSurTempHeadSearch, reqNa
import
LoadingModel
from
'../../common/listDataComponent/LoadingModel'
;
import
LocalVariable
from
'../../common/LocalVariable'
;
import
{
exitLoginStatus
}
from
'../../../action/LoginAction'
;
import
*
as
R
from
'ramda'
;
class
ChooseProductPage
extends
Component
{
constructor
(
props
)
{
...
...
@@ -363,21 +364,16 @@ class ChooseProductPage extends Component {
if
(
leIndex
===
leftActiveIndex
)
{
// 当前选择项
leItem
[
LocalVariable
.
SELECTED_QUQNTITY
]
=
count
if
(
leItem
[
LocalVariable
.
LOCAL_SECOND_DATA
].
length
>
0
)
{
leItem
[
LocalVariable
.
SELECTED_DATA_ARR
]
=
[]
leItem
[
LocalVariable
.
LOCAL_SECOND_DATA
].
forEach
(
function
(
chItem
)
{
if
(
chItem
[
coutFieName
])
{
leItem
[
LocalVariable
.
SELECTED_DATA_ARR
].
push
(
chItem
)
}
})
}
const
selectData
=
R
.
filter
(
R
.
compose
(
R
.
lt
(
0
),
R
.
prop
(
coutFieName
)))(
leItem
[
LocalVariable
.
LOCAL_SECOND_DATA
])
leItem
.
selectedArr
=
selectData
// 原本是赋值给这个对象属性的,但不知道哪里这个对象属性会把第四个以后的所选耗材放到第四个上,
// 所以最后计算的时候使用属性 selectedArr
leItem
[
LocalVariable
.
SELECTED_DATA_ARR
]
=
R
.
clone
(
selectData
)
}
top_sel_sum
+=
leItem
[
LocalVariable
.
SELECTED_QUQNTITY
]
})
topProcOptionList
[
topActiveIndex
][
LocalVariable
.
SELECTED_QUQNTITY
]
=
top_sel_sum
this
.
setState
({
topProcOptionList
})
this
.
setState
({
topProcOptionList
})
}
// 关闭已选弹窗
...
...
@@ -543,7 +539,6 @@ class ChooseProductPage extends Component {
})
}
})
this
.
setState
({
topProcOptionList
:
topProcOptionList
})
...
...
@@ -798,7 +793,7 @@ class ChooseProductPage extends Component {
})
cur_sel_options
[
cur_sel_options
.
length
-
1
][
LocalVariable
.
SELECTED_DATA_ARR
]
=
cur_hc_arr
}
}
}
return
(
<
View
style
=
{
list_common_item
.
sub_box
}
>
...
...
@@ -1032,4 +1027,4 @@ const mapDispatchToProps = (dispatch) => {
}
}
export
default
connect
(
mapStateToProps
,
mapDispatchToProps
)(
ChooseProductPage
);
\ No newline at end of file
export
default
connect
(
mapStateToProps
,
mapDispatchToProps
)(
ChooseProductPage
);
app/containers/selfOrder/module/EditThirdLevelPage.js
View file @
89116767
...
...
@@ -581,4 +581,4 @@ const mapDispatchToProps = (dispatch) => {
}
}
export
default
connect
(
mapStateToProps
,
mapDispatchToProps
)(
EditThirdLevelPage
);
\ No newline at end of file
export
default
connect
(
mapStateToProps
,
mapDispatchToProps
)(
EditThirdLevelPage
);
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