Skip to content

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

出入库详情

parent 2f84b432
Expand all Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 16 deletions
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/NewCKVc.swift
View file @ f9df6fde
...@@ -128,6 +128,8 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo ...@@ -128,6 +128,8 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
HUD.flash(.label("请选择出库商品"), delay: 1.2) HUD.flash(.label("请选择出库商品"), delay: 1.2)
return return
} }
HUD.show(.progress) HUD.show(.progress)
var goodsInfoArr:Array<Any> = [] var goodsInfoArr:Array<Any> = []
for i in 0 ..< rkSelectArr.count { for i in 0 ..< rkSelectArr.count {
...@@ -177,9 +179,16 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo ...@@ -177,9 +179,16 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
"audit_remark":remark as Any, "audit_remark":remark as Any,
"goods_info":dataChangeString(sender: goodsInfoArr) as Any "goods_info":dataChangeString(sender: goodsInfoArr) as Any
] ]
if sender.tag == 1 {//打印
print("连接打印机")
return
}
GoodsOutput(dict, success: { (data) in GoodsOutput(dict, success: { (data) in
HUD.hide() HUD.hide()
HUD.flash(.labeledSubSuccess(subtitle: "出库成功"), delay: 1.2) HUD.flash(.labeledSubSuccess(subtitle: "出库成功"), delay: 1.2)
self.navigationController?.popViewController(animated: true) self.navigationController?.popViewController(animated: true)
}) { (error) in }) { (error) in
......
GeliBusinessPlatform/ViewController/出入库记录/CRKXiangQVC.swift
View file @ f9df6fde
...@@ -649,13 +649,13 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource, ...@@ -649,13 +649,13 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
return 49 return 49
} }
if model?.io_type == 1 {//入库 if model?.io_type == 1 {//入库
return 264 return 362
} }
if (model?.status)! > 1 { if (model?.status)! > 1 {
return 264 return 362
} }
if isGm == false { if isGm == false {
return 264 return 362
} }
let arr = piCiArr[indexPath.row] let arr = piCiArr[indexPath.row]
if arr.count > 0 { if arr.count > 0 {
......
GeliBusinessPlatform/ViewController/出入库记录/CRKXiangQVC.xib
View file @ f9df6fde
<?xml version="1.0" encoding="UTF-8"?> <?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"/> <device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <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="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" 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"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<objects> <objects>
...@@ -25,7 +26,7 @@ ...@@ -25,7 +26,7 @@
<subviews> <subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WaS-5d-gVj"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WaS-5d-gVj">
<rect key="frame" x="0.0" y="813" width="414" height="83"/> <rect key="frame" x="0.0" y="813" width="414" height="83"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/> <color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view> </view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EBn-Ps-D90"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EBn-Ps-D90">
<rect key="frame" x="0.0" y="813" width="414" height="49"/> <rect key="frame" x="0.0" y="813" width="414" height="49"/>
...@@ -37,7 +38,7 @@ ...@@ -37,7 +38,7 @@
<constraint firstAttribute="height" constant="1" id="rS8-nk-JNK"/> <constraint firstAttribute="height" constant="1" id="rS8-nk-JNK"/>
</constraints> </constraints>
</view> </view>
<button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sPz-uT-fTr"> <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sPz-uT-fTr">
<rect key="frame" x="0.0" y="1" width="207" height="48"/> <rect key="frame" x="0.0" y="1" width="207" height="48"/>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/> <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
<state key="normal" title="不通过"> <state key="normal" title="不通过">
...@@ -47,7 +48,7 @@ ...@@ -47,7 +48,7 @@
<action selector="crkxqBtnClick:" destination="-1" eventType="touchUpInside" id="SsN-9N-cc4"/> <action selector="crkxqBtnClick:" destination="-1" eventType="touchUpInside" id="SsN-9N-cc4"/>
</connections> </connections>
</button> </button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QU8-BL-JRl"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QU8-BL-JRl">
<rect key="frame" x="207" y="1" width="207" height="48"/> <rect key="frame" x="207" y="1" width="207" height="48"/>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/> <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
<state key="normal" title="通过"> <state key="normal" title="通过">
...@@ -58,7 +59,7 @@ ...@@ -58,7 +59,7 @@
</connections> </connections>
</button> </button>
</subviews> </subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/> <color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="49" id="9Zg-jL-ofh"/> <constraint firstAttribute="height" constant="49" id="9Zg-jL-ofh"/>
<constraint firstAttribute="trailing" secondItem="ydi-1B-6A5" secondAttribute="trailing" id="Gwu-ui-0rc"/> <constraint firstAttribute="trailing" secondItem="ydi-1B-6A5" secondAttribute="trailing" id="Gwu-ui-0rc"/>
...@@ -83,7 +84,8 @@ ...@@ -83,7 +84,8 @@
</connections> </connections>
</tableView> </tableView>
</subviews> </subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/> <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints> <constraints>
<constraint firstItem="w5k-1L-VKh" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="05i-4e-oTV"/> <constraint firstItem="w5k-1L-VKh" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="05i-4e-oTV"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="w5k-1L-VKh" secondAttribute="trailing" id="2H8-lN-Ji9"/> <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="w5k-1L-VKh" secondAttribute="trailing" id="2H8-lN-Ji9"/>
...@@ -97,7 +99,6 @@ ...@@ -97,7 +99,6 @@
<constraint firstAttribute="trailing" secondItem="WaS-5d-gVj" secondAttribute="trailing" id="iQd-4i-bQ7"/> <constraint firstAttribute="trailing" secondItem="WaS-5d-gVj" secondAttribute="trailing" id="iQd-4i-bQ7"/>
<constraint firstItem="WaS-5d-gVj" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="kEL-vT-6C3"/> <constraint firstItem="WaS-5d-gVj" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="kEL-vT-6C3"/>
</constraints> </constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<point key="canvasLocation" x="124.6376811594203" y="108.48214285714285"/> <point key="canvasLocation" x="124.6376811594203" y="108.48214285714285"/>
</view> </view>
</objects> </objects>
...@@ -111,5 +112,8 @@ ...@@ -111,5 +112,8 @@
<namedColor name="蓝色字体颜色"> <namedColor name="蓝色字体颜色">
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources> </resources>
</document> </document>
GeliBusinessPlatform/ViewController/出入库记录/NewCKCell.xib
View file @ f9df6fde
<?xml version="1.0" encoding="UTF-8"?> <?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"/> <device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <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="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" 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"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<objects> <objects>
...@@ -94,7 +95,7 @@ ...@@ -94,7 +95,7 @@
<color key="textColor" name="个人中心灰色字体"/> <color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="meu-FK-Krq"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="meu-FK-Krq">
<rect key="frame" x="293" y="160.5" width="40" height="28"/> <rect key="frame" x="293" y="160.5" width="40" height="28"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="请选择"> <state key="normal" title="请选择">
...@@ -137,7 +138,7 @@ ...@@ -137,7 +138,7 @@
</constraints> </constraints>
</view> </view>
</subviews> </subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/> <color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints> <constraints>
<constraint firstAttribute="trailing" secondItem="O1C-jG-Pqe" secondAttribute="trailing" constant="15" id="1Dg-eD-JWD"/> <constraint firstAttribute="trailing" secondItem="O1C-jG-Pqe" secondAttribute="trailing" constant="15" id="1Dg-eD-JWD"/>
<constraint firstItem="v8m-Lh-pEo" firstAttribute="top" secondItem="SLL-lW-cm1" secondAttribute="bottom" id="3li-0z-eCR"/> <constraint firstItem="v8m-Lh-pEo" firstAttribute="top" secondItem="SLL-lW-cm1" secondAttribute="bottom" id="3li-0z-eCR"/>
...@@ -212,7 +213,7 @@ ...@@ -212,7 +213,7 @@
<color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
<namedColor name="个人中心灰色字体"> <namedColor name="个人中心灰色字体">
<color red="0.3919999897480011" green="0.3919999897480011" blue="0.3919999897480011" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.38823529411764707" green="0.38823529411764707" blue="0.38823529411764707" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
<namedColor name="标题字颜色"> <namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
...@@ -226,5 +227,8 @@ ...@@ -226,5 +227,8 @@
<namedColor name="蓝色字体颜色"> <namedColor name="蓝色字体颜色">
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources> </resources>
</document> </document>
GeliBusinessPlatform/ViewController/出入库记录/NewRKCell.swift
View file @ f9df6fde
...@@ -10,6 +10,8 @@ import UIKit ...@@ -10,6 +10,8 @@ import UIKit
class NewRKCell: UITableViewCell { class NewRKCell: UITableViewCell {
@IBOutlet weak var pi_ci_lbl: UILabel!
@IBOutlet weak var gys_lbl: UILabel!
@IBOutlet weak var baogao: UILabel! @IBOutlet weak var baogao: UILabel!
@IBOutlet weak var rkzj: UILabel! @IBOutlet weak var rkzj: UILabel!
@IBOutlet weak var gqrq: UILabel! @IBOutlet weak var gqrq: UILabel!
......
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