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
0b6a7ebb
authored
Jul 15, 2020
by
Denglingling
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
转单、消耗模块,增加扫一扫入口,转单明细查询还未对接后端接口
(cherry picked from commit
acf2bce2
)
parent
84c64254
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
43 additions
and
11 deletions
app/action/TransAction.js
app/containers/equipConsu/module/ConsumDetailsPage.js
app/containers/transOrder/TransOrderPage.js
app/containers/transOrder/module/TransSearchPage.js
app/action/TransAction.js
View file @
0b6a7ebb
...
...
@@ -143,7 +143,7 @@ export const requestSubTransOrganizations = async (global_domain_config, params)
return
await
GetRequest
(
global_domain_config
,
getUrlParams
(
'/authorized_inventory/search'
,
params
))
}
// 子页-获取来源借货订单号 parmas={access_token: '', org_code: '', seller_code: '', customer_code: '', collect_header_status: '
RETURNED,COLLECTED' / '
COLLECTING_WAITING_CONFIRM,CONFIRM_COLLECT,COLLECTED_WAITING_CONFIRMED,APPROVED,COLLECTED'}
// 子页-获取来源借货订单号 parmas={access_token: '', org_code: '', seller_code: '', customer_code: '', collect_header_status: 'COLLECTING_WAITING_CONFIRM,CONFIRM_COLLECT,COLLECTED_WAITING_CONFIRMED,APPROVED,COLLECTED'}
export
const
requestSubSourBorOrdNum
=
async
(
global_domain_config
,
params
)
=>
{
return
await
GetRequest
(
global_domain_config
,
getUrlParams
(
'/surgery/collect_order/search'
,
params
))
}
...
...
app/containers/equipConsu/module/ConsumDetailsPage.js
View file @
0b6a7ebb
...
...
@@ -112,6 +112,16 @@ class ConsumDetailsPage extends Component {
this
.
getCurOrderDetail
()
}
componentWillReceiveProps
(
nextProps
)
{
let
{
barCodeData
}
=
nextProps
.
navigation
.
state
.
params
let
that
=
this
if
(
barCodeData
&&
barCodeData
.
typeValue
&&
barCodeData
.
typeName
==
'consum_search_value'
)
{
that
.
setState
({
searchValue
})
}
}
// 获取当前订单的消耗明细
async
getCurOrderDetail
()
{
let
{
orderId
}
=
this
.
props
.
navigation
.
state
.
params
...
...
@@ -184,6 +194,17 @@ class ConsumDetailsPage extends Component {
})
}
// 搜索 扫一扫
handleConsumScanCheck
()
{
this
.
props
.
navigation
.
navigate
(
'BarCodePage'
,
{
typeName
:
'consum_search_value'
,
supPage
:
{
title
:
'器械消耗 - 添加明细'
,
pageName
:
'ConsumDetailsPage'
}
})
}
// 修改加载中
changeLodingFlag
(
show
)
{
this
.
setState
({
...
...
@@ -291,6 +312,13 @@ class ConsumDetailsPage extends Component {
<
View
style
=
{
list_common_item
.
ser_img_box
}
>
<
Image
source
=
{
require
(
'../../../images/search_icon.png'
)}
style
=
{
icon_style
}
/
>
<
/View
>
<
TouchableOpacity
activeOpacity
=
{.
8
}
style
=
{
styles
.
ser_scanit_box
}
onPress
=
{()
=>
this
.
handleConsumScanCheck
()}
>
<
Image
source
=
{
require
(
'../../../images/scan_2.png'
)}
style
=
{
icon_style
}
/
>
<
/TouchableOpacity
>
<
/View
>
)
}
...
...
@@ -466,6 +494,13 @@ const styles = StyleSheet.create({
},
loding_back
:
{
backgroundColor
:
'rgba(0, 0, 0, 0)'
},
ser_scanit_box
:
{
position
:
'absolute'
,
right
:
24
,
top
:
20
,
width
:
pxSize
(
22
),
height
:
pxSize
(
22
),
}
})
...
...
app/containers/transOrder/TransOrderPage.js
View file @
0b6a7ebb
...
...
@@ -766,30 +766,27 @@ class TransOrderPage extends Component {
handleConsumDetailCheck
()
{
console
.
warn
(
'耗材明细------check'
)
let
{
listOptionData
}
=
this
.
state
// if(this.judgeOrgIsNull() && this.judgeCustomerIsNull()
// && this.judgeOrderInfoIsNull()) {
// this.props.navigation.navigate('TransSearchPage', {
// title: '耗材明细 - 转单查询',
// org_code: listOptionData[1].value
// })
// }
let
subTransObj
=
{
seller_name
:
listOptionData
[
0
].
name
,
org_code
:
listOptionData
[
1
].
value
,
customer_code
:
listOptionData
[
2
].
value
,
collect_number
:
listOptionData
[
3
].
value
}
if
(
!
listOptionData
[
6
].
subOption
.
length
)
{
this
.
props
.
setTransDetailOption
([],
{})
}
// 测试
this
.
props
.
navigation
.
navigate
(
'TransSearchPage'
,
{
title
:
'耗材明细 - 转单查询'
,
subTransObj
})
// if(this.judgeOrgIsNull() && this.judgeCustomerIsNull()
// && this.judgeOrderInfoIsNull()) {
// this.props.navigation.navigate('TransSearchPage', {
// title: '耗材明细 - 转单查询',
// subTransObj
// })
// }
}
// 添加图片 点击
...
...
app/containers/transOrder/module/TransSearchPage.js
View file @
0b6a7ebb
This diff is collapsed.
Click to expand it.
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