16

GeliBusinessPlatform/ViewController/分销订单管理/RetailListMgVC.swift

@@ -9,7 +9,11 @@
 import UIKit
 import Parchment
 
-class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchBarDelegate, SearchBarViewDelegate ,HeaderSelectViewDelegate ,SelectContentViewDelegate,TimeShowDownViewDeleagte{
+class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchBarDelegate, SearchBarViewDelegate ,HeaderSelectViewDelegate ,SelectContentViewDelegate,TimeShowDownViewDeleagte, UITableViewDelegate, UITableViewDataSource, RetailManageFooterViewDelagte, GeliAlertViewDelegate{
+    
+    var order_status = 0
+    var page : Int = 0
+    let UserToken = UserDefaults.standard.value(forKey: "user_token")
     
     @IBOutlet weak var contentV: UIView!
     
@@ -25,6 +29,9 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
     //头部滚动视图
     weak var pagingVC : PagingViewController?
     var titleStr = ""
+    
+    
+    var listView:UITableView!
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -33,16 +40,39 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
         self.view.addSubview(navbar)
         SetTopFrameView(view: contentV, btmView: self.view)
         
+        
+        
         viewControllers.forEach { (vc) in
             vc.view.tag = vcType
         }
         viewControllers[1].price_type = 1
-        if vcType != 157 {
-            if vcType == 132 {
         
-            }else{
         
+        if vcType != 157 {
+            initSearchBar()
+            initHeaderSelectView()
+            listView = UITableView()
+            listView.register(UINib(nibName: "RetailManageViewCell", bundle: nil), forCellReuseIdentifier: "RetailManageViewCell")
+            self.view.addSubview(listView)
+            listView.delegate = self
+            listView.dataSource = self
+            listView.backgroundColor = UIColor(named: "app底色")
+            listView.snp.makeConstraints { (make) in
+                make.top.equalTo(selectV.snp_bottom)
+                make.left.right.bottom.equalTo(0)
+            }
+            listView.separatorStyle = .none
+            if vcType == 132 {
+                jurisdiction = 1
+            }else{//店长管理
+                jurisdiction = 2
             }
+            headerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadData))
+            listView.mj_header = headerMJ
+            footerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadMoreData))
+            listView.mj_footer = footerMJ
+            listView.mj_header?.beginRefreshing()
+            
         }else{
             let pagingViewController = PagingViewController(viewControllers: viewControllers)
             pagingViewController.indicatorColor = UIColor.init(named: "蓝色字体颜色")!
@@ -60,10 +90,13 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
             contentV.constrainToEdges(pagingViewController.view)
             pagingViewController.didMove(toParent: self)
             pagingVC = pagingViewController
-        }
             initSearchBar()
             initHeaderSelectView()
         }
+        
+    }
+    
+    
     weak var searchV: SearchBarView? = nil
     var blackBtnView:UIButton! = nil
     var keyword = ""
@@ -75,7 +108,11 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
         contentV.addSubview(btn_view)
         btn_view.snp.makeConstraints { (make) in
             make.left.right.equalToSuperview()
+            if vcType == 157 {
                 make.top.equalTo(50)
+            }else{
+                make.top.equalTo(0)
+            }
             make.height.equalTo(40)
         }
         contentV.addSubview(btn_line_view)
@@ -113,7 +150,7 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
         contentV.addSubview(SearchBarContentV)
         SearchBarContentV.snp.makeConstraints { (make) in
             make.left.right.equalToSuperview()
-            make.top.equalTo(90)
+            make.top.equalTo(btn_line_view.snp_bottom)
             make.height.equalTo(45)
         }
         let searchBr = SearchBarView.init()
@@ -145,12 +182,17 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
                         make.left.equalTo(x + offset)
                         make.bottom.equalTo(btn_view.snp_bottom)
                     }
+                    if vcType == 157 {
                         viewControllers.forEach { (vc) in
                             vc.order_status = button.tag
                             vc.isUpData = false
                         }
                         let vc = viewControllers[selectIndex]
                         vc.listView.mj_header?.beginRefreshing()
+                    }else{
+                        order_status = button.tag
+                        listView.mj_header?.beginRefreshing()
+                    }
                 }else{
                     button.isSelected = false
                 }
@@ -165,24 +207,31 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
         removeBlackBtnView()
         if searchBar.text?.count == 0 && keyword.count != 0{
             keyword = searchBar.text!
+            if vcType == 157 {
                 viewControllers.forEach { (vc) in
                     vc.keyword = keyword
                     vc.isUpData = false
                 }
                 let vc = viewControllers[selectIndex]
                 vc.listView.mj_header?.beginRefreshing()
+            }else{
+                listView.mj_header?.beginRefreshing()
+            }
         }
     }
     func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
         searchBar.resignFirstResponder()
         keyword = searchBar.text!
+        if vcType == 157 {
             viewControllers.forEach { (vc) in
                 vc.keyword = keyword
                 vc.isUpData = false
             }
             let vc = viewControllers[selectIndex]
             vc.listView.mj_header?.beginRefreshing()
-        
+        }else{
+            listView.mj_header?.beginRefreshing()
+        }
     }
     @objc func removeBlackBtnView(){
         if blackBtnView != nil {
@@ -260,7 +309,9 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
                     make.top.equalTo(changeBgView.snp_bottom)
                 }
                 showSelectV = showSelectView
-                showSelectView.dataArr = ["全部", "人工结算", "自动结算", "待自动结算", "已自动结算", "待人工结算", "已人工结算"]
+                
+                showSelectView.dataArr = ["全部", "人工已结算", "人工未结算", "自动已结算", "自动未结算", "人工结算失败", "人工结算中", "自动结算失败", "自动结算中", "人工已退还", "自动已退还"]
+                
                 showSelectView.selectIndx = selectIndexArr[0]
                 
             }
@@ -302,12 +353,16 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
     func didselectCell(sender: Int, SelectContentView: SelectContentView) {
         selectIndexArr[showSelectvIndex] = sender
         selectV.colseBytitleArr(arr: [], index:showSelectvIndex)
+        if vcType == 157{
             viewControllers.forEach { (vc) in
                 vc.dbt_type = selectIndexArr[0]
                 vc.isUpData = false
             }
             let vc = viewControllers[selectIndex]
             vc.listView.mj_header?.beginRefreshing()
+        }else{
+            listView.mj_header?.beginRefreshing()
+        }
     }
     
     func selectContentvRemoveForSup() {
@@ -328,6 +383,7 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
             startTime = Int(timeInterval)
             endTime = Int(timeIntervalEnd)
         }
+        if vcType == 157 {
             viewControllers.forEach { (vc) in
                 vc.startTime = startTime
                 vc.endTime = endTime
@@ -335,7 +391,9 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
             }
             let vc = viewControllers[selectIndex]
             vc.listView.mj_header?.beginRefreshing()
-        
+        }else{
+            listView.mj_header?.beginRefreshing()
+        }
     }
     
     //MARK:---滚动选择
@@ -359,6 +417,200 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
             }
         }
     }
+    
+    //MARK: - tableview
+    var dataArr:Array<dbtAgeOrderList_Data_model> = []
+    var price_type = 0
+    var jurisdiction = 1
+    @objc func loadData(){
+        //结算方式（0全部1人工结算 2自动结算(3待自动结算、4已自动结算)(5待人工结算6已人工结算)）
+        page = 1
+        
+        let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"dbt_type":selectIndexArr[0],"order_status":order_status as Any,"start_time":startTime as Any,"end_time":endTime as Any,"jurisdiction":jurisdiction as Any]
+        dbtAgeOrderList(dic) { (data) in
+            let dataM = data as! dbtAgeOrderList_model
+            self.dataArr.removeAll()
+            dataM.data?.forEach({ (model) in
+                self.dataArr.append(model)
+            })
+            self.listView.mj_header?.endRefreshing()
+            
+            self.listView.reloadData()
+            if dataM.data?.count == 0 {
+                self.listView.mj_footer?.endRefreshingWithNoMoreData()
+            }else{
+                self.listView.mj_footer?.endRefreshing()
+            }
+            self.page = 2
+        } failture: { (err) in
+            self.listView.mj_header?.endRefreshing()
+        }
+        
+    }
+    @objc func loadMoreData(){
+        
+        let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"dbt_type":selectIndexArr[0],"order_status":order_status as Any,"start_time":startTime as Any,"end_time":endTime as Any,"jurisdiction":jurisdiction as Any]
+        dbtAgeOrderList(dic) { (data) in
+            let dataM = data as! dbtAgeOrderList_model
+            if dataM.data?.count == 0 {
+                self.listView.mj_footer?.endRefreshingWithNoMoreData()
+            }else{
+                self.page += 1
+                dataM.data?.forEach({ (model) in
+                    self.dataArr.append(model)
+                })
+                self.listView.reloadData()
+                self.listView.mj_footer?.endRefreshing()
+            }
+            
+        } failture: { (err) in
+            self.listView.mj_footer?.endRefreshing()
+        }
+        
+    }
+    func numberOfSections(in tableView: UITableView) -> Int {
+        
+        return self.dataArr.count
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        
+        let goodArrModel = self.dataArr[section]
+        
+        return goodArrModel.order_goods!.count
+    }
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: "RetailManageViewCell") as! RetailManageViewCell
+        let goodArrModel = self.dataArr[indexPath.section]
+        
+        let goodModel = goodArrModel.order_goods![indexPath.row]
+        
+        cell.goodsLbl.text = goodModel.goods_name
+        cell.numLbl.text = "x" + StringByInt(number: goodModel.goods_number!)
+        cell.priceLbl.text = "￥" + goodModel.amount!
+        
+        if (indexPath.row + 1) == goodArrModel.order_goods?.count {
+            cell.dotImgV.isHidden = true
+            
+        }else{
+            cell.dotImgV.isHidden = false
+        }
+        return cell
+    }
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        
+        let vc = RetailManageDetailViewController()
+        let goodArrModel = self.dataArr[indexPath.section]
+        vc.orderId = goodArrModel.order_id
+        self.navigationController?.pushViewController(vc, animated: true)
+    }
+    
+    @objc func didselectCellHorF(sender:UITapGestureRecognizer){
+        let vc = RetailManageDetailViewController()
+        let goodArrModel = self.dataArr[sender.view!.tag]
+        vc.orderId = goodArrModel.order_id
+        self.navigationController?.pushViewController(vc, animated: true)
+    }
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let headerV = UIView()
+        let tap = UITapGestureRecognizer(target: self, action: #selector(didselectCellHorF))
+        headerV.addGestureRecognizer(tap)
+        headerV.tag = section
+        
+        let contentV = RetailManageHeaderView()
+        headerV.addSubview(contentV)
+        contentV.snp_makeConstraints { (make) in
+            make.left.top.right.bottom.equalToSuperview()
+        }
+        let model = self.dataArr[section]
+        contentV.snNumLbl.text = model.order_sn
+        var dbt_typeStr = "人工结算"
+        if model.dbt_type == 2 {
+            dbt_typeStr = "自动结算"
+        }
+        switch model.pay_status {
+        case 2:
+            contentV.stateLbl.text = "已付款/" + dbt_typeStr
+            break
+        case 10:
+            contentV.stateLbl.text = "月结/" + dbt_typeStr
+            break
+        case 11:
+            contentV.stateLbl.text = "已退款/" + dbt_typeStr
+            break
+        default:
+            contentV.stateLbl.text = "未付款/" + dbt_typeStr
+            break
+        }
+        return headerV
+        
+    }
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 50
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        let footerV = UIView()
+        let tap = UITapGestureRecognizer(target: self, action: #selector(didselectCellHorF))
+        footerV.addGestureRecognizer(tap)
+        footerV.tag = section
+        
+        let contentV = RetailManageFooterView()
+        footerV.addSubview(contentV)
+        contentV.snp_makeConstraints { (make) in
+            make.left.top.right.bottom.equalToSuperview()
+        }
+        let model = self.dataArr[section]
+        contentV.priceLbl.text = model.sum_amount!
+        if model.commission_status == 1 {
+            contentV.moneyLbl.text = model.commission! + "(已结算)"
+            
+        }else{
+            contentV.moneyLbl.text = model.commission! + "(未结算)"
+            
+        }
+        contentV.actionBtn.tag = section
+        contentV.delgate = self
+        return footerV
+        
+    }
+    func tapRetailManageFooterBtnAction(sender: Int) {
+        //标记为人工结算
+        let alertView = GeliAlertView(frame: self.view.window!.bounds)
+        alertView.delegate = self;
+        alertView.tishiLbl.text = ""
+        alertView.titileLbl.text = "是否把该订单标记为已人工结算？"
+        alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确定"), for: .normal)
+        alertView.rightBtn.tag = sender
+        self.view.window?.addSubview(alertView)
+    }
+    func sureGeliAlertViewAction(sender: UIButton) {
+        HUD.flash(.progress)
+        let model = self.dataArr[sender.tag]
+        editCommissionStatus(["user_token":UserToken as Any,"order_id":model.order_id as Any]) { (data) in
+            HUD.hide()
+            model.commission_status = 1
+            
+            HUD.flash(.labeledSubSuccess(subtitle: "确认成功"),delay: 1.2)
+            self.listView.reloadSections([sender.tag], with: .none)
+        } failture: { (error) in
+            
+        }
+        
+    }
+    
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        let model = self.dataArr[section]
+        //已结算
+        if model.commission_status == 1 {
+            return 48
+        }
+        //或 自动结算 不需要显示标记
+        if model.dbt_type == 2 {
+            return 48
+        }
+        return 100
+        
+    }
 }
 extension RetailListMgVC: PagingViewControllerDataSource {
     

GeliBusinessPlatform/ViewController/分销订单管理/RetailManageDetailViewController.swift

@@ -158,7 +158,10 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
 
             cell.count_lbl.text = "单价:" + (rowModel?.goods_price)!
             cell.yong_jin_lbl.text = "小计:" + String(format: "%.2f", p_count)
+            cell.dan_jia_lbl.text =  "提成:-" 
+            if rowModel?.commission_val != nil {
                 cell.dan_jia_lbl.text =  "提成:￥" + (rowModel?.commission_val)!
+            }
             cell.xiao_ji_lbl.text = "数量:" +  StringByInt(number: (rowModel?.cart_number!)!)
             cell.delegate = self
             cell.tag = indexPath.row

GeliBusinessPlatform/ViewController/分销订单管理/RetailManageViewController.swift

@@ -152,13 +152,10 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
     }
     
     @objc func didselectCellHorF(sender:UITapGestureRecognizer){
-        
         let vc = RetailManageDetailViewController()
         let goodArrModel = self.dataArr[sender.view!.tag]
         vc.orderId = goodArrModel.order_id
         self.navigationController?.pushViewController(vc, animated: true)
-        
-        
     }
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         let headerV = UIView()

GeliBusinessPlatform/ViewController/工作中心/WorkItemTableViewCell.swift

@@ -122,7 +122,6 @@ class WorkItemTableViewCell: UITableViewCell , UICollectionViewDelegate, UIColle
             
             if rowModel.app_icon == nil {
                 cell.itemImgV.image  = UIImage.init(named: "worktest1")
-                
             }else{
                 if isOften {
                     if rowModel.app_icon_bg != nil {