供应商分销商品管理（缺已铺/可铺数量）

GeliBusinessPlatform/Model/get_dbt_rule_model/getDbtRuleModel.swift

@@ -148,11 +148,16 @@ class supSpreadGoodsDataModel: Mappable {
     var goods_number:Int?//库存
     var shop_price : String?//价格
     var dbt_price :String?//分销价
-    
+    var commission_type:Int?//佣金类型 1百分比  2固定值
+    var commission_per:Int?//佣金百分比(0为初始值)
+    var good_id:Int?//商品id
     required init?( map: Map) {
         
     }
     func mapping(map: Map) {
+        good_id <- map["good_id"]
+        commission_type <- map["commission_type"]
+        commission_per <- map["commission_per"]
         goods_thumb <- map["goods_thumb"]
         goods_name <- map["goods_name"]
         dbt_sale <- map["dbt_sale"]

GeliBusinessPlatform/View/Cell/GYS_FX_ProductCellTableViewCell.xib

@@ -157,7 +157,7 @@
                             </userDefinedRuntimeAttribute>
                         </userDefinedRuntimeAttributes>
                     </view>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="daixuan" translatesAutoresizingMaskIntoConstraints="NO" id="ewJ-WY-yIu">
+                    <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="daixuan" translatesAutoresizingMaskIntoConstraints="NO" id="ewJ-WY-yIu">
                         <rect key="frame" x="15" y="55" width="20" height="20"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="20" id="6Qe-hc-uBa"/>

GeliBusinessPlatform/ViewController/供应商分销商品管理/GYS_FX_Product_VC.swift

@@ -9,12 +9,18 @@
 import UIKit
 
 class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataSource{
-    
     @IBOutlet weak var center_select_btn: UIButton!
     @IBOutlet weak var count_lbl: UILabel!//已铺货/可铺货 数量
     @IBOutlet weak var bottom_title_lbl: UILabel!
     @IBOutlet weak var rightBtn: UIButton!
     @IBOutlet weak var leftBtn: UIButton!
+    
+    var page : Int = 0
+    var isUpData = false
+    let UserToken = UserDefaults.standard.value(forKey: "user_token")
+    var shop_id:Int = 0
+    
+    var datas:Array<supSpreadGoodsDataModel> = []
     //MARK: - 顶栏按钮点击事件
     @IBAction func topBtnClick(_ sender: UIButton) {
         if sender.tag == 0 {
@@ -35,7 +41,10 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
             make.width.equalTo(fullScreenWidth * 0.5)
             make.height.equalTo(3)
         }
+        home_list_tbv.mj_header?.beginRefreshing()
     }
+    
+    
     @IBOutlet weak var top_Bottom_Line: UIView!
     @IBOutlet weak var center_Name_Lbl: UILabel!
     @IBOutlet weak var arrow_Img: UIImageView!
@@ -63,10 +72,16 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
     
     @IBOutlet weak var top_view: UIView!
     
-    var centersArr = ["1","2","3","4","5","6","7","8","9"]
+    var centersArr:Array<getDbtShopDataModel> = []
     
     func rightBtnClick() {
         let vc = GYS_FX_SearchViewController()
+        vc.shop_id = shop_id
+        vc.UserToken = UserToken as! String
+        if bottom_title_lbl.text != "已铺货"{
+            vc.look_type = 2
+        }
+        
         self.navigationController?.pushViewController(vc, animated: true)
     }
     override func viewDidLoad() {
@@ -87,17 +102,109 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
         select_list_tbv.separatorStyle = .none
         select_list_tbv.showsVerticalScrollIndicator = false
         select_list_tbv.dataSource = self
+    }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        HUD.flash(.progress)
+        if centersArr.count == 0 {
+            getDbtShop(["user_token":UserToken as Any]) { (data) in
+                let model = data as! getDbtShopModel
+                self.centersArr.removeAll()
+                model.data?.forEach({ (item) in
+                    self.centersArr.append(item)
+                })
                 
                 //MARK: -  限制中心选择高度
-        var select_list_tbv_height = centersArr.count * 49
-        if centersArr.count > 350 {
+                var select_list_tbv_height = self.centersArr.count * 49
+                if select_list_tbv_height > 350 {
                     select_list_tbv_height = 350
                 }
-        select_list_tbv.snp.updateConstraints{ (make) in
-            make.top.equalTo(center_select_btn.snp_bottom)
+                self.select_list_tbv.snp.updateConstraints{ (make) in
+                    make.top.equalTo(self.center_select_btn.snp_bottom)
                     make.left.right.equalTo(0)
                     make.height.equalTo(select_list_tbv_height)
                 }
+                self.center_Name_Lbl.text = self.centersArr.first?.shop_name
+                self.shop_id = (self.centersArr.first?.shop_id)!
+                self.select_list_tbv.reloadData()
+                if model.code == 1 {
+                    HUD.hide()
+                }
+                
+                self.shop_id = (model.data?.first?.shop_id)!
+                //下拉刷新相关设置
+                self.headerMJ.setRefreshingTarget(self, refreshingAction: #selector(self.loadData))
+                self.home_list_tbv.mj_header = self.headerMJ
+                //上拉加载相关设置
+                
+                self.home_list_tbv.mj_header?.beginRefreshing()
+                self.footerMJ.setRefreshingTarget(self, refreshingAction: #selector(self.loadMoreData))
+                self.home_list_tbv.mj_footer = self.footerMJ
+                
+            } failture: { (err) in
+                
+            }
+        }
+    }
+    
+    //MARK:--加载数据
+    @objc func loadData(){
+        print("加载数据")
+        page = 1
+        isUpData = true
+        var look_type = 1
+        if bottom_title_lbl.text != "已铺货"{
+            look_type = 2
+        }
+        
+        let dic = ["user_token":UserToken as Any,"retrieval":"" as Any,"page":page as Any,"look_type":look_type as Any,"shop_id":shop_id as Any]
+        
+        supSpreadGoods(dic) { (data) in
+            
+            let model = data  as! supSpreadGoodsModel
+            self.datas.removeAll()
+            model.data?.forEach({ (item) in
+                self.datas.append(item)
+            })
+            self.home_list_tbv.reloadData()
+            self.home_list_tbv?.mj_header?.endRefreshing()
+            self.page = 2
+            if model.data?.count == 0 {
+                self.home_list_tbv?.mj_footer?.endRefreshingWithNoMoreData()
+            }else{
+                self.home_list_tbv?.mj_footer?.endRefreshing()
+            }
+        } failture: { (err) in
+            self.home_list_tbv?.mj_header?.endRefreshing()
+        }
+        
+    }
+    //MARK:--加载更多数据
+    @objc func loadMoreData(){
+        print("加载更多数据")
+        
+        var look_type = 1
+        if bottom_title_lbl.text != "已铺货"{
+            look_type = 2
+        }
+        
+        let dic = ["user_token":UserToken as Any,"retrieval":"" as Any,"page":page as Any,"look_type":look_type as Any,"shop_id":shop_id as Any]
+        supSpreadGoods(dic, success: { (data) in
+            let model = data  as! supSpreadGoodsModel
+            if model.data?.count == 0 {
+                self.home_list_tbv?.mj_footer?.endRefreshingWithNoMoreData()
+            }else{
+                self.page += 1
+                model.data?.forEach({ (item) in
+                    self.datas.append(item)
+                })
+                self.home_list_tbv.reloadData()
+                self.home_list_tbv?.mj_footer?.endRefreshing()
+            }
+        }) { (error) in
+            self.home_list_tbv?.mj_footer?.endRefreshing()
+        }
     }
     
     override func viewDidLayoutSubviews() {
@@ -108,7 +215,7 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
     //MARK: - tableview_delegate
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         if tableView == home_list_tbv {
-            return 3
+            return datas.count
         }else{
             return centersArr.count
         }
@@ -122,11 +229,25 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
             }else{
                 cell.submitBtn.setTitle("铺货", for: .normal)
             }
+            let model = datas[indexPath.row]
+            cell.title_Lbl.text = model.goods_name
+            cell.sell_total_Lbl.text = StringByInt(number: model.dbt_sale!)
+            cell.store_lbl.text = StringByInt(number: model.goods_number!)
+            if model.commission_type == 1 {
+                cell.FX_Percent_Lbl.text = StringByInt(number: model.commission_per!) + "%"
+                cell.FX_Percent_Lbl.isHidden = false
+            }else{
+                cell.FX_Percent_Lbl.isHidden = true
+            }
+            cell.new_price_Lbl.text = model.dbt_price
+            cell.old_price_Lbl.text = model.shop_price
+            cell.item_Icon_Img.sd_setImage(with:URL(string:SERVERCE_ImageHost +  model.goods_thumb!))
             return cell
         }else{
             let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndSelectCell") as! TitleAndSelectCell
             cell.is_center_select = true
-            cell.titleLbl.text = centersArr[indexPath.row]
+            let model = centersArr[indexPath.row]
+            cell.titleLbl.text = model.shop_name
             return cell
         }
     }
@@ -153,8 +274,11 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
             select_list_tbv.isHidden = true
             cover_Btn.isHidden = true
             arrow_Img.image = UIImage(named: "up_blue")
-            center_Name_Lbl.text = centersArr[indexPath.row]
-//            home_list_tbv.reloadData()
+            let model = centersArr[indexPath.row]
+            center_Name_Lbl.text = model.shop_name
+            shop_id = model.shop_id!
+            home_list_tbv.mj_header?.beginRefreshing()
+            //            home_list_tbv.reloadData()
         }
     }
     /*

GeliBusinessPlatform/ViewController/供应商分销商品管理/GYS_FX_SearchViewController.swift

@@ -15,7 +15,10 @@ class GYS_FX_SearchViewController: BaseViewController,UITableViewDelegate,UITabl
         print("点击搜索进行--")
         searchBar.resignFirstResponder()
         keyword = searchBar.text!
-        
+        self.home_list_tbv.mj_header?.beginRefreshing()
+        //上拉加载相关设置
+        self.footerMJ.setRefreshingTarget(self, refreshingAction: #selector(self.loadMoreData))
+        self.home_list_tbv.mj_footer = self.footerMJ
     }
     //MARK:--取消搜索代理
     func clearSearchAction() {
@@ -25,6 +28,7 @@ class GYS_FX_SearchViewController: BaseViewController,UITableViewDelegate,UITabl
         print("编辑即将结束了--")
         if searchBar.text?.count == 0 && keyword.count != 0{
             keyword = searchBar.text!
+         
         }
         print("key - ",searchBar.text!)
     }
@@ -34,6 +38,7 @@ class GYS_FX_SearchViewController: BaseViewController,UITableViewDelegate,UITabl
         return true
     }
     
+    var isAlreadySearch = false
     
     @IBAction func backAction(_ sender: UIButton) {
         self.navigationController?.popViewController(animated: true)
@@ -49,6 +54,7 @@ class GYS_FX_SearchViewController: BaseViewController,UITableViewDelegate,UITabl
         searchV = searchBr
         self.searchView.addSubview(searchBr)
         searchV?.changecornerRadius(cornerRadius: 35*0.5)
+        searchBr.placeholderStr = "请输入商品名称"
         searchBr.delegate = self
         searchBr.delegateL = self
         
@@ -63,15 +69,92 @@ class GYS_FX_SearchViewController: BaseViewController,UITableViewDelegate,UITabl
         home_list_tbv.delegate = self
         home_list_tbv.separatorStyle = .none
         home_list_tbv.dataSource = self
+        
+        //下拉刷新相关设置
+        self.headerMJ.setRefreshingTarget(self, refreshingAction: #selector(self.loadData))
+        self.home_list_tbv.mj_header = self.headerMJ
+        
+    }
+    
+    var page = 0
+    var look_type = 1
+    var shop_id = 0
+    var UserToken = ""
+    
+    var datas:Array<supSpreadGoodsDataModel> = []
+    
+    //MARK:--加载数据
+    @objc func loadData(){
+        print("加载数据")
+        page = 1
+
+        
+        let dic = ["user_token":UserToken as Any,"retrieval":keyword as Any,"page":page as Any,"look_type":look_type as Any,"shop_id":shop_id as Any]
+        
+        supSpreadGoods(dic) { (data) in
+            
+            let model = data  as! supSpreadGoodsModel
+            self.datas.removeAll()
+            model.data?.forEach({ (item) in
+                self.datas.append(item)
+            })
+            self.home_list_tbv.reloadData()
+            self.home_list_tbv?.mj_header?.endRefreshing()
+            self.page = 2
+            if model.data?.count == 0 {
+                self.home_list_tbv?.mj_footer?.endRefreshingWithNoMoreData()
+            }else{
+                self.home_list_tbv?.mj_footer?.endRefreshing()
+            }
+        } failture: { (err) in
+            self.home_list_tbv?.mj_header?.endRefreshing()
+        }
+
+    }
+    //MARK:--加载更多数据
+    @objc func loadMoreData(){
+        print("加载更多数据")
+        
+        let dic = ["user_token":UserToken as Any,"retrieval":keyword as Any,"page":page as Any,"look_type":look_type as Any,"shop_id":shop_id as Any]
+        supSpreadGoods(dic, success: { (data) in
+            let model = data  as! supSpreadGoodsModel
+            if model.data?.count == 0 {
+                self.home_list_tbv?.mj_footer?.endRefreshingWithNoMoreData()
+            }else{
+                self.page += 1
+                model.data?.forEach({ (item) in
+                    self.datas.append(item)
+                })
+                self.home_list_tbv.reloadData()
+                self.home_list_tbv?.mj_footer?.endRefreshing()
             }
+        }) { (error) in
+            self.home_list_tbv?.mj_footer?.endRefreshing()
+        }
+    }
+    
+    
 //MARK: - tableview_delegate
 
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return 3
+        return datas.count
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "GYS_FX_ProductCellTableViewCell") as! GYS_FX_ProductCellTableViewCell
+        let model = datas[indexPath.row]
+        cell.title_Lbl.text = model.goods_name
+        cell.sell_total_Lbl.text = StringByInt(number: model.dbt_sale!)
+        cell.store_lbl.text = StringByInt(number: model.goods_number!)
+        if model.commission_type == 1 {
+            cell.FX_Percent_Lbl.text = StringByInt(number: model.commission_per!) + "%"
+            cell.FX_Percent_Lbl.isHidden = false
+        }else{
+            cell.FX_Percent_Lbl.isHidden = true
+        }
+        cell.new_price_Lbl.text = model.dbt_price
+        cell.old_price_Lbl.text = model.shop_price
+        cell.item_Icon_Img.sd_setImage(with:URL(string:SERVERCE_ImageHost +  model.goods_thumb!))
         return cell
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {

GeliBusinessPlatform/ViewController/供应商分销商品管理/GYS_FX_SearchViewController.xib

@@ -56,7 +56,7 @@
                     </constraints>
                 </view>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="XP3-hn-tEc">
-                    <rect key="frame" x="0.0" y="93" width="414" height="769"/>
+                    <rect key="frame" x="0.0" y="93" width="414" height="803"/>
                     <color key="backgroundColor" name="app底色"/>
                     <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <connections>
@@ -70,7 +70,7 @@
             <constraints>
                 <constraint firstItem="XP3-hn-tEc" firstAttribute="top" secondItem="3CE-yE-nGj" secondAttribute="bottom" id="55b-H1-3YK"/>
                 <constraint firstItem="XP3-hn-tEc" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="FA1-wY-VGk"/>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="XP3-hn-tEc" secondAttribute="bottom" id="JDj-hb-GKc"/>
+                <constraint firstAttribute="bottom" secondItem="XP3-hn-tEc" secondAttribute="bottom" id="JDj-hb-GKc"/>
                 <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="XP3-hn-tEc" secondAttribute="trailing" id="JmR-By-NM5"/>
                 <constraint firstItem="3CE-yE-nGj" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="b90-Ff-XRT"/>
                 <constraint firstItem="3CE-yE-nGj" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="uL1-jy-uTl"/>

GeliBusinessPlatform/ViewController/采购单列表/CGDListVC.swift

@@ -360,6 +360,7 @@ class CGDListVC: BaseViewController , UITableViewDelegate, UITableViewDataSource
         page = 1
         
         let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"order_status":orderStatus as Any]
+        
         purchaseOrderList(dic, success: { (data) in
             self.datas.removeAll()
             let model = data as! PurchaseOrderListModel