长期的 逻辑

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherResidenceFillView.swift

@@ -43,6 +43,14 @@ class YHOtherResidenceFillView: UIView {
             make.left.right.equalToSuperview()
         }
         
+        
+        endView.showLongTimeButtonFlag = true
+        endView.block = {[weak self] flag, text in
+            guard let self = self else { return }
+            self.endView.updateKeyName(name: "结束时间", keyValue: "")
+            self.dataModel?.end_time = text
+            self.layoutIfNeeded()
+        }
         endView.snp.makeConstraints { make in
             make.top.equalTo(startView.snp.bottom)
             make.left.right.equalToSuperview()
@@ -109,7 +117,14 @@ extension YHOtherResidenceFillView {
         startView.updateKeyName(name: "开始时间", keyValue: dataModel.start_time)
         startView.needCheckFlag = dataModel.needCheckFlag
         
-        endView.updateKeyName(name: "结束时间", keyValue: dataModel.end_time)
+        
+        if dataModel.end_time == "至今" || dataModel.end_time == "8888-01-01" {
+            endView.longTimeButton.isSelected = true
+            endView.updateKeyName(name: "结束时间", keyValue: "")
+        } else {
+            endView.longTimeButton.isSelected = false
+            endView.updateKeyName(name: "结束时间", keyValue: dataModel.end_time)
+        }
         endView.needCheckFlag = dataModel.needCheckFlag
         
         layoutIfNeeded()
@@ -132,7 +147,7 @@ extension YHOtherResidenceFillView {
     
     
     @objc func tapStartDate(_ gestureRecognizer: UIPanGestureRecognizer) {
-        YHDatePickView.show(type: .yyyymmdd) { date in
+        YHDatePickView.show(type: .yyyymm,title: "请选择开始时间") { date in
            printLog(date)
             
             self.startView.updateKeyName(name: "开始时间", keyValue: date)
@@ -142,11 +157,14 @@ extension YHOtherResidenceFillView {
     }
     
     @objc func tapEndDate(_ gestureRecognizer: UIPanGestureRecognizer) {
-        YHDatePickView.show(type: .yyyymmdd) { date in
-           printLog(date)
-            self.endView.updateKeyName(name: "结束时间", keyValue: date)
-            self.dataModel?.end_time = date
-            self.layoutIfNeeded()
+        
+        if !endView.longTimeButton.isSelected {
+            YHDatePickView.show(type: .yyyymm,title: "请选择结束时间") { date in
+               printLog(date)
+                self.endView.updateKeyName(name: "结束时间", keyValue: date)
+                self.dataModel?.end_time = date
+                self.layoutIfNeeded()
+            }
         }
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherSelecteItemView.swift

@@ -16,9 +16,6 @@ enum YHOtherSelecteItemType: Int {
 
 
 class YHOtherSelecteItemView: UIView {
-
-    static let viewH : CGFloat = 52 // type == 1时的高度
-    static let viewH2 : CGFloat = 88 //type == 2时的高度
     
     //1- 一行布局  2-2行布局
     var type : Int = 1 {
@@ -33,11 +30,31 @@ class YHOtherSelecteItemView: UIView {
         }
     }
     
-    //获取高度
-    static func getViewHBy(type : Int)->CGFloat {
-        return type == 1 ? viewH : viewH2
+    var showLongTimeButtonFlag : Bool = false {
+        didSet {
+            layoutMyUI()
+        }
     }
     
+    typealias ItemBlock = (_ flag: Bool, _ text: String) -> ()
+    var block: ItemBlock?
+    
+    
+    lazy var longTimeButton = {
+        let button = UIButton(type: .custom)
+        button.setImage(UIImage(named: "main_time_normal"), for: .normal)
+        button.setImage(UIImage(named: "main_time_select"), for: .selected)
+        button.setTitleColor(UIColor.mainTextColor, for: .normal)
+        button.setTitle("长期", for: .normal)
+        button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
+        button.contentHorizontalAlignment = .right
+        button.addTarget(self, action: #selector(longTimeButtonClick), for: .touchUpInside)
+        button.imageEdgeInsets = UIEdgeInsets(top: 10, left: 0, bottom: 10, right: 30)
+        button.isSelected = false
+        button.isHidden = true
+        return button
+    }()
+    
     override init(frame: CGRect) {
         super.init(frame: frame)
         setupUI()
@@ -102,6 +119,9 @@ class YHOtherSelecteItemView: UIView {
         return view
     }()
     
+    
+    private let rightIcon = UIImageView()
+    
     override func layoutSubviews() {
         super.layoutSubviews()
         
@@ -110,6 +130,9 @@ class YHOtherSelecteItemView: UIView {
 }
 
 
+
+
+
 extension YHOtherSelecteItemView {
     func setupUI() {
         addSubview(bottomLine)
@@ -118,7 +141,6 @@ extension YHOtherSelecteItemView {
         addSubview(noTextTipsLable)
         
         title = "开始时间"
-        let rightIcon = UIImageView()
         rightIcon.image = UIImage(named: "form_right_arrow")
         rightIcon.contentMode = .scaleAspectFill
         
@@ -133,6 +155,26 @@ extension YHOtherSelecteItemView {
             make.right.equalTo(rightIcon.snp.left).offset(-4)
             make.bottom.top.left.equalToSuperview()
         }
+        
+        //
+        addSubview(longTimeButton)
+        longTimeButton.snp.makeConstraints { make in
+            make.right.equalToSuperview()
+            make.centerY.equalToSuperview()
+            make.height.equalTo(32)
+            make.width.equalTo(43)
+        }
+    }
+    
+    @objc func longTimeButtonClick() {
+        longTimeButton.isSelected = !longTimeButton.isSelected
+        if longTimeButton.isSelected {
+            block?(true,"8888-01-01")
+            textField.placeholder = ""
+        } else {
+            block?(false,"")//for test hjl
+            textField.placeholder = "请选择"
+        }
     }
 }
 
@@ -222,14 +264,49 @@ extension YHOtherSelecteItemView {
                     make.left.equalTo(titleLabel.snp.right).offset(40)
                 }
                 
-                
                 bottomLine.snp.remakeConstraints { make in
                     make.top.equalTo(titleLabel.snp.bottom).offset(kMargin)
                     make.bottom.left.right.equalToSuperview()
                     make.height.equalTo(0.5)
                 }
+            }
+            
+            if showLongTimeButtonFlag {
+                
+                rightIcon.snp.removeConstraints()
+                rightIcon.isHidden = true
+                longTimeButton.snp.removeConstraints()
+                longTimeButton.isHidden = false
+                longTimeButton.snp.remakeConstraints { make in
+                    make.right.equalToSuperview()
+                    make.centerY.equalToSuperview()
+                    make.height.equalTo(32)
+                    make.width.equalTo(43)
+                }
+                
+                textField.snp.removeConstraints()
+                textField.snp.makeConstraints { make in
+                    make.right.equalTo(longTimeButton.snp.left).offset(-4)
+                    make.bottom.top.left.equalToSuperview()
+                }
+            } else {
+                rightIcon.snp.removeConstraints()
+                rightIcon.isHidden = false
+                rightIcon.snp.makeConstraints { make in
+                    make.centerY.equalToSuperview()
+                    make.right.equalToSuperview()
+                    make.width.height.equalTo(20)
+                }
+                
+                longTimeButton.snp.removeConstraints()
+                longTimeButton.isHidden = true
+                
+                textField.snp.removeConstraints()
+                textField.snp.makeConstraints { make in
+                    make.right.equalTo(rightIcon.snp.left).offset(-4)
+                    make.bottom.top.left.equalToSuperview()
+                }
                 
-               
             }
         } else if type == 2 {
             if needCheckFlag == true {