完善出入库记录的筛选和搜索

GeliBusinessPlatform/AppDelegate.swift

@@ -258,7 +258,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate, UITabBarCon
         
         tabBarController.viewControllers = [v1, v2, v3, v4, v5]
         
-        tabBarController.selectedIndex = 1
+        tabBarController.selectedIndex = 2
         
         
         

GeliBusinessPlatform/View/MoreBtnView/MoreAndTimeSelectView.swift

@@ -281,9 +281,10 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
             }
             bugSArr[index] = sender.isSelected
             
+
+            if index > 0 && sender.isSelected{
                 let suv = contenV.viewWithTag(10086)
                 suv?.removeFromSuperview()
-            if index > 0 && sender.isSelected{
                 //选择了出入库
                 print("选择了出入库")
                 if sendSArr.count == 0 {
@@ -326,6 +327,9 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
                 
             }else{
                 print("选择全部")
+                if sendSArr.count > 0 {
+                    let suv = contenV.viewWithTag(10086)
+                    suv?.removeFromSuperview()
                     let statusV = addTitleAndMoreBtn(title: "具体类型", arrStr: [], btnTag: 3000)
                     sendSArr = []
                     contenV.addSubview(statusV)
@@ -340,6 +344,8 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
                     contentHeight.constant = contentH
                 }
 
+            }
+            
         }else{
             let index = sender.tag - 3000
             var tmpeArr:[Bool] = []

GeliBusinessPlatform/ViewController/出入库记录/CRKListVC.swift

@@ -15,17 +15,33 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
     func CRKXiangQVCFinishAction() {
         listView.mj_header?.beginRefreshing()
     }
-    
+    weak var searchV:SearchBarView!
     func searchBarShouldBeginEditing(_ searchBar: UISearchBar) -> Bool {
         print("调起搜索后添加个蒙版本")
+        blackBtnView = UIButton ()
+        blackBtnView.backgroundColor = UIColor.init(named: "提示视图背景色")
+        self.view.addSubview(blackBtnView)
+        blackBtnView.snp.makeConstraints { (make) in
+            make.top.equalTo(searchBgView.snp_bottom)
+
+            make.left.right.bottom.equalToSuperview()
+        }
         
+        blackBtnView.addTarget(self, action: #selector(removeBlackBtnView), for: .touchUpInside)
         if moreTimeSelectView != nil {
             moreTimeSelectView.removeFromSuperview()
             moreTimeSelectView  = nil
         }
         return true
     }
+    @objc func removeBlackBtnView(){
+        if blackBtnView != nil {
+            blackBtnView.removeFromSuperview()
+            searchV!.resignFirstResponder()
+        }
+    }
     var isSearch = false
+    var blackBtnView:UIButton! = nil
     
     //MARK: - searchView delegate
     func clearSearchAction() {
@@ -40,11 +56,15 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
                 loadData()
             }
         }
+        removeBlackBtnView()
+
     }
     func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
         print("点击搜索进行--")
         searchBar.resignFirstResponder()
         keyword = searchBar.text!
+        removeBlackBtnView()
+
         listView.mj_header?.beginRefreshing()
         
         
@@ -61,6 +81,8 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
     var moreTimeSelectView:MoreAndTimeSelectView! = nil
     @IBAction func openViewAction(_ sender: Any) {
         print("筛选选项")
+        removeBlackBtnView()
+
         if  moreTimeSelectView == nil {
             moreTimeSelectView = MoreAndTimeSelectView()
             moreTimeSelectView.delegate = self
@@ -89,6 +111,62 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
         bugSArr = bugSelectArr
         sendSArr =  sendSelectArr
 
+        if BeginDate == nil {
+            start_time = 0
+            end_time = 0
+        }else{
+            let timeInterval:TimeInterval = BeginDate!.timeIntervalSince1970
+            let timeIntervalEnd:TimeInterval = EndDate!.timeIntervalSince1970
+            start_time = Int(timeInterval)
+            end_time = Int(timeIntervalEnd)
+        }
+
+        
+        //单选处理--多选就做拼接。里层UI就不做限制
+        for i in 0..<paySArr.count {
+            let rowBool = paySArr[i]
+            if rowBool {
+                status = i
+                break
+            }
+        }
+        for i in 0..<bugSArr.count {
+            let rowBool = bugSArr[i]
+            if rowBool {
+                io_type = i
+                break
+            }
+        }
+        if io_type == 1 {
+            //入库
+            i_type = 0
+            o_type = 0
+            for i in 0..<sendSArr.count {
+                let rowBool = sendSArr[i]
+                if rowBool {
+                    i_type = i
+                    break
+                }
+            }
+        }else if io_type == 2{
+            //出库
+            i_type = 0
+            o_type = 0
+            for i in 0..<sendSArr.count {
+                let rowBool = sendSArr[i]
+                if rowBool {
+                    o_type = i
+                    break
+                }
+            }
+        }else{
+            //全部
+            i_type = 0
+            o_type = 0
+        }
+
+        listView.mj_header?.beginRefreshing()
+
     }
     //MARK:--筛选回调数据
     func colseActionMoreAndTimeSelectView() {
@@ -108,6 +186,7 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
         
         //searchbar
         let searchBr = SearchBarView.init()
+        searchV = searchBr
         self.searchBgView.addSubview(searchBr)
         searchBr.snp.makeConstraints { (make) in
             make.left.equalTo(0)
@@ -148,7 +227,7 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
     @objc func loadData(){
         page = 1
         let UserToken = UserDefaults.standard.value(forKey: "user_token")
-        let dic = ["user_token":UserToken as Any,"status":0 as Any,"page":page as Any,"io_type":io_type as Any ,"i_type":i_type  as Any,"o_type":o_type  as Any,"start_time":"","end_time":"","keyword":""]
+        let dic = ["user_token":UserToken as Any,"status":status as Any,"page":page as Any,"io_type":io_type as Any ,"i_type":i_type  as Any,"o_type":o_type  as Any,"start_time":start_time as Any,"end_time":end_time as Any,"keyword":keyword as Any]
         
         WarehouseIoList(dic , success: { (data) in
             self.datas?.removeAll()
@@ -182,7 +261,7 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
         print("加载更多数据")
         print("page = ",page)
         let UserToken = UserDefaults.standard.value(forKey: "user_token")
-        let dic = ["user_token":UserToken as Any,"status":0 as Any,"page":page as Any,"io_type":io_type as Any ,"i_type":i_type  as Any,"o_type":o_type  as Any,"start_time":"","end_time":"","keyword":""]
+        let dic = ["user_token":UserToken as Any,"status":status as Any,"page":page as Any,"io_type":io_type as Any ,"i_type":i_type  as Any,"o_type":o_type  as Any,"start_time":start_time as Any,"end_time":end_time as Any,"keyword":keyword as Any]
 
         WarehouseIoList(dic, success: { (data) in
             let dataM = data as! WarehouseIoListModel

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

@@ -187,7 +187,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
                             self.dataModel?.auth_res?.forEach({ (pmd) in
                                 if md.auth_id == pmd.auth_id {
                                     //存在且还常用
-                                    self.oftenArr?.append(md)
+                                    self.oftenArr?.append(pmd)
                                 }
                             })
                         })