优化无内容界面备注显示

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

@@ -50,9 +50,6 @@ class NewOnlyRKCell: UITableViewCell,UITextFieldDelegate {
     func textFieldDidEndEditing(_ textField: UITextField) {
         if isPurnNumber(str: textField.text!) {
             delegate?.NewOnlyRKCellTFinput(text: textField.text!, inputType: textField.tag, cell: self)
-        }else{
-            HUD.flash(.label("请输入正确的数字"), delay: 1.2)
-            textField.text = ""
         }
     }
     func setYuanJiao2(sender:UIView){

GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewOnlyRKCell.xib

@@ -245,7 +245,8 @@
                             <constraint firstAttribute="width" constant="83" id="Dnk-eA-tTw"/>
                             <constraint firstAttribute="height" constant="32" id="zZC-ZH-Pwa"/>
                         </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <color key="textColor" name="蓝色字体颜色"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
                         <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="color" keyPath="borderColor">

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

@@ -128,6 +128,8 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
     @IBAction func gmAction(_ sender: Any) {
         let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
         alterView.delegate = self
+        alterView.titleLbl.text = "请填写入库备注"
+        alterView.placerLbl.text = "请填写入库备注..."
         self.view.window?.addSubview(alterView)
         
         
@@ -282,11 +284,13 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
                 cell.bzqTf.text = "\(data.BZQ!)"
             }
             if data.DayType == 1 {
-                cell.rightBtn.isSelected = true
-                cell.leftBtn.isSelected = false
-            }else{
                 cell.rightBtn.isSelected = false
                 cell.leftBtn.isSelected = true
+                
+            }else{
+                cell.rightBtn.isSelected = true
+                cell.leftBtn.isSelected = false
+                
             }
             return cell
         }

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

@@ -46,7 +46,8 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
         
         let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
         alterView.delegate = self
-        
+        alterView.titleLbl.text = "请填写出库备注"
+        alterView.placerLbl.text = "请填写出库备注..."
         self.view.window?.addSubview(alterView)
         
     }

GeliBusinessPlatform/ViewController/出入库记录/CRKListVC.swift

@@ -407,12 +407,16 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
             if data.io_type == 2 {
                 let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
                 alterView.delegate = self
+                alterView.titleLbl.text = "请填写通过备注"
+                alterView.placerLbl.text = "请填写通过备注..."
                 self.view.window?.addSubview(alterView)
                 isPass = true
             }
         }else{//不通过
             let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
             alterView.delegate = self
+            alterView.titleLbl.text = "请填写不通过备注"
+            alterView.placerLbl.text = "请填写不通过备注..."
             self.view.window?.addSubview(alterView)
             isPass = false
         }

GeliBusinessPlatform/ViewController/出入库记录/CRKXiangQVC.swift

@@ -114,12 +114,20 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
                 let data = self.ioGoodsModels?.first
                 if self.model?.io_type == 1 {
                     self.titleArr = ["仓库","库位","入库类型","审核人","备注"]
+                    var remark = "-"
+                    if (model.data?.io_res?.apply_remark)!.count > 0 {
+                        remark = (model.data?.io_res?.apply_remark)!
+                    }
                     self.holderArr = [(data?.w_name)! as String,(data?.p_name)! as String
-                        ,str,(self.model?.auditor)! as String,(model.data?.io_res?.apply_remark)! as String]
+                        ,str,(self.model?.auditor)! as String,remark]
                     self.navbar.title = "商品入库详情"
                 }else{
                     self.titleArr = ["出库类型","审核人","备注"]
-                    self.holderArr = [str,(self.model?.auditor)! as String,(model.data?.io_res?.apply_remark)! as String]
+                    var remark = "-"
+                    if (model.data?.io_res?.apply_remark)!.count > 0 {
+                        remark = (model.data?.io_res?.apply_remark)!
+                    }
+                    self.holderArr = [str,(self.model?.auditor)! as String,remark]
                     self.navbar.title = "商品出库详情"
                 }
                 self.listView.reloadData()
@@ -135,14 +143,31 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
                 model.data?.goods_res?.forEach({ (item) in
                     self.ioGoodsModels?.append(item)
                 })
-                let data = self.ioGoodsModels?.first
+
                 if self.model?.io_type == 1 {
                     self.titleArr = ["入库类型","审核人","备注","未通过原因"]
-                    self.holderArr = [str,(self.model?.auditor)! as String,(model.data?.io_res?.apply_remark)! as String,(model.data?.io_res?.audit_remark)! as String]
+                    var remark = "-"
+                    if (model.data?.io_res?.apply_remark)!.count > 0 {
+                        remark = (model.data?.io_res?.apply_remark)!
+                    }
+                    var audit_remark = "-"
+                    if (model.data?.io_res?.audit_remark)!.count > 0 {
+                        audit_remark = (model.data?.io_res?.audit_remark)!
+                    }
+
+                    self.holderArr = [str,(self.model?.auditor)! as String,remark,audit_remark]
                     self.navbar.title = "商品入库详情"
                 }else{
+                    var remark = "-"
+                    if (model.data?.io_res?.apply_remark)!.count > 0 {
+                        remark = (model.data?.io_res?.apply_remark)!
+                    }
+                    var audit_remark = "-"
+                    if (model.data?.io_res?.audit_remark)!.count > 0 {
+                        audit_remark = (model.data?.io_res?.audit_remark)!
+                    }
                     self.titleArr = ["出库类型","审核人","备注","未通过原因"]
-                    self.holderArr = [str,(self.model?.auditor)! as String,(model.data?.io_res?.apply_remark)! as String,(model.data?.io_res?.audit_remark)! as String]
+                    self.holderArr = [str,(self.model?.auditor)! as String,remark,audit_remark]
                     self.navbar.title = "商品出库详情"
                 }
                 self.listView.reloadData()
@@ -164,7 +189,11 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
                     })
                     if self.isGm == false {
                         self.titleArr = ["入库类型","备注"]
-                        self.holderArr = [str,(model.data?.io_res?.apply_remark)! as String]
+                        var remark = "-"
+                        if (model.data?.io_res?.apply_remark)!.count > 0 {
+                            remark = (model.data?.io_res?.apply_remark)!
+                        }
+                        self.holderArr = [str,remark]
                     }
                     self.listView.reloadData()
                 }) { (error) in
@@ -184,7 +213,11 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
                     })
                     if self.isGm == false {
                         self.titleArr = ["出库类型","备注"]
-                        self.holderArr = [str,(model.data?.io_res?.apply_remark)! as String]
+                        var remark = "-"
+                        if (model.data?.io_res?.apply_remark)!.count > 0 {
+                            remark = (model.data?.io_res?.apply_remark)!
+                        }
+                        self.holderArr = [str,remark]
                     }
                     self.listView.reloadData()
                 }) { (error) in
@@ -224,12 +257,16 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
             }else{
                 let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
                 alterView.delegate = self
+                alterView.titleLbl.text = "请填写通过备注"
+                alterView.placerLbl.text = "请填写通过备注..."
                 self.view.window?.addSubview(alterView)
                 isFailAction = false
             }
         }else{
             let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
             alterView.delegate = self
+            alterView.titleLbl.text = "请填写不通过备注"
+            alterView.placerLbl.text = "请填写不通过备注..."
             self.view.window?.addSubview(alterView)
             isFailAction = true
         }

GeliBusinessPlatform/ViewController/商品管理/GoodsManageListVC.swift

@@ -498,8 +498,8 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
                 print("入库哦哦")
 //                HUD.flash(.label("敬请期待"),delay: 1.2)
 //                return
-//                let vc = NewRKVc()
-                let vc = NewCKVc()
+                let vc = NewRKVc()
+//                let vc = NewCKVc()
                 vc.sku_id = changeGoodsResModel?.sku_id
                 vc.goods_id = changeGoodsResModel?.goods_id
                 self.navigationController?.pushViewController(vc, animated: true)
@@ -531,8 +531,8 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
  
             }else{
                 print("入库哦哦")
-//                let vc = NewRKVc()
-                let vc = NewCKVc()
+                let vc = NewRKVc()
+//                let vc = NewCKVc()
                 vc.sku_id = changeGoodsResModel?.sku_id
                 vc.goods_id = changeGoodsResModel?.goods_id
                 self.navigationController?.pushViewController(vc, animated: true)