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
33896e0e
authored
Oct 23, 2020
by
Denglingling
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
调整部分多余代码
parent
c7fefdfb
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
18 deletions
android/app/build.gradle
app/containers/quickOrder/QuickOrderPage.js
app/containers/transOrder/module/TransSearchPage.js
android/app/build.gradle
View file @
33896e0e
...
...
@@ -136,6 +136,17 @@ android {
}
}
}
// new add...
signingConfigs
{
debug
{
v1SigningEnabled
true
v2SigningEnabled
true
}
release
{
v1SigningEnabled
true
v2SigningEnabled
true
}
}
}
dependencies
{
...
...
app/containers/quickOrder/QuickOrderPage.js
View file @
33896e0e
...
...
@@ -115,7 +115,7 @@ class EquipConsuPage extends Component {
},
{
"id"
:
"7"
,
title
:
'
配台
模板'
,
title
:
'
手术
模板'
,
name
:
'请选择'
,
value
:
''
},
...
...
@@ -157,7 +157,7 @@ class EquipConsuPage extends Component {
// surgery_name: '', // 手术名称
surgery_date
:
''
,
// 手术时间
// surgery_type_code: '', // 手术类型
template_collect_number
:
''
,
//
配台
模板
template_collect_number
:
''
,
//
手术
模板
order_type_code
:
''
,
// 订单类型
surgery_desc
:
''
,
// 备注信息
voice_url
:
''
,
// 录音地址
...
...
@@ -586,7 +586,7 @@ class EquipConsuPage extends Component {
if
(
itemTitle
===
'手术类型'
)
{
self
.
clearInitNameAndValue
(
6
)
}
if
(
itemTitle
===
'
配台
模板'
)
{
if
(
itemTitle
===
'
手术
模板'
)
{
listOptionData
[
10
].
value
=
item
.
desc
}
}
...
...
@@ -641,7 +641,7 @@ class EquipConsuPage extends Component {
resultArr
.
push
(
obj
)
})
tempOption
=
[...
resultArr
]
}
else
if
(
currentTitle
===
'
配台
模板'
)
{
}
else
if
(
currentTitle
===
'
手术
模板'
)
{
let
resultArr
=
[]
quickOrderOption
.
forEach
(
item
=>
{
let
obj
=
{}
...
...
@@ -933,12 +933,12 @@ class EquipConsuPage extends Component {
})
}
}
//
配台
模板 点击
//
手术
模板 点击
handleMatchTempCheck
()
{
let
{
state
,
props
}
=
this
if
(
this
.
judgeOrgIsNull
()
&&
this
.
judgeCustomerIsNull
())
{
this
.
setState
({
currentTitle
:
'
配台
模板'
,
currentTitle
:
'
手术
模板'
,
currentItem
:
{
name
:
state
.
listOptionData
[
7
].
name
,
value
:
state
.
listOptionData
[
7
].
value
...
...
@@ -1283,7 +1283,7 @@ class EquipConsuPage extends Component {
>
<
CellTextStyle
>
<
AsteriskTextStyle
>*<
/AsteriskTextStyle
>
<
TitleTextStyle
>
{
'
配台
模板'
}
<
/TitleTextStyle
>
<
TitleTextStyle
>
{
'
手术
模板'
}
<
/TitleTextStyle
>
<
ContTextStyle
>
{
listOptionData
[
7
].
name
}
<
/ContTextStyle
>
{
this
.
renderRightArrowItem
()
}
<
/CellTextStyle
>
...
...
app/containers/transOrder/module/TransSearchPage.js
View file @
33896e0e
...
...
@@ -7,8 +7,7 @@ import {
Text
,
Image
,
FlatList
,
ScrollView
,
Animated
ScrollView
}
from
'react-native'
;
import
{
home_background_color
,
...
...
@@ -56,14 +55,6 @@ class TransSearchPage extends Component {
constructor
(
props
)
{
super
(
props
);
this
.
state
=
{
serchForm
:
{
seller_name
:
''
,
// 销售员
org_code
:
''
,
// 组织
surgery_collect_number
:
''
,
// 来源借货订单号
serial_number
:
''
,
// 序列号
surgery_date_from
:
''
,
// 手术时间开始
surgery_date_to
:
''
,
// 手术时间结束
},
listOptionData
:
[
{
"id"
:
"0"
,
...
...
@@ -558,7 +549,7 @@ class TransSearchPage extends Component {
// 返回顶部查询
renderTopProItem
()
{
let
{
serchForm
,
listOptionData
}
=
this
.
state
let
{
listOptionData
}
=
this
.
state
return
(
<
View
style
=
{
styles
.
list_cont
}
>
{
/* <Text style={styles.search_top_tip}>查询条件,至少输入一个条件</Text> */
}
...
...
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