Commit 6cb2ea57 authored by lujunye's avatar lujunye

禅道bug修复

parent 25bcf4fe
......@@ -10,8 +10,8 @@
9C3AD0BD567C3C122CCE3169 /* Pods_GeliBusinessPlatform.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DA2D518C6159EA47DCD8E0C /* Pods_GeliBusinessPlatform.framework */; };
E007B1D4248F6880004D14CC /* CGDDayCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E007B1D2248F6880004D14CC /* CGDDayCell.swift */; };
E007B1D5248F6880004D14CC /* CGDDayCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E007B1D3248F6880004D14CC /* CGDDayCell.xib */; };
E007B1D8248F7276004D14CC /* CGDCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E007B1D6248F7276004D14CC /* CGDCell.swift */; };
E007B1D9248F7276004D14CC /* CGDCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E007B1D7248F7276004D14CC /* CGDCell.xib */; };
E007B1D8248F7276004D14CC /* CGDCell1.swift in Sources */ = {isa = PBXBuildFile; fileRef = E007B1D6248F7276004D14CC /* CGDCell1.swift */; };
E007B1D9248F7276004D14CC /* CGDCell1.xib in Resources */ = {isa = PBXBuildFile; fileRef = E007B1D7248F7276004D14CC /* CGDCell1.xib */; };
E007B1DB248F8F57004D14CC /* PurchaseInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E007B1DA248F8F57004D14CC /* PurchaseInterface.swift */; };
E00ACBEB2490D6C800128052 /* YDLBVc.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00ACBE92490D6C800128052 /* YDLBVc.swift */; };
E00ACBEC2490D6C800128052 /* YDLBVc.xib in Resources */ = {isa = PBXBuildFile; fileRef = E00ACBEA2490D6C800128052 /* YDLBVc.xib */; };
......@@ -140,6 +140,8 @@
E0516F7F244806C500E373CE /* MsgCenterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0516F7E244806C500E373CE /* MsgCenterViewController.swift */; };
E0516F822448086700E373CE /* MsgCenterCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0516F802448086700E373CE /* MsgCenterCell.swift */; };
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 */; };
E0571C6E248DD4DE00E85711 /* AdressInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0571C6D248DD4DE00E85711 /* AdressInterface.swift */; };
E05FAD272498A5E500D8C90D /* accountsPayableInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E05FAD262498A5E500D8C90D /* accountsPayableInterface.swift */; };
......@@ -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>"; };
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>"; };
E007B1D6248F7276004D14CC /* CGDCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGDCell.swift; sourceTree = "<group>"; };
E007B1D7248F7276004D14CC /* CGDCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CGDCell.xib; sourceTree = "<group>"; };
E007B1D6248F7276004D14CC /* CGDCell1.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGDCell1.swift; 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>"; };
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>"; };
......@@ -688,6 +690,8 @@
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>"; };
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>"; };
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>"; };
......@@ -1627,8 +1631,10 @@
E0AA3A90248F626400CBFC27 /* XinCaiGouViewController.xib */,
E007B1D2248F6880004D14CC /* CGDDayCell.swift */,
E007B1D3248F6880004D14CC /* CGDDayCell.xib */,
E007B1D6248F7276004D14CC /* CGDCell.swift */,
E007B1D7248F7276004D14CC /* CGDCell.xib */,
E007B1D6248F7276004D14CC /* CGDCell1.swift */,
E007B1D7248F7276004D14CC /* CGDCell1.xib */,
E051EBD524A1F0ED00892DA9 /* CGDCell.swift */,
E051EBD624A1F0ED00892DA9 /* CGDCell.xib */,
);
path = "新增采购单";
sourceTree = "<group>";
......@@ -2778,6 +2784,7 @@
files = (
E042F731245272FF00CDFA12 /* XiaYunDanViewController.xib in Resources */,
F9023F63244999F500DD5A63 /* WarehoseMangementCell.xib in Resources */,
E051EBD824A1F0ED00892DA9 /* CGDCell.xib in Resources */,
E0BE8A84245A76AF00E80134 /* XiaDanCGDiZhiCell.xib in Resources */,
E0516F832448086700E373CE /* MsgCenterCell.xib in Resources */,
E0228BB1246FDA9A005812FA /* TitleAndLblCell.xib in Resources */,
......@@ -2911,7 +2918,7 @@
F95D9B5024484FAE0080D6E3 /* GeliAlertView.xib in Resources */,
E01EA1A1245A5D6B00F019D5 /* YunDanXiangQingViewController.xib in Resources */,
E0BE8A8C245A7D3300E80134 /* BtmBtnCell.xib in Resources */,
E007B1D9248F7276004D14CC /* CGDCell.xib in Resources */,
E007B1D9248F7276004D14CC /* CGDCell1.xib in Resources */,
E0DDCB1E244AE81800DF54C7 /* GuanLianKeHuCell.xib in Resources */,
E0DDCB14244ADF2C00DF54C7 /* ChangePriceNormalCell.xib in Resources */,
E01EA1A5245A60E000F019D5 /* XiaDanChengGongViewController.xib in Resources */,
......@@ -3229,6 +3236,7 @@
F942A7FD247500C300FDFC47 /* TestClass.swift in Sources */,
F950FDD824518B9500C40530 /* FSCalendarDelegationProxy.m in Sources */,
E01EA1A0245A5D6B00F019D5 /* YunDanXiangQingViewController.swift in Sources */,
E051EBD724A1F0ED00892DA9 /* CGDCell.swift in Sources */,
F9697248248F88C70010D39B /* GeliAltetCodeView.swift in Sources */,
F93615DB2480B421004187F9 /* WorkInterface.swift in Sources */,
F956D5A0246A2D9C003FF510 /* LMNImageView.m in Sources */,
......@@ -3300,7 +3308,7 @@
E0CC847E24823602009B1FE9 /* WarehouseIoListModel.swift in Sources */,
E088CC932447124D000DAA8A /* BindViewController.swift in Sources */,
E0EFB9CA24930DD5005FB0CD /* CGDListVC.swift in Sources */,
E007B1D8248F7276004D14CC /* CGDCell.swift in Sources */,
E007B1D8248F7276004D14CC /* CGDCell1.swift in Sources */,
E0B9461E24566B3100FBEC9A /* TitleAndTFAndBtnCell.swift in Sources */,
E042F74324529B7B00CDFA12 /* JiTuoWuXinXiView.swift in Sources */,
F933F6CC2452C68B00189561 /* WindowRootViewController.swift in Sources */,
......
......@@ -99,7 +99,7 @@ class PurchaseOrderListDataItemsModel: Mappable {
var sku_name :String? //规格值
var num:Int?//数量
var no_push_num : String? //未入库数量
var no_push_num : Int? //未入库数量
var frozen_num :Int?
var amount:String? //采购单价
......
......@@ -162,12 +162,12 @@ class GYSGLViewController: BaseViewController,UITableViewDelegate,UITableViewDat
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if indexPath.section == 2 {
if img1.image != nil {
if zhizhao.count > 0 {
if indexPath.row == 0 {
return 100
}
}
if img2.image != nil {
if food_production_license.count > 0 {
if indexPath.row == 1 {
return 100
}
......@@ -266,16 +266,16 @@ class GYSGLViewController: BaseViewController,UITableViewDelegate,UITableViewDat
cell.button.setTitle("上传", for: .normal)
cell.delegate = self
cell.tag = indexPath.row
if img1.image != nil {
if zhizhao.count > 0 {
if indexPath.row == 0 {
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 {
cell.imgBgView.isHidden = false
cell.imgView.image = img2.image
cell.imgView.sd_setImage( with: URL(string: SERVERCE_ImageHost + food_production_license))
}
}
......
......@@ -200,9 +200,11 @@ class GYSListViewController: BaseViewController,UITableViewDataSource,UITableVie
vc.phoneNum = data.contacts_mobile!
vc.zhizhao = data.zhizhao!
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.img2.sd_setImage(with: URL(string: SERVERCE_ImageHost + data.food_production_license!), placeholderImage: UIImage(named: "worktest1"))
// 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: "dowPhone"))
self.navigationController!.pushViewController(vc, animated: true)
}else{
......
......@@ -40,8 +40,8 @@ class BingDingKeHuViewController: BaseViewController,UITableViewDelegate,UITable
make.centerY.equalToSuperview()
make.height.equalTo(30)
}
searchV = searchBr
searchBr.placeholderStr = "客户名称/联系人/电话号码"
searchV = searchBr
searchBr.placeholderStr = "输入完整的客户名/联系人/电话号码搜索"
searchBr.cornerRadius = 35/2.0
searchBr.delegate = self
searchBr.delegateL = self
......
......@@ -117,10 +117,10 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour
HUD.flash(.label("请选择绑定用户"), delay: 1.2)
return
}
if discount.count == 0 {
HUD.flash(.label("请填写折扣数,没有折扣请输入0"), delay: 1.2)
return
}
// if discount.count == 0 {
// HUD.flash(.label("请填写折扣数,没有折扣请输入0"), delay: 1.2)
// return
// }
let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self;
alertView.tishiLbl.text = ""
......@@ -165,7 +165,7 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour
}
let titleArr = ["客户名称:","客户手机号码: ","客户公司名称:","绑定用户:","客户类型:","客户折扣:"]
var holderArr = ["请输入客户名","请输入手机号码","请输入公司名称","搜索绑定","个人","请输入折扣数值(0~100)"]
var holderArr = ["请输入客户名","请输入手机号码","请输入公司名称","搜索绑定","个人","敬请期待"]
//MARK: - CELL DELEGATE
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return 49
......@@ -250,8 +250,12 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour
cell.textTF.text = companyName
break
case 5:
cell.textTF.keyboardType = .numberPad
cell.textTF.text = discount
cell.textTF.isUserInteractionEnabled = false
cell.textTF.clearButtonMode = .never
// cell.textTF.keyboardType = .numberPad
if discount != "0" && discount != "100"{
cell.textTF.text = discount
}
break
default:
break
......
......@@ -21,7 +21,6 @@ class CGDCell: UITableViewCell {
@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()
......
//
// 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
}
}
......@@ -479,7 +479,7 @@ class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableVie
cell.cgCount.text = "\(model.target_Count!)"
cell.cgPrice.text = model.target_Price!
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
}
......
......@@ -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() {
listView.mj_header?.beginRefreshing()
}
......@@ -231,6 +239,7 @@ class CGDListVC: BaseViewController , UITableViewDelegate, UITableViewDataSource
case "入库","补录入库":
var rkDatas:Array<InputInitInfoGoodsInfoModel> = []
model.goods_res?.forEach({ (item) in
if item.no_push_num != 0 {
let dict = [
"sku_id":item.sku_id as Any,
"goods_id":item.goods_id as Any,
......@@ -248,16 +257,19 @@ class CGDListVC: BaseViewController , UITableViewDelegate, UITableViewDataSource
"createDay":"" as Any,
"createDayStr":"" 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)
rkDatas.append(mo!)
}
})
let vc = NewRKVc()
vc.isCaiGou = true
vc.rkSelectArr = rkDatas
vc.po_id = model.po_id!
vc.delegate = self
vc.orderNumStr = model.po_no! as! String
self.navigationController?.pushViewController(vc, animated: true)
break
case "修改信息":
......
......@@ -44,13 +44,25 @@ class CGDListViewController: BaseViewController ,UISearchBarDelegate, SearchBar
vc.delegate = self
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() {
super.viewDidLoad()
navbar.title = "采购列表"
navbar.rightTitle = "新增"
self.view.addSubview(navbar)
NotificationCenter.default.addObserver(self, selector: #selector(updateXQ), name: NSNotification.Name(rawValue:"updateXQ"), object: nil)
SetTopFrame(view: searchBg, height: 52)
//searchbar
......@@ -100,7 +112,6 @@ class CGDListViewController: BaseViewController ,UISearchBarDelegate, SearchBar
}
let vc = viewControllers[selectIndex]
vc.listView.mj_header?.beginRefreshing()
}
//MARK:--取消搜索代理
......
......@@ -9,6 +9,7 @@
import UIKit
protocol CGDXQVcDelegate {
func CGDXQVcFinishAction()
func CGDXQVcChangePayStatus()
}
class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAlertSelectViewDelegate,GeliAlertTextViewDelegate,GeliAlertViewDelegate,NewRKVcDelegate, XinCaiGouViewControllerDelegate {
func XinCaiGouViewControllerFinish() {
......@@ -112,7 +113,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
listView.separatorStyle = .none
listView.register(UINib(nibName: "TitleAndTFCell", bundle: nil), forCellReuseIdentifier: "TitleAndTFCell")
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()
}
......@@ -351,7 +352,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
return cell
}
}
let cell = tableView.dequeueReusableCell(withIdentifier: "CGDCell") as! CGDCell
let cell = tableView.dequeueReusableCell(withIdentifier: "CGDCell1") as! CGDCell1
cell.btnWidth.constant = 0
cell.lblRight.constant = 15
let item = model?.goods_res![indexPath.row]
......@@ -449,6 +450,11 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
payZt = sender.tag
holderArr.insert(zfTypeArr[payZt], at: 6)
holderArr.remove(at: 7)
if payZt == 1{
payFs = 1
holderArr.insert(zfWayArr[payFs], at: 5)
holderArr.remove(at: 6)
}
}
}
if title == "请选择支付方式" {
......@@ -474,6 +480,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
self.listView.reloadData()
self.glSelectView?.removeFromSuperview()
self.glSelectView = nil
self.delegate!.CGDXQVcChangePayStatus()
}) { (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