修改港澳台

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -8,6 +8,10 @@
 
 /* Begin PBXBuildFile section */
 		9C3AD0BD567C3C122CCE3169 /* Pods_GeliBusinessPlatform.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DA2D518C6159EA47DCD8E0C /* Pods_GeliBusinessPlatform.framework */; };
+		E007B1D4248F6880004D14CC /* CGDDayCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E007B1D2248F6880004D14CC /* CGDDayCell.swift */; };
+		E007B1D5248F6880004D14CC /* CGDDayCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E007B1D3248F6880004D14CC /* CGDDayCell.xib */; };
+		E007B1D8248F7276004D14CC /* CGDCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E007B1D6248F7276004D14CC /* CGDCell.swift */; };
+		E007B1D9248F7276004D14CC /* CGDCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E007B1D7248F7276004D14CC /* CGDCell.xib */; };
 		E00B0B1B24629E99006DC846 /* SJMapCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00B0B1924629E99006DC846 /* SJMapCell.swift */; };
 		E00B0B1C24629E99006DC846 /* SJMapCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E00B0B1A24629E99006DC846 /* SJMapCell.xib */; };
 		E00CBA0124820CF000701D9D /* CRKSumCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00CB9FF24820CF000701D9D /* CRKSumCell.swift */; };
@@ -163,8 +167,6 @@
 		E07B1E6C245926330055BA3C /* GYSGLCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E07B1E6A245926330055BA3C /* GYSGLCell.xib */; };
 		E07B1E6F245929060055BA3C /* GYSGLViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E07B1E6D245929060055BA3C /* GYSGLViewController.swift */; };
 		E07B1E70245929060055BA3C /* GYSGLViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E07B1E6E245929060055BA3C /* GYSGLViewController.xib */; };
-		E07B1E78245966E60055BA3C /* XinCaiGouViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E07B1E76245966E60055BA3C /* XinCaiGouViewController.swift */; };
-		E07B1E79245966E60055BA3C /* XinCaiGouViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E07B1E77245966E60055BA3C /* XinCaiGouViewController.xib */; };
 		E088CC8D24470BF0000DAA8A /* CodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E088CC8C24470BF0000DAA8A /* CodeView.swift */; };
 		E088CC932447124D000DAA8A /* BindViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E088CC912447124D000DAA8A /* BindViewController.swift */; };
 		E088CC942447124D000DAA8A /* BindViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E088CC922447124D000DAA8A /* BindViewController.xib */; };
@@ -219,6 +221,8 @@
 		E0A7548B244A8F0F00A84B67 /* CheckWareHourseViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0A75489244A8F0F00A84B67 /* CheckWareHourseViewController.xib */; };
 		E0AA3A87248F3C5E00CBFC27 /* StatisticsModel.swif.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0AA3A86248F3C5E00CBFC27 /* StatisticsModel.swif.swift */; };
 		E0AA3A89248F3E1400CBFC27 /* StatisticsInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0AA3A88248F3E1400CBFC27 /* StatisticsInterface.swift */; };
+		E0AA3A91248F626400CBFC27 /* XinCaiGouViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0AA3A8F248F626400CBFC27 /* XinCaiGouViewController.swift */; };
+		E0AA3A92248F626400CBFC27 /* XinCaiGouViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0AA3A90248F626400CBFC27 /* XinCaiGouViewController.xib */; };
 		E0B5307E247266F400FFCC15 /* DKXDAdrCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B5307C247266F400FFCC15 /* DKXDAdrCell.swift */; };
 		E0B5307F247266F400FFCC15 /* DKXDAdrCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0B5307D247266F400FFCC15 /* DKXDAdrCell.xib */; };
 		E0B5308424728D7E00FFCC15 /* ShopWarehouseListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B5308324728D7E00FFCC15 /* ShopWarehouseListModel.swift */; };
@@ -526,6 +530,10 @@
 		073EFCE4E1CBD26A64719EC0 /* Pods-GeliBusinessPlatform.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GeliBusinessPlatform.release.xcconfig"; path = "Target Support Files/Pods-GeliBusinessPlatform/Pods-GeliBusinessPlatform.release.xcconfig"; sourceTree = "<group>"; };
 		5DA2D518C6159EA47DCD8E0C /* Pods_GeliBusinessPlatform.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GeliBusinessPlatform.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		6FA79EFC99FED0CA28AA1444 /* Pods-GeliBusinessPlatform.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GeliBusinessPlatform.debug.xcconfig"; path = "Target Support Files/Pods-GeliBusinessPlatform/Pods-GeliBusinessPlatform.debug.xcconfig"; sourceTree = "<group>"; };
+		E007B1D2248F6880004D14CC /* CGDDayCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGDDayCell.swift; sourceTree = "<group>"; };
+		E007B1D3248F6880004D14CC /* CGDDayCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CGDDayCell.xib; sourceTree = "<group>"; };
+		E007B1D6248F7276004D14CC /* CGDCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGDCell.swift; sourceTree = "<group>"; };
+		E007B1D7248F7276004D14CC /* CGDCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CGDCell.xib; sourceTree = "<group>"; };
 		E00B0B1924629E99006DC846 /* SJMapCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SJMapCell.swift; sourceTree = "<group>"; };
 		E00B0B1A24629E99006DC846 /* SJMapCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SJMapCell.xib; sourceTree = "<group>"; };
 		E00CB9FF24820CF000701D9D /* CRKSumCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CRKSumCell.swift; sourceTree = "<group>"; };
@@ -687,8 +695,6 @@
 		E07B1E6A245926330055BA3C /* GYSGLCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GYSGLCell.xib; sourceTree = "<group>"; };
 		E07B1E6D245929060055BA3C /* GYSGLViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GYSGLViewController.swift; sourceTree = "<group>"; };
 		E07B1E6E245929060055BA3C /* GYSGLViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GYSGLViewController.xib; sourceTree = "<group>"; };
-		E07B1E76245966E60055BA3C /* XinCaiGouViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XinCaiGouViewController.swift; sourceTree = "<group>"; };
-		E07B1E77245966E60055BA3C /* XinCaiGouViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = XinCaiGouViewController.xib; sourceTree = "<group>"; };
 		E088CC8C24470BF0000DAA8A /* CodeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeView.swift; sourceTree = "<group>"; };
 		E088CC912447124D000DAA8A /* BindViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BindViewController.swift; sourceTree = "<group>"; };
 		E088CC922447124D000DAA8A /* BindViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BindViewController.xib; sourceTree = "<group>"; };
@@ -743,6 +749,8 @@
 		E0A75489244A8F0F00A84B67 /* CheckWareHourseViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CheckWareHourseViewController.xib; sourceTree = "<group>"; };
 		E0AA3A86248F3C5E00CBFC27 /* StatisticsModel.swif.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatisticsModel.swif.swift; sourceTree = "<group>"; };
 		E0AA3A88248F3E1400CBFC27 /* StatisticsInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatisticsInterface.swift; sourceTree = "<group>"; };
+		E0AA3A8F248F626400CBFC27 /* XinCaiGouViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XinCaiGouViewController.swift; sourceTree = "<group>"; };
+		E0AA3A90248F626400CBFC27 /* XinCaiGouViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = XinCaiGouViewController.xib; sourceTree = "<group>"; };
 		E0B5307C247266F400FFCC15 /* DKXDAdrCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DKXDAdrCell.swift; sourceTree = "<group>"; };
 		E0B5307D247266F400FFCC15 /* DKXDAdrCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DKXDAdrCell.xib; sourceTree = "<group>"; };
 		E0B5308324728D7E00FFCC15 /* ShopWarehouseListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopWarehouseListModel.swift; sourceTree = "<group>"; };
@@ -1547,8 +1555,12 @@
 		E07B1E75245966C90055BA3C /* 新增采购单 */ = {
 			isa = PBXGroup;
 			children = (
-				E07B1E76245966E60055BA3C /* XinCaiGouViewController.swift */,
-				E07B1E77245966E60055BA3C /* XinCaiGouViewController.xib */,
+				E0AA3A8F248F626400CBFC27 /* XinCaiGouViewController.swift */,
+				E0AA3A90248F626400CBFC27 /* XinCaiGouViewController.xib */,
+				E007B1D2248F6880004D14CC /* CGDDayCell.swift */,
+				E007B1D3248F6880004D14CC /* CGDDayCell.xib */,
+				E007B1D6248F7276004D14CC /* CGDCell.swift */,
+				E007B1D7248F7276004D14CC /* CGDCell.xib */,
 			);
 			path = "新增采购单";
 			sourceTree = "<group>";
@@ -2739,6 +2751,7 @@
 				E02C882B2456B4BA00925766 /* WLGZCell.xib in Resources */,
 				E042F735245274F200CDFA12 /* YunDanLieBiaoCell.xib in Resources */,
 				E0D197CB24484D90002B080C /* PersonCenterCell.xib in Resources */,
+				E007B1D5248F6880004D14CC /* CGDDayCell.xib in Resources */,
 				E07B1E63245921A60055BA3C /* KeHuXQCell.xib in Resources */,
 				E00D85EB244561FE00F5F816 /* LaunchScreen.storyboard in Resources */,
 				E02FD9FB24557E8600E10E27 /* XinZengDiZhiViewController.xib in Resources */,
@@ -2752,6 +2765,7 @@
 				E0DDCB19244AE2AC00DF54C7 /* XiuGaiYuShouJiaViewController.xib in Resources */,
 				E00E48BF2457BAC700F16545 /* XuanZeShangPinCell.xib in Resources */,
 				E06524FE24581BD900CA22E2 /* PiCiXuanZeViewController.xib in Resources */,
+				E0AA3A92248F626400CBFC27 /* XinCaiGouViewController.xib in Resources */,
 				E09F4CA32452D18800BE033D /* ZengZhiServicesViewController.xib in Resources */,
 				F95D9CA524493E840080D6E3 /* ShopInfoViewController.xib in Resources */,
 				F961D26F245015D6007FBE70 /* SelectContentView.xib in Resources */,
@@ -2772,7 +2786,6 @@
 				F971D7B3248B6432007F1619 /* address_new.json in Resources */,
 				E00D85E8244561FE00F5F816 /* Preview Assets.xcassets in Resources */,
 				E02DDD962450106C00ABB707 /* PuTongJieTiCell.xib in Resources */,
-				E07B1E79245966E60055BA3C /* XinCaiGouViewController.xib in Resources */,
 				E0BE8A88245A7A1500E80134 /* JiBenXinXiCell.xib in Resources */,
 				F93E320F2473DF2300524DFC /* GeliAlertTextView.xib in Resources */,
 				F9B6D9E32486891C00111698 /* MoreAndTimeSelectView.xib in Resources */,
@@ -2786,6 +2799,7 @@
 				F95D9B5024484FAE0080D6E3 /* GeliAlertView.xib in Resources */,
 				E01EA1A1245A5D6B00F019D5 /* YunDanXiangQingViewController.xib in Resources */,
 				E0BE8A8C245A7D3300E80134 /* BtmBtnCell.xib in Resources */,
+				E007B1D9248F7276004D14CC /* CGDCell.xib in Resources */,
 				E0DDCB1E244AE81800DF54C7 /* GuanLianKeHuCell.xib in Resources */,
 				E0DDCB14244ADF2C00DF54C7 /* ChangePriceNormalCell.xib in Resources */,
 				E01EA1A5245A60E000F019D5 /* XiaDanChengGongViewController.xib in Resources */,
@@ -2944,7 +2958,6 @@
 				F95567A72453DA86009674AB /* WarehoseMangementListVC.swift in Sources */,
 				F933F6CF2452C68B00189561 /* PKHUDErrorView.swift in Sources */,
 				F933C42E2484A66C0058940C /* WorkTestModel.swift in Sources */,
-				E07B1E78245966E60055BA3C /* XinCaiGouViewController.swift in Sources */,
 				F933F6C42452C68B00189561 /* PKHUD.swift in Sources */,
 				E0F97B102451728D001BD600 /* AddGuiGeCell.swift in Sources */,
 				E0F97B1A2451951D001BD600 /* ShangPinGguiGeCell.swift in Sources */,
@@ -3048,6 +3061,7 @@
 				E0273DD824551B4C00B3FCAE /* SendTimeSelectView.swift in Sources */,
 				E08A7AE024652E2C00F934F2 /* BingDingKeHuViewController.swift in Sources */,
 				F96E9D5A246656A700B5B94A /* HGImageCollectionViewController.swift in Sources */,
+				E0AA3A91248F626400CBFC27 /* XinCaiGouViewController.swift in Sources */,
 				E09B03A12445AF7100211A51 /* Define.swift in Sources */,
 				F961D271245016B7007FBE70 /* SelectContentView.swift in Sources */,
 				F933F6C02452C68B00189561 /* PKHUDSystemActivityIndicatorView.swift in Sources */,
@@ -3088,6 +3102,7 @@
 				F950FDDC24518B9500C40530 /* FSCalendar.m in Sources */,
 				F9FF7BA124760DA9006E305E /* LogisticsCompanyModel.swift in Sources */,
 				E0206327246CD84A007A40C4 /* TitleAndLblView.swift in Sources */,
+				E007B1D4248F6880004D14CC /* CGDDayCell.swift in Sources */,
 				F942A7FD247500C300FDFC47 /* TestClass.swift in Sources */,
 				F950FDD824518B9500C40530 /* FSCalendarDelegationProxy.m in Sources */,
 				E01EA1A0245A5D6B00F019D5 /* YunDanXiangQingViewController.swift in Sources */,
@@ -3158,6 +3173,7 @@
 				E02DDD9924501A5B00ABB707 /* DelGuiGeCell.swift in Sources */,
 				E0CC847E24823602009B1FE9 /* WarehouseIoListModel.swift in Sources */,
 				E088CC932447124D000DAA8A /* BindViewController.swift in Sources */,
+				E007B1D8248F7276004D14CC /* CGDCell.swift in Sources */,
 				E0B9461E24566B3100FBEC9A /* TitleAndTFAndBtnCell.swift in Sources */,
 				E042F74324529B7B00CDFA12 /* JiTuoWuXinXiView.swift in Sources */,
 				F933F6CC2452C68B00189561 /* WindowRootViewController.swift in Sources */,

GeliBusinessPlatform/View/Cell/TitleAndBtnCell.xib

@@ -2,6 +2,7 @@
 <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">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
+        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>

GeliBusinessPlatform/View/Cell/TitleAndTFCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<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">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <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/ViewController/地址管理/XinZengDiZhiViewController.swift

@@ -103,7 +103,7 @@ class XinZengDiZhiViewController: BaseViewController,UITableViewDelegate,UITable
     var cityIndex = 0
     //选择的区（县）索引
     var areaIndex = 0
-    var adrStr = ""//详细地址地址
+    var adrStr = ""//详细地址
     var nameStr = ""//收货人
     var phone = ""//手机
     var tel = ""//电话
@@ -116,7 +116,7 @@ class XinZengDiZhiViewController: BaseViewController,UITableViewDelegate,UITable
     @IBOutlet weak var listView: UITableView!
     @IBAction func saveAction(_ sender: Any) {
         print("save ")
-        if holderArr.first == "请填写收货人姓名"{
+        if nameStr.count == 0{
             HUD.flash(.label("请填写收货人姓名"), delay: 1.2)
             return
         }
@@ -124,11 +124,11 @@ class XinZengDiZhiViewController: BaseViewController,UITableViewDelegate,UITable
             HUD.flash(.label("请选择城市"), delay: 1.2)
             return
         }
-        if holderArr[2] == "请输入详细地址"{
+        if adrStr.count == 0 {
             HUD.flash(.label("请输入详细地址"), delay: 1.2)
             return
         }
-        if holderArr[3] == "请请输入手机号"{
+        if  phone.count == 0{
             HUD.flash(.label("请输入手机号"), delay: 1.2)
             return
         }
@@ -400,6 +400,8 @@ class XinZengDiZhiViewController: BaseViewController,UITableViewDelegate,UITable
             let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFAndBtnCell") as! TitleAndTFAndBtnCell
             cell.titleLbl.text = titleArr[indexPath.row]
             cell.textTF.text = adrStr
+            cell.textTF.delegate = self
+            cell.textTF.tag = 2
             cell.textTF.placeholder = holderArr[indexPath.row]
             cell.delegate = self
             return cell
@@ -562,6 +564,9 @@ class XinZengDiZhiViewController: BaseViewController,UITableViewDelegate,UITable
         if textField.tag == 5 {
             zip = textField.text!
         }
+        if textField.tag == 2 {
+            adrStr = textField.text!
+        }
         listView.reloadData()
     }
     

GeliBusinessPlatform/ViewController/新增采购单/CGDCell.swift

+//
+//  CGDCell.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2020/6/9.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import UIKit
+
+class CGDCell: UITableViewCell {
+
+    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/新增采购单/CGDCell.xib

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13142" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12042"/>
+        <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="CGDCell" 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="43"/>
+                <autoresizingMask key="autoresizingMask"/>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+        </tableViewCell>
+    </objects>
+</document>

GeliBusinessPlatform/ViewController/新增采购单/CGDDayCell.swift

+//
+//  CGDDayCell.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2020/6/9.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import UIKit
+
+class CGDDayCell: UITableViewCell {
+
+    @IBOutlet weak var dayLbl: UILabel!
+    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/新增采购单/CGDDayCell.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">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <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"/>
+    </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="CGDDayCell" 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="252" verticalHuggingPriority="251" text="采购日期" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="78O-wq-zr3">
+                        <rect key="frame" x="15" y="14" width="54" height="16"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                        <color key="textColor" name="标题字颜色"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="B7S-iU-1L5">
+                        <rect key="frame" x="15" y="43" width="305" height="1"/>
+                        <color key="backgroundColor" name="灰色分界线"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="1" id="ACw-d4-Pzt"/>
+                        </constraints>
+                    </view>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rili" translatesAutoresizingMaskIntoConstraints="NO" id="3jt-vk-O8G">
+                        <rect key="frame" x="289" y="15.5" width="16" height="13.5"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="13.5" id="a1D-2H-hX5"/>
+                            <constraint firstAttribute="width" constant="16" id="wKH-RH-LO4"/>
+                        </constraints>
+                    </imageView>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请选择时间" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="of0-XX-lgJ">
+                        <rect key="frame" x="84" y="13" width="190" height="18.5"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="18.5" id="J73-2s-5xs"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                        <color key="textColor" name="个人中心灰色字体"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+                <constraints>
+                    <constraint firstAttribute="bottom" secondItem="B7S-iU-1L5" secondAttribute="bottom" id="6lF-C9-16q"/>
+                    <constraint firstAttribute="trailing" secondItem="B7S-iU-1L5" secondAttribute="trailing" id="Bbf-Sy-SKb"/>
+                    <constraint firstAttribute="trailing" secondItem="3jt-vk-O8G" secondAttribute="trailing" constant="15" id="Ee9-dw-XYz"/>
+                    <constraint firstItem="78O-wq-zr3" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="Hjl-B4-rqP"/>
+                    <constraint firstItem="B7S-iU-1L5" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="MQo-5r-Maw"/>
+                    <constraint firstItem="of0-XX-lgJ" firstAttribute="centerY" secondItem="78O-wq-zr3" secondAttribute="centerY" id="TlT-iM-0lZ"/>
+                    <constraint firstItem="3jt-vk-O8G" firstAttribute="leading" secondItem="of0-XX-lgJ" secondAttribute="trailing" constant="15" id="dR0-fw-dVC"/>
+                    <constraint firstItem="78O-wq-zr3" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="fMC-Al-kdd"/>
+                    <constraint firstItem="3jt-vk-O8G" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="zfK-b3-e6m"/>
+                    <constraint firstItem="of0-XX-lgJ" firstAttribute="leading" secondItem="78O-wq-zr3" secondAttribute="trailing" constant="15" id="zwy-gh-YQA"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+            <connections>
+                <outlet property="dayLbl" destination="of0-XX-lgJ" id="wXK-D3-7sr"/>
+            </connections>
+            <point key="canvasLocation" x="131.8840579710145" y="132.58928571428572"/>
+        </tableViewCell>
+    </objects>
+    <resources>
+        <image name="rili" width="18" height="15.5"/>
+        <namedColor name="个人中心灰色字体">
+            <color red="0.3919999897480011" green="0.3919999897480011" blue="0.3919999897480011" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+        <namedColor name="标题字颜色">
+            <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+        <namedColor name="灰色分界线">
+            <color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+    </resources>
+</document>

GeliBusinessPlatform/ViewController/新增采购单/XinCaiGouViewController.swift

@@ -2,276 +2,147 @@
 //  XinCaiGouViewController.swift
 //  GeliBusinessPlatform
 //
-//  Created by junye lu on 2020/4/29.
+//  Created by junye lu on 2020/6/9.
 //  Copyright © 2020 junye lu. All rights reserved.
 //
 
 import UIKit
 
-class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAlertSelectViewDelegate,AddGuiGeCellDelegate{
-    func GLASClose(view: GLAlertSelectView, selectnum: Int, selectArr: Array<Int>) {
-          if selectnum != 10086 {
-        if view.titleLbl.text == "请选择购物类型" {
-             gouWuType = selectnum
-            }
-            
-        }
-     
-         view.removeFromSuperview()
-        glSelectView = nil
-    }
-    
-    
-    var glSelectView:GLAlertSelectView? = nil
+class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource {
     
-    @IBOutlet weak var lineView: UIView!
-    @IBAction func btnAction(_ sender: Any) {
-        //sender.tag 0:提交 1:提交并新增
+    //MARK: - 提交审核
+    @IBAction func submitAction(_ sender: Any) {
+        print("submit")
     }
-    
     @IBOutlet weak var listView: UITableView!
-    
-    var isEdit:Bool?
-    //测试数据
-    var data:NSDictionary? = nil
-    var gouWuType:Int? //购物类型
+    @IBOutlet weak var btmLine: UIView!
+    var datas:Array<Any> = []
+    let titleArr = ["采购日期","供应商","采购人","制单人","采购类型"]
+    let holderArr = ["","请选择供应商","请输入采购人姓名","","请选择采购类型"]
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        //编辑状态
-        //        isEdit = true
-        //        data = NSDictionary()
-        //
-        
         navbar.title = "新增采购单"
         self.view.addSubview(navbar)
-        
+        SetTopFrameView(view: listView, btmView: btmLine)
         listView.separatorStyle = .none
-        SetTopFrameView(view: listView, btmView: lineView)
-        listView.register(UINib(nibName: "TitleAndTFCell", bundle: nil), forCellReuseIdentifier: "TitleAndTFCell")
+        
         listView.register(UINib(nibName: "TitleAndBtnCell", bundle: nil), forCellReuseIdentifier: "TitleAndBtnCell")
-        listView.register(UINib(nibName: "AddGuiGeCell", bundle: nil), forCellReuseIdentifier: "AddGuiGeCell")
-        listView.register(UINib(nibName: "RuKuJiaGeCell", bundle: nil), forCellReuseIdentifier: "RuKuJiaGeCell")
-        listView.register(UINib(nibName: "DaiKeXiaDanGouWuCell", bundle: nil), forCellReuseIdentifier: "DaiKeXiaDanGouWuCell")
-    }
-    //MARK: - CELL DELEGATE
-    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
-        if section == 1 {
-            let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 36))
-            view.backgroundColor = UIColor.white
-            let title = UILabel()
-            title.text = "商品清单"
-            title.font = UIFont.boldSystemFont(ofSize: 15)
-            title.textColor = UIColor(named: "标题字颜色")
-            view.addSubview(title)
-            title.sizeToFit()
-            title.snp.makeConstraints { (make) in
-                make.left.equalTo(15)
-                make.height.equalTo(21)
-                make.width.equalTo(title.bounds.size.width)
-                make.bottom.equalTo(0)
-            }
-            let ti1 = UILabel()
-            ti1.text = "（仅支持采购一种商品）"
-            ti1.font = UIFont.boldSystemFont(ofSize: 11)
-            ti1.textColor = UIColor(named: "灰色字体颜色")
-            view.addSubview(ti1)
-            ti1.sizeToFit()
-            ti1.snp.makeConstraints { (make) in
-                make.left.equalTo(title.snp_right)
-                make.height.equalTo(15)
-                make.width.equalTo(ti1.bounds.size.width)
-                make.bottom.equalTo(0)
-            }
-            return view
-        }
-        return UIView()
-    }
-    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        if section == 1 {
-            return 38
-        }
-        return 0.001
-    }
-    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
-        if isEdit == true /*&& 有商品 */{
-            if section == 1 {
-                return 87
-            }
-        }
-        return 10
-    }
-    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
-        if isEdit == true && data != nil {
-            if section == 1 {
-                let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 87))
-                let bgV = UIView()
-                bgV.backgroundColor = UIColor.white
-                view.addSubview(bgV)
-                bgV.snp.makeConstraints { (make) in
-                    make.top.left.right.equalTo(0)
-                    make.height.equalTo(77)
-                }
-                let line = UIView()
-                line.backgroundColor = UIColor(named: "灰色分界线")
-                view.addSubview(line)
-                line.snp.makeConstraints { (make) in
-                    make.top.right.equalTo(0)
-                    make.left.equalTo(15)
-                    make.height.equalTo(1)
+        listView.register(UINib(nibName: "TitleAndTFCell", bundle: nil), forCellReuseIdentifier: "TitleAndTFCell")
+        listView.register(UINib(nibName: "CGDDayCell", bundle: nil), forCellReuseIdentifier: "CGDDayCell")
     }
     
-                let countLbl = UILabel()
-                countLbl.text = "abc"
-                countLbl.font = UIFont.boldSystemFont(ofSize: 13)
-                countLbl.textColor = UIColor(named: "蓝色字体颜色")
-                countLbl.sizeToFit()
-                view.addSubview(countLbl)
-                countLbl.snp.makeConstraints { (make) in
-                    make.right.equalTo(-15)
-                    make.top.equalTo(15)
-                    make.height.equalTo(18.5)
-                    make.width.equalTo(countLbl.bounds.size.width)
+    //MARK: - cell delegate
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if indexPath.section == 0 {
+            switch indexPath.row {
+            case 0://时间
+                break
+            case 1://供应商
+                break
+            case 4://采购类型
+                break
+            default:
+                break
             }
-                let countTLbl = UILabel()
-                countTLbl.text = "商品合计："
-                countTLbl.font = UIFont.systemFont(ofSize: 13)
-                countTLbl.textAlignment = .right
-                countTLbl.textColor = UIColor(named: "标题字颜色")
-                view.addSubview(countTLbl)
-                countTLbl.snp.makeConstraints { (make) in
-                    make.right.equalTo(countLbl.snp_left)
-                    make.left.top.equalTo(15)
-                    make.height.equalTo(18.5)
         }
-                
-                let countLbl2 = UILabel()
-                countLbl2.text = "a123123123bc"
-                countLbl2.font = UIFont.systemFont(ofSize: 13)
-                countLbl2.textColor = UIColor(named: "蓝色字体颜色")
-                countLbl2.sizeToFit()
-                view.addSubview(countLbl2)
-                countLbl2.snp.makeConstraints { (make) in
-                    make.right.equalTo(-15)
-                    make.top.equalTo(countTLbl.snp_bottom).offset(10)
-                    make.height.equalTo(18.5)
-                    make.width.equalTo(countLbl2.bounds.size.width)
     }
     
-                let countTLbl2 = UILabel()
-                countTLbl2.text = "订单合计："
-                countTLbl2.font = UIFont.systemFont(ofSize: 13)
-                countTLbl2.textAlignment = .right
-                countTLbl2.textColor = UIColor(named: "标题字颜色")
-                view.addSubview(countTLbl2)
-                countTLbl2.snp.makeConstraints { (make) in
-                    make.right.equalTo(countLbl2.snp_left)
-                    make.centerY.equalTo(countLbl2.snp_centerY)
-                    make.height.equalTo(18.5)
+    //MARK: - 添加商品
+    @objc func addItemAction(){
+        print("add product")
+        datas.append("1")
+        listView.reloadData()
     }
-                
-                return view
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if indexPath.section == 0 {
+            if indexPath.row == 1 || indexPath.row == 4 {
+                let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndBtnCell") as! TitleAndBtnCell
+                cell.nameLbl.text = titleArr[indexPath.row]
+                cell.contentLbl.text = holderArr[indexPath.row]
+                cell.btn.isUserInteractionEnabled = false
+                return cell
+            }else if indexPath.row == 0{
+                let cell = tableView.dequeueReusableCell(withIdentifier: "CGDDayCell") as! CGDDayCell
+                return cell
+            }else{
+                let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
+                cell.nameLbl.text = titleArr[indexPath.row]
+                cell.textTF.placeholder = holderArr[indexPath.row]
+                if indexPath.row == 3 {
+                    cell.textTF.isUserInteractionEnabled = false
                 }
+                return cell
             }
-        let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 10))
-        return view
         }
-    let p1Arr = ["采购单号：","采购日期：","供应商：","采购人：","制单人：","采购类型："]
-    let p3Arr = ["采购数量：","采购单价：","采购金额："]
         
-    let hold1Arr = ["请输入采购单号","请选择采购日期","请选择供应商","请输入采购人姓名","请输入制单人姓名","请选择采购类型"]
-    func numberOfSections(in tableView: UITableView) -> Int {
-        return 3
-    }
-    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        switch section {
-        case 0:return 6
-        case 1:return 1
-        default:return 3
-        }
+        let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndBtnCell") as! TitleAndBtnCell
+        return cell
     }
+    
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        if indexPath.section == 1 {
-            return 123.5
-        }
-        return 49
-    }
-    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if indexPath.section == 0 {
-            if indexPath.row == 2{//跳转供应商选择
-                let vc = GYSListViewController()
-                vc.barTitle = "请选择供应商"
-                self.navigationController?.pushViewController(vc, animated: true)
+            return 49
         }
-            if indexPath.row == 5 {
-                if glSelectView == nil {
-                    let view = GLAlertSelectView(frame: self.view.bounds)
-                    //                    view.isMultipleSelect = false//是否多选
-                    if gouWuType != nil {
-                        view.selectNum = gouWuType!
-                        view.tempNum = view.selectNum
+        return 174
     }
-                    view.delegate = self
-                    view.titleLbl.text = "请选择购物类型"
-                    view.dataArr = ["普通订单","预售下单"]
-                    self.view.addSubview(view)
-                    glSelectView = view
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        if section == 0 {
+            let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 15))
+            view.backgroundColor = UIColor(named: "app底色")
+            return view
         }
+        let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 135))
+        view.backgroundColor = UIColor.white
+        let img = UIImageView()
+        img.image = UIImage(named: "tianjiashangpin")
+        view.addSubview(img)
+        img.snp.makeConstraints { (make) in
+            make.top.equalTo(50)
+            make.centerX.equalTo(view.snp_centerX)
+            make.width.height.equalTo(52)
+        }
+        let btn = UIButton()
+        view.addSubview(btn)
+        btn.snp.makeConstraints { (make) in
+            make.top.left.right.bottom.equalTo(0)
+        }
+        btn.addTarget(self, action: #selector(addItemAction), for: .touchUpInside)
+        return view
     }
+    
+    
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        if section == 0 {
+            return 15
         }
+        return 135
     }
-    
-    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        switch indexPath.section {
-        case 0:
-            if indexPath.row == 1 || indexPath.row == 2 || indexPath.row == 5 {
-                let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndBtnCell") as! TitleAndBtnCell
-                cell.nameLbl.text = p1Arr[indexPath.row]
-                cell.contentLbl.text = hold1Arr[indexPath.row]
-                cell.btn.isUserInteractionEnabled = false
-                return cell
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 2
     }
-            let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
-            cell.nameLbl.text = p1Arr[indexPath.row]
-            cell.textTF.placeholder = hold1Arr[indexPath.row]
-            return cell
-        case 1:
-            if data != nil{//有数据
-                let cell = tableView.dequeueReusableCell(withIdentifier: "DaiKeXiaDanGouWuCell") as! DaiKeXiaDanGouWuCell
-                cell.delImg.isHidden = true
-                cell.delBtn.isHidden = true
-                cell.changeBtn.isHidden = false
-                return cell
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if section == 0 {
+            return titleArr.count
         }
-            let cell = tableView.dequeueReusableCell(withIdentifier: "AddGuiGeCell") as! AddGuiGeCell
-            cell.imgBtn.setImage(UIImage(named: "tianjiashangpin"), for: .normal)
-            cell.delegate = self
-            return cell
-        default:
-            if indexPath.row == 0 {
-                let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
-                cell.nameLbl.text = p3Arr[indexPath.row]
-                cell.textTF.placeholder = "请输入采购数量"
-                return cell
-            }else{
-                let cell = tableView.dequeueReusableCell(withIdentifier: "RuKuJiaGeCell") as! RuKuJiaGeCell
-                cell.nameLbl.text = p3Arr[indexPath.row]
-                return cell
+        return datas.count
     }
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        if section == 1 {
+            let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 39))
+            let lbl = UILabel(frame: CGRect(x: 15, y: 15, width: fullScreenWidth, height: 21))
+            lbl.text = "选择商品"
+            lbl.textColor = UIColor(named: "标题字颜色")
+            lbl.font = UIFont.boldSystemFont(ofSize: 15)
+            view.addSubview(lbl)
+            return view
         }
+        return UIView()
     }
-    //MARK: - 自定义Delegate
-    
-    func AddGuiGeCellClick(cell: AddGuiGeCell) {
-        print("AddGuiGeCellClick")
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        if section == 1 {
+            return 39
         }
-    
-    func GLAlertSelectViewClick(selectNum: Int, view: GLAlertSelectView) {
-        print("单选",selectNum)
-        glSelectView?.removeFromSuperview()
-        glSelectView = nil
+        return 0.001
     }
-    
- 
-    
 }

GeliBusinessPlatform/ViewController/新增采购单/XinCaiGouViewController.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<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">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <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"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="XinCaiGouViewController" customModule="GeliBusinessPlatform" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="XinCaiGouViewController" customModule="TestClass" customModuleProvider="target">
             <connections>
-                <outlet property="lineView" destination="JYw-Ey-g0U" id="Srw-DG-ZYT"/>
-                <outlet property="listView" destination="Kwt-zo-ggd" id="pVj-F4-Gv3"/>
+                <outlet property="btmLine" destination="cSW-1R-48s" id="W3Q-FC-Bvs"/>
+                <outlet property="listView" destination="Cs6-iU-pYN" id="3RO-hA-kcA"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
             </connections>
         </placeholder>
@@ -20,104 +21,66 @@
             <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JYw-Ey-g0U">
-                    <rect key="frame" x="0.0" y="812" width="414" height="1"/>
-                    <color key="backgroundColor" name="灰色分界线"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="1" id="j1b-Ww-Uj9"/>
-                    </constraints>
-                </view>
-                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Kwt-zo-ggd">
-                    <rect key="frame" x="0.0" y="44" width="414" height="768"/>
-                    <color key="backgroundColor" name="app底色"/>
-                    <connections>
-                        <outlet property="dataSource" destination="-1" id="Ubz-IY-3xj"/>
-                        <outlet property="delegate" destination="-1" id="XdQ-s4-RF2"/>
-                    </connections>
-                </tableView>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QjX-yY-Gxg">
-                    <rect key="frame" x="0.0" y="812" width="414" height="84"/>
-                    <subviews>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jnW-bv-WHd">
-                            <rect key="frame" x="0.0" y="0.0" width="207" height="84"/>
-                            <color key="backgroundColor" name="白色背景色"/>
-                            <state key="normal" title="提交并新增">
-                                <color key="titleColor" name="白色背景色"/>
-                            </state>
-                            <connections>
-                                <action selector="btnAction:" destination="-1" eventType="touchUpInside" id="sgC-b4-ejt"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DeH-dV-ARk">
-                            <rect key="frame" x="207" y="0.0" width="207" height="84"/>
-                            <color key="backgroundColor" name="白色背景色"/>
-                            <state key="normal" title="提交申请">
-                                <color key="titleColor" name="白色背景色"/>
-                            </state>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1yh-oh-zJe" customClass="LGButton" customModule="LGButton">
+                    <rect key="frame" x="0.0" y="813" width="414" height="83"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="NO"/>
+                        <userDefinedRuntimeAttribute type="color" keyPath="bgColor">
+                            <color key="value" name="白色背景色"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
                     <connections>
-                                <action selector="btnAction:" destination="-1" eventType="touchUpInside" id="VTE-za-KIs"/>
+                        <action selector="submitAction:" destination="-1" eventType="touchUpInside" id="g2L-cb-5uh"/>
                     </connections>
-                        </button>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="提交申请" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="coa-Jy-9pf">
-                            <rect key="frame" x="0.0" y="0.0" width="207" height="49"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="49" id="32z-mL-GtC"/>
-                            </constraints>
-                            <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="17"/>
-                            <color key="textColor" name="蓝色字体颜色"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="提交并新增" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="30U-PO-mW3">
-                            <rect key="frame" x="207" y="0.0" width="207" height="49"/>
+                </view>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="提交申请" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0WX-TF-5sE">
+                    <rect key="frame" x="0.0" y="813" width="414" height="49"/>
                     <constraints>
-                                <constraint firstAttribute="height" constant="49" id="mV2-St-gW3"/>
+                        <constraint firstAttribute="height" constant="49" id="vbT-1r-JRY"/>
                     </constraints>
                     <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="17"/>
                     <color key="textColor" name="蓝色字体颜色"/>
                     <nil key="highlightedColor"/>
                 </label>
-                    </subviews>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cSW-1R-48s">
+                    <rect key="frame" x="0.0" y="812" width="414" height="1"/>
+                    <color key="backgroundColor" name="灰色分界线"/>
                     <constraints>
-                        <constraint firstAttribute="bottom" secondItem="DeH-dV-ARk" secondAttribute="bottom" id="0xx-Xx-OJG"/>
-                        <constraint firstAttribute="bottom" secondItem="jnW-bv-WHd" secondAttribute="bottom" id="4QI-Xh-3AD"/>
-                        <constraint firstItem="jnW-bv-WHd" firstAttribute="top" secondItem="QjX-yY-Gxg" secondAttribute="top" id="RKr-kv-vAb"/>
-                        <constraint firstItem="coa-Jy-9pf" firstAttribute="leading" secondItem="jnW-bv-WHd" secondAttribute="leading" id="Rgk-8e-zle"/>
-                        <constraint firstItem="DeH-dV-ARk" firstAttribute="width" secondItem="jnW-bv-WHd" secondAttribute="width" id="Ruz-hd-qpE"/>
-                        <constraint firstAttribute="trailing" secondItem="DeH-dV-ARk" secondAttribute="trailing" id="T6O-Cm-uvJ"/>
-                        <constraint firstItem="jnW-bv-WHd" firstAttribute="leading" secondItem="QjX-yY-Gxg" secondAttribute="leading" id="WkM-Tg-HDY"/>
-                        <constraint firstItem="30U-PO-mW3" firstAttribute="leading" secondItem="DeH-dV-ARk" secondAttribute="leading" id="XPH-rX-Kn3"/>
-                        <constraint firstItem="coa-Jy-9pf" firstAttribute="trailing" secondItem="jnW-bv-WHd" secondAttribute="trailing" id="bNU-dJ-pZo"/>
-                        <constraint firstItem="30U-PO-mW3" firstAttribute="trailing" secondItem="DeH-dV-ARk" secondAttribute="trailing" id="k4H-Cc-fXc"/>
-                        <constraint firstItem="coa-Jy-9pf" firstAttribute="top" secondItem="jnW-bv-WHd" secondAttribute="top" id="mCY-Tc-ON6"/>
-                        <constraint firstItem="30U-PO-mW3" firstAttribute="top" secondItem="DeH-dV-ARk" secondAttribute="top" id="nZE-MU-vTD"/>
-                        <constraint firstItem="DeH-dV-ARk" firstAttribute="leading" secondItem="jnW-bv-WHd" secondAttribute="trailing" id="piu-Z1-f5p"/>
-                        <constraint firstItem="DeH-dV-ARk" firstAttribute="top" secondItem="QjX-yY-Gxg" secondAttribute="top" id="wkC-K5-dno"/>
+                        <constraint firstAttribute="height" constant="1" id="fK5-AP-LGO"/>
                     </constraints>
                 </view>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="Cs6-iU-pYN">
+                    <rect key="frame" x="0.0" y="44" width="414" height="768"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <connections>
+                        <outlet property="dataSource" destination="-1" id="4d1-os-XKU"/>
+                        <outlet property="delegate" destination="-1" id="juZ-cO-vTy"/>
+                    </connections>
+                </tableView>
             </subviews>
-            <color key="backgroundColor" name="app底色"/>
+            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
             <constraints>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="JYw-Ey-g0U" secondAttribute="trailing" id="1ns-VQ-1GJ"/>
-                <constraint firstItem="JYw-Ey-g0U" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="8et-NG-sgE"/>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="Kwt-zo-ggd" secondAttribute="trailing" id="Chf-YR-Em0"/>
-                <constraint firstItem="QjX-yY-Gxg" firstAttribute="top" secondItem="Kwt-zo-ggd" secondAttribute="bottom" id="Mpa-qz-Mdb"/>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="JYw-Ey-g0U" secondAttribute="bottom" constant="49" id="W6R-3m-CJM"/>
-                <constraint firstAttribute="bottom" secondItem="QjX-yY-Gxg" secondAttribute="bottom" id="ba3-NQ-FAc"/>
-                <constraint firstItem="QjX-yY-Gxg" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="psm-kJ-NXd"/>
-                <constraint firstAttribute="trailing" secondItem="QjX-yY-Gxg" secondAttribute="trailing" id="qkZ-Nu-9nv"/>
-                <constraint firstItem="Kwt-zo-ggd" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="tIH-PR-7In"/>
-                <constraint firstItem="Kwt-zo-ggd" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="vkD-GP-DTj"/>
-                <constraint firstItem="JYw-Ey-g0U" firstAttribute="top" secondItem="QjX-yY-Gxg" secondAttribute="top" id="zw5-Yq-Eps"/>
+                <constraint firstAttribute="bottom" secondItem="1yh-oh-zJe" secondAttribute="bottom" id="6tb-Es-vOW"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="Cs6-iU-pYN" secondAttribute="trailing" id="7d6-BN-QIg"/>
+                <constraint firstItem="cSW-1R-48s" firstAttribute="top" secondItem="Cs6-iU-pYN" secondAttribute="bottom" id="Cn5-hv-7B2"/>
+                <constraint firstItem="cSW-1R-48s" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="Daa-AA-QPw"/>
+                <constraint firstItem="0WX-TF-5sE" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="EkB-7A-ftO"/>
+                <constraint firstItem="Cs6-iU-pYN" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="HoZ-Yt-v0H"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="0WX-TF-5sE" secondAttribute="bottom" id="IjZ-HE-bDf"/>
+                <constraint firstAttribute="trailing" secondItem="1yh-oh-zJe" secondAttribute="trailing" id="L84-6Q-iWL"/>
+                <constraint firstItem="1yh-oh-zJe" firstAttribute="top" secondItem="0WX-TF-5sE" secondAttribute="top" id="dA6-py-nWx"/>
+                <constraint firstItem="1yh-oh-zJe" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="mek-ad-ul4"/>
+                <constraint firstItem="Cs6-iU-pYN" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="rH1-Ps-BJC"/>
+                <constraint firstItem="1yh-oh-zJe" firstAttribute="top" secondItem="cSW-1R-48s" secondAttribute="bottom" id="rx4-zx-m6E"/>
+                <constraint firstAttribute="trailing" secondItem="cSW-1R-48s" secondAttribute="trailing" id="wzu-wi-iLA"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="0WX-TF-5sE" secondAttribute="trailing" id="z4Z-Wl-qhJ"/>
             </constraints>
             <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
-            <point key="canvasLocation" x="131.8840579710145" y="120.53571428571428"/>
+            <point key="canvasLocation" x="131.8840579710145" y="91.741071428571431"/>
         </view>
     </objects>
     <resources>
-        <namedColor name="app底色">
-            <color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </namedColor>
         <namedColor name="灰色分界线">
             <color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
@@ -125,7 +88,7 @@
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="蓝色字体颜色">
-            <color red="0.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>