Merge branch 'master' of http://git.gelifood.com/ljy/gelibusinessplatform

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

@@ -215,7 +215,8 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
         super.viewDidLoad()
         navbar.title = "出入库记录"
         self.view.addSubview(navbar)
-        
+        //初始化筛选条件
+        pushTheSelectData()
         //searchbar
         let searchBr = SearchBarView.init()
         searchV = searchBr
@@ -246,6 +247,19 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
         self.listView!.mj_footer = footerMJ
         self.listView?.mj_header?.beginRefreshing()
         
+        
+    }
+    func pushTheSelectData(){
+        for i in 0..<paySArr.count {
+            if i == status {
+                paySArr[i] = true
+            }
+        }
+        for i in 0..<bugSArr.count {
+            if i == io_type {
+                bugSArr[i] = true
+            }
+        }
     }
     var status = 0 //    出入库(审核)状态，1审核中，2通过，3不通过；0全部
     var io_type = 0 //类型(出/入库)，1入库，2出库，3撤销入库,0全部

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

@@ -341,11 +341,15 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
         case 2:
             //入库申请
             let vc = CRKListVC()
+            vc.status = 1
+            vc.io_type = 1
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 3:
             //出库申请
             let vc = CRKListVC()
+            vc.status = 1
+            vc.io_type = 2
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 4:
@@ -502,10 +506,16 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
             HUD.flash(.label("敬请期待"),delay: 1.2)
             return
         case 121: //出库审核
-            HUD.flash(.label("敬请期待"),delay: 1.2)
+            let vc = CRKListVC()
+            vc.status = 1
+            vc.io_type = 2
+            self.navigationController?.pushViewController(vc, animated: true)
             return
         case 122: //入库审核
-            HUD.flash(.label("敬请期待"),delay: 1.2)
+            let vc = CRKListVC()
+            vc.status = 1
+            vc.io_type = 1
+            self.navigationController?.pushViewController(vc, animated: true)
             return
         case 123: //新增仓库
             let vc = CheckWareHourseViewController()