Skip to content

G
GeliBusinessPlatform
Commit 2f5b1dcc authored by lujunye's avatar lujunye
Browse files
Options

出库cell显示待完善

parent fe15ff5b
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 33 deletions
GeliBusinessPlatform/Model/WarehouseManageModel/GetGoodBatchModel.swift
View file @ 2f5b1dcc
......@@ -38,6 +38,7 @@ class GetGoodBatchDataModel: Mappable {
var status : Int?//状态：1正常，2临期，3过期
var report_id : Int?//批次报告
var chuHuoLiang:Int?//出货量
var ven_name:String?//供应商名字
required init?( map: Map) {
}
......@@ -45,7 +46,7 @@ class GetGoodBatchDataModel: Mappable {
batch_id <- map["batch_id"]
batch_sn <- map["batch_sn"]
w_id <- map["w_id"]
ven_name <- map["ven_name"]
p_id <- map["p_id"]
inventory <- map["inventory"]
production_data <- map["production_data"]
......
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/CKGmCell.swift
View file @ 2f5b1dcc
......@@ -16,7 +16,6 @@ class CKGmCell: UITableViewCell {
@IBOutlet weak var listBg: UIView!
@IBOutlet weak var titleViewH: NSLayoutConstraint!
@IBOutlet weak var gys_name_lbl: UILabel!
@IBOutlet weak var detailLbl: UILabel!
@IBOutlet weak var titleView: UIView!
var delegate:CKGmCellDelegate?
......
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/CKGmCell.xib
View file @ 2f5b1dcc
......@@ -13,10 +13,10 @@
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="314" id="KGk-i7-Jjw" customClass="CKGmCell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="376" height="200"/>
<rect key="frame" x="0.0" y="0.0" width="376" height="140"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="376" height="200"/>
<rect key="frame" x="0.0" y="0.0" width="376" height="140"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ktk-mw-IGw">
......@@ -27,7 +27,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="von-qo-7FQ">
<rect key="frame" x="0.0" y="199" width="376" height="1"/>
<rect key="frame" x="0.0" y="139" width="376" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="QX9-6A-DHR"/>
......@@ -57,19 +57,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="13"/>
<rect key="frame" x="15" y="54" width="29" height="10.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="132" width="53.5" height="16"/>
<rect key="frame" x="15" y="101" 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="126" width="40" height="28"/>
<rect key="frame" x="321" y="95" width="40" height="28"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="请选择">
<color key="titleColor" name="蓝色字体颜色"/>
......@@ -79,11 +79,11 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="d5T-uL-vW9">
<rect key="frame" x="15" y="169" width="346" height="29"/>
<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="169" width="346" height="0.0"/>
<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"/>
......@@ -115,25 +115,13 @@
<constraint firstItem="4Lr-1i-B0V" firstAttribute="centerX" secondItem="fta-n1-NF1" secondAttribute="centerX" id="rxi-zI-kjY"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="供应商" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="s5J-ou-T0G">
<rect key="frame" x="15" y="82" width="39" height="18.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YLF-48-1Eh">
<rect key="frame" x="15" y="115.5" width="361" height="1"/>
<rect key="frame" x="15" y="84.5" width="361" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="R0C-tA-py6"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1qD-Ob-Om4">
<rect key="frame" x="328" y="82" width="33" height="18.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="yRi-If-85q" firstAttribute="top" secondItem="YLF-48-1Eh" secondAttribute="bottom" constant="15.5" id="28C-8f-FnC"/>
......@@ -142,43 +130,38 @@
<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="s5J-ou-T0G" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="8LH-2s-tfO"/>
<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="s5J-ou-T0G" secondAttribute="bottom" constant="15" id="R4r-Mc-pGu"/>
<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="s5J-ou-T0G" firstAttribute="top" secondItem="oxJ-qd-UEI" secondAttribute="bottom" constant="15" id="agy-U5-7Ve"/>
<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="1qD-Ob-Om4" secondAttribute="trailing" constant="15" id="lWk-VA-206"/>
<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="1qD-Ob-Om4" firstAttribute="centerY" secondItem="s5J-ou-T0G" secondAttribute="centerY" id="wSK-KI-kW7"/>
<constraint firstItem="Ktk-mw-IGw" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="ykG-vR-rtE"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="detailLbl" destination="oxJ-qd-UEI" id="be4-eE-hhI"/>
<outlet property="gys_name_lbl" destination="1qD-Ob-Om4" id="78P-FC-Myc"/>
<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"/>
</connections>
<point key="canvasLocation" x="131.8840579710145" y="195.20089285714286"/>
<point key="canvasLocation" x="131.8840579710145" y="194.86607142857142"/>
</tableViewCell>
</objects>
<resources>
......
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/NewCKVc.swift
View file @ 2f5b1dcc
......@@ -315,7 +315,6 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
cell.delegate = self
cell.nameLbl.text = data.goods_name
cell.detailLbl.text = data.spec_str! + " ¥" + data.price!
cell.gys_name_lbl.text = "待补充"
let arr = piCiArr?[cell.tag]
if arr!.count > 0 {
......@@ -389,9 +388,9 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
if isGm {
let arr = piCiArr![indexPath.row]
if arr.count > 0 {
return CGFloat(175 + arr.count * 30 + 35)
return CGFloat(140 + arr.count * 30 + 35)
}else{
return 175
return 140
}
}
......
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