Переглянути джерело

销售单时间查默认最近7天

jiangyh 1 рік тому
батько
коміт
7399573157

+ 2 - 2
IBOSSmini.xcodeproj/project.pbxproj

@@ -5662,7 +5662,7 @@
 				GCC_PREFIX_HEADER = "IBOSSmini/IBOSSmini-Prefix.pch";
 				INFOPLIST_FILE = "IBOSSmini/IBOSSmini-Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = iBossmini;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/IBOSSmini/ZBarSDK/Headers",
@@ -5713,7 +5713,7 @@
 				GCC_PREFIX_HEADER = "IBOSSmini/IBOSSmini-Prefix.pch";
 				INFOPLIST_FILE = "IBOSSmini/IBOSSmini-Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = iBossmini;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/IBOSSmini/ZBarSDK/Headers",

BIN
IBOSSmini.xcodeproj/project.xcworkspace/xcuserdata/kedong.xcuserdatad/UserInterfaceState.xcuserstate


BIN
IBOSSmini/Business/SalesSlip/.DS_Store


+ 2 - 0
IBOSSmini/Business/SalesSlip/Cell/SalesSlipSearchCell.h

@@ -34,4 +34,6 @@
 @property (strong,nonatomic) NSString *tempStartDate;
 @property (strong,nonatomic) NSString *tempEndDate;
 @property (strong,nonatomic) NSString *invoiceStatus;
+
+@property (nonatomic,strong)  NSMutableDictionary *mutDict;
 @end

+ 13 - 0
IBOSSmini/Business/SalesSlip/Cell/SalesSlipSearchCell.m

@@ -340,6 +340,19 @@
 - (void)updateCellWithModel:(SideSlipModel *__autoreleasing *)model
                   indexPath:(NSIndexPath *)indexPath{
     self.regionModel = *model;
+    
+    _mutDict = [NSMutableDictionary dictionaryWithDictionary:_regionModel.customDict];
+    SalesSlipSearchModel *searchModel = [[SalesSlipSearchModel alloc] init];
+   NSString *startDateStr= [DateFormat getDateBefore:7];
+    NSString *endDataStr=[DateFormat getCurrentDate];
+     [_startDateBtn setTitle:startDateStr forState:UIControlStateNormal];
+   _startDate= _startDateBtn.titleLabel.text;
+    [_endDateBtn setTitle:endDataStr forState:UIControlStateNormal];
+    _endDate= _endDateBtn.titleLabel.text;
+    searchModel.startDate=_startDate;
+    searchModel.endDate=_endDate;
+     [_mutDict setValue:searchModel forKey:SEARCH_RANGE_MODEL];
+    self.regionModel.customDict = _mutDict;
 }
 
 

+ 3 - 0
IBOSSmini/Business/SalesSlip/Controller/SalesSlipListVC.m

@@ -25,6 +25,8 @@ RefreshTableViewDelegate>
 @synthesize vCustomTableView;
 - (void)viewDidLoad {
     [super viewDidLoad];
+    _endDate =  [DateFormat getCurrentDate];
+    _startDate = [DateFormat getDateBefore:7];
     [self loadNavStyle];
     [self initUI];
     [self initSlideSlip];
@@ -123,6 +125,7 @@ RefreshTableViewDelegate>
     [dict setObject:kkUserCode forKey:@"UserCode"];
     [dict setObject:kkUserPwd forKey:@"UserPassword"];
     [dict setObject:kkSessionKey forKey:@"SessionKey"];
+    [dict setObject:kkSessionKey forKey:@"SessionKey"];
     [dict setObject:_salesNo== nil?@"":_salesNo forKey:@"SalesNo"];
     [dict setObject:_goodsCode == nil?@"":_goodsCode forKey:@"Code"];
     [dict setObject:_customerName == nil?@"":_customerName forKey:@"CustomerName"];