Skip to content

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

修复bug1.0

parent 623c3547
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 27 deletions
GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewRKVc.swift
View file @ b26de610
......@@ -174,7 +174,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
@IBOutlet weak var lgBtnTitLbl: UILabel!
@IBOutlet weak var lgBtn: LGButton!
var isGm = false
let titleArr = ["仓库：","库位：","入库类型：","入库时间：","备注："]
var titleArr = ["仓库：","库位：","入库类型：","入库时间：","备注："]
var holderArr = ["请选择仓库","请选择库位","请选择入库类型","时间","请输入备注"]
//入库类型
var rkTypeArr = ["采购","调入","退货","生产","调出被拒绝","外采","其他","固定采购","临时采购"]
......@@ -200,7 +200,10 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
override func viewDidLoad() {
super.viewDidLoad()
if orderNumStr.count > 0 {
titleArr.append("采购单号：")
holderArr.append(orderNumStr)
}
if isCaiGou {
typeSelect = 0
......@@ -422,7 +425,9 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
}
let data = rkSelectArr[indexPath.row]
cell.nameLbl.text = data.goods_name
cell.titLbl.text = "入库数量：(可入库量为\(data.no_push_num!)"
if data.no_push_num != nil {
cell.titLbl.text = "入库数量：(可入库量为\(data.no_push_num!))"
}
cell.detailLbl.text = data.spec_str! + " " + "¥\(data.price!)"
cell.rkPriceTf.text = "\(data.price!)"
cell.rkCountTf.text = "1"
......@@ -462,7 +467,9 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
if indexPath.row == 4 {
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndLblCell") as! TitleAndLblCell
cell.nameLbl.text = titleArr[indexPath.row]
if orderNumStr.count == 0 {
cell.btmLine.isHidden = true
}
cell.contentLbl.text = holderArr[indexPath.row]
cell.btmW.constant = 0
cell.contentRight.constant = 0
......
GeliBusinessPlatform/ViewController/新增采购单/CGDCell.xib
View file @ b26de610
......@@ -60,20 +60,26 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kBE-rT-dOt">
<rect key="frame" x="15" y="82" width="345" height="38.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="采购数量" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0cf-lx-CTb">
<rect key="frame" x="25" y="11.5" width="54" height="16"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="采购数量" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0cf-lx-CTb">
<rect key="frame" x="0.0" y="0.0" width="86.5" height="38.5"/>
<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="46J-ih-76e">
<rect key="frame" x="146" y="11.5" width="53.5" height="16"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="采购单价" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="46J-ih-76e">
<rect key="frame" x="172.5" y="0.0" width="86.5" height="38.5"/>
<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="mJ8-AR-jCS">
<rect key="frame" x="270" y="11.5" width="50" height="16"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小记(元)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mJ8-AR-jCS">
<rect key="frame" x="259" y="0.0" width="86" height="38.5"/>
<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="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0CN-yV-fkL">
<rect key="frame" x="86.5" y="0.0" width="86" height="38.5"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/>
......@@ -81,29 +87,42 @@
</subviews>
<color key="backgroundColor" name="app底色"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="mJ8-AR-jCS" secondAttribute="trailing" constant="25" id="A8g-im-XAy"/>
<constraint firstItem="mJ8-AR-jCS" firstAttribute="centerY" secondItem="kBE-rT-dOt" secondAttribute="centerY" id="AX2-Cs-Llw"/>
<constraint firstItem="0cf-lx-CTb" firstAttribute="leading" secondItem="kBE-rT-dOt" secondAttribute="leading" constant="25" id="H3G-IO-8JD"/>
<constraint firstItem="46J-ih-76e" firstAttribute="centerY" secondItem="kBE-rT-dOt" secondAttribute="centerY" id="Nca-EX-ZA8"/>
<constraint firstItem="0cf-lx-CTb" firstAttribute="centerY" secondItem="kBE-rT-dOt" secondAttribute="centerY" id="i2c-Pg-dFF"/>
<constraint firstItem="46J-ih-76e" firstAttribute="centerX" secondItem="kBE-rT-dOt" secondAttribute="centerX" id="mv6-TA-BuJ"/>
<constraint firstItem="46J-ih-76e" firstAttribute="leading" secondItem="0CN-yV-fkL" secondAttribute="trailing" id="3jX-hh-azO"/>
<constraint firstAttribute="bottom" secondItem="0CN-yV-fkL" secondAttribute="bottom" id="8h5-Ko-20V"/>
<constraint firstItem="0CN-yV-fkL" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="top" id="ATO-qG-Szh"/>
<constraint firstAttribute="trailing" secondItem="mJ8-AR-jCS" secondAttribute="trailing" id="FCr-V1-Y94"/>
<constraint firstItem="46J-ih-76e" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="top" id="HCg-wT-cHb"/>
<constraint firstItem="46J-ih-76e" firstAttribute="width" secondItem="0cf-lx-CTb" secondAttribute="width" id="OyZ-WM-Xai"/>
<constraint firstItem="mJ8-AR-jCS" firstAttribute="leading" secondItem="46J-ih-76e" secondAttribute="trailing" id="Stg-5f-lqd"/>
<constraint firstAttribute="bottom" secondItem="mJ8-AR-jCS" secondAttribute="bottom" id="YmS-vl-wXj"/>
<constraint firstItem="mJ8-AR-jCS" firstAttribute="width" secondItem="0cf-lx-CTb" secondAttribute="width" id="e5h-0B-GlD"/>
<constraint firstItem="0CN-yV-fkL" firstAttribute="width" secondItem="0cf-lx-CTb" secondAttribute="width" id="juc-qv-Zqw"/>
<constraint firstItem="mJ8-AR-jCS" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="top" id="l8U-aW-ibk"/>
<constraint firstItem="0cf-lx-CTb" firstAttribute="leading" secondItem="kBE-rT-dOt" secondAttribute="leading" id="llw-Oo-lEa"/>
<constraint firstAttribute="bottom" secondItem="46J-ih-76e" secondAttribute="bottom" id="lrr-2q-xH2"/>
<constraint firstAttribute="height" constant="38.5" id="psI-Xx-5yI"/>
<constraint firstItem="0cf-lx-CTb" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="top" id="ugb-br-gta"/>
<constraint firstAttribute="bottom" secondItem="0cf-lx-CTb" secondAttribute="bottom" id="uot-8a-LKU"/>
<constraint firstItem="0CN-yV-fkL" firstAttribute="leading" secondItem="0cf-lx-CTb" secondAttribute="trailing" id="yqL-34-myb"/>
</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="HF8-ja-1Mp">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HF8-ja-1Mp">
<rect key="frame" x="50.5" y="135.5" width="33" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<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="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m0Z-19-yG6">
<rect key="frame" x="171" y="135.5" width="33" height="16"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xMe-fM-o6d">
<rect key="frame" x="293.5" y="135.5" width="33" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<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="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xMe-fM-o6d">
<rect key="frame" x="293.5" y="135.5" width="33" height="16"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m0Z-19-yG6">
<rect key="frame" x="216" y="128" width="33" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/>
......@@ -111,10 +130,8 @@
</subviews>
<color key="backgroundColor" name="白色背景色"/>
<constraints>
<constraint firstItem="xMe-fM-o6d" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="bottom" constant="15" id="1qd-FP-LcT"/>
<constraint firstItem="kBE-rT-dOt" firstAttribute="top" secondItem="uED-Ck-HCh" secondAttribute="bottom" constant="10" id="DXT-Nj-hCW"/>
<constraint firstAttribute="trailing" secondItem="uED-Ck-HCh" secondAttribute="trailing" constant="15" id="Dzn-qc-0aj"/>
<constraint firstItem="xMe-fM-o6d" firstAttribute="centerX" secondItem="mJ8-AR-jCS" secondAttribute="centerX" id="E49-7P-0vg"/>
<constraint firstItem="zUM-gk-TDF" firstAttribute="leading" secondItem="53n-Ij-aLj" secondAttribute="trailing" id="FNm-yK-j5F"/>
<constraint firstAttribute="trailing" secondItem="zUM-gk-TDF" secondAttribute="trailing" id="GYX-Pp-TVw"/>
<constraint firstItem="53n-Ij-aLj" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="IY9-Bn-zNP"/>
......@@ -122,15 +139,11 @@
<constraint firstItem="c2P-6b-lpC" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="LQH-t0-OEw"/>
<constraint firstAttribute="trailing" secondItem="c2P-6b-lpC" secondAttribute="trailing" id="Nfl-mv-J8f"/>
<constraint firstItem="kBE-rT-dOt" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="ZH2-ul-Rc5"/>
<constraint firstItem="m0Z-19-yG6" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="bottom" constant="15" id="Zv2-hp-Kwg"/>
<constraint firstItem="uED-Ck-HCh" firstAttribute="top" secondItem="53n-Ij-aLj" secondAttribute="bottom" constant="5" id="c3e-zB-PD7"/>
<constraint firstItem="zUM-gk-TDF" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="gwz-w4-HaY"/>
<constraint firstItem="HF8-ja-1Mp" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="bottom" constant="15" id="j4F-Nl-GY1"/>
<constraint firstItem="53n-Ij-aLj" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="15" id="jb1-N1-bkz"/>
<constraint firstItem="m0Z-19-yG6" firstAttribute="centerX" secondItem="46J-ih-76e" secondAttribute="centerX" id="sq5-BU-PcI"/>
<constraint firstItem="uED-Ck-HCh" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="vb1-1w-P6S"/>
<constraint firstAttribute="bottom" secondItem="c2P-6b-lpC" secondAttribute="bottom" id="xqy-z2-fqO"/>
<constraint firstItem="HF8-ja-1Mp" firstAttribute="centerX" secondItem="0cf-lx-CTb" secondAttribute="centerX" id="zy8-Zj-6iF"/>
</constraints>
</tableViewCellContentView>
<color key="backgroundColor" name="白色背景色"/>
......
GeliBusinessPlatform/ViewController/采购单详情/CGDXQVc.swift
View file @ b26de610
......@@ -159,7 +159,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
case "修改信息":
let vc = XinCaiGouViewController()
vc.delegate = self
vc.cgName = model?.purchaser!
vc.cgName = model?.purchaser! as! String
vc.orderNum = model?.po_no!
vc.po_id = model?.po_id!
vc.ven_id = model?.ven_id!
......
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