修改Convert List视图界面，隐藏单选按钮，增加Can See Sales Order权限检测。

RedAnt ERP Mobile/common/Functions/offline/SelectUploadOrderViewController.m

@@ -135,10 +135,10 @@
         NSDictionary *dic = (NSDictionary *)obj;
         // order_id
         NSString *order_id = [NSString stringWithFormat:@"%@",[dic objectForKey:@"order_id"]];
-        int check = [[dic objectForKey:@"check"] integerValue];
+//        int check = [[dic objectForKey:@"check"] integerValue];
         
         [order_ids appendString:[NSString stringWithFormat:@"%@,",order_id]];
-        if (check) {
+        if (idx == 0) {
             checked_id = order_id;
         }
         
@@ -227,23 +227,23 @@
     myView.layer.shadowOpacity = 0.5;
     myView.layer.shadowRadius = 2.0;
     
-    UILabel *mergeTo = [[UILabel alloc] initWithFrame:CGRectMake(10, 10, 40, 44)];
-    mergeTo.textAlignment = NSTextAlignmentCenter;
-    mergeTo.textColor=UIColorFromRGB(color);
-    mergeTo.backgroundColor = [UIColor clearColor];
-    mergeTo.text=NSLocalizedString(@"To", nil);
-    [mergeTo sizeToFit];
-    [myView addSubview:mergeTo];
+//    UILabel *mergeTo = [[UILabel alloc] initWithFrame:CGRectMake(10, 10, 40, 44)];
+//    mergeTo.textAlignment = NSTextAlignmentCenter;
+//    mergeTo.textColor=UIColorFromRGB(color);
+//    mergeTo.backgroundColor = [UIColor clearColor];
+//    mergeTo.text=NSLocalizedString(@"To", nil);
+//    [mergeTo sizeToFit];
+//    [myView addSubview:mergeTo];
 
     
-    UILabel *solabel = [[UILabel alloc] initWithFrame:CGRectMake(48, 2, 100, 22)];
+    UILabel *solabel = [[UILabel alloc] initWithFrame:CGRectMake(20, 2, 100, 22)];// 48,2
     solabel.textColor=UIColorFromRGB(color);
     solabel.backgroundColor = [UIColor clearColor];
     solabel.text=NSLocalizedString(@"SO#", nil);
     [solabel sizeToFit];
     [myView addSubview:solabel];
     
-    UILabel *userlabel = [[UILabel alloc] initWithFrame:CGRectMake(48, 21, 100, 22)];
+    UILabel *userlabel = [[UILabel alloc] initWithFrame:CGRectMake(20, 21, 100, 22)];
     userlabel.textColor=UIColorFromRGB(color);
     userlabel.backgroundColor = [UIColor clearColor];
     userlabel.text=NSLocalizedString(@"Create By", nil);

RedAnt ERP Mobile/common/Functions/order/OrderListViewController.m

@@ -1795,9 +1795,14 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
             [self.orderTypeSegmentControl sendActionsForControlEvents:UIControlEventValueChanged];
         }
         
-        [self.orderTypeSegmentControl removeSegmentAtIndex:1 animated:YES];
+        if(self.orderTypeSegmentControl.numberOfSegments > 1) {
+            [self.orderTypeSegmentControl removeSegmentAtIndex:1 animated:YES];
+        }
     } else {
-        [self.orderTypeSegmentControl insertSegmentWithTitle:@"Sales Order" atIndex:1 animated:YES];
+        if ([Singleton sharedInstance].customer_can_see_sales_Order) {
+            [self.orderTypeSegmentControl insertSegmentWithTitle:@"Sales Order" atIndex:1 animated:YES];
+        }
+        
     }
 }
 

RedAnt ERP Mobile/common/data_provider/iSalesNetwork.m

@@ -3631,6 +3631,7 @@ repeat:
             
             [Singleton sharedInstance].deliveryString = [objheader valueForKey:@"delivery_price"];
             [[Singleton sharedInstance] resetGlobalLock];
+            [Singleton sharedInstance].customer_can_see_sales_Order = [[objheader valueForKey:@"can_see_salesorder"] boolValue];
         }
         
         //        DebugLog(@"sessionid=%@ ",appDelegate.sessionid);

RedAnt ERP Mobile/iSales-NPD/Base.lproj/OLM.storyboard

@@ -228,34 +228,34 @@
                                         <rect key="frame" x="0.0" y="28" width="768" height="86"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XXr-fU-67o" id="Ohn-hG-mj9">
-                                            <frame key="frameInset" width="768" height="86"/>
+                                            <frame key="frameInset" width="768" height="85.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="AIn-eK-sCn">
-                                                    <frame key="frameInset" minX="48" minY="15" width="712" height="21"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="AIn-eK-sCn">
+                                                    <frame key="frameInset" minX="20" minY="15" width="712" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="hrK-DY-RbO">
+                                                <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="hrK-DY-RbO">
                                                     <frame key="frameInset" minX="10" minY="32" width="21" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <state key="normal" image="check_0_24"/>
-                                                    <state key="selected" image="check_1_24"/>
+                                                    <state key="normal" image="B11A9C3F-FE01-4632-A5B3-A3F5E011677E"/>
+                                                    <state key="selected" image="142D2D00-B776-4D67-A565-3DA0ECBD0273"/>
                                                     <connections>
                                                         <action selector="checkButtonClick:" destination="XXr-fU-67o" eventType="touchUpInside" id="KeU-ld-H4J"/>
                                                     </connections>
                                                 </button>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="v9S-8N-eqS">
-                                                    <frame key="frameInset" minX="48" width="63.19%" height="22" maxY="15"/>
+                                                    <frame key="frameInset" minX="20" width="60.83%" height="22" maxY="15.5"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="11/08/2016 17:55:32 PST" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="efa-f8-yHS">
-                                                    <frame key="frameInset" width="200" height="22" maxY="15"/>
+                                                    <frame key="frameInset" width="200" height="22" maxY="14.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
@@ -382,11 +382,11 @@
                                         <rect key="frame" x="0.0" y="28" width="360" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0HM-qr-ZyP" id="qg6-aD-3QW">
-                                            <frame key="frameInset" width="360" height="44"/>
+                                            <frame key="frameInset" width="360" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hql-hH-AXh">
-                                                    <frame key="frameInset" minX="15" width="330" height="43"/>
+                                                    <frame key="frameInset" minX="15" width="330" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -422,9 +422,187 @@
         </scene>
     </scenes>
     <resources>
+        <image name="142D2D00-B776-4D67-A565-3DA0ECBD0273" width="24" height="24">
+            <mutableData key="keyedArchiveRepresentation">
+YnBsaXN0MDDUAQIDBAUGPT5YJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK4HCBMU
+GR4fIyQrLjE3OlUkbnVsbNUJCgsMDQ4PEBESVk5TU2l6ZVYkY2xhc3NcTlNJbWFnZUZsYWdzVk5TUmVw
+c1dOU0NvbG9ygAKADRIgwAAAgAOAC1h7MjQsIDI0fdIVChYYWk5TLm9iamVjdHOhF4AEgArSFQoaHaIb
+HIAFgAaACRAA0iAKISJfEBROU1RJRkZSZXByZXNlbnRhdGlvboAHgAhPERGeTU0AKgAACQgAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcHBxcVFRVIKSkpgkdHR+NISEjnKSkphRcXF0sICAgZAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANDQ0tLi4u
+k0ZGRt9QUFD/UlJS/1BQUP9QUFD/UlJS/1BQUP9HR0fgLy8vlw8PDzEAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAgICCCcnJ31LS0vuU1NT/1FRUf9PT0//T09P/09PT/9PT0//T09P
+/09PT/9RUVH/U1NT/0xMTPEoKCiEAwMDCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQQNjY2
+q1NTU/9QUFD/T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/1BQUP9TU1P/ODg4
+sgYGBhQAAAAAAAAAAAAAAAAAAAAAAAAAAAICAgk2NjarVFRU/09PT/9PT0//T09P/09PT/9PT0//T09P
+/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9OTk7/UVFR/zg4OLMDAwMLAAAAAAAAAAAAAAAAAAAA
+ACYmJnxTU1P/T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P
+/0xMTP9WVlb/X19f/1JSUv8oKCiGAAAAAAAAAAAAAAAADAwMK0pKSu5QUFD/T09P/09PT/9PT0//T09P
+/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//SkpK/29vb//Z2dn/7+/v/5KSkv9ISEjyDw8P
+MwAAAAAAAAAALS0tklNTU/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P
+/09PT/9KSkr/cHBw/+np6f///////////8fHx/9PT0//MDAwnAAAAAAGBgYVRUVF3lFRUf9OTk7/SkpK
+/0pKSv9OTk7/T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/0pKSv9wcHD/6enp////////////+/v7
+/4eHh/9NTU3/R0dH5QgICBoUFBRET09P/E5OTv9TU1P/lZWV/52dnf9TU1P/TU1N/09PT/9PT0//T09P
+/09PT/9PT0//SkpK/3BwcP/q6ur////////////8/Pz/lZWV/0xMTP9PT0//UFBQ/xgYGFAmJiZ8UlJS
+/0pKSv+cnJz///////////+3t7f/UFBQ/01NTf9PT0//T09P/09PT/9KSkr/cHBw/+rq6v//////////
+//z8/P+Wlpb/S0tL/05OTv9PT0//UlJS/y8vL5YwMDCbUlJS/0tLS/+xsbH/////////////////t7e3
+/1BQUP9NTU3/T09P/0pKSv9wcHD/6urq/////////////Pz8/5aWlv9LS0v/Tk5O/09PT/9PT0//T09P
+/0xMTPswMDCbUlJS/01NTf9ZWVn/ysrK/////////////////7u7u/9RUVH/R0dH/3BwcP/s7Oz/////
+///////8/Pz/k5OT/0tLS/9OTk7/T09P/09PT/9PT0//T09P/0xMTPsmJiZ8UlJS/09PT/9MTEz/WFhY
+/8rKyv////////////////+3t7f/dnZ2/+rq6v////////////z8/P+Tk5P/S0tL/05OTv9PT0//T09P
+/09PT/9PT0//UlJS/y8vL5YUFBRET09P/FBQUP9PT0//TExM/1hYWP/Lysr/////////////////+vr6
+/////////////Pz8/5OTk/9LS0v/Tk5O/09PT/9PT0//T09P/09PT/9PT0//UFBQ/xgYGFAGBgYVRUVF
+3lFRUf9PT0//T09P/0xMTP9YWFj/y8vK///////////////////////8/Pz/k5OT/0tLS/9OTk7/T09P
+/09PT/9PT0//T09P/09PT/9RUVH/R0dH5QgICBoAAAAALS0tklNTU/9PT0//T09P/09PT/9NTU3/WFhY
+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
+ZwBlAG4A6AByAGkAYwBDHqUAdQAgAGgA7ABuAGgAIABSAEcAQgAgAEMAaAB1AG4AZwBQAGUAcgBmAGkA
+bAAgAFIARwBCACAARwBlAG4A6QByAGkAYwBvBBcEMAQzBDAEOwRMBD0EOAQ5ACAEPwRABD4ERAQwBDkE
+OwAgAFIARwBCAFAAcgBvAGYAaQBsACAAZwDpAG4A6QByAGkAcQB1AGUAIABSAFYAQgDBAGwAdABhAGwA
+4QBuAG8AcwAgAFIARwBCACAAcAByAG8AZgBpAGyQGnUoACAAUgBHAEIAIIJyX2ljz4/wAEcAZQBuAGUA
+cgBpAHMAawAgAFIARwBCAC0AcAByAG8AZgBpAGwATwBiAGUAYwBuAP0AIABSAEcAQgAgAHAAcgBvAGYA
+aQBsBeQF6AXVBeQF2QXcACAAUgBHAEIAIAXbBdwF3AXZAFAAcgBvAGYAaQBsAG8AIABSAEcAQgAgAGcA
+ZQBuAGUAcgBpAGMAbwBQAHIAbwBmAGkAbAAgAFIARwBCACAAZwBlAG4AZQByAGkAYwBBAGwAbABnAGUA
+bQBlAGkAbgBlAHMAIABSAEcAQgAtAFAAcgBvAGYAaQBsx3y8GAAgAFIARwBCACDVBLhc0wzHfGZukBoA
+IABSAEcAQgAgY8+P8GWHTvZOAIIsACAAUgBHAEIAIDDXMO0w1TChMKQw6wOTA7UDvQO5A7oDzAAgA8AD
+wQO/A8YDrwO7ACAAUgBHAEIAUABlAHIAZgBpAGwAIABSAEcAQgAgAGcAZQBuAOkAcgBpAGMAbwBBAGwA
+ZwBlAG0AZQBlAG4AIABSAEcAQgAtAHAAcgBvAGYAaQBlAGwOQg4bDiMORA4fDiUOTAAgAFIARwBCACAO
+Fw4xDkgOJw5EDhsARwBlAG4AZQBsACAAUgBHAEIAIABQAHIAbwBmAGkAbABpAFkAbABlAGkAbgBlAG4A
+IABSAEcAQgAtAHAAcgBvAGYAaQBpAGwAaQBHAGUAbgBlAHIAaQENAGsAaQAgAFIARwBCACAAcAByAG8A
+ZgBpAGwAVQBuAGkAdwBlAHIAcwBhAGwAbgB5ACAAcAByAG8AZgBpAGwAIABSAEcAQgQeBDEESQQ4BDkA
+IAQ/BEAEPgREBDgEOwRMACAAUgBHAEIGRQZEBkEAIAYqBjkGMQZKBkEAIABSAEcAQgAgBicGRAY5BicG
+RQBHAGUAbgBlAHIAaQBjACAAUgBHAEIAIABQAHIAbwBmAGkAbABldGV4dAAAAABDb3B5cmlnaHQgMjAw
+NyBBcHBsZSBJbmMuLCBhbGwgcmlnaHRzIHJlc2VydmVkLgBYWVogAAAAAAAA81IAAQAAAAEWz1hZWiAA
+AAAAAAB0TQAAPe4AAAPQWFlaIAAAAAAAAFp1AACscwAAFzRYWVogAAAAAAAAKBoAABWfAAC4NmN1cnYA
+AAAAAAAAAQHNAABzZjMyAAAAAAABDEIAAAXe///zJgAAB5IAAP2R///7ov///aMAAAPcAADAbNIlJico
+WiRjbGFzc25hbWVYJGNsYXNzZXNfEBBOU0JpdG1hcEltYWdlUmVwoycpKlpOU0ltYWdlUmVwWE5TT2Jq
+ZWN00iUmLC1XTlNBcnJheaIsKtIlJi8wXk5TTXV0YWJsZUFycmF5oy8sKtMyMwo0NTZXTlNXaGl0ZVxO
+U0NvbG9yU3BhY2VEMCAwABADgAzSJSY4OVdOU0NvbG9yojgq0iUmOzxXTlNJbWFnZaI7Kl8QD05TS2V5
+ZWRBcmNoaXZlctE/QFRyb290gAEACAARABoAIwAtADIANwBGAEwAVwBeAGUAcgB5AIEAgwCFAIoAjACO
+AJcAnACnAKkAqwCtALIAtQC3ALkAuwC9AMIA2QDbAN0SfxKEEo8SmBKrEq8SuhLDEsgS0BLTEtgS5xLr
+EvIS+hMHEwwTDhMQExUTHRMgEyUTLRMwE0ITRRNKAAAAAAAAAgEAAAAAAAAAQQAAAAAAAAAAAAAAAAAA
+E0w
+</mutableData>
+        </image>
+        <image name="B11A9C3F-FE01-4632-A5B3-A3F5E011677E" width="24" height="24">
+            <mutableData key="keyedArchiveRepresentation">
+YnBsaXN0MDDUAQIDBAUGPT5YJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK4HCBMU
+GR4fIyQrLjE3OlUkbnVsbNUJCgsMDQ4PEBESVk5TU2l6ZVYkY2xhc3NcTlNJbWFnZUZsYWdzVk5TUmVw
+c1dOU0NvbG9ygAKADRIgwAAAgAOAC1h7MjQsIDI0fdIVChYYWk5TLm9iamVjdHOhF4AEgArSFQoaHaIb
+HIAFgAaACRAA0iAKISJfEBROU1RJRkZSZXByZXNlbnRhdGlvboAHgAhPERGeTU0AKgAACQgAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8NCxQzMCw/YVxYdYaAeqCHgHuiZF1adzUyL0IPDg0WAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgHBspdW9t
+h7m1scjY1NPh4N3d5d/d2+Pd3dzi39/d5djV1OG6t7PLeXRwiyMhHi0AAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAABAMDB2BbV3PIw8HY4+Ph59/g4ODc3N3d29vb29vb29vb29vb29vb
+29zc3Nzf4ODg4uLh5srIxNpmYV55BgUECgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJCQcOh4J9
+m9/d3ejf39/f29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb297f39/h4N3pj4iE
+owwLCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAUEBAiGgH2b4+Ph6dzc3Nzb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vc3Nzc5OPi6I+IhaMHBgUKAAAAAAAAAAAAAAAAAAAA
+AF5aVnDf3t3o3Nzd3dvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb3Nzc3OLf3uhnYV16AAAAAAAAAAAAAAAAHhsZJ8fCvtfe39/f29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb297e39/NycXbJCEf
+LgAAAAAAAAAAcmxphOPj4efb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vi4uLme3ZyjgAAAAANDAkSt7Oux+Dh4OHb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vf3+DgvLi0zRAPDRcvLCk81tPR4Nzd3d3b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vc3N3d2dXT4jk0MkZcVlFv393c
+5dvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb4N/d5WljXn13cGyO39/f5Nvb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29va
+37CnntV3cGyO39/f5Nvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29va37CnntVcVlFv393c5dvb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb4N/d5WljXn0vLCk81tPR4Nzd3d3b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vc3N3d2dXT4jk2MUYNDAkSt7Ou
+x+Dh4OHb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vf3+DgvLi0zRAPDhcAAAAAcmxphOPj4efb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vi4uLme3Zy
+jgAAAAAAAAAAHhsZJ8fCvtfe39/f29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb297e39/MycXcJCEfLgAAAAAAAAAAAAAAAF5aVnDf3t3o3Nzd
+3dvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb3Nzc
+3OLf3uhnYV16AAAAAAAAAAAAAAAAAAAAAAUEBAiGgH2b4+Ph6dzc3Nzb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vc3Nzc5OPi6I+IhaMHBgUKAAAAAAAAAAAAAAAAAAAA
+AAAAAAAJCQgOh4J9m9/d3ejf39/f29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+297f39/h4N3pj4iEowwLCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAMDB2BbV3PIw8HY4+Ph
+59/g4ODc3N3d29vb29vb29vb29vb29vb29zc3Nzf4ODg4uLh5srIxNpmYV55BgUECgAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgHBspdW9th7m1scjY1NPh393d5d/f3+Tf39/k393d
+5djV1OG6t7PLeXNwiyMhHi0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAA8NCxQzMCw/YlxZdX13cpV+eHKWZF5adzUyL0IPDg0WAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABgAAAEBAAMAAAABABgAAAECAAMAAAAEAAAJtgEDAAMA
+AAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAESAAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMA
+AAABABgAAAEXAAQAAAABAAAJAAEcAAMAAAABAAEAAAFSAAMAAAABAAEAAAFTAAMAAAAEAAAJvodzAAcA
+AAfYAAAJxgAAAAAACAAIAAgACAABAAEAAQABAAAH2GFwcGwCIAAAbW50clJHQiBYWVogB9kAAgAZAAsA
+GgALYWNzcEFQUEwAAAAAYXBwbAAAAAAAAAAAAAAAAAAAAAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALZGVzYwAAAQgAAABvZHNjbQAAAXgA
+AAWcY3BydAAABxQAAAA4d3RwdAAAB0wAAAAUclhZWgAAB2AAAAAUZ1hZWgAAB3QAAAAUYlhZWgAAB4gA
+AAAUclRSQwAAB5wAAAAOY2hhZAAAB6wAAAAsYlRSQwAAB5wAAAAOZ1RSQwAAB5wAAAAOZGVzYwAAAAAA
+AAAUR2VuZXJpYyBSR0IgUHJvZmlsZQAAAAAAAAAAAAAAFEdlbmVyaWMgUkdCIFByb2ZpbGUAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG1sdWMAAAAAAAAAHwAAAAxz
+a1NLAAAAKAAAAYRkYURLAAAALgAAAaxjYUVTAAAAJAAAAdp2aVZOAAAAJAAAAf5wdEJSAAAAJgAAAiJ1
+a1VBAAAAKgAAAkhmckZVAAAAKAAAAnJodUhVAAAAKAAAApp6aFRXAAAAFgAAAsJuYk5PAAAAJgAAAthj
+c0NaAAAAIgAAAv5oZUlMAAAAHgAAAyBpdElUAAAAKAAAAz5yb1JPAAAAJAAAA2ZkZURFAAAALAAAA4pr
+b0tSAAAAFgAAA7ZzdlNFAAAAJgAAAth6aENOAAAAFgAAA8xqYUpQAAAAGgAAA+JlbEdSAAAAIgAAA/xw
+dFBPAAAAJgAABB5ubE5MAAAAKAAABERlc0VTAAAAJgAABB50aFRIAAAAJAAABGx0clRSAAAAIgAABJBm
+aUZJAAAAKAAABLJockhSAAAAKAAABNpwbFBMAAAALAAABQJydVJVAAAAIgAABS5hckVHAAAAJgAABVBl
+blVTAAAAJgAABXYAVgFhAGUAbwBiAGUAYwBuAP0AIABSAEcAQgAgAHAAcgBvAGYAaQBsAEcAZQBuAGUA
+cgBlAGwAIABSAEcAQgAtAGIAZQBzAGsAcgBpAHYAZQBsAHMAZQBQAGUAcgBmAGkAbAAgAFIARwBCACAA
+ZwBlAG4A6AByAGkAYwBDHqUAdQAgAGgA7ABuAGgAIABSAEcAQgAgAEMAaAB1AG4AZwBQAGUAcgBmAGkA
+bAAgAFIARwBCACAARwBlAG4A6QByAGkAYwBvBBcEMAQzBDAEOwRMBD0EOAQ5ACAEPwRABD4ERAQwBDkE
+OwAgAFIARwBCAFAAcgBvAGYAaQBsACAAZwDpAG4A6QByAGkAcQB1AGUAIABSAFYAQgDBAGwAdABhAGwA
+4QBuAG8AcwAgAFIARwBCACAAcAByAG8AZgBpAGyQGnUoACAAUgBHAEIAIIJyX2ljz4/wAEcAZQBuAGUA
+cgBpAHMAawAgAFIARwBCAC0AcAByAG8AZgBpAGwATwBiAGUAYwBuAP0AIABSAEcAQgAgAHAAcgBvAGYA
+aQBsBeQF6AXVBeQF2QXcACAAUgBHAEIAIAXbBdwF3AXZAFAAcgBvAGYAaQBsAG8AIABSAEcAQgAgAGcA
+ZQBuAGUAcgBpAGMAbwBQAHIAbwBmAGkAbAAgAFIARwBCACAAZwBlAG4AZQByAGkAYwBBAGwAbABnAGUA
+bQBlAGkAbgBlAHMAIABSAEcAQgAtAFAAcgBvAGYAaQBsx3y8GAAgAFIARwBCACDVBLhc0wzHfGZukBoA
+IABSAEcAQgAgY8+P8GWHTvZOAIIsACAAUgBHAEIAIDDXMO0w1TChMKQw6wOTA7UDvQO5A7oDzAAgA8AD
+wQO/A8YDrwO7ACAAUgBHAEIAUABlAHIAZgBpAGwAIABSAEcAQgAgAGcAZQBuAOkAcgBpAGMAbwBBAGwA
+ZwBlAG0AZQBlAG4AIABSAEcAQgAtAHAAcgBvAGYAaQBlAGwOQg4bDiMORA4fDiUOTAAgAFIARwBCACAO
+Fw4xDkgOJw5EDhsARwBlAG4AZQBsACAAUgBHAEIAIABQAHIAbwBmAGkAbABpAFkAbABlAGkAbgBlAG4A
+IABSAEcAQgAtAHAAcgBvAGYAaQBpAGwAaQBHAGUAbgBlAHIAaQENAGsAaQAgAFIARwBCACAAcAByAG8A
+ZgBpAGwAVQBuAGkAdwBlAHIAcwBhAGwAbgB5ACAAcAByAG8AZgBpAGwAIABSAEcAQgQeBDEESQQ4BDkA
+IAQ/BEAEPgREBDgEOwRMACAAUgBHAEIGRQZEBkEAIAYqBjkGMQZKBkEAIABSAEcAQgAgBicGRAY5BicG
+RQBHAGUAbgBlAHIAaQBjACAAUgBHAEIAIABQAHIAbwBmAGkAbABldGV4dAAAAABDb3B5cmlnaHQgMjAw
+NyBBcHBsZSBJbmMuLCBhbGwgcmlnaHRzIHJlc2VydmVkLgBYWVogAAAAAAAA81IAAQAAAAEWz1hZWiAA
+AAAAAAB0TQAAPe4AAAPQWFlaIAAAAAAAAFp1AACscwAAFzRYWVogAAAAAAAAKBoAABWfAAC4NmN1cnYA
+AAAAAAAAAQHNAABzZjMyAAAAAAABDEIAAAXe///zJgAAB5IAAP2R///7ov///aMAAAPcAADAbNIlJico
+WiRjbGFzc25hbWVYJGNsYXNzZXNfEBBOU0JpdG1hcEltYWdlUmVwoycpKlpOU0ltYWdlUmVwWE5TT2Jq
+ZWN00iUmLC1XTlNBcnJheaIsKtIlJi8wXk5TTXV0YWJsZUFycmF5oy8sKtMyMwo0NTZXTlNXaGl0ZVxO
+U0NvbG9yU3BhY2VEMCAwABADgAzSJSY4OVdOU0NvbG9yojgq0iUmOzxXTlNJbWFnZaI7Kl8QD05TS2V5
+ZWRBcmNoaXZlctE/QFRyb290gAEACAARABoAIwAtADIANwBGAEwAVwBeAGUAcgB5AIEAgwCFAIoAjACO
+AJcAnACnAKkAqwCtALIAtQC3ALkAuwC9AMIA2QDbAN0SfxKEEo8SmBKrEq8SuhLDEsgS0BLTEtgS5xLr
+EvIS+hMHEwwTDhMQExUTHRMgEyUTLRMwE0ITRRNKAAAAAAAAAgEAAAAAAAAAQQAAAAAAAAAAAAAAAAAA
+E0w
+</mutableData>
+        </image>
         <image name="btn_ok" width="102" height="30"/>
-        <image name="check_0_24" width="24" height="24"/>
-        <image name="check_1_24" width="24" height="24"/>
         <image name="checkbox" width="16" height="16"/>
         <image name="close" width="32" height="32"/>
     </resources>

RedAnt ERP Mobile/iSales-NPD/CUL.storyboard

@@ -109,7 +109,7 @@
                                         <rect key="frame" x="0.0" y="28" width="375" height="47"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rnb-EK-8yY" id="WGZ-Bw-E4C">
-                                            <frame key="frameInset" width="375" height="46.5"/>
+                                            <frame key="frameInset" width="375" height="46"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Dinning" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3fh-vo-1qn">

RedAnt ERP Mobile/iSales-NPD/Singleton.h

@@ -31,6 +31,7 @@ typedef enum {
 @property (nonatomic,assign) NSInteger customer_order_type;///< 0 Shop Order/ 1 Sales Order，
 
 @property (nonatomic,assign) BOOL global_lock;///<全局锁，Yes表示订单不能查看Detail，需要密码验证Price Setting，Hide Price
+@property (nonatomic,assign) BOOL customer_can_see_sales_Order;///<是否有权查看Sales Order，控制Order List
 
 #pragma mark - Employee