采购设置

GeliBusinessPlatform/Other/JXPhotoBrowser/JXPhotoBrowser.swift

@@ -137,7 +137,7 @@ open class JXPhotoBrowser: UIViewController, UIViewControllerTransitioningDelega
         pageIndicator?.reloadData(numberOfItems: numberOfItems(), pageIndex: pageIndex)
     }
     
-    let lbl = UILabel(frame: CGRect(x: 20, y: 0, width: 100, height: 100))
+    let lbl = UILabel()
     open override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -158,9 +158,22 @@ open class JXPhotoBrowser: UIViewController, UIViewControllerTransitioningDelega
         }
         
         
+        
         lbl.text = "返回"
         lbl.textColor = UIColor.white
         view.addSubview(lbl)
+        lbl.snp.makeConstraints { (make) in
+            make.top.equalTo(NavHeight)
+            make.left.equalTo(20)
+            make.width.equalTo(60)
+            make.height.equalTo(30)
+        }
+        lbl.textAlignment = .center
+        lbl.font = UIFont(name: "PingFangSC-Medium", size: 15)
+        lbl.backgroundColor = UIColor(named: "蓝色字体颜色")
+        lbl.layer.cornerRadius = 15
+        lbl.layer.masksToBounds = true
+        
         
         view.setNeedsLayout()
         view.layoutIfNeeded()
@@ -189,6 +202,7 @@ open class JXPhotoBrowser: UIViewController, UIViewControllerTransitioningDelega
     
     open override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
+        lbl.removeFromSuperview()
         hideNavigationBar(false)
     }
     
@@ -285,7 +299,7 @@ open class JXPhotoBrowser: UIViewController, UIViewControllerTransitioningDelega
     
     deinit {
         JXPhotoBrowserLog.low("deinit - \(self.classForCoder)")
-        lbl.removeFromSuperview()
+        
         navigationController?.delegate = previousNavigationControllerDelegate
     }
     

GeliBusinessPlatform/View/AlertView/GLAlertSelectView.swift

@@ -30,6 +30,7 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
     func sureGeliAlertViewAction(sender: UIButton) {
         delegate?.GLAlertSelectViewFinish?(sender:sender,title: ysyfTitle,cellTag: cellTag!)
     }
+    var isHideCaiGou = false
     var isBz = false
     var is_center_select = false
     var isNonSelect = false {
@@ -89,7 +90,9 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
     var dataArr = Array<String>(){
         didSet{
             var tbvH = CGFloat(dataArr.count * 49)
-        
+            if isHideCaiGou {
+                tbvH = CGFloat((dataArr.count-1) * 49)
+            }
             if tbvH > fullScreenHeight*0.6 {
                 tbvH = fullScreenHeight*0.6
                 selectTbv.isScrollEnabled = true
@@ -190,12 +193,18 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
                 return 0.001
             }
         }
+        if isHideCaiGou {
+            if indexPath.row == 0 {
+                return 0.001
+            }
+        }
         return 49
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         if (titleLbl.text?.contains("库位"))! && isOnlySelectKuWei == false{
             return kuWeiArr.count
         }
+     
         return dataArr.count
     }
     

GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewRKVc.swift

@@ -416,11 +416,10 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
             if isCaiGou  == false{
                 if glSelectView == nil {
                     let view = GLAlertSelectView(frame: self.view.bounds)
+                    view.isHideCaiGou = true
                     view.tag = indexPath.row
-                    if typeSelect != nil {
                     view.selectNum = typeSelect
                     view.tempNum = view.selectNum
-                    }
                     view.isOnlySelectKuWei = true
                     view.delegate = self
                     view.titleLbl.text = "请选择入库类型"

GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift

@@ -701,7 +701,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
         let rowModel = self.dataArr[indexPath.row]
         let vc = OrderDViewController()
         vc.delegate = self
-        vc.orderId = rowModel.order_id!
+        vc.orderId = rowModel.order_id!
         vc.lmIdx = orderStatus
         self.navigationController?.pushViewController(vc, animated: true)
     }

GeliBusinessPlatform/ViewController/订单管理/预售价格修改/XiuGaiYuShouJiaViewController.swift

@@ -61,7 +61,6 @@ class XiuGaiYuShouJiaViewController: BaseViewController, UITextFieldDelegate {
         }else{
             //MARK:--代客下单流程
             if inputData.count > 0 {
-                
                 let item = inputData[0]
                 titleLbl.text  = item.goods_name
                 detailLbl.text = item.spec_str
@@ -70,7 +69,6 @@ class XiuGaiYuShouJiaViewController: BaseViewController, UITextFieldDelegate {
                 weiKuanTF.text = wkTFstr
                 countLbl.text = "￥" + item.target_Price! + "x\(item.target_Count!)"
             }
-            
         }
         //MARK:--输入框代理
         dingJinTF.delegate = self