Commit 2f5b1dcc authored by lujunye's avatar lujunye

出库cell显示待完善

parent fe15ff5b
...@@ -38,6 +38,7 @@ class GetGoodBatchDataModel: Mappable { ...@@ -38,6 +38,7 @@ class GetGoodBatchDataModel: Mappable {
var status : Int?//状态:1正常,2临期,3过期 var status : Int?//状态:1正常,2临期,3过期
var report_id : Int?//批次报告 var report_id : Int?//批次报告
var chuHuoLiang:Int?//出货量 var chuHuoLiang:Int?//出货量
var ven_name:String?//供应商名字
required init?( map: Map) { required init?( map: Map) {
} }
...@@ -45,7 +46,7 @@ class GetGoodBatchDataModel: Mappable { ...@@ -45,7 +46,7 @@ class GetGoodBatchDataModel: Mappable {
batch_id <- map["batch_id"] batch_id <- map["batch_id"]
batch_sn <- map["batch_sn"] batch_sn <- map["batch_sn"]
w_id <- map["w_id"] w_id <- map["w_id"]
ven_name <- map["ven_name"]
p_id <- map["p_id"] p_id <- map["p_id"]
inventory <- map["inventory"] inventory <- map["inventory"]
production_data <- map["production_data"] production_data <- map["production_data"]
......
...@@ -16,7 +16,6 @@ class CKGmCell: UITableViewCell { ...@@ -16,7 +16,6 @@ class CKGmCell: UITableViewCell {
@IBOutlet weak var listBg: UIView! @IBOutlet weak var listBg: UIView!
@IBOutlet weak var titleViewH: NSLayoutConstraint! @IBOutlet weak var titleViewH: NSLayoutConstraint!
@IBOutlet weak var gys_name_lbl: UILabel!
@IBOutlet weak var detailLbl: UILabel! @IBOutlet weak var detailLbl: UILabel!
@IBOutlet weak var titleView: UIView! @IBOutlet weak var titleView: UIView!
var delegate:CKGmCellDelegate? var delegate:CKGmCellDelegate?
......
...@@ -315,7 +315,6 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo ...@@ -315,7 +315,6 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
cell.delegate = self cell.delegate = self
cell.nameLbl.text = data.goods_name cell.nameLbl.text = data.goods_name
cell.detailLbl.text = data.spec_str! + " ¥" + data.price! cell.detailLbl.text = data.spec_str! + " ¥" + data.price!
cell.gys_name_lbl.text = "待补充"
let arr = piCiArr?[cell.tag] let arr = piCiArr?[cell.tag]
if arr!.count > 0 { if arr!.count > 0 {
...@@ -389,9 +388,9 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo ...@@ -389,9 +388,9 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
if isGm { if isGm {
let arr = piCiArr![indexPath.row] let arr = piCiArr![indexPath.row]
if arr.count > 0 { if arr.count > 0 {
return CGFloat(175 + arr.count * 30 + 35) return CGFloat(140 + arr.count * 30 + 35)
}else{ }else{
return 175 return 140
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment