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
05b22711
Commit
05b22711
authored
Nov 25, 2024
by
Alex朱枝文
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
收入记录测试bug修复
parent
045afe5f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
5 deletions
+30
-5
YHIncomeRecordWorkExperienceViewController.swift
...(收入记录)/C/YHIncomeRecordWorkExperienceViewController.swift
+2
-2
YHIncomeType.swift
...ceProcess(我的信息流程)/IncomeRecord(收入记录)/M/YHIncomeType.swift
+5
-2
YHIncomeDocumentationConfirmationCell.swift
...ecord(收入记录)/V/YHIncomeDocumentationConfirmationCell.swift
+23
-1
No files found.
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/C/YHIncomeRecordWorkExperienceViewController.swift
View file @
05b22711
...
@@ -145,7 +145,7 @@ extension YHIncomeRecordWorkExperienceViewController {
...
@@ -145,7 +145,7 @@ extension YHIncomeRecordWorkExperienceViewController {
}
}
private
func
setupUI
()
{
private
func
setupUI
()
{
gk_navTitle
=
"
工作经验
信息填写"
gk_navTitle
=
"
收入记录
信息填写"
gk_navBarAlpha
=
1.0
gk_navBarAlpha
=
1.0
gk_navBackgroundColor
=
.
white
gk_navBackgroundColor
=
.
white
...
@@ -453,8 +453,8 @@ extension YHIncomeRecordWorkExperienceViewController: UITableViewDelegate, UITab
...
@@ -453,8 +453,8 @@ extension YHIncomeRecordWorkExperienceViewController: UITableViewDelegate, UITab
case
let
.
documentComfirm
(
title
,
question
,
docs
):
case
let
.
documentComfirm
(
title
,
question
,
docs
):
if
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHIncomeDocumentationConfirmationCell
.
cellReuseIdentifier
)
as?
YHIncomeDocumentationConfirmationCell
{
if
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHIncomeDocumentationConfirmationCell
.
cellReuseIdentifier
)
as?
YHIncomeDocumentationConfirmationCell
{
hasAllFileIndexPath
=
indexPath
hasAllFileIndexPath
=
indexPath
cell
.
setupCellInfo
(
title
:
title
,
question
:
question
,
documents
:
docs
,
needShowFailButton
:
!
isHasAllFileOK
)
cell
.
selectedSureButton
=
YHIncomeRecordHasAllFile
(
rawValue
:
companyModel
.
has_all_file
)
??
.
unknown
cell
.
selectedSureButton
=
YHIncomeRecordHasAllFile
(
rawValue
:
companyModel
.
has_all_file
)
??
.
unknown
cell
.
setupCellInfo
(
title
:
title
,
question
:
question
,
documents
:
docs
,
needShowFailButton
:
!
isHasAllFileOK
)
cell
.
didSelectSureButton
=
{
[
weak
self
]
flag
in
cell
.
didSelectSureButton
=
{
[
weak
self
]
flag
in
guard
let
self
=
self
else
{
guard
let
self
=
self
else
{
return
return
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/M/YHIncomeType.swift
View file @
05b22711
...
@@ -56,7 +56,8 @@ enum YHIncomeType: Int, CaseIterable {
...
@@ -56,7 +56,8 @@ enum YHIncomeType: Int, CaseIterable {
"绝对实益拥有人声明书"
,
"绝对实益拥有人声明书"
,
"企业所得税月(季)度预缴纳税申报表(A类)(前4个季度/前12个月)"
,
"企业所得税月(季)度预缴纳税申报表(A类)(前4个季度/前12个月)"
,
"企业所得税完税证明(表格式)"
,
"企业所得税完税证明(表格式)"
,
"企业所得税年度纳税申报表(A类)(近一年度)"
]
"企业所得税年度纳税申报表(A类)(近一年度)"
,
"工作证明"
]
case
.
incomeOfHKCompanies
:
case
.
incomeOfHKCompanies
:
return
[
"周年申报表"
,
return
[
"周年申报表"
,
"审计报告"
,
"审计报告"
,
...
@@ -109,7 +110,9 @@ enum YHIncomeType: Int, CaseIterable {
...
@@ -109,7 +110,9 @@ enum YHIncomeType: Int, CaseIterable {
case
.
incomeOfOtherOverseasCompanies
:
case
.
incomeOfOtherOverseasCompanies
:
return
[
"财务报表"
,
return
[
"财务报表"
,
"合法纳税及完税证明"
,
"合法纳税及完税证明"
,
"公司所有权官方证明文件"
]
"公司所有权官方证明文件"
,
"工作签证"
,
"工作证明"
]
}
}
}
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/V/YHIncomeDocumentationConfirmationCell.swift
View file @
05b22711
...
@@ -6,6 +6,7 @@
...
@@ -6,6 +6,7 @@
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
//
import
AttributedString
import
UIKit
import
UIKit
class
YHIncomeDocumentationConfirmationCell
:
YHResignDocumentCell
{
class
YHIncomeDocumentationConfirmationCell
:
YHResignDocumentCell
{
...
@@ -82,6 +83,8 @@ class YHIncomeDocumentationConfirmationCell: YHResignDocumentCell {
...
@@ -82,6 +83,8 @@ class YHIncomeDocumentationConfirmationCell: YHResignDocumentCell {
label
.
font
=
.
PFSC_R
(
ofSize
:
12
)
label
.
font
=
.
PFSC_R
(
ofSize
:
12
)
label
.
textColor
=
.
failColor
label
.
textColor
=
.
failColor
label
.
text
=
"请选择"
label
.
text
=
"请选择"
label
.
numberOfLines
=
0
label
.
lineBreakMode
=
.
byCharWrapping
return
label
return
label
}()
}()
...
@@ -135,8 +138,9 @@ class YHIncomeDocumentationConfirmationCell: YHResignDocumentCell {
...
@@ -135,8 +138,9 @@ class YHIncomeDocumentationConfirmationCell: YHResignDocumentCell {
extension
YHIncomeDocumentationConfirmationCell
{
extension
YHIncomeDocumentationConfirmationCell
{
private
func
updateFailLabel
(
_
needShowFailButton
:
Bool
)
{
private
func
updateFailLabel
(
_
needShowFailButton
:
Bool
)
{
if
needShowFailButton
{
if
needShowFailButton
||
selectedSureButton
==
.
false
{
infoFailLabel
.
isHidden
=
false
infoFailLabel
.
isHidden
=
false
infoFailLabel
.
attributed
.
text
=
selectedSureButton
.
selectedTips
()
containerView
.
snp
.
remakeConstraints
{
make
in
containerView
.
snp
.
remakeConstraints
{
make
in
make
.
left
.
equalTo
(
infoTitleLabel
.
snp
.
left
)
make
.
left
.
equalTo
(
infoTitleLabel
.
snp
.
left
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
18
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
18
)
...
@@ -149,8 +153,10 @@ extension YHIncomeDocumentationConfirmationCell {
...
@@ -149,8 +153,10 @@ extension YHIncomeDocumentationConfirmationCell {
make
.
right
.
lessThanOrEqualToSuperview
()
.
offset
(
-
18
)
make
.
right
.
lessThanOrEqualToSuperview
()
.
offset
(
-
18
)
make
.
bottom
.
equalToSuperview
()
.
offset
(
-
16
)
make
.
bottom
.
equalToSuperview
()
.
offset
(
-
16
)
}
}
}
else
{
}
else
{
infoFailLabel
.
isHidden
=
true
infoFailLabel
.
isHidden
=
true
infoFailLabel
.
attributed
.
text
=
selectedSureButton
.
selectedTips
()
containerView
.
snp
.
remakeConstraints
{
make
in
containerView
.
snp
.
remakeConstraints
{
make
in
make
.
left
.
equalTo
(
infoTitleLabel
.
snp
.
left
)
make
.
left
.
equalTo
(
infoTitleLabel
.
snp
.
left
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
18
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
18
)
...
@@ -336,3 +342,19 @@ class YHIncomeDocumentationView: UIView {
...
@@ -336,3 +342,19 @@ class YHIncomeDocumentationView: UIView {
}
}
}
}
}
}
private
extension
YHIncomeRecordHasAllFile
{
func
selectedTips
()
->
ASAttributedString
?
{
switch
self
{
case
.
unknown
:
return
.
init
(
string
:
"请选择"
,
.
font
(
UIFont
.
PFSC_R
(
ofSize
:
12
)),
.
foreground
(
UIColor
.
failColor
))
case
.
true
:
return
nil
case
.
false
:
let
first
:
ASAttributedString
=
.
init
(
string
:
"若不能提供以上证明材料,将导致您的该收入"
,
.
font
(
UIFont
.
PFSC_R
(
ofSize
:
12
)),
.
foreground
(
UIColor
(
hexString
:
"#8993A2"
)
??
.
gray
))
let
second
:
ASAttributedString
=
.
init
(
string
:
"不被认可不予加分"
,
.
font
(
UIFont
.
PFSC_R
(
ofSize
:
12
)),
.
foreground
(
UIColor
.
failColor
))
let
third
:
ASAttributedString
=
.
init
(
string
:
",请尽可能准备以上材料并修改此选项。"
,
.
font
(
UIFont
.
PFSC_R
(
ofSize
:
12
)),
.
foreground
(
UIColor
(
hexString
:
"#8993A2"
)
??
.
gray
))
return
first
+
second
+
third
}
}
}
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