新增库位

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -42,6 +42,8 @@
 		E09B03C82445BF9300211A51 /* SwiftNotice.swift in Sources */ = {isa = PBXBuildFile; fileRef = E09B03C72445BF9300211A51 /* SwiftNotice.swift */; };
 		E0A7548A244A8F0F00A84B67 /* CheckWareHourseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0A75488244A8F0F00A84B67 /* CheckWareHourseViewController.swift */; };
 		E0A7548B244A8F0F00A84B67 /* CheckWareHourseViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0A75489244A8F0F00A84B67 /* CheckWareHourseViewController.xib */; };
+		E0B6036E244D376900A56B38 /* KuWeiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B6036C244D376900A56B38 /* KuWeiCell.swift */; };
+		E0B6036F244D376900A56B38 /* KuWeiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0B6036D244D376900A56B38 /* KuWeiCell.xib */; };
 		E0D197BA2448431C002B080C /* BabyDefine.m in Sources */ = {isa = PBXBuildFile; fileRef = E0D197A92448431B002B080C /* BabyDefine.m */; };
 		E0D197BB2448431C002B080C /* BabyCallback.m in Sources */ = {isa = PBXBuildFile; fileRef = E0D197AB2448431B002B080C /* BabyCallback.m */; };
 		E0D197BC2448431C002B080C /* BabyPeripheralManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E0D197AD2448431B002B080C /* BabyPeripheralManager.m */; };
@@ -147,6 +149,8 @@
 		E09B03C72445BF9300211A51 /* SwiftNotice.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftNotice.swift; sourceTree = "<group>"; };
 		E0A75488244A8F0F00A84B67 /* CheckWareHourseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckWareHourseViewController.swift; sourceTree = "<group>"; };
 		E0A75489244A8F0F00A84B67 /* CheckWareHourseViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CheckWareHourseViewController.xib; sourceTree = "<group>"; };
+		E0B6036C244D376900A56B38 /* KuWeiCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KuWeiCell.swift; sourceTree = "<group>"; };
+		E0B6036D244D376900A56B38 /* KuWeiCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KuWeiCell.xib; sourceTree = "<group>"; };
 		E0D197A82448431B002B080C /* BabyCentralManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BabyCentralManager.h; sourceTree = "<group>"; };
 		E0D197A92448431B002B080C /* BabyDefine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BabyDefine.m; sourceTree = "<group>"; };
 		E0D197AA2448431B002B080C /* BabyOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BabyOptions.h; sourceTree = "<group>"; };
@@ -473,6 +477,8 @@
 				E0A75489244A8F0F00A84B67 /* CheckWareHourseViewController.xib */,
 				E08B0672244A98B2001D2E01 /* WareHouseSpCell.swift */,
 				E08B0673244A98B2001D2E01 /* WareHouseSpCell.xib */,
+				E0B6036C244D376900A56B38 /* KuWeiCell.swift */,
+				E0B6036D244D376900A56B38 /* KuWeiCell.xib */,
 			);
 			path = "新增、编辑（查看）仓库";
 			sourceTree = "<group>";
@@ -734,6 +740,7 @@
 				E09B03B72445B85A00211A51 /* LoginViewController.xib in Resources */,
 				E09B03C12445B96500211A51 /* FgPassViewController.xib in Resources */,
 				E0D197C7244845FD002B080C /* PersonCenterViewController.xib in Resources */,
+				E0B6036F244D376900A56B38 /* KuWeiCell.xib in Resources */,
 				E01C26B72446AF3100ADCC70 /* DemoViewController.xib in Resources */,
 				F9023F6E2449A9B100DD5A63 /* TitleAndTFCell.xib in Resources */,
 				F9023F6A2449A50900DD5A63 /* TitleContentCell.xib in Resources */,
@@ -823,6 +830,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				F9023F6D2449A9B100DD5A63 /* TitleAndTFCell.swift in Sources */,
+				E0B6036E244D376900A56B38 /* KuWeiCell.swift in Sources */,
 				E0D197BA2448431C002B080C /* BabyDefine.m in Sources */,
 				F9023F712449ACA800DD5A63 /* TitleAndSwitchCell.swift in Sources */,
 				E0DDCB13244ADF2C00DF54C7 /* ChangePriceNormalCell.swift in Sources */,

GeliBusinessPlatform/Assets.xcassets/仓库/bianji.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "bianji@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "bianji@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

GeliBusinessPlatform/Assets.xcassets/仓库/shanchu.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "shanchu@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "shanchu@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

GeliBusinessPlatform/BaseView/NavViewController.swift

@@ -16,9 +16,9 @@ class NavViewController: UINavigationController {
         UIBarButtonItem.appearance().setBackButtonTitlePositionAdjustment(UIOffset(horizontal: -2000, vertical: 0), for: UIBarMetrics.default)//去掉返回图片后面的文字
         
     }
-    override var preferredStatusBarStyle: UIStatusBarStyle{
-        return UIStatusBarStyle.lightContent
-    }
+//    override var preferredStatusBarStyle: UIStatusBarStyle{
+//        return UIStatusBarStyle.lightContent
+//    }
 //    override func viewDidLayoutSubviews() {
 //        super.viewDidLayoutSubviews()
 //      

GeliBusinessPlatform/ViewController/仓库管理/WarehoseMangementCell.swift

@@ -12,6 +12,8 @@ class WarehoseMangementCell: UITableViewCell {
 
     override func awakeFromNib() {
         super.awakeFromNib()
+        self.selectionStyle = .none
+        
         // Initialization code
     }
 

GeliBusinessPlatform/ViewController/新增、编辑（查看）仓库/CheckWareHourseViewController.swift

@@ -10,12 +10,13 @@ import UIKit
 import LGButton
 import IQKeyboardManagerSwift
 
-class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,WareHouseSpCellDelegate{
+class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,WareHouseSpCellDelegate,KuWeiCellCellDelegate{
     
     var titleStr:String?
     @IBOutlet weak var bottomBtn: LGButton!
     @IBOutlet weak var color: LGButton!
     @IBOutlet weak var listView: UITableView!
+    
     var btnArray:NSMutableArray = NSMutableArray()
     var statusStr:String = ""
     var warehourseType:Int = 99
@@ -23,6 +24,17 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
     
     let titleArr = ["仓库名称：","仓库类型：","包含库位：","仓库地址：","仓库容积：","仓库面积：","联系人：","联系人电话："]
     let placeHArr = ["请输入仓库名称","请选择仓库类型","请输入库位名","请输仓库地址","请输入仓库容积","请输入仓库面积","请输入联系人","请输入联系人电话"]
+    
+    
+    var listArray = ["a","b","c"]
+    var btmView:UIView?
+    var header:UIView?
+    var inputV:UIView?
+    var wareHourseTbv:UITableView?
+    var btmButton:LGButton?
+    
+    
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         navbar.title = titleStr
@@ -45,12 +57,29 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
         }
         // Do any additional setup after loading the view.
     }
+    
+    
+    
     //MARK: -方法
     
     @IBAction func submitAction(_ sender: LGButton) {
+        wareHourseTbv?.removeFromSuperview()
+        btmButton?.removeFromSuperview()
+        inputV?.removeFromSuperview()
+        btmView?.removeFromSuperview()
+        header?.removeFromSuperview()
+        warehourseTypeSelectView?.removeFromSuperview()
+        header = nil
+        wareHourseTbv = nil
+        btmButton = nil
+        inputV = nil
+        btmView = nil
+        
+        if sender.tag == 999 {//请选择或填写包含库位的确定按钮
+            print("tag 999")
+        }else{
             if sender.titleString == "确定"{
                 print("确定 -- 仓库类型：\(warehourseType) (0:冷冻、1:冷藏、2:常温)")
-            warehourseTypeSelectView?.removeFromSuperview()
             }else{
                 if sender.titleString == "保存" {
                     sender.titleString = "编辑"
@@ -63,18 +92,33 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
                 listView.reloadData()
             }
         }
+    }
     //MARK: - delegate
     func rightBtnClick() {
         print("删除")
     }
     
+    func deleClickAction(sender: Int) {//点击库位删除
+        print("删除第\(sender)行cell")
+    }
+    func editClickAction(sender: Int) {//点击库位编辑
+        print("编辑第\(sender)行cell")
+    }
     @objc func removeActin(sender:UIButton){
         sender.superview?.removeFromSuperview()
+        wareHourseTbv?.removeFromSuperview()
+        btmButton?.removeFromSuperview()
+        inputV?.removeFromSuperview()
+        btmView?.removeFromSuperview()
+        header?.removeFromSuperview()
+        header = nil
+        wareHourseTbv = nil
+        btmButton = nil
+        inputV = nil
+        btmView = nil
     }
     
     func clickAction(sender: UIButton) {
-        print(sender.tag)
-        
         IQKeyboardManager.shared.resignFirstResponder()
         if sender.tag == 1 {//新增仓库类型
             let bgView = UIView(frame:self.view.bounds)
@@ -132,16 +176,173 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
             }
             
             UIView.animate(withDuration: 0.1) {
-                bottomV.frame = CGRect(x: 0, y: UIScreen.main.bounds.size.height-251*glscale, width: UIScreen.main.bounds.size.width, height: 251*glscale)
+                bottomV.frame = CGRect(x: 0, y: fullScreenHeight-251*glscale, width: fullScreenWidth, height: 251*glscale)
+            }
+            
+            warehourseTypeSelectView = bgView
+            
         }
+        if sender.tag == 2 {//MARK: -包含库位
+            let bgView = UIView(frame:self.view.bounds)
+            bgView.backgroundColor = UIColor.clear
+            self.view.addSubview(bgView)
+            
+            let colorV = UIButton(frame: bgView.bounds)
+            colorV.addTarget(self, action: #selector(removeActin(sender:)), for: .touchUpInside)
+            colorV.backgroundColor = UIColor(named: "标题字颜色")
+            colorV.alpha = 0.5
+            bgView.addSubview(colorV)
+            
+            let tbvHeight = CGFloat(listArray.count)*49.0
+            var bvHeight = 197.5 + tbvHeight
+            if bvHeight > fullScreenHeight*0.75 {
+                bvHeight = fullScreenHeight*0.75
+            }
+            let bottomView = UIView(frame: CGRect(x: 0, y: fullScreenHeight, width: fullScreenWidth, height: bvHeight))
+            bottomView.backgroundColor = UIColor.clear
+            bgView.addSubview(bottomView)
+            btmView = bottomView
             
+            let head = self.getHeaderView()
+            bottomView.addSubview(head)
+            header = head
+            
+            let input = self.getInputView(y: head.frame.maxY)
+            bottomView.addSubview(input)
+            inputV = input
+            
+            if wareHourseTbv == nil {
+                let tbv = UITableView(frame: CGRect(x: 0, y: input.frame.maxY, width: fullScreenWidth, height:bvHeight-197.5))
+                tbv.delegate = self
+                tbv.dataSource = self
+                bottomView.addSubview(tbv)
+                tbv.backgroundColor = UIColor.white
+                tbv.separatorStyle = .none
+                wareHourseTbv = tbv
+                wareHourseTbv?.register(UINib(nibName: "KuWeiCell", bundle: nil), forCellReuseIdentifier: "KuWei")
+            }
+            let submitBtn = LGButton()
+            submitBtn.frame = CGRect(x: 0, y: (wareHourseTbv?.frame.maxY)!, width: fullScreenWidth, height: 49)
+            submitBtn.titleString = "确定"
+            submitBtn.titleFontSize = 17
+            submitBtn.gradientStartColor = UIColor(named: "按钮渐变色上")
+            submitBtn.gradientEndColor = UIColor(named: "按钮渐变色下,字体颜色")
+            submitBtn.gradientHorizontal = true
+            submitBtn.tag = 999
+            submitBtn.addTarget(self, action: #selector(submitAction(_:)), for: .touchUpInside)
+            bottomView.addSubview(submitBtn)
+            btmButton = submitBtn
             warehourseTypeSelectView = bgView
+            UIView.animate(withDuration: 0.1){
+                bottomView.frame = CGRect(x: 0, y: fullScreenHeight-bvHeight, width: fullScreenWidth, height:bvHeight)
                 
             }
-        if sender.tag == 2 {//包含库位
           
         }
     }
+    func getInputView(y:CGFloat)->UIView{
+        let view = UIView(frame: CGRect(x: 0, y: y, width: fullScreenWidth, height: 95.5))
+        view.backgroundColor = UIColor.white
+        let ti3 = UILabel()
+        ti3.text = "操作"
+        ti3.textColor = UIColor(named: "灰色字体颜色")
+        ti3.font = UIFont.systemFont(ofSize: 13)
+        view.addSubview(ti3)
+        ti3.sizeToFit()
+        ti3.snp.makeConstraints { (make) in
+            make.top.equalTo(15)
+            make.right.equalTo(-33)
+            make.width.equalTo(28)
+            make.height.equalTo(18.5)
+        }
+        
+        let ti2 = UILabel()
+        ti2.text = "库存数"
+        ti2.textColor = UIColor(named: "灰色字体颜色")
+        ti2.font = UIFont.systemFont(ofSize: 13)
+        view.addSubview(ti2)
+        ti2.sizeToFit()
+        ti2.snp.makeConstraints { (make) in
+            make.top.equalTo(15)
+            make.right.equalTo(ti3.snp_left).offset(-80)
+            make.width.equalTo(44)
+            make.height.equalTo(18.5)
+        }
+        
+        let ti1 = UILabel()
+        ti1.text = "库位名称"
+        ti1.textColor = UIColor(named: "灰色字体颜色")
+        ti1.font = UIFont.systemFont(ofSize: 13)
+        view.addSubview(ti1)
+        ti1.sizeToFit()
+        ti1.snp.makeConstraints { (make) in
+            make.top.equalTo(15)
+            make.left.equalTo(20)
+            make.width.equalTo(60)
+            make.height.equalTo(18.5)
+        }
+        
+        let inputTF = UITextField()
+        inputTF.addTarget(self, action: #selector(textChange(TF:)), for: .allEditingEvents)
+        inputTF.placeholder = "请输入库位名称"
+        inputTF.textAlignment = .center
+        inputTF.font = UIFont.systemFont(ofSize: 13)
+        inputTF.textColor = UIColor(named: "标题字颜色")
+        inputTF.borderStyle = .none
+        inputTF.layer.cornerRadius = 3
+        inputTF.layer.masksToBounds = true
+        inputTF.layer.borderColor = UIColor(named: "灰色字体颜色")?.cgColor
+        inputTF.layer.borderWidth = 1
+        view.addSubview(inputTF)
+        inputTF.snp.makeConstraints { (make) in
+            make.top.equalTo(ti1.snp_bottom).offset(15)
+            make.left.equalTo(15)
+            make.width.equalTo(120)
+            make.height.equalTo(32)
+        }
+        
+        let l = UILabel()
+        l.text = "-"
+        l.font = UIFont.systemFont(ofSize: 13)
+        l.textColor = UIColor(named: "灰色字体颜色")
+        view.addSubview(l)
+        l.snp.makeConstraints { (make) in
+            make.centerX.equalTo(ti2.snp_centerX)
+            make.centerY.equalTo(inputTF.snp_centerY)
+            make.width.height.equalTo(8)
+        }
+        
+        let btn = UIButton()
+        btn.setTitle("新增", for: .normal)
+        btn.setTitleColor(UIColor(named: "按钮渐变色下,字体颜色"), for: .normal)
+        btn.addTarget(self, action: #selector(addKuWei), for: .touchUpInside)
+        btn.titleLabel?.font = UIFont.systemFont(ofSize: 13)
+        view.addSubview(btn)
+        btn.snp.makeConstraints { (make) in
+            make.centerX.equalTo(ti3.snp_centerX)
+            make.centerY.equalTo(inputTF.snp_centerY)
+            make.width.height.equalTo(50)
+        }
+        return view
+    }
+    
+    @objc func addKuWei(){
+        listArray.append("\(listArray.count)")
+        
+        
+        let tbvHeight = CGFloat(listArray.count)*49.0
+        var bvHeight = 197.5 + tbvHeight
+        if bvHeight > fullScreenHeight*0.75 {
+            bvHeight = fullScreenHeight*0.75
+        }
+        btmView?.frame = CGRect(x: 0, y: fullScreenHeight-bvHeight, width: fullScreenWidth, height: bvHeight)
+        header?.frame = CGRect(x: 0, y: 0, width: fullScreenWidth, height: 53)
+        inputV?.frame = CGRect(x: 0, y: (header?.frame.maxY)!, width: fullScreenWidth, height: 95.5)
+        wareHourseTbv?.frame =  CGRect(x: 0, y: (inputV?.frame.maxY)!, width: fullScreenWidth, height:bvHeight-197.5)
+        btmButton?.frame = CGRect(x: 0, y: (wareHourseTbv?.frame.maxY)!, width: fullScreenWidth, height: 49)
+        wareHourseTbv?.reloadData()
+    }
+    
     func setBtn(tagView:UIView,title:String,tag:Int)->UIView{
         let view = UIView(frame: CGRect(x: 0, y: tagView.frame.maxY, width: fullScreenWidth, height: 49*glscale))
         
@@ -181,42 +382,51 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
     }
     // MARK: - cell delegate
     func numberOfSections(in tableView: UITableView) -> Int {
+        if tableView == listView {
             return 2
         }
+        return 1
+    }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if tableView == listView {
             if section == 0 {
                 return titleArr.count
             }
             return 1
+        }else{
+            return listArray.count
+        }
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return 49
     }
+    @objc func textChange(TF:UITextField){
+        print("\(TF.text)")
+    }
+    
+    //footer
     func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        if tableView == wareHourseTbv {
+            let view = UIView()
+            return view
+        }
         let view = UIView(frame: CGRect(x: 0, y: 0, width: self.view.bounds.size.width, height: 10))
         view.backgroundColor = UIColor(named: "app背景色")
         return view
     }
     func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        if tableView == wareHourseTbv{
+            return 0.01
+        }
         return 10
     }
-    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: "WareHouse") as! WareHouseSpCell
-        cell.clickBtn.isHidden = true
-        cell.detailTF.isUserInteractionEnabled = false
-        cell.whSwitch.isUserInteractionEnabled = false
-        if indexPath.section == 0 {
-            cell.whSwitch.isHidden = true
-            cell.delegate = self
-            cell.titleLbl.text = titleArr[indexPath.row]
-            cell.detailTF.placeholder = placeHArr[indexPath.row]
-            cell.btnImg.isHidden = true
+    
+    func setCellLayout(cell:WareHouseSpCell,indexPath:IndexPath){
         cell.detailTF.snp.updateConstraints{ (make) in
             make.left.equalTo(cell.titleLbl.snp_right)
             make.top.bottom.equalTo(0)
             make.right.equalTo(-15)
         }
-            
         if titleStr == "新增仓库" || statusStr == "保存"{
             cell.detailTF.isUserInteractionEnabled = true
             cell.whSwitch.isUserInteractionEnabled = true
@@ -247,14 +457,63 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
                 }
             }
         }
-        }else{
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if tableView == listView {
+            let cell = tableView.dequeueReusableCell(withIdentifier: "WareHouse") as! WareHouseSpCell
+            cell.clickBtn.isHidden = true
+            cell.detailTF.isUserInteractionEnabled = false
+            cell.whSwitch.isUserInteractionEnabled = false
+            if indexPath.section == 0 {//仓库名称等
+                cell.whSwitch.isHidden = true
+                cell.delegate = self
+                cell.titleLbl.text = titleArr[indexPath.row]
+                cell.detailTF.placeholder = placeHArr[indexPath.row]
+                cell.btnImg.isHidden = true
+                
+                //cell ui 布局
+                self.setCellLayout(cell: cell, indexPath: indexPath)
+            }else{//默认仓库
                 cell.detailTF.isHidden = true
                 cell.clickBtn.isHidden = true
+                
             }
+            return cell
+        }else{
             
+            let cell = tableView.dequeueReusableCell(withIdentifier: "KuWei") as! KuWeiCell
+            cell.nameLbl.text = listArray[indexPath.row]
+            cell.delegate = self
+            cell.tag = indexPath.row
+            return cell
+        }
+    }
     
+    func getHeaderView()->UIView{
+        let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 53))
+        view.backgroundColor = UIColor.white
+        let bezierPath = UIBezierPath(roundedRect: view.bounds, byRoundingCorners: [.topLeft,.topRight], cornerRadii: CGSize(width: 5, height: 5))
+        let shapeLayer = CAShapeLayer()
+        shapeLayer.frame = view.bounds
+        shapeLayer.path = bezierPath.cgPath
+        view.layer.mask = shapeLayer
         
+        let lbl = UILabel(frame: view.bounds)
+        lbl.text = "请选择或填写包含库位"
+        lbl.textColor = UIColor(named: "标题字颜色")
+        lbl.font = UIFont.systemFont(ofSize: 17)
+        lbl.textAlignment = .center
+        view.addSubview(lbl)
         
-        return cell
+        let line = UIView()
+        line.backgroundColor = UIColor(named: "灰色分界线")
+        view.addSubview(line)
+        line.snp.makeConstraints { (make) in
+            make.bottom.right.equalTo(0)
+            make.left.equalTo(15)
+            make.height.equalTo(1)
+        }
+        return view
     }
 }

GeliBusinessPlatform/ViewController/新增、编辑（查看）仓库/KuWeiCell.swift

+//
+//  KuWeiCell.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2020/4/20.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import UIKit
+@objc protocol KuWeiCellCellDelegate {
+    @objc optional func editClickAction(sender:Int)
+    @objc optional func deleClickAction(sender:Int)
+}
+class KuWeiCell: UITableViewCell {
+
+    var delegate:KuWeiCellCellDelegate?
+    @IBOutlet weak var nameLbl: UILabel!
+    @IBOutlet weak var countLbl: UILabel!
+    @IBAction func editClick(_ sender: Int) {
+        delegate?.editClickAction?(sender: Int(self.tag))
+    }
+    
+    @IBAction func deleClick(_ sender: Int) {
+        delegate?.deleClickAction?(sender:  Int(self.tag))
+    }
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        self.selectionStyle = .none
+        
+        // Initialization code
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+    
+}

GeliBusinessPlatform/ViewController/新增、编辑（查看）仓库/KuWeiCell.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"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="KuWeiCell" customModule="GeliBusinessPlatform" 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="44"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="36000" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nNe-LK-eKR">
+                        <rect key="frame" x="125" y="0.0" width="56" height="44"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="56" id="Jx9-39-YYw"/>
+                        </constraints>
+                        <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="7库4楼2号" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dMX-NM-Bar">
+                        <rect key="frame" x="20" y="0.0" width="95" height="44"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                        <color key="textColor" name="标题字颜色"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="shanchu" translatesAutoresizingMaskIntoConstraints="NO" id="GVg-rI-poz">
+                        <rect key="frame" x="265.5" y="13.5" width="17" height="17.5"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="17.5" id="8NX-fZ-RrF"/>
+                            <constraint firstAttribute="width" constant="17" id="jx0-B2-ldN"/>
+                        </constraints>
+                    </imageView>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bianji" translatesAutoresizingMaskIntoConstraints="NO" id="0ef-kc-EYn">
+                        <rect key="frame" x="225" y="13.5" width="17.5" height="17"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="17" id="NDE-nx-rTx"/>
+                            <constraint firstAttribute="width" constant="17.5" id="xE7-DS-aye"/>
+                        </constraints>
+                    </imageView>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rU2-NE-ybF">
+                        <rect key="frame" x="15" y="43" width="305" height="1"/>
+                        <color key="backgroundColor" name="灰色分界线"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="1" id="Ofh-3Z-BTt"/>
+                        </constraints>
+                    </view>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HOv-8K-UgR">
+                        <rect key="frame" x="259" y="0.0" width="30" height="43"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="30" id="adQ-ew-H9P"/>
+                        </constraints>
+                        <connections>
+                            <action selector="deleClick:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="vq3-u0-djb"/>
+                        </connections>
+                    </button>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sXc-jH-lU6">
+                        <rect key="frame" x="219" y="0.0" width="30" height="43"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="30" id="qzQ-0r-2aO"/>
+                        </constraints>
+                        <connections>
+                            <action selector="editClick:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="c1C-hM-kig"/>
+                        </connections>
+                    </button>
+                </subviews>
+                <constraints>
+                    <constraint firstAttribute="bottom" secondItem="rU2-NE-ybF" secondAttribute="bottom" id="8dH-3M-2TB"/>
+                    <constraint firstItem="nNe-LK-eKR" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="E12-W6-amI"/>
+                    <constraint firstItem="HOv-8K-UgR" firstAttribute="centerX" secondItem="GVg-rI-poz" secondAttribute="centerX" id="FUI-Rz-1nR"/>
+                    <constraint firstItem="dMX-NM-Bar" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="HJz-YU-6kH"/>
+                    <constraint firstItem="HOv-8K-UgR" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="Nmw-gT-RVZ"/>
+                    <constraint firstItem="sXc-jH-lU6" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="Qqs-p9-vbh"/>
+                    <constraint firstItem="GVg-rI-poz" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="Qyd-g3-MEK"/>
+                    <constraint firstItem="nNe-LK-eKR" firstAttribute="leading" secondItem="dMX-NM-Bar" secondAttribute="trailing" constant="10" id="Rgg-mN-E4u"/>
+                    <constraint firstItem="rU2-NE-ybF" firstAttribute="top" secondItem="sXc-jH-lU6" secondAttribute="bottom" id="TAW-eu-eZ6"/>
+                    <constraint firstAttribute="bottom" secondItem="nNe-LK-eKR" secondAttribute="bottom" id="VpX-UQ-pX4"/>
+                    <constraint firstItem="dMX-NM-Bar" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="20" id="WcJ-f8-2w9"/>
+                    <constraint firstAttribute="bottom" secondItem="dMX-NM-Bar" secondAttribute="bottom" id="ZTa-MJ-3OP"/>
+                    <constraint firstItem="sXc-jH-lU6" firstAttribute="centerX" secondItem="0ef-kc-EYn" secondAttribute="centerX" id="eId-dd-z5X"/>
+                    <constraint firstItem="0ef-kc-EYn" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="i8O-Rr-rP6"/>
+                    <constraint firstItem="0ef-kc-EYn" firstAttribute="leading" secondItem="nNe-LK-eKR" secondAttribute="trailing" constant="44" id="mmJ-du-Ytb"/>
+                    <constraint firstAttribute="trailing" secondItem="GVg-rI-poz" secondAttribute="trailing" constant="37.5" id="nwM-pw-OdK"/>
+                    <constraint firstItem="rU2-NE-ybF" firstAttribute="top" secondItem="HOv-8K-UgR" secondAttribute="bottom" id="prA-cF-kvC"/>
+                    <constraint firstItem="GVg-rI-poz" firstAttribute="leading" secondItem="0ef-kc-EYn" secondAttribute="trailing" constant="23" id="r91-aY-NAQ"/>
+                    <constraint firstAttribute="trailing" secondItem="rU2-NE-ybF" secondAttribute="trailing" id="tC8-DB-Znm"/>
+                    <constraint firstItem="rU2-NE-ybF" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="vyy-4j-gnH"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+            <connections>
+                <outlet property="countLbl" destination="nNe-LK-eKR" id="5zc-sz-Z3z"/>
+                <outlet property="nameLbl" destination="dMX-NM-Bar" id="D10-2X-OyL"/>
+            </connections>
+            <point key="canvasLocation" x="131.8840579710145" y="122.54464285714285"/>
+        </tableViewCell>
+    </objects>
+    <resources>
+        <image name="bianji" width="17" height="16.5"/>
+        <image name="shanchu" width="17" height="17.5"/>
+        <namedColor name="标题字颜色">
+            <color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" 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"/>
+        </namedColor>
+    </resources>
+</document>

GeliBusinessPlatform/ViewController/新增、编辑（查看）仓库/WareHouseSpCell.xib

@@ -18,9 +18,9 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="仓库类型：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Nns-NP-fAD">
-                        <rect key="frame" x="15" y="0.0" width="67" height="44"/>
+                        <rect key="frame" x="15" y="0.0" width="80" height="44"/>
                         <constraints>
-                            <constraint firstAttribute="width" constant="67" id="bdp-Qd-CdZ"/>
+                            <constraint firstAttribute="width" constant="80" id="bdp-Qd-CdZ"/>
                         </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                         <color key="textColor" name="标题字颜色"/>
@@ -41,7 +41,7 @@
                         </constraints>
                     </view>
                     <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入库位名" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="zsG-fB-Zeb">
-                        <rect key="frame" x="82" y="0.0" width="193" height="43"/>
+                        <rect key="frame" x="95" y="0.0" width="180" height="43"/>
                         <color key="textColor" name="标题字颜色"/>
                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                         <textInputTraits key="textInputTraits"/>

GeliBusinessPlatform/ViewController/消息中心/MsgCenterCell.xib

@@ -100,16 +100,16 @@
     </objects>
     <resources>
         <namedColor name="app底色">
-            <color red="0.94900000095367432" green="0.94900000095367432" blue="0.94900000095367432" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="标题字颜色">
-            <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="标题字颜色">
             <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="灰色字体颜色">
-            <color red="0.60000002384185791" green="0.60000002384185791" blue="0.60000002384185791" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>

GeliBusinessPlatform/ViewController/登录/LoginViewController.swift

@@ -81,7 +81,7 @@ class LoginViewController: BaseViewController {
     
     @IBAction func loginAction(_ sender: Any) {
         print("loginAction")
-        let vc = XiuGaiYuShouJiaViewController()
+        let vc = CheckWareHourseViewController()
         self.navigationController?.pushViewController(vc, animated: true)
 //        let alertView = GeliAlertView(frame: self.view.window!.bounds)
 //        alertView.tishiLbl.text = "202121";

GeliBusinessPlatform/ViewController/订单管理/关联客户cell/GuanLianKeHuCell.xib

@@ -163,7 +163,7 @@
         <image name="guanlian" width="15.5" height="12.5"/>
         <image name="yuxuan" width="19" height="19"/>
         <namedColor name="企业、预售字体">
-            <color red="1" green="0.69019607843137254" blue="0.47058823529411764" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="1" green="0.68999999761581421" blue="0.47099998593330383" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="按钮渐变色下,字体颜色">
             <color red="0.27450980392156865" green="0.5607843137254902" blue="0.88627450980392153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

GeliBusinessPlatform/ViewController/账号信息/AccountViewController.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="retina6_1" 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"/>
@@ -293,10 +293,10 @@
             <color red="0.27450980392156865" green="0.5607843137254902" blue="0.88627450980392153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="标题字颜色">
-            <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="灰色分界线">
-            <color red="0.92900002002716064" green="0.92900002002716064" blue="0.92900002002716064" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="白色背景色">
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>