采购入库完成，应收完成

GeliBusinessPlatform/Interface/Interface_Z.plist

@@ -174,5 +174,13 @@
 	<string>Finance/accountsPayableList</string>
 	<key>应付账款详情</key>
 	<string>Finance/accountsPayableDetail</string>
+	<key>应收账款列表</key>
+	<string>Finance/accountReceivableList</string>
+	<key>应收账款详情</key>
+	<string>Finance/accountReceivableDetail</string>
+	<key>应收账款收款</key>
+	<string>Finance/confirmReceipt</string>
+	<key>设为未收</key>
+	<string>Finance/uncollected</string>
 </dict>
 </plist>

GeliBusinessPlatform/Model/UpDataModel.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 import ObjectMapper
-//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库审核,商品入库,商品入库申请,商品出库,商品申请出库,商品审核出库,出库入库审核不通过,编辑地址,删除地址,新增采购单,审核采购单,撤销入库,采购单修改支付状态,供应商编辑,新增供应商,编辑客户,新增客户,
+//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库审核,商品入库,商品入库申请,商品出库,商品申请出库,商品审核出库,出库入库审核不通过,编辑地址,删除地址,新增采购单,审核采购单,撤销入库,采购单修改支付状态,供应商编辑,新增供应商,编辑客户,新增客户,应收账款收款,设为未收,
 
 class UpDataModel: Mappable {
     var code:Int?

GeliBusinessPlatform/Model/WarehouseManageModel/InputInitInfoModel.swift

@@ -127,6 +127,7 @@ class InputInitInfoGoodsInfoModel: Mappable {  //商品信息
     var createDayStr:String?
     
     var chuKuLiang:Int?
+    var pog_id = 0
     
     required init?( map: Map) {
         
@@ -146,6 +147,7 @@ class InputInitInfoGoodsInfoModel: Mappable {  //商品信息
         RKJG <- map["RKJG"]
         DayType <- map["DayType"]
         chuKuLiang <- map["chuKuLiang"]
+        pog_id <- map["pog_id"]
     }
 }
 

GeliBusinessPlatform/Model/accountsPayableInterface.swift

@@ -42,3 +42,71 @@ func accountsPayableDetail(_ params:[String:Any],success:@escaping (_ res:Any)->
         failture(error)
     }
 }
+
+
+//MARK:--应收账款列表
+
+/* 说明：供应商信息在列表中已经全部列出，详情功能拿列表数据即可
+ //params-key(
+ //user_token(验证token)
+ page 页数
+ keyword 搜索关键词
+ */
+func accountReceivableList(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("应收账款列表", params, { (rep:DataResponse<accountReceivableListModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+//MARK:--应收账款详情
+
+/* 说明：供应商信息在列表中已经全部列出，详情功能拿列表数据即可
+ //params-key(
+ //user_token(验证token)
+ page 页数
+ keyword 搜索关键词
+ */
+func accountReceivableDetail(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("应收账款详情", params, { (rep:DataResponse<accountReceivableDetailModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+//MARK:--应收账款收款
+
+/* 说明：供应商信息在列表中已经全部列出，详情功能拿列表数据即可
+ //params-key(
+ //user_token(验证token)
+ page 页数
+ keyword 搜索关键词
+ */
+func confirmReceipt(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("应收账款收款", params, { (rep:DataResponse<UpDataModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+//MARK:--设为未收
+
+/* 说明：供应商信息在列表中已经全部列出，详情功能拿列表数据即可
+ //params-key(
+ //user_token(验证token)
+cus_log_id 应收账款记录id
+ */
+func uncollected(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("设为未收", params, { (rep:DataResponse<UpDataModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}

GeliBusinessPlatform/Model/yfzkModel/accountsPayableListModel.swift

@@ -113,3 +113,124 @@ class accountsPayableDetailDataListModel: Mappable {
         po_no <- map["po_no"]
     }
 }
+
+
+
+
+//MARK: - 应收账款列表
+class accountReceivableListModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data :accountReceivableDataModel?
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+
+class accountReceivableDataModel: Mappable {
+    var list:Array<accountReceivableListDataModel>?
+    var arrears_money_sum :Int?
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        list <- map["list"]
+        arrears_money_sum <- map["arrears_money_sum"]
+    }
+}
+
+class accountReceivableListDataModel: Mappable {
+    var cus_id:Int? //客户id
+    var cus_name :String?        //客户名
+
+    var arrears_money :String?  //应收账款金额
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        cus_id <- map["cus_id"]
+        cus_name <- map["cus_name"]
+        arrears_money <- map["arrears_money"]
+    }
+}
+
+class accountReceivableDetailModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data :accountReceivableDetailDataModel?
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+class accountReceivableDetailDataModel: Mappable {
+    var arrears_money:String? //当前应收款余额总计
+    var jf : Float? //本期借方余额
+    var df :Float?//本期贷方余额
+    
+    var list:Array<accountReceivableDetailListModel>?
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        arrears_money <- map["arrears_money"]
+        jf <- map["jf"]
+        df <- map["df"]
+        list <- map["list"]
+    }
+}
+class accountReceivableDetailListModel: Mappable {
+    var cus_log_id:Int?//应收账款记录id
+    var cus_id : Int?
+    var order_id :Int?
+    
+    var money:String? //交易金额(为贷方金额还是借方金额，由 type 字段确定)
+    var type : Int? //类型 1借出 2归还
+    var create_time :Double? //时间
+    
+    var update_time:Double?
+    var is_del : Int?
+    var arrears_money :String?//已额
+    
+    var status:Int?  //状态：0 归还记录 1 借出未归还 2借出已归还(说明，状态)
+    var pay_status : Int?
+    var money_type :Int?
+    
+    var order_sn:String?  //单号
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        cus_log_id <- map["cus_log_id"]
+        cus_id <- map["cus_id"]
+        order_id <- map["order_id"]
+        money <- map["money"]
+        
+        type <- map["type"]
+        create_time <- map["create_time"]
+        update_time <- map["update_time"]
+        is_del <- map["is_del"]
+        
+        arrears_money <- map["arrears_money"]
+        status <- map["status"]
+        pay_status <- map["pay_status"]
+        money_type <- map["money_type"]
+        
+        order_sn <- map["order_sn"]
+    }
+}

GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewRKVc.swift

@@ -8,9 +8,14 @@
 
 import UIKit
 import LGButton
-
+protocol NewRKVcDelegate {
+    func NewRKVcFinish()
+}
 class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, NewOnlyRKCellDelegate,NewSelectItemVcDelegate,NewSelectWarehouseVCDelegate,GLAlertSelectViewDelegate,GeliAlertTextViewDelegate, ShowTimeSelectViewDelegate{
     let UserToken = UserDefaults.standard.value(forKey: "user_token")
+    var delegate:NewRKVcDelegate?
+    var po_id = 0
+    var isCaiGou = false
     //MARK: - 提交申请
     func sureGeliAlertTextViewAction(sender: String) {
         if isGm {
@@ -46,7 +51,8 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
                     "subtotal":total as Any,
                     "production_data":model.createDay as Any,
                     "shelf_life":shelf_life as Any,
-                    "report_id":0 as Any
+                    "report_id":0 as Any,
+                    "pog_id":model.pog_id as Any
                 ]
                 goodsInfoArr?.append(goods)
             }
@@ -55,12 +61,14 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
                 "user_token":UserToken as Any,
                 "i_type":typeSelect! + 1 as Any,
                 "apply_remark":sender as Any,
-                "goods_info":goods_info as Any,
+                "po_id":po_id as Any,
+                "goods_info":goods_info as Any
             ]
             
             GoodsInputApply(dict, success: { (data) in
                 HUD.hide()
                 HUD.flash(.labeledSubSuccess(subtitle: "申请成功"), delay: 1.2)
+                self.delegate?.NewRKVcFinish()
                 self.navigationController?.popViewController(animated: true)
                 
             }) { (error) in
@@ -96,7 +104,8 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
                 "subtotal":total as Any,
                 "production_data":model.createDay as Any,
                 "shelf_life":shelf_life as Any,
-                "report_id":0 as Any
+                "report_id":0 as Any,
+                "pog_id":model.pog_id as Any
             ]
             goodsInfoArr?.append(goods)
         }
@@ -109,11 +118,13 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
             "p_id":p_id as Any,
             "i_type":typeSelect! + 1 as Any,
             "apply_remark":sender as Any,
-            "goods_info":goods_info as Any,
+            "po_id":po_id as Any,
+            "goods_info":goods_info as Any
         ]
         GoodsInput(dict, success: { (data) in
             HUD.hide()
             HUD.flash(.labeledSubSuccess(subtitle: "入库成功"), delay: 1.2)
+            self.delegate?.NewRKVcFinish()
             self.navigationController?.popViewController(animated: true)
             
         }) { (error) in
@@ -197,6 +208,12 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        if isCaiGou {
+            typeSelect = 0
+            holderArr.insert(rkTypeArr[typeSelect!], at: 2)
+            holderArr.remove(at: 3)
+        }
+        
         let strNowTime = getTimeNow()
         holderArr.insert(strNowTime, at: 3)
         holderArr.remove(at: 4)
@@ -210,6 +227,12 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
         listView.register(UINib(nibName: "NewOnlyRKCell", bundle: nil), forCellReuseIdentifier: "NewOnlyRKCell")
         
         
+        loadData()
+        
+        // Do any additional setup after loading the view.
+    }
+    
+    func loadData(){
         HUD.flash(.progress)
         listView.isHidden = true
         lgBtn.isHidden = true
@@ -290,16 +313,14 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
         }) { (error) in
             
         }
-        // Do any additional setup after loading the view.
     }
     
-    
-    
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if indexPath.section == 1 {
             return
         }
         if indexPath.row == 2 {
+            if isCaiGou  == false{
                 if glSelectView == nil {
                     let view = GLAlertSelectView(frame: self.view.bounds)
                     view.tag = indexPath.row
@@ -315,6 +336,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
                     glSelectView = view
                 }
             }
+        }
         if indexPath.row == 0 {
             let vc = NewSelectWarehouseVC()
             vc.rkWareHouseArr = rkWareHouseArr
@@ -417,6 +439,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
             if data.BZQ != nil {
                 cell.bzqTf.text = "\(data.BZQ!)"
             }
+          
             if data.DayType == 0 {
                 cell.rightBtn.isSelected = true
                 cell.leftBtn.isSelected = false
@@ -560,6 +583,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
             view.backgroundColor = UIColor(named: "app底色")
             return view
         }
+        if isCaiGou == false {
             let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 147.5))
             let img = UIImageView()
             view.addSubview(img)
@@ -576,14 +600,22 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
             }
             btn.addTarget(self, action: #selector(addProduct), for: .touchUpInside)
             return view
+        }else{
+            let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 10))
+            view.backgroundColor = UIColor(named: "app底色")
+            return view
+        }
     }
     
     func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
         if section == 0 {
             return 10
         }
+        if isCaiGou == false {
             return 147.5
         }
+        return 0.001
+    }
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         if section == 1 {
             let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 39))

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

@@ -13,7 +13,7 @@ class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchB
     var page : Int = 0
     var keyword: String = ""
     var dataArr:Array<accountsPayableListDataModel> = []//应付
-    var datas:Array<Any> = []//应收
+    var datas:Array<accountReceivableListDataModel> = []//应收
     @IBOutlet weak var titleLbl: UILabel!
     @IBOutlet weak var totalPriceLbl: UILabel!
     @IBOutlet weak var topView: UIView!
@@ -66,7 +66,9 @@ class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchB
         if (barTitle?.contains("应付"))!{
             let model = dataArr[indexPath.row]
             vc.ven_id = model.ven_id!
-            
+        }else{
+            let model = datas[indexPath.row]
+            vc.ven_id = model.cus_id!
         }
         self.navigationController?.pushViewController(vc, animated: true)
     }
@@ -92,7 +94,13 @@ class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchB
                 cell.priceLbl.text = "¥0"
             }
         }else{
-            
+            let mo = datas[indexPath.row]
+            cell.nameLbl.text = mo.cus_name!
+            if mo.arrears_money != "0.00" {
+                cell.priceLbl.text = "¥" + mo.arrears_money!
+            }else{
+                cell.priceLbl.text = "¥0"
+            }
         }
         return cell
         
@@ -163,7 +171,24 @@ class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchB
                 self.listView.mj_header?.endRefreshing()
             }
         }else{//应收
-            
+            accountReceivableList(dic, success: { (data) in
+                let model = (data as! accountReceivableListModel)
+                self.datas.removeAll()
+                model.data?.list?.forEach({ (model) in
+                    self.datas.append(model)
+                })
+                self.totalPriceLbl.text = "¥\(model.data!.arrears_money_sum!)"
+                self.listView.reloadData()
+                self.listView.mj_header?.endRefreshing()
+                self.page = 2
+                if model.data?.list?.count == 0 {
+                    self.listView.mj_footer?.endRefreshingWithNoMoreData()
+                }else{
+                    self.listView.mj_footer?.endRefreshing()
+                }
+            }) { (error) in
+                self.listView.mj_header?.endRefreshing()
+            }
         }
     }
     //MARK:--加载更多数据
@@ -189,8 +214,21 @@ class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchB
                 
             }
         }else{//应收
-            
+            accountReceivableList(dic, success: { (data) in
+                    let model = (data as! accountReceivableListModel)
+                if model.data?.list?.count == 0 {
+                    self.listView.mj_footer?.endRefreshingWithNoMoreData()
+                }else{
+                    self.page += 1
+                    model.data?.list?.forEach({ (model) in
+                        self.datas.append(model)
+                    })
+                    self.listView.reloadData()
+                    self.listView.mj_header?.endRefreshing()
+                }
+                }) { (error) in
+                    self.listView.mj_header?.endRefreshing()
+                }
             }
         }
-    
 }

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

@@ -26,6 +26,7 @@ class YingFuZhangKuanXQCell: UITableViewCell {
     @IBOutlet weak var nameLbl: UILabel!
     @IBOutlet weak var dateLbl: UILabel!
     var model:accountsPayableDetailDataListModel?
+    var data:accountReceivableDetailListModel?
     override func awakeFromNib() {
         super.awakeFromNib()
         self.selectionStyle = .none
@@ -39,6 +40,36 @@ class YingFuZhangKuanXQCell: UITableViewCell {
         priceLbl1.text = "-"
         priceLbl2.text = "-"
         priceLbl3.text = "-"
+        
+        if data != nil {
+            nameLbl.text = data?.order_sn
+            dateLbl.text = dayAndTimeByDouble(sender: (data?.create_time)!)
+            priceLbl3.text = data?.arrears_money!
+            if data?.type == 1 {
+                priceLbl1.text = data?.money
+            }else{
+                priceLbl2.text = data?.money
+            }
+            submitBtn.isUserInteractionEnabled = true
+            if data?.type == 2 && data?.status == 0 {
+                submitBtn.backgroundColor = UIColor.clear
+                submitBtn.setTitleColor(UIColor(named: "灰色字体颜色"), for: .normal)
+                submitBtn.setTitle("未收", for: .normal)
+                submitBtn.layer.borderWidth = 1
+            }else if data?.type == 1 && data?.status == 1 {
+                submitBtn.backgroundColor = UIColor(named: "按钮渐变色下,字体颜色")
+                submitBtn.setTitle("收款", for: .normal)
+                submitBtn.setTitleColor(UIColor.white, for: .normal)
+                submitBtn.layer.borderWidth = 0
+            }else{
+                submitBtn.isUserInteractionEnabled = false
+                submitBtn.backgroundColor = UIColor(named: "灰色字体颜色")
+                submitBtn.setTitle("已收款", for: .normal)
+                submitBtn.setTitleColor(UIColor.white, for: .normal)
+                submitBtn.layer.borderWidth = 0
+            }
+        }
+        
         if model != nil {
             nameLbl.text = model?.po_no!
             dateLbl.text = dayAndTimeByDouble(sender: (model?.create_time!)!)

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

@@ -8,13 +8,24 @@
 
 import UIKit
 
-class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,SearchBarViewDelegate,UITableViewDelegate,UITableViewDataSource,YingFuZhangKuanXQCellDelegate,GLAlertSelectViewDelegate{
+class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,SearchBarViewDelegate,UITableViewDelegate,UITableViewDataSource,YingFuZhangKuanXQCellDelegate,GLAlertSelectViewDelegate, GeliAlertViewDelegate{
+    func sureGeliAlertViewAction(sender: UIButton) {
+        HUD.flash(.progress)
+        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()
+        }) { (err) in
+            
+        }
+    }
+    
     
     let UserToken = UserDefaults.standard.value(forKey: "user_token")
     var ven_id:Int?
     
     var dataArr:Array<accountsPayableDetailDataListModel> = []
-    var datas:Array<Any> = []
+    var datas:Array<accountReceivableDetailListModel> = []
     
     func GLASClose(view: GLAlertSelectView, selectnum: Int, selectArr: Array<Int>) {
         glSelectView?.removeFromSuperview()
@@ -47,8 +58,19 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
             }) { (err) in}
             break
         case "收款":
-            break
-        case "未收":
+            let model = datas[cellTag]
+            dict["cus_log_id"] = model.cus_log_id
+            if sender.tag == 0 {
+                dict["pay_type"] = 7
+            }else{
+                dict["pay_type"] = sender.tag + 8
+            }
+            confirmReceipt(dict, success: { (data) in
+                HUD.hide()
+                self.listView.mj_header?.beginRefreshing()
+            }) { (err) in
+                
+            }
             break
         default:
             break
@@ -68,7 +90,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
     
     var first = ""
     var second = ""
-    
+    var third = ""
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -170,7 +192,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
                 make.width.equalTo(title3.bounds.size.width)
             }
             let ti111 = UILabel()
-            ti111.text = "¥-594153"
+            ti111.text = "¥\(third)"
             ti111.font = UIFont.boldSystemFont(ofSize: 13)
             ti111.textColor = UIColor(named: "#F57575")
             view.addSubview(ti111)
@@ -221,7 +243,8 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
                 cell.model = model
             }
         }else{
-            
+            let model = datas[indexPath.row]
+            cell.data = model
         }
         return cell
     }
@@ -238,6 +261,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
                 view.dataArr = typeArr
                 view.titleLbl.text = "请选择付款方式"
                 glSelectView = view
+                self.view.addSubview(view)
             }
             break
         case "设置未收款":
@@ -246,16 +270,30 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
                 view.selectNum = 0
                 view.dataArr = payTypeArr
                 glSelectView = view
+                self.view.addSubview(view)
             }
             break
         case "收款":
+            if glSelectView == nil {
+                view.dataArr = typeArr
+                view.titleLbl.text = "请选择收款方式"
+                glSelectView = view
+                self.view.addSubview(view)
+            }
             break
         case "未收":
+            let alertView = GeliAlertView(frame: self.view.window!.bounds)
+            alertView.delegate = self;
+            alertView.tishiLbl.text = ""
+            alertView.rightBtn.tag = cell.tag
+            alertView.titileLbl.text = "确定设为未收款？"
+            alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确定"), for: .normal)
+            self.view.window?.addSubview(alertView)
             break
         default:
             break
         }
-        self.view.addSubview(view)
+        
     }
     var keyword = ""
     var page = 0
@@ -266,7 +304,6 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
         searchBar.resignFirstResponder()
         keyword = searchBar.text!
         listView.mj_header?.beginRefreshing()
-        
     }
     //MARK:--取消搜索代理
     func clearSearchAction() {
@@ -304,13 +341,13 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
     @objc func loadData(){
         print("加载数据")
         page = 1
-        let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"ven_id":ven_id as Any]
         if (navTitle.contains("应付")){
+            let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"ven_id":ven_id as Any]
             accountsPayableDetail(dic, success: { (data) in
                 let model = (data as! accountsPayableDetailModel)
                 self.dataArr.removeAll()
-                model.data?.list?.forEach({ (model) in
-                    self.dataArr.append(model)
+                model.data?.list?.forEach({ (item) in
+                    self.dataArr.append(item)
                 })
                 if model.data?.payable != nil{
                     self.first = model.data?.payable as! String
@@ -331,15 +368,35 @@ 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]
+            accountReceivableDetail(dic, success: { (data) in
+                let model = data as! accountReceivableDetailModel
+                self.datas.removeAll()
+                model.data?.list?.forEach({ (item) in
+                    self.datas.append(item)
+                })
+                self.first = model.data?.arrears_money! as! String
+                self.second = "\(model.data!.jf!)"
+                self.third = "\(model.data!.df!)"
                 
+                self.listView.reloadData()
+                self.listView.mj_header?.endRefreshing()
+                self.page = 2
+                if model.data?.list?.count == 0 {
+                    self.listView.mj_footer?.endRefreshingWithNoMoreData()
+                }else{
+                    self.listView.mj_footer?.endRefreshing()
+                }
+            }) { (err) in
+                self.listView.mj_header?.endRefreshing()
+            }
         }
     }
     //MARK:--加载更多数据
     @objc func loadMoreData(){
         print("加载更多数据")
-        
-        let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"ven_id":ven_id as Any]
         if (navTitle.contains("应付")){
+            let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"ven_id":ven_id as Any]
             accountsPayableDetail(dic, success: { (data) in
                 let dataM = data as! accountsPayableDetailModel
                 if dataM.data?.list?.count == 0 {
@@ -357,7 +414,22 @@ 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]
+            accountReceivableDetail(dic, success: { (data) in
+                let model = data as! accountReceivableDetailModel
+                if model.data?.list?.count == 0 {
+                    self.listView.mj_footer?.endRefreshingWithNoMoreData()
+                }else{
+                    self.page += 1
+                    model.data?.list?.forEach({ (item) in
+                        self.datas.append(item)
+                    })
+                    self.listView.reloadData()
+                    self.listView.mj_header?.endRefreshing()
+                }
+            }) { (err) in
+                self.listView.mj_header?.endRefreshing()
+            }
         }
     }
     

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

@@ -9,7 +9,11 @@
 import UIKit
 import ViewAnimator //cell动效
 
-class CGDListVC: BaseViewController , UITableViewDelegate, UITableViewDataSource, GeliAlertViewDelegate,CGDListCellDelegate,CGDXQVcDelegate,XinCaiGouViewControllerDelegate {
+class CGDListVC: BaseViewController , UITableViewDelegate, UITableViewDataSource, GeliAlertViewDelegate,CGDListCellDelegate,CGDXQVcDelegate,XinCaiGouViewControllerDelegate,NewRKVcDelegate{
+    func NewRKVcFinish() {
+        listView.mj_header?.beginRefreshing()
+    }
+    
     func XinCaiGouViewControllerFinish() {
         listView.mj_header?.beginRefreshing()
     }
@@ -72,7 +76,6 @@ class CGDListVC: BaseViewController , UITableViewDelegate, UITableViewDataSource
     init(title: String, content: String) {
         super.init(nibName: nil, bundle: nil)
         self.title = title
-        print("ttit===\(title)")
     }
     
     required init?(coder: NSCoder) {
@@ -154,32 +157,6 @@ class CGDListVC: BaseViewController , UITableViewDelegate, UITableViewDataSource
         let vc = CGDXQVc()
         vc.po_id = model.po_id
         vc.delegate = self
-        var btnStr:Array<String> = []
-        
-        switch model.order_status {
-        //订单状态（1未审核，2审核通过，3审核不通过，4已撤销，5已完成）
-        case 1:
-            if isPowerful {
-                btnStr = ["不通过","通过"]
-            }
-            break
-        case 2://入库状态（1未入库，2部分入库，3已入库）
-            switch model.push_status {
-            case 1:
-                btnStr = ["入库"]
-                break
-            case 2:
-                btnStr = ["撤销入库","补录入库"]
-                break
-            default:
-                btnStr = ["撤销入库"]
-                break
-            }
-            break
-        default:
-            break
-        }
-        vc.btnTitle = btnStr
         self.navigationController?.pushViewController(vc, animated: true)
     }
     var isBackOut = false //撤销入库状态:默认关闭
@@ -197,37 +174,59 @@ class CGDListVC: BaseViewController , UITableViewDelegate, UITableViewDataSource
             alertView.rightBtn.tag = model.po_id!
             self.view.window?.addSubview(alertView)
             break
-        case "入库":
-            
-            break
-        case "补录入库":
-            
+        case "入库","补录入库":
+            var rkDatas:Array<InputInitInfoGoodsInfoModel> = []
+            model.goods_res?.forEach({ (item) in
+                let dict = [
+                    "sku_id":item.sku_id as Any,
+                    "goods_id":item.goods_id as Any,
+                    "goods_name":item.goods_name as Any,
+                    "spec_str":item.sku_name as Any,
+                    "goods_thumb":"" as Any,
+                    "price":item.price as Any,
+                    "inventory":0 as Any,
+                    "warehouse_inventory":0 as Any,
+                    "BZQ":"" as Any,
+                    "ZJ":"" as Any,
+                    "RKSL":"" as Any,
+                    "RKJG":"" as Any,
+                    "DayType":1 as Any,
+                    "createDay":"" as Any,
+                    "createDayStr":"" as Any,
+                    "chuKuLiang":"" as Any,
+                    "pog_id":item.pog_id as Any
+                ]
+                let mo = InputInitInfoGoodsInfoModel(JSON: dict)
+                rkDatas.append(mo!)
+            })
+            let vc = NewRKVc()
+            vc.isCaiGou = true
+            vc.rkSelectArr = rkDatas
+            vc.po_id = model.po_id!
+            vc.delegate = self
+            self.navigationController?.pushViewController(vc, animated: true)
             break
         case "修改信息":
             let vc = XinCaiGouViewController()
             vc.delegate = self
             vc.cgName = model.purchaser!
             vc.orderNum = model.po_no!
-            if model.ven_id != nil {
             vc.ven_id = model.ven_id!
-            }
             vc.ven_name = model.ven_name!
             vc.dayTime = model.purchase_time!
             vc.contentStr = model.remarks!
-            if model.type != nil {
             vc.typeSelect = model.type! - 1
-            }
             
             model.goods_res?.forEach({ (item) in
                 let dict = [
-                    "goods_name":item.goods_name,
-                    "goods_id":item.goods_id,
-                    "sku_id":item.sku_id,
-                    "spec_str":item.sku_name,
-                    "unit":item.unit,
-                    "price":item.price,
-                    "target_Count":item.num,
-                    "target_Price":item.amount
+                    "goods_name":item.goods_name as Any,
+                    "goods_id":item.goods_id as Any,
+                    "sku_id":item.sku_id as Any,
+                    "spec_str":item.sku_name as Any,
+                    "unit":item.unit as Any,
+                    "price":item.price as Any,
+                    "target_Count":item.num as Any,
+                    "target_Price":item.amount as Any
                     ] as [String : Any]
                 let mo = GetGoodsInfoDataModel(JSON: dict)
                 

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

@@ -20,19 +20,14 @@ class CGDListViewController: BaseViewController  ,UISearchBarDelegate, SearchBar
     func clearSearchAction() {
         
     }  
-    
     //头部滚动视图
     weak var pagingVC : PagingViewController?
-    
-    
     fileprivate let cities = [
         "待审核",
         "已通过",
         "未通过",
         "已完成"
     ]
-    
-    
     let viewControllers = [
         CGDListVC(title: "待审核"),
         CGDListVC(title: "已通过"),
@@ -140,28 +135,12 @@ extension CGDListViewController: PagingViewControllerDataSource {
 }
 
 extension CGDListViewController: PagingViewControllerSizeDelegate {
-    
-    
     func pagingViewController(_ pagingViewController: PagingViewController, widthForPagingItem pagingItem: PagingItem, isSelected: Bool) -> CGFloat {
-        guard let item = pagingItem as? PagingIndexItem else { return 0 }
-        
-//        let insets = UIEdgeInsets(top: 0, left: 25, bottom: 0, right: 25)
-//        let size = CGSize(width: CGFloat.greatestFiniteMagnitude, height: pagingViewController.options.menuItemSize.height)
-//        let attributes = [NSAttributedString.Key.font: pagingViewController.options.font]
-//
-//        let rect = item.title.boundingRect(with: size,
-//                                           options: .usesLineFragmentOrigin,
-//                                           attributes: attributes,
-//                                           context: nil)
-//        let width = ceil(rect.width) + insets.left + insets.right
-        
         let width = fullScreenWidth / 4 * 0.9
-        
         if isSelected {
             return width * 1.5
         } else {
             return width
         }
     }
-    
 }

GeliBusinessPlatform/ViewController/采购单详情/CGDXQVc.swift

@@ -10,7 +10,16 @@ import UIKit
 protocol CGDXQVcDelegate {
     func CGDXQVcFinishAction()
 }
-class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAlertSelectViewDelegate,GeliAlertTextViewDelegate,GeliAlertViewDelegate {
+class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAlertSelectViewDelegate,GeliAlertTextViewDelegate,GeliAlertViewDelegate,NewRKVcDelegate {
+    func NewRKVcFinish() {
+        loadData()
+        
+        
+        
+        //        delegate?.CGDXQVcFinishAction()
+        //        self.navigationController?.popViewController(animated: false)
+    }
+    
     
     func sureGeliAlertViewAction(sender: UIButton) {
         let dict = ["user_token":UserToken as Any,"po_id":po_id as Any]
@@ -27,7 +36,6 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
     var delegate:CGDXQVcDelegate?
     func sureGeliAlertTextViewAction(sender: String) {
         if isPass == false {
-            print("abc")
             if sender.count == 0 {
                 HUD.flash(.label("请填写不通过原因"), delay: 1.2)
                 return
@@ -93,6 +101,13 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
         listView.register(UINib(nibName: "TitleAndBtnCell", bundle: nil), forCellReuseIdentifier: "TitleAndBtnCell")
         listView.register(UINib(nibName: "CGDCell", bundle: nil), forCellReuseIdentifier: "CGDCell")
         
+        loadData()
+    }
+    
+    func setBtnUI(){
+        btmView.subviews.forEach { (view) in
+            view.removeFromSuperview()
+        }
         if btnTitle.count == 0 {
             btmView.isHidden = true
             btmColor.isHidden = true
@@ -108,13 +123,41 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
             }
         }
         
-        loadData()
     }
+    
     @objc func btmBtnClick(sender:UIButton){
         switch sender.titleLabel?.text {
-        case "入库":
-            break
-        case "补录入库":
+        case "入库","补录入库":
+            var rkDatas:Array<InputInitInfoGoodsInfoModel> = []
+            model!.goods_res?.forEach({ (item) in
+                let dict = [
+                    "sku_id":item.sku_id as Any,
+                    "goods_id":item.goods_id as Any,
+                    "goods_name":item.goods_name as Any,
+                    "spec_str":item.sku_name as Any,
+                    "goods_thumb":"" as Any,
+                    "price":item.price as Any,
+                    "inventory":0 as Any,
+                    "warehouse_inventory":0 as Any,
+                    "BZQ":"" as Any,
+                    "ZJ":"" as Any,
+                    "RKSL":"" as Any,
+                    "RKJG":"" as Any,
+                    "DayType":1 as Any,
+                    "createDay":"" as Any,
+                    "createDayStr":"" as Any,
+                    "chuKuLiang":"" as Any,
+                    "pog_id":item.pog_id as Any
+                ]
+                let mo = InputInitInfoGoodsInfoModel(JSON: dict)
+                rkDatas.append(mo!)
+            })
+            let vc = NewRKVc()
+            vc.isCaiGou = true
+            vc.rkSelectArr = rkDatas
+            vc.po_id = model?.po_id! as! Int
+            vc.delegate = self
+            self.navigationController?.pushViewController(vc, animated: true)
             break
         case "撤销入库":
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
@@ -123,7 +166,6 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
             alertView.titileLbl.text = "是否撤销入库？"
             alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确定"), for: .normal)
             self.view.window?.addSubview(alertView)
-            
             break
         case "通过":
             isPass = true
@@ -145,7 +187,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
         }
     }
     func loadData(){
-        
+        print("test === ")
         let dict = ["user_token":UserToken as Any,"po_id":po_id as Any]
         purchaseOrderDetail(dict, success: { (data) in
             let item = data as! PurchaseOrderDetailModel
@@ -183,6 +225,27 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
             }
             
             self.model = mo
+            
+            switch self.model!.order_status {
+            //订单状态（1未审核，2审核通过，3审核不通过，4已撤销，5已完成）
+            case 2://入库状态（1未入库，2部分入库，3已入库）
+                switch self.model!.push_status {
+                case 1:
+                    self.btnTitle = ["入库"]
+                    break
+                case 2:
+                    self.btnTitle = ["撤销入库","补录入库"]
+                    break
+                default:
+                    self.btnTitle = ["撤销入库"]
+                    break
+                }
+                break
+            default:
+                break
+            }
+            self.setBtnUI()
+            
             self.listView.reloadData()
         }) { (error) in