调整无数据显示“---”

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

@@ -160,6 +160,9 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
         
         
     }
+    
+    var gmNumber:Int?
+    
     var sku_id:Int?
     var goods_id:Int?
     @IBOutlet weak var lgBtnTitLbl: UILabel!
@@ -203,7 +206,11 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
         listView.register(UINib(nibName: "CRKBtnCell", bundle: nil), forCellReuseIdentifier: "CRKBtnCell")
         listView.register(UINib(nibName: "NewOnlyRKCell", bundle: nil), forCellReuseIdentifier: "NewOnlyRKCell")
         let UserToken = UserDefaults.standard.value(forKey: "user_token")
+        
         HUD.flash(.progress)
+        listView.isHidden = true
+        lgBtn.isHidden = true
+        lgBtnTitLbl.isHidden = true
         InputInitInfo(["user_token":UserToken as Any,"goods_id":goods_id as Any], success: { (data) in
             let model = data as! InputInitInfoModel
             
@@ -226,6 +233,8 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
                     })
                 }
             })
+            
+            
             if self.authArr.contains("63") == false && self.authArr.contains("65") == false {
                 self.listView.isHidden = true
                 self.lgBtn.isHidden = true
@@ -234,12 +243,31 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
                 return
             }
             
-            self.lgBtnTitLbl.text = "提交申请"
-            if self.authArr.contains("63"){
-                self.isGm = true
-                self.lgBtnTitLbl.text = "直接入库"
+            if self.gmNumber != nil{//入库申请
+                var pass = false
+                self.authArr.forEach { (str) in
+                    if str == "\(self.gmNumber!)"{
+                        self.lgBtnTitLbl.text = "提交申请"
+                        pass = true
+                    }
+                }
+                if pass == false {
+                    self.listView.isHidden = true
+                    self.lgBtn.isHidden = true
+                    self.lgBtnTitLbl.isHidden = true
+                    HUD.flash(.label("亲，您不具备编辑的权限"), delay:1.2)
+                    return
+                }
+            }else{
+                self.lgBtnTitLbl.text = "提交申请"
+                if self.authArr.contains("63"){
+                    self.isGm = true
+                    self.lgBtnTitLbl.text = "直接入库"
+                }
             }
             
+            
+            
             model.data?.warehouse_res?.forEach({ (item) in
                 self.rkWareHouseArr.append(item)
             })
@@ -249,8 +277,13 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
                 }
                 self.rkDatas.append(item)
             })
+            
+            
             self.listView.reloadData()
             HUD.hide()
+            self.listView.isHidden = false
+            self.lgBtn.isHidden = false
+            self.lgBtnTitLbl.isHidden = false
         }) { (error) in
             
         }
@@ -299,7 +332,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
                     view.titleLbl.text = "请选择库位"
                     var pArr:Array<String> = []
                     for item in poiArr {
-                        let str = item.p_name! + "(库存数:\(item.inventory_count!)"
+                        let str = item.p_name! + "(库存数:\(item.inventory_count!))"
                         pArr.append(str)
                     }
                     
@@ -317,19 +350,23 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
                         })
                         if self.glSelectView == nil {
                             let view = GLAlertSelectView(frame: self.view.bounds)
-                            if self.selectIdx != nil {
-                                view.selectNum = self.selectIdx
-                                view.tempNum = view.selectNum
-                            }
+                            
                             view.isOnlySelectKuWei = true
                             view.delegate = self
                             view.titleLbl.text = "请选择库位"
                             var pArr:Array<String> = []
-                            for item in self.poiArr {
-                                let str = item.p_name! + "(库存数:\(item.inventory_count!)"
+                            for i in 0 ..< self.poiArr.count {
+                                let item = self.poiArr[i]
+                                let str = item.p_name! + "(库存数:\(item.inventory_count!))"
+                                if item.p_id == self.p_id {
+                                    self.selectIdx = i
+                                }
                                 pArr.append(str)
                             }
                             
+                            view.selectNum = self.selectIdx
+                            view.tempNum = view.selectNum
+                            
                             view.dataArr = pArr
                             self.view.addSubview(view)
                             self.glSelectView = view
@@ -589,9 +626,11 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
     func NewSelectWarehouseVCFinish(kuWeiArr: Array<ShopWarehouseDetailDataPositionModel>, data: InputInitInfoWareHouseResModel) {
         holderArr.insert(data.w_name!, at: 0)
         holderArr.remove(at: 1)
-        holderArr.insert("请选择库位", at: 1)
-        holderArr.remove(at: 2)
-        w_id = data.w_id
+        if w_id != data.w_id {
+            holderArr.insert("请选择库位", at: 1)
+            holderArr.remove(at: 2)
+            w_id = data.w_id
+        }
         poiArr.removeAll()
         kuWeiArr.forEach { (item) in
             poiArr.append(item)

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

@@ -11,7 +11,7 @@ import LGButton
 
 class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNonGmCellDelegate,CKGmCellDelegate, PiCiXuanZeViewControllerDelegate,GLAlertSelectViewDelegate,NewSelectItemVcDelegate,GeliAlertTextViewDelegate{
     
-    
+    var gmNumber:Int?
     
     var piCiArr:Array<Array<GetGoodBatchDataModel>>? = []
     
@@ -187,6 +187,10 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
         holderArr.remove(at: 2)
         
         let UserToken = UserDefaults.standard.value(forKey: "user_token")
+        self.listView.isHidden = true
+        self.btmLbl.isHidden = true
+        self.btmBtn.isHidden = true
+        HUD.flash(.progress)
         OutputInitInfo(["user_token":UserToken as Any,"p_id":0 as Any], success: { (data) in
             
             let model = data as! InputInitInfoModel
@@ -211,13 +215,33 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
                 HUD.flash(.label("亲，您不具备编辑的权限"), delay:1.2)
                 return
             }
-            
-            self.btmLbl.text = "提交申请"
-            if self.authArr.contains("64"){
-                    self.isGm = true
-                    self.btmLbl.text = "直接出库"
+            if self.gmNumber != nil{//入库申请
+                var pass = false
+                self.authArr.forEach { (str) in
+                    if str == "\(self.gmNumber!)"{
+                        self.btmLbl.text = "提交申请"
+                        pass = true
+                    }
+                }
+                if pass == false {
+                    self.listView.isHidden = true
+                    self.btmBtn.isHidden = true
+                    self.btmLbl.isHidden = true
+                    HUD.flash(.label("亲，您不具备编辑的权限"), delay:1.2)
+                    return
                 }
+            }else{
+                self.btmLbl.text = "提交申请"
+                if self.authArr.contains("64"){
+                        self.isGm = true
+                        self.btmLbl.text = "直接出库"
+                    }
+            }
             self.listView.reloadData()
+            self.listView.isHidden = false
+            self.btmLbl.isHidden = false
+            self.btmBtn.isHidden = false
+            HUD.hide()
         }) { (error) in
             
         }

GeliBusinessPlatform/ViewController/入库/PiCiXuanZeCell.swift

@@ -10,7 +10,7 @@ import UIKit
 protocol PiCiXuanZeCellDelegate {
     func PiCiXuanZeCellBtnTextChange(sender:String,cell:PiCiXuanZeCell)
     func PiCiXuanZeCellBtnSelect(cell:PiCiXuanZeCell)
-    func PiCiXuanZeCellRefreshCount()
+    func PiCiXuanZeCellRefreshCount(cell:PiCiXuanZeCell)
 }
 class PiCiXuanZeCell: UITableViewCell,UITextFieldDelegate {
     
@@ -37,7 +37,7 @@ class PiCiXuanZeCell: UITableViewCell,UITextFieldDelegate {
     
     func textFieldDidEndEditing(_ textField: UITextField) {
         if isPurnInt(string: textTF.text!){
-           delegate?.PiCiXuanZeCellRefreshCount()
+           delegate?.PiCiXuanZeCellRefreshCount(cell:self)
         }
     }
     @objc func textChange(sender:UITextField){

GeliBusinessPlatform/ViewController/入库/PiCiXuanZeCell.xib

@@ -2,6 +2,7 @@
 <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">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
+        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
@@ -56,7 +57,7 @@
                         <color key="textColor" name="标题字颜色"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="4ur-7d-I3G">
+                    <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="4ur-7d-I3G">
                         <rect key="frame" x="168" y="8.5" width="67" height="32"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="32" id="gMi-WY-5yp"/>

GeliBusinessPlatform/ViewController/入库/PiCiXuanZeViewController.swift

@@ -131,31 +131,38 @@ class PiCiXuanZeViewController: BaseViewController,UITableViewDelegate,UITableVi
     }
     
     func PiCiXuanZeCellBtnTextChange(sender: String, cell: PiCiXuanZeCell) {
+        print("2 == ",selectArr,recordArr.first?.chuHuoLiang)
         let num = sender as NSString
         let data = dataArray[cell.tag]
         data.chuHuoLiang = num.integerValue
     }
-    func PiCiXuanZeCellRefreshCount() {
+    func PiCiXuanZeCellRefreshCount(cell:PiCiXuanZeCell) {
         totalCount = 0
-        print("0 == ",selectArr)
+        print("1 == ",selectArr,recordArr.first?.chuHuoLiang)
         for item in selectArr{
             let data = dataArray[item]
             if data.chuHuoLiang != nil {
                 totalCount += data.chuHuoLiang!
             }
         }
-        let index = IndexPath(row: 0, section: 1)
-        listView.reloadRows(at: [index], with: .none)
+        if selectArr.contains(cell.tag) == false{
+            selectArr.append(cell.tag)
+        }
+        //        let index = IndexPath(row: 0, section: 1)
+        //        listView.reloadRows(at: [index], with: .none)
+        listView.reloadData()
     }
     
     func PiCiXuanZeCellBtnSelect(cell: PiCiXuanZeCell) {
+        
+        //已选择cell
         if selectArr.contains(cell.tag){
             let idx = selectArr.index(of: cell.tag)
             selectArr.remove(at: idx!)
         }else{
             selectArr.append(cell.tag)
         }
-        
+        //数据
         let data = dataArray[cell.tag]
         let idx = recordArr.firstIndex { (model) -> Bool in
             return data.batch_id == model.batch_id
@@ -167,7 +174,7 @@ class PiCiXuanZeViewController: BaseViewController,UITableViewDelegate,UITableVi
         }
         
         totalCount = 0
-        print("0 == ",selectArr)
+        print("0 == ",selectArr,recordArr.first?.chuHuoLiang)
         for item in recordArr{
             if item.chuHuoLiang != nil {
                 totalCount += item.chuHuoLiang!

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

@@ -21,7 +21,7 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
         let UserToken = UserDefaults.standard.value(forKey: "user_token")
         //MARK: - 出入库列表 iog_id
         
-       
+        
         
         var goodInfoArr:Array<Any> = []
         inGoodsModels?.forEach({ (item) in
@@ -469,25 +469,35 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
                 if self.model!.status! > 1 {
                     let  data = ioGoodsModels![indexPath.row]
                     cell.nameLbl.text = data.goods_name
-                    cell.guiGe.text = data.goods_spec
+                    cell.guiGe.text = "规格:---"
+                    if data.goods_spec != nil {
+                        cell.guiGe.text = data.goods_spec
+                    }
                     cell.rukuShu.text = "入库数量:" + "\(data.number!)"
-                    cell.scrq.text = "生产日期:" + dayByDouble(sender: data.production_data!)
-                    cell.gqrq.text = "过期日期:" + dayByDouble(sender:data.valid_date!)
+                    cell.scrq.text = "生产日期:---"
+                    if data.production_data! != 0 {
+                        cell.scrq.text = "生产日期:" + dayByDouble(sender: data.production_data!)
+                    }
+                    cell.gqrq.text = "过期日期:---"
+                    if data.valid_date! != 0 {
+                        cell.gqrq.text = "过期日期:" + dayByDouble(sender:data.valid_date!)
+                    }
                     cell.rkjg.text = "入库价格:¥" + data.amount!
                     cell.rkzj.text = "入库总价:¥" + data.subtotal!
-                    cell.baozhiQ.text = "保质期:" + "\(data.shelf_life!)天"
-                    let month = data.shelf_life!/30
-                    let day = data.shelf_life! % 30
-                  
+                    cell.baozhiQ.text = "保质期:---"
+                    if data.shelf_life != nil {
+                        cell.baozhiQ.text = "保质期:" + "\(data.shelf_life!)天"
+                        let month = data.shelf_life!/30
+                        let day = data.shelf_life! % 30
                         if month > 0 {
                             if day != 0 {
                                 cell.baozhiQ.text = "保质期:" + "\(month)月" + "\(day)天"
-                                              }else{
+                            }else{
                                 cell.baozhiQ.text = "保质期:" + "\(month)月"
-                                              }
+                            }
                             
                         }
-                    
+                    }
                     
                     cell.baogao.text = "报告:无"
                     if data.report_sn != nil {
@@ -497,22 +507,35 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
                 }else{
                     let   model = inGoodsModels![indexPath.row]
                     cell.nameLbl.text = model.goods_name
-                    cell.guiGe.text = model.goods_spec
+                    cell.guiGe.text = "规格:---"
+                    if model.goods_spec != nil {
+                        cell.guiGe.text = model.goods_spec
+                    }
+                    
+                    cell.scrq.text = "生产日期:---"
+                    if model.production_data! != 0 {
+                        cell.scrq.text = "生产日期:" + dayByDouble(sender: model.production_data!)
+                    }
+                    cell.gqrq.text = "过期日期:---"
+                    if model.valid_date! != 0 {
+                        cell.gqrq.text = "过期日期:" + dayByDouble(sender:model.valid_date!)
+                    }
                     cell.rukuShu.text = "入库数量:" + "\(model.number!)"
-                    cell.scrq.text = "生产日期:" + dayByDouble(sender: model.production_data!)
-                    cell.gqrq.text = "过期日期:" + dayByDouble(sender: model.valid_date!)
                     cell.rkjg.text = "入库价格:¥" + "\(model.amount!)"
                     cell.rkzj.text = "入库总价:¥" + "\(model.subtotal!)"
-                    cell.baozhiQ.text = "保质期:" + "\(model.shelf_life!)天"
-                    let month = model.shelf_life!/30
-                    let day = model.shelf_life! % 30
-                    if month > 0 {
-                        if day != 0 {
-                            cell.baozhiQ.text = "保质期:" + "\(month)月" + "\(day)天"
-                                          }else{
-                                              cell.baozhiQ.text = "保质期:" + "\(month)月"
-                                          }
-                        
+                    cell.baozhiQ.text = "保质期:---"
+                    if model.shelf_life != nil {
+                        cell.baozhiQ.text = "保质期:" + "\(model.shelf_life!)天"
+                        let month = model.shelf_life!/30
+                        let day = model.shelf_life! % 30
+                        if month > 0 {
+                            if day != 0 {
+                                cell.baozhiQ.text = "保质期:" + "\(month)月" + "\(day)天"
+                            }else{
+                                cell.baozhiQ.text = "保质期:" + "\(month)月"
+                            }
+                            
+                        }
                     }
                     
                     cell.baogao.text = "报告:无"
@@ -534,24 +557,32 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
             if model.w_name != nil {
                 cell.rukuShu.text = "仓库名:" + "\(model.w_name!)"
             }
-            cell.scrq.text = "生产日期:" + dayByDouble(sender: model.production_data!)
-            cell.gqrq.text = "过期日期:" + dayByDouble(sender: model.valid_date!)
+            cell.scrq.text = "生产日期:---"
+            if model.production_data! != 0 {
+                cell.scrq.text = "生产日期:" + dayByDouble(sender: model.production_data!)
+            }
+            cell.gqrq.text = "过期日期:---"
+            if model.valid_date! != 0 {
+                cell.gqrq.text = "过期日期:" + dayByDouble(sender: model.valid_date!)
+            }
             cell.rkjg.text = "库位名:---"
             if model.p_name != nil {
                 cell.rkjg.text = "库位名:" + "\(model.p_name!)"
             }
-            cell.rkzj.text = "保质期:" + "\(model.shelf_life!)天"
-            let month = model.shelf_life!/30
-            let day = model.shelf_life!%30
-            if month > 0 {
-                if day != 0 {
-                    cell.baozhiQ.text = "保质期:" + "\(month)月" + "\(day)天"
-                                  }else{
-                                      cell.baozhiQ.text = "保质期:" + "\(month)月"
-                                  }
-                
+            cell.rkzj.text = "保质期:---"
+            if model.shelf_life != nil {
+                cell.rkzj.text = "保质期:" + "\(model.shelf_life!)天"
+                let month = model.shelf_life!/30
+                let day = model.shelf_life!%30
+                if month > 0 {
+                    if day != 0 {
+                        cell.baozhiQ.text = "保质期:" + "\(month)月" + "\(day)天"
+                    }else{
+                        cell.baozhiQ.text = "保质期:" + "\(month)月"
+                    }
+                    
+                }
             }
-            
             cell.baozhiQ.text = "报告:无"
             if model.report_sn != nil {
                 cell.baozhiQ.text = "报告:" + "\(model.report_sn!)"

GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift

@@ -419,10 +419,12 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
             return
         case 65: //申请入库
             let vc = NewRKVc()
+            vc.gmNumber = 65
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 66: //申请出库
             let vc = NewCKVc()
+            vc.gmNumber = 66
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 67: //仓库管理