Skip to content

T
total
Commit 7ab7c0bb authored by 曹云霄's avatar 曹云霄
Browse files
Options

修改项说明：订单增加删除状态

parent 5fbb023b
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 24 deletions
total.xcodeproj/project.pbxproj
View file @ 7ab7c0bb
......@@ -3144,8 +3144,8 @@
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 Distribution: Shanghai Gomore Information Technology Co.,Ltd";
CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -3162,7 +3162,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gomoe.total;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "f96494cb-c220-43ce-8034-75e000c2193f";
PROVISIONING_PROFILE = "c2d977b5-adac-45f6-bfbb-3a53616b54d7";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "total/total-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
......@@ -3177,8 +3177,8 @@
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 Distribution: Shanghai Gomore Information Technology Co.,Ltd";
CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -3195,7 +3195,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gomoe.total;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "f96494cb-c220-43ce-8034-75e000c2193f";
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/Views/GTORepairBoltView.m
View file @ 7ab7c0bb
......@@ -256,6 +256,8 @@
stateStr =@"effectived";
}else if(indexPath.row == 7){//已配送
stateStr =@"shipped";
}else if(indexPath.row == 8){//已删除
stateStr =@"delete";
}
[self.delegate getBoltValueSelectRow:stateStr];
}
......
total/GTOApp/Business/SeeObtainViewController.m
View file @ 7ab7c0bb
......@@ -1034,6 +1034,7 @@
user.enterprise = [ICRUserUtil sharedInstance].f_enterprise_uuid;
user.time = [GTOCommonTools GetCurrenttime];
[IBTLoadingView showProgressLabel:@"提交中..."];
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/receiveBill/submit/%@",HTTP_REST_API_BASE_URL,uuidString] withRequestType:ZERO withParameter:[user toDictionary] withSuccess:^(id returnValue) {
if ([returnValue[@"success"] isEqualToNumber:@1]) {
[IBTLoadingView hideHUDWithText:@"提交成功"];
......@@ -1051,7 +1052,6 @@
}
} withFailed:^(NSError *failed) {
[IBTLoadingView hideHUDWithText:@"提交失败"];
[IBTLoadingView showTextOnly:failed.localizedDescription];
}];
......
total/GTOApp/Business/SeeOrderViewController.m
View file @ 7ab7c0bb
......@@ -240,6 +240,7 @@ typedef enum : NSUInteger {
[weakSelf.oilOrderTableview.mj_footer resetNoMoreData];
weakSelf.indexPage = ZERO;
weakSelf.queryOrder.pageNumber = weakSelf.indexPage;
[weakSelf getOilOrderDatas:YES];
}];
header.lastUpdatedTimeLabel.hidden = YES;
......@@ -283,16 +284,21 @@ typedef enum : NSUInteger {
{
if ([self.title isEqualToString:DINGYOUDAN] || [self.title isEqualToString:PEIYOUDAN]) {
SubTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"SubTableViewCell" forIndexPath:indexPath];
NSDictionary *dict = self.orderResultArray[indexPath.row];
if ([self.title isEqualToString:DINGYOUDAN]) {
cell.model = self.orderResultArray[indexPath.row];
cell.model = dict;
}else
{
cell.peiModel = self.orderResultArray[indexPath.row];
cell.peiModel = dict;
}
if ([self.title isEqualToString:PEIYOUDAN] && [dict[@"state"] isEqualToString:GTO_REPAIR_STATE_INITIAL]) {
cell.stateImageView.image = TCImage(@"组-9-副本-2");
}
return cell;
}
OilOrderTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"OilOrderTableViewCell" forIndexPath:indexPath];
cell.model = self.orderResultArray[indexPath.row];
NSDictionary *dict = self.orderResultArray[indexPath.row];
cell.model = dict;
return cell;
}
......@@ -466,7 +472,11 @@ typedef enum : NSUInteger {
_boltView.backgroundColor = XXFBgColor;
_boltView.delegate = self;
//initial(未提交)submitted(已提交)rejected(已拒绝)approved(已审批)shipping(发运中)finished(已完成)
_boltView.dataArr = [[NSMutableArray alloc]initWithObjects:@"全部",@"未提交",@"已提交",@"已作废",@"配送中",@"已完成",@"已生效",@"已配送",nil];
NSMutableArray *array = [[NSMutableArray alloc]initWithObjects:@"全部",@"未提交",@"已提交",@"已作废",@"配送中",@"已完成",@"已生效",@"已配送",@"已删除",nil];
if (![self.title isEqualToString:SHOUYOUDAN]) {
[array removeLastObject];
}
_boltView.dataArr = array;
[_maskView addSubview:_boltView];
[UIView animateWithDuration:0.25 animations:^{
CGRect sortFrame = _boltView.frame;
......@@ -566,15 +576,23 @@ typedef enum : NSUInteger {
- (void)getBoltValueSelectRow:(NSString *)state
{
//现在的状态标示和以前的不一样，以下代码做适配
if ([state isEqualToString:@"submitted"]) {
if ([state isEqualToString:GTO_REPAIR_STATE_SUBMITTED]) {
state = @"submit";
} else if ([state isEqualToString:@"processing"]) {
state = @"canceled";
//收油单区分
state = [self.title isEqualToString:SHOUYOUDAN]?@"cancel":@"canceled";
} else if ([state isEqualToString:@"application"]) {
state = @"shipping";
} else if ([state isEqualToString:@"finished"]) {
} else if ([state isEqualToString:GTO_REPAIR_STATE_FINISHED]) {
state = @"accomplished";
}
if ([self.title isEqualToString:PEIYOUDAN] && [state isEqualToString:GTO_REPAIR_STATE_INITIAL]) {
//取消未提交状态
state = @"zhanwei";
}
if ([self.title isEqualToString:PEIYOUDAN] && [state isEqualToString:@"canceled"]) {
state = GTO_REPAIR_STATE_INITIAL;
}
NSMutableArray *array = [NSMutableArray arrayWithArray:[self.queryOrder toDictionary][@"conditions"]];
NSMutableDictionary *dict = [NSMutableDictionary dictionary];
[dict setValue:@"stateIn" forKey:@"operation"];
......
total/GTOApp/Business/SeePriceViewController.m
View file @ 7ab7c0bb
......@@ -114,7 +114,7 @@
self.seePriceTableview.delegate = self;
self.seePriceTableview.dataSource = self;
self.seePriceTableview.tableFooterView = [UIView new];
self.seePriceTableview.userInteractionEnabled = [ICRUserUtil sharedInstance].storeArray.count;
// self.seePriceTableview.userInteractionEnabled = [ICRUserUtil sharedInstance].storeArray.count;
}
#pragma mark -获取配送区域数据、获取行政区域数据
......@@ -233,14 +233,12 @@
if (indexPath.row == 0) {
cell.distributionAreaContent.text = self.distributionArray[0][@"name"];
self.distributionArea = self.distributionArray[0];
cell.userInteractionEnabled = NO;
}
}
if (self.administrativeArray.count == 1 && [[ICRUserUtil sharedInstance].position isEqualToString:@"storer"]) {
if (indexPath.row == 1) {
cell.distributionAreaContent.text = [NSString stringWithFormat:@"[%@]%@",self.administrativeArray[0][@"uuid"],self.administrativeArray[0][@"name"]];
self.administrativeArea = self.administrativeArray[0];
cell.userInteractionEnabled = NO;
}
}
return cell;
......@@ -266,11 +264,12 @@
SeePriceTableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
WS(weakSelf);
if (indexPath.row == 0) {
if (!self.distributionArray.count) {
[IBTLoadingView showTextOnly:@"当前油站无所属油站，无法选择配送区域"];return;
if (![ICRUserUtil sharedInstance].storeArray.count) {
[IBTLoadingView showTextOnly:@"当前人员无所属油站，无法选择配送区域"];return;
}
if ([ICRUserUtil sharedInstance].storeArray.count == 1) {
return;
}
PromptTableViewController *selectArea = [[PromptTableViewController alloc]init];
selectArea.title = @"选择配送区域";
selectArea.currentTitle = [cell.distributionAreaContent.text isEqualToString:@"请选择"]?nil:cell.distributionAreaContent.text;
......@@ -293,11 +292,14 @@
}
if (indexPath.row == 1) {
if (![ICRUserUtil sharedInstance].storeArray.count) {
[IBTLoadingView showTextOnly:@"当前人员无所属油站，无法选择行政区域"];return;
}
if ([ICRUserUtil sharedInstance].storeArray.count == 1) {
return;
}
if ([[ICRUserUtil sharedInstance].position isEqualToString:@"storer"]) {
if (!self.administrativeArea.count) {
[IBTLoadingView showTextOnly:@"当前油站无所属油站，无法选择行政区域"];return;
}
PromptTableViewController *selectArea = [[PromptTableViewController alloc]init];
selectArea.title = @"选择行政区域";
selectArea.currentTitle = [cell.distributionAreaContent.text isEqualToString:@"请选择"]?nil:cell.distributionAreaContent.text;
......
total/GTOApp/UserUtil/GTOCommonTools.m
View file @ 7ab7c0bb
......@@ -256,7 +256,12 @@
return TCImage(@"已配送");
} else if ([stateString isEqualToString:@"effectived"]) {//已生效
return TCImage(@"已生效");
} else if ([stateString isEqualToString:@"delete"]) {//已删除
return TCImage(@"deleteorder");
} else if ([stateString isEqualToString:@"cancel"]) {//已作废
return TCImage(@"组-9-副本-2");
}
return nil;
}
......
total/Images.xcassets/收油单明细_iPhone_assets/deleteorder.imageset/Contents.json 0 → 100644
View file @ 7ab7c0bb
{
"images" : [
{
"idiom" : "universal",
"filename" : "delete.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "delete@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "delete@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
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