diff --git a/XFFruit/ViewControllers/Business/BusinessViewController.m b/XFFruit/ViewControllers/Business/BusinessViewController.m index f830213c080b6e733c4951075b60ecbe38636c8e..c0b4d5690afc8e1990e64b2d8997fda1a9f0e47f 100644 --- a/XFFruit/ViewControllers/Business/BusinessViewController.m +++ b/XFFruit/ViewControllers/Business/BusinessViewController.m @@ -166,7 +166,7 @@ } break; - case kFunctionSeePurchase:{ + case kFunctionSeePurchase:{//查看采è´å• PurchaseViewController *pvc = [[PurchaseViewController alloc]init]; pvc.title = @"采è´å•"; [self PushViewController:pvc animated:YES]; diff --git a/XFFruit/ViewControllers/Purchase/Controllers/NewPurchaseViewController.m b/XFFruit/ViewControllers/Purchase/Controllers/NewPurchaseViewController.m index 4d318f7921ad3e542055bf1a827d67e69fd6cc31..9c9be38ec6d579a0fb5fbb7d2b6382cf0aa29b85 100644 --- a/XFFruit/ViewControllers/Purchase/Controllers/NewPurchaseViewController.m +++ b/XFFruit/ViewControllers/Purchase/Controllers/NewPurchaseViewController.m @@ -333,17 +333,24 @@ typedef enum : NSUInteger { @"receiveWrh_uuid":[IBTCommon checkString:_purchaseView.receiveWrh_uuid], @"receiveWrh_code":[IBTCommon checkString:_purchaseView.receiveWrh_code], @"receiveWrh_name":[IBTCommon checkString:_purchaseView.receiveWrh_name], + @"purchaserUuid":_purchaseView.selectPerson.userUuid, + @"purchaserCode":_purchaseView.selectPerson.userCode, + @"purchaserName":_purchaseView.selectPerson.userName, @"total":_purchaseView.total, @"charge":_purchaseView.chargePurchase, @"remark":[IBTCommon checkString:_purchaseView.remark], @"products":billProducts, - @"accountDetails":costs0}; + @"accountDetails":costs}; [IBTLoadingView showProgressLabel:msg]; [[ICRHTTPController sharedController] savePurchaseWithData:dict success:succ failure:fail]; } #pragma mark - checkNull - (BOOL)checkPurchase{ _purchaseView.remark = _purchaseView.remarkTextView.text; + if (_purchaseView.selectPerson == nil) { + ShowMessage(@"采è´å‘˜ä¸èƒ½ä¸ºç©º"); + return NO; + } if (_purchaseView.type.length == 0 ) { ShowMessage(@"采è´ç±»åž‹ä¸èƒ½ä¸ºç©º"); return NO; diff --git a/XFFruit/ViewControllers/Purchase/Controllers/PurchaseDetailViewController.m b/XFFruit/ViewControllers/Purchase/Controllers/PurchaseDetailViewController.m index 92fc18792b17f56d135641177fbb614ebd872429..8b4795e83e882f60de08800441986517dd99e485 100644 --- a/XFFruit/ViewControllers/Purchase/Controllers/PurchaseDetailViewController.m +++ b/XFFruit/ViewControllers/Purchase/Controllers/PurchaseDetailViewController.m @@ -43,7 +43,7 @@ typedef enum : NSUInteger { @property (nonatomic,strong)UILabel *checkNameLabel; @property (nonatomic,strong)UILabel *stateLabel; @property (nonatomic,strong)UILabel *lastModifyNameLabel; - +@property (nonatomic, strong) UILabel *purchaserLabel; @property (nonatomic,strong)UILabel *typeLabel; @property (nonatomic,strong)UILabel *vendorNameLabel; @property (nonatomic,strong)UILabel *vendorIsSureLabel; @@ -302,7 +302,7 @@ typedef enum : NSUInteger { } - (void)createPurchaseView{ - _leftArr = @[@"å•å·:",@"采è´é€šçŸ¥å•:",@"创建人:",@"状æ€:",@"类型:",@"供应商:",@"供应商确认:",@"收货仓库:",@"其他费用:",@"总金é¢:",@"备注:"]; + _leftArr = @[@"å•å·:",@"采è´é€šçŸ¥å•:",@"创建人:",@"采è´å‘˜:",@"状æ€:",@"类型:",@"供应商:",@"供应商确认:",@"收货仓库:",@"其他费用:",@"总金é¢:",@"备注:"]; _purchaseView= [[UIView alloc]initWithFrame:CGRectMake(0, TopMargin, ScreenSize.width, LeftHeight*_leftArr.count +LeftMargin)]; _purchaseView.backgroundColor = [UIColor whiteColor]; @@ -325,15 +325,18 @@ typedef enum : NSUInteger { self.noticeNumberLabel = rightLabel; }else if(i == 2){ self.createOperNameLabel = rightLabel; - }else if(i == 3){ + }else if (i == 3){ + self.purchaserLabel = rightLabel; + } + else if(i == 4){ self.stateLabel = rightLabel; - }else if(i == 4){ - self.typeLabel = rightLabel; }else if(i == 5){ - self.vendorNameLabel = rightLabel; + self.typeLabel = rightLabel; }else if(i == 6){ - self.vendorIsSureLabel = rightLabel; + self.vendorNameLabel = rightLabel; }else if(i == 7){ + self.vendorIsSureLabel = rightLabel; + }else if(i == 8){ self.warehouseLabel = rightLabel; }else if(i == _leftArr.count - 3){ self.otherPriceLabel = rightLabel; @@ -342,6 +345,7 @@ typedef enum : NSUInteger { }else if(i == _leftArr.count - 1){ rightLabel.numberOfLines = 0; self.noteLabel = rightLabel; + //rightLabel.backgroundColor = [UIColor redColor]; } [_purchaseView addSubview:rightLabel]; } @@ -383,6 +387,7 @@ typedef enum : NSUInteger { self.lastModifyNameLabel.text = [IBTCommon checkString:self.bill.lastModify_operName]; NSString *type = [self.bill.type isEqualToString:GXF_Critical] ? @"紧急" : @"普通"; self.typeLabel.text = type; + self.purchaserLabel.text = self.bill.purchaserName; self.vendorIsSureLabel.text = (self.bill.vendorConfirmTime.length > 0 && self.bill.vendorConfirmTime)? @"是":@"å¦"; self.warehouseLabel.text = [IBTCommon checkString:self.bill.receiveWrh_name]; self.otherPriceLabel.text = [self.bill.charge stringValue]; diff --git a/XFFruit/ViewControllers/Purchase/Models/PurchaseBill.h b/XFFruit/ViewControllers/Purchase/Models/PurchaseBill.h index 0ee968fb98301d4e5b26ff14054592be2166c794..d00aaee0aaa190954a07a40effd727e739df7cf0 100644 --- a/XFFruit/ViewControllers/Purchase/Models/PurchaseBill.h +++ b/XFFruit/ViewControllers/Purchase/Models/PurchaseBill.h @@ -34,6 +34,7 @@ @property (nonatomic,strong)NSString *lastModify_id;//最åŽä¿®æ”¹äººä»£ç @property (nonatomic,strong)NSString *lastModify_operName;//最åŽä¿®æ”¹äººåç§° @property (nonatomic,strong)NSString *type;//类型 +@property (nonatomic, strong) NSString *purchaserName;//采è´å‘˜åå— @property (nonatomic,strong)NSArray *products; @end diff --git a/XFFruit/ViewControllers/Purchase/Views/TopPurchaseView.h b/XFFruit/ViewControllers/Purchase/Views/TopPurchaseView.h index 2181237698790b667dc4473a6bf52accf4427a0c..049f094df284c6e85d4921c5b1556948fb045669 100644 --- a/XFFruit/ViewControllers/Purchase/Views/TopPurchaseView.h +++ b/XFFruit/ViewControllers/Purchase/Views/TopPurchaseView.h @@ -9,6 +9,7 @@ #import <UIKit/UIKit.h> #import "HPGrowingTextView.h" #import "PurchaseBill.h" +#import "SurveyUser.h" @protocol TopPurchaseViewDelegate <NSObject> - (void)hiddenKeyBoard; @@ -38,6 +39,7 @@ @property (nonatomic,strong)NSNumber *chargePurchase; @property (nonatomic,strong)NSString *remark; @property (nonatomic,strong)PurchaseBill *bill; +@property (nonatomic,strong)SurveyUser *selectPerson; @property (nonatomic,weak)id <TopPurchaseViewDelegate>delegate; diff --git a/XFFruit/ViewControllers/Purchase/Views/TopPurchaseView.m b/XFFruit/ViewControllers/Purchase/Views/TopPurchaseView.m index 50b1368c84b4be317324a59c86bcce42315839bb..5d85e82e63e25ac18ac1633686a14c17ebe88835 100644 --- a/XFFruit/ViewControllers/Purchase/Views/TopPurchaseView.m +++ b/XFFruit/ViewControllers/Purchase/Views/TopPurchaseView.m @@ -12,7 +12,9 @@ #import "ChooseVendorViewController.h" #import "ChooseTypeViewController.h" #import "ChooseWarehouseViewController.h" +#import "ChosePersonViewController.h" #import "Vendor.h" +#import "SurveyUser.h" #define LeftMargin 15 #define LeftWidth 80 #define SpaceHeight 10 @@ -45,7 +47,7 @@ { self.backgroundColor = XXFBgColor; _dataArr = [NSMutableArray array]; - NSArray *arr = @[@"采è´é€šçŸ¥:",@"类型:",@"供应商:",@"收货仓库:",@"其他费用:",@"总金é¢:",@"备注:"]; + NSArray *arr = @[@"采è´å‘˜:",@"类型:",@"供应商:",@"收货仓库:",@"其他费用:",@"总金é¢:",@"备注:"]; [_dataArr addObjectsFromArray:arr]; _tableView = [[UITableView alloc]initWithFrame:(CGRectMake(0, TopMargin,self.frame.size.width, self.frame.size.height - TopMargin)) style:(UITableViewStylePlain)]; @@ -69,7 +71,7 @@ cell = [[SurveyCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID]; tableView.separatorStyle = UITableViewCellSeparatorStyleNone; cell.selectionStyle = UITableViewCellSelectionStyleNone; - if (indexPath.row > 0 && indexPath.row < 4) { + if (indexPath.row >= 0 && indexPath.row < 4) { cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; } [self createViewInCell:cell indexPath:indexPath]; @@ -104,10 +106,10 @@ self.remarkTextView.isScrollable = YES; self.remarkTextView.font = GXF_FIFTEENTEN_SIZE; self.remarkTextView.textAlignment = NSTextAlignmentRight; - self.remarkTextView.delegate = self; + self.remarkTextView.delegate = self; self.remarkTextView.returnKeyType = UIReturnKeyDone; self.remarkTextView.placeholder = @"输入备注内容"; - + [cell.contentView addSubview:self.remarkTextView]; }else{ UILabel *contentLabel = [[UILabel alloc]initWithFrame:(CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-15, TableHeight))]; @@ -116,7 +118,7 @@ contentLabel.font = GXF_FIFTEENTEN_SIZE; [cell.contentView addSubview:contentLabel]; if (indexPath.row == 0) { - contentLabel.text = @"采è´é€šçŸ¥å•å·"; + contentLabel.text = @"选择采è´å‘˜"; self.purchaseNoticeLabel = contentLabel; }else if(indexPath.row == 1){ @@ -140,7 +142,7 @@ label.textColor = GXF_CONTENT_COLOR; label.font = GXF_FIFTEENTEN_SIZE; [cell.contentView addSubview:label]; - + } } [self prepareDataInCell]; @@ -253,6 +255,19 @@ self.selectWarehouse = self.receiveWrh_uuid; }; [self.delegate pushNextViewController:wvc]; + }else if (indexPath.row == 0){ + + ChosePersonViewController *cvc = [ChosePersonViewController new]; + cvc.choseBaseInfo = ^(NSArray *users){ + if(users.count == 1){ + self.selectPerson = users[0]; + self.purchaseNoticeLabel.text = _selectPerson.userName; + self.purchaseNoticeLabel.textColor = GXF_CONTENT_COLOR; + } + }; + cvc.isMoreChose = NO; + [self.delegate pushNextViewController:cvc]; + } } - (BOOL)growingTextViewShouldReturn:(HPGrowingTextView *)growingTextView{ diff --git a/XFFruit/ViewControllers/PurchaseNotice/Controllers/PurchaseNoticeViewController.m b/XFFruit/ViewControllers/PurchaseNotice/Controllers/PurchaseNoticeViewController.m index 1d49eb11e48347d365e6becdce2e7719a21d01c2..9d61e2c2288fdfda3fb9ec1b310e31eb71bfe3c0 100644 --- a/XFFruit/ViewControllers/PurchaseNotice/Controllers/PurchaseNoticeViewController.m +++ b/XFFruit/ViewControllers/PurchaseNotice/Controllers/PurchaseNoticeViewController.m @@ -65,10 +65,10 @@ typedef enum : NSUInteger { self.dataArr = [NSMutableArray array]; } - (void)getData{ - [ICRUserUtil sharedInstance].needFresh = NO; - __weak typeof(self)weakSelf = self; - void(^succ)(id) = ^(id data) { - [IBTLoadingView hideHUDWithText:nil]; + [ICRUserUtil sharedInstance].needFresh = NO; + __weak typeof(self)weakSelf = self; + void(^succ)(id) = ^(id data) { + [IBTLoadingView hideHUDWithText:nil]; __strong __typeof(weakSelf)strongSelf = weakSelf; [strongSelf fetchtPuchaseList:data]; }; @@ -77,7 +77,7 @@ typedef enum : NSUInteger { [IBTLoadingView showTips:data]; }; [IBTLoadingView showProgressLabel:@"æ£åœ¨åŠ è½½..."]; -// ICRUserUtil *userUtil = [ICRUserUtil sharedInstance]; + // ICRUserUtil *userUtil = [ICRUserUtil sharedInstance]; NSMutableArray *orderArr =[NSMutableArray array]; if (self.orderDirection.length > 0 && ![self.orderDirection isEqualToString:@"none"]) {