修复bug1.0

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

@@ -174,7 +174,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
     @IBOutlet weak var lgBtnTitLbl: UILabel!
     @IBOutlet weak var lgBtn: LGButton!
     var isGm = false
-    let titleArr = ["仓库：","库位：","入库类型：","入库时间：","备注："]
+    var titleArr = ["仓库：","库位：","入库类型：","入库时间：","备注："]
     var holderArr = ["请选择仓库","请选择库位","请选择入库类型","时间","请输入备注"]
     //入库类型
     var rkTypeArr = ["采购","调入","退货","生产","调出被拒绝","外采","其他","固定采购","临时采购"]
@@ -200,7 +200,10 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        
+        if orderNumStr.count > 0 {
+            titleArr.append("采购单号：")
+            holderArr.append(orderNumStr)
+        }
         
         if isCaiGou {
             typeSelect = 0
@@ -422,7 +425,9 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
             }
             let data = rkSelectArr[indexPath.row]
             cell.nameLbl.text = data.goods_name
-            cell.titLbl.text = "入库数量：(可入库量为\(data.no_push_num!)"
+            if data.no_push_num != nil {
+                cell.titLbl.text = "入库数量：(可入库量为\(data.no_push_num!))"
+            }
             cell.detailLbl.text = data.spec_str! + " " + "¥\(data.price!)"
             cell.rkPriceTf.text = "\(data.price!)"
             cell.rkCountTf.text = "1"
@@ -462,7 +467,9 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
         if indexPath.row == 4 {
             let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndLblCell") as! TitleAndLblCell
             cell.nameLbl.text = titleArr[indexPath.row]
-            cell.btmLine.isHidden = true
+            if orderNumStr.count == 0 {
+                cell.btmLine.isHidden = true
+            }
             cell.contentLbl.text = holderArr[indexPath.row]
             cell.btmW.constant = 0
             cell.contentRight.constant = 0

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

@@ -159,7 +159,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
         case "修改信息":
             let vc = XinCaiGouViewController()
             vc.delegate = self
-            vc.cgName = model?.purchaser!
+            vc.cgName = model?.purchaser! as! String
             vc.orderNum = model?.po_no!
             vc.po_id = model?.po_id!
             vc.ven_id = model?.ven_id!