出入库记录详情（待审核）

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -21,6 +21,8 @@
 		E00E48C32457C0D600F16545 /* XuanZeShangPinViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E00E48C12457C0D600F16545 /* XuanZeShangPinViewController.xib */; };
 		E00E48C62457C99900F16545 /* KuCunShangPinXQViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00E48C42457C99900F16545 /* KuCunShangPinXQViewController.swift */; };
 		E00E48C72457C99900F16545 /* KuCunShangPinXQViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E00E48C52457C99900F16545 /* KuCunShangPinXQViewController.xib */; };
+		E00E48CA2457D96100F16545 /* ChuRuKuJiLuXQViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00E48C82457D96100F16545 /* ChuRuKuJiLuXQViewController.swift */; };
+		E00E48CB2457D96100F16545 /* ChuRuKuJiLuXQViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E00E48C92457D96100F16545 /* ChuRuKuJiLuXQViewController.xib */; };
 		E01C26B12446989700ADCC70 /* Interface_Z.plist in Resources */ = {isa = PBXBuildFile; fileRef = E01C26B02446989700ADCC70 /* Interface_Z.plist */; };
 		E01C26B62446AF3100ADCC70 /* DemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E01C26B42446AF3100ADCC70 /* DemoViewController.swift */; };
 		E01C26B72446AF3100ADCC70 /* DemoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E01C26B52446AF3100ADCC70 /* DemoViewController.xib */; };
@@ -117,8 +119,6 @@
 		E0C4F4A8244EC82A00CC7E2F /* TitleAndBtnCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0C4F4A6244EC82A00CC7E2F /* TitleAndBtnCell.xib */; };
 		E0C4F4B5244EE9EE00CC7E2F /* YuShouCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0C4F4B3244EE9EE00CC7E2F /* YuShouCell.swift */; };
 		E0C4F4B6244EE9EE00CC7E2F /* YuShouCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0C4F4B4244EE9EE00CC7E2F /* YuShouCell.xib */; };
-		E0C4F4B9244EEA7C00CC7E2F /* JiaTiJiaCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0C4F4B7244EEA7C00CC7E2F /* JiaTiJiaCell.swift */; };
-		E0C4F4BA244EEA7C00CC7E2F /* JiaTiJiaCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0C4F4B8244EEA7C00CC7E2F /* JiaTiJiaCell.xib */; };
 		E0C4F4BD244EF53D00CC7E2F /* BindStepTwoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0C4F4BB244EF53D00CC7E2F /* BindStepTwoViewController.swift */; };
 		E0C4F4BE244EF53D00CC7E2F /* BindStepTwoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0C4F4BC244EF53D00CC7E2F /* BindStepTwoViewController.xib */; };
 		E0C9EF12244E922200277435 /* OrderDViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0C9EF10244E922200277435 /* OrderDViewController.swift */; };
@@ -293,6 +293,8 @@
 		E00E48C12457C0D600F16545 /* XuanZeShangPinViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = XuanZeShangPinViewController.xib; sourceTree = "<group>"; };
 		E00E48C42457C99900F16545 /* KuCunShangPinXQViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KuCunShangPinXQViewController.swift; sourceTree = "<group>"; };
 		E00E48C52457C99900F16545 /* KuCunShangPinXQViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KuCunShangPinXQViewController.xib; sourceTree = "<group>"; };
+		E00E48C82457D96100F16545 /* ChuRuKuJiLuXQViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChuRuKuJiLuXQViewController.swift; sourceTree = "<group>"; };
+		E00E48C92457D96100F16545 /* ChuRuKuJiLuXQViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ChuRuKuJiLuXQViewController.xib; sourceTree = "<group>"; };
 		E01C26B02446989700ADCC70 /* Interface_Z.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Interface_Z.plist; sourceTree = "<group>"; };
 		E01C26B42446AF3100ADCC70 /* DemoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoViewController.swift; sourceTree = "<group>"; };
 		E01C26B52446AF3100ADCC70 /* DemoViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DemoViewController.xib; sourceTree = "<group>"; };
@@ -390,8 +392,6 @@
 		E0C4F4A6244EC82A00CC7E2F /* TitleAndBtnCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TitleAndBtnCell.xib; sourceTree = "<group>"; };
 		E0C4F4B3244EE9EE00CC7E2F /* YuShouCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YuShouCell.swift; sourceTree = "<group>"; };
 		E0C4F4B4244EE9EE00CC7E2F /* YuShouCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = YuShouCell.xib; sourceTree = "<group>"; };
-		E0C4F4B7244EEA7C00CC7E2F /* JiaTiJiaCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JiaTiJiaCell.swift; sourceTree = "<group>"; };
-		E0C4F4B8244EEA7C00CC7E2F /* JiaTiJiaCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = JiaTiJiaCell.xib; sourceTree = "<group>"; };
 		E0C4F4BB244EF53D00CC7E2F /* BindStepTwoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BindStepTwoViewController.swift; sourceTree = "<group>"; };
 		E0C4F4BC244EF53D00CC7E2F /* BindStepTwoViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BindStepTwoViewController.xib; sourceTree = "<group>"; };
 		E0C9EF10244E922200277435 /* OrderDViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderDViewController.swift; sourceTree = "<group>"; };
@@ -724,6 +724,8 @@
 			children = (
 				E02FD9EF2455705F00E10E27 /* ChuRuKuJiLuCell.swift */,
 				E02FD9F02455705F00E10E27 /* ChuRuKuJiLuCell.xib */,
+				E00E48C82457D96100F16545 /* ChuRuKuJiLuXQViewController.swift */,
+				E00E48C92457D96100F16545 /* ChuRuKuJiLuXQViewController.xib */,
 			);
 			path = "出入库记录";
 			sourceTree = "<group>";
@@ -746,8 +748,6 @@
 				E0336DD4244EC40000380BE9 /* CreatNewSpecsViewController.xib */,
 				E0C4F4B3244EE9EE00CC7E2F /* YuShouCell.swift */,
 				E0C4F4B4244EE9EE00CC7E2F /* YuShouCell.xib */,
-				E0C4F4B7244EEA7C00CC7E2F /* JiaTiJiaCell.swift */,
-				E0C4F4B8244EEA7C00CC7E2F /* JiaTiJiaCell.xib */,
 				E02DDD87244FE14D00ABB707 /* footer */,
 				E02DDD8E244FE52D00ABB707 /* 仅新增规格header */,
 				E02DDD86244FDF2300ABB707 /* 普通+预售header */,
@@ -1540,6 +1540,7 @@
 				E09B03C12445B96500211A51 /* FgPassViewController.xib in Resources */,
 				E0D197C7244845FD002B080C /* PersonCenterViewController.xib in Resources */,
 				E02DDD83244FD15B00ABB707 /* TitleAndSwitchHeaderView.xib in Resources */,
+				E00E48CB2457D96100F16545 /* ChuRuKuJiLuXQViewController.xib in Resources */,
 				E0A2E816245527CB00D6DB34 /* OrderSuccessViewController.xib in Resources */,
 				F950FDB12451811A00C40530 /* TitleAndSelCalendarView.xib in Resources */,
 				E0B946282456775000FBEC9A /* DaiKeXiaDanGouWuCell.xib in Resources */,
@@ -1548,7 +1549,6 @@
 				E01C26B72446AF3100ADCC70 /* DemoViewController.xib in Resources */,
 				F9DDBE972457D3EC00A32CB2 /* WebViewController.xib in Resources */,
 				E0F97B0424512299001BD600 /* GLAlertSelectView.xib in Resources */,
-				E0C4F4BA244EEA7C00CC7E2F /* JiaTiJiaCell.xib in Resources */,
 				F9023F6E2449A9B100DD5A63 /* TitleAndTFCell.xib in Resources */,
 				E042F7392452766100CDFA12 /* AdressSelectCell.xib in Resources */,
 				E00E48C32457C0D600F16545 /* XuanZeShangPinViewController.xib in Resources */,
@@ -1697,7 +1697,6 @@
 				E0DDCB13244ADF2C00DF54C7 /* ChangePriceNormalCell.swift in Sources */,
 				E09B03B62445B85A00211A51 /* LoginViewController.swift in Sources */,
 				E02FD9FA24557E8600E10E27 /* XinZengDiZhiViewController.swift in Sources */,
-				E0C4F4B9244EEA7C00CC7E2F /* JiaTiJiaCell.swift in Sources */,
 				F950FDDE24518B9500C40530 /* FSCalendarWeekdayView.m in Sources */,
 				E02DDD90244FE54C00ABB707 /* NewCreateHeader.swift in Sources */,
 				F950FDA92451613500C40530 /* GetMobileModel.swift in Sources */,
@@ -1808,6 +1807,7 @@
 				F95A9EED24558E3D00867849 /* ChangeGoodsPriceVC.swift in Sources */,
 				E00E48BE2457BAC700F16545 /* XuanZeShangPinCell.swift in Sources */,
 				E042F734245274F200CDFA12 /* YunDanLieBiaoCell.swift in Sources */,
+				E00E48CA2457D96100F16545 /* ChuRuKuJiLuXQViewController.swift in Sources */,
 				E01C26B62446AF3100ADCC70 /* DemoViewController.swift in Sources */,
 				F933F6C32452C68B00189561 /* FrameView.swift in Sources */,
 				F9DDBE922457BFEC00A32CB2 /* HUDEXT.swift in Sources */,

GeliBusinessPlatform/View/Cell/TitleAndBtnCell.swift

@@ -12,6 +12,7 @@ import UIKit
 }
 class TitleAndBtnCell: UITableViewCell {
 var delegate:TitleAndBtnCellDelegate?
+    @IBOutlet weak var arrowImg: UIImageView!
     @IBOutlet weak var contentLbl: UILabel!
     @IBOutlet weak var nameLbl: UILabel!
     override func awakeFromNib() {

GeliBusinessPlatform/View/Cell/TitleAndBtnCell.xib

@@ -77,6 +77,7 @@
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
             <connections>
+                <outlet property="arrowImg" destination="Gf0-pG-ZDj" id="uaE-Be-XYP"/>
                 <outlet property="contentLbl" destination="7nL-vu-Tdl" id="sEW-G5-GaR"/>
                 <outlet property="nameLbl" destination="EfU-Eu-amU" id="XOH-Zx-SHi"/>
             </connections>

GeliBusinessPlatform/View/Cell/TitleAndOnlyBtnCell.swift

@@ -11,6 +11,7 @@ import UIKit
 class TitleAndOnlyBtnCell: UITableViewCell {
 
    
+    @IBOutlet weak var button: UIButton!
     @IBAction func editAction(_ sender: Any) {
     }
     @IBOutlet weak var titleLbl: UILabel!

GeliBusinessPlatform/View/Cell/TitleAndOnlyBtnCell.xib

@@ -49,6 +49,7 @@
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
             <connections>
+                <outlet property="button" destination="7yt-Tb-VMT" id="GVo-N5-Uoh"/>
                 <outlet property="titleLbl" destination="kTB-YG-ytP" id="Apa-4p-tAX"/>
             </connections>
             <point key="canvasLocation" x="132" y="122"/>

GeliBusinessPlatform/View/Cell/WenDuCell.xib

@@ -106,10 +106,10 @@
     </objects>
     <resources>
         <namedColor name="标题字颜色">
-            <color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="灰色字体颜色">
-            <color red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.40000000596046448" green="0.40000000596046448" blue="0.40000000596046448" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="白色背景色">
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

GeliBusinessPlatform/View/CollectionCell/GoodsCollectionViewCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>

GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuCell.swift

@@ -10,6 +10,10 @@ import UIKit
 
 class DaiKeXiaDanGouWuCell: UITableViewCell {
 
+    @IBOutlet weak var btmLIneWidth: NSLayoutConstraint!
+    @IBOutlet weak var detailLbl2: UILabel!
+    @IBOutlet weak var delBtn: UIButton!
+    @IBOutlet weak var delImg: UIImageView!
     @IBOutlet weak var totalPriceLbl: UILabel!
     @IBOutlet weak var priceLbl: UILabel!
     @IBOutlet weak var detailLbl: UILabel!

GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuCell.xib

@@ -119,7 +119,11 @@
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
             <connections>
+                <outlet property="btmLIneWidth" destination="qMJ-nI-cSg" id="dsM-yO-8bv"/>
+                <outlet property="delBtn" destination="eKc-LO-OD0" id="sTb-4h-fLY"/>
+                <outlet property="delImg" destination="ftv-xQ-eXW" id="CON-aC-p5Y"/>
                 <outlet property="detailLbl" destination="LBB-wB-bMd" id="Z5L-Om-fG8"/>
+                <outlet property="detailLbl2" destination="X1B-vl-mvy" id="h0s-3d-jnl"/>
                 <outlet property="imgView" destination="AWX-Qu-0ML" id="BQH-fG-eL9"/>
                 <outlet property="priceLbl" destination="Rio-TZ-iyo" id="Ivg-2f-C6y"/>
                 <outlet property="titleLbl" destination="HYf-UQ-mHg" id="bMC-Ni-Yjv"/>

GeliBusinessPlatform/ViewController/出入库记录/ChuRuKuJiLuXQViewController.swift

+//
+//  ChuRuKuJiLuXQViewController.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2020/4/28.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import UIKit
+
+class ChuRuKuJiLuXQViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource{
+    
+    @IBAction func btmAction(_ sender: UIButton) {
+        print(sender.titleLabel?.text)
+    }
+    @IBOutlet weak var btmLeftLbl: UILabel!
+    let firstArr = ["0","申请人","申请时间","入库数量"]
+    let lastArr = ["生产日期","有效日期","保质期","检测报告","商品库存","仓库","库位","备注"]
+    @IBOutlet weak var listView: UITableView!
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        navbar.title = "商品-xxxx"
+        self.view.addSubview(navbar)
+        
+        listView.separatorStyle = .none
+        listView.snp.makeConstraints { (make) in
+            make.top.equalTo(NavCGRect.height)
+            make.left.right.equalTo(0)
+            make.bottom.equalTo(btmLeftLbl.snp_top)
+        }
+        listView.register(UINib(nibName: "TitleAndTFCell", bundle: nil), forCellReuseIdentifier: "TitleAndTFCell")
+        listView.register(UINib(nibName: "DaiKeXiaDanGouWuCell", bundle: nil), forCellReuseIdentifier: "DaiKeXiaDanGouWuCell")
+        listView.register(UINib(nibName: "TitleAndOnlyBtnCell", bundle: nil), forCellReuseIdentifier: "TitleAndOnlyBtnCell")
+        // Do any additional setup after loading the view.
+    }
+    //MARK: - cell delegate
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 2
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if section == 0 {
+            return 4
+        }
+        return 8
+    }
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if indexPath.section == 0 {
+            if indexPath.row == 0 {
+                let cell = tableView.dequeueReusableCell(withIdentifier: "DaiKeXiaDanGouWuCell") as! DaiKeXiaDanGouWuCell
+                cell.delImg.isHidden = true
+                cell.delBtn.isHidden = true
+                cell.detailLbl2.isHidden = true
+                cell.btmLIneWidth.constant = 0
+                return cell
+            }
+        }
+        let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
+        cell.textTF.isUserInteractionEnabled = false
+        cell.textTF.text = "2020.01.02  15:12:21"
+        if indexPath.section == 0 {
+            cell.nameLbl.text = firstArr[indexPath.row]
+        }else{
+            if indexPath.row == 3 {
+                let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndOnlyBtnCell")
+                    as! TitleAndOnlyBtnCell
+                cell.button.setTitle("查看", for: .normal)
+                cell.titleLbl.text = lastArr[indexPath.row]
+               
+                return cell
+            }
+            cell.nameLbl.text = lastArr[indexPath.row]
+        }
+        return cell
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if indexPath.section == 0 {
+            if indexPath.row == 0 {
+                return 120
+            }
+            return 49
+        }
+        return 49
+    }
+    //MARK: - footer
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 10))
+        return view
+    }
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 10
+    }
+}

GeliBusinessPlatform/ViewController/出入库记录/ChuRuKuJiLuXQViewController.xib

+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <capability name="Named colors" minToolsVersion="9.0"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ChuRuKuJiLuXQViewController" customModule="GeliBusinessPlatform" customModuleProvider="target">
+            <connections>
+                <outlet property="btmLeftLbl" destination="v4Q-94-0b6" id="lUq-Ap-JZs"/>
+                <outlet property="listView" destination="6n5-Zr-Oki" id="jts-69-guJ"/>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="6n5-Zr-Oki">
+                    <rect key="frame" x="0.0" y="44" width="414" height="769"/>
+                    <color key="backgroundColor" name="app底色"/>
+                    <connections>
+                        <outlet property="dataSource" destination="-1" id="bUI-N1-4qA"/>
+                        <outlet property="delegate" destination="-1" id="eWU-ea-os2"/>
+                    </connections>
+                </tableView>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SVb-J0-zzo">
+                    <rect key="frame" x="0.0" y="813" width="207" height="83"/>
+                    <color key="backgroundColor" name="白色背景色"/>
+                    <state key="normal" title="不通过">
+                        <color key="titleColor" name="白色背景色"/>
+                    </state>
+                    <connections>
+                        <action selector="btmAction:" destination="-1" eventType="touchUpInside" id="z1J-HQ-9DK"/>
+                    </connections>
+                </button>
+                <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oIu-tx-kXQ">
+                    <rect key="frame" x="207" y="813" width="207" height="83"/>
+                    <color key="backgroundColor" name="白色背景色"/>
+                    <state key="normal" title="通过">
+                        <color key="titleColor" name="白色背景色"/>
+                    </state>
+                    <connections>
+                        <action selector="btmAction:" destination="-1" eventType="touchUpInside" id="z6r-4U-BhW"/>
+                    </connections>
+                </button>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v4Q-94-0b6">
+                    <rect key="frame" x="0.0" y="813" width="207" height="49"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="49" id="sW7-wd-7VX"/>
+                    </constraints>
+                    <attributedString key="attributedText">
+                        <fragment content="不通过">
+                            <attributes>
+                                <color key="NSColor" name="蓝色字体颜色"/>
+                                <font key="NSFont" size="13" name="PingFangSC-Medium"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                    </attributedString>
+                    <nil key="highlightedColor"/>
+                </label>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8eJ-rV-uBw">
+                    <rect key="frame" x="207" y="813" width="207" height="49"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="49" id="chk-Ew-vxX"/>
+                    </constraints>
+                    <attributedString key="attributedText">
+                        <fragment content="通过">
+                            <attributes>
+                                <color key="NSColor" name="蓝色字体颜色"/>
+                                <font key="NSFont" size="13" name="PingFangSC-Medium"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                    </attributedString>
+                    <nil key="highlightedColor"/>
+                </label>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="oIu-tx-kXQ" firstAttribute="leading" secondItem="SVb-J0-zzo" secondAttribute="trailing" id="1KL-pW-Srs"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="v4Q-94-0b6" secondAttribute="bottom" id="76B-ou-1Fg"/>
+                <constraint firstItem="oIu-tx-kXQ" firstAttribute="top" secondItem="v4Q-94-0b6" secondAttribute="top" id="C5Y-ks-JoO"/>
+                <constraint firstItem="SVb-J0-zzo" firstAttribute="top" secondItem="8eJ-rV-uBw" secondAttribute="top" id="KBX-IY-1aq"/>
+                <constraint firstItem="6n5-Zr-Oki" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="LIn-J1-ItN"/>
+                <constraint firstItem="8eJ-rV-uBw" firstAttribute="leading" secondItem="v4Q-94-0b6" secondAttribute="trailing" id="LSe-SJ-oha"/>
+                <constraint firstItem="SVb-J0-zzo" firstAttribute="top" secondItem="6n5-Zr-Oki" secondAttribute="bottom" id="OKJ-kD-bNR"/>
+                <constraint firstItem="8eJ-rV-uBw" firstAttribute="width" secondItem="v4Q-94-0b6" secondAttribute="width" id="QR8-I5-3Ff"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="8eJ-rV-uBw" secondAttribute="trailing" id="RkL-ZV-o3M"/>
+                <constraint firstItem="6n5-Zr-Oki" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="XNi-wm-BoA"/>
+                <constraint firstAttribute="trailing" secondItem="oIu-tx-kXQ" secondAttribute="trailing" id="bOn-uN-ZfG"/>
+                <constraint firstItem="oIu-tx-kXQ" firstAttribute="width" secondItem="SVb-J0-zzo" secondAttribute="width" id="bTR-M2-77U"/>
+                <constraint firstItem="v4Q-94-0b6" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="hvF-wc-SKq"/>
+                <constraint firstItem="6n5-Zr-Oki" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="lML-H8-T3v"/>
+                <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="8eJ-rV-uBw" secondAttribute="bottom" id="pPI-7i-t6o"/>
+                <constraint firstAttribute="bottom" secondItem="oIu-tx-kXQ" secondAttribute="bottom" id="ttX-y9-jL3"/>
+                <constraint firstAttribute="bottom" secondItem="SVb-J0-zzo" secondAttribute="bottom" id="w17-1d-piy"/>
+                <constraint firstItem="SVb-J0-zzo" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="zjz-55-goI"/>
+            </constraints>
+            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
+            <point key="canvasLocation" x="131.8840579710145" y="121.875"/>
+        </view>
+    </objects>
+    <resources>
+        <namedColor name="app底色">
+            <color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+        <namedColor name="白色背景色">
+            <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+        <namedColor name="蓝色字体颜色">
+            <color red="0.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+    </resources>
+</document>

GeliBusinessPlatform/ViewController/库存商品/KuCunShangPinXQViewController.swift

@@ -22,6 +22,13 @@ class KuCunShangPinXQViewController: BaseViewController,UITableViewDelegate,UITa
         navbar.title = "商品-xxxx"
         self.view.addSubview(navbar)
         
+        let maskPath = UIBezierPath(roundedRect: topView.bounds,
+        byRoundingCorners:[.bottomLeft, .bottomRight], cornerRadii:CGSize(width:3, height:3))
+        let masklayer = CAShapeLayer()
+        masklayer.frame = topView.bounds
+        masklayer.path = maskPath.cgPath
+        topView.layer.mask = masklayer
+        
         topView.snp.makeConstraints { (make) in
             make.top.equalTo(NavCGRect.height)
             make.right.left.equalTo(0)

GeliBusinessPlatform/ViewController/新增规格/JiaTiJiaCell.swift

-//
-//  JiaTiJiaCell.swift
-//  GeliBusinessPlatform
-//
-//  Created by junye lu on 2020/4/21.
-//  Copyright © 2020 junye lu. All rights reserved.
-//
-
-import UIKit
-
-class JiaTiJiaCell: UITableViewCell {
-
-    override func awakeFromNib() {
-        super.awakeFromNib()
-        // Initialization code
-    }
-
-    override func setSelected(_ selected: Bool, animated: Bool) {
-        super.setSelected(selected, animated: animated)
-
-        // Configure the view for the selected state
-    }
-    
-}

GeliBusinessPlatform/ViewController/新增规格/JiaTiJiaCell.xib

-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13142" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12042"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="JiaTiJiaCell" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-            <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="320" height="43"/>
-                <autoresizingMask key="autoresizingMask"/>
-            </tableViewCellContentView>
-            <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
-        </tableViewCell>
-    </objects>
-</document>

GeliBusinessPlatform/ViewController/新增规格/PuTongJieTiCell.xib

@@ -127,7 +127,7 @@
     <resources>
         <image name="shanchu-1" width="20" height="20"/>
         <namedColor name="标题字颜色">
-            <color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>

GeliBusinessPlatform/ViewController/新增规格/YuShouCell.xib

@@ -155,7 +155,7 @@
             <color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="标题字颜色">
-            <color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="灰色分界线">
             <color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

GeliBusinessPlatform/ViewController/物流跟踪/WLGZCell.xib

@@ -85,7 +85,7 @@
                             <fragment content="代签收(雄狮前台)，感谢使用京东冷运；期待再次为您服务(住单总件数：1件)">
                                 <attributes>
                                     <color key="NSColor" name="灰色字体颜色"/>
-                                    <font key="NSFont" metaFont="label" size="11"/>
+                                    <font key="NSFont" metaFont="message" size="11"/>
                                     <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="3" tighteningFactorForTruncation="0.0"/>
                                 </attributes>
                             </fragment>
@@ -130,7 +130,7 @@
     </objects>
     <resources>
         <namedColor name="#999999">
-            <color red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.60000002384185791" green="0.60000002384185791" blue="0.60000002384185791" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="app底色">
             <color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>