Merge branch 'master' of https://git.oschina.net/gomore/total

total.xcodeproj/project.pbxproj

@@ -3150,9 +3150,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = W54V2VB863;
+				CODE_SIGN_IDENTITY = "iPhone Developer: jie zhang (9V9955H2BK)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: jie zhang (9V9955H2BK)";
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3168,7 +3168,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomoe.total;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE = "c2d977b5-adac-45f6-bfbb-3a53616b54d7";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "total/total-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -3183,9 +3183,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = W54V2VB863;
+				CODE_SIGN_IDENTITY = "iPhone Developer: jie zhang (9V9955H2BK)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: jie zhang (9V9955H2BK)";
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3201,7 +3201,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomoe.total;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE = "c2d977b5-adac-45f6-bfbb-3a53616b54d7";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "total/total-Bridging-Header.h";
 				TARGETED_DEVICE_FAMILY = "1,2";

total/GTOApp/Business/Repair/GTOLiceneResultViewController.m

@@ -208,7 +208,7 @@ static NSString *headerProblemItemID = @"headerItem";
         }
 
     } else if (isSubmitted) {
-        bottomV = [[GXFBottomView alloc] initOneButtonWithFrame:rect buttonColor:GTO_RED_COLOR buttonTitle:@"申请审批"];
+        bottomV = [[GXFBottomView alloc] initOneButtonWithFrame:rect buttonColor:GTO_BLUE_DEEP_COLOR buttonTitle:@"申请审批"];
         bottomV.tag = kBOttomViewAskForApprove;
     }else if (isAskForApprove) {
         bottomV = [[GXFBottomView alloc] initWithFrame:rect

total/GTOApp/Business/Repair/GTORepairListViewController.m

@@ -49,6 +49,8 @@ static NSString *cellID = @"repairListCell";
 @property (nonatomic,strong)NSString *state;
 @property (nonatomic,strong)NSString *billLike;
 @property (nonatomic,strong)NSString *orderDirection;//asc(升序)，desc(降序)
+@property (strong, nonatomic) NSString *areaLike;
+@property (strong, nonatomic) NSString *stationNameLike;
 @end
 
 @implementation GTORepairListViewController
@@ -121,11 +123,23 @@ static NSString *cellID = @"repairListCell";
     if (self.titleLike.length > 0) {
         titleObject = self.titleLike;
     }
+    
+    id areaObject = [NSNull null];
+    if (self.areaLike.length > 0) {
+        areaObject = self.areaLike;
+    }
+    
+    id stationObject = [NSNull null];
+    if (self.stationNameLike.length > 0) {
+        stationObject = self.stationNameLike;
+    }
     NSDictionary *dict = @{
                            @"engineerUuid": [ICRUserUtil sharedInstance].f_user_uuid,
                            @"billNumberLike":billObject,
                            @"state":stateObject,
                            @"titleLike":titleObject,
+                           @"storeAreaNameLike":areaObject,
+                           @"storeNameLike":stationObject,
                            @"queryOrders":orderArr,
                            @"pageNumber":@(_currentPage),
                            @"pageSize":@(20)};
@@ -261,7 +275,7 @@ static NSString *cellID = @"repairListCell";
             [btn setImage:[UIImage imageNamed:@"selected-filter_with_text"] forState:UIControlStateNormal];
             if (_boltView == nil) {
                 CGRect rect = CGRectMake(0, -105, ScreenSize.width, 274) ;
-                _boltView = [[GTORepairBoltView alloc]initWithFrame:rect state:self.state title:self.titleLike bill:self.billLike];
+                _boltView = [[GTORepairBoltView alloc]initRepairBoltViewWithFrame:rect state:self.state title:self.titleLike bill:self.billLike area:self.areaLike station:self.stationNameLike];
 
                 
                 _boltView.backgroundColor = XXFBgColor;
@@ -380,6 +394,14 @@ static NSString *cellID = @"repairListCell";
     CLog(@"%@",billNumber);
 }
 
+- (void)getAreaLike:(NSString *)area {
+    self.areaLike = area;
+}
+
+- (void)getStationNameLime:(NSString *)stationName {
+    self.stationNameLike = stationName;
+}
+
 //- (void)getvendorLike:(NSString *)vendorLike{
 //    self.vendorLike = vendorLike;
 //    CLog(@"%@",vendorLike);
@@ -395,6 +417,8 @@ static NSString *cellID = @"repairListCell";
     if (self.state.length > 0) {
         self.state = @"";
     }
+    self.areaLike = nil;
+    self.stationNameLike = nil;
 //    if (self.vendorLike.length > 0) {
 //        self.vendorLike = @"";
 //    }

total/GTOApp/Business/Repair/Views/GTORepairBoltView.h

@@ -11,17 +11,20 @@
 - (void)getBoltValueSelectRow:(NSString *)state;
 - (void)getTitleLike:(NSString *)titleLike;
 - (void)getBillNumber:(NSString *)billNumber;
+- (void)getAreaLike:(NSString *)area;
+- (void)getStationNameLime:(NSString *)stationName;
 - (void)clearBoltInformation;
 @end
 @interface GTORepairBoltView : UIView<UITableViewDataSource,UITableViewDelegate>
 @property (nonatomic,strong)UITableView *tableView;
 @property (nonatomic,strong)NSMutableArray *dataArr;
 @property (nonatomic,weak)id <GTORepairBoltViewDelegate>delegate;
-
 @property (nonatomic,strong)UITextField *titleFiled;
 @property (nonatomic,strong)UITextField *billFiled;
 
 - (instancetype)initWithFrame:(CGRect)frame state:(NSString *)state title:(NSString *)title bill:(NSString *)bill;
 
+- (instancetype)initRepairBoltViewWithFrame:(CGRect)frame state:(NSString *)state title:(NSString *)title bill:(NSString *)bill area:(NSString *)area station:(NSString *)station;
+
 
 @end

total/GTOApp/Business/Repair/Views/GTORepairBoltView.m

@@ -14,6 +14,31 @@
 #define LeftHeight 44
 #define BottomHeight 50
 
+/**
+ *  筛选条件
+ */
+typedef NS_ENUM(NSInteger, BoltConditionType) {
+    /**
+     *  状态
+     */
+    BoltConditionTypeState,
+    /**
+     *  单号
+     */
+    BoltConditionTypeBillNumber,
+    /**
+     *  标题
+     */
+    BoltConditionTypeTitle,
+    /**
+     *  区域
+     */
+    BoltConditionTypeArea,
+    /**
+     *  油站
+     */
+    BoltConditionTypeStation
+};
 @interface GTORepairBoltView ()<UITextFieldDelegate>
 {
     UIView *_leftView;
@@ -29,6 +54,8 @@
 @property (nonatomic,strong)NSString *state;
 @property (nonatomic,strong)NSString *title;
 @property (nonatomic,strong)NSString *billNumber;
+@property (assign, nonatomic) BoltConditionType type;
+@property (strong, nonatomic) NSMutableDictionary *dicData;
 
 
 @end
@@ -44,6 +71,10 @@
         [self createView];
         [self createRightView];
         [self preferData];
+        
+        if (title) {
+            [self.dicData setObject:title forKey:@(1003)];
+        }
     }
     
     self.tableView.hidden = NO;
@@ -54,6 +85,36 @@
     return self;
 }
 
+- (instancetype)initRepairBoltViewWithFrame:(CGRect)frame state:(NSString *)state title:(NSString *)title bill:(NSString *)bill area:(NSString *)area station:(NSString *)station {
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.title = title;
+        self.billNumber = bill;
+        self.state = state;
+        [self createBoltLeftView];
+        [self createRightView];
+        [self preferData];
+        if (title) {
+            [self.dicData setObject:title forKey:@(1003)];
+        }
+        if (area) {
+            [self.dicData setObject:area forKey:@(1004)];
+        }
+        
+        if (station) {
+            
+            [self.dicData setObject:station forKey:@(1005)];
+        }
+    }
+    
+    self.tableView.hidden = NO;
+    _titleView.hidden = YES;
+    _billNumberView.hidden = YES;
+    //    self.titleFiled.text = title;
+    self.billFiled.text = bill;
+    return self;
+}
+
 - (void)preferData{
     
     if ([self.state isEqualToString:@"none"]) {
@@ -78,12 +139,47 @@
         self.billFiled.text = self.billNumber;
     }
 }
+
+#pragma mark - 创建视图
+- (void)createBoltLeftView
+{
+    _leftView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, LeftMargin,self.frame.size.height- BottomHeight)];
+    [self addSubview:_leftView];
+    NSArray *arr = @[@"按状态",@"单号",@"标题",@"区域",@"油站"];
+    
+    
+    for (NSInteger i = 0; i<arr.count; i++) {
+        UIButton *button = [UIButton buttonWithType:UIButtonTypeSystem];
+        button.frame = CGRectMake(0, LeftHeight * i ,  LeftMargin ,LeftHeight);
+        [button setTitle:arr[i] forState:UIControlStateNormal];
+        [button setTitleColor:GXF_DETAIL_COLOR forState:UIControlStateNormal];
+        if (i == 0) {
+            button.enabled = NO;
+            _currentBtn = button;
+        }
+        [button setBackgroundImage:[UIImage imageNamed:@"maskEnable"] forState:UIControlStateDisabled];
+        [button setBackgroundImage:[UIImage imageNamed:@"mask"] forState:UIControlStateNormal];
+        button.tag = 1001+i;
+        [button addTarget:self action:@selector(leftBtnClick:) forControlEvents:UIControlEventTouchUpInside];
+        [_leftView addSubview:button];
+    }
+    _clearBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    _clearBtn.frame = CGRectMake(0, CGRectGetMaxY(_leftView.frame), self.frame.size.width, BottomHeight);
+    [_clearBtn setTitle:@"清空选项" forState:UIControlStateNormal];
+    [_clearBtn setTitleColor:GXF_CONTENT_COLOR forState:UIControlStateNormal];
+    _clearBtn.titleLabel.font = GXF_FIFTEENTEN_SIZE;
+    [_clearBtn addTarget:self action:@selector(clearBolt) forControlEvents:UIControlEventTouchUpInside];
+    [self addSubview:_clearBtn];
+}
+
 #pragma mark - 创建视图
 - (void)createView
 {
     _leftView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, LeftMargin,self.frame.size.height- BottomHeight)];
     [self addSubview:_leftView];
-    NSArray *arr = @[@"按状态",@"单号",self.title?self.title:@"标题"];
+    NSMutableArray *arr = @[@"按状态",@"单号",self.title?self.title:@"标题"].mutableCopy;
+    
+    
     for (NSInteger i = 0; i<arr.count; i++) {
         UIButton *button = [UIButton buttonWithType:UIButtonTypeSystem];
         button.frame = CGRectMake(0, LeftHeight * i ,  LeftMargin ,LeftHeight);
@@ -157,6 +253,8 @@
     btn.enabled = NO;
     _currentBtn = btn;
     [self keyBoardHidden];
+    NSString *string = [self.dicData objectForKey:@(btn.tag)];
+    NSLog(@"%p", self);
     switch (btn.tag) {
         case 1001://状态
         {
@@ -176,7 +274,30 @@
         {
             self.tableView.hidden = YES;
             _titleView.hidden = NO;
+            _titleFiled.placeholder = self.title?@"创建人类似于":@"输入类似标题";
+            _titleFiled.text = string;
             _billNumberView.hidden = YES;
+            self.type = BoltConditionTypeTitle;
+        }
+            break;
+        case 1004://区域
+        {
+            self.tableView.hidden = YES;
+            _titleView.hidden = NO;
+            _titleFiled.placeholder = @"输入行政区域";
+            _titleFiled.text = string;
+            _billNumberView.hidden = YES;
+            self.type = BoltConditionTypeArea;
+        }
+            break;
+        case 1005://油站
+        {
+            self.tableView.hidden = YES;
+            _titleView.hidden = NO;
+            _titleFiled.placeholder = @"输入油站名称";
+            _titleFiled.text = string;
+            _billNumberView.hidden = YES;
+            self.type = BoltConditionTypeStation;
         }
             break;
         default:
@@ -185,6 +306,7 @@
 }
 
 - (void)clearBolt{
+    [self.dicData removeAllObjects];
     if (_titleFiled.text.length > 0) {
         _titleFiled.text = @"";
     }
@@ -279,13 +401,27 @@
 }
 
 - (void)textFieldDidEndEditing:(UITextField *)textField{
-    if (textField == self.titleFiled) {
-        [self.delegate getTitleLike:self.titleFiled.text];
-    }else if(textField == self.billFiled){
-        //        if (self.billFiled.text.length > 0) {
+   if(textField == self.billFiled){
         [self.delegate getBillNumber:self.billFiled.text];
-        //        }
     }
+    
+    if (self.type == BoltConditionTypeTitle) {
+        [self.delegate getTitleLike:self.titleFiled.text];
+        [self.dicData setObject:self.titleFiled.text forKey:@(1003)];
+    }else if (self.type == BoltConditionTypeArea) {
+        [self.delegate getAreaLike:self.titleFiled.text];
+        [self.dicData setObject:self.titleFiled.text forKey:@(1004)];
+    }else if (self.type == BoltConditionTypeStation){
+        [self.delegate getStationNameLime:self.titleFiled.text];
+        [self.dicData setObject:self.titleFiled.text forKey:@(1005)];
+    }
+}
+
+- (NSMutableDictionary *)dicData {
+    if (!_dicData) {
+        _dicData = [NSMutableDictionary dictionary];
+    }
+    return _dicData;
 }
 
 @end

total/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.10</string>
+	<string>1.2.11</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.10</string>
+	<string>1.2.11</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>