Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
T
total
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
张杰
total
Commits
0dc73808
Commit
0dc73808
authored
8 years ago
by
Sandy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改权限控制
parent
ee3783ef
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
12 deletions
+14
-12
project.pbxproj
total.xcodeproj/project.pbxproj
+4
-4
BusinessViewController.m
total/GTOApp/Business/BusinessViewController.m
+5
-5
GTOLicenceCheckListViewController.m
...Business/LicenceCheck/GTOLicenceCheckListViewController.m
+2
-2
GTOLiceneResultViewController.m
total/GTOApp/Business/Repair/GTOLiceneResultViewController.m
+2
-0
GTOAppMacro.h
total/Macro/GTOAppMacro.h
+1
-1
No files found.
total.xcodeproj/project.pbxproj
View file @
0dc73808
...
@@ -3123,8 +3123,8 @@
...
@@ -3123,8 +3123,8 @@
buildSettings
=
{
buildSettings
=
{
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
CLANG_ENABLE_MODULES
=
YES
;
CLANG_ENABLE_MODULES
=
YES
;
CODE_SIGN_IDENTITY
=
"iPhone D
istribution: Shanghai Gomore Information Technology Co.,Ltd
"
;
CODE_SIGN_IDENTITY
=
"iPhone D
eveloper
"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone D
istribution: Shanghai Gomore Information Technology Co.,Ltd
"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone D
eveloper
"
;
ENABLE_BITCODE
=
NO
;
ENABLE_BITCODE
=
NO
;
FRAMEWORK_SEARCH_PATHS
=
(
FRAMEWORK_SEARCH_PATHS
=
(
"$(inherited)"
,
"$(inherited)"
,
...
@@ -3140,7 +3140,7 @@
...
@@ -3140,7 +3140,7 @@
);
);
PRODUCT_BUNDLE_IDENTIFIER
=
com.gomoe.total
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.gomoe.total
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE
=
"
f96494cb-c220-43ce-8034-75e000c2193f
"
;
PROVISIONING_PROFILE
=
""
;
SWIFT_OBJC_BRIDGING_HEADER
=
"total/total-Bridging-Header.h"
;
SWIFT_OBJC_BRIDGING_HEADER
=
"total/total-Bridging-Header.h"
;
SWIFT_OPTIMIZATION_LEVEL
=
"-Onone"
;
SWIFT_OPTIMIZATION_LEVEL
=
"-Onone"
;
TARGETED_DEVICE_FAMILY
=
1
;
TARGETED_DEVICE_FAMILY
=
1
;
...
@@ -3171,7 +3171,7 @@
...
@@ -3171,7 +3171,7 @@
);
);
PRODUCT_BUNDLE_IDENTIFIER
=
com.gomoe.total
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.gomoe.total
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE
=
"
f96494cb-c220-43ce-8034-75e000c2193f
"
;
PROVISIONING_PROFILE
=
""
;
SWIFT_OBJC_BRIDGING_HEADER
=
"total/total-Bridging-Header.h"
;
SWIFT_OBJC_BRIDGING_HEADER
=
"total/total-Bridging-Header.h"
;
TARGETED_DEVICE_FAMILY
=
1
;
TARGETED_DEVICE_FAMILY
=
1
;
USER_HEADER_SEARCH_PATHS
=
"$(PODS_ROOT)/**"
;
USER_HEADER_SEARCH_PATHS
=
"$(PODS_ROOT)/**"
;
...
...
This diff is collapsed.
Click to expand it.
total/GTOApp/Business/BusinessViewController.m
View file @
0dc73808
...
@@ -217,10 +217,9 @@
...
@@ -217,10 +217,9 @@
//工程
//工程
NSArray
*
project
=
[
NSArray
arrayWithObjects
:
NSArray
*
project
=
[
NSArray
arrayWithObjects
:
@"500303,500300"
@"500303,500300"
,
@"500402,500400"
,
@"500402,500401"
,
@"500404,500402,500401,500403"
,
@"500404,500403"
,
@"500101"
,
@"500102"
,
@"500101,500102,500103"
,
nil
];
,
@"500103"
,
nil
];
//建仓、订油、配油、收油
//建仓、订油、配油、收油
NSArray
*
order
=
[
NSArray
arrayWithObjects
:
NSArray
*
order
=
[
NSArray
arrayWithObjects
:
@"500802"
@"500802"
...
@@ -286,7 +285,8 @@
...
@@ -286,7 +285,8 @@
for
(
int
i
=
0
;
i
<
permission
.
count
;
i
++
)
{
for
(
int
i
=
0
;
i
<
permission
.
count
;
i
++
)
{
if
([
self
permissionWithMaxNumber
:
permission
[
i
]])
{
if
([
self
permissionWithMaxNumber
:
permission
[
i
]])
{
cell
.
functionImageView
.
image
=
image
;
cell
.
functionImageView
.
image
=
image
;
cell
.
userInteractionEnabled
=
YES
;
break
;
cell
.
userInteractionEnabled
=
YES
;
break
;
}
}
if
(
i
==
permission
.
count
-
1
)
{
if
(
i
==
permission
.
count
-
1
)
{
cell
.
functionImageView
.
image
=
[
image
rt_tintedImageWithColor
:[
UIColor
grayColor
]
level
:
0
.
7
];
cell
.
functionImageView
.
image
=
[
image
rt_tintedImageWithColor
:[
UIColor
grayColor
]
level
:
0
.
7
];
...
...
This diff is collapsed.
Click to expand it.
total/GTOApp/Business/LicenceCheck/GTOLicenceCheckListViewController.m
View file @
0dc73808
...
@@ -106,7 +106,7 @@ static NSString *cellID = @"licenceListCell";
...
@@ -106,7 +106,7 @@ static NSString *cellID = @"licenceListCell";
}
}
if
(
orderArr
.
count
==
0
)
{
if
(
orderArr
.
count
==
0
)
{
QueryOrderNew
*
order
=
[
QueryOrderNew
new
];
QueryOrderNew
*
order
=
[
QueryOrderNew
new
];
order
.
field
=
@"
lastModify_time
"
;
order
.
field
=
@"
billnumber
"
;
order
.
direction
=
@"desc"
;
order
.
direction
=
@"desc"
;
[
orderArr
addObject
:[
order
dictForCommit
]];
[
orderArr
addObject
:[
order
dictForCommit
]];
}
}
...
@@ -131,7 +131,7 @@ static NSString *cellID = @"licenceListCell";
...
@@ -131,7 +131,7 @@ static NSString *cellID = @"licenceListCell";
NSDictionary
*
dict
=
@{
NSDictionary
*
dict
=
@{
@"userUuid"
:
userUtil
.
f_user_uuid
,
@"userUuid"
:
userUtil
.
f_user_uuid
,
@"billNumberLike"
:
billNumberObject
,
@"billNumberLike"
:
billNumberObject
,
@"state"
:
[
NSNull
null
]
,
@"state"
:
GTO_LICENCE__STATE_ASKFORAPPROVE
,
@"repairUuid"
:
@""
,
@"repairUuid"
:
@""
,
@"repairNumberLike"
:
[
NSNull
null
],
// repairNumberObject,
@"repairNumberLike"
:
[
NSNull
null
],
// repairNumberObject,
@"riskGrade"
:
riskGradeObject
,
@"riskGrade"
:
riskGradeObject
,
...
...
This diff is collapsed.
Click to expand it.
total/GTOApp/Business/Repair/GTOLiceneResultViewController.m
View file @
0dc73808
...
@@ -181,6 +181,8 @@ static NSString *headerProblemItemID = @"headerItem";
...
@@ -181,6 +181,8 @@ static NSString *headerProblemItemID = @"headerItem";
//是已提交状态 && 有权限
//是已提交状态 && 有权限
BOOL
isSubmitted
=
[
_d_licence
.
state
isEqualToString
:
GTO_LICENCE__STATE_SUBMITTED
]
&&
[
GTOCommonTools
hasPermissionWithPermissionId
:
500405
];
BOOL
isSubmitted
=
[
_d_licence
.
state
isEqualToString
:
GTO_LICENCE__STATE_SUBMITTED
]
&&
[
GTOCommonTools
hasPermissionWithPermissionId
:
500405
];
//申请审批状态 && 有审批权
BOOL
isAskForApprove
=
[
_d_licence
.
state
isEqualToString
:
GTO_LICENCE__STATE_ASKFORAPPROVE
]
&&
approvePermission
;
BOOL
isAskForApprove
=
[
_d_licence
.
state
isEqualToString
:
GTO_LICENCE__STATE_ASKFORAPPROVE
]
&&
approvePermission
;
if
([
_d_licence
.
state
isEqualToString
:
GTO_LICENCE_STATE_INITIAL
]
||
[
_d_licence
.
state
isEqualToString
:
GTO_LICENCE_STATE_LOCAL
])
{
if
([
_d_licence
.
state
isEqualToString
:
GTO_LICENCE_STATE_INITIAL
]
||
[
_d_licence
.
state
isEqualToString
:
GTO_LICENCE_STATE_LOCAL
])
{
...
...
This diff is collapsed.
Click to expand it.
total/Macro/GTOAppMacro.h
View file @
0dc73808
...
@@ -91,7 +91,7 @@
...
@@ -91,7 +91,7 @@
//#define HTTP_REST_API_BASE_URL @"http://139.196.39.77:8080/total-server/rest"
//#define HTTP_REST_API_BASE_URL @"http://139.196.39.77:8080/total-server/rest"
//开发环境
//开发环境
#define HTTP_LOCAL_BASE_URL @"http://
1
39.196.195.30:8093"
#define HTTP_LOCAL_BASE_URL @"http://39.196.195.30:8093"
#define HTTP_REST_API_BASE_URL @"http://139.196.195.30:8093/total-server/rest"
#define HTTP_REST_API_BASE_URL @"http://139.196.195.30:8093/total-server/rest"
...
...
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