Skip to content

G
GeliBusinessPlatform
Commit 717c7afa authored by lujunye's avatar lujunye
Browse files
Options

采购入库跳转已通过

parent ef254946
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 24 deletions
GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift
View file @ 717c7afa
......@@ -13,7 +13,7 @@ import Alamofire
import SwiftyJSON
class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewDataSource ,WorkSelectTimeViewDelegate,WorkItemTableViewCellDelegate,EditWorkCViewControllerDelegate, GeliAlertViewDelegate{
@IBOutlet weak var topNavBtn: UIButton!
......@@ -68,7 +68,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
})
}
browser.show()
}
//MARK:--头部按钮方法
let selectV = WorkSelectTimeView()
......@@ -380,7 +380,10 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
return
case 4:
//采购入库
HUD.flash(.label("敬请期待"),delay: 1.2)
let vc = CGDListViewController()
vc.cgRK = true
self.navigationController?.pushViewController(vc, animated: true)
// HUD.flash(.label("敬请期待"),delay: 1.2)
return
default:
break
......@@ -401,9 +404,9 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
return
case 51: //品牌列表
HUD.flash(.label("敬请期待"),delay: 1.2)
// let vc = PinPaiListViewController()
// self.navigationController?.pushViewController(vc, animated: true)
// let vc = PinPaiListViewController()
// self.navigationController?.pushViewController(vc, animated: true)
return
case 53: //销售下单-代客下单
let vc = DaiKeXiaDanGouWuViewController()
......@@ -426,8 +429,8 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
self.navigationController?.pushViewController(vc, animated: true)
return
case 59: //地址管理
// HUD.flash(.label("敬请期待"),delay: 1.2)
// return
// HUD.flash(.label("敬请期待"),delay: 1.2)
// return
let vc = DZGLViewController()
self.navigationController?.pushViewController(vc, animated: true )
return
......@@ -478,8 +481,8 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
HUD.flash(.label("敬请期待"),delay: 1.2)
return
case 75: //收支统计
// HUD.flash(.label("敬请期待"),delay: 1.2)
// return
// HUD.flash(.label("敬请期待"),delay: 1.2)
// return
let vc = ShouZhiTongJiViewController()
self.navigationController?.pushViewController(vc, animated: true)
return
......@@ -487,19 +490,19 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
HUD.flash(.label("敬请期待"),delay: 1.2)
return
case 77: //应收账款
// HUD.flash(.label("敬请期待"),delay: 1.2)
// HUD.flash(.label("敬请期待"),delay: 1.2)
let vc = YingFuZKListViewController()
vc.barTitle = "应收账款"
self.navigationController?.pushViewController(vc, animated: true)
return
case 78: //应付账款
// HUD.flash(.label("敬请期待"),delay: 1.2)
// HUD.flash(.label("敬请期待"),delay: 1.2)
let vc = YingFuZKListViewController()
vc.barTitle = "应付账款"
self.navigationController?.pushViewController(vc, animated: true)
return
case 80: //客户列表
// HUD.flash(.label("敬请期待"),delay: 1.2)
// HUD.flash(.label("敬请期待"),delay: 1.2)
let vc = KeHuListViewController()
self.navigationController?.pushViewController(vc, animated: true)
return
......@@ -526,12 +529,12 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
HUD.flash(.label("敬请期待"),delay: 1.2)
return
case 92: //采购订单管理
// HUD.flash(.label("敬请期待"),delay: 1.2)
// HUD.flash(.label("敬请期待"),delay: 1.2)
let vc = CGDListViewController()
self.navigationController?.pushViewController(vc, animated: true)
return
case 93: //供应商管理
// HUD.flash(.label("敬请期待"),delay: 1.2)
// HUD.flash(.label("敬请期待"),delay: 1.2)
let vc = GYSListViewController()
vc.barTitle = "供应商管理"
self.navigationController?.pushViewController(vc, animated: true)
......@@ -550,7 +553,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
self.navigationController?.pushViewController(vc, animated: true)
return
case 119: //新增采购单
// let vc = YDLBVc()
// let vc = YDLBVc()
let vc = XinCaiGouViewController()
self.navigationController?.pushViewController(vc, animated: true)
return
......@@ -575,7 +578,10 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
self.navigationController?.pushViewController(vc, animated: true)
return
case 124: //采购入库
HUD.flash(.label("敬请期待"),delay: 1.2)
let vc = CGDListViewController()
vc.cgRK = true
self.navigationController?.pushViewController(vc, animated: true)
// HUD.flash(.label("敬请期待"),delay: 1.2)
return
default:
break;
......@@ -613,7 +619,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
let currentVersion:String = infoDicod!["CFBundleShortVersionString"] as! String
Alamofire.request("http://itunes.apple.com/cn/lookup?id=1515684912")
.responseJSON { response in
switch response.result.isSuccess {
switch response.result.isSuccess {
case true:
if let value = response.result.value {
let json = JSON(value)
......@@ -628,7 +634,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.upAppIconV.isHidden = false
alertView.versionLbl.isHidden = false
alertView.tLbl.isHidden = false
alertView.tLbl.isHidden = false
alertView.versionLbl.text = "V" + json["results"][0]["version"].string!
alertView.delegate = self;
alertView.tishiLbl.text = ""
......@@ -636,7 +642,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
alertView.titileLbl.textAlignment = .left
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "立即更新"), for: .normal)
alertView.leftBtn.setAttributedTitle(NSAttributedString(string: "残忍拒绝"), for: .normal)
alertView.rightBtn.tag = 1515684912
alertView.appStoreVersion = appStoreVersion
self.view.window?.addSubview(alertView)
......@@ -654,15 +660,15 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
alertView.titileLbl.textAlignment = .left
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "立即更新"), for: .normal)
alertView.leftBtn.setAttributedTitle(NSAttributedString(string: "残忍拒绝"), for: .normal)
alertView.rightBtn.tag = 1515684912
alertView.appStoreVersion = appStoreVersion
self.view.window?.addSubview(alertView)
}
}else{
print("不需要更新哦---")
}
}
}
......
GeliBusinessPlatform/ViewController/采购单列表/CGDListViewController.swift
View file @ 717c7afa
......@@ -14,7 +14,7 @@ class CGDListViewController: BaseViewController ,UISearchBarDelegate, SearchBar
let vc = viewControllers[selectIndex]
vc.listView.mj_header?.beginRefreshing()
}
var cgRK = false
@IBOutlet weak var contentView: UIView!
@IBOutlet weak var searchBg: UIView!
func clearSearchAction() {
......@@ -50,6 +50,8 @@ class CGDListViewController: BaseViewController ,UISearchBarDelegate, SearchBar
navbar.rightTitle = "新增"
self.view.addSubview(navbar)
SetTopFrame(view: searchBg, height: 52)
//searchbar
let searchBr = SearchBarView.init()
......@@ -81,6 +83,10 @@ class CGDListViewController: BaseViewController ,UISearchBarDelegate, SearchBar
contentView.constrainToEdges(pagingViewController.view)
pagingViewController.didMove(toParent: self)
pagingVC = pagingViewController
if cgRK {
pagingVC?.select(index: 1)
}
}
//MARK:--搜索按钮代理
var keyword = ""
......
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