Skip to content

O
Opple-iOS
Commit 343aaf5a authored by 勾芒's avatar 勾芒
Browse files
Options

caoyunxiao

parent d7b136f4
Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 65 deletions
Lighting/Class/AllpriceTableViewCell.m
View file @ 343aaf5a
......@@ -27,10 +27,10 @@
for (ShopcarModel *model in _goodsAllprice) {
allNumber += model.goodsNum;
allPrice += [model.goods.costPrice integerValue];
allPrice += [model.goods.costPrice integerValue] *model.goodsNum;
}
self.goodsAllNumber.text = [NSString stringWithFormat:@"%ld",allNumber];
self.goodsAllPrice.text = [NSString stringWithFormat:@"%ld",allPrice*allNumber];
self.goodsAllPrice.text = [NSString stringWithFormat:@"%ld",allPrice];
}
......@@ -47,8 +47,8 @@
for (TOOrderdetailEntity *model in _goodsArray) {
allNumber += [model.goodsPrice integerValue];
allPrice += [model.goodsNum integerValue];
allNumber += [model.goodsNum integerValue];
allPrice += [model.goodsPrice integerValue]*[model.goodsNum intValue];
}
self.goodsAllNumber.text = [NSString stringWithFormat:@"%ld",allNumber];
self.goodsAllPrice.text = [NSString stringWithFormat:@"￥%ld",allPrice];
......
Lighting/Class/ClientViewController.m
View file @ 343aaf5a
......@@ -64,10 +64,10 @@
self.navigationController.interactivePopGestureRecognizer.enabled = NO;
}
//下拉刷新
MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
ConsumerQueryCondition *condition = [[ConsumerQueryCondition alloc]init];
condition.resellerCodeEquals = [[Shoppersmanager manager].Shoppers.employee.currentDepart orgCode];
DataPage *page = [[DataPage alloc]init];
page.page = 1;
condition.page = page;
......@@ -156,6 +156,7 @@
[self.CustomerresultArray removeAllObjects];
}
NSDictionary *datas = returnValue[@"data"];
ConsumerPageResult *Customerresult = [[ConsumerPageResult alloc]initWithDictionary:datas error:nil];
self.totalPages = [datas[@"totalpages"] intValue];
for (TOConsumerEntity *objc in Customerresult.results) {
......@@ -418,6 +419,10 @@
self.customerAddress.enabled = NO;
self.phoneNumberField.enabled = NO;
self.companyNameField.enabled = NO;
[self SetupUserShoppingCarNumberRequest];
[self SetupUserRequest];
[self ChangeCustomerName];
}
else
{
......@@ -477,24 +482,41 @@
[self ErrorMBProgressView:@"搜索信息不能为空"];
return;
}
[self CreateMBProgressHUDLoding];
ConsumerQueryCondition *searchCustomer = [[ConsumerQueryCondition alloc]init];
DataPage *page = [[DataPage alloc]init];
page.page = 0;
page.page = 1;
page.rows = 10;
searchCustomer.page = page;
searchCustomer.nameEquals = self.searchPersonInformationField.text;
searchCustomer.mobileEquals = self.searchPersonInformationField.text;
//request
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/consumer/query"] WithRequestType:0 WithParameter:searchCustomer WithReturnValueBlock:^(id returnValue) {
[self RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
ConsumerPageResult *result = [[ConsumerPageResult alloc]initWithDictionary:returnValue error:nil];
ConsumerPageResult *result = [[ConsumerPageResult alloc]initWithDictionary:returnValue[@"data"] error:nil];
[self.CustomerresultArray removeAllObjects];
for (TOConsumerEntity *model in result.results) {
[self.CustomerresultArray addObject:model];
for (TOConsumerEntity *objc in result.results) {
MyclientEntityModel *myclientModel = [[MyclientEntityModel alloc]init];
myclientModel.fid = objc.fid;
myclientModel.createName = objc.createName;
myclientModel.createBy = objc.createBy;
myclientModel.createDate = objc.createDate;
myclientModel.sysOrgCode = objc.sysOrgCode;
myclientModel.name = objc.name;
myclientModel.mobile = objc.mobile;
myclientModel.province = objc.province;
myclientModel.city = objc.city;
myclientModel.country = objc.country;
myclientModel.address = objc.address;
myclientModel.picture = objc.picture;
myclientModel.lastVisitedTime = objc.lastVisitedTime;
[self.CustomerresultArray addObject:myclientModel];
}
[self.informationTableview reloadData];
}
......
Lighting/Class/CommodityListTableViewCell.m
View file @ 343aaf5a
......@@ -28,8 +28,6 @@
NSInteger price = [_model.goods.costPrice integerValue];
NSInteger allPrice = number*price;
self.totalPrice.text = [NSString stringWithFormat:@"%ld",allPrice];
}
......@@ -39,9 +37,11 @@
{
_orderDetailslist = orderDetailslist;
[self.goodsHeader sd_setImageWithURL:[NSURL URLWithString:_orderDetailslist.goodsBrand] placeholderImage:ReplaceImage];
self.goodsNumber.text = _orderDetailslist.goodsNum;
self.clinchPrice.text = [_orderDetailslist.goodsPrice stringValue];
self.totalPrice.text = [_orderDetailslist.goodsTotalPrice stringValue];
self.goodsNumber.text = [NSString stringWithFormat:@"数量 X%@",_orderDetailslist.goodsNum];
self.clinchPrice.text = [NSString stringWithFormat:@"成交价 ￥%@",[_orderDetailslist.goodsPrice stringValue]];
//小计
NSInteger totalPrice = [_orderDetailslist.goodsNum integerValue] * [_orderDetailslist.goodsPrice integerValue];
self.totalPrice.text = [NSString stringWithFormat:@"￥%ld",totalPrice];
self.goodsName.text = _orderDetailslist.goodsSpec;
......
Lighting/Class/CustomerOrderTableViewCell.h
View file @ 343aaf5a
......@@ -21,7 +21,7 @@
*
* @param cellindex cell下标
*/
- (void)undoOrderButtonClick:(NSInteger)cellindex;
- (void)undoOrderButtonClick:(NSInteger)cellindex WithButtonCurrent:(NSString *)title;
@end
......
Lighting/Class/CustomerOrderTableViewCell.m
View file @ 343aaf5a
......@@ -53,9 +53,12 @@
goodsAllprice += [goodslist.goodsTotalPrice integerValue];
}
self.orderTotalPrice.text = [NSString stringWithFormat:@"%ld",goodsAllprice];
if ([_model.order.orderState isEqualToString:@"002"]) {
//撤销订单、去支付
if ([_model.order.orderState isEqualToString:@"002"] || [_model.order.orderState isEqualToString:@"001"]) {
self.delecteOrder.hidden = NO;
if ([_model.order.orderState isEqualToString:@"001"]) {
[self.delecteOrder setTitle:@"去支付" forState:UIControlStateNormal];
}
}else
{
self.delecteOrder.hidden = YES;
......@@ -83,9 +86,9 @@
#pragma mark -撤销订单
- (IBAction)delecteOrderButtonClick:(UIButton *)sender {
if ([self.delegate respondsToSelector:@selector(undoOrderButtonClick:)]) {
if ([self.delegate respondsToSelector:@selector(undoOrderButtonClick:WithButtonCurrent:)]) {
[self.delegate undoOrderButtonClick:_cellIndex];
[self.delegate undoOrderButtonClick:_cellIndex WithButtonCurrent:sender.currentTitle];
}
}
......
Lighting/Class/CustomerOrderViewController.m
View file @ 343aaf5a
......@@ -8,7 +8,7 @@
#import "CustomerOrderViewController.h"
#import "CustomerOrderTableViewCell.h"
#import "OrderdetailsViewController.h"
@interface CustomerOrderViewController ()<UITableViewDataSource,UITableViewDelegate,ReturnTableviewcellIndexpathdelegate,UITextFieldDelegate,undoOrderDelegate>
/**
......@@ -75,7 +75,7 @@
Neworder.guideId = [Shoppersmanager manager].Shoppers.employee.fid;
allOrder.datapage = page;
allOrder.order = Neworder;
self.indexPage = 0;
self.indexPage = 1;
[self getGuideAllcustomerOrder:YES WithorderBill:allOrder];
}];
headerRefresh.stateLabel.hidden = YES;
......@@ -190,6 +190,22 @@
return 260;
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
OrderdetailsViewController *orderdetails = [storyboard instantiateViewControllerWithIdentifier:@"orderdetails"];
TOOrderEntity *model = [[self.datasArray objectAtIndex_opple:indexPath.row] order];
orderdetails.orderCode = model.orderNumber;
orderdetails.sectionTitle = @[@"订单信息",@"客户信息",@"收货信息",@"商品信息",@"附件信息"];
orderdetails.isShowattachment = YES;
if ([model.orderState isEqualToString:@"006"]) {
orderdetails.isShowPayButton = YES;
orderdetails.isShowPrintButton = YES;
}
[self.navigationController pushViewController:orderdetails animated:YES];
}
#pragma mark -弹出popover视图控制器
......@@ -309,32 +325,39 @@
*
* @param cellindex cell下标
*/
- (void)undoOrderButtonClick:(NSInteger)cellindex
- (void)undoOrderButtonClick:(NSInteger)cellindex WithButtonCurrent:(NSString *)title
{
[self CreateMBProgressHUDLoding];
OrderBill *model = [self.datasArray objectAtIndex_opple:cellindex];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@%@/%@/%@",ServerAddress,@"/order/updateOrderState/",model.order.orderNumber,model.order.orderState,@"005"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[self RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if ([title isEqualToString:@"撤销订单"]) {
OrderBill *model = [self.datasArray objectAtIndex_opple:cellindex];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@%@/%@/%@",ServerAddress,@"/order/updateOrderState/",model.order.orderNumber,model.order.orderState,@"005"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[self SuccessMBProgressView:@"撤销成功"];
model.order.orderState = @"005";
NSIndexPath *indexapath = [NSIndexPath indexPathForRow:cellindex inSection:0];
[self.customerOrderTableView reloadRowsAtIndexPaths:@[indexapath] withRowAnimation:UITableViewRowAnimationLeft];
}
else
{
[self ErrorMBProgressView:returnValue[@"message"]];
}
[self RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
[self SuccessMBProgressView:@"撤销成功"];
model.order.orderState = @"005";
NSIndexPath *indexapath = [NSIndexPath indexPathForRow:cellindex inSection:0];
[self.customerOrderTableView reloadRowsAtIndexPaths:@[indexapath] withRowAnimation:UITableViewRowAnimationLeft];
}
else
{
[self ErrorMBProgressView:returnValue[@"message"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
} WithFailureBlock:^(id error) {
[self RemoveMBProgressHUDLoding];
}];
} WithErrorCodeBlock:^(id errorCodeValue) {
}else if ([title isEqualToString:@"去支付"])
{
} WithFailureBlock:^(id error) {
[self RemoveMBProgressHUDLoding];
}];
}
}
......
Lighting/Class/InformationTableViewCell.m
View file @ 343aaf5a
......@@ -24,7 +24,7 @@
self.personName.text = _model.name;
self.personPhoneNumber.text = _model.mobile;
self.recentTime.text = _model.lastVisitedTime;
self.Guideservices.text = _model.createName;
self.Guideservices.text = [[Shoppersmanager manager].Shoppers.employee realName];
self.personLocation.text = _model.address;
self.setCurrentCustomer.selected = _model.selectedState;
}
......
Lighting/Class/OrderInformationTableViewCell.m
View file @ 343aaf5a
......@@ -21,7 +21,7 @@
{
_model = model;
self.orderNumber.text = _model.order.orderNumber;
self.orderTime.text = _model.order.orderTime;
self.orderTime.text = _model.order.createDate;
self.orderStatus.text = [BaseViewController ReturnOrderStateTitleWithStateCode:[_model.order.orderState integerValue] withPoint:CGPointMake(self.orderStatus.frame.origin.x, self.orderStatus.frame.origin.y) WithCode:0];
self.orderStatus.textColor = [BaseViewController ReturnOrderStateTitleWithStateCode:[_model.order.orderState integerValue] withPoint:CGPointMake(self.orderStatus.frame.origin.x, self.orderStatus.frame.origin.y) WithCode:1];
self.operatorName.text = _model.employee.realName;
......
Lighting/Class/PersonInformationTableViewCell.h
View file @ 343aaf5a
......@@ -58,7 +58,10 @@
@property (nonatomic,strong) TOConsumerEntity *model;
/**
* 客户地址
*/
@property (weak, nonatomic) IBOutlet UILabel *customerAddress;
......
Lighting/Class/PersonInformationTableViewCell.m
View file @ 343aaf5a
......@@ -14,16 +14,25 @@
[super awakeFromNib];
// Initialization code
[self.customerHeader sd_setImageWithURL:[NSURL URLWithString:[Customermanager manager].customerName] placeholderImage:REPLACEIMAGE];
self.customerName.text = [Customermanager manager].customerName;
self.companyName.text = [Customermanager manager].customerName;
// self.emailName.text = [Customermanager manager]
self.companyLocation.text = [Customermanager manager].companyName;
self.customerPhoneNumber.text = [Customermanager manager].customerPhoneNumber;
[self.customerHeader sd_setImageWithURL:[NSURL URLWithString:[[Customermanager manager] customerID]] placeholderImage:REPLACEIMAGE];
self.customerName.text = [[Customermanager manager] customerName];
self.companyName.text = [[Customermanager manager] customerName];
self.companyLocation.text = [[Customermanager manager] cutomerAddress];
self.customerPhoneNumber.text = [[Customermanager manager] customerPhoneNumber];
}
- (void)setModel:(TOConsumerEntity *)model
{
_model = model;
[self.customerHeader sd_setImageWithURL:[NSURL URLWithString:_model.picture] placeholderImage:REPLACEIMAGE];
self.customerName.text = _model.name;
self.companyName.text = _model.name;
self.customerAddress.text = _model.address;
self.customerPhoneNumber.text = _model.mobile;
}
......
Lighting/Class/SceneLibraryViewController.m
View file @ 343aaf5a
......@@ -104,11 +104,13 @@
DataPage *page = [[DataPage alloc]init];
if (self.indexPage ++ > self.totalPages) {
[self.seceneLibararyCollectionView.mj_footer endRefreshingWithNoMoreData];
}else
{
page.page = self.indexPage ++;
page.rows = 10;
condition.page = page;
[self getSceneLibrarydatas:condition isRemove:NO];
}
page.page = self.indexPage ++;
page.rows = 10;
condition.page = page;
[self getSceneLibrarydatas:condition isRemove:NO];
}];
}
......
Lighting/Class/Shoppingcart/GenerateOrdersViewController.m
View file @ 343aaf5a
......@@ -333,7 +333,7 @@
OrderBill *order = [[OrderBill alloc]init];
//分页
DataPage *page = [[DataPage alloc]init];
page.page = 0;
page.page = 1;
order.datapage = page;
//收货地址
......@@ -366,7 +366,7 @@
orderGoods.goodsSpec = model.goods.spec;
orderGoods.goodsName = model.goods.name;
orderGoods.goodsBrand = model.goods.brandId;
orderGoods.goodsNum = model.goods.number;
orderGoods.goodsNum = [NSString stringWithFormat:@"%d",model.goodsNum];
orderGoods.goodsPrice = model.goods.costPrice;
orderGoods.remark = model.goods.spec;
orderGoods.goodsUnit = model.goods.unit;
......
Lighting/Class/Shoppingcart/ShoppingViewController.m
View file @ 343aaf5a
......@@ -292,8 +292,7 @@
model.isSelected = YES;
}
[self.settlementButton setTitle:[NSString stringWithFormat:@"去结算(%ld)",self.shopResponseArray.count] forState:UIControlStateNormal];
//计算总金额
[self CalculateSelectedGoodsAllprice];
}else
{
//取消全部选中
......@@ -307,6 +306,8 @@
}
[self.settlementButton setTitle:@"去结算(0)" forState:UIControlStateNormal];
}
//计算总金额
[self CalculateSelectedGoodsAllprice];
}
#pragma mark -计算选中后的商品总金额
......
Lighting/Class/Tabbar/CustomTabbarController.m
View file @ 343aaf5a
......@@ -189,7 +189,26 @@
//购物车
case 103:
self.selectedIndex = 8;
//必须设置当前客户才能跳转到购物车
if (![Shoppersmanager manager].currentCustomer) {
MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view.window animated:YES];
// Set the custom view mode to show any view.
hud.mode = MBProgressHUDModeCustomView;
// Set an image view with a checkmark.
UIImage *image = [[UIImage imageNamed:@"Error"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
hud.customView = [[UIImageView alloc] initWithImage:image];
// Looks a bit nicer if we make it square.
hud.square = YES;
// Optional label text.
hud.activityIndicatorColor = kMainBlueColor;
hud.labelFont = [UIFont systemFontOfSize:12];
hud.labelText = @"必须设置当前客户";
[hud hide:YES afterDelay:1];
}else
{
self.selectedIndex = 8;
}
break;
......
Lighting/Lighting/StoryboardwithCYX.storyboard
View file @ 343aaf5a
......@@ -880,6 +880,7 @@
</tableViewCellContentView>
<connections>
<outlet property="companyName" destination="oql-Lw-B2F" id="BuX-in-oFM"/>
<outlet property="customerAddress" destination="TDA-d4-cxP" id="RZW-69-UX8"/>
<outlet property="customerHeader" destination="Zdg-s0-xfD" id="Q2Q-ff-q8T"/>
<outlet property="customerName" destination="86V-EZ-5eX" id="Paa-1D-l0z"/>
<outlet property="customerPhoneNumber" destination="A8m-f4-VJE" id="2iI-No-miD"/>
......@@ -953,8 +954,8 @@
<rect key="frame" x="10" y="4" width="70" height="70"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="吊灯" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="aGq-4q-dKu">
<rect key="frame" x="102" y="18" width="72" height="42"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="吊灯" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="aGq-4q-dKu">
<rect key="frame" x="102" y="5" width="100" height="70"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
......@@ -2062,14 +2063,14 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥25600" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dZX-LS-ay8">
<rect key="frame" x="607" y="14" width="130" height="21"/>
<rect key="frame" x="611" y="14" width="130" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="r7E-5t-6TA">
<rect key="frame" x="445" y="15" width="77" height="21"/>
<rect key="frame" x="443" y="15" width="77" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
......
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