Commit 2370cb39 authored by Sandy's avatar Sandy

1.许可证审批状态增加“申请审批” 。

2.中级审批权可以审批对应级别的许可证。
3.增加申请审批权限控制
parent 58bceca3
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?> <?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> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
</dependencies> </dependencies>
<scenes> <scenes>
<!--Business View Controller--> <!--Business View Controller-->
......
This diff is collapsed.
...@@ -111,6 +111,8 @@ ...@@ -111,6 +111,8 @@
if ([englishState isEqualToString:@"initial"]) { if ([englishState isEqualToString:@"initial"]) {
return @"未提交"; return @"未提交";
} else if ([englishState isEqualToString:@"submitted"]) { } else if ([englishState isEqualToString:@"submitted"]) {
return @"申请审批";
}else if ([englishState isEqualToString:GTO_LICENCE__STATE_ASKFORAPPROVE]) {
return @"待审批"; return @"待审批";
}else if ([englishState isEqualToString:@"approved"]) { }else if ([englishState isEqualToString:@"approved"]) {
return @"审批通过"; return @"审批通过";
......
...@@ -79,8 +79,8 @@ ...@@ -79,8 +79,8 @@
//#define HTTP_LOCAL_BASE_URL @"http://218.244.151.129:7580" //#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_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_LOCAL_BASE_URL @"http://139.196.39.77:7080"
// //
//测试环境 //测试环境
//#define HTTP_REST_API_BASE_URL @"http://139.196.39.77:8180/total-server/rest" //#define HTTP_REST_API_BASE_URL @"http://139.196.39.77:8180/total-server/rest"
...@@ -91,8 +91,8 @@ ...@@ -91,8 +91,8 @@
//#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://139.196.195.30:8093" #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_REST_API_BASE_URL @"http://139.196.195.30:8093/total-server/rest"
//豪杰/ //豪杰/
...@@ -168,6 +168,7 @@ typedef NS_ENUM(NSUInteger, ICRQestionType) { ...@@ -168,6 +168,7 @@ typedef NS_ENUM(NSUInteger, ICRQestionType) {
#define GTO_LICENCE_STATE_LOCAL @"local" #define GTO_LICENCE_STATE_LOCAL @"local"
#define GTO_LICENCE_STATE_INITIAL @"initial" #define GTO_LICENCE_STATE_INITIAL @"initial"
#define GTO_LICENCE__STATE_SUBMITTED @"submitted" #define GTO_LICENCE__STATE_SUBMITTED @"submitted"
#define GTO_LICENCE__STATE_ASKFORAPPROVE @"askforapprove"
#define GTO_LICENCE__STATE_APPROVED @"approved" #define GTO_LICENCE__STATE_APPROVED @"approved"
#define GTO_LICENCE__STATE_REJECTED @"rejected" #define GTO_LICENCE__STATE_REJECTED @"rejected"
#define GTO_LICENCE__STATE_EXPIRED @"expired" #define GTO_LICENCE__STATE_EXPIRED @"expired"
......
...@@ -132,6 +132,12 @@ typedef NS_ENUM(NSUInteger, ICRAttachmentType) { ...@@ -132,6 +132,12 @@ typedef NS_ENUM(NSUInteger, ICRAttachmentType) {
version: (NSInteger)version version: (NSInteger)version
success:(void (^)(id))succ success:(void (^)(id))succ
failure:(void (^)(id))fail; failure:(void (^)(id))fail;
// 申请审批许可证(写)
- (void)doLicenceAskForApproveWithLicenceUuid:(NSString *)licenceUuid
version: (NSInteger)version
success:(void (^)(id))succ
failure:(void (^)(id))fail;
//5.8许可证操作日志列表(读) //5.8许可证操作日志列表(读)
- (void)getLicenceGet_logsWithLicenceUuid:(NSString *)licenceUuid - (void)getLicenceGet_logsWithLicenceUuid:(NSString *)licenceUuid
success:(void (^)(id))succ success:(void (^)(id))succ
......
...@@ -82,6 +82,7 @@ typedef NS_ENUM(NSUInteger, ICRHTTPAction) { ...@@ -82,6 +82,7 @@ typedef NS_ENUM(NSUInteger, ICRHTTPAction) {
kGTOHTTP_LicenceRemove, kGTOHTTP_LicenceRemove,
kGTOHTTP_LicenceReject, kGTOHTTP_LicenceReject,
kGTOHTTP_LicenceApprove, kGTOHTTP_LicenceApprove,
kGTOHTTP_LicenceAskForApprove,
kGTOHTTP_LicenceGetLogs, kGTOHTTP_LicenceGetLogs,
//6.1 保存拓店(写) //6.1 保存拓店(写)
kGTOHTTP_PioneeringSaveResult, kGTOHTTP_PioneeringSaveResult,
...@@ -171,6 +172,7 @@ static NSString * const ICRHTTPInterface[] = { ...@@ -171,6 +172,7 @@ static NSString * const ICRHTTPInterface[] = {
[kGTOHTTP_LicenceRemove] = @"licence/remove", [kGTOHTTP_LicenceRemove] = @"licence/remove",
[kGTOHTTP_LicenceReject] = @"licence/reject", [kGTOHTTP_LicenceReject] = @"licence/reject",
[kGTOHTTP_LicenceApprove] = @"licence/approve", [kGTOHTTP_LicenceApprove] = @"licence/approve",
[kGTOHTTP_LicenceAskForApprove] = @"licence/askforapprove",
[kGTOHTTP_LicenceGetLogs] = @"licence/get_logs", [kGTOHTTP_LicenceGetLogs] = @"licence/get_logs",
//6.1 保存拓店(写) //6.1 保存拓店(写)
...@@ -1026,6 +1028,17 @@ acceptTypeJson:YES ...@@ -1026,6 +1028,17 @@ acceptTypeJson:YES
NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
[self p_doPostActionWithEncodeURL:encodeUrlStr data:nil success:succ failure:fail]; [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许可证操作日志列表(读) //5.8许可证操作日志列表(读)
- (void)getLicenceGet_logsWithLicenceUuid:(NSString *)licenceUuid - (void)getLicenceGet_logsWithLicenceUuid:(NSString *)licenceUuid
success:(void (^)(id))succ success:(void (^)(id))succ
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment