Commit 7653df0f authored by admin's avatar admin

开放 在线抽查

parent bfc0f83b
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
#import <MJRefresh.h> #import <MJRefresh.h>
#import "SearchViewController.h" #import "SearchViewController.h"
#import "LookReportDetailViewController.h"
typedef NSComparisonResult (^NSComparator)(id obj1, id obj2); typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
...@@ -109,8 +110,8 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2); ...@@ -109,8 +110,8 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
self.navigationItem.titleView = customLab; self.navigationItem.titleView = customLab;
self.titleArray = [NSMutableArray array]; self.titleArray = [NSMutableArray array];
// self.sectionArray = [NSMutableArray arrayWithObjects:@"口碑报告",@"商场风采",@"优秀案例",@"巡店报告", @"问题知识",@"口碑巡检",@"在线抽查",nil]; self.sectionArray = [NSMutableArray arrayWithObjects:@"口碑报告",@"商场风采",@"优秀案例",@"巡店报告", @"问题知识",@"口碑巡检",@"在线抽查",nil];
self.sectionArray = [NSMutableArray arrayWithObjects:@"口碑报告",@"商场风采",@"优秀案例",@"巡店报告", @"问题知识",@"口碑巡检",nil]; // self.sectionArray = [NSMutableArray arrayWithObjects:@"口碑报告",@"商场风采",@"优秀案例",@"巡店报告", @"问题知识",@"口碑巡检",nil];
self.allRankListArray = [NSMutableArray array]; self.allRankListArray = [NSMutableArray array];
self.taskListDataArray = [NSMutableArray array]; self.taskListDataArray = [NSMutableArray array];
...@@ -167,22 +168,22 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2); ...@@ -167,22 +168,22 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
if ([permissions containsObject:@"500101"] || [permissions containsObject:@"500102"]) { if ([permissions containsObject:@"500101"] || [permissions containsObject:@"500102"]) {
[self.titleArray addObject:@"口碑巡检"]; [self.titleArray addObject:@"口碑巡检"];
[self requestInspectList]; [self requestInspectList];
}else { } else {
[_sectionArray removeObject:@"口碑巡检"]; [_sectionArray removeObject:@"口碑巡检"];
} }
// if ([permissions containsObject:@"500701"] || [permissions containsObject:@"500702"]) { if ([permissions containsObject:@"500701"] || [permissions containsObject:@"500702"]) {
// [self.titleArray addObject:@"在线抽查"]; [self.titleArray addObject:@"在线抽查"];
//
// if ([permissions containsObject:@"500701"]) { if ([permissions containsObject:@"500701"]) {
// [self requestLookOnLineList]; [self requestLookOnLineList];
// } else if ([permissions containsObject:@"500702"]){ } else if ([permissions containsObject:@"500702"]){
// [self requestSpotCheckList]; [self requestSpotCheckList];
// } }
//
// } else { } else {
// [_sectionArray removeObject:@"在线抽查"]; [_sectionArray removeObject:@"在线抽查"];
// } }
// if ([permissions containsObject:@"500702"]) { // if ([permissions containsObject:@"500702"]) {
// [self.titleArray addObject:@"在线抽查"]; // [self.titleArray addObject:@"在线抽查"];
...@@ -1066,12 +1067,27 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2); ...@@ -1066,12 +1067,27 @@ typedef NSComparisonResult (^NSComparator)(id obj1, id obj2);
completeVC.uuid = spot.uuid; completeVC.uuid = spot.uuid;
self.hidesBottomBarWhenPushed = YES; self.hidesBottomBarWhenPushed = YES;
[self.navigationController pushViewController:completeVC animated:YES]; [self.navigationController pushViewController:completeVC animated:YES];
} else if ([permissions containsObject:@"500702"]){ } else if ([permissions containsObject:@"500702"]){
LookOnLineModel *lookOnLine = _allLookOnLineList[indexPath.row]; LookOnLineModel *lookOnLine = _allLookOnLineList[indexPath.row];
LookOnLineDetailViewController *lookDetailVC = [[LookOnLineDetailViewController alloc] init]; // LookOnLineDetailViewController *lookDetailVC = [[LookOnLineDetailViewController alloc] init];
lookDetailVC.lookOnLine = lookOnLine; // lookDetailVC.lookOnLine = lookOnLine;
self.hidesBottomBarWhenPushed = YES; // self.hidesBottomBarWhenPushed = YES;
[self.navigationController pushViewController:lookDetailVC animated:YES]; // [self.navigationController pushViewController:lookDetailVC animated:YES];
if ([lookOnLine.state isEqualToString:@"initial"]) {
LookOnLineDetailViewController *lookDetailVC = [[LookOnLineDetailViewController alloc] init];
// lookDetailVC.delegate = self;
lookDetailVC.lookOnLine = lookOnLine;
self.hidesBottomBarWhenPushed = YES;
[self.navigationController pushViewController:lookDetailVC animated:YES];
} else {
LookReportDetailViewController *lookReportVC = [[LookReportDetailViewController alloc] init];
lookReportVC.lookOnLine = lookOnLine;
self.hidesBottomBarWhenPushed = YES;
[self.navigationController pushViewController:lookReportVC animated:YES];
}
} else { } else {
return; return;
} }
......
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