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
a8938b2c
authored
Feb 26, 2021
by
wong.peiyi
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
[调整] 多仓借还显隐调整
parent
1b5dbc4a
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
12 deletions
app/containers/quickOrder/QuickOrderPage.js
app/containers/transOrder/TransOrderPage.js
yarn.lock
app/containers/quickOrder/QuickOrderPage.js
View file @
a8938b2c
...
@@ -215,7 +215,7 @@ class EquipConsuPage extends Component {
...
@@ -215,7 +215,7 @@ class EquipConsuPage extends Component {
// ],
// ],
showNotEnogPop
:
false
,
// 库存不足弹窗
showNotEnogPop
:
false
,
// 库存不足弹窗
not_enough_items_list
:[],
// 库存不足数据
not_enough_items_list
:[],
// 库存不足数据
bor_ware_required
:
''
,
// APP借货仓库必填权限
bor_ware_required
:
0
,
// APP借货仓库必填权限
}
}
}
}
...
@@ -559,7 +559,7 @@ class EquipConsuPage extends Component {
...
@@ -559,7 +559,7 @@ class EquipConsuPage extends Component {
let
tempStatus
=
false
let
tempStatus
=
false
let
tempTit
=
''
let
tempTit
=
''
let
maxIndex
=
10
let
maxIndex
=
10
if
(
bor_ware_required
===
'Y'
){
if
(
bor_ware_required
===
3
){
maxIndex
=
11
maxIndex
=
11
}
}
for
(
let
chIndex
in
listOptionData
)
{
for
(
let
chIndex
in
listOptionData
)
{
...
@@ -1325,10 +1325,10 @@ class EquipConsuPage extends Component {
...
@@ -1325,10 +1325,10 @@ class EquipConsuPage extends Component {
console
.
log
(
'sysRes:=='
,
sysRes
)
console
.
log
(
'sysRes:=='
,
sysRes
)
if
(
sysRes
.
error_code
===
0
){
if
(
sysRes
.
error_code
===
0
){
this
.
setState
({
this
.
setState
({
bor_ware_required
:
sysRes
.
data
.
profile_value
bor_ware_required
:
Number
(
sysRes
.
data
.
profile_value
)
||
0
})
})
}
else
{
//
}else {
this
.
showWarnError
(
sysRes
)
//
this.showWarnError(sysRes)
}
}
}
}
showWarnError
(
res
){
showWarnError
(
res
){
...
@@ -1437,15 +1437,19 @@ class EquipConsuPage extends Component {
...
@@ -1437,15 +1437,19 @@ class EquipConsuPage extends Component {
listCallBack
=
{()
=>
this
.
handleOrderCheck
(
listOptionData
[
9
])}
listCallBack
=
{()
=>
this
.
handleOrderCheck
(
listOptionData
[
9
])}
listHasArrow
=
{
true
}
listHasArrow
=
{
true
}
/
>
/
>
{
bor_ware_required
>
1
?
<
PageListArrow
<
PageListArrow
listActOpa
=
{.
8
}
listActOpa
=
{.
8
}
listHasAster
=
{
bor_ware_required
===
'Y'
}
listHasAster
=
{
bor_ware_required
===
3
}
listItem
=
{
listOptionData
[
10
]}
listItem
=
{
listOptionData
[
10
]}
listName
=
{
'name'
}
listName
=
{
'name'
}
listTitle
=
{
'title'
}
listTitle
=
{
'title'
}
listCallBack
=
{()
=>
this
.
handleWareCheck
(
listOptionData
[
10
])}
listCallBack
=
{()
=>
this
.
handleWareCheck
(
listOptionData
[
10
])}
listHasArrow
=
{
true
}
listHasArrow
=
{
true
}
/
>
/
>
:
<
Text
><
/Text
>
}
<
DateModel
<
DateModel
date
=
{
listOptionData
[
8
].
dateValue
}
date
=
{
listOptionData
[
8
].
dateValue
}
...
...
app/containers/transOrder/TransOrderPage.js
View file @
a8938b2c
...
@@ -172,7 +172,7 @@ class TransOrderPage extends Component {
...
@@ -172,7 +172,7 @@ class TransOrderPage extends Component {
],
],
isShowImage
:
false
,
isShowImage
:
false
,
currShowImgIndex
:
0
,
currShowImgIndex
:
0
,
bor_ware_required
:
''
,
// APP目标仓库必填权限
bor_ware_required
:
0
,
// APP目标仓库显示及必填权限
}
}
}
}
...
@@ -515,7 +515,7 @@ class TransOrderPage extends Component {
...
@@ -515,7 +515,7 @@ class TransOrderPage extends Component {
let
tempStatus
=
false
let
tempStatus
=
false
let
tempTit
=
''
let
tempTit
=
''
let
maxIndex
=
4
let
maxIndex
=
4
if
(
bor_ware_required
===
'Y'
){
if
(
bor_ware_required
===
3
){
maxIndex
=
5
maxIndex
=
5
}
}
for
(
let
chIndex
in
listOptionData
)
{
for
(
let
chIndex
in
listOptionData
)
{
...
@@ -1183,10 +1183,10 @@ class TransOrderPage extends Component {
...
@@ -1183,10 +1183,10 @@ class TransOrderPage extends Component {
console
.
log
(
'sysRes:=='
,
sysRes
)
console
.
log
(
'sysRes:=='
,
sysRes
)
if
(
sysRes
.
error_code
===
0
){
if
(
sysRes
.
error_code
===
0
){
this
.
setState
({
this
.
setState
({
bor_ware_required
:
sysRes
.
data
.
profile_value
bor_ware_required
:
Number
(
sysRes
.
data
.
profile_value
)
||
0
})
})
}
else
{
//
}else {
this
.
showWarnError
(
sysRes
)
//
this.showWarnError(sysRes)
}
}
}
}
showWarnError
(
res
){
showWarnError
(
res
){
...
@@ -1240,15 +1240,18 @@ class TransOrderPage extends Component {
...
@@ -1240,15 +1240,18 @@ class TransOrderPage extends Component {
listHasArrow
=
{
true
}
listHasArrow
=
{
true
}
listMaxLines
=
{
3
}
listMaxLines
=
{
3
}
/
>
/
>
{
bor_ware_required
>
1
&&
<
PageListArrow
<
PageListArrow
listActOpa
=
{.
8
}
listActOpa
=
{.
8
}
listHasAster
=
{
bor_ware_required
===
'Y'
}
listHasAster
=
{
bor_ware_required
===
3
}
listItem
=
{
listOptionData
[
4
]}
listItem
=
{
listOptionData
[
4
]}
listName
=
{
'name'
}
listName
=
{
'name'
}
listTitle
=
{
'title'
}
listTitle
=
{
'title'
}
listCallBack
=
{()
=>
this
.
handleWareCheck
(
listOptionData
[
4
])}
listCallBack
=
{()
=>
this
.
handleWareCheck
(
listOptionData
[
4
])}
listHasArrow
=
{
true
}
listHasArrow
=
{
true
}
/
>
/
>
}
{
this
.
renderPickerModel
()
}
{
this
.
renderPickerModel
()
}
...
...
yarn.lock
0 → 100644
View file @
a8938b2c
This diff could not be displayed because it is too large.
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