Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
X
xffruit
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张杰
xffruit
Commits
e0831efc
Commit
e0831efc
authored
Jul 31, 2017
by
Sandy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
在发运单、收货单的“未收货”的状态下,出现“作废”按钮,且不控制作废权限
parent
c9e63bfa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
11 deletions
+20
-11
NewReceiveViewController.m
...trollers/Receiving/Controllers/NewReceiveViewController.m
+12
-8
TransportDetailViewController.m
...ers/Transport/Controllers/TransportDetailViewController.m
+8
-3
No files found.
XFFruit/ViewControllers/Receiving/Controllers/NewReceiveViewController.m
View file @
e0831efc
...
...
@@ -203,11 +203,13 @@ typedef enum : NSUInteger {
if
([
self
.
transfer
.
state
isEqualToString
:
TRANSFER_STATE_UNRECEIVED
])
{
if
([
IBTCommon
checkIsPermission
:
RECEIVE_ACTION_RECEIVE
])
{
[
self
createBtnWithArr
:@[
@"保存"
,
@"收货"
]];
}
else
{
[
self
hiddenBottom
];
NSMutableArray
*
arr
=
[
NSMutableArray
array
];
if
([
IBTCommon
checkIsPermission
:
RECEIVE_ACTION_RECEIVE
])
{
//如果有收货权,则显示收货按钮
[
arr
addObjectsFromArray
:@[
@"保存"
,
@"收货"
]];
}
//这里作废不受权限控制
[
arr
addObject
:
@"作废"
];
[
self
createBtnWithArr
:
arr
];
}
else
if
([
self
.
transfer
.
state
isEqualToString
:
TRANSFER_STATE_RECEIVED
])
{
if
([
IBTCommon
checkIsPermission
:
TRANSFER_ACTION_ABORT
])
{
[
self
createBtnWithArr
:@[
@"作废"
]];
...
...
@@ -215,11 +217,13 @@ typedef enum : NSUInteger {
[
self
hiddenBottom
];
}
}
else
if
([
self
.
transfer
.
state
isEqualToString
:
TRANSFER_STATE_PROCESSFAIL
])
{
if
([
IBTCommon
checkIsPermission
:
RECEIVE_ACTION_RECEIVE
])
{
[
self
createBtnWithArr
:@[
@"作废"
,
@"收货"
]];
}
else
{
[
self
hiddenBottom
];
NSMutableArray
*
arr
=
[
NSMutableArray
array
];
if
([
IBTCommon
checkIsPermission
:
RECEIVE_ACTION_RECEIVE
])
{
//如果有
[
arr
addObjectsFromArray
:@[
@"保存"
,
@"收货"
]];
}
[
arr
addObject
:
@"作废"
];
[
self
createBtnWithArr
:
arr
];
}
else
{
[
self
hiddenBottom
];
...
...
XFFruit/ViewControllers/Transport/Controllers/TransportDetailViewController.m
View file @
e0831efc
...
...
@@ -411,9 +411,14 @@ typedef enum : NSUInteger {
}
else
{
[
self
createBtnWithArr
:
arr
];
}
}
else
if
([
self
.
transport
.
state
isEqualToString
:
TRANSPORT_STATE_UNRECEIVED
]
&&
!
self
.
isWms
&&
[
IBTCommon
checkIsPermission
:
TRANSPORT_ACTION_RECEIVE
]){
[
self
createBtnWithArr
:@[
@"保存"
,
@"收货"
]];
}
else
if
([
self
.
transport
.
state
isEqualToString
:
TRANSPORT_STATE_UNRECEIVED
]
&&
!
self
.
isWms
){
NSMutableArray
*
arr
=
[
NSMutableArray
array
];
if
([
IBTCommon
checkIsPermission
:
TRANSPORT_ACTION_RECEIVE
])
{
//如果有收货权,则显示收货按钮
[
arr
addObjectsFromArray
:@[
@"保存"
,
@"收货"
]];
}
//这里作废不受权限控制
[
arr
addObject
:
@"作废"
];
[
self
createBtnWithArr
:
arr
];
}
else
{
[
self
hiddenAllBtn
];
...
...
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