Commit 6c86fb0a authored by lujunye's avatar lujunye

打印出库列表修改

parent 68cf9135
...@@ -215,15 +215,15 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo ...@@ -215,15 +215,15 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
vc.rkSelectArr = rkSelectArr vc.rkSelectArr = rkSelectArr
vc.piCiArr = piCiArr vc.piCiArr = piCiArr
self.view.addSubview(vc) self.view.addSubview(vc)
return }else{
} HUD.show(.progress)
HUD.show(.progress) 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
}
} }
} }
} }
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bTg-VN-P3E"> <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"/> <rect key="frame" x="207" y="0.0" width="207" height="44"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/> <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<state key="normal" title="出库并打印批次号"> <state key="normal" title="打印批次号">
<color key="titleColor" name="蓝色字体颜色"/> <color key="titleColor" name="蓝色字体颜色"/>
</state> </state>
<connections> <connections>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<objects> <objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="Print_Gprinter_View" customModule="TestClass" customModuleProvider="target"> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="Print_Gprinter_View" customModule="TestClass" customModuleProvider="target">
<connections> <connections>
<outlet property="list_view" destination="tg1-Mu-DiU" id="Lnf-Be-uXc"/> <outlet property="list_view" destination="huM-3Q-uCP" id="Yfi-iw-0iq"/>
</connections> </connections>
</placeholder> </placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
...@@ -20,13 +20,6 @@ ...@@ -20,13 +20,6 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<button opaque="NO" alpha="0.40000000000000002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oEf-W5-yQm">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<color key="backgroundColor" name="标题字颜色"/>
<connections>
<action selector="close_action:" destination="-1" eventType="touchUpInside" id="JE9-Am-Z6x"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ldh-k1-OH6" customClass="LGButton" customModule="LGButton"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ldh-k1-OH6" customClass="LGButton" customModule="LGButton">
<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"/> <color key="backgroundColor" systemColor="systemBackgroundColor"/>
...@@ -43,7 +36,7 @@ ...@@ -43,7 +36,7 @@
<action selector="print_action:" destination="-1" eventType="touchUpInside" id="ftV-2T-wEl"/> <action selector="print_action:" destination="-1" eventType="touchUpInside" id="ftV-2T-wEl"/>
</connections> </connections>
</view> </view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="确认出库并打印" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BPl-41-65h"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="确认打印" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BPl-41-65h">
<rect key="frame" x="0.0" y="813" width="414" height="49"/> <rect key="frame" x="0.0" y="813" width="414" height="49"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="49" id="9Nc-vp-S9Z"/> <constraint firstAttribute="height" constant="49" id="9Nc-vp-S9Z"/>
...@@ -52,67 +45,80 @@ ...@@ -52,67 +45,80 @@
<color key="textColor" name="白色背景色"/> <color key="textColor" name="白色背景色"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FKx-Wz-KDW"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jyN-St-Pep">
<rect key="frame" x="0.0" y="420" width="414" height="393"/> <rect key="frame" x="0.0" y="44" width="414" height="49"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="打印商品格利批次号" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vTf-aY-1ge"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="打印批次" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gxM-7e-glX">
<rect key="frame" x="0.0" y="0.0" width="414" height="49"/> <rect key="frame" x="173" y="12.5" width="68" height="24"/>
<constraints> <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="17"/>
<constraint firstAttribute="height" constant="49" id="HWE-ib-DMW"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="标题字颜色"/> <color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vfG-wL-c5P"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ajd-75-fkG">
<rect key="frame" x="0.0" y="49" width="414" height="1"/> <rect key="frame" x="0.0" y="0.0" width="46" height="49"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="1" id="1N8-sp-1At"/> <constraint firstAttribute="width" constant="46" id="ovC-ki-zOq"/>
</constraints> </constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="tg1-Mu-DiU">
<rect key="frame" x="0.0" y="50" width="414" height="343"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<connections> <connections>
<outlet property="dataSource" destination="-1" id="TxP-cg-CI8"/> <action selector="close_action:" destination="-1" eventType="touchUpInside" id="ixF-79-4N9"/>
<outlet property="delegate" destination="-1" id="vud-ro-DI6"/>
</connections> </connections>
</tableView> </button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="y6r-nJ-4D2">
<rect key="frame" x="0.0" y="48" width="414" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="MdT-PU-V8p"/>
</constraints>
</view>
</subviews> </subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/> <color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints> <constraints>
<constraint firstAttribute="trailing" secondItem="tg1-Mu-DiU" secondAttribute="trailing" id="044-Ar-jor"/> <constraint firstItem="gxM-7e-glX" firstAttribute="centerY" secondItem="jyN-St-Pep" secondAttribute="centerY" id="8w6-Ut-ENT"/>
<constraint firstItem="vfG-wL-c5P" firstAttribute="leading" secondItem="FKx-Wz-KDW" secondAttribute="leading" id="68h-My-t5p"/> <constraint firstAttribute="bottom" secondItem="ajd-75-fkG" secondAttribute="bottom" id="Abc-C7-PpF"/>
<constraint firstItem="vTf-aY-1ge" firstAttribute="leading" secondItem="FKx-Wz-KDW" secondAttribute="leading" id="753-C1-izB"/> <constraint firstAttribute="bottom" secondItem="y6r-nJ-4D2" secondAttribute="bottom" id="KSN-5o-URw"/>
<constraint firstAttribute="trailing" secondItem="vfG-wL-c5P" secondAttribute="trailing" id="BI2-RG-iga"/> <constraint firstItem="ajd-75-fkG" firstAttribute="leading" secondItem="jyN-St-Pep" secondAttribute="leading" id="KbU-Xv-9hP"/>
<constraint firstAttribute="height" constant="393" id="DXi-Yd-mer"/> <constraint firstAttribute="trailing" secondItem="y6r-nJ-4D2" secondAttribute="trailing" id="NyW-77-rn8"/>
<constraint firstItem="tg1-Mu-DiU" firstAttribute="top" secondItem="vfG-wL-c5P" secondAttribute="bottom" id="azc-7t-y1K"/> <constraint firstItem="gxM-7e-glX" firstAttribute="centerX" secondItem="jyN-St-Pep" secondAttribute="centerX" id="YGw-ko-kKP"/>
<constraint firstItem="tg1-Mu-DiU" firstAttribute="leading" secondItem="FKx-Wz-KDW" secondAttribute="leading" id="hcI-lq-K6s"/> <constraint firstItem="ajd-75-fkG" firstAttribute="top" secondItem="jyN-St-Pep" secondAttribute="top" id="c9i-Xc-4EP"/>
<constraint firstAttribute="bottom" secondItem="tg1-Mu-DiU" secondAttribute="bottom" id="qJS-Ur-7HF"/> <constraint firstItem="y6r-nJ-4D2" firstAttribute="leading" secondItem="jyN-St-Pep" secondAttribute="leading" id="oZf-WJ-YY3"/>
<constraint firstItem="vfG-wL-c5P" firstAttribute="top" secondItem="vTf-aY-1ge" secondAttribute="bottom" id="sqF-RL-mnG"/> <constraint firstAttribute="height" constant="49" id="wKa-O5-106"/>
<constraint firstAttribute="trailing" secondItem="vTf-aY-1ge" secondAttribute="trailing" id="wP8-4B-LD6"/>
<constraint firstItem="vTf-aY-1ge" firstAttribute="top" secondItem="FKx-Wz-KDW" secondAttribute="top" id="yHh-i3-jxF"/>
</constraints> </constraints>
</view> </view>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="fanhui" translatesAutoresizingMaskIntoConstraints="NO" id="t7R-j4-9mN">
<rect key="frame" x="15" y="60" width="10" height="17"/>
<constraints>
<constraint firstAttribute="height" constant="17" id="8xF-vR-nYB"/>
<constraint firstAttribute="width" constant="10" id="KcU-1P-Gk1"/>
</constraints>
</imageView>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="huM-3Q-uCP">
<rect key="frame" x="0.0" y="93" width="414" height="720"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<connections>
<outlet property="dataSource" destination="-1" id="VRT-ER-ctQ"/>
<outlet property="delegate" destination="-1" id="Pfh-Fh-O6G"/>
</connections>
</tableView>
</subviews> </subviews>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/> <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints> <constraints>
<constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="BPl-41-65h" secondAttribute="trailing" id="3ry-uY-JD4"/> <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="BPl-41-65h" secondAttribute="trailing" id="3ry-uY-JD4"/>
<constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="oEf-W5-yQm" secondAttribute="trailing" id="4AG-ST-Naj"/> <constraint firstItem="t7R-j4-9mN" firstAttribute="centerY" secondItem="gxM-7e-glX" secondAttribute="centerY" id="4YB-UD-G9y"/>
<constraint firstItem="Ldh-k1-OH6" firstAttribute="top" secondItem="huM-3Q-uCP" secondAttribute="bottom" id="9ZY-BM-65C"/>
<constraint firstAttribute="bottom" secondItem="Ldh-k1-OH6" secondAttribute="bottom" id="Al9-vz-iyc"/> <constraint firstAttribute="bottom" secondItem="Ldh-k1-OH6" secondAttribute="bottom" id="Al9-vz-iyc"/>
<constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="BPl-41-65h" secondAttribute="bottom" id="D10-9A-hrJ"/> <constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="BPl-41-65h" secondAttribute="bottom" id="D10-9A-hrJ"/>
<constraint firstItem="Ldh-k1-OH6" firstAttribute="top" secondItem="BPl-41-65h" secondAttribute="top" id="MCH-sM-Z0P"/> <constraint firstItem="Ldh-k1-OH6" firstAttribute="top" secondItem="BPl-41-65h" secondAttribute="top" id="MCH-sM-Z0P"/>
<constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="FKx-Wz-KDW" secondAttribute="trailing" id="QAW-Dc-ztm"/> <constraint firstItem="huM-3Q-uCP" firstAttribute="top" secondItem="jyN-St-Pep" secondAttribute="bottom" id="QvB-h0-Thh"/>
<constraint firstItem="oEf-W5-yQm" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="VP1-Aq-Hi2"/> <constraint firstItem="t7R-j4-9mN" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="15" id="U6q-RO-O83"/>
<constraint firstItem="oEf-W5-yQm" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="bXT-Ri-XZU"/> <constraint firstItem="jyN-St-Pep" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="VNg-Ih-Wtk"/>
<constraint firstItem="Ldh-k1-OH6" firstAttribute="top" secondItem="FKx-Wz-KDW" secondAttribute="bottom" id="bzX-CB-izu"/> <constraint firstItem="jyN-St-Pep" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" id="Yf6-eY-tnY"/>
<constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="huM-3Q-uCP" secondAttribute="trailing" id="ZY3-Ec-IB4"/>
<constraint firstAttribute="trailing" secondItem="Ldh-k1-OH6" secondAttribute="trailing" id="etO-Ki-fks"/> <constraint firstAttribute="trailing" secondItem="Ldh-k1-OH6" secondAttribute="trailing" id="etO-Ki-fks"/>
<constraint firstAttribute="bottom" secondItem="oEf-W5-yQm" secondAttribute="bottom" id="mcm-BF-WQV"/> <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="jyN-St-Pep" secondAttribute="trailing" id="rGI-pa-VAz"/>
<constraint firstItem="Ldh-k1-OH6" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="rsm-aL-iLT"/> <constraint firstItem="Ldh-k1-OH6" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="rsm-aL-iLT"/>
<constraint firstItem="BPl-41-65h" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="tsa-il-j9J"/> <constraint firstItem="BPl-41-65h" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="tsa-il-j9J"/>
<constraint firstItem="FKx-Wz-KDW" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="uTM-w5-s0J"/> <constraint firstItem="huM-3Q-uCP" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="voR-pE-fLh"/>
</constraints> </constraints>
<point key="canvasLocation" x="140.57971014492756" y="103.79464285714285"/> <point key="canvasLocation" x="140.57971014492756" y="103.79464285714285"/>
</view> </view>
...@@ -123,6 +129,7 @@ ...@@ -123,6 +129,7 @@
</designable> </designable>
</designables> </designables>
<resources> <resources>
<image name="fanhui" width="18" height="35"/>
<namedColor name="按钮渐变色上"> <namedColor name="按钮渐变色上">
<color red="0.3880000114440918" green="0.62400001287460327" blue="0.90200001001358032" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.3880000114440918" green="0.62400001287460327" blue="0.90200001001358032" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
......
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