Merge branch 'qmas-1130' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into qmas-1130

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/C/YHIncomeRecordWorkExperienceViewController.swift

@@ -497,32 +497,36 @@ extension YHIncomeRecordWorkExperienceViewController: UITableViewDelegate, UITab
 
 extension YHIncomeRecordWorkExperienceViewController {
     private func checkInput() -> Bool {
+        var retValue = true
+        var updateRows: [IndexPath] = []
         if companyModel.has_all_file == YHIncomeRecordHasAllFile.unknown.rawValue {
             isHasAllFileOK = false
             if let hasAllFileIndexPath = hasAllFileIndexPath, tableView.numberOfSections > hasAllFileIndexPath.section, tableView.numberOfRows(inSection: hasAllFileIndexPath.section) > hasAllFileIndexPath.row {
-                tableView.reloadRows(at: [hasAllFileIndexPath], with: .none)
+                updateRows.append(hasAllFileIndexPath)
             }
-            return false
+            retValue = false
         }
-        isHasAllFileOK = true
         if companyModel.income_type.count == 0 {
             isIncomeTypeOK = false
             if let incomeTypeIndexPath = incomeTypeIndexPath, tableView.numberOfSections > incomeTypeIndexPath.section, tableView.numberOfRows(inSection: incomeTypeIndexPath.section) > incomeTypeIndexPath.row {
-                tableView.reloadRows(at: [incomeTypeIndexPath], with: .none)
+                updateRows.append(incomeTypeIndexPath)
             }
-            return false
+            retValue = false
         }
-        isIncomeTypeOK = true
-        
         if companyModel.income_money == 0 {
             isIncomeMoneyOK = false
             if let incomMoneyIndexPath = incomMoneyIndexPath, tableView.numberOfSections > incomMoneyIndexPath.section, tableView.numberOfRows(inSection: incomMoneyIndexPath.section) > incomMoneyIndexPath.row {
-                tableView.reloadRows(at: [incomMoneyIndexPath], with: .none)
+                updateRows.append(incomMoneyIndexPath)
             }
-            return false
+            retValue = false
         }
+        if updateRows.count > 0 {
+            tableView.reloadRows(at: updateRows, with: .none)
+            isHasAllFileOK = true
+            isIncomeTypeOK = true
             isIncomeMoneyOK = true
-        return true
+        }
+        return retValue
     }
 
     private func requestData(isNeedLoading: Bool = false) {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/V/YHIncomeInputMoneyCell.swift

@@ -57,7 +57,7 @@ class YHIncomeInputMoneyCell: YHResignDocumentCell {
         let label = UILabel()
         label.font = .PFSC_R(ofSize: 12)
         label.textColor = .failColor
-        label.text = "请选择"
+        label.text = "请输入"
         return label
     }()
     
@@ -110,11 +110,11 @@ class YHIncomeInputMoneyCell: YHResignDocumentCell {
         infoFailLabel.isHidden = !needShowFailButton
         infoFailLabel.snp.remakeConstraints { make in
             if needShowFailButton {
-                make.top.equalTo(infoDetailLabel.snp.bottom).offset(6)
+                make.top.equalTo(infoTitleLabel.snp.bottom).offset(6)
             }
             make.left.equalToSuperview().offset(18)
             make.right.lessThanOrEqualToSuperview().offset(-18)
-            make.bottom.equalToSuperview().offset(-16)
+            make.bottom.lessThanOrEqualToSuperview().offset(-16)
         }
         
     }