完成运单列表

GeliBusinessPlatform/Model/Logistics/LogisticsModel.swift

@@ -27,7 +27,7 @@ class LogisticsModel: Mappable {
 class LogisticsDataModel: Mappable {
     var id:Int?
     var lwb_no : String? //运单号
-    var delivery_status :String? //运单状态：1下单完成 2揽收成功 3运输中 4已签收 5已取消 6拒收 7再投
+    var delivery_status :Int? //运单状态：1下单完成 2揽收成功 3运输中 4已签收 5已取消 6拒收 7再投
     
     var express_item_name:String?//托寄物名称
     var sale_plat : String?//所属平台
@@ -39,7 +39,10 @@ class LogisticsDataModel: Mappable {
     
     var lc_name:String? //物流公司
     var delivery_status_cn : String? //运单状态(中文)
-    
+    var wb_no : String?
+    var pay_status : Int?
+    var freight : Float?
+
     
     required init?( map: Map) {
         
@@ -59,6 +62,11 @@ class LogisticsDataModel: Mappable {
         
         lc_name <- map["lc_name"]
         delivery_status_cn <- map["delivery_status_cn"]
+        
+        wb_no <- map["wb_no"]
+        pay_status <- map["pay_status"]
+        freight <- map["freight"]
+
     }
 }
 

GeliBusinessPlatform/View/Cell/YunDanLieBiaoCell.swift

@@ -8,7 +8,12 @@
 
 import UIKit
 
+protocol YunDanLieBiaoCellDelegate {
+    func YunDanLieBiaoCellAction(sender:UIButton)
+}
+
 class YunDanLieBiaoCell: UITableViewCell {
+    var delegate : YunDanLieBiaoCellDelegate?
     /// 订单号
     @IBOutlet weak var orderNumLbl: UILabel!
     /// 时间
@@ -38,6 +43,9 @@ class YunDanLieBiaoCell: UITableViewCell {
         // Initialization code
     }
 
+    @IBAction func acTion(_ sender: UIButton) {
+        delegate?.YunDanLieBiaoCellAction(sender: sender)
+    }
     override func setSelected(_ selected: Bool, animated: Bool) {
         super.setSelected(selected, animated: animated)
 

GeliBusinessPlatform/View/Cell/YunDanLieBiaoCell.xib

@@ -156,6 +156,9 @@
                                         <color key="value" name="蓝色字体颜色"/>
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
+                                <connections>
+                                    <action selector="acTion:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="nKQ-4e-vs1"/>
+                                </connections>
                             </button>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>

GeliBusinessPlatform/ViewController/代客下单（货运）/运单详情/YunDanXiangQingViewController.swift

@@ -158,7 +158,6 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
             alertView.tishiLbl.text = ""
             alertView.titileLbl.text = "是否取消运单？"
             alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确定"), for: .normal)
-//            alertView.rightBtn.tag = model.po_id!
             self.view.window?.addSubview(alertView)
             break
         default: