赊单查询增加筛选

YHB_Prj/YHB_Prj.xcodeproj/project.pbxproj

@@ -52,7 +52,6 @@
 		AB3877AA1B97D7F700DD7468 /* YDCXCell.m in Sources */ = {isa = PBXBuildFile; fileRef = AB3877A81B97D7F700DD7468 /* YDCXCell.m */; };
 		AB3877AB1B97D7F700DD7468 /* YDCXCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB3877A91B97D7F700DD7468 /* YDCXCell.xib */; };
 		AB3877AE1B97DF8200DD7468 /* YDCXManager.m in Sources */ = {isa = PBXBuildFile; fileRef = AB3877AD1B97DF8200DD7468 /* YDCXManager.m */; };
-		AB3877B11B97DFD300DD7468 /* YDCXMode.m in Sources */ = {isa = PBXBuildFile; fileRef = AB3877B01B97DFD300DD7468 /* YDCXMode.m */; };
 		AB40EAB51B8BF97500DE5ED7 /* ClerkViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AB40EAB41B8BF97500DE5ED7 /* ClerkViewController.m */; };
 		AB40EABC1B8BFA0100DE5ED7 /* ClerkTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = AB40EABA1B8BFA0100DE5ED7 /* ClerkTableViewCell.m */; };
 		AB40EABD1B8BFA0100DE5ED7 /* ClerkTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB40EABB1B8BFA0100DE5ED7 /* ClerkTableViewCell.xib */; };
@@ -320,8 +319,6 @@
 		AB3877A91B97D7F700DD7468 /* YDCXCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = YDCXCell.xib; sourceTree = "<group>"; };
 		AB3877AC1B97DF8200DD7468 /* YDCXManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YDCXManager.h; sourceTree = "<group>"; };
 		AB3877AD1B97DF8200DD7468 /* YDCXManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YDCXManager.m; sourceTree = "<group>"; };
-		AB3877AF1B97DFD300DD7468 /* YDCXMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YDCXMode.h; sourceTree = "<group>"; };
-		AB3877B01B97DFD300DD7468 /* YDCXMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YDCXMode.m; sourceTree = "<group>"; };
 		AB40EAB31B8BF97500DE5ED7 /* ClerkViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClerkViewController.h; sourceTree = "<group>"; };
 		AB40EAB41B8BF97500DE5ED7 /* ClerkViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClerkViewController.m; sourceTree = "<group>"; };
 		AB40EAB91B8BFA0100DE5ED7 /* ClerkTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClerkTableViewCell.h; sourceTree = "<group>"; };
@@ -889,8 +886,6 @@
 				AB3877AC1B97DF8200DD7468 /* YDCXManager.h */,
 				AB3877AD1B97DF8200DD7468 /* YDCXManager.m */,
 				ABAAFB661B996B1B0012D1C6 /* Model */,
-				AB3877AF1B97DFD300DD7468 /* YDCXMode.h */,
-				AB3877B01B97DFD300DD7468 /* YDCXMode.m */,
 			);
 			path = Yudanchaxun;
 			sourceTree = "<group>";
@@ -1782,7 +1777,6 @@
 				FFF391961B846F58007DC652 /* AFHTTPSessionManager.m in Sources */,
 				AB9F43E91B92E45900914C85 /* SettingViewController.m in Sources */,
 				AB2579361B8F02010015039A /* IQUIView+Hierarchy.m in Sources */,
-				AB3877B11B97DFD300DD7468 /* YDCXMode.m in Sources */,
 				FF4DFCF51B856B9600617660 /* SCach.m in Sources */,
 				FF4DFCF41B856B9600617660 /* NSFileManager_Additions.m in Sources */,
 				ABAACA071B95B5EC00305080 /* SupplierManage.m in Sources */,

YHB_Prj/YHB_Prj/FourthViewController/ClerkVC/ClerkTableViewCell.xib

@@ -3,6 +3,7 @@
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -14,7 +15,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mY2-XP-BhI">
+                    <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mY2-XP-BhI">
                         <rect key="frame" x="0.0" y="99" width="320" height="0.5"/>
                         <color key="backgroundColor" red="0.86274509799999999" green="0.86274509799999999" blue="0.8606124047" alpha="1" colorSpace="calibratedRGB"/>
                     </view>
@@ -79,6 +80,10 @@
                         <nil key="highlightedColor"/>
                     </label>
                 </subviews>
+                <constraints>
+                    <constraint firstItem="mY2-XP-BhI" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" constant="-16" id="8if-Wd-Ofq"/>
+                    <constraint firstAttribute="trailingMargin" secondItem="mY2-XP-BhI" secondAttribute="trailing" constant="-41" id="NCP-b9-53g"/>
+                </constraints>
             </tableViewCellContentView>
             <connections>
                 <outlet property="jobLabel" destination="O33-sA-fdL" id="wGg-ht-GQm"/>

YHB_Prj/YHB_Prj/FourthViewController/GateVC/GateDetailVC/GateDetailViewController.m

@@ -237,11 +237,11 @@ - (void)setIsEdit:(BOOL)isEdit
 //        self.locaBtn.enabled = NO;
         for (int i=0; i<_titleArray.count; i++)
         {
-            if (i!=FieldTypeLoca)
-            {
+//            if (i!=FieldTypeLoca)
+//            {
                 UITextField *textfield = (UITextField *)[_bgScrollView viewWithTag:100+i];
                 textfield.enabled = NO;
-            }
+//            }
             UIImageView *imgView = (UIImageView *)[_bgScrollView viewWithTag:300+i];
             imgView.hidden = YES;
         }

YHB_Prj/YHB_Prj/FourthViewController/SupplierVC/SupplierTableViewCell.xib

@@ -3,6 +3,7 @@
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -14,7 +15,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="u8z-iy-IU6">
+                    <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="u8z-iy-IU6">
                         <rect key="frame" x="0.0" y="139" width="320" height="1"/>
                         <color key="backgroundColor" red="0.86274509799999999" green="0.86274509799999999" blue="0.8606124047" alpha="1" colorSpace="calibratedRGB"/>
                     </view>
@@ -91,6 +92,10 @@
                         <nil key="highlightedColor"/>
                     </label>
                 </subviews>
+                <constraints>
+                    <constraint firstItem="u8z-iy-IU6" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" constant="-16" id="EwY-Ij-HAd"/>
+                    <constraint firstAttribute="trailingMargin" secondItem="u8z-iy-IU6" secondAttribute="trailing" constant="-41" id="Rk5-Zg-f7J"/>
+                </constraints>
             </tableViewCellContentView>
             <connections>
                 <outlet property="chuanzhenLabel" destination="Krk-bC-NI2" id="HS2-ic-alN"/>

YHB_Prj/YHB_Prj/FourthViewController/Tenant/TenantViewController.m

@@ -221,11 +221,11 @@ - (void)setIsEdit:(BOOL)isEdit
 //        self.locaBtn.enabled = NO;
         for (int i=0; i<_titleArray.count; i++)
         {
-            if (i!=FieldTypeLoca)
-            {
+//            if (i!=FieldTypeLoca)
+//            {
                 UITextField *textfield = (UITextField *)[_bgScrollView viewWithTag:100+i];
                 textfield.enabled = NO;
-            }
+//            }
             UIImageView *imgView = (UIImageView *)[_bgScrollView viewWithTag:300+i];
             imgView.hidden = YES;
         }

YHB_Prj/YHB_Prj/Jicunchaxun/JCCXSXViewController.m

@@ -12,6 +12,7 @@
 #import "HYGLViewController.h"
 #import "VipInfoMode.h"
 #import "HYCell.h"
+#import "YDCXManager.h"
 @interface JCCXSXViewController ()
 {
      __weak JCCXSXViewController *weakself;
@@ -28,6 +29,9 @@ @interface JCCXSXViewController ()
 @property (strong, nonatomic) NSString *strStartTime;
 @property (strong, nonatomic) NSString *strEndTime;
 @property (strong, nonatomic) NSString *strVipeId;
+
+@property (strong, nonatomic) YDCXManager *YDCXmanager;
+@property (strong, nonatomic) void(^myPopBlock)(void);
 @end
 
 @implementation JCCXSXViewController
@@ -56,6 +60,12 @@ - (void)setJCCXManager:(JCCXManager *)aManager
 {
     self.manager = aManager;
 }
+
+- (void)setYDCXManager:(YDCXManager *)aManager andPopBlock:(void(^)(void))aPopBlock
+{
+    _YDCXmanager = aManager;
+    _myPopBlock = aPopBlock;
+}
 #pragma mark 进入日期页面
 - (void)dataBtItem:(UIButton *)abt
 {
@@ -159,6 +169,25 @@ - (void)okButtonItem
             [self.manager setCurrentVipid:_strVipeId];
         }
     }
+    if (_YDCXmanager)
+    {
+        if (self.strEndTime&& _strEndTime.length > 0)
+        {
+            [_YDCXmanager setEndTime:_strEndTime];
+        }
+        if(self.strStartTime &&self.strStartTime.length>0)
+        {
+            [_YDCXmanager setStartTime:self.strStartTime];
+        }
+        if(self.strVipeId)
+        {
+            [_YDCXmanager setCurrentVipid:_strVipeId];
+        }
+    }
+    if (_myPopBlock) {
+        _myPopBlock();
+        [self.navigationController popViewControllerAnimated:YES];
+    }
 }
 
 - (void)didReceiveMemoryWarning {

YHB_Prj/YHB_Prj/Yudanchaxun/YDCXCell.m

@@ -22,8 +22,8 @@ +(CGFloat)heightForCell
 
 - (void)setCellWithMode:(DJYDCXRows *)aMode
 {
-    self.labelMoney.text = [NSString stringWithFormat:@"%f", aMode.realMoney];
-    self.labelNum.text = [NSString stringWithFormat:@"%f", aMode.rowsIdentifier];
+    self.labelMoney.text = [NSString stringWithFormat:@"%.2f", aMode.realMoney];
+    self.labelNum.text = [NSString stringWithFormat:@"%d", (int)aMode.rowsIdentifier];
     self.labelOdd.text = aMode.srl;
     NSString *proStr;
     if ([aMode.profitMoney isKindOfClass:[NSString class]]) proStr = aMode.profitMoney;

YHB_Prj/YHB_Prj/Yudanchaxun/YDCXCell.xib

@@ -3,6 +3,7 @@
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -14,7 +15,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3dv-Qy-IrM">
+                    <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3dv-Qy-IrM">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="31"/>
                         <color key="backgroundColor" red="0.85098039215686272" green="0.8666666666666667" blue="0.83529411764705885" alpha="1" colorSpace="calibratedRGB"/>
                     </view>
@@ -102,11 +103,17 @@
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="KhN-oF-mDJ">
+                    <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="KhN-oF-mDJ">
                         <rect key="frame" x="0.0" y="171.5" width="320" height="0.5"/>
                         <color key="backgroundColor" red="0.85098039219999999" green="0.86666666670000003" blue="0.83529411760000005" alpha="1" colorSpace="calibratedRGB"/>
                     </view>
                 </subviews>
+                <constraints>
+                    <constraint firstAttribute="trailingMargin" secondItem="KhN-oF-mDJ" secondAttribute="trailing" constant="-16" id="5Fn-TH-yQa"/>
+                    <constraint firstItem="KhN-oF-mDJ" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" constant="-16" id="8kA-R3-HMe"/>
+                    <constraint firstItem="3dv-Qy-IrM" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" constant="-16" id="B2E-M3-ZKc"/>
+                    <constraint firstAttribute="trailingMargin" secondItem="3dv-Qy-IrM" secondAttribute="trailing" constant="-16" id="if3-JA-Iiu"/>
+                </constraints>
             </tableViewCellContentView>
             <connections>
                 <outlet property="labelMoney" destination="dCE-JM-Vih" id="YMl-fu-mHn"/>
@@ -117,6 +124,7 @@
                 <outlet property="labelType" destination="8HM-2G-yxO" id="Yei-mz-EmV"/>
                 <outlet property="lableName" destination="kG3-ca-2jQ" id="hsI-Gb-VBY"/>
             </connections>
+            <point key="canvasLocation" x="245" y="290"/>
         </tableViewCell>
     </objects>
 </document>

YHB_Prj/YHB_Prj/Yudanchaxun/YDCXDetailCell.xib

@@ -3,6 +3,7 @@
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -32,8 +33,8 @@
                         <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="upf-0o-R0Y">
-                        <rect key="frame" x="0.0" y="92.5" width="320" height="0.5"/>
+                    <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="upf-0o-R0Y">
+                        <rect key="frame" x="0.0" y="93" width="320" height="1"/>
                         <color key="backgroundColor" red="0.86274509803921573" green="0.86274509803921573" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
                     </view>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="母婴坊小熊水温计" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xqo-zq-XVq">
@@ -79,6 +80,10 @@
                         <nil key="highlightedColor"/>
                     </label>
                 </subviews>
+                <constraints>
+                    <constraint firstAttribute="trailingMargin" secondItem="upf-0o-R0Y" secondAttribute="trailing" constant="-16" id="SZ8-fV-kVN"/>
+                    <constraint firstItem="upf-0o-R0Y" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" constant="-16" id="Xnc-Gk-h95"/>
+                </constraints>
             </tableViewCellContentView>
             <connections>
                 <outlet property="labelName" destination="Xqo-zq-XVq" id="qJp-si-pho"/>
@@ -87,6 +92,7 @@
                 <outlet property="labelSum" destination="jsc-TO-S8J" id="Tte-yl-kUg"/>
                 <outlet property="labelZhe" destination="sdT-Hc-OTN" id="QTz-GH-hz6"/>
             </connections>
+            <point key="canvasLocation" x="196" y="299.5"/>
         </tableViewCell>
     </objects>
 </document>

YHB_Prj/YHB_Prj/Yudanchaxun/YDCXManager.h

@@ -15,7 +15,7 @@ typedef NS_ENUM(NSInteger, VipCerditStatus) {
 };
 
 @interface YDCXManager : NSObject
-- (void)appGetVipCerditListArr:(int)aStatus finishBlock:(void(^)(NSArray *llist))aFinishBlock;
+- (void)appGetVipCerditListArr:(int)aStatus isRefresh:(BOOL)aIsRefresh finishBlock:(void (^)(NSArray *))aFinishBlock;
 - (void)setCurrentVipid:(NSString *)aVipId;
 - (void)setStartTime:(NSString *)aStartTime;
 - (void)setEndTime:(NSString *)aEndTime;

YHB_Prj/YHB_Prj/Yudanchaxun/YDCXManager.m

@@ -25,10 +25,16 @@ @interface YDCXManager()
 
 @implementation YDCXManager
 
-- (void)appGetVipCerditListArr:(int)aStatus finishBlock:(void (^)(NSArray *))aFinishBlock
+- (void)appGetVipCerditListArr:(int)aStatus isRefresh:(BOOL)aIsRefresh finishBlock:(void (^)(NSArray *))aFinishBlock
 {
     NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithCapacity:0];
     [dict setValue:[NSNumber numberWithInt:aStatus] forKey:@"Status"];
+    if (aIsRefresh==YES)
+    {
+        _currentPage_yes = 0;
+        _currentPage_no = 0;
+        _currentPage_all = 0;
+    }
     if(aStatus == VipCerditStatusAll)
     {
         [dict setValue:[NSNumber numberWithInt:_currentPage_all] forKey:@"pageNo"];