Skip to content

G
GeliBusinessPlatform
Commit 6cb2ea57 authored by lujunye's avatar lujunye
Browse files
Options

禅道bug修复

parent 25bcf4fe
Show whitespace changes
Inline Side-by-side
Showing with 333 additions and 81 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 6cb2ea57
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
9C3AD0BD567C3C122CCE3169 /* Pods_GeliBusinessPlatform.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DA2D518C6159EA47DCD8E0C /* Pods_GeliBusinessPlatform.framework */; }; 9C3AD0BD567C3C122CCE3169 /* Pods_GeliBusinessPlatform.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DA2D518C6159EA47DCD8E0C /* Pods_GeliBusinessPlatform.framework */; };
E007B1D4248F6880004D14CC /* CGDDayCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E007B1D2248F6880004D14CC /* CGDDayCell.swift */; }; E007B1D4248F6880004D14CC /* CGDDayCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E007B1D2248F6880004D14CC /* CGDDayCell.swift */; };
E007B1D5248F6880004D14CC /* CGDDayCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E007B1D3248F6880004D14CC /* CGDDayCell.xib */; }; E007B1D5248F6880004D14CC /* CGDDayCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E007B1D3248F6880004D14CC /* CGDDayCell.xib */; };
E007B1D8248F7276004D14CC /* CGDCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E007B1D6248F7276004D14CC /* CGDCell.swift */; }; E007B1D8248F7276004D14CC /* CGDCell1.swift in Sources */ = {isa = PBXBuildFile; fileRef = E007B1D6248F7276004D14CC /* CGDCell1.swift */; };
E007B1D9248F7276004D14CC /* CGDCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E007B1D7248F7276004D14CC /* CGDCell.xib */; }; E007B1D9248F7276004D14CC /* CGDCell1.xib in Resources */ = {isa = PBXBuildFile; fileRef = E007B1D7248F7276004D14CC /* CGDCell1.xib */; };
E007B1DB248F8F57004D14CC /* PurchaseInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E007B1DA248F8F57004D14CC /* PurchaseInterface.swift */; }; E007B1DB248F8F57004D14CC /* PurchaseInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E007B1DA248F8F57004D14CC /* PurchaseInterface.swift */; };
E00ACBEB2490D6C800128052 /* YDLBVc.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00ACBE92490D6C800128052 /* YDLBVc.swift */; }; E00ACBEB2490D6C800128052 /* YDLBVc.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00ACBE92490D6C800128052 /* YDLBVc.swift */; };
E00ACBEC2490D6C800128052 /* YDLBVc.xib in Resources */ = {isa = PBXBuildFile; fileRef = E00ACBEA2490D6C800128052 /* YDLBVc.xib */; }; E00ACBEC2490D6C800128052 /* YDLBVc.xib in Resources */ = {isa = PBXBuildFile; fileRef = E00ACBEA2490D6C800128052 /* YDLBVc.xib */; };
...@@ -140,6 +140,8 @@ ...@@ -140,6 +140,8 @@
E0516F7F244806C500E373CE /* MsgCenterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0516F7E244806C500E373CE /* MsgCenterViewController.swift */; }; E0516F7F244806C500E373CE /* MsgCenterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0516F7E244806C500E373CE /* MsgCenterViewController.swift */; };
E0516F822448086700E373CE /* MsgCenterCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0516F802448086700E373CE /* MsgCenterCell.swift */; }; E0516F822448086700E373CE /* MsgCenterCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0516F802448086700E373CE /* MsgCenterCell.swift */; };
E0516F832448086700E373CE /* MsgCenterCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0516F812448086700E373CE /* MsgCenterCell.xib */; }; E0516F832448086700E373CE /* MsgCenterCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0516F812448086700E373CE /* MsgCenterCell.xib */; };
E051EBD724A1F0ED00892DA9 /* CGDCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E051EBD524A1F0ED00892DA9 /* CGDCell.swift */; };
E051EBD824A1F0ED00892DA9 /* CGDCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E051EBD624A1F0ED00892DA9 /* CGDCell.xib */; };
E0571C6C248DC60000E85711 /* AddressListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0571C6B248DC60000E85711 /* AddressListModel.swift */; }; E0571C6C248DC60000E85711 /* AddressListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0571C6B248DC60000E85711 /* AddressListModel.swift */; };
E0571C6E248DD4DE00E85711 /* AdressInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0571C6D248DD4DE00E85711 /* AdressInterface.swift */; }; E0571C6E248DD4DE00E85711 /* AdressInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0571C6D248DD4DE00E85711 /* AdressInterface.swift */; };
E05FAD272498A5E500D8C90D /* accountsPayableInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E05FAD262498A5E500D8C90D /* accountsPayableInterface.swift */; }; E05FAD272498A5E500D8C90D /* accountsPayableInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E05FAD262498A5E500D8C90D /* accountsPayableInterface.swift */; };
...@@ -552,8 +554,8 @@ ...@@ -552,8 +554,8 @@
6FA79EFC99FED0CA28AA1444 /* Pods-GeliBusinessPlatform.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GeliBusinessPlatform.debug.xcconfig"; path = "Target Support Files/Pods-GeliBusinessPlatform/Pods-GeliBusinessPlatform.debug.xcconfig"; sourceTree = "<group>"; }; 6FA79EFC99FED0CA28AA1444 /* Pods-GeliBusinessPlatform.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GeliBusinessPlatform.debug.xcconfig"; path = "Target Support Files/Pods-GeliBusinessPlatform/Pods-GeliBusinessPlatform.debug.xcconfig"; sourceTree = "<group>"; };
E007B1D2248F6880004D14CC /* CGDDayCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGDDayCell.swift; sourceTree = "<group>"; }; E007B1D2248F6880004D14CC /* CGDDayCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGDDayCell.swift; sourceTree = "<group>"; };
E007B1D3248F6880004D14CC /* CGDDayCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CGDDayCell.xib; sourceTree = "<group>"; }; E007B1D3248F6880004D14CC /* CGDDayCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CGDDayCell.xib; sourceTree = "<group>"; };
E007B1D6248F7276004D14CC /* CGDCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGDCell.swift; sourceTree = "<group>"; }; E007B1D6248F7276004D14CC /* CGDCell1.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGDCell1.swift; sourceTree = "<group>"; };
E007B1D7248F7276004D14CC /* CGDCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CGDCell.xib; sourceTree = "<group>"; }; E007B1D7248F7276004D14CC /* CGDCell1.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CGDCell1.xib; sourceTree = "<group>"; };
E007B1DA248F8F57004D14CC /* PurchaseInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PurchaseInterface.swift; sourceTree = "<group>"; }; E007B1DA248F8F57004D14CC /* PurchaseInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PurchaseInterface.swift; sourceTree = "<group>"; };
E00ACBE92490D6C800128052 /* YDLBVc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YDLBVc.swift; sourceTree = "<group>"; }; E00ACBE92490D6C800128052 /* YDLBVc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YDLBVc.swift; sourceTree = "<group>"; };
E00ACBEA2490D6C800128052 /* YDLBVc.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = YDLBVc.xib; sourceTree = "<group>"; }; E00ACBEA2490D6C800128052 /* YDLBVc.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = YDLBVc.xib; sourceTree = "<group>"; };
...@@ -688,6 +690,8 @@ ...@@ -688,6 +690,8 @@
E0516F7E244806C500E373CE /* MsgCenterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MsgCenterViewController.swift; sourceTree = "<group>"; }; E0516F7E244806C500E373CE /* MsgCenterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MsgCenterViewController.swift; sourceTree = "<group>"; };
E0516F802448086700E373CE /* MsgCenterCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MsgCenterCell.swift; sourceTree = "<group>"; }; E0516F802448086700E373CE /* MsgCenterCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MsgCenterCell.swift; sourceTree = "<group>"; };
E0516F812448086700E373CE /* MsgCenterCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MsgCenterCell.xib; sourceTree = "<group>"; }; E0516F812448086700E373CE /* MsgCenterCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MsgCenterCell.xib; sourceTree = "<group>"; };
E051EBD524A1F0ED00892DA9 /* CGDCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CGDCell.swift; sourceTree = "<group>"; };
E051EBD624A1F0ED00892DA9 /* CGDCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CGDCell.xib; sourceTree = "<group>"; };
E0571C6B248DC60000E85711 /* AddressListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressListModel.swift; sourceTree = "<group>"; }; E0571C6B248DC60000E85711 /* AddressListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressListModel.swift; sourceTree = "<group>"; };
E0571C6D248DD4DE00E85711 /* AdressInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdressInterface.swift; sourceTree = "<group>"; }; E0571C6D248DD4DE00E85711 /* AdressInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdressInterface.swift; sourceTree = "<group>"; };
E05FAD262498A5E500D8C90D /* accountsPayableInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = accountsPayableInterface.swift; sourceTree = "<group>"; }; E05FAD262498A5E500D8C90D /* accountsPayableInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = accountsPayableInterface.swift; sourceTree = "<group>"; };
...@@ -1627,8 +1631,10 @@ ...@@ -1627,8 +1631,10 @@
E0AA3A90248F626400CBFC27 /* XinCaiGouViewController.xib */, E0AA3A90248F626400CBFC27 /* XinCaiGouViewController.xib */,
E007B1D2248F6880004D14CC /* CGDDayCell.swift */, E007B1D2248F6880004D14CC /* CGDDayCell.swift */,
E007B1D3248F6880004D14CC /* CGDDayCell.xib */, E007B1D3248F6880004D14CC /* CGDDayCell.xib */,
E007B1D6248F7276004D14CC /* CGDCell.swift */, E007B1D6248F7276004D14CC /* CGDCell1.swift */,
E007B1D7248F7276004D14CC /* CGDCell.xib */, E007B1D7248F7276004D14CC /* CGDCell1.xib */,
E051EBD524A1F0ED00892DA9 /* CGDCell.swift */,
E051EBD624A1F0ED00892DA9 /* CGDCell.xib */,
); );
path = "新增采购单"; path = "新增采购单";
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -2778,6 +2784,7 @@ ...@@ -2778,6 +2784,7 @@
files = ( files = (
E042F731245272FF00CDFA12 /* XiaYunDanViewController.xib in Resources */, E042F731245272FF00CDFA12 /* XiaYunDanViewController.xib in Resources */,
F9023F63244999F500DD5A63 /* WarehoseMangementCell.xib in Resources */, F9023F63244999F500DD5A63 /* WarehoseMangementCell.xib in Resources */,
E051EBD824A1F0ED00892DA9 /* CGDCell.xib in Resources */,
E0BE8A84245A76AF00E80134 /* XiaDanCGDiZhiCell.xib in Resources */, E0BE8A84245A76AF00E80134 /* XiaDanCGDiZhiCell.xib in Resources */,
E0516F832448086700E373CE /* MsgCenterCell.xib in Resources */, E0516F832448086700E373CE /* MsgCenterCell.xib in Resources */,
E0228BB1246FDA9A005812FA /* TitleAndLblCell.xib in Resources */, E0228BB1246FDA9A005812FA /* TitleAndLblCell.xib in Resources */,
...@@ -2911,7 +2918,7 @@ ...@@ -2911,7 +2918,7 @@
F95D9B5024484FAE0080D6E3 /* GeliAlertView.xib in Resources */, F95D9B5024484FAE0080D6E3 /* GeliAlertView.xib in Resources */,
E01EA1A1245A5D6B00F019D5 /* YunDanXiangQingViewController.xib in Resources */, E01EA1A1245A5D6B00F019D5 /* YunDanXiangQingViewController.xib in Resources */,
E0BE8A8C245A7D3300E80134 /* BtmBtnCell.xib in Resources */, E0BE8A8C245A7D3300E80134 /* BtmBtnCell.xib in Resources */,
E007B1D9248F7276004D14CC /* CGDCell.xib in Resources */, E007B1D9248F7276004D14CC /* CGDCell1.xib in Resources */,
E0DDCB1E244AE81800DF54C7 /* GuanLianKeHuCell.xib in Resources */, E0DDCB1E244AE81800DF54C7 /* GuanLianKeHuCell.xib in Resources */,
E0DDCB14244ADF2C00DF54C7 /* ChangePriceNormalCell.xib in Resources */, E0DDCB14244ADF2C00DF54C7 /* ChangePriceNormalCell.xib in Resources */,
E01EA1A5245A60E000F019D5 /* XiaDanChengGongViewController.xib in Resources */, E01EA1A5245A60E000F019D5 /* XiaDanChengGongViewController.xib in Resources */,
...@@ -3229,6 +3236,7 @@ ...@@ -3229,6 +3236,7 @@
F942A7FD247500C300FDFC47 /* TestClass.swift in Sources */, F942A7FD247500C300FDFC47 /* TestClass.swift in Sources */,
F950FDD824518B9500C40530 /* FSCalendarDelegationProxy.m in Sources */, F950FDD824518B9500C40530 /* FSCalendarDelegationProxy.m in Sources */,
E01EA1A0245A5D6B00F019D5 /* YunDanXiangQingViewController.swift in Sources */, E01EA1A0245A5D6B00F019D5 /* YunDanXiangQingViewController.swift in Sources */,
E051EBD724A1F0ED00892DA9 /* CGDCell.swift in Sources */,
F9697248248F88C70010D39B /* GeliAltetCodeView.swift in Sources */, F9697248248F88C70010D39B /* GeliAltetCodeView.swift in Sources */,
F93615DB2480B421004187F9 /* WorkInterface.swift in Sources */, F93615DB2480B421004187F9 /* WorkInterface.swift in Sources */,
F956D5A0246A2D9C003FF510 /* LMNImageView.m in Sources */, F956D5A0246A2D9C003FF510 /* LMNImageView.m in Sources */,
...@@ -3300,7 +3308,7 @@ ...@@ -3300,7 +3308,7 @@
E0CC847E24823602009B1FE9 /* WarehouseIoListModel.swift in Sources */, E0CC847E24823602009B1FE9 /* WarehouseIoListModel.swift in Sources */,
E088CC932447124D000DAA8A /* BindViewController.swift in Sources */, E088CC932447124D000DAA8A /* BindViewController.swift in Sources */,
E0EFB9CA24930DD5005FB0CD /* CGDListVC.swift in Sources */, E0EFB9CA24930DD5005FB0CD /* CGDListVC.swift in Sources */,
E007B1D8248F7276004D14CC /* CGDCell.swift in Sources */, E007B1D8248F7276004D14CC /* CGDCell1.swift in Sources */,
E0B9461E24566B3100FBEC9A /* TitleAndTFAndBtnCell.swift in Sources */, E0B9461E24566B3100FBEC9A /* TitleAndTFAndBtnCell.swift in Sources */,
E042F74324529B7B00CDFA12 /* JiTuoWuXinXiView.swift in Sources */, E042F74324529B7B00CDFA12 /* JiTuoWuXinXiView.swift in Sources */,
F933F6CC2452C68B00189561 /* WindowRootViewController.swift in Sources */, F933F6CC2452C68B00189561 /* WindowRootViewController.swift in Sources */,
......
GeliBusinessPlatform/Model/PurchaseModel/PurchaseModel.swift
View file @ 6cb2ea57
...@@ -99,7 +99,7 @@ class PurchaseOrderListDataItemsModel: Mappable { ...@@ -99,7 +99,7 @@ class PurchaseOrderListDataItemsModel: Mappable {
var sku_name :String? //规格值 var sku_name :String? //规格值
var num:Int?//数量 var num:Int?//数量
var no_push_num : String? //未入库数量 var no_push_num : Int? //未入库数量
var frozen_num :Int? var frozen_num :Int?
var amount:String? //采购单价 var amount:String? //采购单价
......
GeliBusinessPlatform/ViewController/供应商管理/GYSGLViewController.swift
View file @ 6cb2ea57
...@@ -162,12 +162,12 @@ class GYSGLViewController: BaseViewController,UITableViewDelegate,UITableViewDat ...@@ -162,12 +162,12 @@ class GYSGLViewController: BaseViewController,UITableViewDelegate,UITableViewDat
} }
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if indexPath.section == 2 { if indexPath.section == 2 {
if img1.image != nil { if zhizhao.count > 0 {
if indexPath.row == 0 { if indexPath.row == 0 {
return 100 return 100
} }
} }
if img2.image != nil { if food_production_license.count > 0 {
if indexPath.row == 1 { if indexPath.row == 1 {
return 100 return 100
} }
...@@ -266,16 +266,16 @@ class GYSGLViewController: BaseViewController,UITableViewDelegate,UITableViewDat ...@@ -266,16 +266,16 @@ class GYSGLViewController: BaseViewController,UITableViewDelegate,UITableViewDat
cell.button.setTitle("上传", for: .normal) cell.button.setTitle("上传", for: .normal)
cell.delegate = self cell.delegate = self
cell.tag = indexPath.row cell.tag = indexPath.row
if img1.image != nil { if zhizhao.count > 0 {
if indexPath.row == 0 { if indexPath.row == 0 {
cell.imgBgView.isHidden = false cell.imgBgView.isHidden = false
cell.imgView.image = img1.image cell.imgView.sd_setImage( with: URL(string: SERVERCE_ImageHost + zhizhao))
} }
} }
if img2.image != nil { if food_production_license.count > 0 {
if indexPath.row == 1 { if indexPath.row == 1 {
cell.imgBgView.isHidden = false cell.imgBgView.isHidden = false
cell.imgView.image = img2.image cell.imgView.sd_setImage( with: URL(string: SERVERCE_ImageHost + food_production_license))
} }
} }
......
GeliBusinessPlatform/ViewController/供应商管理/GYSListViewController.swift
View file @ 6cb2ea57
...@@ -200,9 +200,11 @@ class GYSListViewController: BaseViewController,UITableViewDataSource,UITableVie ...@@ -200,9 +200,11 @@ class GYSListViewController: BaseViewController,UITableViewDataSource,UITableVie
vc.phoneNum = data.contacts_mobile! vc.phoneNum = data.contacts_mobile!
vc.zhizhao = data.zhizhao! vc.zhizhao = data.zhizhao!
vc.food_production_license = data.food_production_license! vc.food_production_license = data.food_production_license!
vc.img1.sd_setImage(with: URL(string: SERVERCE_ImageHost + data.zhizhao!), placeholderImage: UIImage(named: "worktest1"))
print("img = ",SERVERCE_ImageHost + data.zhizhao!) // vc.img1.sd_setImage(with: URL(string: SERVERCE_ImageHost + data.zhizhao!), placeholderImage: UIImage(named: "dowPhone"))
vc.img2.sd_setImage(with: URL(string: SERVERCE_ImageHost + data.food_production_license!), placeholderImage: UIImage(named: "worktest1")) //
//
// vc.img2.sd_setImage(with: URL(string: SERVERCE_ImageHost + data.food_production_license!), placeholderImage: UIImage(named: "dowPhone"))
self.navigationController!.pushViewController(vc, animated: true) self.navigationController!.pushViewController(vc, animated: true)
}else{ }else{
......
GeliBusinessPlatform/ViewController/客户管理/BingDingKeHuViewController.swift
View file @ 6cb2ea57
...@@ -41,7 +41,7 @@ class BingDingKeHuViewController: BaseViewController,UITableViewDelegate,UITable ...@@ -41,7 +41,7 @@ class BingDingKeHuViewController: BaseViewController,UITableViewDelegate,UITable
make.height.equalTo(30) make.height.equalTo(30)
} }
searchV = searchBr searchV = searchBr
searchBr.placeholderStr = "客户名称/联系人/电话号码" searchBr.placeholderStr = "输入完整的客户名/联系人/电话号码搜索"
searchBr.cornerRadius = 35/2.0 searchBr.cornerRadius = 35/2.0
searchBr.delegate = self searchBr.delegate = self
searchBr.delegateL = self searchBr.delegateL = self
......
GeliBusinessPlatform/ViewController/客户管理/XinZengAndBianJiKeHuViewController.swift
View file @ 6cb2ea57
...@@ -117,10 +117,10 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour ...@@ -117,10 +117,10 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour
HUD.flash(.label("请选择绑定用户"), delay: 1.2) HUD.flash(.label("请选择绑定用户"), delay: 1.2)
return return
} }
if discount.count == 0 { // if discount.count == 0 {
HUD.flash(.label("请填写折扣数,没有折扣请输入0"), delay: 1.2) // HUD.flash(.label("请填写折扣数,没有折扣请输入0"), delay: 1.2)
return // return
} // }
let alertView = GeliAlertView(frame: self.view.window!.bounds) let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self; alertView.delegate = self;
alertView.tishiLbl.text = "" alertView.tishiLbl.text = ""
...@@ -165,7 +165,7 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour ...@@ -165,7 +165,7 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour
} }
let titleArr = ["客户名称：","客户手机号码： ","客户公司名称：","绑定用户：","客户类型：","客户折扣："] let titleArr = ["客户名称：","客户手机号码： ","客户公司名称：","绑定用户：","客户类型：","客户折扣："]
var holderArr = ["请输入客户名","请输入手机号码","请输入公司名称","搜索绑定","个人","请输入折扣数值(0~100)"] var holderArr = ["请输入客户名","请输入手机号码","请输入公司名称","搜索绑定","个人","敬请期待"]
//MARK: - CELL DELEGATE //MARK: - CELL DELEGATE
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return 49 return 49
...@@ -250,8 +250,12 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour ...@@ -250,8 +250,12 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour
cell.textTF.text = companyName cell.textTF.text = companyName
break break
case 5: case 5:
cell.textTF.keyboardType = .numberPad cell.textTF.isUserInteractionEnabled = false
cell.textTF.clearButtonMode = .never
// cell.textTF.keyboardType = .numberPad
if discount != "0" && discount != "100"{
cell.textTF.text = discount cell.textTF.text = discount
}
break break
default: default:
break break
......
GeliBusinessPlatform/ViewController/新增采购单/CGDCell.swift
View file @ 6cb2ea57
...@@ -21,7 +21,6 @@ class CGDCell: UITableViewCell { ...@@ -21,7 +21,6 @@ class CGDCell: UITableViewCell {
@IBOutlet weak var cgCount: UILabel! @IBOutlet weak var cgCount: UILabel!
@IBOutlet weak var detailLbl: UILabel! @IBOutlet weak var detailLbl: UILabel!
@IBOutlet weak var nameLbl: UILabel! @IBOutlet weak var nameLbl: UILabel!
@IBOutlet weak var rkCount: UILabel!
@IBOutlet weak var btnWidth: NSLayoutConstraint! @IBOutlet weak var btnWidth: NSLayoutConstraint!
override func awakeFromNib() { override func awakeFromNib() {
super.awakeFromNib() super.awakeFromNib()
......
GeliBusinessPlatform/ViewController/新增采购单/CGDCell.xib
View file @ 6cb2ea57
...@@ -60,26 +60,20 @@ ...@@ -60,26 +60,20 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kBE-rT-dOt"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kBE-rT-dOt">
<rect key="frame" x="15" y="82" width="345" height="38.5"/> <rect key="frame" x="15" y="82" width="345" height="38.5"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="采购数量" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0cf-lx-CTb"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="采购数量" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0cf-lx-CTb">
<rect key="frame" x="0.0" y="0.0" width="86.5" height="38.5"/> <rect key="frame" x="25" y="11.5" width="54" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/> <color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="采购单价" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="46J-ih-76e"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="采购单价" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="46J-ih-76e">
<rect key="frame" x="172.5" y="0.0" width="86.5" height="38.5"/> <rect key="frame" x="146" y="11.5" width="53.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/> <color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小记(元)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mJ8-AR-jCS"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小计(元)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mJ8-AR-jCS">
<rect key="frame" x="259" y="0.0" width="86" height="38.5"/> <rect key="frame" x="270" y="11.5" width="50" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="已入库" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0CN-yV-fkL">
<rect key="frame" x="86.5" y="0.0" width="86" height="38.5"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/> <color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
...@@ -87,45 +81,29 @@ ...@@ -87,45 +81,29 @@
</subviews> </subviews>
<color key="backgroundColor" name="app底色"/> <color key="backgroundColor" name="app底色"/>
<constraints> <constraints>
<constraint firstItem="46J-ih-76e" firstAttribute="leading" secondItem="0CN-yV-fkL" secondAttribute="trailing" id="3jX-hh-azO"/> <constraint firstAttribute="trailing" secondItem="mJ8-AR-jCS" secondAttribute="trailing" constant="25" id="A8g-im-XAy"/>
<constraint firstAttribute="bottom" secondItem="0CN-yV-fkL" secondAttribute="bottom" id="8h5-Ko-20V"/> <constraint firstItem="mJ8-AR-jCS" firstAttribute="centerY" secondItem="kBE-rT-dOt" secondAttribute="centerY" id="AX2-Cs-Llw"/>
<constraint firstItem="0CN-yV-fkL" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="top" id="ATO-qG-Szh"/> <constraint firstItem="0cf-lx-CTb" firstAttribute="leading" secondItem="kBE-rT-dOt" secondAttribute="leading" constant="25" id="H3G-IO-8JD"/>
<constraint firstAttribute="trailing" secondItem="mJ8-AR-jCS" secondAttribute="trailing" id="FCr-V1-Y94"/> <constraint firstItem="46J-ih-76e" firstAttribute="centerY" secondItem="kBE-rT-dOt" secondAttribute="centerY" id="Nca-EX-ZA8"/>
<constraint firstItem="46J-ih-76e" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="top" id="HCg-wT-cHb"/> <constraint firstItem="0cf-lx-CTb" firstAttribute="centerY" secondItem="kBE-rT-dOt" secondAttribute="centerY" id="i2c-Pg-dFF"/>
<constraint firstItem="46J-ih-76e" firstAttribute="width" secondItem="0cf-lx-CTb" secondAttribute="width" id="OyZ-WM-Xai"/> <constraint firstItem="46J-ih-76e" firstAttribute="centerX" secondItem="kBE-rT-dOt" secondAttribute="centerX" id="mv6-TA-BuJ"/>
<constraint firstItem="mJ8-AR-jCS" firstAttribute="leading" secondItem="46J-ih-76e" secondAttribute="trailing" id="Stg-5f-lqd"/>
<constraint firstAttribute="bottom" secondItem="mJ8-AR-jCS" secondAttribute="bottom" id="YmS-vl-wXj"/>
<constraint firstItem="mJ8-AR-jCS" firstAttribute="width" secondItem="0cf-lx-CTb" secondAttribute="width" id="e5h-0B-GlD"/>
<constraint firstItem="0CN-yV-fkL" firstAttribute="width" secondItem="0cf-lx-CTb" secondAttribute="width" id="juc-qv-Zqw"/>
<constraint firstItem="mJ8-AR-jCS" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="top" id="l8U-aW-ibk"/>
<constraint firstItem="0cf-lx-CTb" firstAttribute="leading" secondItem="kBE-rT-dOt" secondAttribute="leading" id="llw-Oo-lEa"/>
<constraint firstAttribute="bottom" secondItem="46J-ih-76e" secondAttribute="bottom" id="lrr-2q-xH2"/>
<constraint firstAttribute="height" constant="38.5" id="psI-Xx-5yI"/> <constraint firstAttribute="height" constant="38.5" id="psI-Xx-5yI"/>
<constraint firstItem="0cf-lx-CTb" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="top" id="ugb-br-gta"/>
<constraint firstAttribute="bottom" secondItem="0cf-lx-CTb" secondAttribute="bottom" id="uot-8a-LKU"/>
<constraint firstItem="0CN-yV-fkL" firstAttribute="leading" secondItem="0cf-lx-CTb" secondAttribute="trailing" id="yqL-34-myb"/>
</constraints> </constraints>
</view> </view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HF8-ja-1Mp"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HF8-ja-1Mp">
<rect key="frame" x="41.5" y="135.5" width="33" height="16"/> <rect key="frame" x="50.5" y="135.5" width="33" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xMe-fM-o6d">
<rect key="frame" x="300.5" y="135.5" width="33" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/> <color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c8T-ya-FE8"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m0Z-19-yG6">
<rect key="frame" x="128" y="135.5" width="33" height="16"/> <rect key="frame" x="171" y="135.5" width="33" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/> <color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m0Z-19-yG6"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xMe-fM-o6d">
<rect key="frame" x="214" y="135.5" width="33" height="16"/> <rect key="frame" x="293.5" y="135.5" width="33" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/> <color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
...@@ -133,28 +111,26 @@ ...@@ -133,28 +111,26 @@
</subviews> </subviews>
<color key="backgroundColor" name="白色背景色"/> <color key="backgroundColor" name="白色背景色"/>
<constraints> <constraints>
<constraint firstItem="c8T-ya-FE8" firstAttribute="centerX" secondItem="0CN-yV-fkL" secondAttribute="centerX" id="50J-Iz-lij"/> <constraint firstItem="xMe-fM-o6d" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="bottom" constant="15" id="1qd-FP-LcT"/>
<constraint firstItem="kBE-rT-dOt" firstAttribute="top" secondItem="uED-Ck-HCh" secondAttribute="bottom" constant="10" id="DXT-Nj-hCW"/> <constraint firstItem="kBE-rT-dOt" firstAttribute="top" secondItem="uED-Ck-HCh" secondAttribute="bottom" constant="10" id="DXT-Nj-hCW"/>
<constraint firstAttribute="trailing" secondItem="uED-Ck-HCh" secondAttribute="trailing" constant="15" id="Dzn-qc-0aj"/> <constraint firstAttribute="trailing" secondItem="uED-Ck-HCh" secondAttribute="trailing" constant="15" id="Dzn-qc-0aj"/>
<constraint firstItem="xMe-fM-o6d" firstAttribute="centerX" secondItem="mJ8-AR-jCS" secondAttribute="centerX" id="E49-7P-0vg"/>
<constraint firstItem="zUM-gk-TDF" firstAttribute="leading" secondItem="53n-Ij-aLj" secondAttribute="trailing" id="FNm-yK-j5F"/> <constraint firstItem="zUM-gk-TDF" firstAttribute="leading" secondItem="53n-Ij-aLj" secondAttribute="trailing" id="FNm-yK-j5F"/>
<constraint firstAttribute="trailing" secondItem="zUM-gk-TDF" secondAttribute="trailing" id="GYX-Pp-TVw"/> <constraint firstAttribute="trailing" secondItem="zUM-gk-TDF" secondAttribute="trailing" id="GYX-Pp-TVw"/>
<constraint firstItem="53n-Ij-aLj" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="IY9-Bn-zNP"/> <constraint firstItem="53n-Ij-aLj" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="IY9-Bn-zNP"/>
<constraint firstAttribute="trailing" secondItem="kBE-rT-dOt" secondAttribute="trailing" constant="15" id="Kjn-Yq-ekR"/> <constraint firstAttribute="trailing" secondItem="kBE-rT-dOt" secondAttribute="trailing" constant="15" id="Kjn-Yq-ekR"/>
<constraint firstItem="c2P-6b-lpC" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="LQH-t0-OEw"/> <constraint firstItem="c2P-6b-lpC" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="LQH-t0-OEw"/>
<constraint firstAttribute="trailing" secondItem="c2P-6b-lpC" secondAttribute="trailing" id="Nfl-mv-J8f"/> <constraint firstAttribute="trailing" secondItem="c2P-6b-lpC" secondAttribute="trailing" id="Nfl-mv-J8f"/>
<constraint firstItem="HF8-ja-1Mp" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="bottom" constant="15" id="Vev-0q-oMu"/>
<constraint firstItem="m0Z-19-yG6" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="bottom" constant="15" id="XKL-x2-iiq"/>
<constraint firstItem="kBE-rT-dOt" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="ZH2-ul-Rc5"/> <constraint firstItem="kBE-rT-dOt" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="ZH2-ul-Rc5"/>
<constraint firstItem="xMe-fM-o6d" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="bottom" constant="15" id="bMI-FR-LIr"/> <constraint firstItem="m0Z-19-yG6" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="bottom" constant="15" id="Zv2-hp-Kwg"/>
<constraint firstItem="uED-Ck-HCh" firstAttribute="top" secondItem="53n-Ij-aLj" secondAttribute="bottom" constant="5" id="c3e-zB-PD7"/> <constraint firstItem="uED-Ck-HCh" firstAttribute="top" secondItem="53n-Ij-aLj" secondAttribute="bottom" constant="5" id="c3e-zB-PD7"/>
<constraint firstItem="c8T-ya-FE8" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="bottom" constant="15" id="gK3-XY-e9S"/>
<constraint firstItem="zUM-gk-TDF" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="gwz-w4-HaY"/> <constraint firstItem="zUM-gk-TDF" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="gwz-w4-HaY"/>
<constraint firstItem="HF8-ja-1Mp" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="bottom" constant="15" id="j4F-Nl-GY1"/>
<constraint firstItem="53n-Ij-aLj" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="15" id="jb1-N1-bkz"/> <constraint firstItem="53n-Ij-aLj" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="15" id="jb1-N1-bkz"/>
<constraint firstItem="xMe-fM-o6d" firstAttribute="centerX" secondItem="mJ8-AR-jCS" secondAttribute="centerX" id="qgi-hs-sJh"/> <constraint firstItem="m0Z-19-yG6" firstAttribute="centerX" secondItem="46J-ih-76e" secondAttribute="centerX" id="sq5-BU-PcI"/>
<constraint firstItem="HF8-ja-1Mp" firstAttribute="centerX" secondItem="0cf-lx-CTb" secondAttribute="centerX" id="tto-xs-IvJ"/>
<constraint firstItem="m0Z-19-yG6" firstAttribute="centerX" secondItem="46J-ih-76e" secondAttribute="centerX" id="v9Y-gk-Hcc"/>
<constraint firstItem="uED-Ck-HCh" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="vb1-1w-P6S"/> <constraint firstItem="uED-Ck-HCh" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="vb1-1w-P6S"/>
<constraint firstAttribute="bottom" secondItem="c2P-6b-lpC" secondAttribute="bottom" id="xqy-z2-fqO"/> <constraint firstAttribute="bottom" secondItem="c2P-6b-lpC" secondAttribute="bottom" id="xqy-z2-fqO"/>
<constraint firstItem="HF8-ja-1Mp" firstAttribute="centerX" secondItem="0cf-lx-CTb" secondAttribute="centerX" id="zy8-Zj-6iF"/>
</constraints> </constraints>
</tableViewCellContentView> </tableViewCellContentView>
<color key="backgroundColor" name="白色背景色"/> <color key="backgroundColor" name="白色背景色"/>
...@@ -167,7 +143,6 @@ ...@@ -167,7 +143,6 @@
<outlet property="detailLbl" destination="uED-Ck-HCh" id="zoK-Xu-ytf"/> <outlet property="detailLbl" destination="uED-Ck-HCh" id="zoK-Xu-ytf"/>
<outlet property="lblRight" destination="FNm-yK-j5F" id="Ax4-S8-T59"/> <outlet property="lblRight" destination="FNm-yK-j5F" id="Ax4-S8-T59"/>
<outlet property="nameLbl" destination="53n-Ij-aLj" id="aPc-sG-d9k"/> <outlet property="nameLbl" destination="53n-Ij-aLj" id="aPc-sG-d9k"/>
<outlet property="rkCount" destination="c8T-ya-FE8" id="L0q-P3-PMe"/>
</connections> </connections>
<point key="canvasLocation" x="132.60869565217394" y="132.58928571428572"/> <point key="canvasLocation" x="132.60869565217394" y="132.58928571428572"/>
</tableViewCell> </tableViewCell>
......
GeliBusinessPlatform/ViewController/新增采购单/CGDCell1.swift 0 → 100644
View file @ 6cb2ea57
//
// CGDCell.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/6/9.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
protocol CGDCell1Delegate {
func CGDCellDelAction(cell:CGDCell1)
}
class CGDCell1: UITableViewCell {
var delegate:CGDCell1Delegate?
@IBAction func delAction(_ sender: UIButton) {
delegate?.CGDCellDelAction(cell: self)
}
@IBOutlet weak var lblRight: NSLayoutConstraint!
@IBOutlet weak var cgTotalPrice: UILabel!
@IBOutlet weak var cgPrice: UILabel!
@IBOutlet weak var cgCount: UILabel!
@IBOutlet weak var detailLbl: UILabel!
@IBOutlet weak var nameLbl: UILabel!
@IBOutlet weak var rkCount: UILabel!
@IBOutlet weak var btnWidth: NSLayoutConstraint!
override func awakeFromNib() {
super.awakeFromNib()
self.selectionStyle = .none
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}
GeliBusinessPlatform/ViewController/新增采购单/CGDCell1.xib 0 → 100644
View file @ 6cb2ea57
<?xml version="1.0" encoding="UTF-8"?>
<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"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="CGDCell1" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="375" height="174"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="375" height="174"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="c2P-6b-lpC">
<rect key="frame" x="15" y="173" width="360" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="tYk-77-cq1"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zUM-gk-TDF">
<rect key="frame" x="326.5" y="0.0" width="48.5" height="48.5"/>
<constraints>
<constraint firstAttribute="height" constant="48.5" id="5oN-gR-Ld8"/>
<constraint firstAttribute="width" constant="48.5" id="IJP-pf-u5R"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="移除">
<color key="titleColor" name="#F57575"/>
</state>
<connections>
<action selector="delAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="VeY-uG-gFs"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="标题" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="53n-Ij-aLj">
<rect key="frame" x="15" y="15" width="311.5" height="37"/>
<constraints>
<constraint firstAttribute="height" constant="37" id="2Td-7E-Tpz"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uED-Ck-HCh">
<rect key="frame" x="15" y="57" width="345" height="15"/>
<constraints>
<constraint firstAttribute="height" constant="15" id="Omj-i4-Ql2"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
<color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kBE-rT-dOt">
<rect key="frame" x="15" y="82" width="345" height="38.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="采购数量" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0cf-lx-CTb">
<rect key="frame" x="0.0" y="0.0" width="86.5" height="38.5"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="采购单价" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="46J-ih-76e">
<rect key="frame" x="172.5" y="0.0" width="86.5" height="38.5"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小计(元)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mJ8-AR-jCS">
<rect key="frame" x="259" y="0.0" width="86" height="38.5"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="已入库" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0CN-yV-fkL">
<rect key="frame" x="86.5" y="0.0" width="86" height="38.5"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" name="app底色"/>
<constraints>
<constraint firstItem="46J-ih-76e" firstAttribute="leading" secondItem="0CN-yV-fkL" secondAttribute="trailing" id="3jX-hh-azO"/>
<constraint firstAttribute="bottom" secondItem="0CN-yV-fkL" secondAttribute="bottom" id="8h5-Ko-20V"/>
<constraint firstItem="0CN-yV-fkL" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="top" id="ATO-qG-Szh"/>
<constraint firstAttribute="trailing" secondItem="mJ8-AR-jCS" secondAttribute="trailing" id="FCr-V1-Y94"/>
<constraint firstItem="46J-ih-76e" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="top" id="HCg-wT-cHb"/>
<constraint firstItem="46J-ih-76e" firstAttribute="width" secondItem="0cf-lx-CTb" secondAttribute="width" id="OyZ-WM-Xai"/>
<constraint firstItem="mJ8-AR-jCS" firstAttribute="leading" secondItem="46J-ih-76e" secondAttribute="trailing" id="Stg-5f-lqd"/>
<constraint firstAttribute="bottom" secondItem="mJ8-AR-jCS" secondAttribute="bottom" id="YmS-vl-wXj"/>
<constraint firstItem="mJ8-AR-jCS" firstAttribute="width" secondItem="0cf-lx-CTb" secondAttribute="width" id="e5h-0B-GlD"/>
<constraint firstItem="0CN-yV-fkL" firstAttribute="width" secondItem="0cf-lx-CTb" secondAttribute="width" id="juc-qv-Zqw"/>
<constraint firstItem="mJ8-AR-jCS" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="top" id="l8U-aW-ibk"/>
<constraint firstItem="0cf-lx-CTb" firstAttribute="leading" secondItem="kBE-rT-dOt" secondAttribute="leading" id="llw-Oo-lEa"/>
<constraint firstAttribute="bottom" secondItem="46J-ih-76e" secondAttribute="bottom" id="lrr-2q-xH2"/>
<constraint firstAttribute="height" constant="38.5" id="psI-Xx-5yI"/>
<constraint firstItem="0cf-lx-CTb" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="top" id="ugb-br-gta"/>
<constraint firstAttribute="bottom" secondItem="0cf-lx-CTb" secondAttribute="bottom" id="uot-8a-LKU"/>
<constraint firstItem="0CN-yV-fkL" firstAttribute="leading" secondItem="0cf-lx-CTb" secondAttribute="trailing" id="yqL-34-myb"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HF8-ja-1Mp">
<rect key="frame" x="41.5" y="135.5" width="33" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xMe-fM-o6d">
<rect key="frame" x="300.5" y="135.5" width="33" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c8T-ya-FE8">
<rect key="frame" x="128" y="135.5" width="33" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m0Z-19-yG6">
<rect key="frame" x="214" y="135.5" width="33" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" name="白色背景色"/>
<constraints>
<constraint firstItem="c8T-ya-FE8" firstAttribute="centerX" secondItem="0CN-yV-fkL" secondAttribute="centerX" id="50J-Iz-lij"/>
<constraint firstItem="kBE-rT-dOt" firstAttribute="top" secondItem="uED-Ck-HCh" secondAttribute="bottom" constant="10" id="DXT-Nj-hCW"/>
<constraint firstAttribute="trailing" secondItem="uED-Ck-HCh" secondAttribute="trailing" constant="15" id="Dzn-qc-0aj"/>
<constraint firstItem="zUM-gk-TDF" firstAttribute="leading" secondItem="53n-Ij-aLj" secondAttribute="trailing" id="FNm-yK-j5F"/>
<constraint firstAttribute="trailing" secondItem="zUM-gk-TDF" secondAttribute="trailing" id="GYX-Pp-TVw"/>
<constraint firstItem="53n-Ij-aLj" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="IY9-Bn-zNP"/>
<constraint firstAttribute="trailing" secondItem="kBE-rT-dOt" secondAttribute="trailing" constant="15" id="Kjn-Yq-ekR"/>
<constraint firstItem="c2P-6b-lpC" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="LQH-t0-OEw"/>
<constraint firstAttribute="trailing" secondItem="c2P-6b-lpC" secondAttribute="trailing" id="Nfl-mv-J8f"/>
<constraint firstItem="HF8-ja-1Mp" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="bottom" constant="15" id="Vev-0q-oMu"/>
<constraint firstItem="m0Z-19-yG6" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="bottom" constant="15" id="XKL-x2-iiq"/>
<constraint firstItem="kBE-rT-dOt" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="ZH2-ul-Rc5"/>
<constraint firstItem="xMe-fM-o6d" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="bottom" constant="15" id="bMI-FR-LIr"/>
<constraint firstItem="uED-Ck-HCh" firstAttribute="top" secondItem="53n-Ij-aLj" secondAttribute="bottom" constant="5" id="c3e-zB-PD7"/>
<constraint firstItem="c8T-ya-FE8" firstAttribute="top" secondItem="kBE-rT-dOt" secondAttribute="bottom" constant="15" id="gK3-XY-e9S"/>
<constraint firstItem="zUM-gk-TDF" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="gwz-w4-HaY"/>
<constraint firstItem="53n-Ij-aLj" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="15" id="jb1-N1-bkz"/>
<constraint firstItem="xMe-fM-o6d" firstAttribute="centerX" secondItem="mJ8-AR-jCS" secondAttribute="centerX" id="qgi-hs-sJh"/>
<constraint firstItem="HF8-ja-1Mp" firstAttribute="centerX" secondItem="0cf-lx-CTb" secondAttribute="centerX" id="tto-xs-IvJ"/>
<constraint firstItem="m0Z-19-yG6" firstAttribute="centerX" secondItem="46J-ih-76e" secondAttribute="centerX" id="v9Y-gk-Hcc"/>
<constraint firstItem="uED-Ck-HCh" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="vb1-1w-P6S"/>
<constraint firstAttribute="bottom" secondItem="c2P-6b-lpC" secondAttribute="bottom" id="xqy-z2-fqO"/>
</constraints>
</tableViewCellContentView>
<color key="backgroundColor" name="白色背景色"/>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="btnWidth" destination="IJP-pf-u5R" id="64D-9I-XmJ"/>
<outlet property="cgCount" destination="HF8-ja-1Mp" id="GRT-MI-GPA"/>
<outlet property="cgPrice" destination="m0Z-19-yG6" id="zQy-Cc-uZQ"/>
<outlet property="cgTotalPrice" destination="xMe-fM-o6d" id="baZ-ZX-rbr"/>
<outlet property="detailLbl" destination="uED-Ck-HCh" id="zoK-Xu-ytf"/>
<outlet property="lblRight" destination="FNm-yK-j5F" id="Ax4-S8-T59"/>
<outlet property="nameLbl" destination="53n-Ij-aLj" id="aPc-sG-d9k"/>
<outlet property="rkCount" destination="c8T-ya-FE8" id="L0q-P3-PMe"/>
</connections>
<point key="canvasLocation" x="132.60869565217394" y="132.58928571428572"/>
</tableViewCell>
</objects>
<resources>
<namedColor name="#F57575">
<color red="0.96100002527236938" green="0.45899999141693115" blue="0.45899999141693115" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="app底色">
<color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="个人中心灰色字体">
<color red="0.3919999897480011" green="0.3919999897480011" blue="0.3919999897480011" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色分界线">
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="白色背景色">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/新增采购单/XinCaiGouViewController.swift
View file @ 6cb2ea57
...@@ -479,7 +479,7 @@ class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -479,7 +479,7 @@ class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableVie
cell.cgCount.text = "\(model.target_Count!)" cell.cgCount.text = "\(model.target_Count!)"
cell.cgPrice.text = model.target_Price! cell.cgPrice.text = model.target_Price!
let price = model.target_Price! as NSString let price = model.target_Price! as NSString
cell.cgTotalPrice.text = "\(Float(model.target_Count!) * price.floatValue)" cell.cgTotalPrice.text = String(format: "%.2f", Float(model.target_Count!)*price.floatValue)
return cell return cell
} }
......
GeliBusinessPlatform/ViewController/采购单列表/CGDListVC.swift
View file @ 6cb2ea57
...@@ -70,6 +70,14 @@ class CGDListVC: BaseViewController , UITableViewDelegate, UITableViewDataSource ...@@ -70,6 +70,14 @@ class CGDListVC: BaseViewController , UITableViewDelegate, UITableViewDataSource
} }
} }
deinit {
/// 移除通知
NotificationCenter.default.removeObserver(self)
}
func CGDXQVcChangePayStatus(){
NotificationCenter.default.post(name: NSNotification.Name("updateXQ"), object: self, userInfo: nil)
}
func CGDXQVcFinishAction() { func CGDXQVcFinishAction() {
listView.mj_header?.beginRefreshing() listView.mj_header?.beginRefreshing()
} }
...@@ -231,6 +239,7 @@ class CGDListVC: BaseViewController , UITableViewDelegate, UITableViewDataSource ...@@ -231,6 +239,7 @@ class CGDListVC: BaseViewController , UITableViewDelegate, UITableViewDataSource
case "入库","补录入库": case "入库","补录入库":
var rkDatas:Array<InputInitInfoGoodsInfoModel> = [] var rkDatas:Array<InputInitInfoGoodsInfoModel> = []
model.goods_res?.forEach({ (item) in model.goods_res?.forEach({ (item) in
if item.no_push_num != 0 {
let dict = [ let dict = [
"sku_id":item.sku_id as Any, "sku_id":item.sku_id as Any,
"goods_id":item.goods_id as Any, "goods_id":item.goods_id as Any,
...@@ -248,16 +257,19 @@ class CGDListVC: BaseViewController , UITableViewDelegate, UITableViewDataSource ...@@ -248,16 +257,19 @@ class CGDListVC: BaseViewController , UITableViewDelegate, UITableViewDataSource
"createDay":"" as Any, "createDay":"" as Any,
"createDayStr":"" as Any, "createDayStr":"" as Any,
"chuKuLiang":"" as Any, "chuKuLiang":"" as Any,
"pog_id":item.pog_id as Any "pog_id":item.pog_id as Any,
"no_push_num":item.no_push_num as Any
] ]
let mo = InputInitInfoGoodsInfoModel(JSON: dict) let mo = InputInitInfoGoodsInfoModel(JSON: dict)
rkDatas.append(mo!) rkDatas.append(mo!)
}
}) })
let vc = NewRKVc() let vc = NewRKVc()
vc.isCaiGou = true vc.isCaiGou = true
vc.rkSelectArr = rkDatas vc.rkSelectArr = rkDatas
vc.po_id = model.po_id! vc.po_id = model.po_id!
vc.delegate = self vc.delegate = self
vc.orderNumStr = model.po_no! as! String
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
break break
case "修改信息": case "修改信息":
......
GeliBusinessPlatform/ViewController/采购单列表/CGDListViewController.swift
View file @ 6cb2ea57
...@@ -44,13 +44,25 @@ class CGDListViewController: BaseViewController ,UISearchBarDelegate, SearchBar ...@@ -44,13 +44,25 @@ class CGDListViewController: BaseViewController ,UISearchBarDelegate, SearchBar
vc.delegate = self vc.delegate = self
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
} }
@objc func updateXQ(nofi : Notification){
let vc1 = viewControllers[1]
vc1.listView.mj_header?.beginRefreshing()
let vc3 = viewControllers[3]
vc3.listView.mj_header?.beginRefreshing()
}
deinit {
/// 移除通知
NotificationCenter.default.removeObserver(self)
}
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
navbar.title = "采购列表" navbar.title = "采购列表"
navbar.rightTitle = "新增" navbar.rightTitle = "新增"
self.view.addSubview(navbar) self.view.addSubview(navbar)
NotificationCenter.default.addObserver(self, selector: #selector(updateXQ), name: NSNotification.Name(rawValue:"updateXQ"), object: nil)
SetTopFrame(view: searchBg, height: 52) SetTopFrame(view: searchBg, height: 52)
//searchbar //searchbar
...@@ -100,7 +112,6 @@ class CGDListViewController: BaseViewController ,UISearchBarDelegate, SearchBar ...@@ -100,7 +112,6 @@ class CGDListViewController: BaseViewController ,UISearchBarDelegate, SearchBar
} }
let vc = viewControllers[selectIndex] let vc = viewControllers[selectIndex]
vc.listView.mj_header?.beginRefreshing() vc.listView.mj_header?.beginRefreshing()
} }
//MARK:--取消搜索代理 //MARK:--取消搜索代理
......
GeliBusinessPlatform/ViewController/采购单详情/CGDXQVc.swift
View file @ 6cb2ea57
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
import UIKit import UIKit
protocol CGDXQVcDelegate { protocol CGDXQVcDelegate {
func CGDXQVcFinishAction() func CGDXQVcFinishAction()
func CGDXQVcChangePayStatus()
} }
class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAlertSelectViewDelegate,GeliAlertTextViewDelegate,GeliAlertViewDelegate,NewRKVcDelegate, XinCaiGouViewControllerDelegate { class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAlertSelectViewDelegate,GeliAlertTextViewDelegate,GeliAlertViewDelegate,NewRKVcDelegate, XinCaiGouViewControllerDelegate {
func XinCaiGouViewControllerFinish() { func XinCaiGouViewControllerFinish() {
...@@ -112,7 +113,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl ...@@ -112,7 +113,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
listView.separatorStyle = .none listView.separatorStyle = .none
listView.register(UINib(nibName: "TitleAndTFCell", bundle: nil), forCellReuseIdentifier: "TitleAndTFCell") listView.register(UINib(nibName: "TitleAndTFCell", bundle: nil), forCellReuseIdentifier: "TitleAndTFCell")
listView.register(UINib(nibName: "TitleAndBtnCell", bundle: nil), forCellReuseIdentifier: "TitleAndBtnCell") listView.register(UINib(nibName: "TitleAndBtnCell", bundle: nil), forCellReuseIdentifier: "TitleAndBtnCell")
listView.register(UINib(nibName: "CGDCell", bundle: nil), forCellReuseIdentifier: "CGDCell") listView.register(UINib(nibName: "CGDCell1", bundle: nil), forCellReuseIdentifier: "CGDCell1")
loadData() loadData()
} }
...@@ -351,7 +352,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl ...@@ -351,7 +352,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
return cell return cell
} }
} }
let cell = tableView.dequeueReusableCell(withIdentifier: "CGDCell") as! CGDCell let cell = tableView.dequeueReusableCell(withIdentifier: "CGDCell1") as! CGDCell1
cell.btnWidth.constant = 0 cell.btnWidth.constant = 0
cell.lblRight.constant = 15 cell.lblRight.constant = 15
let item = model?.goods_res![indexPath.row] let item = model?.goods_res![indexPath.row]
...@@ -449,6 +450,11 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl ...@@ -449,6 +450,11 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
payZt = sender.tag payZt = sender.tag
holderArr.insert(zfTypeArr[payZt], at: 6) holderArr.insert(zfTypeArr[payZt], at: 6)
holderArr.remove(at: 7) holderArr.remove(at: 7)
if payZt == 1{
payFs = 1
holderArr.insert(zfWayArr[payFs], at: 5)
holderArr.remove(at: 6)
}
} }
} }
if title == "请选择支付方式" { if title == "请选择支付方式" {
...@@ -474,6 +480,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl ...@@ -474,6 +480,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
self.listView.reloadData() self.listView.reloadData()
self.glSelectView?.removeFromSuperview() self.glSelectView?.removeFromSuperview()
self.glSelectView = nil self.glSelectView = nil
self.delegate!.CGDXQVcChangePayStatus()
}) { (err) in }) { (err) in
} }
......
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