// 父母信息

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -70,7 +70,7 @@
 		04A7BC8F2B6B2BC2000E8D47 /* YHFamilyRequestViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A7BC8E2B6B2BC2000E8D47 /* YHFamilyRequestViewModel.swift */; };
 		04A7BC912B6B7B89000E8D47 /* YHTwoOptionAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A7BC902B6B7B89000E8D47 /* YHTwoOptionAlertView.swift */; };
 		04AF58C42B4FC51C0066011A /* YHLocalizable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AF58C32B4FC51C0066011A /* YHLocalizable.swift */; };
-		04D765732B6A173C0055ECBB /* YHSpouseInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D765722B6A173C0055ECBB /* YHSpouseInfoVC.swift */; };
+		04D765732B6A173C0055ECBB /* YHSpouseInfoContainerVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D765722B6A173C0055ECBB /* YHSpouseInfoContainerVC.swift */; };
 		6203A87EDC96313BBE789D9C /* Pods_galaxy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 987C69D43AE8D85DC1930DCF /* Pods_galaxy.framework */; };
 		A51044182B493675006B60BB /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = A51044172B493675006B60BB /* README.md */; };
 		A510441A2B495DD0006B60BB /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51044192B495DD0006B60BB /* UIView+Extension.swift */; };
@@ -289,7 +289,7 @@
 		04A7BC8E2B6B2BC2000E8D47 /* YHFamilyRequestViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFamilyRequestViewModel.swift; sourceTree = "<group>"; };
 		04A7BC902B6B7B89000E8D47 /* YHTwoOptionAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTwoOptionAlertView.swift; sourceTree = "<group>"; };
 		04AF58C32B4FC51C0066011A /* YHLocalizable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLocalizable.swift; sourceTree = "<group>"; };
-		04D765722B6A173C0055ECBB /* YHSpouseInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSpouseInfoVC.swift; sourceTree = "<group>"; };
+		04D765722B6A173C0055ECBB /* YHSpouseInfoContainerVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSpouseInfoContainerVC.swift; sourceTree = "<group>"; };
 		58C2405158A4A6632D0E7460 /* Pods-galaxy.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-galaxy.debug.xcconfig"; path = "Target Support Files/Pods-galaxy/Pods-galaxy.debug.xcconfig"; sourceTree = "<group>"; };
 		987C69D43AE8D85DC1930DCF /* Pods_galaxy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_galaxy.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		A51044172B493675006B60BB /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
@@ -497,7 +497,7 @@
 			isa = PBXGroup;
 			children = (
 				041B52972B5E8EA0007EBCEB /* YHFamilyMemberFormVC.swift */,
-				04D765722B6A173C0055ECBB /* YHSpouseInfoVC.swift */,
+				04D765722B6A173C0055ECBB /* YHSpouseInfoContainerVC.swift */,
 				041B52D52B5F899E007EBCEB /* YHSpouseInitialInfoVC.swift */,
 				042FBBBA2B62806D00F9DE23 /* YHCertificateInfoController.swift */,
 				042FBBBE2B639F0300F9DE23 /* YHSpouseBasicInfoVC.swift */,
@@ -1467,7 +1467,7 @@
 				A5ACE9392B4564F7002C94D2 /* UIDevice+Extension.swift in Sources */,
 				041B52912B5E67F3007EBCEB /* YHFormItemEnterDetailCell.swift in Sources */,
 				A5ACE9422B4564F7002C94D2 /* AppDelegate+Extension.swift in Sources */,
-				04D765732B6A173C0055ECBB /* YHSpouseInfoVC.swift in Sources */,
+				04D765732B6A173C0055ECBB /* YHSpouseInfoContainerVC.swift in Sources */,
 				A5FD63BF2B6250BC00D1D9DA /* YHInformationPerfectCell.swift in Sources */,
 				A510441A2B495DD0006B60BB /* UIView+Extension.swift in Sources */,
 				A5ACE93E2B4564F7002C94D2 /* UIImage+Extension.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHFamilyMemberFormVC.swift

@@ -439,7 +439,7 @@ extension YHFamilyMemberFormVC : UITableViewDelegate, UITableViewDataSource {
         
              // 配偶
              if detailItem.relationType == .spouse {
-             let vc = YHSpouseInfoVC()
+             let vc = YHSpouseInfoContainerVC()
              vc.spouse = detailItem
              vc.orderId = orderId
              self.navigationController?.pushViewController(vc)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHSpouseInfoVC.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHSpouseInfoContainerVC.swift

@@ -15,7 +15,7 @@ import UIKit
     
 }
 
-class YHSpouseInfoVC: YHBaseViewController, YHSpouseInfoVCProtocol {
+class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
 
     let familyRequest:YHFamilyRequestViewModel = YHFamilyRequestViewModel()
 
@@ -153,7 +153,7 @@ class YHSpouseInfoVC: YHBaseViewController, YHSpouseInfoVCProtocol {
     }
 }
 
-extension YHSpouseInfoVC {
+extension YHSpouseInfoContainerVC {
     func saveInfo() {
         
         guard  let spouse = spouse else { return }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/M/YHFamilyInitialInfo.swift

@@ -697,6 +697,19 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
         self.hasDegree = val ? "1" : "0"
     }
     
+    // 是否已故
+    func isDead() -> Bool {
+        return self.deceased == 1
+    }
+    
+    func setIsDead(_ val:Bool) {
+        self.deceased = (val ? 1 : 0)
+    }
+    
+    // 是否在职
+    func isNowHaveJob() -> Bool {
+        return self.occupation == "在职"
+    }
     
     var relationType:YHFamilyMemberType {
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHSaveAndSubmitView.swift

@@ -11,11 +11,27 @@ import UIKit
 class YHSaveAndSubmitView: UIView {
 
     static let submitBtnHeight = 48.0
+    static let saveBtnWidth = 86.0
     static let gap = 8.0
     static let height = submitBtnHeight+gap*2
     
     var saveBlock:(()->Void)?
     var submitBlock:(()->Void)?
+    // 是否隐藏保存按钮
+    var isHiddenSave:Bool = false {
+        didSet {
+            self.saveBtn.isHidden = isHiddenSave
+            self.saveBtn.snp.updateConstraints { make in
+                make.width.equalTo(isHiddenSave ? 0 : Self.saveBtnWidth)
+            }
+            
+            self.submitBtn.snp.updateConstraints { make in
+                make.left.equalTo(saveBtn.snp.right).offset(isHiddenSave ? 0.0 : 10)
+            }
+            self.setNeedsLayout()
+            self.layoutIfNeeded()
+        }
+    }
 
     lazy var submitBtn:UIButton = {
         let btn = UIButton()
@@ -71,7 +87,8 @@ class YHSaveAndSubmitView: UIView {
         
         saveBtn.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(16)
-            make.size.equalTo(CGSize(width: 86.0, height: Self.submitBtnHeight))
+            make.height.equalTo(Self.submitBtnHeight)
+            make.width.equalTo(Self.saveBtnWidth)
             make.top.equalTo(Self.gap)
         }