Commit c51d1056 authored by 刘俊宏's avatar 刘俊宏

修正出入库记录筛选展示

parent 4b73348a
...@@ -137,8 +137,10 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect ...@@ -137,8 +137,10 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
//如果展示时间选择器,就 + 235*glscale //如果展示时间选择器,就 + 235*glscale
//MARK:--展示日历选择器 //MARK:--展示日历选择器
var isShowCalendarV = false
func isShowCalendarV(isShow: Bool) { func isShowCalendarV(isShow: Bool) {
if isShow { if isShow {
isShowCalendarV = true
contentH = contentH + 235*glscale contentH = contentH + 235*glscale
contentHeight.constant = contentH contentHeight.constant = contentH
calendarV.moreSelection = true calendarV.moreSelection = true
...@@ -153,6 +155,7 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect ...@@ -153,6 +155,7 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
calendarV.setOldDate(beginD: BeginDate!, endD: EndDate!) calendarV.setOldDate(beginD: BeginDate!, endD: EndDate!)
} }
}else{ }else{
isShowCalendarV = false
contentH = contentH - 235*glscale contentH = contentH - 235*glscale
contentHeight.constant = contentH contentHeight.constant = contentH
calendarV.removeFromSuperview() calendarV.removeFromSuperview()
...@@ -286,6 +289,7 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect ...@@ -286,6 +289,7 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
let suv = contenV.viewWithTag(10086) let suv = contenV.viewWithTag(10086)
suv?.removeFromSuperview() suv?.removeFromSuperview()
//选择了出入库 //选择了出入库
print("选择了出入库") print("选择了出入库")
if sendSArr.count == 0 { if sendSArr.count == 0 {
contentH = contentH + 120*glscale contentH = contentH + 120*glscale
...@@ -324,7 +328,11 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect ...@@ -324,7 +328,11 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
} }
} }
scrollview.setContentOffset(CGPoint(x: 0, y: 120*glscale), animated: true) var offsetH = 120*glscale
if isShowCalendarV {
offsetH = offsetH + 235*glscale
}
scrollview.setContentOffset(CGPoint(x: 0, y: offsetH), animated: true)
}else{ }else{
print("选择全部") print("选择全部")
......
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