Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
GeliBusinessPlatform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ljy
GeliBusinessPlatform
Commits
0860a9f3
Commit
0860a9f3
authored
Jun 03, 2020
by
刘俊宏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工作中心+出库记录完善ing
parent
21ea9098
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
271 additions
and
138 deletions
+271
-138
GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
...ata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/Model/Work/WorkcenterIndexModel.swift
GeliBusinessPlatform/Model/Work/WorkcenterIndexModel.swift
+1
-0
GeliBusinessPlatform/View/MoreBtnView/MoreAndTimeSelectView.swift
...nessPlatform/View/MoreBtnView/MoreAndTimeSelectView.swift
+194
-101
GeliBusinessPlatform/View/MoreBtnView/MoreAndTimeSelectView.xib
...sinessPlatform/View/MoreBtnView/MoreAndTimeSelectView.xib
+1
-0
GeliBusinessPlatform/ViewController/出入库记录/CRKListVC.swift
GeliBusinessPlatform/ViewController/出入库记录/CRKListVC.swift
+47
-16
GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift
...essPlatform/ViewController/工作中心/WorkCViewController.swift
+5
-6
GeliBusinessPlatform/ViewController/工作中心/WorkItemCollectionViewCell.xib
...atform/ViewController/工作中心/WorkItemCollectionViewCell.xib
+6
-1
GeliBusinessPlatform/ViewController/工作中心/WorkItemTableViewCell.swift
...sPlatform/ViewController/工作中心/WorkItemTableViewCell.swift
+6
-3
GeliBusinessPlatform/ViewController/工作中心/编辑工作中心/EditWorkCViewController.swift
.../ViewController/工作中心/编辑工作中心/EditWorkCViewController.swift
+11
-11
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
View file @
0860a9f3
No preview for this file type
GeliBusinessPlatform/Model/Work/WorkcenterIndexModel.swift
View file @
0860a9f3
...
...
@@ -81,6 +81,7 @@ class WorkcenterIndexAuthResModel: Mappable {
ranges
<-
map
[
"ranges"
]
platforms
<-
map
[
"platforms"
]
auth_pid
<-
map
[
"auth_pid"
]
app_icon
<-
map
[
"app_icon"
]
}
...
...
GeliBusinessPlatform/View/MoreBtnView/MoreAndTimeSelectView.swift
View file @
0860a9f3
...
...
@@ -17,7 +17,8 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
@IBOutlet
weak
var
contenV
:
UIView
!
var
contentView
:
UIView
!
var
delegate
:
MoreAndTimeSelectViewDelegate
?
@IBOutlet
weak
var
scrollview
:
UIScrollView
!
@IBOutlet
weak
var
showViewHeight
:
NSLayoutConstraint
!
@IBAction
func
resetAction
(
_
sender
:
UIButton
)
{
//重置
...
...
@@ -29,26 +30,26 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
EndDate
=
nil
paySArr
=
[
false
,
false
,
false
,
false
]
bugSArr
=
[
false
,
false
,
false
]
sendSArr
=
[
false
,
false
,
false
,
false
]
sendSArr
=
[]
setUI
()
self
.
delegate
?
.
sureActionMoreAndTimeSelectView
(
beginDate
:
BeginDate
,
endginDate
:
EndDate
,
paySelectArr
:
paySArr
,
bugSelectArr
:
bugSArr
,
sendSelectArr
:
sendSArr
)
}
@IBAction
func
sureAction
(
_
sender
:
UIButton
)
{
//确定
self
.
removeFromSuperview
()
self
.
delegate
?
.
sureActionMoreAndTimeSelectView
(
beginDate
:
BeginDate
,
endginDate
:
EndDate
,
paySelectArr
:
paySArr
,
bugSelectArr
:
bugSArr
,
sendSelectArr
:
sendSArr
)
}
@IBAction
func
blackTapAction
(
_
sender
:
UITapGestureRecognizer
)
{
//点击黑色部分隐藏
self
.
removeFromSuperview
()
self
.
delegate
?
.
colseActionMoreAndTimeSelectView
()
}
//setUI-前必传
//MARK:--数据源
...
...
@@ -56,13 +57,14 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
var
EndDate
:
Date
!
=
nil
var
paySArr
:
Array
<
Bool
>
=
[
false
,
false
,
false
,
false
]
var
bugSArr
:
Array
<
Bool
>
=
[
false
,
false
,
false
]
var
sendSArr
:
Array
<
Bool
>
=
[
false
,
false
,
false
,
false
]
var
sendSArr
:
Array
<
Bool
>
=
[]
var
contentH
=
320*
glscale
var
contentH
=
360*
glscale
let
line1
=
UIView
()
let
timeTilelV
=
TitleAndSelCalendarView
()
let
calendarV
=
TimeSelectView
(
frame
:
CGRect
(
x
:
0
,
y
:
85*
glscale
,
width
:
fullScreenWidth
,
height
:
235*
glscale
))
let
line3
=
UIView
()
func
setUI
(){
contentWidht
.
constant
=
375*
glscale
...
...
@@ -114,7 +116,6 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
make
.
height
.
equalTo
(
60*
glscale
)
}
//分界线3
let
line3
=
UIView
()
line3
.
backgroundColor
=
UIColor
.
init
(
named
:
"灰色分界线"
)
contenV
.
addSubview
(
line3
)
line3
.
snp
.
makeConstraints
{
(
make
)
in
...
...
@@ -122,21 +123,24 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
make
.
height
.
equalTo
(
1
)
make
.
top
.
equalTo
(
typeV
.
snp_bottom
)
.
offset
(
15*
glscale
)
}
let
statusV
=
addTitleAndMoreBtn
(
title
:
"具体类型"
,
arrStr
:
[
"调入"
,
"退货"
,
"生产"
,
"调出被拒绝"
],
btnTag
:
3000
)
let
statusV
=
addTitleAndMoreBtn
(
title
:
"具体类型"
,
arrStr
:
[],
btnTag
:
3000
)
contenV
.
addSubview
(
statusV
)
statusV
.
tag
=
10086
statusV
.
snp
.
makeConstraints
{
(
make
)
in
make
.
left
.
equalTo
(
15*
glscale
)
make
.
top
.
equalTo
(
line3
.
snp_bottom
)
.
offset
(
15*
glscale
)
make
.
right
.
equalTo
(
0
)
make
.
height
.
equalTo
(
6
0*
glscale
)
make
.
height
.
equalTo
(
2
0*
glscale
)
}
}
//如果展示时间选择器,就 + 235*glscale
//MARK:--展示日历选择器
func
isShowCalendarV
(
isShow
:
Bool
)
{
if
isShow
{
contentHeight
.
constant
=
contentH
+
235*
glscale
func
isShowCalendarV
(
isShow
:
Bool
)
{
if
isShow
{
contentH
=
contentH
+
235*
glscale
contentHeight
.
constant
=
contentH
calendarV
.
moreSelection
=
true
contenV
.
addSubview
(
calendarV
)
calendarV
.
delegate
=
self
...
...
@@ -148,7 +152,8 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
if
BeginDate
!=
nil
{
calendarV
.
setOldDate
(
beginD
:
BeginDate
!
,
endD
:
EndDate
!
)
}
}
else
{
}
else
{
contentH
=
contentH
-
235*
glscale
contentHeight
.
constant
=
contentH
calendarV
.
removeFromSuperview
()
line1
.
snp
.
remakeConstraints
{
(
make
)
in
...
...
@@ -156,23 +161,23 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
make
.
height
.
equalTo
(
1
)
make
.
top
.
equalTo
(
timeTilelV
.
snp_bottom
)
.
offset
(
15*
glscale
)
}
}
}
}
}
//MARK:--日历代理
func
selectMoreDate
(
beginDate
:
Date
,
endginDate
:
Date
)
{
//bug
let
timeInterval
:
TimeInterval
=
beginDate
.
timeIntervalSince1970
let
timeIntervalEnd
:
TimeInterval
=
endginDate
.
timeIntervalSince1970
timeTilelV
.
timeLbl
.
text
=
dayByDouble
(
sender
:
timeInterval
)
+
"-"
+
dayByDouble
(
sender
:
timeIntervalEnd
)
EndDate
=
endginDate
BeginDate
=
beginDate
}
//MARK--标题和按钮多的情况1
var
allSelectBtn
:
Array
<
UIButton
>
=
[]
func
addTitleAndMoreBtn
(
title
:
String
,
arrStr
:[
String
],
btnTag
:
Int
)
->
UIView
{
let
conView
=
UIView
()
...
...
@@ -184,6 +189,24 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
make
.
left
.
top
.
equalTo
(
0
)
}
titleLbl
.
text
=
title
if
title
==
"具体类型"
{
let
tishiLbl
=
UILabel
()
tishiLbl
.
textColor
=
UIColor
.
init
(
named
:
"灰色字体颜色"
)
tishiLbl
.
font
=
UIFont
.
systemFont
(
ofSize
:
11
)
conView
.
addSubview
(
tishiLbl
)
tishiLbl
.
snp
.
makeConstraints
{
(
make
)
in
make
.
bottom
.
equalTo
(
titleLbl
)
make
.
left
.
equalTo
(
titleLbl
.
snp_right
)
.
offset
(
3
)
}
tishiLbl
.
text
=
"(需选择出入库类型)"
let
tempBtnArr
=
allSelectBtn
allSelectBtn
.
removeAll
()
tempBtnArr
.
forEach
{
(
sender
)
in
if
sender
.
tag
<
3000
{
allSelectBtn
.
append
(
sender
)
}
}
}
weak
var
btn
:
UIButton
?
=
nil
for
i
in
0
..<
arrStr
.
count
{
let
str
=
arrStr
[
i
]
...
...
@@ -199,9 +222,15 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
make
.
left
.
equalTo
(
CGFloat
(
CGFloat
(
i
*
(
73
+
15
))
*
glscale
))
make
.
top
.
equalTo
(
titleLbl
.
snp_bottom
)
.
offset
(
10*
glscale
)
btn
=
selectBtn
}
else
{
}
else
if
i
<
8
{
make
.
left
.
equalTo
(
CGFloat
(
CGFloat
((
i
-
4
)
*
(
73
+
15
))
*
glscale
))
make
.
top
.
equalTo
(
btn
!.
snp_bottom
)
.
offset
(
10*
glscale
)
if
i
==
7
{
btn
=
selectBtn
}
}
else
{
make
.
left
.
equalTo
(
CGFloat
(
CGFloat
((
i
-
8
)
*
(
73
+
15
))
*
glscale
))
make
.
top
.
equalTo
(
btn
!.
snp_bottom
)
.
offset
(
10*
glscale
)
}
make
.
width
.
equalTo
(
73*
glscale
)
make
.
height
.
equalTo
(
30*
glscale
)
...
...
@@ -210,7 +239,7 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
selectBtn
.
tag
=
btnTag
+
i
allSelectBtn
.
append
(
selectBtn
)
}
return
conView
}
...
...
@@ -237,7 +266,7 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
}
}
paySArr
[
index
]
=
sender
.
isSelected
}
else
if
sender
.
tag
<
3000
{
let
index
=
sender
.
tag
-
2000
bugSArr
=
[
false
,
false
,
false
]
...
...
@@ -251,9 +280,73 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
}
}
bugSArr
[
index
]
=
sender
.
isSelected
let
suv
=
contenV
.
viewWithTag
(
10086
)
suv
?
.
removeFromSuperview
()
if
index
>
0
&&
sender
.
isSelected
{
//选择了出入库
print
(
"选择了出入库"
)
if
sendSArr
.
count
==
0
{
contentH
=
contentH
+
120*
glscale
contentHeight
.
constant
=
contentH
}
if
index
==
1
{
let
arrStr
=
[
"全部"
,
"采购"
,
"调入"
,
"退货"
,
"生产"
,
"调出被拒绝"
,
"外采"
,
"其他"
,
"固定采购"
,
"临时采购"
]
sendSArr
.
removeAll
()
arrStr
.
forEach
{
(
str
)
in
sendSArr
.
append
(
false
)
}
let
statusV
=
addTitleAndMoreBtn
(
title
:
"具体类型"
,
arrStr
:
arrStr
,
btnTag
:
3000
)
contenV
.
addSubview
(
statusV
)
statusV
.
tag
=
10086
statusV
.
snp
.
makeConstraints
{
(
make
)
in
make
.
left
.
equalTo
(
15*
glscale
)
make
.
top
.
equalTo
(
line3
.
snp_bottom
)
.
offset
(
15*
glscale
)
make
.
right
.
equalTo
(
0
)
make
.
height
.
equalTo
(
140*
glscale
)
}
}
else
{
let
arrStr
=
[
"全部"
,
"销售"
,
"调出"
,
"报损"
,
"赠品"
,
"自用"
,
"生产使用"
,
"过期处理"
,
"用户试用"
,
"采购退货"
,
"其他"
]
sendSArr
.
removeAll
()
arrStr
.
forEach
{
(
str
)
in
sendSArr
.
append
(
false
)
}
let
statusV
=
addTitleAndMoreBtn
(
title
:
"具体类型"
,
arrStr
:
arrStr
,
btnTag
:
3000
)
contenV
.
addSubview
(
statusV
)
statusV
.
tag
=
10086
statusV
.
snp
.
makeConstraints
{
(
make
)
in
make
.
left
.
equalTo
(
15*
glscale
)
make
.
top
.
equalTo
(
line3
.
snp_bottom
)
.
offset
(
15*
glscale
)
make
.
right
.
equalTo
(
0
)
make
.
height
.
equalTo
(
140*
glscale
)
}
}
}
else
{
print
(
"选择全部"
)
let
statusV
=
addTitleAndMoreBtn
(
title
:
"具体类型"
,
arrStr
:
[],
btnTag
:
3000
)
sendSArr
=
[]
contenV
.
addSubview
(
statusV
)
statusV
.
tag
=
10086
statusV
.
snp
.
makeConstraints
{
(
make
)
in
make
.
left
.
equalTo
(
15*
glscale
)
make
.
top
.
equalTo
(
line3
.
snp_bottom
)
.
offset
(
15*
glscale
)
make
.
right
.
equalTo
(
0
)
make
.
height
.
equalTo
(
20*
glscale
)
}
contentH
=
contentH
-
120*
glscale
contentHeight
.
constant
=
contentH
}
}
else
{
let
index
=
sender
.
tag
-
3000
sendSArr
=
[
false
,
false
,
false
,
false
]
var
tmpeArr
:[
Bool
]
=
[]
sendSArr
.
forEach
{
(
isb
)
in
tmpeArr
.
append
(
false
)
}
sendSArr
=
tmpeArr
allSelectBtn
.
forEach
{
(
btn
)
in
if
btn
.
tag
<
4000
&&
btn
.
tag
>
2999
{
if
btn
.
tag
!=
sender
.
tag
{
...
...
@@ -266,87 +359,87 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
sendSArr
[
index
]
=
sender
.
isSelected
}
}
func
setUIbyData
(
beginDate
:
Date
?,
endginDate
:
Date
?,
paySelectArr
:
Array
<
Bool
>
,
bugSelectArr
:
Array
<
Bool
>
,
sendSelectArr
:
Array
<
Bool
>
)
{
EndDate
=
endginDate
BeginDate
=
beginDate
self
.
paySArr
=
paySelectArr
self
.
bugSArr
=
bugSelectArr
self
.
sendSArr
=
sendSelectArr
if
BeginDate
==
nil
{
timeTilelV
.
timeLbl
.
text
=
"请选择时间范围"
}
else
{
let
timeInterval
:
TimeInterval
=
BeginDate
.
timeIntervalSince1970
let
timeIntervalEnd
:
TimeInterval
=
EndDate
.
timeIntervalSince1970
timeTilelV
.
timeLbl
.
text
=
dayByDouble
(
sender
:
timeInterval
)
+
","
+
dayByDouble
(
sender
:
timeIntervalEnd
)
}
allSelectBtn
.
forEach
{
(
sender
)
in
if
sender
.
tag
<
2000
{
let
i
=
sender
.
tag
-
1000
let
isBool
=
paySelectArr
[
i
]
sender
.
isSelected
=
isBool
if
isBool
{
sender
.
setTitleColor
(
UIColor
.
init
(
named
:
"白色背景色"
),
for
:
.
normal
)
sender
.
backgroundColor
=
UIColor
.
init
(
named
:
"蓝色字体颜色"
)
}
}
else
if
sender
.
tag
<
3000
{
let
i
=
sender
.
tag
-
2000
let
isBool
=
bugSelectArr
[
i
]
sender
.
isSelected
=
isBool
if
isBool
{
sender
.
setTitleColor
(
UIColor
.
init
(
named
:
"白色背景色"
),
for
:
.
normal
)
sender
.
backgroundColor
=
UIColor
.
init
(
named
:
"蓝色字体颜色"
)
}
}
else
{
let
i
=
sender
.
tag
-
3000
let
isBool
=
sendSelectArr
[
i
]
sender
.
isSelected
=
isBool
if
isBool
{
sender
.
setTitleColor
(
UIColor
.
init
(
named
:
"白色背景色"
),
for
:
.
normal
)
sender
.
backgroundColor
=
UIColor
.
init
(
named
:
"蓝色字体颜色"
)
}
}
func
setUIbyData
(
beginDate
:
Date
?,
endginDate
:
Date
?,
paySelectArr
:
Array
<
Bool
>
,
bugSelectArr
:
Array
<
Bool
>
,
sendSelectArr
:
Array
<
Bool
>
)
{
EndDate
=
endginDate
BeginDate
=
beginDate
self
.
paySArr
=
paySelectArr
self
.
bugSArr
=
bugSelectArr
self
.
sendSArr
=
sendSelectArr
if
BeginDate
==
nil
{
timeTilelV
.
timeLbl
.
text
=
"请选择时间范围"
}
else
{
let
timeInterval
:
TimeInterval
=
BeginDate
.
timeIntervalSince1970
let
timeIntervalEnd
:
TimeInterval
=
EndDate
.
timeIntervalSince1970
timeTilelV
.
timeLbl
.
text
=
dayByDouble
(
sender
:
timeInterval
)
+
","
+
dayByDouble
(
sender
:
timeIntervalEnd
)
}
allSelectBtn
.
forEach
{
(
sender
)
in
if
sender
.
tag
<
2000
{
let
i
=
sender
.
tag
-
1000
let
isBool
=
paySelectArr
[
i
]
sender
.
isSelected
=
isBool
if
isBool
{
sender
.
setTitleColor
(
UIColor
.
init
(
named
:
"白色背景色"
),
for
:
.
normal
)
sender
.
backgroundColor
=
UIColor
.
init
(
named
:
"蓝色字体颜色"
)
}
}
else
if
sender
.
tag
<
3000
{
let
i
=
sender
.
tag
-
2000
let
isBool
=
bugSelectArr
[
i
]
sender
.
isSelected
=
isBool
if
isBool
{
sender
.
setTitleColor
(
UIColor
.
init
(
named
:
"白色背景色"
),
for
:
.
normal
)
sender
.
backgroundColor
=
UIColor
.
init
(
named
:
"蓝色字体颜色"
)
}
}
else
{
let
i
=
sender
.
tag
-
3000
let
isBool
=
sendSelectArr
[
i
]
sender
.
isSelected
=
isBool
if
isBool
{
sender
.
setTitleColor
(
UIColor
.
init
(
named
:
"白色背景色"
),
for
:
.
normal
)
sender
.
backgroundColor
=
UIColor
.
init
(
named
:
"蓝色字体颜色"
)
}
}
}
}
}
}
//初始化时将xib中的view添加进来
override
init
(
frame
:
CGRect
)
{
super
.
init
(
frame
:
frame
)
contentView
=
loadViewFromNib
()
addSubview
(
contentView
)
contentView
.
snp
.
makeConstraints
{
(
make
)
in
make
.
left
.
top
.
right
.
bottom
.
equalToSuperview
()
}
//初始化时将xib中的view添加进来
override
init
(
frame
:
CGRect
)
{
super
.
init
(
frame
:
frame
)
contentView
=
loadViewFromNib
()
addSubview
(
contentView
)
contentView
.
snp
.
makeConstraints
{
(
make
)
in
make
.
left
.
top
.
right
.
bottom
.
equalToSuperview
()
}
}
// /初始化时将xib中的view添加进来
required
init
?(
coder
aDecoder
:
NSCoder
)
{
super
.
init
(
coder
:
aDecoder
)
contentView
=
loadViewFromNib
()
addSubview
(
contentView
)
contentView
.
snp
.
makeConstraints
{
(
make
)
in
make
.
left
.
top
.
right
.
bottom
.
equalToSuperview
()
}
}
//加载xib
func
loadViewFromNib
()
->
UIView
{
let
className
=
type
(
of
:
self
)
let
bundle
=
Bundle
(
for
:
className
)
let
name
=
NSStringFromClass
(
className
)
.
components
(
separatedBy
:
"."
)
.
last
let
nib
=
UINib
(
nibName
:
name
!
,
bundle
:
bundle
)
let
view
=
nib
.
instantiate
(
withOwner
:
self
,
options
:
nil
)
.
first
as!
UIView
return
view
}
// /初始化时将xib中的view添加进来
required
init
?(
coder
aDecoder
:
NSCoder
)
{
super
.
init
(
coder
:
aDecoder
)
contentView
=
loadViewFromNib
()
addSubview
(
contentView
)
contentView
.
snp
.
makeConstraints
{
(
make
)
in
make
.
left
.
top
.
right
.
bottom
.
equalToSuperview
()
}
}
//加载xib
func
loadViewFromNib
()
->
UIView
{
let
className
=
type
(
of
:
self
)
let
bundle
=
Bundle
(
for
:
className
)
let
name
=
NSStringFromClass
(
className
)
.
components
(
separatedBy
:
"."
)
.
last
let
nib
=
UINib
(
nibName
:
name
!
,
bundle
:
bundle
)
let
view
=
nib
.
instantiate
(
withOwner
:
self
,
options
:
nil
)
.
first
as!
UIView
return
view
}
}
GeliBusinessPlatform/View/MoreBtnView/MoreAndTimeSelectView.xib
View file @
0860a9f3
...
...
@@ -14,6 +14,7 @@
<outlet
property=
"contenV"
destination=
"vHv-I4-dmk"
id=
"WbO-6S-e3L"
/>
<outlet
property=
"contentHeight"
destination=
"fb3-1v-gnz"
id=
"Wvf-2H-zNw"
/>
<outlet
property=
"contentWidht"
destination=
"Ui1-5n-gGg"
id=
"EH0-e8-5Gv"
/>
<outlet
property=
"scrollview"
destination=
"dH1-9z-HTC"
id=
"ZCH-Yf-jLE"
/>
<outlet
property=
"showViewHeight"
destination=
"e8t-mB-tnZ"
id=
"dat-TC-NVN"
/>
</connections>
</placeholder>
...
...
GeliBusinessPlatform/ViewController/出入库记录/CRKListVC.swift
View file @
0860a9f3
...
...
@@ -9,11 +9,30 @@
import
UIKit
import
ViewAnimator
//cell动效
class
CRKListVC
:
BaseViewController
,
UITableViewDelegate
,
UITableViewDataSource
,
CRKCellDelegate
,
UISearchBarDelegate
,
SearchBarViewDelegate
,
CRKXiangQVCDelegate
{
class
CRKListVC
:
BaseViewController
,
UITableViewDelegate
,
UITableViewDataSource
,
CRKCellDelegate
,
UISearchBarDelegate
,
SearchBarViewDelegate
,
CRKXiangQVCDelegate
,
MoreAndTimeSelectViewDelegate
{
//刷新???
func
CRKXiangQVCFinishAction
()
{
listView
.
mj_header
?
.
beginRefreshing
()
}
func
searchBarShouldBeginEditing
(
_
searchBar
:
UISearchBar
)
->
Bool
{
print
(
"调起搜索后添加个蒙版本"
)
if
moreTimeSelectView
!=
nil
{
moreTimeSelectView
.
removeFromSuperview
()
moreTimeSelectView
=
nil
}
return
true
}
//MARK: - searchView delegate
func
clearSearchAction
()
{
print
(
"取消搜索代理了--"
)
}
func
searchBarTextDidEndEditing
(
_
searchBar
:
UISearchBar
)
{
print
(
"编辑即将结束了--"
)
}
var
page
=
0
var
isGm
=
true
...
...
@@ -21,19 +40,38 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
@IBOutlet
weak
var
topBtn
:
UIButton
!
var
moreTimeSelectView
:
MoreAndTimeSelectView
!
=
nil
@IBAction
func
openViewAction
(
_
sender
:
Any
)
{
print
(
"筛选选项"
)
let
moreTimeSelectView
=
MoreAndTimeSelectView
()
self
.
view
.
addSubview
(
moreTimeSelectView
)
moreTimeSelectView
.
snp
.
makeConstraints
{
(
make
)
in
make
.
left
.
bottom
.
right
.
equalTo
(
0
)
make
.
top
.
equalTo
(
100*
glscale
)
if
moreTimeSelectView
==
nil
{
moreTimeSelectView
=
MoreAndTimeSelectView
()
moreTimeSelectView
.
delegate
=
self
self
.
view
.
addSubview
(
moreTimeSelectView
)
moreTimeSelectView
.
snp
.
makeConstraints
{
(
make
)
in
make
.
left
.
bottom
.
right
.
equalTo
(
0
)
make
.
top
.
equalTo
(
searchBgView
.
snp_bottom
)
}
moreTimeSelectView
.
setUI
()
}
else
{
moreTimeSelectView
.
removeFromSuperview
()
moreTimeSelectView
=
nil
}
moreTimeSelectView
.
setUI
()
}
//MARK:--筛选回调数据
func
sureActionMoreAndTimeSelectView
(
beginDate
:
Date
?,
endginDate
:
Date
?,
paySelectArr
:
Array
<
Bool
>
,
bugSelectArr
:
Array
<
Bool
>
,
sendSelectArr
:
Array
<
Bool
>
)
{
print
(
beginDate
,
endginDate
,
paySelectArr
,
bugSelectArr
,
sendSelectArr
)
}
//MARK:--筛选回调数据
func
colseActionMoreAndTimeSelectView
()
{
moreTimeSelectView
=
nil
}
@IBOutlet
weak
var
searchBG
:
UIView
!
...
...
@@ -206,12 +244,5 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
}
}
//MARK: - searchView delegate
func
clearSearchAction
()
{
print
(
"取消搜索代理了--"
)
}
func
searchBarTextDidEndEditing
(
_
searchBar
:
UISearchBar
)
{
print
(
"编辑即将结束了--"
)
}
}
GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift
View file @
0860a9f3
...
...
@@ -186,14 +186,14 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
oldOftenArr
?
.
forEach
({
(
md
)
in
var
isAdd
=
false
self
.
dataModel
?
.
auth_res
?
.
forEach
({
(
pmd
)
in
if
md
.
auth_id
==
pmd
.
auth_id
&&
pmd
.
is_often
==
1
{
if
md
.
auth_id
==
pmd
.
auth_id
{
//存在且还常用
isAdd
=
true
}
})
if
isAdd
{
self
.
oftenArr
?
.
append
(
md
)
}
}
})
}
...
...
@@ -266,7 +266,6 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
cell
.
dataIndexSection
=
indexPath
.
row
switch
indexPath
.
row
{
case
1
:
cell
.
itemDataArrs
=
self
.
oftenArr
!
var
tempArr
:[
String
]
=
[]
self
.
oftenArr
?
.
forEach
({
(
md
)
in
tempArr
.
append
(
md
.
auth_name
!
)
...
...
@@ -505,14 +504,14 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
case
116
:
//字段列表
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
11
7
:
//新增商品
case
11
8
:
//新增商品
let
vc
=
ProductDetailViewController
()
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
return
case
11
8
:
//新增采购单
case
11
9
:
//新增采购单
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
1
19
:
//商品毛利统计
case
1
20
:
//商品毛利统计
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
default
:
...
...
GeliBusinessPlatform/ViewController/工作中心/WorkItemCollectionViewCell.xib
View file @
0860a9f3
...
...
@@ -2,6 +2,7 @@
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"3.0"
toolsVersion=
"16097"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
useAutolayout=
"YES"
useTraitCollections=
"YES"
useSafeAreas=
"YES"
colorMatched=
"YES"
>
<device
id=
"retina6_1"
orientation=
"portrait"
appearance=
"light"
/>
<dependencies>
<deployment
identifier=
"iOS"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"16087"
/>
<capability
name=
"Named colors"
minToolsVersion=
"9.0"
/>
<capability
name=
"Safe area layout guides"
minToolsVersion=
"9.0"
/>
...
...
@@ -27,7 +28,11 @@
<nil
key=
"highlightedColor"
/>
</label>
<imageView
clipsSubviews=
"YES"
userInteractionEnabled=
"NO"
contentMode=
"scaleAspectFit"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
image=
"bianji"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"qfI-0k-kQG"
>
<rect
key=
"frame"
x=
"41.5"
y=
"18"
width=
"17"
height=
"16.5"
/>
<rect
key=
"frame"
x=
"37"
y=
"6.5"
width=
"26"
height=
"28"
/>
<constraints>
<constraint
firstAttribute=
"width"
constant=
"26"
id=
"AKt-O2-9tI"
/>
<constraint
firstAttribute=
"height"
constant=
"28"
id=
"mL5-ZO-3vy"
/>
</constraints>
</imageView>
<label
hidden=
"YES"
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"0"
textAlignment=
"center"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"Ajc-oX-hvc"
>
<rect
key=
"frame"
x=
"74"
y=
"0.0"
width=
"16"
height=
"16"
/>
...
...
GeliBusinessPlatform/ViewController/工作中心/WorkItemTableViewCell.swift
View file @
0860a9f3
...
...
@@ -111,11 +111,14 @@ class WorkItemTableViewCell: UITableViewCell , UICollectionViewDelegate, UIColle
}
else
{
cell
.
countLbl
.
isHidden
=
true
let
rowModel
=
self
.
itemDataArrs
[
indexPath
.
row
]
if
rowModel
.
app_icon
!=
nil
{
cell
.
itemImgV
.
sd_setImage
(
with
:
URL
(
string
:
SERVERCE_ImageHost
+
rowModel
.
app_icon
!
),
placeholderImage
:
UIImage
.
init
(
named
:
"worktest1"
))
}
else
{
if
rowModel
.
app_icon
==
nil
{
cell
.
itemImgV
.
image
=
UIImage
.
init
(
named
:
"worktest1"
)
}
else
{
cell
.
itemImgV
.
sd_setImage
(
with
:
URL
(
string
:
SERVERCE_ImageHost
+
rowModel
.
app_icon
!
),
placeholderImage
:
UIImage
.
init
(
named
:
"worktest1"
))
}
}
cell
.
itemNameLbl
.
text
=
itemArrs
[
indexPath
.
row
]
...
...
GeliBusinessPlatform/ViewController/工作中心/编辑工作中心/EditWorkCViewController.swift
View file @
0860a9f3
...
...
@@ -151,13 +151,14 @@ class EditWorkCViewController: BaseViewController, UICollectionViewDelegate, UIC
}
})
let
rowModel
=
chlicdAuthResModelArr
[
indexPath
.
row
]
if
rowModel
.
app_icon
!
=
nil
{
cell
.
itemImgV
.
sd_setImage
(
with
:
URL
(
string
:
SERVERCE_ImageHost
+
rowModel
.
app_icon
!
),
placeholderImage
:
UIImage
.
init
(
named
:
"worktest1"
)
)
if
rowModel
.
app_icon
=
=
nil
{
cell
.
itemImgV
.
image
=
UIImage
.
init
(
named
:
"worktest1"
)
}
else
{
cell
.
itemImgV
.
image
=
UIImage
.
init
(
named
:
"worktest1"
)
}
}
else
{
cell
.
itemImgV
.
sd_setImage
(
with
:
URL
(
string
:
SERVERCE_ImageHost
+
rowModel
.
app_icon
!
),
placeholderImage
:
UIImage
.
init
(
named
:
"worktest1"
))
}
cell
.
itemNameLbl
.
text
=
rowModel
.
auth_name
oftenArr
?
.
forEach
({
(
md
)
in
if
md
.
auth_id
==
rowModel
.
auth_id
{
...
...
@@ -176,14 +177,13 @@ class EditWorkCViewController: BaseViewController, UICollectionViewDelegate, UIC
cell
.
itemNameLbl
.
isHidden
=
false
cell
.
itemImgV
.
isHidden
=
false
let
rowModel
=
oftenArr
!
[
indexPath
.
row
]
if
rowModel
.
app_icon
!=
nil
{
cell
.
itemImgV
.
sd_setImage
(
with
:
URL
(
string
:
SERVERCE_ImageHost
+
rowModel
.
app_icon
!
),
placeholderImage
:
UIImage
.
init
(
named
:
"worktest1"
))
}
else
{
if
rowModel
.
app_icon
==
nil
{
cell
.
itemImgV
.
image
=
UIImage
.
init
(
named
:
"worktest1"
)
}
else
{
cell
.
itemImgV
.
sd_setImage
(
with
:
URL
(
string
:
SERVERCE_ImageHost
+
rowModel
.
app_icon
!
),
placeholderImage
:
UIImage
.
init
(
named
:
"worktest1"
))
}
cell
.
itemNameLbl
.
text
=
rowModel
.
auth_name
cell
.
bgImV
.
image
=
UIImage
.
init
(
named
:
"workjian"
)
}
...
...
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