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
271433da
Commit
271433da
authored
4 years ago
by
lujunye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
出库样式修改完成
parent
866f9655
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
155 additions
and
26 deletions
+155
-26
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
...erdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/Assets.xcassets/背景色/#EDEDED.colorset/Contents.json
...atform/Assets.xcassets/背景色/#EDEDED.colorset/Contents.json
+38
-0
GeliBusinessPlatform/Assets.xcassets/背景色/#F3F4F8.colorset/Contents.json
...atform/Assets.xcassets/背景色/#F3F4F8.colorset/Contents.json
+38
-0
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/CKGmCell.swift
...usinessPlatform/ViewController/1.1入库&出库/出库/CKGmCell.swift
+77
-16
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/CKGmCell.xib
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/CKGmCell.xib
+0
-0
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/NewCKVc.swift
...BusinessPlatform/ViewController/1.1入库&出库/出库/NewCKVc.swift
+2
-10
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
View file @
271433da
No preview for this file type
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/Assets.xcassets/背景色/#EDEDED.colorset/Contents.json
0 → 100644
View file @
271433da
{
"colors"
:
[
{
"color"
:
{
"color-space"
:
"srgb"
,
"components"
:
{
"alpha"
:
"1.000"
,
"blue"
:
"0.929"
,
"green"
:
"0.929"
,
"red"
:
"0.929"
}
},
"idiom"
:
"universal"
},
{
"appearances"
:
[
{
"appearance"
:
"luminosity"
,
"value"
:
"dark"
}
],
"color"
:
{
"color-space"
:
"srgb"
,
"components"
:
{
"alpha"
:
"1.000"
,
"blue"
:
"0.929"
,
"green"
:
"0.929"
,
"red"
:
"0.929"
}
},
"idiom"
:
"universal"
}
],
"info"
:
{
"author"
:
"xcode"
,
"version"
:
1
}
}
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/Assets.xcassets/背景色/#F3F4F8.colorset/Contents.json
0 → 100644
View file @
271433da
{
"colors"
:
[
{
"color"
:
{
"color-space"
:
"srgb"
,
"components"
:
{
"alpha"
:
"1.000"
,
"blue"
:
"0.973"
,
"green"
:
"0.957"
,
"red"
:
"0.953"
}
},
"idiom"
:
"universal"
},
{
"appearances"
:
[
{
"appearance"
:
"luminosity"
,
"value"
:
"dark"
}
],
"color"
:
{
"color-space"
:
"srgb"
,
"components"
:
{
"alpha"
:
"1.000"
,
"blue"
:
"0.973"
,
"green"
:
"0.957"
,
"red"
:
"0.953"
}
},
"idiom"
:
"universal"
}
],
"info"
:
{
"author"
:
"xcode"
,
"version"
:
1
}
}
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/CKGmCell.swift
View file @
271433da
...
...
@@ -13,11 +13,12 @@ protocol CKGmCellDelegate {
}
class
CKGmCell
:
UITableViewCell
{
var
dataArr
:
Array
<
GetGoodBatchDataModel
>
?
=
[]
@IBOutlet
weak
var
listBg
:
UIView
!
@IBOutlet
weak
var
titleViewH
:
NSLayoutConstraint
!
@IBOutlet
weak
var
select_btn
:
UIButton
!
@IBOutlet
weak
var
detailLbl
:
UILabel
!
@IBOutlet
weak
var
titleView
:
UIView
!
var
delegate
:
CKGmCellDelegate
?
@IBAction
func
selectAction
(
_
sender
:
Any
)
{
delegate
?
.
CKGmCellSelectAction
(
cell
:
self
)
...
...
@@ -32,15 +33,57 @@ class CKGmCell: UITableViewCell {
// Initialization code
}
let
scrollView
=
UIScrollView
()
override
func
layoutIfNeeded
()
{
listBg
.
subviews
.
forEach
{
(
view
)
in
view
.
removeFromSuperview
()
}
let
colorName
=
"#F3F4F8"
scrollView
.
bounces
=
true
scrollView
.
frame
=
CGRect
(
x
:
15.0
,
y
:
select_btn
.
frame
.
maxY
+
3.0
,
width
:
ScreenWidth
-
30.0
,
height
:
CGFloat
(
dataArr
!.
count
)
*
30.0
+
38.5
)
scrollView
.
contentSize
=
CGSize
(
width
:
495
,
height
:
0
)
self
.
contentView
.
addSubview
(
scrollView
)
let
titleView
=
UIView
(
frame
:
CGRect
(
x
:
0
,
y
:
0
,
width
:
495
,
height
:
38.5
))
scrollView
.
addSubview
(
titleView
)
titleView
.
backgroundColor
=
UIColor
(
named
:
colorName
)
let
t1
=
UILabel
(
frame
:
CGRect
(
x
:
0
,
y
:
0
,
width
:
110
,
height
:
38.5
))
titleView
.
addSubview
(
t1
)
t1
.
text
=
"格利商品批次"
t1
.
font
=
UIFont
.
systemFont
(
ofSize
:
13
)
t1
.
textAlignment
=
.
center
t1
.
textColor
=
UIColor
(
named
:
"标题字颜色"
)
let
t2
=
UILabel
(
frame
:
CGRect
(
x
:
111
,
y
:
0
,
width
:
110
,
height
:
38.5
))
titleView
.
addSubview
(
t2
)
t2
.
text
=
"商品状态"
t2
.
font
=
UIFont
.
systemFont
(
ofSize
:
13
)
t2
.
textAlignment
=
.
center
t2
.
textColor
=
UIColor
(
named
:
"标题字颜色"
)
let
t3
=
UILabel
(
frame
:
CGRect
(
x
:
t2
.
frame
.
maxX
+
1
,
y
:
0
,
width
:
181.5
,
height
:
38.5
))
titleView
.
addSubview
(
t3
)
t3
.
text
=
"供应商"
t3
.
font
=
UIFont
.
systemFont
(
ofSize
:
13
)
t3
.
textAlignment
=
.
center
t3
.
textColor
=
UIColor
(
named
:
"标题字颜色"
)
let
t4
=
UILabel
(
frame
:
CGRect
(
x
:
t3
.
frame
.
maxX
+
1
,
y
:
0
,
width
:
495
-
t3
.
frame
.
maxX
-
1
,
height
:
38.5
))
titleView
.
addSubview
(
t4
)
t4
.
text
=
"出库数量"
t4
.
font
=
UIFont
.
systemFont
(
ofSize
:
13
)
t4
.
textAlignment
=
.
center
t4
.
textColor
=
UIColor
(
named
:
"标题字颜色"
)
let
lineV
=
UIView
(
frame
:
CGRect
(
x
:
0
,
y
:
titleView
.
frame
.
maxY
,
width
:
495
,
height
:
1
))
scrollView
.
addSubview
(
lineV
)
lineV
.
backgroundColor
=
UIColor
(
named
:
"#EDEDED"
)
let
bottomView
=
UIView
(
frame
:
CGRect
(
x
:
0
,
y
:
titleView
.
frame
.
maxY
+
1
,
width
:
495
,
height
:
scrollView
.
bounds
.
size
.
height
-
38.5
))
scrollView
.
addSubview
(
bottomView
)
bottomView
.
backgroundColor
=
UIColor
(
named
:
colorName
)
if
dataArr
!.
count
>
0
{
for
i
in
0
..<
dataArr
!.
count
{
let
model
=
dataArr
!
[
i
]
let
view
=
UIView
()
listBg
.
addSubview
(
view
)
bottomView
.
addSubview
(
view
)
view
.
snp
.
makeConstraints
{
(
make
)
in
make
.
top
.
equalTo
(
i
*
30
)
make
.
height
.
equalTo
(
30
)
...
...
@@ -48,22 +91,25 @@ class CKGmCell: UITableViewCell {
}
let
leftL
=
UILabel
()
view
.
addSubview
(
leftL
)
leftL
.
textAlignment
=
.
center
leftL
.
textColor
=
UIColor
(
named
:
"个人中心灰色字体"
)
leftL
.
font
=
UIFont
.
systemFont
(
ofSize
:
13
)
leftL
.
snp
.
makeConstraints
{
(
make
)
in
make
.
left
.
equalTo
(
30
)
make
.
top
.
bottom
.
right
.
equalTo
(
0
)
make
.
centerX
.
equalTo
(
t1
.
snp_centerX
)
make
.
centerY
.
equalTo
(
view
.
snp_centerY
)
make
.
width
.
equalTo
(
100
)
}
leftL
.
text
=
"
\(
model
.
batch_id
!
)
"
let
middleL
=
UILabel
()
v
iew
.
addSubview
(
middleL
)
bottomV
iew
.
addSubview
(
middleL
)
middleL
.
textColor
=
UIColor
(
named
:
"个人中心灰色字体"
)
middleL
.
font
=
UIFont
.
systemFont
(
ofSize
:
13
)
middleL
.
textAlignment
=
.
center
middleL
.
snp
.
makeConstraints
{
(
make
)
in
make
.
centerX
.
equalTo
(
view
.
snp_centerX
)
make
.
top
.
bottom
.
right
.
equalTo
(
0
)
make
.
centerX
.
equalTo
(
t2
.
snp_centerX
)
make
.
centerY
.
equalTo
(
view
.
snp_centerY
)
make
.
width
.
equalTo
(
100
)
}
var
stauts
=
""
switch
model
.
status
{
//1正常,2临期,3过期
...
...
@@ -80,17 +126,32 @@ class CKGmCell: UITableViewCell {
middleL
.
text
=
stauts
let
rightL
=
UILabel
()
v
iew
.
addSubview
(
rightL
)
bottomV
iew
.
addSubview
(
rightL
)
rightL
.
textColor
=
UIColor
(
named
:
"个人中心灰色字体"
)
rightL
.
textAlignment
=
.
right
rightL
.
textAlignment
=
.
center
rightL
.
font
=
UIFont
.
systemFont
(
ofSize
:
13
)
rightL
.
snp
.
makeConstraints
{
(
make
)
in
make
.
right
.
equalTo
(
-
30
)
make
.
top
.
bottom
.
left
.
equalTo
(
0
)
make
.
centerX
.
equalTo
(
t4
.
snp_centerX
)
make
.
centerY
.
equalTo
(
view
.
snp_centerY
)
make
.
width
.
equalTo
(
83.5
)
}
rightL
.
text
=
"
\(
model
.
chuHuoLiang
!
)
"
let
rightL2
=
UILabel
()
bottomView
.
addSubview
(
rightL2
)
rightL2
.
textColor
=
UIColor
(
named
:
"个人中心灰色字体"
)
rightL2
.
textAlignment
=
.
center
rightL2
.
font
=
UIFont
.
systemFont
(
ofSize
:
13
)
rightL2
.
snp
.
makeConstraints
{
(
make
)
in
make
.
centerX
.
equalTo
(
t3
.
snp_centerX
)
make
.
centerY
.
equalTo
(
view
.
snp_centerY
)
make
.
width
.
equalTo
(
171.5
)
}
rightL2
.
text
=
"
\(
model
.
chuHuoLiang
!
)
"
}
}
scrollView
.
contentSize
=
CGSize
(
width
:
495.0
,
height
:
38.5
+
30.0
*
CGFloat
(
dataArr
!.
count
))
scrollView
.
isScrollEnabled
=
true
super
.
layoutIfNeeded
()
}
override
func
setSelected
(
_
selected
:
Bool
,
animated
:
Bool
)
{
...
...
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/CKGmCell.xib
View file @
271433da
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/NewCKVc.swift
View file @
271433da
...
...
@@ -319,17 +319,9 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
let
arr
=
piCiArr
?[
cell
.
tag
]
if
arr
!.
count
>
0
{
cell
.
dataArr
=
arr
cell
.
titleView
.
alpha
=
1
cell
.
titleView
.
isHidden
=
false
cell
.
titleViewH
.
constant
=
35
cell
.
listBg
.
isHidden
=
false
cell
.
listBg
.
alpha
=
1
cell
.
scrollView
.
isHidden
=
false
}
else
{
cell
.
listBg
.
isHidden
=
true
cell
.
titleView
.
isHidden
=
true
cell
.
titleViewH
.
constant
=
0
cell
.
titleView
.
alpha
=
0
cell
.
listBg
.
alpha
=
0
cell
.
scrollView
.
isHidden
=
true
}
return
cell
}
...
...
This diff is collapsed.
Click to expand it.
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