禅道bug

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

@@ -216,7 +216,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
         
         listView.register(UINib(nibName: "CRKBtnCell", bundle: nil), forCellReuseIdentifier: "CRKBtnCell")
         listView.register(UINib(nibName: "NewOnlyRKCell", bundle: nil), forCellReuseIdentifier: "NewOnlyRKCell")
-        
+        listView.register(UINib(nibName: "TitleAndLblCell", bundle: nil), forCellReuseIdentifier: "TitleAndLblCell")
         
         loadData()
         
@@ -315,6 +315,10 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
             alterView.delegate = self
             alterView.titleLbl.text = "请填写入库备注"
             alterView.placerLbl.text = "请填写入库备注..."
+            if remark.count > 0 {
+                alterView.textview.text = remark
+                alterView.placerLbl.isHidden = true
+            }
             self.view.window?.addSubview(alterView)
         }
         if indexPath.row == 2 {
@@ -451,6 +455,25 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
             return cell
         }
         
+        if indexPath.row == 4 {
+            let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndLblCell") as! TitleAndLblCell
+            cell.nameLbl.text = titleArr[indexPath.row]
+            cell.btmLine.isHidden = true
+            cell.contentLbl.text = holderArr[indexPath.row]
+            cell.btmW.constant = 0
+            cell.contentRight.constant = 0
+            cell.imgRight.constant = 15
+            cell.contentLbl.textColor = UIColor(named: "#999999")
+            if remark.count != 0 {
+                cell.contentLbl.text = remark
+                cell.btmW.constant = 15
+                cell.contentRight.constant = 5
+                cell.imgRight.constant = 22
+                cell.contentLbl.textColor = UIColor(named: "标题字颜色")
+            }
+            return cell
+        }
+        
         let cell = tableView.dequeueReusableCell(withIdentifier: "CRKBtnCell") as! CRKBtnCell
         cell.tag = indexPath.row
         cell.nameLbl.text = titleArr[indexPath.row]
@@ -559,6 +582,16 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
         vc.rkSelectArr = rkSelectArr
         self.navigationController?.pushViewController(vc, animated: true)
     }
+    func getStrHeight(str:String) -> CGFloat{
+        let lbl = UILabel()
+        lbl.text = titleArr.last
+        lbl.font = UIFont.systemFont(ofSize: 13)
+        lbl.sizeToFit()
+        let margin = lbl.bounds.size.width + 77
+        let viewSize = CGSize(width:fullScreenWidth - margin , height: CGFloat(MAXFLOAT))
+        let font = UIFont.systemFont(ofSize: 13)
+        return (str as NSString).boundingRect(with: viewSize, options: [.usesLineFragmentOrigin], attributes: [NSAttributedString.Key.font:font], context: nil).height
+    }
     //MARK: - cell delegate
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if indexPath.section == 0 {
@@ -567,6 +600,11 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
                     return 0.001
                 }
             }
+            if indexPath.row == 4 {
+                if getStrHeight(str: remark)+30 > 49 {
+                    return getStrHeight(str: remark)+30
+                }
+            }
             return 49
         }
         

GeliBusinessPlatform/ViewController/出入库记录/CRKBtnCell.xib

@@ -41,7 +41,7 @@
                         <color key="textColor" name="标题字颜色"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="内容" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rkw-Cn-WEC">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="内容" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rkw-Cn-WEC">
                         <rect key="frame" x="63" y="0.0" width="239" height="64"/>
                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                         <color key="textColor" name="个人中心灰色字体"/>

GeliBusinessPlatform/ViewController/新增采购单/XinCaiGouViewController.swift

@@ -105,8 +105,6 @@ class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableVie
             }
         }else{
             datas.forEach { (model) in
-                let p = model.target_Price as! NSString
-                let amount = p.floatValue * Float(model.target_Count!)
                 let goods = [
                     "goods_id":model.goods_id as Any,
                     "sku_id":model.sku_id as Any,
@@ -114,8 +112,8 @@ class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableVie
                     "sku_name":model.sku_attr as Any,
                     "num":model.target_Count as Any,
                     "unit":model.unit as Any,
-                    "price":model.target_Price as Any,
-                    "amount":amount as Any,
+                    "price":model.price as Any,
+                    "amount":model.target_Price as Any,
                     "pog_id":model.pog_id as Any
                 ]
                 goodsInfoArr?.append(goods)

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

@@ -128,7 +128,7 @@ class CGDListVC: BaseViewController , UITableViewDelegate, UITableViewDataSource
         let cell = tableView.dequeueReusableCell(withIdentifier: "CGDListCell") as! CGDListCell
         let model = datas[indexPath.row]
         cell.cgDataArr = model.goods_res
-        cell.nameLbl.text = model.purchaser!
+        cell.nameLbl.text = model.po_no!
         cell.statusLbl.isHidden = true
         var status = ""
         if orderStatus == 2 {