Skip to content

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

出库修改大致完成

parent 0d926d74
Hide whitespace changes
Inline Side-by-side
Showing with 274 additions and 87 deletions
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file @ 2f84b432
......@@ -3,4 +3,27 @@
uuid = "4EFF3422-0342-402A-BFF0-17B15851B3EC"
type = "0"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.SwiftErrorBreakpoint">
<BreakpointContent
uuid = "F9AAF047-CA09-4A11-834A-7F1E40C91A0A"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
<BreakpointContent
uuid = "AA5AC940-8A53-441B-9107-A47EED6E312E"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
breakpointStackSelectionBehavior = "1"
scope = "1"
stopOnStyle = "0">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/CKGmCell.swift
View file @ 2f84b432
......@@ -16,6 +16,7 @@ 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?
......@@ -56,6 +57,29 @@ class CKGmCell: UITableViewCell {
}
leftL.text = "\(model.batch_id!)"
let middleL = UILabel()
view.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)
}
var stauts = ""
switch model.status {//1正常，2临期，3过期
case 1:
stauts = "正常"
break
case 2:
stauts = "临期"
break
default:
stauts = "过期"
break
}
middleL.text = stauts
let rightL = UILabel()
view.addSubview(rightL)
rightL.textColor = UIColor(named: "个人中心灰色字体")
......
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/CKGmCell.xib
View file @ 2f84b432
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" 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="17125"/>
<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"/>
......@@ -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="125"/>
<rect key="frame" x="0.0" y="0.0" width="376" height="200"/>
<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="125"/>
<rect key="frame" x="0.0" y="0.0" width="376" height="200"/>
<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="124" width="376" height="1"/>
<rect key="frame" x="0.0" y="199" width="376" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="QX9-6A-DHR"/>
......@@ -48,28 +48,28 @@
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="标题" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d4N-n8-5II">
<rect key="frame" x="15" y="16" width="295" height="37"/>
<rect key="frame" x="15" y="16" width="295" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="37" id="Xps-Kh-91n"/>
<constraint firstAttribute="height" constant="30" id="Xps-Kh-91n"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<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="61" width="29" height="13"/>
<rect key="frame" x="15" y="54" width="29" height="13"/>
<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="86" width="53.5" height="16"/>
<rect key="frame" x="15" y="132" 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="80" width="40" height="28"/>
<rect key="frame" x="321" y="126" 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="123" width="346" height="0.0"/>
<rect key="frame" x="15" y="169" width="346" height="29"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fta-n1-NF1">
<rect key="frame" x="15" y="123" width="346" height="0.0"/>
<rect key="frame" x="15" y="169" 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"/>
......@@ -97,47 +97,82 @@
<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>
<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"/>
<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="oxJ-qd-UEI" secondAttribute="bottom" constant="12" id="28C-8f-FnC"/>
<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="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 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"/>
......
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/NewCKVc.swift
View file @ 2f84b432
......@@ -15,8 +15,8 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
var piCiArr:Array<Array<GetGoodBatchDataModel>>? = []
let titleArr = ["出库类型：","出库时间："]
var holderArr = ["请选择出库类型","时间"]
let titleArr = ["出库类型：","出库时间：","出库备注："]
var holderArr = ["请选择出库类型","时间","请填写出库备注"]
var glSelectView:GLAlertSelectView?
let ckTypeArr = ["销售","调出","报损","赠品","自用","生产使用","过期处理","用户试用","采购退货","其他"]
var typeSelect:Int?
......@@ -62,68 +62,14 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
self.view.window?.addSubview(alterView)
}
var remark = ""
func sureGeliAlertTextViewAction(sender: String) {
if isGm {//直接出库
HUD.show(.progress)
if sender.count == 0 {
HUD.flash(.label("请填写备注"), delay: 1.2)
return
}
var goodsInfoArr:Array<Any> = []
for i in 0 ..< rkSelectArr.count {
let item = rkSelectArr[i]
var count = 0
let pici = piCiArr![i]
for data in pici {
count += data.chuHuoLiang!
}
var batchInfo:Array<Any> = []
piCiArr!.forEach { (batchArr) in
batchArr.forEach { (model) in
let batch = [
"w_id":model.w_id as Any,
"p_id":model.p_id as Any,
"number":model.chuHuoLiang as Any,
"production_data":model.production_data as Any,
"shelf_life":model.shelf_life as Any,
"valid_date":model.valid_date as Any,
"batch_id":model.batch_id as Any,
"report_id":model.report_id as Any
]
batchInfo.append(batch)
}
}
let goods = [
"goods_id":item.goods_id as Any,
"goods_name":item.goods_name as Any,
"goods_spec":item.spec_str as Any,
"sku_id":item.sku_id as Any,
"number":count as Any,
"batch_info":batchInfo as Any,
]
goodsInfoArr.append(goods)
}
let dict = [
"user_token":UserToken as Any,
"o_type":typeSelect! + 1 as Any,
"audit_remark":sender as Any,
"goods_info":dataChangeString(sender: goodsInfoArr) as Any
]
GoodsOutput(dict, success: { (data) in
HUD.hide()
HUD.flash(.labeledSubSuccess(subtitle: "出库成功"), delay: 1.2)
self.navigationController?.popViewController(animated: true)
}) { (error) in
}
remark = sender
holderArr.insert(remark, at: holderArr.count-1)
holderArr.remove(at: holderArr.count-1)
listView.reloadData()
}else{//提交申请
var goodsInfoArr:Array<Any> = []
rkSelectArr.forEach { (model) in
let goods = [
......@@ -168,6 +114,77 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
}
}
@IBOutlet weak var gm_view: UIView!
@IBAction func ck_action(_ sender: UIButton) {
if typeSelect == nil {
HUD.flash(.label("请选择出库类型"),delay: 1.2)
return
}
if remark.count == 0 {
HUD.flash(.label("请填写备注"), delay: 1.2)
return
}
if rkSelectArr.count == 0 {
HUD.flash(.label("请选择出库商品"), delay: 1.2)
return
}
HUD.show(.progress)
var goodsInfoArr:Array<Any> = []
for i in 0 ..< rkSelectArr.count {
let item = rkSelectArr[i]
var count = 0
let pici = piCiArr![i]
if pici.count == 0 {
HUD.flash(.label("请选择出库商品批次"), delay: 1.2)
return
}
for data in pici {
count += data.chuHuoLiang!
}
var batchInfo:Array<Any> = []
piCiArr!.forEach { (batchArr) in
batchArr.forEach { (model) in
let batch = [
"w_id":model.w_id as Any,
"p_id":model.p_id as Any,
"number":model.chuHuoLiang as Any,
"production_data":model.production_data as Any,
"shelf_life":model.shelf_life as Any,
"valid_date":model.valid_date as Any,
"batch_id":model.batch_id as Any,
"report_id":model.report_id as Any
]
batchInfo.append(batch)
}
}
let goods = [
"goods_id":item.goods_id as Any,
"goods_name":item.goods_name as Any,
"goods_spec":item.spec_str as Any,
"sku_id":item.sku_id as Any,
"number":count as Any,
"batch_info":batchInfo as Any,
]
goodsInfoArr.append(goods)
}
let dict = [
"user_token":UserToken as Any,
"o_type":typeSelect! + 1 as Any,
"audit_remark":remark as Any,
"goods_info":dataChangeString(sender: goodsInfoArr) as Any
]
GoodsOutput(dict, success: { (data) in
HUD.hide()
HUD.flash(.labeledSubSuccess(subtitle: "出库成功"), delay: 1.2)
self.navigationController?.popViewController(animated: true)
}) { (error) in
}
}
@IBOutlet weak var btmBtn: LGButton!
@IBOutlet weak var btmLbl: UILabel!
@IBOutlet weak var listView: UITableView!
......@@ -181,7 +198,7 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
listView.register(UINib(nibName: "CKNonGmCell", bundle: nil), forCellReuseIdentifier: "CKNonGmCell")
listView.register(UINib(nibName: "CRKBtnCell", bundle: nil), forCellReuseIdentifier: "CRKBtnCell")
listView.register(UINib(nibName: "CKGmCell", bundle: nil), forCellReuseIdentifier: "CKGmCell")
listView.register(UINib(nibName: "TitleAndLblCell", bundle: nil), forCellReuseIdentifier: "TitleAndLblCell")
holderArr.insert(getTimeNow(), at: 1)
holderArr.remove(at: 2)
......@@ -234,6 +251,7 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
if self.authArr.contains("64"){
self.isGm = true
self.btmLbl.text = "直接出库"
self.gm_view.isHidden = false
}
}
self.listView.reloadData()
......@@ -264,8 +282,8 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
let data = rkSelectArr[cell.tag]
cell.delegate = self
cell.nameLbl.text = data.goods_name
cell.detailLbl.text = data.spec_str
cell.detailLbl.text = data.spec_str! + " ¥" + data.price!
cell.gys_name_lbl.text = "待补充"
let arr = piCiArr?[cell.tag]
if arr!.count > 0 {
cell.dataArr = arr
......@@ -299,7 +317,23 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
return cell
}
if indexPath.row == 2 {
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndLblCell") as! TitleAndLblCell
cell.nameLbl.text = titleArr[indexPath.row]
cell.contentLbl.text = holderArr[indexPath.row]
cell.btmW.constant = 0
cell.contentRight.constant = 0
cell.imgRight.constant = 15
cell.contentLbl.textColor = UIColor(named: "#999999")
if remark.count != 0 {
cell.contentLbl.text = remark
cell.btmW.constant = 15
cell.contentRight.constant = 5
cell.imgRight.constant = 22
cell.contentLbl.textColor = UIColor(named: "标题字颜色")
}
return cell
}
let cell = tableView.dequeueReusableCell(withIdentifier: "CRKBtnCell") as! CRKBtnCell
cell.tag = indexPath.row
cell.nameLbl.text = titleArr[indexPath.row]
......@@ -314,14 +348,17 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if indexPath.section == 0 {
if indexPath.row == 4 {
return UITableView.automaticDimension
}
return 49
}
if isGm {
let arr = piCiArr![indexPath.row]
if arr.count > 0 {
return CGFloat(125 + arr.count * 30 + 35)
return CGFloat(175 + arr.count * 30 + 35)
}else{
return 125
return 175
}
}
......@@ -400,12 +437,23 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
if section == 0 {
return 2
return titleArr.count
}
return rkSelectArr.count
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if indexPath.section == 0 {
if indexPath.row == 2 {
let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
alterView.delegate = self
alterView.titleLbl.text = "请填写出库备注"
alterView.placerLbl.text = "请填写出库备注..."
if remark.count > 0 {
alterView.textview.text = remark
alterView.placerLbl.isHidden = true
}
self.view.window?.addSubview(alterView)
}
if indexPath.row == 0 {
if glSelectView == nil {
let view = GLAlertSelectView(frame: self.view.bounds)
......
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/NewCKVc.xib
View file @ 2f84b432
<?xml version="1.0" encoding="UTF-8"?>
<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">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" 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"/>
<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>
......@@ -13,6 +14,7 @@
<connections>
<outlet property="btmBtn" destination="yfg-Ft-JzP" id="BU2-Kp-3re"/>
<outlet property="btmLbl" destination="GKS-4B-MyY" id="X7n-F5-1a4"/>
<outlet property="gm_view" destination="moD-QI-ooo" id="MIj-ye-sZc"/>
<outlet property="listView" destination="Myt-AK-Ady" id="UCq-v8-4KC"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
......@@ -24,7 +26,7 @@
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yfg-Ft-JzP" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="0.0" y="813" width="414" height="83"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
<color key="value" name="按钮渐变色上"/>
......@@ -54,33 +56,82 @@
</attributedString>
<nil key="highlightedColor"/>
</label>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="moD-QI-ooo">
<rect key="frame" x="0.0" y="813" width="414" height="83"/>
<subviews>
<button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bTg-VN-P3E">
<rect key="frame" x="207" y="0.0" width="207" height="44"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<state key="normal" title="出库并打印批次号">
<color key="titleColor" name="蓝色字体颜色"/>
</state>
<connections>
<action selector="ck_action:" destination="-1" eventType="touchUpInside" id="zdq-H7-jNb"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8Cb-F8-yca">
<rect key="frame" x="0.0" y="0.0" width="207" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="v9u-zb-uZn"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<state key="normal" title="直接出库">
<color key="titleColor" name="蓝色字体颜色"/>
</state>
<connections>
<action selector="ck_action:" destination="-1" eventType="touchUpInside" id="Tla-G7-UYG"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="bTg-VN-P3E" firstAttribute="leading" secondItem="8Cb-F8-yca" secondAttribute="trailing" id="9f0-AT-Ry8"/>
<constraint firstItem="bTg-VN-P3E" firstAttribute="width" secondItem="8Cb-F8-yca" secondAttribute="width" id="IYl-7c-u8i"/>
<constraint firstAttribute="trailing" secondItem="bTg-VN-P3E" secondAttribute="trailing" id="RUX-ve-PhV"/>
<constraint firstItem="bTg-VN-P3E" firstAttribute="top" secondItem="moD-QI-ooo" secondAttribute="top" id="TLR-th-41a"/>
<constraint firstItem="8Cb-F8-yca" firstAttribute="leading" secondItem="moD-QI-ooo" secondAttribute="leading" id="WeI-bW-r7F"/>
<constraint firstItem="8Cb-F8-yca" firstAttribute="top" secondItem="moD-QI-ooo" secondAttribute="top" id="r0N-Nv-v4M"/>
<constraint firstItem="8Cb-F8-yca" firstAttribute="leading" secondItem="moD-QI-ooo" secondAttribute="leading" id="wtS-re-Rsu"/>
<constraint firstItem="8Cb-F8-yca" firstAttribute="top" secondItem="moD-QI-ooo" secondAttribute="top" id="yiM-Mc-NrV"/>
</constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="Myt-AK-Ady">
<rect key="frame" x="0.0" y="44" width="414" height="769"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<connections>
<outlet property="dataSource" destination="-1" id="dQi-xw-tCS"/>
<outlet property="delegate" destination="-1" id="DZf-hu-aOI"/>
</connections>
</tableView>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="moD-QI-ooo" firstAttribute="height" secondItem="yfg-Ft-JzP" secondAttribute="height" id="196-kU-pDi"/>
<constraint firstAttribute="bottom" secondItem="yfg-Ft-JzP" secondAttribute="bottom" id="3Rw-4z-1xg"/>
<constraint firstItem="yfg-Ft-JzP" firstAttribute="top" secondItem="Myt-AK-Ady" secondAttribute="bottom" id="5ea-VU-PCh"/>
<constraint firstItem="Myt-AK-Ady" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="8Nd-zZ-e6Y"/>
<constraint firstAttribute="trailing" secondItem="yfg-Ft-JzP" secondAttribute="trailing" id="FFL-8x-j2C"/>
<constraint firstItem="moD-QI-ooo" firstAttribute="leading" secondItem="yfg-Ft-JzP" secondAttribute="leading" id="IbG-2s-pPG"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="GKS-4B-MyY" secondAttribute="bottom" id="P1B-m5-LJq"/>
<constraint firstItem="Myt-AK-Ady" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="YpP-Yr-9qc"/>
<constraint firstItem="bTg-VN-P3E" firstAttribute="height" secondItem="GKS-4B-MyY" secondAttribute="height" multiplier="0.897959" id="aaN-wK-9n7"/>
<constraint firstItem="yfg-Ft-JzP" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="ba8-mE-xDO"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="GKS-4B-MyY" secondAttribute="trailing" id="bwq-Hv-TBP"/>
<constraint firstItem="moD-QI-ooo" firstAttribute="width" secondItem="yfg-Ft-JzP" secondAttribute="width" id="fjB-6v-Ay3"/>
<constraint firstItem="moD-QI-ooo" firstAttribute="bottom" secondItem="yfg-Ft-JzP" secondAttribute="bottom" id="gV5-80-wHI"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="Myt-AK-Ady" secondAttribute="trailing" id="iVq-AJ-4wY"/>
<constraint firstItem="GKS-4B-MyY" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="oey-x7-Tpm"/>
<constraint firstItem="yfg-Ft-JzP" firstAttribute="top" secondItem="GKS-4B-MyY" secondAttribute="top" id="tvf-1M-dMb"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<point key="canvasLocation" x="131.8840579710145" y="132.58928571428572"/>
</view>
</objects>
<designables>
<designable name="yfg-Ft-JzP">
<size key="intrinsicContentSize" width="10" height="10"/>
</designable>
</designables>
<resources>
<namedColor name="按钮渐变色上">
<color red="0.3880000114440918" green="0.62400001287460327" blue="0.90200001001358032" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -91,5 +142,11 @@
<namedColor name="白色背景色">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<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>
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