Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
galaxy-iOS
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
mobile-group
galaxy-iOS
Commits
34d3d2d7
Commit
34d3d2d7
authored
Aug 29, 2024
by
Steven杜宇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
// 旅行
parent
a8130799
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
99 additions
and
13 deletions
+99
-13
YHTravelDocsPreparationDetailVC.swift
...aration(6 旅行证件准备)/C/YHTravelDocsPreparationDetailVC.swift
+55
-8
YHTravelDocsPreparationDetailModel.swift
...tion(6 旅行证件准备)/M/YHTravelDocsPreparationDetailModel.swift
+7
-0
YHTravelCertificateUploadCell.swift
...eparation(6 旅行证件准备)/V/YHTravelCertificateUploadCell.swift
+37
-5
No files found.
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/C/YHTravelDocsPreparationDetailVC.swift
View file @
34d3d2d7
...
...
@@ -48,6 +48,13 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
//上个界面传递过来的数据对象
var
dataModel
:
YHTravelDocsPreparationListModel
=
YHTravelDocsPreparationListModel
()
var
isDisableEdit
:
Bool
{
get
{
// 待审核或已完成 不能编辑
return
(
self
.
dataModel
.
status
==
1
||
self
.
dataModel
.
status
==
3
)
}
}
var
orderId
:
Int
=
0
var
sectionItems
:[
YHTravelCerSectionItem
]
=
[]
...
...
@@ -68,9 +75,12 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
return
tableView
}()
let
bottomViewHeight
=
98.0
lazy
var
bottomView
:
UIView
=
{
let
view
=
UIView
()
view
.
backgroundColor
=
.
white
view
.
isHidden
=
true
view
.
addSubview
(
bottomBtn
)
bottomBtn
.
snp
.
makeConstraints
{
make
in
make
.
left
.
equalTo
(
16
)
...
...
@@ -106,7 +116,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
}
self
.
bottomView
.
snp
.
makeConstraints
{
make
in
make
.
left
.
right
.
bottom
.
equalToSuperview
()
make
.
height
.
equalTo
(
98.
0
)
make
.
height
.
equalTo
(
0
)
}
loadDetailInfo
()
}
...
...
@@ -140,18 +150,21 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
if
let
model
=
model
{
model
.
latest_validaty_date
=
self
.
viewModel
.
travelDetailModel
?
.
latest_validaty_date
??
""
item2
.
cerDetailModel
=
model
model
.
isCanEdit
=
!
self
.
isDisableEdit
sectionItems
.
append
(
item2
)
}
}
}
else
{
// 没有上传过证件
let
item
=
YHTravelCerSectionItem
(
type
:
.
certificate
,
tipsArr
:
[])
var
userId
=
0
if
let
uid
=
YHLoginManager
.
shared
.
userModel
?
.
id
{
userId
=
Int
(
uid
)
??
0
}
if
self
.
type
==
.
HK
||
self
.
type
==
.
chinesePassPort
{
var
userId
=
0
if
let
uid
=
YHLoginManager
.
shared
.
userModel
?
.
id
{
userId
=
Int
(
uid
)
??
0
}
let
item
=
YHTravelCerSectionItem
(
type
:
.
certificate
,
tipsArr
:
[])
// 证件类型 1-护照 2-中国旅行证 3-港澳通行证 4-存款证明 5-其他
var
type
=
-
1
if
self
.
type
==
.
chinesePassPort
{
...
...
@@ -161,11 +174,36 @@ 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
)
"
)
cerModel1
.
latest_validaty_date
=
self
.
viewModel
.
travelDetailModel
?
.
latest_validaty_date
??
""
cerModel1
.
isCanEdit
=
true
item
.
cerDetailModel
=
cerModel1
sectionItems
.
append
(
item
)
}
else
if
self
.
type
==
.
forignPassPort
{
// 外国护照
// 外国护照
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
)
"
)
cerModel1
.
isCanEdit
=
true
item1
.
cerDetailModel
=
cerModel1
sectionItems
.
append
(
item1
)
// 中国居留许可签证
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
)
"
)
cerModel2
.
isCanEdit
=
true
item2
.
cerDetailModel
=
cerModel2
sectionItems
.
append
(
item2
)
}
}
self
.
bottomView
.
isHidden
=
self
.
isDisableEdit
self
.
bottomView
.
snp
.
updateConstraints
{
make
in
make
.
height
.
equalTo
(
self
.
isDisableEdit
?
0.0
:
bottomViewHeight
)
}
tableView
.
reloadData
()
self
.
view
.
setNeedsLayout
()
self
.
view
.
layoutIfNeeded
()
}
@objc
func
didSaveBtnClicked
()
{
...
...
@@ -181,7 +219,14 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
if
item
.
type
==
.
certificate
{
item
.
cerDetailModel
.
isNeedCheckCer
=
false
if
item
.
cerDetailModel
.
img_front
.
isEmpty
||
item
.
cerDetailModel
.
img_back
.
isEmpty
{
var
noCerInfo
=
false
if
item
.
cerDetailModel
.
type
==
3
{
// 只有港澳通行证有正反面
noCerInfo
=
(
item
.
cerDetailModel
.
img_front
.
isEmpty
||
item
.
cerDetailModel
.
img_back
.
isEmpty
)
}
else
{
noCerInfo
=
item
.
cerDetailModel
.
img_front
.
isEmpty
}
if
noCerInfo
{
hasError
=
true
item
.
cerDetailModel
.
isNeedCheckCer
=
true
if
item
.
cerDetailModel
.
type
==
3
{
// 港澳通行证
...
...
@@ -333,7 +378,9 @@ extension YHTravelDocsPreparationDetailVC: UITableViewDelegate, UITableViewDataS
cell
.
updateBlock
=
{
[
weak
self
]
in
guard
let
self
=
self
else
{
return
}
self
.
checkInfo
()
if
!
self
.
isDisableEdit
{
self
.
checkInfo
()
}
self
.
tableView
.
reloadData
()
}
cell
.
templateClick
=
{
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/M/YHTravelDocsPreparationDetailModel.swift
View file @
34d3d2d7
...
...
@@ -35,12 +35,19 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
var
nationality
:
String
=
""
//国籍 1-中国 2-国外
// 自定义
// 是否检测证件
var
isNeedCheckCer
:
Bool
=
false
// 证件错误信息
var
checkTips
:
String
=
""
// 是否显示被拒理由
var
isNeedShowRejectReason
:
Bool
=
false
// 被拒理由
var
rejectReason
:
String
=
""
var
latest_validaty_date
:
String
=
""
// 是否检测时间
var
isNeedCheckDate
:
Bool
=
false
// 是否可编辑
var
isCanEdit
:
Bool
=
true
required
init
()
{
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/V/YHTravelCertificateUploadCell.swift
View file @
34d3d2d7
...
...
@@ -110,7 +110,9 @@ class YHTravelCertificateUploadCell: UITableViewCell {
guard
let
self
=
self
else
{
return
}
if
self
.
dataModel
.
type
==
3
{
// 港澳通行证
self
.
dataModel
.
img_front
=
url
self
.
getOCR
(
url
:
url
,
isBack
:
0
)
if
self
.
dataModel
.
isCanEdit
{
self
.
getOCR
(
url
:
url
,
isBack
:
0
)
}
}
else
{
self
.
dataModel
.
img_front
=
url
...
...
@@ -121,6 +123,10 @@ class YHTravelCertificateUploadCell: UITableViewCell {
view
.
deleteBlock
=
{
[
weak
self
]
url
,
index
in
guard
let
self
=
self
else
{
return
}
if
!
self
.
dataModel
.
isCanEdit
{
return
}
if
self
.
dataModel
.
type
==
3
{
// 港澳通行证
self
.
dataModel
.
img_front
=
""
}
else
{
...
...
@@ -138,13 +144,34 @@ class YHTravelCertificateUploadCell: UITableViewCell {
view
.
urlBlock
=
{
[
weak
self
]
url
,
index
in
guard
let
self
=
self
else
{
return
}
self
.
dataModel
.
img_back
=
url
self
.
getOCR
(
url
:
url
,
isBack
:
1
)
if
self
.
dataModel
.
type
==
3
{
// 港澳通行证
self
.
dataModel
.
img_back
=
url
if
self
.
dataModel
.
isCanEdit
{
self
.
getOCR
(
url
:
url
,
isBack
:
1
)
}
}
else
{
self
.
dataModel
.
img_front
=
url
self
.
dataModel
.
img_back
=
url
self
.
updateBlock
?()
}
}
view
.
deleteBlock
=
{
[
weak
self
]
url
,
index
in
guard
let
self
=
self
else
{
return
}
self
.
dataModel
.
img_back
=
""
if
!
self
.
dataModel
.
isCanEdit
{
return
}
if
self
.
dataModel
.
type
==
3
{
// 港澳通行证
self
.
dataModel
.
img_back
=
""
}
else
{
self
.
dataModel
.
img_front
=
""
self
.
dataModel
.
img_back
=
""
}
self
.
updateBlock
?()
}
return
view
...
...
@@ -171,10 +198,15 @@ class YHTravelCertificateUploadCell: UITableViewCell {
itemView
.
isNeedShowErrorTips
=
item
.
isShowErrorTips
itemView
.
errorTips
=
item
.
errorTips
itemView
.
detail
=
item
.
value
itemView
.
arrowImgView
.
isHidden
=
!
self
.
dataModel
.
isCanEdit
itemView
.
clickBlock
=
{
[
weak
self
]
in
guard
let
self
=
self
else
{
return
}
if
!
self
.
dataModel
.
isCanEdit
{
return
}
if
item
.
id
==
.
signDate
||
item
.
id
==
.
deadDate
{
YHDatePickView
.
show
(
type
:
.
yyyymmdd
)
{
time
in
...
...
@@ -234,7 +266,7 @@ class YHTravelCertificateUploadCell: UITableViewCell {
title
=
"护照信息"
frontTitle
=
"护照资料页"
}
else
if
model
.
type
==
3
{
// 中国居留许可签证
}
else
if
model
.
type
==
2
{
// 中国居留许可签证
title
=
"中国居留许可签证"
frontTitle
=
"中国居留许可签证"
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment