Commit 5f4e8e1a authored by lujunye's avatar lujunye

新增运单列表(缺筛选列表)

parent 6b7798f7
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
E007B1D8248F7276004D14CC /* CGDCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E007B1D6248F7276004D14CC /* CGDCell.swift */; }; E007B1D8248F7276004D14CC /* CGDCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E007B1D6248F7276004D14CC /* CGDCell.swift */; };
E007B1D9248F7276004D14CC /* CGDCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E007B1D7248F7276004D14CC /* CGDCell.xib */; }; E007B1D9248F7276004D14CC /* CGDCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E007B1D7248F7276004D14CC /* CGDCell.xib */; };
E007B1DB248F8F57004D14CC /* PurchaseInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E007B1DA248F8F57004D14CC /* PurchaseInterface.swift */; }; E007B1DB248F8F57004D14CC /* PurchaseInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E007B1DA248F8F57004D14CC /* PurchaseInterface.swift */; };
E00ACBEB2490D6C800128052 /* YDLBVc.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00ACBE92490D6C800128052 /* YDLBVc.swift */; };
E00ACBEC2490D6C800128052 /* YDLBVc.xib in Resources */ = {isa = PBXBuildFile; fileRef = E00ACBEA2490D6C800128052 /* YDLBVc.xib */; };
E00B0B1B24629E99006DC846 /* SJMapCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00B0B1924629E99006DC846 /* SJMapCell.swift */; }; E00B0B1B24629E99006DC846 /* SJMapCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00B0B1924629E99006DC846 /* SJMapCell.swift */; };
E00B0B1C24629E99006DC846 /* SJMapCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E00B0B1A24629E99006DC846 /* SJMapCell.xib */; }; E00B0B1C24629E99006DC846 /* SJMapCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E00B0B1A24629E99006DC846 /* SJMapCell.xib */; };
E00CBA0124820CF000701D9D /* CRKSumCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00CB9FF24820CF000701D9D /* CRKSumCell.swift */; }; E00CBA0124820CF000701D9D /* CRKSumCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00CB9FF24820CF000701D9D /* CRKSumCell.swift */; };
...@@ -542,6 +544,8 @@ ...@@ -542,6 +544,8 @@
E007B1D6248F7276004D14CC /* CGDCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGDCell.swift; 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>"; }; E007B1D7248F7276004D14CC /* CGDCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CGDCell.xib; sourceTree = "<group>"; };
E007B1DA248F8F57004D14CC /* PurchaseInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PurchaseInterface.swift; sourceTree = "<group>"; }; E007B1DA248F8F57004D14CC /* PurchaseInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PurchaseInterface.swift; sourceTree = "<group>"; };
E00ACBE92490D6C800128052 /* YDLBVc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YDLBVc.swift; sourceTree = "<group>"; };
E00ACBEA2490D6C800128052 /* YDLBVc.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = YDLBVc.xib; sourceTree = "<group>"; };
E00B0B1924629E99006DC846 /* SJMapCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SJMapCell.swift; 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>"; }; 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>"; }; E00CB9FF24820CF000701D9D /* CRKSumCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CRKSumCell.swift; sourceTree = "<group>"; };
...@@ -1214,6 +1218,15 @@ ...@@ -1214,6 +1218,15 @@
path = Pods; path = Pods;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
E00ACBE82490D6A100128052 /* 运单列表 */ = {
isa = PBXGroup;
children = (
E00ACBE92490D6C800128052 /* YDLBVc.swift */,
E00ACBEA2490D6C800128052 /* YDLBVc.xib */,
);
path = "运单列表";
sourceTree = "<group>";
};
E00D85D2244561FD00F5F816 = { E00D85D2244561FD00F5F816 = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -1713,6 +1726,7 @@ ...@@ -1713,6 +1726,7 @@
E03549AA24582806008BD021 /* 客户管理 */, E03549AA24582806008BD021 /* 客户管理 */,
E030DF382486517E002764D3 /* 1.1入库&出库 */, E030DF382486517E002764D3 /* 1.1入库&出库 */,
E06524EA2458006600CA22E2 /* 入库 */, E06524EA2458006600CA22E2 /* 入库 */,
E00ACBE82490D6A100128052 /* 运单列表 */,
E02C88232456B23400925766 /* 物流跟踪 */, E02C88232456B23400925766 /* 物流跟踪 */,
E02FD9EE2455704600E10E27 /* 出入库记录 */, E02FD9EE2455704600E10E27 /* 出入库记录 */,
E02FD9F3245578D800E10E27 /* 地址管理 */, E02FD9F3245578D800E10E27 /* 地址管理 */,
...@@ -2836,6 +2850,7 @@ ...@@ -2836,6 +2850,7 @@
E01EA1A5245A60E000F019D5 /* XiaDanChengGongViewController.xib in Resources */, E01EA1A5245A60E000F019D5 /* XiaDanChengGongViewController.xib in Resources */,
E042F74124528CD500CDFA12 /* TitleAndOnlyBtnCell.xib in Resources */, E042F74124528CD500CDFA12 /* TitleAndOnlyBtnCell.xib in Resources */,
E0D46C5724503EC50087B564 /* TitleAndSelectCell.xib in Resources */, E0D46C5724503EC50087B564 /* TitleAndSelectCell.xib in Resources */,
E00ACBEC2490D6C800128052 /* YDLBVc.xib in Resources */,
E013D78D2484CAFC0092DE46 /* CRKBtnCell.xib in Resources */, E013D78D2484CAFC0092DE46 /* CRKBtnCell.xib in Resources */,
E0A2E82C24555D8600D6DB34 /* KuCunXiangQingCell.xib in Resources */, E0A2E82C24555D8600D6DB34 /* KuCunXiangQingCell.xib in Resources */,
E020632D246CDD3F007A40C4 /* OrderDViewFooterView.xib in Resources */, E020632D246CDD3F007A40C4 /* OrderDViewFooterView.xib in Resources */,
...@@ -3060,6 +3075,7 @@ ...@@ -3060,6 +3075,7 @@
F9DDBE962457D3EC00A32CB2 /* WebViewController.swift in Sources */, F9DDBE962457D3EC00A32CB2 /* WebViewController.swift in Sources */,
F956D5AA246A2D9C003FF510 /* LMNBulletsLine.m in Sources */, F956D5AA246A2D9C003FF510 /* LMNBulletsLine.m in Sources */,
E06524F924581A7900CA22E2 /* ChuKuCell.swift in Sources */, E06524F924581A7900CA22E2 /* ChuKuCell.swift in Sources */,
E00ACBEB2490D6C800128052 /* YDLBVc.swift in Sources */,
F9A0E1DD246D198B00D7F26F /* CusListAllModel.swift in Sources */, F9A0E1DD246D198B00D7F26F /* CusListAllModel.swift in Sources */,
F9956B2524640D34001A617D /* GoodsClassModel.swift in Sources */, F9956B2524640D34001A617D /* GoodsClassModel.swift in Sources */,
F961D26B24500FF6007FBE70 /* HeaderSelectView.swift in Sources */, F961D26B24500FF6007FBE70 /* HeaderSelectView.swift in Sources */,
......
...@@ -2,6 +2,7 @@ ...@@ -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"> <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"/> <device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="Named colors" minToolsVersion="9.0"/> <capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/>
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" 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"/> <device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="Named colors" minToolsVersion="9.0"/> <capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
...@@ -10,7 +11,7 @@ ...@@ -10,7 +11,7 @@
<objects> <objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="FirstCell" customModule="GeliBusinessPlatform" customModuleProvider="target"> <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="FirstCell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="375" height="49"/> <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <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"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
......
<?xml version="1.0" encoding="UTF-8"?> <?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="retina4_7" orientation="portrait" appearance="light"/> <device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies> <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="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<objects> <objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="GoodsManageListVC" customModule="GeliBusinessPlatform" customModuleProvider="target"> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="GoodsManageListVC" customModule="TestClass" customModuleProvider="target">
<connections> <connections>
<outlet property="changeBgView" destination="Swh-le-IcW" id="U00-xj-SCY"/> <outlet property="changeBgView" destination="Swh-le-IcW" id="U00-xj-SCY"/>
<outlet property="collectionBgView" destination="aXP-zc-ITt" id="r7C-D3-25B"/> <outlet property="collectionBgView" destination="aXP-zc-ITt" id="r7C-D3-25B"/>
...@@ -114,7 +115,7 @@ ...@@ -114,7 +115,7 @@
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
<namedColor name="蓝色字体颜色"> <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> </namedColor>
</resources> </resources>
</document> </document>
...@@ -544,8 +544,8 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD ...@@ -544,8 +544,8 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
return return
case 119: //新增采购单 case 119: //新增采购单
// let vc = CGDXQVc() let vc = YDLBVc()
let vc = XinCaiGouViewController() // let vc = XinCaiGouViewController()
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
return return
case 120: //商品毛利统计 case 120: //商品毛利统计
......
<?xml version="1.0" encoding="UTF-8"?> <?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"/> <device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies> <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="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
...@@ -10,7 +11,7 @@ ...@@ -10,7 +11,7 @@
<objects> <objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="WLGZCell" customModule="GeliBusinessPlatform" customModuleProvider="target"> <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="WLGZCell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="375" height="49"/> <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <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"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
...@@ -85,7 +86,7 @@ ...@@ -85,7 +86,7 @@
<fragment content="代签收(雄狮前台),感谢使用京东冷运;期待再次为您服务(住单总件数:1件)"> <fragment content="代签收(雄狮前台),感谢使用京东冷运;期待再次为您服务(住单总件数:1件)">
<attributes> <attributes>
<color key="NSColor" name="灰色字体颜色"/> <color key="NSColor" name="灰色字体颜色"/>
<font key="NSFont" metaFont="message" size="11"/> <font key="NSFont" metaFont="menu" size="11"/>
<paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="3" tighteningFactorForTruncation="0.0"/> <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="3" tighteningFactorForTruncation="0.0"/>
</attributes> </attributes>
</fragment> </fragment>
...@@ -136,7 +137,7 @@ ...@@ -136,7 +137,7 @@
<color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
<namedColor name="灰色字体颜色"> <namedColor name="灰色字体颜色">
<color red="0.40000000596046448" green="0.40000000596046448" blue="0.40000000596046448" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
<namedColor name="灰色字体颜色"> <namedColor name="灰色字体颜色">
<color red="0.40000000596046448" green="0.40000000596046448" blue="0.40000000596046448" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.40000000596046448" green="0.40000000596046448" blue="0.40000000596046448" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
...@@ -145,7 +146,7 @@ ...@@ -145,7 +146,7 @@
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
<namedColor name="蓝色字体颜色"> <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> </namedColor>
</resources> </resources>
</document> </document>
...@@ -11,7 +11,7 @@ import UIKit ...@@ -11,7 +11,7 @@ import UIKit
class WuLiuGenZongViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource { class WuLiuGenZongViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource {
var dataArr:Array<Any>? var dataArr:Array<Any> = []
@IBOutlet weak var listView: UITableView! @IBOutlet weak var listView: UITableView!
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
...@@ -38,8 +38,8 @@ class WuLiuGenZongViewController: BaseViewController,UITableViewDelegate,UITable ...@@ -38,8 +38,8 @@ class WuLiuGenZongViewController: BaseViewController,UITableViewDelegate,UITable
if section == 0 { if section == 0 {
return 1 return 1
} }
// return dataArr?.count return dataArr.count
return 3
} }
func numberOfSections(in tableView: UITableView) -> Int { func numberOfSections(in tableView: UITableView) -> Int {
return 2 return 2
...@@ -55,11 +55,13 @@ class WuLiuGenZongViewController: BaseViewController,UITableViewDelegate,UITable ...@@ -55,11 +55,13 @@ class WuLiuGenZongViewController: BaseViewController,UITableViewDelegate,UITable
cell.topLine.isHidden = true cell.topLine.isHidden = true
cell.firstLbl.isHidden = false cell.firstLbl.isHidden = false
} }
// if indexPath.row == dataArr!.count-1 { if dataArr.count > 0 {
if indexPath.row == 2{ if indexPath.row == dataArr.count-1 {
cell.bottomLine.isHidden = true cell.bottomLine.isHidden = true
} }
}
return cell return cell
} }
} }
...@@ -2,6 +2,7 @@ ...@@ -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"> <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="retina4_7" orientation="portrait" appearance="light"/> <device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="Named colors" minToolsVersion="9.0"/> <capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/>
......
...@@ -2,6 +2,7 @@ ...@@ -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"> <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"/> <device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="Named colors" minToolsVersion="9.0"/> <capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/>
......
//
// YDLBVc.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/6/10.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISearchBarDelegate,SearchBarViewDelegate{
@IBAction func listControlAction(_ sender: Any) {
print("调用筛选列表")
}
@IBOutlet weak var listView: UITableView!
@IBOutlet weak var searchVBg: UIView!
@IBOutlet weak var topView: UIView!
var searchV : SearchBarView? = nil
var datas:Array<Any> = [1,2]
var keyWord = ""
override func viewDidLoad() {
super.viewDidLoad()
navbar.title = "运单列表"
self.view.addSubview(navbar)
SetTopFrame(view: topView, height: 51)
listView.separatorStyle = .none
listView.register(UINib(nibName: "YunDanLieBiaoCell", bundle: nil), forCellReuseIdentifier: "YunDanLieBiaoCell")
let searchBr = SearchBarView.init()
searchVBg.addSubview(searchBr)
searchBr.snp.makeConstraints { (make) in
make.left.equalTo(10)
make.right.equalTo(-10)
make.centerY.equalToSuperview()
make.height.equalTo(30)
}
searchV = searchBr
searchBr.placeholderStr = "请输入运单号/收货人/发货人/地址"
searchBr.cornerRadius = 35/2.0
searchBr.delegate = self
searchBr.delegateL = self
headerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadData))
self.listView!.mj_header = headerMJ
self.listView.mj_header?.beginRefreshing()
}
//MARK: - 加载数据
@objc func loadData(){
print("加载数据")
}
//MARK:--搜索模块
//MAKR:--调起搜索后添加个蒙版本
var blackBtnView:UIButton! = nil
func searchBarShouldBeginEditing(_ searchBar: UISearchBar) -> Bool {
print("调起搜索后添加个蒙版本")
blackBtnView = UIButton ()
blackBtnView.backgroundColor = UIColor.init(named: "提示视图背景色")
view.addSubview(blackBtnView)
blackBtnView.snp.makeConstraints { (make) in
make.left.right.bottom.equalToSuperview()
make.top.equalTo(searchVBg.snp_bottom)
}
blackBtnView.addTarget(self, action: #selector(removeBlackBtnView), for: .touchUpInside)
return true
}
@objc func removeBlackBtnView(){
if blackBtnView != nil {
blackBtnView.removeFromSuperview()
searchV!.resignFirstResponder()
}
}
//MARK:--搜索按钮代理
func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
print("点击搜索关键字进行--\(searchBar.text)")
searchBar.resignFirstResponder()
if blackBtnView != nil {
blackBtnView.removeFromSuperview()
}
keyWord = searchBar.text!
listView.mj_header?.beginRefreshing()
}
//MARK:--清空搜索代理
func clearSearchAction() {
}
//MARK:--编辑即将结束
func searchBarTextDidEndEditing(_ searchBar: UISearchBar) {
print("编辑即将结束了--")
removeBlackBtnView()
if keyWord.count > 0 {
keyWord = searchBar.text!
if keyWord.count == 0 {
listView.mj_header?.beginRefreshing()
}
}
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return 227
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return datas.count
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "YunDanLieBiaoCell") as! YunDanLieBiaoCell
cell.tag = indexPath.row
return cell
}
}
<?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" customClass="YDLBVc" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="listView" destination="E9d-mv-UN9" id="6sr-ao-Kjp"/>
<outlet property="searchVBg" destination="7gn-wh-Lhk" id="wOG-0w-jdg"/>
<outlet property="topView" destination="5Ue-mR-h4b" id="IVg-qY-dGD"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
<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="5Ue-mR-h4b">
<rect key="frame" x="0.0" y="44" width="414" height="51"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="shaixuan" translatesAutoresizingMaskIntoConstraints="NO" id="Jo5-vu-2Oa">
<rect key="frame" x="382" y="18" width="17" height="15"/>
<constraints>
<constraint firstAttribute="height" constant="15" id="6vs-GG-6eM"/>
<constraint firstAttribute="width" constant="17" id="g3m-yk-2Bl"/>
</constraints>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nd8-3a-ZP4">
<rect key="frame" x="368" y="0.0" width="46" height="51"/>
<constraints>
<constraint firstAttribute="width" constant="46" id="EuJ-Ag-E8u"/>
</constraints>
<connections>
<action selector="listControlAction:" destination="-1" eventType="touchUpInside" id="f30-Xq-KVd"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7gn-wh-Lhk">
<rect key="frame" x="0.0" y="0.0" width="368" height="51"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
</view>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="height" constant="51" id="DX8-6n-cOa"/>
<constraint firstItem="7gn-wh-Lhk" firstAttribute="top" secondItem="5Ue-mR-h4b" secondAttribute="top" id="HWi-LK-0yf"/>
<constraint firstAttribute="bottom" secondItem="Nd8-3a-ZP4" secondAttribute="bottom" id="Mx6-E1-JaO"/>
<constraint firstAttribute="bottom" secondItem="7gn-wh-Lhk" secondAttribute="bottom" id="QOr-LD-XNX"/>
<constraint firstItem="Jo5-vu-2Oa" firstAttribute="centerY" secondItem="5Ue-mR-h4b" secondAttribute="centerY" id="UMH-3K-mL4"/>
<constraint firstItem="Nd8-3a-ZP4" firstAttribute="top" secondItem="5Ue-mR-h4b" secondAttribute="top" id="W0Z-qR-eTf"/>
<constraint firstItem="Nd8-3a-ZP4" firstAttribute="leading" secondItem="7gn-wh-Lhk" secondAttribute="trailing" id="Xvc-7c-1ih"/>
<constraint firstAttribute="trailing" secondItem="Nd8-3a-ZP4" secondAttribute="trailing" id="clV-l9-Psj"/>
<constraint firstItem="7gn-wh-Lhk" firstAttribute="leading" secondItem="5Ue-mR-h4b" secondAttribute="leading" id="hVV-Os-0xj"/>
<constraint firstAttribute="trailing" secondItem="Jo5-vu-2Oa" secondAttribute="trailing" constant="15" id="yhQ-Oi-syV"/>
</constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="E9d-mv-UN9">
<rect key="frame" x="0.0" y="95" width="414" height="767"/>
<color key="backgroundColor" name="app底色"/>
<connections>
<outlet property="dataSource" destination="-1" id="fH8-34-h3j"/>
<outlet property="delegate" destination="-1" id="sm5-Ie-Zxr"/>
</connections>
</tableView>
</subviews>
<color key="backgroundColor" name="白色背景色"/>
<constraints>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="5Ue-mR-h4b" secondAttribute="trailing" id="2Rn-9o-jP8"/>
<constraint firstItem="5Ue-mR-h4b" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="62f-Tp-HgD"/>
<constraint firstItem="E9d-mv-UN9" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="XzD-tD-7Ga"/>
<constraint firstItem="5Ue-mR-h4b" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="ifk-Fh-OQz"/>
<constraint firstItem="E9d-mv-UN9" firstAttribute="top" secondItem="5Ue-mR-h4b" secondAttribute="bottom" id="nxo-e3-Ycz"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="E9d-mv-UN9" secondAttribute="trailing" id="r1r-eU-bK0"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="E9d-mv-UN9" secondAttribute="bottom" id="tHD-Cg-sOa"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<point key="canvasLocation" x="132" y="119"/>
</view>
</objects>
<resources>
<image name="shaixuan" width="17" height="15"/>
<namedColor name="app底色">
<color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="白色背景色">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment