29

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -482,6 +482,8 @@
 		E0DA8AAF25E8F3D800425099 /* SVProgressHUD.bundle in Resources */ = {isa = PBXBuildFile; fileRef = E0DA8AA125E8F3D800425099 /* SVProgressHUD.bundle */; };
 		E0DA8ACF25E8F4C000425099 /* BtViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E0DA8ACD25E8F4C000425099 /* BtViewController.m */; };
 		E0DA8AD025E8F4C000425099 /* BtViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0DA8ACE25E8F4C000425099 /* BtViewController.xib */; };
+		E0DCA8D0268999AC00518C4D /* Title_Btn_Cell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0DCA8CE268999AC00518C4D /* Title_Btn_Cell.swift */; };
+		E0DCA8D1268999AC00518C4D /* Title_Btn_Cell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0DCA8CF268999AC00518C4D /* Title_Btn_Cell.xib */; };
 		E0DDCB0F244AD8C500DF54C7 /* DaiQueRenCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0DDCB0D244AD8C500DF54C7 /* DaiQueRenCell.swift */; };
 		E0DDCB10244AD8C500DF54C7 /* DaiQueRenCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0DDCB0E244AD8C500DF54C7 /* DaiQueRenCell.xib */; };
 		E0DDCB13244ADF2C00DF54C7 /* ChangePriceNormalCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0DDCB11244ADF2C00DF54C7 /* ChangePriceNormalCell.swift */; };
@@ -1337,6 +1339,8 @@
 		E0DA8ACC25E8F4C000425099 /* BtViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BtViewController.h; sourceTree = "<group>"; };
 		E0DA8ACD25E8F4C000425099 /* BtViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BtViewController.m; sourceTree = "<group>"; };
 		E0DA8ACE25E8F4C000425099 /* BtViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BtViewController.xib; sourceTree = "<group>"; };
+		E0DCA8CE268999AC00518C4D /* Title_Btn_Cell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Title_Btn_Cell.swift; sourceTree = "<group>"; };
+		E0DCA8CF268999AC00518C4D /* Title_Btn_Cell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Title_Btn_Cell.xib; sourceTree = "<group>"; };
 		E0DDCB0D244AD8C500DF54C7 /* DaiQueRenCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DaiQueRenCell.swift; sourceTree = "<group>"; };
 		E0DDCB0E244AD8C500DF54C7 /* DaiQueRenCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DaiQueRenCell.xib; sourceTree = "<group>"; };
 		E0DDCB11244ADF2C00DF54C7 /* ChangePriceNormalCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChangePriceNormalCell.swift; sourceTree = "<group>"; };
@@ -2144,6 +2148,8 @@
 				E08A7ADB246505F000F934F2 /* KeHuListViewController.xib */,
 				E08A7ADE24652E2C00F934F2 /* BingDingKeHuViewController.swift */,
 				E08A7ADF24652E2C00F934F2 /* BingDingKeHuViewController.xib */,
+				E0DCA8CE268999AC00518C4D /* Title_Btn_Cell.swift */,
+				E0DCA8CF268999AC00518C4D /* Title_Btn_Cell.xib */,
 			);
 			path = "客户管理";
 			sourceTree = "<group>";
@@ -4279,6 +4285,7 @@
 				E0DDCB19244AE2AC00DF54C7 /* XiuGaiYuShouJiaViewController.xib in Resources */,
 				E00E48BF2457BAC700F16545 /* XuanZeShangPinCell.xib in Resources */,
 				E06524FE24581BD900CA22E2 /* PiCiXuanZeViewController1.xib in Resources */,
+				E0DCA8D1268999AC00518C4D /* Title_Btn_Cell.xib in Resources */,
 				E0AA3A92248F626400CBFC27 /* XinCaiGouViewController.xib in Resources */,
 				E09F4CA32452D18800BE033D /* ZengZhiServicesViewController.xib in Resources */,
 				F95D9CA524493E840080D6E3 /* ShopInfoViewController.xib in Resources */,
@@ -4710,6 +4717,7 @@
 				F950FDAD245163E500C40530 /* GoodsListModel.swift in Sources */,
 				F9D44E8824CBC6A400FBD8DB /* ToAndFormSelectViewController.swift in Sources */,
 				E0D197BD2448431C002B080C /* BabySpeaker.m in Sources */,
+				E0DCA8D0268999AC00518C4D /* Title_Btn_Cell.swift in Sources */,
 				F9956B22246408A6001A617D /* GoodsClassViewController.swift in Sources */,
 				E07413112637AEBA0098006A /* ConnecterManager.m in Sources */,
 				F950FDDA24518B9500C40530 /* FSCalendarCell.m in Sources */,

GeliBusinessPlatform/View/Cell/TitleAndOnlyBtnCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>

GeliBusinessPlatform/View/Cell/TitleAndTFAndBtnCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>

GeliBusinessPlatform/View/Cell/XuanZeShangPinCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>

GeliBusinessPlatform/ViewController/1.1入库&出库/出库/NewCKVc.swift

@@ -56,8 +56,6 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
             make.top.left.right.bottom.equalToSuperview()
         }
         
-        
-        
         self.view.addSubview(title_Lbl)
         title_Lbl.text = "打印列表"
         title_Lbl.backgroundColor = UIColor.white
@@ -297,10 +295,7 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
                 HUD.flash(.label("请选择出库类型"),delay: 1.2)
                 return
             }
-            if remark.count == 0 {
-                HUD.flash(.label("请填写备注"), delay: 1.2)
-                return
-            }
+      
             if rkSelectArr.count == 0 {
                 HUD.flash(.label("请选择出库商品"), delay: 1.2)
                 return

GeliBusinessPlatform/ViewController/1.1入库&出库/出库/NewCKVc.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>

GeliBusinessPlatform/ViewController/客户管理/KeHuListViewController.swift

@@ -13,7 +13,6 @@ class KeHuListViewController: BaseViewController,UITableViewDelegate,UITableView
         listView.mj_header?.beginRefreshing()
     }
     
-    
     var searchV : SearchBarView? = nil
     
     @IBOutlet weak var topView: UIView!

GeliBusinessPlatform/ViewController/客户管理/KeHuListViewController.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -31,7 +32,7 @@
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UK3-Bv-Spb">
                     <rect key="frame" x="0.0" y="44" width="414" height="44"/>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="44" id="PS6-OU-AOM"/>
                     </constraints>
@@ -53,13 +54,13 @@
                                 <constraint firstAttribute="height" constant="1" id="Vqx-9l-fUr"/>
                             </constraints>
                         </view>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wlq-kf-RDX">
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wlq-kf-RDX">
                             <rect key="frame" x="0.0" y="1" width="207" height="42"/>
                             <connections>
                                 <action selector="btnClick:" destination="-1" eventType="touchUpInside" id="Qcm-hC-FPe"/>
                             </connections>
                         </button>
-                        <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GXD-3Z-7Lp">
+                        <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GXD-3Z-7Lp">
                             <rect key="frame" x="207" y="1" width="207" height="43"/>
                             <connections>
                                 <action selector="btnClick:" destination="-1" eventType="touchUpInside" id="khN-ay-HlS"/>
@@ -84,7 +85,7 @@
                             <rect key="frame" x="329" y="20.5" width="9" height="4.5"/>
                         </imageView>
                     </subviews>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
                         <constraint firstAttribute="trailing" secondItem="P8g-dp-qR6" secondAttribute="trailing" id="96g-7h-ikP"/>
                         <constraint firstItem="oLg-fW-ms4" firstAttribute="centerY" secondItem="GXD-3Z-7Lp" secondAttribute="centerY" id="9z0-do-0L9"/>
@@ -113,7 +114,7 @@
                 </view>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="eHW-wc-LLa">
                     <rect key="frame" x="0.0" y="132" width="414" height="681"/>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <connections>
                         <outlet property="dataSource" destination="-1" id="Q3v-hm-IEl"/>
                         <outlet property="delegate" destination="-1" id="ajh-yq-AKL"/>
@@ -121,7 +122,7 @@
                 </tableView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NmT-QC-WB0" customClass="LGButton" customModule="LGButton">
                     <rect key="frame" x="0.0" y="813" width="414" height="83"/>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
                             <color key="value" name="按钮渐变色上"/>
@@ -144,7 +145,7 @@
                     <color key="textColor" name="白色背景色"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <button hidden="YES" opaque="NO" alpha="0.5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mYo-wM-YJR">
+                <button hidden="YES" opaque="NO" alpha="0.5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mYo-wM-YJR">
                     <rect key="frame" x="0.0" y="132" width="414" height="800"/>
                     <color key="backgroundColor" name="标题字颜色"/>
                     <constraints>
@@ -177,6 +178,7 @@
                     </connections>
                 </tableView>
             </subviews>
+            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="t8X-ZG-zEi" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="0cL-lc-9CQ"/>
@@ -206,10 +208,14 @@
                 <constraint firstItem="t8X-ZG-zEi" firstAttribute="top" secondItem="hFZ-bh-SIG" secondAttribute="bottom" id="yF5-Jg-CP5"/>
                 <constraint firstItem="NmT-QC-WB0" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="yW9-el-GKK"/>
             </constraints>
-            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
             <point key="canvasLocation" x="131.8840579710145" y="131.91964285714286"/>
         </view>
     </objects>
+    <designables>
+        <designable name="NmT-QC-WB0">
+            <size key="intrinsicContentSize" width="10" height="10"/>
+        </designable>
+    </designables>
     <resources>
         <image name="xiala" width="9" height="4.5"/>
         <namedColor name="按钮渐变色上">
@@ -227,5 +233,8 @@
         <namedColor name="白色背景色">
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>

GeliBusinessPlatform/ViewController/客户管理/Title_Btn_Cell.swift

+//
+//  Title_Btn_Cell.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2021/6/28.
+//  Copyright © 2021 junye lu. All rights reserved.
+//
+
+import UIKit
+
+class Title_Btn_Cell: UITableViewCell {
+
+    @IBOutlet weak var title_lbl: UILabel!
+    @IBOutlet weak var add_adr_lbl: UILabel!
+    @IBOutlet weak var arrow_img: UIImageView!
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        self.selectionStyle = .none
+        // Initialization code
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+    
+}

GeliBusinessPlatform/ViewController/客户管理/Title_Btn_Cell.xib

+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="Title_Btn_Cell" customModule="TestClass" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
+                <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                <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" translatesAutoresizingMaskIntoConstraints="NO" id="OWf-Av-nZU">
+                        <rect key="frame" x="15" y="12.5" width="33" height="19"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="jinru" translatesAutoresizingMaskIntoConstraints="NO" id="vZj-x0-0S4">
+                        <rect key="frame" x="291" y="15" width="14" height="14"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="14" id="FlI-Pc-usN"/>
+                            <constraint firstAttribute="height" constant="14" id="eOf-Cq-vXi"/>
+                        </constraints>
+                    </imageView>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="新增地址" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ChW-vM-0fm">
+                        <rect key="frame" x="253" y="12.5" width="52" height="19"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
+                        <color key="textColor" red="0.2784313725" green="0.56078431370000004" blue="0.89019607840000003" alpha="1" colorSpace="calibratedRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="ChW-vM-0fm" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="7QX-nQ-kAe"/>
+                    <constraint firstAttribute="trailing" secondItem="vZj-x0-0S4" secondAttribute="trailing" constant="15" id="Kab-XU-YfB"/>
+                    <constraint firstAttribute="trailing" secondItem="ChW-vM-0fm" secondAttribute="trailing" constant="15" id="bxO-Tp-QDj"/>
+                    <constraint firstItem="OWf-Av-nZU" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="gT8-9Y-QD7"/>
+                    <constraint firstItem="OWf-Av-nZU" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="nuy-GE-GFq"/>
+                    <constraint firstItem="vZj-x0-0S4" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="pIL-Mk-bpc"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+            <connections>
+                <outlet property="add_adr_lbl" destination="ChW-vM-0fm" id="M3G-yt-J7O"/>
+                <outlet property="arrow_img" destination="vZj-x0-0S4" id="GTM-i2-a2J"/>
+                <outlet property="title_lbl" destination="OWf-Av-nZU" id="ve1-PV-r6I"/>
+            </connections>
+            <point key="canvasLocation" x="132" y="90"/>
+        </tableViewCell>
+    </objects>
+    <resources>
+        <image name="jinru" width="13" height="23"/>
+    </resources>
+</document>

GeliBusinessPlatform/ViewController/客户管理/XinZengAndBianJiKeHuViewController.swift

@@ -113,14 +113,14 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour
             HUD.flash(.label("请填写客户公司名称"), delay: 1.2)
             return
         }
-//        if  bindKehu.count == 0 {
-//            HUD.flash(.label("请选择绑定用户"), delay: 1.2)
-//            return
-//        }
-//        if discount.count == 0 {
-//            HUD.flash(.label("请填写折扣数,没有折扣请输入0"), delay: 1.2)
-//            return
-//        }
+        //        if  bindKehu.count == 0 {
+        //            HUD.flash(.label("请选择绑定用户"), delay: 1.2)
+        //            return
+        //        }
+        //        if discount.count == 0 {
+        //            HUD.flash(.label("请填写折扣数,没有折扣请输入0"), delay: 1.2)
+        //            return
+        //        }
         let alertView = GeliAlertView(frame: self.view.window!.bounds)
         alertView.delegate = self;
         alertView.tishiLbl.text = ""
@@ -136,8 +136,12 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour
     }
     var titleStr:String?
     let UserToken = UserDefaults.standard.value(forKey: "user_token")
+    let titleArr = ["客户名称","客户手机号码 ","客户公司名称","绑定用户","客户类型","客户折扣","客户地址管理"]
+    var holderArr = ["请输入客户名","请输入手机号码","请输入公司名称","搜索绑定","个人","敬请期待",""]
     @IBOutlet weak var bottomBtn: LGButton!
+    @IBOutlet weak var tbv_h: NSLayoutConstraint!
     @IBOutlet weak var listView: UITableView!
+    @IBOutlet weak var top_margin: NSLayoutConstraint!
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -150,19 +154,16 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour
         
         listView.separatorStyle = .none
         listView.isScrollEnabled = false
-        listView.snp.makeConstraints { (make) in
-            make.top.equalTo(NavCGRect.height)
-            make.height.equalTo(294)
-            make.right.left.equalTo(0)
-        }
+        top_margin.constant = NavCGRect.height-49
+        
+
+        tbv_h.constant = CGFloat(49*titleArr.count)
         listView.register(UINib(nibName: "TitleAndBtnCell", bundle: nil), forCellReuseIdentifier: "TitleAndBtnCell")
         listView.register(UINib(nibName: "TitleAndTFCell", bundle: nil), forCellReuseIdentifier: "TitleAndTFCell")
-        
+        listView.register(UINib(nibName: "Title_Btn_Cell", bundle: nil), forCellReuseIdentifier: "Title_Btn_Cell")
         
     }
     
-    let titleArr = ["客户名称：","客户手机号码： ","客户公司名称：","绑定用户：","客户类型：","客户折扣："]
-    var holderArr = ["请输入客户名","请输入手机号码","请输入公司名称","搜索绑定","个人","敬请期待"]
     //MARK: - CELL DELEGATE
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return 49
@@ -171,6 +172,9 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour
         return titleArr.count
     }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if indexPath.row == 6 {
+            print("abc == ")
+        }
         if indexPath.row == 3 {
             let vc = BingDingKeHuViewController()
             vc.delegate = self
@@ -206,7 +210,11 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour
         user_id = sender.user_id!
         listView.reloadData()
     }
+    
+    
+    
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
         if indexPath.row == 3 || indexPath.row == 4 {
             let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndBtnCell") as! TitleAndBtnCell
             cell.nameLbl.text = titleArr[indexPath.row]
@@ -225,6 +233,13 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour
             
             return cell
         }
+        
+        if indexPath.row == 6 {
+            let cell = tableView.dequeueReusableCell(withIdentifier: "Title_Btn_Cell") as! Title_Btn_Cell
+            cell.title_lbl.text = titleArr[indexPath.row]
+            return cell
+        }
+        
         let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
         cell.nameLbl.text = titleArr[indexPath.row]
         cell.textTF.placeholder = holderArr[indexPath.row]
@@ -249,7 +264,6 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour
         case 5:
             cell.textTF.isUserInteractionEnabled = false
             cell.textTF.clearButtonMode = .never
-//            cell.textTF.keyboardType = .numberPad
             if discount != "0" && discount != "100"{
                 cell.textTF.text = discount
             }
@@ -258,6 +272,7 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour
             break
         }
         return cell
+        //        }
     }
     func textFieldDidEndEditing(_ textField: UITextField) {
         switch textField.tag {

GeliBusinessPlatform/ViewController/客户管理/XinZengAndBianJiKeHuViewController.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -13,6 +14,8 @@
             <connections>
                 <outlet property="bottomBtn" destination="Hbo-FL-O2S" id="gfj-Jr-rtv"/>
                 <outlet property="listView" destination="lZh-U4-Q33" id="thn-cy-mca"/>
+                <outlet property="tbv_h" destination="3M5-ys-efs" id="hmE-nD-OSc"/>
+                <outlet property="top_margin" destination="JjJ-9B-OG4" id="hiR-I3-JoP"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
             </connections>
         </placeholder>
@@ -23,7 +26,7 @@
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Hbo-FL-O2S" customClass="LGButton" customModule="LGButton">
                     <rect key="frame" x="0.0" y="813" width="414" height="83"/>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
                             <color key="value" name="按钮渐变色上"/>
@@ -54,8 +57,8 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="lZh-U4-Q33">
-                    <rect key="frame" x="0.0" y="44" width="414" height="300"/>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <rect key="frame" x="0.0" y="49" width="414" height="300"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="300" id="3M5-ys-efs"/>
                     </constraints>
@@ -65,7 +68,7 @@
                     </connections>
                 </tableView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="客户折扣仅在绑定用户后，格利食品网pc渠道中，对售价和阶梯价可用" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TLb-MK-lV8">
-                    <rect key="frame" x="0.0" y="354" width="414" height="15"/>
+                    <rect key="frame" x="0.0" y="359" width="414" height="15"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="15" id="ceX-G0-MCg"/>
                     </constraints>
@@ -74,12 +77,13 @@
                     <nil key="highlightedColor"/>
                 </label>
             </subviews>
+            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstAttribute="bottom" secondItem="Hbo-FL-O2S" secondAttribute="bottom" id="5oV-Hf-M6B"/>
                 <constraint firstItem="lZh-U4-Q33" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="FEd-PC-7UJ"/>
                 <constraint firstAttribute="trailing" secondItem="Hbo-FL-O2S" secondAttribute="trailing" id="IhC-ma-C4H"/>
-                <constraint firstItem="lZh-U4-Q33" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="JjJ-9B-OG4"/>
+                <constraint firstItem="lZh-U4-Q33" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" constant="5" id="JjJ-9B-OG4"/>
                 <constraint firstItem="TLb-MK-lV8" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="KoC-4f-w2i"/>
                 <constraint firstItem="jMG-ga-6QQ" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="LiY-Uk-c5j"/>
                 <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="jMG-ga-6QQ" secondAttribute="trailing" id="NXm-pV-gSC"/>
@@ -90,10 +94,14 @@
                 <constraint firstItem="TLb-MK-lV8" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="j5K-cP-pfJ"/>
                 <constraint firstItem="Hbo-FL-O2S" firstAttribute="top" secondItem="jMG-ga-6QQ" secondAttribute="top" id="sih-ht-ww7"/>
             </constraints>
-            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
             <point key="canvasLocation" x="131.8840579710145" y="121.875"/>
         </view>
     </objects>
+    <designables>
+        <designable name="Hbo-FL-O2S">
+            <size key="intrinsicContentSize" width="10" height="10"/>
+        </designable>
+    </designables>
     <resources>
         <namedColor name="按钮渐变色上">
             <color red="0.3880000114440918" green="0.62400001287460327" blue="0.90200001001358032" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -107,5 +115,8 @@
         <namedColor name="白色背景色">
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>

GeliBusinessPlatform/ViewController/溯源/Print_Gprinter_View.swift

@@ -40,7 +40,9 @@ class Print_Gprinter_View: UIView,UITableViewDelegate,UITableViewDataSource, GPr
         cell.tag = indexPath.row
         let model = rkSelectArr[indexPath.row]
         cell.name_lbl.text = model.goods_name
+        if piCiArr!.count > 0 {
             cell.piciArr = piCiArr![indexPath.row]
+        }
         cell.btm_line.isHidden = false
         if indexPath.row == rkSelectArr.count - 1 {
             cell.btm_line.isHidden = true
@@ -49,9 +51,12 @@ class Print_Gprinter_View: UIView,UITableViewDelegate,UITableViewDataSource, GPr
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if piCiArr!.count > 0 {
             let pici = piCiArr![indexPath.row]
             return CGFloat(103 + 67 * pici.count)
         }
+        return 170
+    }
     var rkSelectArr:Array<InputInitInfoGoodsInfoModel> = []{
         didSet {
             for i in 0 ..< rkSelectArr.count {
@@ -94,8 +99,10 @@ class Print_Gprinter_View: UIView,UITableViewDelegate,UITableViewDataSource, GPr
             var dict:Dictionary<String,Any> = Dictionary()
             for i in select_arr {
                 dict["goods_name"] = model.goods_name
+                if piCiArr!.count > 0 {
                     let p = piCiArr![item][i]
                     dict["goods_data"] = p
+                }
                 let n = print_num_arr[item][i]
                 dict["print_counts"] = n
                 dict["spec_str"] = model.spec_str