添加采购单修改支付状态接口

GeliBusinessPlatform/Interface/Interface_Z.plist

@@ -154,5 +154,7 @@
 	<string>Purchase/purchaseOrderAudit</string>
 	<key>撤销入库</key>
 	<string>Purchase/backOut</string>
+	<key>采购单修改支付状态</key>
+	<string>Purchase/payStatus</string>
 </dict>
 </plist>

GeliBusinessPlatform/Model/PurchaseInterface.swift

@@ -103,3 +103,20 @@ func backOut(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@e
         failture(error)
     }
 }
+
+//MARK:--采购单修改支付状态
+/* 说明：供应商信息在列表中已经全部列出，详情功能拿列表数据即可
+ //params-key(
+ //user_token(验证token)
+po_id 采购单id
+ pay_type     支付类型:0未支付,1现金,2转账(私),3转账(公),4转账(微信),5转账(支付宝)
+ pay_status 付款状态:1未付款,2已付款,3月结,4欠款
+ */
+func payStatus(_ 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/UpDataModel.swift

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

GeliBusinessPlatform/View/AlertView/GLAlertSelectView.swift

@@ -142,7 +142,6 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
         ipdVHeight.constant = 0.001
     }
  
-    
     func setKuWeiView(){
         IQKeyboardManager.shared.resignFirstResponder()
         
@@ -218,11 +217,12 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
         }
         
         let cell = tableView.dequeueReusableCell(withIdentifier: "selectTbvCell") as! TitleAndSelectCell
-        cell.titleLbl.text = dataArr[indexPath.row] as! String
+        cell.titleLbl.text = dataArr[indexPath.row]
         cell.delegate = self
         cell.tag = indexPath.row
         cell.titleLbl.textColor = UIColor(named: "标题字颜色")
         cell.selectBtn.isSelected = false
+        
         if isMultipleS == true {
             for item in selectArray! {
                 if item == indexPath.row {
@@ -236,11 +236,13 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
                 cell.selectBtn.isSelected = true
             }
         }
+        
+        
         if deSelectArr.count > 0 {
             cell.titleLbl.textColor = UIColor(named: "蓝色字体颜色")
             cell.selectBtn.isSelected = true
-            for i in deSelectArr {
-                if i == indexPath.row {
+            deSelectArr.forEach { (i) in
+                if i == indexPath.row{
                     cell.titleLbl.textColor = UIColor(named: "#999999")
                     cell.selectBtn.isUserInteractionEnabled = false
                     cell.selectBtn.isSelected = false
@@ -249,6 +251,8 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
         }
         return cell
     }
+    
+    
     @IBAction func submitClick(_ sender: Any) {
         
         if (titleLbl.text?.contains("库位"))! && isOnlySelectKuWei == false{
@@ -339,7 +343,6 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
     
     
     func deleClickAction(sender: Int) {
-        print("sender == ",sender)
         if (titleLbl.text?.contains("库位"))! && isOnlySelectKuWei == false{
             kuWeiArr.remove(at: sender)
             delegate?.GLAlertSelectDelAction?(sender: kuWeiArr)

GeliBusinessPlatform/View/AlertView/GLAlertSelectView.xib

@@ -76,7 +76,6 @@
                         </label>
                         <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="aRc-4S-xXS">
                             <rect key="frame" x="0.0" y="147.66666666666663" width="414" height="102.33333333333331"/>
-                            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                             <connections>
                                 <outlet property="dataSource" destination="-1" id="5Tz-Qf-U57"/>
                                 <outlet property="delegate" destination="-1" id="OfK-fO-bG2"/>

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

@@ -69,14 +69,15 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
     
     //MARK: - cell delegate
     
-    var titleArr = ["采购单号","采购日期","供应商","采购人","采购类型","支付方式","支付类型","备注"]
+    var titleArr = ["采购单号","采购日期","供应商","采购人","采购类型","支付方式","支付状态","备注"]
     var holderArr = ["-","-","-","-","-","未支付","未付款","-"]
     
-    let zfTypeArr = ["未付款","欠款","月结","已付款"]
+    let zfTypeArr = ["未付款","已付款","月结","欠款"]
+
     let zfWayArr =  ["未支付","现金","转账（私）","转账（公）","转账（微信）","转账（支付宝）"]
 
-    var payType = 0//支付方式
-    var payStatus = 0//支付状态
+    var payZt = 0//支付方式
+    var payFs = 0//支付状态
     
     var model:PurchaseOrderDetailDataModel?
     
@@ -137,9 +138,6 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
             alterView.titleLbl.text = "请填写不通过原因（必填）"
             alterView.placerLbl.text = "请填写不通过原因..."
             self.view.window?.addSubview(alterView)
-            
-            
-            
             break
         default:
             break
@@ -229,13 +227,13 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
                     let view = GLAlertSelectView(frame: self.view.bounds)
                     view.tag = 100
                     view.delegate = self
-                    if payStatus != 0 {
-                        view.deSelectArr = [0,1,2]
-                    }
-                    view.selectNum = payType
+                    view.selectNum = payZt
                     view.tempNum = view.selectNum
                     view.titleLbl.text = "请选择支付状态"
                     view.dataArr = zfTypeArr
+                    if payFs != 0 {
+                        view.deSelectArr = [0,2,3]
+                    }
                     self.view.addSubview(view)
                     glSelectView = view
                 }
@@ -245,7 +243,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
                     let view = GLAlertSelectView(frame: self.view.bounds)
                     view.tag = 999
                     view.delegate = self
-                    view.selectNum = payStatus
+                    view.selectNum = payFs
                     view.tempNum = view.selectNum
                     view.titleLbl.text = "请选择支付方式"
                     view.dataArr = zfWayArr
@@ -292,20 +290,20 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
     }
     func GLAlertSelectViewClick(selectNum: Int, view: GLAlertSelectView) {
         if view.tag == 999 {
-            payStatus = selectNum
-            holderArr.insert(zfWayArr[payStatus], at: 5)
+            payFs = selectNum
+            holderArr.insert(zfWayArr[payFs], at: 5)
             holderArr.remove(at: 6)
-            if payStatus != 0 {
-                payType = 3
+            if payFs != 0 {
+                payZt = 1
             }else{
-                payType = 0
+                payZt = 0
             }
-            holderArr.insert(zfTypeArr[payType], at: 6)
+            holderArr.insert(zfTypeArr[payZt], at: 6)
             holderArr.remove(at: 7)
         }else{
-            if payStatus == 0 {
-                payType = selectNum
-                holderArr.insert(zfTypeArr[payType], at: 6)
+            if payFs == 0 {
+                payZt = selectNum
+                holderArr.insert(zfTypeArr[payZt], at: 6)
                 holderArr.remove(at: 7)
             }
         }
@@ -316,10 +314,10 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
     func GLASClose(view: GLAlertSelectView, selectnum: Int, selectArr: Array<Int>) {
         if selectnum != 10086 {
             if view.titleLbl.text == "请选择支付状态" {
-                payStatus = selectnum
+                payZt = selectnum
             }
             if view.titleLbl.text == "请选择支付方式" {
-                payType = selectnum
+                payFs = selectnum
             }
         }
         view.removeFromSuperview()