Commit 94383b20 authored by Steven杜宇's avatar Steven杜宇

// 旅行

parent ad8498d2
...@@ -172,7 +172,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController { ...@@ -172,7 +172,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
let cerModel1 = YHTravelDocsPreparationDetailItemModel(type: type, order_id: self.orderId, order_sn: "", img_back: "", img_front: "", status: 0, issue_start: "", issue_end: "", user_id:userId , user_type: dataModel.type, remark: "", nationality: "\(dataModel.nationality)", age: age) let cerModel1 = YHTravelDocsPreparationDetailItemModel(type: type, order_id: self.orderId, order_sn: "", img_back: "", img_front: "", status: 0, issue_start: "", issue_end: "", user_id:userId , user_type: dataModel.type, remark: "", nationality: "\(dataModel.nationality)", age: age)
cerModel1.latest_validaty_date = self.viewModel.travelDetailModel?.latest_validaty_date ?? "" cerModel1.latest_validaty_date = self.viewModel.travelDetailModel?.latest_validaty_date ?? ""
cerModel1.china_travel_latest_validate_date = self.viewModel.travelDetailModel?.china_travel_latest_validaty_date ?? "" cerModel1.china_travel_latest_validaty_date = self.viewModel.travelDetailModel?.china_travel_latest_validaty_date ?? ""
cerModel1.isCanEdit = true cerModel1.isCanEdit = true
item.cerDetailModel = cerModel1 item.cerDetailModel = cerModel1
sectionItems.append(item) sectionItems.append(item)
...@@ -183,7 +183,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController { ...@@ -183,7 +183,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
let item1 = YHTravelCerSectionItem(type: .certificate, tipsArr: []) let item1 = YHTravelCerSectionItem(type: .certificate, tipsArr: [])
let cerModel1 = YHTravelDocsPreparationDetailItemModel(type: 1, order_id: self.orderId, order_sn: "", img_back: "", img_front: "", status: 0, issue_start: "", issue_end: "", user_id:userId , user_type: dataModel.type, remark: "", nationality: "\(dataModel.nationality)", age: age) let cerModel1 = YHTravelDocsPreparationDetailItemModel(type: 1, order_id: self.orderId, order_sn: "", img_back: "", img_front: "", status: 0, issue_start: "", issue_end: "", user_id:userId , user_type: dataModel.type, remark: "", nationality: "\(dataModel.nationality)", age: age)
cerModel1.latest_validaty_date = self.viewModel.travelDetailModel?.latest_validaty_date ?? "" cerModel1.latest_validaty_date = self.viewModel.travelDetailModel?.latest_validaty_date ?? ""
cerModel1.china_travel_latest_validate_date = self.viewModel.travelDetailModel?.china_travel_latest_validaty_date ?? "" cerModel1.china_travel_latest_validaty_date = self.viewModel.travelDetailModel?.china_travel_latest_validaty_date ?? ""
cerModel1.isCanEdit = true cerModel1.isCanEdit = true
item1.cerDetailModel = cerModel1 item1.cerDetailModel = cerModel1
sectionItems.append(item1) sectionItems.append(item1)
...@@ -191,6 +191,8 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController { ...@@ -191,6 +191,8 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
// 中国居留许可签证 // 中国居留许可签证
let item2 = YHTravelCerSectionItem(type: .certificate, tipsArr: []) let item2 = YHTravelCerSectionItem(type: .certificate, tipsArr: [])
let cerModel2 = YHTravelDocsPreparationDetailItemModel(type: 2, order_id: self.orderId, order_sn: "", img_back: "", img_front: "", status: 0, issue_start: "", issue_end: "", user_id:userId , user_type: dataModel.type, remark: "", nationality: "\(dataModel.nationality)", age: age) let cerModel2 = YHTravelDocsPreparationDetailItemModel(type: 2, order_id: self.orderId, order_sn: "", img_back: "", img_front: "", status: 0, issue_start: "", issue_end: "", user_id:userId , user_type: dataModel.type, remark: "", nationality: "\(dataModel.nationality)", age: age)
cerModel2.latest_validaty_date = self.viewModel.travelDetailModel?.latest_validaty_date ?? ""
cerModel2.china_travel_latest_validaty_date = self.viewModel.travelDetailModel?.china_travel_latest_validaty_date ?? ""
cerModel2.isCanEdit = true cerModel2.isCanEdit = true
item2.cerDetailModel = cerModel2 item2.cerDetailModel = cerModel2
sectionItems.append(item2) sectionItems.append(item2)
...@@ -258,14 +260,15 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController { ...@@ -258,14 +260,15 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
} else { } else {
let isValidCertificate = item.cerDetailModel.isValidCer() let isValidCertificate = item.cerDetailModel.isValidCer()
if !isValidCertificate { if !isValidCertificate {
hasError = true if item.cerDetailModel.type == 2, item.cerDetailModel.china_travel_latest_validaty_date.isEmpty {
if item.cerDetailModel.type == 2, item.cerDetailModel.china_travel_latest_validate_date.isEmpty {
// 这个情况直接弹toast // 这个情况直接弹toast
hasError = true
YHHUD.flash(message: "赴港行程尚未成功预约,请前往检查") YHHUD.flash(message: "赴港行程尚未成功预约,请前往检查")
} else { } else {
// 有效期不足也能提交
item.cerDetailModel.isNeedCheckCer = true item.cerDetailModel.isNeedCheckCer = true
let deadDate: String = (item.cerDetailModel.type == 2 ? item.cerDetailModel.china_travel_latest_validate_date : item.cerDetailModel.latest_validaty_date) let deadDate: String = (item.cerDetailModel.type == 2 ? item.cerDetailModel.china_travel_latest_validaty_date : item.cerDetailModel.latest_validaty_date)
item.cerDetailModel.checkTips = "有效期不足,需要为\(deadDate)或以后" item.cerDetailModel.checkTips = "有效期不足,需要为\(deadDate)或以后"
} }
} }
......
...@@ -46,7 +46,7 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable { ...@@ -46,7 +46,7 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
var latest_validaty_date : String = "" //有效期最晚时间 var latest_validaty_date : String = "" //有效期最晚时间
var china_travel_latest_validate_date: String = "" // 中国居留许可签证有效期最晚时间 var china_travel_latest_validaty_date: String = "" // 中国居留许可签证有效期最晚时间
var age: Int = 0 var age: Int = 0
// 是否检测时间 // 是否检测时间
...@@ -87,10 +87,10 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable { ...@@ -87,10 +87,10 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
if self.age < 11 { // 小于11岁的不检测 if self.age < 11 { // 小于11岁的不检测
return true return true
} }
if self.china_travel_latest_validate_date.isEmpty { // 截止日期为空 if self.china_travel_latest_validaty_date.isEmpty { // 截止日期为空
return false return false
} }
let isValid = self.compareDates(dateString1: self.issue_end, dateString2: self.china_travel_latest_validate_date) let isValid = self.compareDates(dateString1: self.issue_end, dateString2: self.china_travel_latest_validaty_date)
return isValid return isValid
} }
......
...@@ -69,7 +69,7 @@ extension YHTravelDocsPreparationViewModel { ...@@ -69,7 +69,7 @@ extension YHTravelDocsPreparationViewModel {
for item in resultModel.list { for item in resultModel.list {
if let item = item { if let item = item {
item.latest_validaty_date = self.travelDetailModel?.latest_validaty_date ?? "" item.latest_validaty_date = self.travelDetailModel?.latest_validaty_date ?? ""
item.china_travel_latest_validate_date = self.travelDetailModel?.china_travel_latest_validaty_date ?? "" item.china_travel_latest_validaty_date = self.travelDetailModel?.china_travel_latest_validaty_date ?? ""
item.age = resultModel.age item.age = resultModel.age
} }
} }
......
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