Skip to content

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

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

parent e0b1f218
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/MoreAndTimeSelectView.swift 0 → 100644
View file @ 89cd6f09
//
// MoreAndTimeSelectView.swift
// GeliBusinessPlatform
//
// Created by liujunhong on 2020/6/2.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
protocol MoreAndTimeSelectViewDelegate {
func sureActionMoreAndTimeSelectView(beginDate: Date?, endginDate: Date?,paySelectArr:Array<Bool>,bugSelectArr:Array<Bool>,sendSelectArr:Array<Bool>)
func colseActionMoreAndTimeSelectView()
}
class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelectViewDelgate {
@IBOutlet weak var contentWidht: NSLayoutConstraint!
@IBOutlet weak var contentHeight: NSLayoutConstraint!
@IBOutlet weak var contenV: UIView!
var contentView:UIView!
var delegate:MoreAndTimeSelectViewDelegate?
@IBOutlet weak var showViewHeight: NSLayoutConstraint!
@IBAction func resetAction(_ sender: UIButton) {
//重置
calendarV.clearTheSelect()
contenV.subviews.forEach { (view) in
view.removeFromSuperview()
}
BeginDate = nil
EndDate = nil
paySArr = [false,false,false,false]
bugSArr = [false,false,false]
sendSArr = [false,false,false,false]
setUI()
self.delegate?.sureActionMoreAndTimeSelectView(beginDate: BeginDate, endginDate: EndDate, paySelectArr: paySArr, bugSelectArr: bugSArr, sendSelectArr: sendSArr)
}
@IBAction func sureAction(_ sender: UIButton) {
//确定
self.removeFromSuperview()
self.delegate?.sureActionMoreAndTimeSelectView(beginDate: BeginDate, endginDate: EndDate, paySelectArr: paySArr, bugSelectArr: bugSArr, sendSelectArr: sendSArr)
}
@IBAction func blackTapAction(_ sender: UITapGestureRecognizer) {
//点击黑色部分隐藏
self.removeFromSuperview()
self.delegate?.colseActionMoreAndTimeSelectView()
}
//setUI-前必传
//MARK:--数据源
var BeginDate: Date! = nil
var EndDate: Date! = nil
var paySArr:Array<Bool> = [false,false,false,false]
var bugSArr:Array<Bool> = [false,false,false]
var sendSArr:Array<Bool> = [false,false,false,false]
var contentH = 360*glscale
let line1 = UIView()
let timeTilelV = TitleAndSelCalendarView()
let calendarV = TimeSelectView(frame: CGRect(x: 0, y: 85*glscale, width: fullScreenWidth, height: 235*glscale))
func setUI(){
contentWidht.constant = 375*glscale
contentHeight.constant = contentH
showViewHeight.constant = contentH + 50*glscale
timeTilelV.delegate = self
contenV.addSubview(timeTilelV)
timeTilelV.timeLbl.text = "请选择时间范围"
timeTilelV.isSelectV = false
timeTilelV.snp.makeConstraints { (make) in
make.left.top.equalTo(15*glscale)
make.right.equalTo(-135*glscale)
make.height.equalTo(60*glscale)
}
//分界线1
line1.backgroundColor = UIColor.init(named: "灰色分界线")
contenV.addSubview(line1)
line1.snp.makeConstraints { (make) in
make.left.right.equalTo(0)
make.height.equalTo(1)
make.top.equalTo(timeTilelV.snp_bottom).offset(15*glscale)
}
let payV = addTitleAndMoreBtn(title: "审核状态", arrStr: ["全部","待审核","已通过","未通过"], btnTag: 1000)
contenV.addSubview(payV)
payV.snp.makeConstraints { (make) in
make.left.equalTo(15*glscale)
make.top.equalTo(line1.snp_bottom).offset(15*glscale)
make.right.equalTo(0)
make.height.equalTo(60*glscale)
}
//分界线2
let line2 = UIView()
line2.backgroundColor = UIColor.init(named: "灰色分界线")
contenV.addSubview(line2)
line2.snp.makeConstraints { (make) in
make.left.right.equalTo(0)
make.height.equalTo(1)
make.top.equalTo(payV.snp_bottom).offset(15*glscale)
}
let typeV = addTitleAndMoreBtn(title: "出库类型", arrStr: ["全部","入库","出库"], btnTag: 2000)
contenV.addSubview(typeV)
typeV.snp.makeConstraints { (make) in
make.left.equalTo(15*glscale)
make.top.equalTo(line2.snp_bottom).offset(15*glscale)
make.right.equalTo(0)
make.height.equalTo(60*glscale)
}
//分界线3
let line3 = UIView()
line3.backgroundColor = UIColor.init(named: "灰色分界线")
contenV.addSubview(line3)
line3.snp.makeConstraints { (make) in
make.left.right.equalTo(0)
make.height.equalTo(1)
make.top.equalTo(typeV.snp_bottom).offset(15*glscale)
}
let statusV = addTitleAndMoreBtn(title: "具体类型", arrStr: ["调入","退货","生产","调出被拒绝"], btnTag: 3000)
contenV.addSubview(statusV)
statusV.snp.makeConstraints { (make) in
make.left.equalTo(15*glscale)
make.top.equalTo(line3.snp_bottom).offset(15*glscale)
make.right.equalTo(0)
make.height.equalTo(60*glscale)
}
}
//如果展示时间选择器，就 + 235*glscale
//MARK:--展示日历选择器
func isShowCalendarV(isShow: Bool) {
if isShow {
contentHeight.constant = contentH + 235*glscale
calendarV.moreSelection = true
contenV.addSubview(calendarV)
calendarV.delegate = self
line1.snp.remakeConstraints { (make) in
make.left.right.equalTo(0)
make.height.equalTo(1)
make.top.equalTo(calendarV.snp_bottom)
}
if BeginDate != nil {
calendarV.setOldDate(beginD: BeginDate!, endD: EndDate!)
}
}else{
contentHeight.constant = contentH
calendarV.removeFromSuperview()
line1.snp.remakeConstraints { (make) in
make.left.right.equalTo(0)
make.height.equalTo(1)
make.top.equalTo(timeTilelV.snp_bottom).offset(15*glscale)
}
}
}
//MARK:--日历代理
func selectMoreDate(beginDate: Date, endginDate: Date) {
//bug
let timeInterval:TimeInterval = beginDate.timeIntervalSince1970
let timeIntervalEnd:TimeInterval = endginDate.timeIntervalSince1970
timeTilelV.timeLbl.text = dayByDouble(sender: timeInterval) + "-" + dayByDouble(sender: timeIntervalEnd)
EndDate = endginDate
BeginDate = beginDate
}
//MARK--标题和按钮多的情况1
var allSelectBtn : Array<UIButton> = []
func addTitleAndMoreBtn(title:String,arrStr:[String],btnTag:Int) -> UIView {
let conView = UIView()
let titleLbl = UILabel()
titleLbl.textColor = UIColor.init(named: "标题字颜色")
titleLbl.font = UIFont.systemFont(ofSize: 13)
conView.addSubview(titleLbl)
titleLbl.snp.makeConstraints { (make) in
make.left.top.equalTo(0)
}
titleLbl.text = title
weak var btn:UIButton? = nil
for i in 0 ..< arrStr.count {
let str = arrStr[i]
let selectBtn = UIButton(type: .custom)
conView.addSubview(selectBtn)
selectBtn.setTitle(str, for: .normal)
selectBtn.titleLabel?.font = UIFont.systemFont(ofSize: 13)
selectBtn.setTitleColor(UIColor.init(named: "多选按钮字体颜色"), for: .normal)
selectBtn.backgroundColor = UIColor.init(named: "多选按钮背景颜色")
selectBtn.layer.cornerRadius = 3
selectBtn.snp.makeConstraints { (make) in
if i < 4 {
make.left.equalTo(CGFloat(CGFloat(i * (73 + 15)) * glscale))
make.top.equalTo(titleLbl.snp_bottom).offset(10*glscale)
btn = selectBtn
}else{
make.left.equalTo(CGFloat(CGFloat((i - 4) * (73 + 15)) * glscale))
make.top.equalTo(btn!.snp_bottom).offset(10*glscale)
}
make.width.equalTo(73*glscale)
make.height.equalTo(30*glscale)
}
selectBtn.addTarget(self, action: #selector(selectBtnAction(sender:)), for: .touchUpInside)
selectBtn.tag = btnTag + i
allSelectBtn.append(selectBtn)
}
return conView
}
@objc func selectBtnAction(sender:UIButton) {
sender.isSelected = !sender.isSelected
if sender.isSelected {
sender.setTitleColor(UIColor.init(named: "白色背景色"), for: .normal)
sender.backgroundColor = UIColor.init(named: "蓝色字体颜色")
}else{
sender.setTitleColor(UIColor.init(named: "多选按钮字体颜色"), for: .normal)
sender.backgroundColor = UIColor.init(named: "多选按钮背景颜色")
}
if sender.tag < 2000 {
let index = sender.tag - 1000
paySArr = [false,false,false,false]
allSelectBtn.forEach { (btn) in
if btn.tag < 2000 && btn.tag > 999 {
if btn.tag != sender.tag {
btn.isSelected = false
btn.setTitleColor(UIColor.init(named: "多选按钮字体颜色"), for: .normal)
btn.backgroundColor = UIColor.init(named: "多选按钮背景颜色")
}
}
}
paySArr[index] = sender.isSelected
}else if sender.tag < 3000 {
let index = sender.tag - 2000
bugSArr = [false,false,false]
allSelectBtn.forEach { (btn) in
if btn.tag < 3000 && btn.tag > 1999 {
if btn.tag != sender.tag {
btn.isSelected = false
btn.setTitleColor(UIColor.init(named: "多选按钮字体颜色"), for: .normal)
btn.backgroundColor = UIColor.init(named: "多选按钮背景颜色")
}
}
}
bugSArr[index] = sender.isSelected
}else{
let index = sender.tag - 3000
sendSArr = [false,false,false,false]
allSelectBtn.forEach { (btn) in
if btn.tag < 4000 && btn.tag > 2999 {
if btn.tag != sender.tag {
btn.isSelected = false
btn.setTitleColor(UIColor.init(named: "多选按钮字体颜色"), for: .normal)
btn.backgroundColor = UIColor.init(named: "多选按钮背景颜色")
}
}
}
sendSArr[index] = sender.isSelected
}
}
func setUIbyData (beginDate: Date?, endginDate: Date?, paySelectArr: Array<Bool>, bugSelectArr: Array<Bool>, sendSelectArr: Array<Bool>) {
EndDate = endginDate
BeginDate = beginDate
self.paySArr = paySelectArr
self.bugSArr = bugSelectArr
self.sendSArr = sendSelectArr
if BeginDate == nil {
timeTilelV.timeLbl.text = "请选择时间范围"
}else{
let timeInterval:TimeInterval = BeginDate.timeIntervalSince1970
let timeIntervalEnd:TimeInterval = EndDate.timeIntervalSince1970
timeTilelV.timeLbl.text = dayByDouble(sender: timeInterval) + "," + dayByDouble(sender: timeIntervalEnd)
}
allSelectBtn.forEach { (sender) in
if sender.tag < 2000 {
let i = sender.tag - 1000
let isBool = paySelectArr[i]
sender.isSelected = isBool
if isBool {
sender.setTitleColor(UIColor.init(named: "白色背景色"), for: .normal)
sender.backgroundColor = UIColor.init(named: "蓝色字体颜色")
}
}else if sender.tag < 3000 {
let i = sender.tag - 2000
let isBool = bugSelectArr[i]
sender.isSelected = isBool
if isBool {
sender.setTitleColor(UIColor.init(named: "白色背景色"), for: .normal)
sender.backgroundColor = UIColor.init(named: "蓝色字体颜色")
}
}else{
let i = sender.tag - 3000
let isBool = sendSelectArr[i]
sender.isSelected = isBool
if isBool {
sender.setTitleColor(UIColor.init(named: "白色背景色"), for: .normal)
sender.backgroundColor = UIColor.init(named: "蓝色字体颜色")
}
}
}
}
//初始化时将xib中的view添加进来
override init(frame: CGRect) {
super.init(frame: frame)
contentView = loadViewFromNib()
addSubview(contentView)
contentView.snp.makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
}
// /初始化时将xib中的view添加进来
required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
contentView = loadViewFromNib()
addSubview(contentView)
contentView.snp.makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
}
//加载xib
func loadViewFromNib() -> UIView {
let className = type(of: self)
let bundle = Bundle(for: className)
let name = NSStringFromClass(className).components(separatedBy: ".").last
let nib = UINib(nibName: name!, bundle: bundle)
let view = nib.instantiate(withOwner: self, options: nil).first as! UIView
return view
}
}
GeliBusinessPlatform/View/MoreBtnView/MoreAndTimeSelectView.xib 0 → 100644
View file @ 89cd6f09
<?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="MoreAndTimeSelectView" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="contenV" destination="vHv-I4-dmk" id="WbO-6S-e3L"/>
<outlet property="contentHeight" destination="fb3-1v-gnz" id="Wvf-2H-zNw"/>
<outlet property="contentWidht" destination="Ui1-5n-gGg" id="EH0-e8-5Gv"/>
<outlet property="showViewHeight" destination="e8t-mB-tnZ" id="dat-TC-NVN"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clipsSubviews="YES" contentMode="scaleToFill" id="eQY-0E-sy6">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Su4-cS-fmC">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<color key="backgroundColor" name="提示视图背景色"/>
<gestureRecognizers/>
<connections>
<outletCollection property="gestureRecognizers" destination="UBg-De-kpx" appends="YES" id="cmD-Cz-G69"/>
</connections>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XPv-Gb-EKh">
<rect key="frame" x="0.0" y="-5" width="375" height="450"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CLQ-Km-2VN">
<rect key="frame" x="0.0" y="399" width="375" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="1ES-pw-D9d"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TWw-pf-NyK">
<rect key="frame" x="187" y="400" width="1" height="50"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="width" constant="1" id="bxh-td-ZV0"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MOC-2G-PoZ">
<rect key="frame" x="0.0" y="400" width="187" height="50"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="重置">
<color key="titleColor" name="灰色字体颜色"/>
</state>
<connections>
<action selector="resetAction:" destination="-1" eventType="touchUpInside" id="tWe-Ns-jIn"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Rmr-aU-Fxu">
<rect key="frame" x="188" y="400" width="187" height="50"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="确定">
<color key="titleColor" name="蓝色字体颜色"/>
</state>
<connections>
<action selector="sureAction:" destination="-1" eventType="touchUpInside" id="CHK-Yz-CRI"/>
</connections>
</button>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dH1-9z-HTC">
<rect key="frame" x="0.0" y="5" width="375" height="394"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vHv-I4-dmk" userLabel="contentView">
<rect key="frame" x="0.0" y="0.0" width="375" height="400"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="width" constant="375" id="Ui1-5n-gGg">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
</userDefinedRuntimeAttributes>
</constraint>
<constraint firstAttribute="height" constant="400" id="fb3-1v-gnz">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
</userDefinedRuntimeAttributes>
</constraint>
</constraints>
</view>
</subviews>
<constraints>
<constraint firstItem="vHv-I4-dmk" firstAttribute="leading" secondItem="dH1-9z-HTC" secondAttribute="leading" id="FsM-Zc-6td"/>
<constraint firstAttribute="trailing" secondItem="vHv-I4-dmk" secondAttribute="trailing" id="a5d-m0-ISe"/>
<constraint firstAttribute="bottom" secondItem="vHv-I4-dmk" secondAttribute="bottom" constant="1" id="eJm-5O-tpi"/>
<constraint firstItem="vHv-I4-dmk" firstAttribute="top" secondItem="dH1-9z-HTC" secondAttribute="top" id="wUb-Gm-hLD"/>
</constraints>
<viewLayoutGuide key="contentLayoutGuide" id="yfc-uC-eFn"/>
<viewLayoutGuide key="frameLayoutGuide" id="9pJ-0J-BGa"/>
</scrollView>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="Rmr-aU-Fxu" firstAttribute="top" secondItem="CLQ-Km-2VN" secondAttribute="bottom" id="8L2-Tg-JZi"/>
<constraint firstItem="CLQ-Km-2VN" firstAttribute="leading" secondItem="XPv-Gb-EKh" secondAttribute="leading" id="ASA-mb-GsY"/>
<constraint firstAttribute="bottom" secondItem="TWw-pf-NyK" secondAttribute="bottom" id="BQd-4v-QEh"/>
<constraint firstItem="TWw-pf-NyK" firstAttribute="centerX" secondItem="XPv-Gb-EKh" secondAttribute="centerX" id="K3D-qE-pud"/>
<constraint firstItem="TWw-pf-NyK" firstAttribute="top" secondItem="CLQ-Km-2VN" secondAttribute="bottom" id="Lb0-fD-Clx"/>
<constraint firstItem="MOC-2G-PoZ" firstAttribute="leading" secondItem="XPv-Gb-EKh" secondAttribute="leading" id="PHj-bQ-frf"/>
<constraint firstAttribute="bottom" secondItem="MOC-2G-PoZ" secondAttribute="bottom" id="Uti-uk-DdQ"/>
<constraint firstItem="dH1-9z-HTC" firstAttribute="leading" secondItem="XPv-Gb-EKh" secondAttribute="leading" id="ZlE-y4-v68"/>
<constraint firstAttribute="trailing" secondItem="dH1-9z-HTC" secondAttribute="trailing" id="b2r-sK-O3C"/>
<constraint firstAttribute="bottom" secondItem="CLQ-Km-2VN" secondAttribute="bottom" constant="50" id="c32-H9-XbQ"/>
<constraint firstAttribute="height" constant="450" id="e8t-mB-tnZ">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
</userDefinedRuntimeAttributes>
</constraint>
<constraint firstAttribute="bottom" secondItem="Rmr-aU-Fxu" secondAttribute="bottom" id="eo6-2C-6OO"/>
<constraint firstAttribute="trailing" secondItem="CLQ-Km-2VN" secondAttribute="trailing" id="i4Z-bn-hbO"/>
<constraint firstItem="CLQ-Km-2VN" firstAttribute="top" secondItem="dH1-9z-HTC" secondAttribute="bottom" id="jFv-9T-KWG"/>
<constraint firstItem="Rmr-aU-Fxu" firstAttribute="leading" secondItem="TWw-pf-NyK" secondAttribute="trailing" id="nwg-YA-uol"/>
<constraint firstItem="TWw-pf-NyK" firstAttribute="leading" secondItem="MOC-2G-PoZ" secondAttribute="trailing" id="qGR-rG-7VN"/>
<constraint firstItem="dH1-9z-HTC" firstAttribute="top" secondItem="XPv-Gb-EKh" secondAttribute="top" constant="5" id="sGC-Ml-zmA"/>
<constraint firstAttribute="trailing" secondItem="Rmr-aU-Fxu" secondAttribute="trailing" id="wzb-dr-ZVf"/>
<constraint firstItem="MOC-2G-PoZ" firstAttribute="top" secondItem="CLQ-Km-2VN" secondAttribute="bottom" id="xr3-qB-pg6"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="5"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="Su4-cS-fmC" secondAttribute="trailing" id="3zl-Sf-PSo"/>
<constraint firstItem="XPv-Gb-EKh" firstAttribute="top" secondItem="eQY-0E-sy6" secondAttribute="top" constant="-5" id="B4s-DZ-qxg"/>
<constraint firstItem="XPv-Gb-EKh" firstAttribute="leading" secondItem="eQY-0E-sy6" secondAttribute="leading" id="Hj1-IH-BiG"/>
<constraint firstItem="Su4-cS-fmC" firstAttribute="top" secondItem="eQY-0E-sy6" secondAttribute="top" id="N3p-YB-t73"/>
<constraint firstAttribute="trailing" secondItem="XPv-Gb-EKh" secondAttribute="trailing" id="PuX-bC-vuB"/>
<constraint firstAttribute="bottom" secondItem="Su4-cS-fmC" secondAttribute="bottom" id="jnr-41-Dtx"/>
<constraint firstItem="Su4-cS-fmC" firstAttribute="leading" secondItem="eQY-0E-sy6" secondAttribute="leading" id="ntV-wp-xYk"/>
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<viewLayoutGuide key="safeArea" id="Vla-af-5m8"/>
<point key="canvasLocation" x="-130.40000000000001" y="123.68815592203899"/>
</view>
<tapGestureRecognizer id="UBg-De-kpx">
<connections>
<action selector="blackTapAction:" destination="-1" id="tq8-ZJ-lAE"/>
<outlet property="delegate" destination="-1" id="kky-Nh-2U4"/>
</connections>
</tapGestureRecognizer>
</objects>
<resources>
<namedColor name="提示视图背景色">
<color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色分界线">
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色字体颜色">
<color red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="蓝色字体颜色">
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
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