修改港澳台

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>