完成生产时间选择

GeliBusinessPlatform/View/TimeSelectView/ShowTimeSelectView.swift

@@ -123,6 +123,16 @@ class ShowTimeSelectView: UIView ,TimeSelectViewDelgate{
 
         }
     }
+    var endDateByWork: Date? = nil {
+        didSet {
+            calendarV.endDateByWork = endDateByWork
+            if BeginDate != nil{
+                calendarV.setOldDate(beginD: BeginDate, endD: BeginDate)
+                let timeInterval:TimeInterval = BeginDate.timeIntervalSince1970
+                timeLbl.text = dayByDouble(sender: timeInterval)
+            }
+        }
+    }
 
     var BeginDate: Date! = nil
     var EndDate: Date! = nil 

GeliBusinessPlatform/View/TimeSelectView/TimeSelectView.swift

@@ -91,6 +91,7 @@ class TimeSelectView: UIView, FSCalendarDataSource, FSCalendarDelegate {
     
     //MARKl:--新增限定时间 ，如果不为nil就是有限定的时间
     var beginDateByWork: Date? = nil
+    var endDateByWork: Date? = nil
 
     func setOldDate (beginD: Date , endD:Date) {
         
@@ -212,11 +213,31 @@ class TimeSelectView: UIView, FSCalendarDataSource, FSCalendarDelegate {
             }
         }else{
             //单选
+            if endDateByWork != nil {
+                if date > endDateByWork! {
+                    let endDateByWorkT:TimeInterval = endDateByWork!.timeIntervalSince1970
+                    HUD.flash(.label("所选日期不得大于" + dayByDouble(sender: endDateByWorkT)), delay: 1.2)
+                      let selectArr  = calendar.selectedDates
+                        for select in selectArr{
+                            calendar.deselect(select)
+                        }
+                    calendarC.select(BeginDate)
+                    SelectAction = true
+
+                }else{
                     BeginDate = date
                     EndDate = nil
                     let dateEnd = BeginDate.addingTimeInterval(TimeInterval(60*60*24 - 1)) //无用处
                     self.delegate?.selectMoreDate(beginDate: BeginDate, endginDate: dateEnd)
                 }
+            }else{
+                BeginDate = date
+                EndDate = nil
+                let dateEnd = BeginDate.addingTimeInterval(TimeInterval(60*60*24 - 1)) //无用处
+                self.delegate?.selectMoreDate(beginDate: BeginDate, endginDate: dateEnd)
+            }
+
+        }
         self.configureVisibleCells()
         
         
@@ -237,17 +258,49 @@ class TimeSelectView: UIView, FSCalendarDataSource, FSCalendarDelegate {
             self.delegate?.selectMoreDate(beginDate: BeginDate, endginDate: dateEnd)
         }else{
             //单选
+            if endDateByWork != nil {
+                if date > endDateByWork! {
+                    let endDateByWorkT:TimeInterval = endDateByWork!.timeIntervalSince1970
+                    HUD.flash(.label("所选日期不得大于" + dayByDouble(sender: endDateByWorkT)), delay: 1.2)
+                    let selectArr  = calendar.selectedDates
+                        for select in selectArr{
+                            calendar.deselect(select)
+                        }
+                    calendarC.select(BeginDate)
+                    SelectAction = true
+ 
+                 }else{
+                    BeginDate = date
+                    EndDate = nil
+                    let dateEnd = BeginDate.addingTimeInterval(TimeInterval(60*60*24 - 1)) //无用处
+                    self.delegate?.selectMoreDate(beginDate: BeginDate, endginDate: dateEnd)
+                }
+            }else{
                 BeginDate = date
                 EndDate = nil
                 let dateEnd = BeginDate.addingTimeInterval(TimeInterval(60*60*24 - 1)) //无用处
                 self.delegate?.selectMoreDate(beginDate: BeginDate, endginDate: dateEnd)
             }
+
+
+        }
         self.configureVisibleCells()
     }
-    //MARK:--最大天数为今日
-    //    func maximumDate(for calendar: FSCalendar) -> Date {
-    //        return Date()
-    //    }
+//    //MARK:--最大天数为今日
+//    func maximumDate(for calendar: FSCalendar) -> Date {
+//        if endDateByWork == nil{
+//            return Date().addingTimeInterval(TimeInterval(100*365*60*60*24))//最大为后100年
+//        }
+//        return endDateByWork!
+//    }
+    //MARK:--最小天数为今日
+//
+//    func minimumDate(for calendar: FSCalendar) -> Date {
+//        if beginDateByWork == nil{
+//            return Date().addingTimeInterval(TimeInterval(-100*365*60*60*24)) //最小为前100年
+//        }
+//        return beginDateByWork!
+//    }
     //    func calendar(_ calendar: FSCalendar, shouldSelect date: Date, at monthPosition: FSCalendarMonthPosition)   -> Bool {
     //        return monthPosition == .current
     //    }

GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewRKVc.swift

@@ -390,12 +390,14 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
         let data = rkSelectArr[tempTag!]
         print("date ==",data.createDayStr,data.createDay)
         //把默认值传回去
-        //         if time_start != 0 &&  time_end != 0{
-        //             var time = TimeInterval(exactly: time_start!)
-        //             timeSelectV.BeginDate = Date(timeIntervalSince1970: time!)
-        //             time = TimeInterval(exactly: time_end!)
-        //             timeSelectV.EndDate = Date(timeIntervalSince1970: time!)
-        //         }
+        if data.createDay != nil {
+            let time = TimeInterval(exactly: data.createDay!)
+            timeSelectV.BeginDate = Date(timeIntervalSince1970: time!)
+            timeSelectV.EndDate = Date(timeIntervalSince1970: time!)//无用处
+
+        }
+
+        timeSelectV.endDateByWork = Date()
         timeSelectV.titleLbl.text = "请选择生产日期"
         timeSelectV.delegate = self
         self.view.window?.addSubview(timeSelectV)