接入筛选接口

GeliBusinessPlatform/ViewController/应付账款/YingFuZKListViewController.swift

@@ -14,6 +14,10 @@ class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchB
     }
     @IBOutlet weak var selectListH: NSLayoutConstraint!
     
+    var exist = 0
+    var amount_order = 0
+    
+    
     @IBAction func topBtnClick(_ sender: UIButton) {
         switch sender.tag {
         case 0:
@@ -121,21 +125,20 @@ class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchB
     }
     
     
-    var leftSelectNum:Int?
-    var rightSelectNum:Int?
+    
     //MARK: - CELL DELEGATE
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if tableView == selectList {
             
             if leftBtnTitle.textColor == UIColor(named:"蓝色字体颜色"){
-                leftSelectNum = indexPath.row
-                leftBtnTitle.text = leftArr2[leftSelectNum!]
+                exist = indexPath.row
+                leftBtnTitle.text = leftArr1[exist]
                 if (barTitle?.contains("应收"))!{
-                    leftBtnTitle.text = leftArr1[leftSelectNum!]
+                    leftBtnTitle.text = leftArr2[exist]
                 }
             }else{
-                rightSelectNum = indexPath.row
-                rightBtnTitle.text = rightArr[rightSelectNum!]
+                amount_order = indexPath.row
+                rightBtnTitle.text = rightArr[amount_order]
             }
             leftImg.image = UIImage(named: "xiala")
             rightImg.image = UIImage(named: "xiala")
@@ -143,7 +146,7 @@ class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchB
             leftBtnTitle.textColor = UIColor(named: "标题字颜色")
             selectList.isHidden = true
             closeBtn.isHidden = true
-            tableView.reloadData()
+            listView.mj_header?.beginRefreshing()
             return
         }
         let vc = YingFuZhangKuanXQViewController()
@@ -190,18 +193,18 @@ class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchB
             if leftBtnTitle.textColor == UIColor(named:"蓝色字体颜色"){
                 if (barTitle?.contains("应收"))!{
                     cell?.textLabel!.text = leftArr2[indexPath.row]
-                    if leftSelectNum == indexPath.row {
+                    if exist == indexPath.row {
                         cell?.textLabel?.textColor = UIColor(named: "蓝色字体颜色")
                     }
                 }else{
                     cell?.textLabel!.text = leftArr1[indexPath.row]
-                    if leftSelectNum == indexPath.row {
+                    if exist == indexPath.row {
                         cell?.textLabel?.textColor = UIColor(named: "蓝色字体颜色")
                     }
                 }
             }else{
                 cell?.textLabel!.text = rightArr[indexPath.row]
-                if rightSelectNum == indexPath.row {
+                if amount_order == indexPath.row {
                     cell?.textLabel?.textColor = UIColor(named: "蓝色字体颜色")
                 }
             }
@@ -274,7 +277,7 @@ class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchB
     @objc func loadData(){
         print("加载数据")
         page = 1
-        let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any]
+        let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"exist":exist as Any,"amount_order":amount_order+1 as Any]
         if (barTitle?.contains("应付"))!{
             accountsPayableList(dic, success: { (data) in
                 let model = (data as! accountsPayableListModel)
@@ -288,7 +291,9 @@ class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchB
                     self.listView.mj_footer = self.footerMJ
                     
                 }
-                self.totalPriceLbl.text = "¥\(model.data!.total_payable_money!)"
+                if model.data?.total_payable_money != nil {
+                    self.totalPriceLbl.text = "¥\(model.data!.total_payable_money!)"
+                }
                 self.listView.reloadData()
                 self.listView.mj_header?.endRefreshing()
                 self.page = 2
@@ -330,7 +335,7 @@ class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchB
     @objc func loadMoreData(){
         print("加载更多数据")
         
-        let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any]
+        let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"exist":exist as Any,"amount_order":amount_order+1 as Any]
         if (barTitle?.contains("应付"))!{
             accountsPayableList(dic, success: { (data) in
                 let dataM = data as! accountsPayableListModel

GeliBusinessPlatform/ViewController/应付账款/YingFuZhangKuanXQViewController.swift

@@ -16,6 +16,11 @@ protocol YingFuZhangKuanXQViewControllerDelegate {
 class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,SearchBarViewDelegate,UITableViewDelegate,UITableViewDataSource,YingFuZhangKuanXQCellDelegate,GLAlertSelectViewDelegate, GeliAlertViewDelegate,TimeSelectViewDelgate{
     var delegate:YingFuZhangKuanXQViewControllerDelegate?
     
+    var time_type = 0
+    var start_time = 0
+    var end_time = 0
+    
+    
     @IBOutlet weak var selectView: UIView!
     
     @IBOutlet weak var selectimeBV: UIView!
@@ -25,11 +30,13 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
             rightBtn.backgroundColor = UIColor(named: "分类Cell背景色")
             leftBtn.isSelected = true
             rightBtn.isSelected = false
+            time_type = 1
         }else{
             leftBtn.backgroundColor = UIColor(named: "分类Cell背景色")
             rightBtn.backgroundColor = UIColor(named: "按钮背景颜色")
             leftBtn.isSelected = false
             rightBtn.isSelected = true
+            time_type = 2
         }
         //10086
         timeView.removeFromSuperview()
@@ -49,10 +56,12 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
     @IBAction func closeAction(_ sender: UIButton) {
         selectView.isHidden = true
         closeBtn.isHidden = true
+        
     }
     @IBAction func showSelectAction(_ sender: UIButton) {
         selectView.isHidden = !selectView.isHidden
         closeBtn.isHidden = selectView.isHidden
+     
         
         timeView.removeFromSuperview()
         selectimeBV.addSubview(timeView)
@@ -68,13 +77,13 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
     
     override func backAction() {
         self.navigationController?.popViewController(animated: true)
-       
+        
     }
     
     func sureGeliAlertViewAction(sender: UIButton) {
         HUD.flash(.progress)
         if navTitle.contains("应收") {
-        let model = datas[sender.tag]
+            let model = datas[sender.tag]
             uncollected(["user_token":UserToken as Any,"cus_log_id":model.cus_log_id as Any], success: { (data) in
                 HUD.hide()
                 self.listView.mj_header?.beginRefreshing()
@@ -173,7 +182,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
     override func viewDidLoad() {
         super.viewDidLoad()
         
-    
+        
         navbar.title = navTitle
         self.view.addSubview(navbar)
         //searchbar
@@ -204,7 +213,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
         headerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadData))
         listView.mj_header = headerMJ
         //上拉加载相关设置
-      
+        
         listView.mj_header?.beginRefreshing()
         
     }
@@ -276,7 +285,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
                 make.height.equalTo(18.5)
                 make.width.equalTo(title3.bounds.size.width)
             }
-           
+            
             let ti111 = UILabel()
             ti111.text = "¥\(third)"
             ti111.font = UIFont.boldSystemFont(ofSize: 13)
@@ -323,7 +332,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
         cell.delegate = self
         cell.submitBtn.tag = indexPath.row
         cell.tag = indexPath.row
-    
+        
         if navTitle.contains("应付"){
             if dataArr.count > 0 {
                 let model = dataArr[indexPath.row]
@@ -430,11 +439,17 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
     @objc func loadData(){
         print("加载数据")
         page = 1
+        
         if (navTitle.contains("应付")){
-            let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"ven_id":ven_id as Any]
+            let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"ven_id":ven_id as Any,"time_type":time_type as Any,"start_time":start_time as Any,"end_time":end_time as Any]
             accountsPayableDetail(dic, success: { (data) in
                 let model = (data as! accountsPayableDetailModel)
                 self.dataArr.removeAll()
+                if model.code == 2 {
+                    self.listView.reloadData()
+                    self.listView.mj_header?.endRefreshing()
+                    return
+                }
                 model.data?.list?.forEach({ (item) in
                     self.dataArr.append(item)
                 })
@@ -444,7 +459,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
                 }else{
                     self.first = "0"
                 }
-               
+                
                 if model.data?.already != nil {
                     self.second = "\(model.data!.already!)"
                 }else{
@@ -456,7 +471,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
                 self.page = 2
                 if self.dataArr.count == 20 {
                     self.footerMJ.setRefreshingTarget(self, refreshingAction: #selector(self.loadMoreData))
-                          self.listView.mj_footer = self.footerMJ
+                    self.listView.mj_footer = self.footerMJ
                 }
                 if model.data?.list == nil {
                     self.listView.mj_footer?.endRefreshingWithNoMoreData()
@@ -469,17 +484,18 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
                 self.listView.mj_header?.endRefreshing()
             }
         }else{//应收
-            let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"cus_id":ven_id as Any]
+            let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"cus_id":ven_id as Any,"time_type":time_type as Any,"start_time":start_time as Any,"end_time":end_time as Any]
             accountReceivableDetail(dic, success: { (data) in
                 self.first = "0"
                 self.second = "0"
                 self.third = "0"
                 let model = data as! accountReceivableDetailModel
+                self.datas.removeAll()
                 if model.code == 2 {
+                    self.listView.reloadData()
                     self.listView.mj_header?.endRefreshing()
                     return
                 }
-                self.datas.removeAll()
                 model.data?.list?.forEach({ (item) in
                     self.datas.append(item)
                 })
@@ -506,7 +522,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
                 self.page = 2
                 if self.datas.count == 20 {
                     self.footerMJ.setRefreshingTarget(self, refreshingAction: #selector(self.loadMoreData))
-                          self.listView.mj_footer = self.footerMJ
+                    self.listView.mj_footer = self.footerMJ
                 }
                 if model.data?.list == nil {
                     self.listView.mj_footer?.endRefreshingWithNoMoreData()
@@ -523,7 +539,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
     @objc func loadMoreData(){
         print("加载更多数据")
         if (navTitle.contains("应付")){
-            let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"ven_id":ven_id as Any]
+            let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"ven_id":ven_id as Any,"time_type":time_type as Any,"start_time":start_time as Any,"end_time":end_time as Any]
             accountsPayableDetail(dic, success: { (data) in
                 let dataM = data as! accountsPayableDetailModel
                 if dataM.data?.list == nil {
@@ -542,7 +558,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
                 
             }
         }else{//应收
-            let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"cus_id":ven_id as Any]
+            let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"cus_id":ven_id as Any,"time_type":time_type as Any,"start_time":start_time as Any,"end_time":end_time as Any]
             accountReceivableDetail(dic, success: { (data) in
                 let model = data as! accountReceivableDetailModel
                 if model.data?.list == nil {
@@ -603,7 +619,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
             make.width.equalTo(70*glscale)
             make.height.equalTo(30*glscale)
         }
-
+        
         let kuangV = UIView()
         kuangV.layer.borderColor = UIColor.init(named: "灰色字体颜色")?.cgColor
         kuangV.layer.borderWidth = 1
@@ -631,7 +647,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
             let timeIntervalEnd:TimeInterval = EndDate.timeIntervalSince1970
             timeLbl.text = dayByDouble(sender: timeInterval) + "-" + dayByDouble(sender: timeIntervalEnd)
             calendarV.setOldDate(beginD: BeginDate!, endD: EndDate!)
-
+            
         }else{
             timeLbl.text = "-"
         }
@@ -646,31 +662,33 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
     }
     weak var TimeLbl:UILabel?
     func selectMoreDate(beginDate: Date, endginDate: Date) {
-           print("选择日期·····")
-           let timeInterval:TimeInterval = beginDate.timeIntervalSince1970
-           let timeIntervalEnd:TimeInterval = endginDate.timeIntervalSince1970
-           TimeLbl!.text = dayByDouble(sender: timeInterval) + "-" + dayByDouble(sender: timeIntervalEnd)
-           EndDate = endginDate
-           BeginDate = beginDate
-       }
-       @objc func clearBtnAction(sender:UIButton){
-           print("清除日期·····")
-           TimeLbl!.text = "-"
-           BeginDate = nil
-           EndDate = nil
-           CalendarV!.clearTheSelect()
-       }
-       var BeginDate: Date! = nil
-       var EndDate: Date! = nil
-       @objc func sureBtnAction(sender:UIButton){
-           //还要传日期文本出去
-           if BeginDate == nil || EndDate == nil {
-               HUD.flash(.label("请选择自定义时间段"),delay: 1.2)
-               return
-           }
+        print("选择日期·····")
+        let timeInterval:TimeInterval = beginDate.timeIntervalSince1970
+        let timeIntervalEnd:TimeInterval = endginDate.timeIntervalSince1970
+        TimeLbl!.text = dayByDouble(sender: timeInterval) + "-" + dayByDouble(sender: timeIntervalEnd)
+        EndDate = endginDate
+        BeginDate = beginDate
+        start_time = Int(timeInterval)
+        end_time = Int(timeIntervalEnd)
+    }
+    @objc func clearBtnAction(sender:UIButton){
+        print("清除日期·····")
+        TimeLbl!.text = "-"
+        BeginDate = nil
+        EndDate = nil
+        CalendarV!.clearTheSelect()
+    }
+    var BeginDate: Date! = nil
+    var EndDate: Date! = nil
+    @objc func sureBtnAction(sender:UIButton){
+        //还要传日期文本出去
+        if BeginDate == nil || EndDate == nil {
+            HUD.flash(.label("请选择自定义时间段"),delay: 1.2)
+            return
+        }
         print("最后的时间",BeginDate,EndDate)
+        listView.mj_header?.beginRefreshing()
         selectView.isHidden = true
         closeBtn.isHidden = true
-        
     }
 }