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
6df041fe
authored
Aug 10, 2020
by
Denglingling
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
优化【转单申请】联动信息选择后,查询出联动字段只有一条数据时,给联动字段赋值这条数据;
parent
2970a610
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
110 additions
and
49 deletions
app/action/TransAction.js
app/containers/equipConsu/EquipConsuPage.js
app/containers/transOrder/TransOrderPage.js
app/action/TransAction.js
View file @
6df041fe
...
...
@@ -66,6 +66,10 @@ export function requestTransSurgeryHospital(params) {
}
}
export
const
reqTransSurgeryHospital
=
async
(
global_domain_config
,
params
)
=>
{
return
await
GetRequest
(
global_domain_config
,
getUrlParams
(
'/sale/seller_customer/search'
,
params
))
}
// 获取目标订单信息 params={access_token: '', org_code: '', seller_code: '', customer_code: '', collect_header_status: 'COLLECTING_WAITING_CONFIRM,CONFIRM_COLLECT,COLLECTED_WAITING_CONFIRMED,APPROVED,COLLECTED'}
export
function
requestTransTargetOrderInfo
(
params
)
{
return
(
dispatch
,
getState
)
=>
{
...
...
@@ -74,7 +78,6 @@ export function requestTransTargetOrderInfo(params) {
GetRequest
(
global_domain_config
,
getUrlParams
(
'/surgery/collect_order/search'
,
params
))
.
then
(
res
=>
{
if
(
res
.
error_code
==
0
)
{
// 待确认!!!!!!!????
let
{
data
:
{
surgery_collect_headers
}
}
=
res
dispatch
(
requestListDataSuccess
(
surgery_collect_headers
));
}
else
if
(
res
.
error_code
===
41006
)
{
...
...
@@ -94,13 +97,17 @@ export function requestTransTargetOrderInfo(params) {
}
}
export
const
reqTransTargetOrderInfo
=
async
(
global_domain_config
,
params
)
=>
{
return
await
GetRequest
(
global_domain_config
,
getUrlParams
(
'/surgery/collect_order/search'
,
params
))
}
function
requestListDataing
()
{
return
{
type
:
TRANS_ORDER_LIST_DOING
}
}
function
requestListDataSuccess
(
data
)
{
export
function
requestListDataSuccess
(
data
)
{
return
{
type
:
TRANS_ORDER_LIST_SUCCESS
,
rawData
:
data
...
...
app/containers/equipConsu/EquipConsuPage.js
View file @
6df041fe
...
...
@@ -442,7 +442,7 @@ class EquipConsuPage extends Component {
let
obj
=
{}
let
collect_number
=
item
.
collect_number
?
item
.
collect_number
:
'空'
let
surgery_name
=
item
.
surgery_name
?
item
.
surgery_name
:
'空'
let
create_time
=
item
.
create_time
?
moment
(
item
.
create_time
).
format
(
"YYYY-MM-DD
HH:mm:ss
"
)
:
'空'
let
create_time
=
item
.
create_time
?
moment
(
item
.
create_time
).
format
(
"YYYY-MM-DD"
)
:
'空'
let
tempName
=
`
${
collect_number
}
-
${
surgery_name
}
-
${
create_time
}
`
obj
.
name
=
tempName
,
obj
.
value
=
item
.
collect_number
...
...
@@ -605,7 +605,7 @@ class EquipConsuPage extends Component {
let
{
listOptionData
}
=
state
let
collect_number
=
surgery_collect_headers
[
0
].
collect_number
?
surgery_collect_headers
[
0
].
collect_number
:
'空'
let
surgery_name
=
surgery_collect_headers
[
0
].
surgery_name
?
surgery_collect_headers
[
0
].
surgery_name
:
'空'
let
create_time
=
surgery_collect_headers
[
0
].
create_time
?
moment
(
surgery_collect_headers
[
0
].
create_time
).
format
(
"YYYY-MM-DD
HH:mm:ss
"
)
:
'空'
let
create_time
=
surgery_collect_headers
[
0
].
create_time
?
moment
(
surgery_collect_headers
[
0
].
create_time
).
format
(
"YYYY-MM-DD"
)
:
'空'
let
tempName
=
`
${
collect_number
}
-
${
surgery_name
}
-
${
create_time
}
`
listOptionData
[
3
].
name
=
tempName
listOptionData
[
3
].
value
=
surgery_collect_headers
[
0
].
collect_number
...
...
app/containers/transOrder/TransOrderPage.js
View file @
6df041fe
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