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
2370cb39
Commit
2370cb39
authored
8 years ago
by
Sandy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.许可证审批状态增加“申请审批” 。
2.中级审批权可以审批对应级别的许可证。 3.增加申请审批权限控制
parent
58bceca3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
1245 additions
and
1294 deletions
+1245
-1294
Actions.json
total/Actions.json
+463
-463
BusinessStoryBoard.storyboard
total/GTOApp/Business/BusinessStoryBoard.storyboard
+2
-2
GTOLicenceCheckListViewController.m
...Business/LicenceCheck/GTOLicenceCheckListViewController.m
+313
-296
GTOLiceneResultViewController.m
total/GTOApp/Business/Repair/GTOLiceneResultViewController.m
+346
-416
ICRLoginViewController.m
total/GTOApp/Login/ICRLoginViewController.m
+95
-113
GTOCommonTools.m
total/GTOApp/UserUtil/GTOCommonTools.m
+2
-0
GTOAppMacro.h
total/Macro/GTOAppMacro.h
+5
-4
ICRHTTPController.h
total/Managers/HttpManager/ICRHTTPController.h
+6
-0
ICRHTTPController.m
total/Managers/HttpManager/ICRHTTPController.m
+13
-0
No files found.
total/Actions.json
View file @
2370cb39
[
[
{
"id"
:
"10"
,
"name"
:
"系统管理"
,
...
...
@@ -460,4 +460,4 @@
}
]
}
]
\ No newline at end of file
]
\ No newline at end of file
This diff is collapsed.
Click to expand it.
total/GTOApp/Business/BusinessStoryBoard.storyboard
View file @
2370cb39
<?xml version="1.0" encoding="UTF-8"?>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB"
version=
"3.0"
toolsVersion=
"
10117
"
systemVersion=
"16B2555"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB"
version=
"3.0"
toolsVersion=
"
9531
"
systemVersion=
"16B2555"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
>
<dependencies>
<deployment
identifier=
"iOS"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"
10085
"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"
9529
"
/>
</dependencies>
<scenes>
<!--Business View Controller-->
...
...
This diff is collapsed.
Click to expand it.
total/GTOApp/Business/LicenceCheck/GTOLicenceCheckListViewController.m
View file @
2370cb39
This diff is collapsed.
Click to expand it.
total/GTOApp/Business/Repair/GTOLiceneResultViewController.m
View file @
2370cb39
This diff is collapsed.
Click to expand it.
total/GTOApp/Login/ICRLoginViewController.m
View file @
2370cb39
This diff is collapsed.
Click to expand it.
total/GTOApp/UserUtil/GTOCommonTools.m
View file @
2370cb39
...
...
@@ -111,6 +111,8 @@
if
([
englishState
isEqualToString
:
@"initial"
])
{
return
@"未提交"
;
}
else
if
([
englishState
isEqualToString
:
@"submitted"
])
{
return
@"申请审批"
;
}
else
if
([
englishState
isEqualToString
:
GTO_LICENCE__STATE_ASKFORAPPROVE
])
{
return
@"待审批"
;
}
else
if
([
englishState
isEqualToString
:
@"approved"
])
{
return
@"审批通过"
;
...
...
This diff is collapsed.
Click to expand it.
total/Macro/GTOAppMacro.h
View file @
2370cb39
...
...
@@ -79,8 +79,8 @@
//#define HTTP_LOCAL_BASE_URL @"http://218.244.151.129:7580"
////正式环境
#define HTTP_REST_API_BASE_URL @"http://139.196.39.77:7080/total-server/rest"
#define HTTP_LOCAL_BASE_URL @"http://139.196.39.77:7080"
//
#define HTTP_REST_API_BASE_URL @"http://139.196.39.77:7080/total-server/rest"
//
#define HTTP_LOCAL_BASE_URL @"http://139.196.39.77:7080"
//
//测试环境
//#define HTTP_REST_API_BASE_URL @"http://139.196.39.77:8180/total-server/rest"
...
...
@@ -91,8 +91,8 @@
//#define HTTP_REST_API_BASE_URL @"http://139.196.39.77:8080/total-server/rest"
//开发环境
//
#define HTTP_LOCAL_BASE_URL @"http://139.196.195.30:8093"
//
#define HTTP_REST_API_BASE_URL @"http://139.196.195.30:8093/total-server/rest"
#define HTTP_LOCAL_BASE_URL @"http://139.196.195.30:8093"
#define HTTP_REST_API_BASE_URL @"http://139.196.195.30:8093/total-server/rest"
//豪杰/
...
...
@@ -168,6 +168,7 @@ typedef NS_ENUM(NSUInteger, ICRQestionType) {
#define GTO_LICENCE_STATE_LOCAL @"local"
#define GTO_LICENCE_STATE_INITIAL @"initial"
#define GTO_LICENCE__STATE_SUBMITTED @"submitted"
#define GTO_LICENCE__STATE_ASKFORAPPROVE @"askforapprove"
#define GTO_LICENCE__STATE_APPROVED @"approved"
#define GTO_LICENCE__STATE_REJECTED @"rejected"
#define GTO_LICENCE__STATE_EXPIRED @"expired"
...
...
This diff is collapsed.
Click to expand it.
total/Managers/HttpManager/ICRHTTPController.h
View file @
2370cb39
...
...
@@ -132,6 +132,12 @@ typedef NS_ENUM(NSUInteger, ICRAttachmentType) {
version
:
(
NSInteger
)
version
success
:(
void
(
^
)(
id
))
succ
failure
:(
void
(
^
)(
id
))
fail
;
// 申请审批许可证(写)
-
(
void
)
doLicenceAskForApproveWithLicenceUuid
:(
NSString
*
)
licenceUuid
version
:
(
NSInteger
)
version
success
:(
void
(
^
)(
id
))
succ
failure
:(
void
(
^
)(
id
))
fail
;
//5.8许可证操作日志列表(读)
-
(
void
)
getLicenceGet_logsWithLicenceUuid
:(
NSString
*
)
licenceUuid
success
:(
void
(
^
)(
id
))
succ
...
...
This diff is collapsed.
Click to expand it.
total/Managers/HttpManager/ICRHTTPController.m
View file @
2370cb39
...
...
@@ -82,6 +82,7 @@ typedef NS_ENUM(NSUInteger, ICRHTTPAction) {
kGTOHTTP_LicenceRemove
,
kGTOHTTP_LicenceReject
,
kGTOHTTP_LicenceApprove
,
kGTOHTTP_LicenceAskForApprove
,
kGTOHTTP_LicenceGetLogs
,
//6.1 保存拓店(写)
kGTOHTTP_PioneeringSaveResult
,
...
...
@@ -171,6 +172,7 @@ static NSString * const ICRHTTPInterface[] = {
[
kGTOHTTP_LicenceRemove
]
=
@"licence/remove"
,
[
kGTOHTTP_LicenceReject
]
=
@"licence/reject"
,
[
kGTOHTTP_LicenceApprove
]
=
@"licence/approve"
,
[
kGTOHTTP_LicenceAskForApprove
]
=
@"licence/askforapprove"
,
[
kGTOHTTP_LicenceGetLogs
]
=
@"licence/get_logs"
,
//6.1 保存拓店(写)
...
...
@@ -1026,6 +1028,17 @@ acceptTypeJson:YES
NSString
*
encodeUrlStr
=
[
urlStr
stringByAddingPercentEscapesUsingEncoding
:
NSUTF8StringEncoding
];
[
self
p_doPostActionWithEncodeURL
:
encodeUrlStr
data
:
nil
success
:
succ
failure
:
fail
];
}
// 申请审批许可证(写)
-
(
void
)
doLicenceAskForApproveWithLicenceUuid
:
(
NSString
*
)
licenceUuid
version
:
(
NSInteger
)
version
success
:
(
void
(
^
)(
id
))
succ
failure
:
(
void
(
^
)(
id
))
fail
{
ICRUserUtil
*
userU
=
[
ICRUserUtil
sharedInstance
];
NSString
*
urlStr
=
[[[
self
class
]
UrlForPluginHTTPAction
:
kGTOHTTP_LicenceAskForApprove
]
stringByAppendingFormat
:
@"/%@?version=%ld&time=%@&operId=%@&operName=%@"
,
licenceUuid
,
version
,[[
NSDate
date
]
httpParameterString
],
userU
.
f_user_code
,
userU
.
f_user_name
];
NSString
*
encodeUrlStr
=
[
urlStr
stringByAddingPercentEscapesUsingEncoding
:
NSUTF8StringEncoding
];
[
self
p_doPostActionWithEncodeURL
:
encodeUrlStr
data
:
nil
success
:
succ
failure
:
fail
];
}
//5.8许可证操作日志列表(读)
-
(
void
)
getLicenceGet_logsWithLicenceUuid
:
(
NSString
*
)
licenceUuid
success
:
(
void
(
^
)(
id
))
succ
...
...
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