补确认收货接口，cell微调

GeliBusinessPlatform/Interface/Interface_Z.plist

@@ -212,5 +212,7 @@
 	<string>Order/refundAndSalesReturn</string>
 	<key>取消订单审核</key>
 	<string>Order/orderCancelAudit</string>
+	<key>确认收到退货</key>
+	<string>Order/confirmReturnedGoods</string>
 </dict>
 </plist>

GeliBusinessPlatform/Model/OrderInterface.swift

@@ -420,3 +420,16 @@ func orderCancelAudit(_ params:[String:Any],success:@escaping (_ res:Any)->(),fa
     }) { (error) in
     }
 }
+
+//MARK: -- 确认收到退货
+/**
+params-key:
+user_token(验证token)
+order_id（订单id）
+*/
+func confirmReturnedGoods(_ 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
+    }
+}

GeliBusinessPlatform/Model/UpDataModel.swift

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

GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift

@@ -354,7 +354,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
             alertView.delegate = self;
             alertView.tishiLbl.text = ""
-            alertView.titileLbl.text = "是否\(sender.titleLabel?.text)？"
+            alertView.titileLbl.text = "是否\(sender.titleLabel!.text!)？"
             alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
             alertView.rightBtn.tag = rowModel.order_id!
             self.view.window?.addSubview(alertView)
@@ -377,7 +377,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
             alertView.rightBtn.tag = rowModel.order_id!
             self.view.window?.addSubview(alertView)
-        }else if sender.titleLabel?.text == "确认收款"{
+        }else if sender.titleLabel?.text == "确认收款" || sender.titleLabel?.text == "确认收到退款"{
             isSrueOrder = 10
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
             alertView.delegate = self;
@@ -386,6 +386,9 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
             alertView.rightBtn.tag = rowModel.order_id!
             self.view.window?.addSubview(alertView)
+        }else if sender.titleLabel?.text == "确认收货"{
+            isSrueOrder = 11
+            
         }else if sender.titleLabel?.text == "发货" {
             isSrueOrder = 4
             if rowModel.order_type == 4 {
@@ -541,6 +544,15 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
 
             }) { (error) in
                 
+            }
+            break
+        case 11:
+        confirmReturnedGoods(["user_token":UserToken as Any,"order_id" : sender.tag as Any], success: { (data) in
+            HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
+            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
+
+        }) { (error) in
+            
         }
         break
         default:

GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift

@@ -271,6 +271,15 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             alertView.rightBtn.tag = 1011
             self.view.window?.addSubview(alertView)
             break
+            case "确认收货":
+            let alertView = GeliAlertView(frame: self.view.window!.bounds)
+            alertView.delegate = self;
+            alertView.tishiLbl.text = ""
+            alertView.titileLbl.text = "是否确认收货？"
+            alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
+            alertView.rightBtn.tag = 1012
+            self.view.window?.addSubview(alertView)
+            break
         case "付款码":
             let alertView = GeliAltetCodeView(frame: self.view.window!.bounds)
             alertView.saveImgID = orderId
@@ -1316,7 +1325,16 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 
             }
         }else if sender.tag == 1011{
-            ConfirmRefund(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id], success: { (data) in
+            ConfirmRefund(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any], success: { (data) in
+                HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
+                NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
+                self.delegate?.refishingOrderDchange()
+                self.loadData()
+            }) { (error) in
+                
+            }
+        }else if  sender.tag == 1012 {//确认收货
+            confirmReturnedGoods(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any], success: { (data) in
                 HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
                 self.delegate?.refishingOrderDchange()

GeliBusinessPlatform/ViewController/采购单详情/CGDListCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -38,10 +38,10 @@
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="131231231230" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CPQ-JB-dO9">
-                                <rect key="frame" x="35" y="16" width="90" height="16"/>
+                                <rect key="frame" x="35" y="16" width="88" height="16"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" relation="lessThanOrEqual" constant="100" id="Jno-Ez-xfr"/>
-                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="90" id="h2R-4R-NZP"/>
+                                    <constraint firstAttribute="width" relation="lessThanOrEqual" constant="90" id="Jno-Ez-xfr"/>
+                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="40" id="h2R-4R-NZP"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <color key="textColor" name="标题字颜色"/>
@@ -184,7 +184,7 @@
                             <constraint firstItem="ZEQ-bR-jNZ" firstAttribute="leading" secondItem="xNb-6a-mWT" secondAttribute="leading" id="3H6-Mf-efn"/>
                             <constraint firstItem="HVh-eU-WcT" firstAttribute="top" secondItem="xNb-6a-mWT" secondAttribute="top" constant="15" id="3vl-Na-tUS"/>
                             <constraint firstItem="wn2-a8-osu" firstAttribute="top" secondItem="ZEQ-bR-jNZ" secondAttribute="bottom" id="4nM-v6-4eY"/>
-                            <constraint firstItem="UuD-5H-NJZ" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="CPQ-JB-dO9" secondAttribute="trailing" constant="10" id="ADQ-aj-VhR"/>
+                            <constraint firstItem="UuD-5H-NJZ" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="CPQ-JB-dO9" secondAttribute="trailing" constant="5" id="ADQ-aj-VhR"/>
                             <constraint firstItem="UuD-5H-NJZ" firstAttribute="centerY" secondItem="HVh-eU-WcT" secondAttribute="centerY" id="GE2-bZ-CEn"/>
                             <constraint firstAttribute="trailing" secondItem="UuD-5H-NJZ" secondAttribute="trailing" constant="15" id="Gbe-hd-ENe"/>
                             <constraint firstItem="HVh-eU-WcT" firstAttribute="leading" secondItem="xNb-6a-mWT" secondAttribute="leading" constant="15" id="I5S-Pm-VYW"/>