Skip to content

G
GeliBusinessPlatform
Commit 89cd6f09 authored by ljh's avatar ljh
Browse files
Options

出入库记录筛选视图（）待完善

parent e0b1f218
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 552 additions and 10 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 89cd6f09
......@@ -477,6 +477,8 @@
F9956B2524640D34001A617D /* GoodsClassModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9956B2424640D34001A617D /* GoodsClassModel.swift */; };
F9A0E1DD246D198B00D7F26F /* CusListAllModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9A0E1DC246D198B00D7F26F /* CusListAllModel.swift */; };
F9A0E1DF246D1B1E00D7F26F /* GetGoodsInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9A0E1DE246D1B1E00D7F26F /* GetGoodsInfoModel.swift */; };
F9B6D9E12486890D00111698 /* MoreAndTimeSelectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9B6D9E02486890D00111698 /* MoreAndTimeSelectView.swift */; };
F9B6D9E32486891C00111698 /* MoreAndTimeSelectView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9B6D9E22486891C00111698 /* MoreAndTimeSelectView.xib */; };
F9DDBE922457BFEC00A32CB2 /* HUDEXT.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9DDBE912457BFEC00A32CB2 /* HUDEXT.swift */; };
F9DDBE962457D3EC00A32CB2 /* WebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9DDBE942457D3EC00A32CB2 /* WebViewController.swift */; };
F9DDBE972457D3EC00A32CB2 /* WebViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9DDBE952457D3EC00A32CB2 /* WebViewController.xib */; };
......@@ -1035,6 +1037,8 @@
F9956B2424640D34001A617D /* GoodsClassModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoodsClassModel.swift; sourceTree = "<group>"; };
F9A0E1DC246D198B00D7F26F /* CusListAllModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CusListAllModel.swift; sourceTree = "<group>"; };
F9A0E1DE246D1B1E00D7F26F /* GetGoodsInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetGoodsInfoModel.swift; sourceTree = "<group>"; };
F9B6D9E02486890D00111698 /* MoreAndTimeSelectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoreAndTimeSelectView.swift; sourceTree = "<group>"; };
F9B6D9E22486891C00111698 /* MoreAndTimeSelectView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MoreAndTimeSelectView.xib; sourceTree = "<group>"; };
F9DDBE912457BFEC00A32CB2 /* HUDEXT.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HUDEXT.swift; sourceTree = "<group>"; };
F9DDBE942457D3EC00A32CB2 /* WebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebViewController.swift; sourceTree = "<group>"; };
F9DDBE952457D3EC00A32CB2 /* WebViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = WebViewController.xib; sourceTree = "<group>"; };
......@@ -2367,6 +2371,8 @@
F961D27624503F51007FBE70 /* OrderSelectMoreView.swift */,
F950FDB02451811A00C40530 /* TitleAndSelCalendarView.xib */,
F950FDB22451820D00C40530 /* TitleAndSelCalendarView.swift */,
F9B6D9E02486890D00111698 /* MoreAndTimeSelectView.swift */,
F9B6D9E22486891C00111698 /* MoreAndTimeSelectView.xib */,
);
path = MoreBtnView;
sourceTree = "<group>";
......@@ -2667,6 +2673,7 @@
E07B1E79245966E60055BA3C /* XinCaiGouViewController.xib in Resources */,
E0BE8A88245A7A1500E80134 /* JiBenXinXiCell.xib in Resources */,
F93E320F2473DF2300524DFC /* GeliAlertTextView.xib in Resources */,
F9B6D9E32486891C00111698 /* MoreAndTimeSelectView.xib in Resources */,
E0A2E81B24552E3C00D6DB34 /* XinZengPinPaiViewController.xib in Resources */,
E013D7912484D5AF0092DE46 /* NewCKCell.xib in Resources */,
F94A315C24628C7E00FEC38E /* WorkItemTableViewCell.xib in Resources */,
......@@ -2917,6 +2924,7 @@
E0A409D02464041200CFF109 /* ThirdCell.swift in Sources */,
F956D59F246A2D9C003FF510 /* LMNPhotoCollectionCell.m in Sources */,
F950FDE424518B9500C40530 /* FSCalendarTransitionCoordinator.m in Sources */,
F9B6D9E12486890D00111698 /* MoreAndTimeSelectView.swift in Sources */,
E0BE8A90245A9B9600E80134 /* YingFuZhangKuanCell.swift in Sources */,
E06524ED2458008900CA22E2 /* RuKuViewController.swift in Sources */,
F9171F0224513C5B00359C2B /* UpDataModel.swift in Sources */,
......
GeliBusinessPlatform/AppDelegate.swift
View file @ 89cd6f09
......@@ -256,7 +256,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate, UITabBarCon
tabBarController.viewControllers = [v1, v2, v3, v4, v5]
tabBarController.selectedIndex = 1
tabBarController.selectedIndex = 2
......
GeliBusinessPlatform/View/MoreBtnView/OrderSelectMoreView.swift
View file @ 89cd6f09
......@@ -30,6 +30,8 @@ class OrderSelectMoreView: UIView,TitleAndSelCalendarViewDelegate ,TimeSelectVie
}
@IBAction func reset(_ sender: Any) {
//重置
calendarV.clearTheSelect()
moreBgView.subviews.forEach { (view) in
view.removeFromSuperview()
}
......
GeliBusinessPlatform/View/MoreBtnView/OrderSelectMoreView.xib
View file @ 89cd6f09
<?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" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<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="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
......@@ -154,10 +155,10 @@
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<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 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>
GeliBusinessPlatform/ViewController/出入库记录/CRKListVC.swift
View file @ 89cd6f09
......@@ -20,9 +20,19 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
private let animations = [AnimationType.from(direction: .bottom, offset: 300*glscale)]
@IBOutlet weak var topBtn: UIButton!
@IBAction func openViewAction(_ sender: Any) {
print("筛选选项")
let moreTimeSelectView = MoreAndTimeSelectView()
self.view.addSubview(moreTimeSelectView)
moreTimeSelectView.snp.makeConstraints { (make) in
make.left.bottom.right.equalTo(0)
make.top.equalTo(100*glscale)
}
moreTimeSelectView.setUI()
}
@IBOutlet weak var searchBG: UIView!
......
GeliBusinessPlatform/ViewController/工作中心/编辑工作中心/EditWorkCViewController.xib
View file @ 89cd6f09
<?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="retina4_7" orientation="portrait" appearance="light"/>
<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="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="EditWorkCViewController" customModule="GeliBusinessPlatform" customModuleProvider="target">
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="EditWorkCViewController" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="collectionVheight" destination="ej4-tR-5IQ" id="lVq-h3-JWK"/>
<outlet property="collectionView" destination="bJE-2x-TVD" id="kjQ-vk-ukD"/>
......@@ -101,7 +102,7 @@
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<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>
</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