Skip to content

G
GeliBusinessPlatform
Commit 271433da authored by lujunye's avatar lujunye
Browse files
Options

出库样式修改完成

parent 866f9655
Show whitespace changes
Inline Side-by-side
Showing with 160 additions and 84 deletions
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
}
}
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
}
}
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()
view.addSubview(middleL)
bottomView.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()
view.addSubview(rightL)
bottomView.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) {
......
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/CKGmCell.xib
View file @ 271433da
......@@ -6,7 +6,6 @@
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
......@@ -57,19 +56,19 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oxJ-qd-UEI">
<rect key="frame" x="15" y="54" width="29" height="10.5"/>
<rect key="frame" x="15" y="54" width="29" height="13.5"/>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
<color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="分配批次" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yRi-If-85q">
<rect key="frame" x="15" y="101" width="53.5" height="16"/>
<rect key="frame" x="15" y="104" width="53.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="E5j-Un-JlW">
<rect key="frame" x="321" y="95" width="40" height="28"/>
<rect key="frame" x="321" y="98" width="40" height="28"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="请选择">
<color key="titleColor" name="蓝色字体颜色"/>
......@@ -78,45 +77,8 @@
<action selector="selectAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="0pU-7y-TF0"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="d5T-uL-vW9">
<rect key="frame" x="15" y="138" width="346" height="0.0"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fta-n1-NF1">
<rect key="frame" x="15" y="138" width="346" height="0.0"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="批次ID" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xMo-gh-5Ix">
<rect key="frame" x="30" y="-8" width="40" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="出库数量" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yz0-KW-fga">
<rect key="frame" x="262.5" y="-8" width="53.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="商品状态" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4Lr-1i-B0V">
<rect key="frame" x="146.5" y="-8" width="53.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" name="app底色"/>
<constraints>
<constraint firstItem="xMo-gh-5Ix" firstAttribute="centerY" secondItem="fta-n1-NF1" secondAttribute="centerY" id="EGE-6w-Mfq"/>
<constraint firstAttribute="height" id="Njp-P8-QFO"/>
<constraint firstItem="xMo-gh-5Ix" firstAttribute="leading" secondItem="fta-n1-NF1" secondAttribute="leading" constant="30" id="cBm-9y-3KX"/>
<constraint firstItem="4Lr-1i-B0V" firstAttribute="centerY" secondItem="yz0-KW-fga" secondAttribute="centerY" id="kCR-yp-xz9"/>
<constraint firstItem="yz0-KW-fga" firstAttribute="centerY" secondItem="fta-n1-NF1" secondAttribute="centerY" id="lqQ-Wx-jZu"/>
<constraint firstAttribute="trailing" secondItem="yz0-KW-fga" secondAttribute="trailing" constant="30" id="nN9-dr-JLO"/>
<constraint firstItem="4Lr-1i-B0V" firstAttribute="centerX" secondItem="fta-n1-NF1" secondAttribute="centerX" id="rxi-zI-kjY"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YLF-48-1Eh">
<rect key="frame" x="15" y="84.5" width="361" height="1"/>
<rect key="frame" x="15" y="87.5" width="361" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="R0C-tA-py6"/>
......@@ -125,30 +87,23 @@
</subviews>
<constraints>
<constraint firstItem="yRi-If-85q" firstAttribute="top" secondItem="YLF-48-1Eh" secondAttribute="bottom" constant="15.5" id="28C-8f-FnC"/>
<constraint firstItem="fta-n1-NF1" firstAttribute="top" secondItem="E5j-Un-JlW" secondAttribute="bottom" constant="15" id="3PE-Ih-taM"/>
<constraint firstItem="YLF-48-1Eh" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="5wM-be-cG0"/>
<constraint firstItem="BNG-HE-P3H" firstAttribute="leading" secondItem="d4N-n8-5II" secondAttribute="trailing" constant="10" id="6MZ-eG-moD"/>
<constraint firstItem="oxJ-qd-UEI" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="6WB-pr-z7I"/>
<constraint firstItem="BNG-HE-P3H" firstAttribute="top" secondItem="Ktk-mw-IGw" secondAttribute="bottom" id="8Ck-iv-OHW"/>
<constraint firstItem="yRi-If-85q" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="DiU-hw-S15"/>
<constraint firstAttribute="trailing" secondItem="von-qo-7FQ" secondAttribute="trailing" id="Fj9-k6-hac"/>
<constraint firstItem="d5T-uL-vW9" firstAttribute="top" secondItem="fta-n1-NF1" secondAttribute="bottom" id="HlG-Bw-01z"/>
<constraint firstItem="E5j-Un-JlW" firstAttribute="centerY" secondItem="yRi-If-85q" secondAttribute="centerY" id="Mw4-ki-DaG"/>
<constraint firstItem="oxJ-qd-UEI" firstAttribute="top" secondItem="d4N-n8-5II" secondAttribute="bottom" constant="8" id="Pvl-5J-evd"/>
<constraint firstItem="Ktk-mw-IGw" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="QbH-Ht-wqs"/>
<constraint firstItem="YLF-48-1Eh" firstAttribute="top" secondItem="oxJ-qd-UEI" secondAttribute="bottom" constant="20" id="R4r-Mc-pGu"/>
<constraint firstAttribute="trailing" secondItem="BNG-HE-P3H" secondAttribute="trailing" id="SUm-fR-5DQ"/>
<constraint firstAttribute="trailing" secondItem="d5T-uL-vW9" secondAttribute="trailing" constant="15" id="T51-sj-kC9"/>
<constraint firstAttribute="trailing" secondItem="YLF-48-1Eh" secondAttribute="trailing" id="ZCu-Ct-Ykw"/>
<constraint firstAttribute="trailing" secondItem="Ktk-mw-IGw" secondAttribute="trailing" id="aC5-Gw-175"/>
<constraint firstItem="d4N-n8-5II" firstAttribute="top" secondItem="Ktk-mw-IGw" secondAttribute="bottom" constant="15" id="dbz-Fp-BLr"/>
<constraint firstAttribute="bottom" secondItem="von-qo-7FQ" secondAttribute="bottom" id="g1K-YL-6d0"/>
<constraint firstItem="d4N-n8-5II" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="hgZ-SX-UvV"/>
<constraint firstItem="fta-n1-NF1" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="itt-z6-OIx"/>
<constraint firstAttribute="trailing" secondItem="fta-n1-NF1" secondAttribute="trailing" constant="15" id="oWL-EC-M0r"/>
<constraint firstItem="von-qo-7FQ" firstAttribute="top" secondItem="d5T-uL-vW9" secondAttribute="bottom" constant="1" id="qVE-co-lEx"/>
<constraint firstAttribute="trailing" secondItem="E5j-Un-JlW" secondAttribute="trailing" constant="15" id="rod-s1-Uwg"/>
<constraint firstItem="d5T-uL-vW9" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="ssn-IH-cB3"/>
<constraint firstItem="von-qo-7FQ" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="vPg-Y9-SFA"/>
<constraint firstItem="Ktk-mw-IGw" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="ykG-vR-rtE"/>
</constraints>
......@@ -156,10 +111,8 @@
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="detailLbl" destination="oxJ-qd-UEI" id="be4-eE-hhI"/>
<outlet property="listBg" destination="d5T-uL-vW9" id="SVo-od-Th4"/>
<outlet property="nameLbl" destination="d4N-n8-5II" id="bI7-ba-Voz"/>
<outlet property="titleView" destination="fta-n1-NF1" id="JJL-vJ-1vN"/>
<outlet property="titleViewH" destination="Njp-P8-QFO" id="Rbv-Zy-B0b"/>
<outlet property="select_btn" destination="E5j-Un-JlW" id="6IO-lu-joX"/>
</connections>
<point key="canvasLocation" x="131.8840579710145" y="194.86607142857142"/>
</tableViewCell>
......@@ -168,9 +121,6 @@
<namedColor name="#F57575">
<color red="0.96100002527236938" green="0.45899999141693115" blue="0.45899999141693115" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="app底色">
<color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="个人中心灰色字体">
<color red="0.38823529411764707" green="0.38823529411764707" blue="0.38823529411764707" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
......@@ -183,8 +133,5 @@
<namedColor name="蓝色字体颜色">
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
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
}
......
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