待完善时间选择

GeliBusinessPlatform/ViewController/供应商管理/GYSListViewController.swift

@@ -7,9 +7,11 @@
 //
 
 import UIKit
-
+protocol GYSListViewControllerDelegate {
+    func GYSListViewControllerGetGYS(sender:VendorListDataModel)
+}
 class GYSListViewController: BaseViewController,UITableViewDataSource,UITableViewDelegate,UISearchBarDelegate,SearchBarViewDelegate{
-    
+    var delegate:GYSListViewControllerDelegate?
     var searchV : SearchBarView? = nil
     var selectTarget:VendorListDataModel?
     @IBOutlet weak var topView: UIView!
@@ -111,10 +113,11 @@ class GYSListViewController: BaseViewController,UITableViewDataSource,UITableVie
     
     @IBAction func addAction(_ sender: Any) {
         if barTitle != "供应商管理" {
+            delegate?.GYSListViewControllerGetGYS(sender: selectTarget!)
+            self.navigationController?.popViewController(animated: true)
+        }else{
             let vc = GYSGLViewController()
             self.navigationController?.pushViewController(vc, animated: true)
-        }else{
-            
         }
     }
     //MARK: - 自定义DELEGATE

GeliBusinessPlatform/ViewController/新增采购单/XinCaiGouViewController.swift

@@ -8,7 +8,21 @@
 
 import UIKit
 
-class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,CGDCellDelegate,XuanZeShangPinViewControllerDelegate, ShowTimeSelectViewDelegate{
+
+class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,CGDCellDelegate,XuanZeShangPinViewControllerDelegate, ShowTimeSelectViewDelegate,GLAlertSelectViewDelegate, GYSListViewControllerDelegate{
+    
+    func GLASClose(view: GLAlertSelectView, selectnum: Int, selectArr: Array<Int>) {
+        typeSelect = selectnum
+        
+        view.removeFromSuperview()
+        glSelectView = nil
+    }
+    func GLAlertSelectViewClick(selectNum: Int, view: GLAlertSelectView) {
+        typeSelect = selectNum
+        listView.reloadData()
+        view.removeFromSuperview()
+        glSelectView = nil
+    }
     func XuanZeShangPinViewControllerSubmitAction(selectArr: Array<GetGoodsInfoDataModel>) {
         for item in selectArr{
             datas.append(item)
@@ -26,10 +40,14 @@ class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableVie
     
     //MARK: - 删除
     func CGDCellDelAction(cell: CGDCell) {
-        
+        datas.remove(at: cell.tag)
+        listView.reloadData()
     }
-    
-    
+    var dayTimeStr = ""
+       var dayTime:Int?
+    var vendor:VendorListDataModel?
+    var glSelectView:GLAlertSelectView?
+    var typeSelect:Int?
     //MARK: - 提交审核
     @IBAction func submitAction(_ sender: Any) {
         print("submit")
@@ -37,8 +55,9 @@ class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableVie
     @IBOutlet weak var listView: UITableView!
     @IBOutlet weak var btmLine: UIView!
     var datas:Array<GetGoodsInfoDataModel> = []
+    let typeArr = ["临时采购","固定采购"]
     let titleArr = ["采购日期","供应商","采购人","采购类型"]
-    let holderArr = ["","请选择供应商","请输入采购人姓名","","请选择采购类型"]
+    var holderArr = ["","请选择供应商","请输入采购人姓名","请选择采购类型"]
     override func viewDidLoad() {
         super.viewDidLoad()
         navbar.title = "新增采购单"
@@ -62,12 +81,14 @@ class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableVie
                 let timeSelectV = ShowTimeSelectView(frame: self.view.window!.bounds)
                 timeSelectV.moreSelection = false
                 //把默认值传回去
-//                if data.createDay != nil {
-//                    let time = TimeInterval(exactly: data.createDay!)
-//                    timeSelectV.BeginDate = Date(timeIntervalSince1970: time!)
-//                    timeSelectV.EndDate = Date(timeIntervalSince1970: time!)//无用处
-//
-//                }
+                
+                if dayTime != nil {
+                    print("day t = ",dayTime!)
+                    let time = TimeInterval(exactly:dayTime!)
+                    timeSelectV.BeginDate = Date(timeIntervalSince1970: time!)
+                    timeSelectV.EndDate = Date(timeIntervalSince1970: time!)//无用处
+
+                }
                 timeSelectV.titleLbl.text = "请选择采购日期"
                 timeSelectV.delegate = self
                 self.view.window?.addSubview(timeSelectV)
@@ -75,9 +96,24 @@ class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableVie
             case 1://供应商
                 let vc = GYSListViewController()
                 vc.barTitle = "选择供应商"
+                vc.delegate = self
                 self.navigationController?.pushViewController(vc, animated: true)
                 break
-            case 4://采购类型
+            case 3://采购类型
+                if glSelectView == nil {
+                    let view = GLAlertSelectView(frame: self.view.bounds)
+                    view.tag = indexPath.row
+                    if typeSelect != nil {
+                        view.selectNum = typeSelect
+                        view.tempNum = view.selectNum
+                    }
+                    view.isOnlySelectKuWei = true
+                    view.delegate = self
+                    view.titleLbl.text = "请选择采购类型"
+                    view.dataArr = typeArr
+                    self.view.addSubview(view)
+                    glSelectView = view
+                }
                 break
             default:
                 break
@@ -85,10 +121,13 @@ class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableVie
         }
     }
     //MARK:--选择时间回调数据
+   
     func showTimeSelectByData(timeStr: String, beginDate: Date, endginDate: Date) {
         let timeInterval:TimeInterval = beginDate.timeIntervalSince1970
         print(timeStr,"采购日期",timeInterval)
- 
+        dayTimeStr = timeStr
+        dayTime = Int(timeInterval)
+        listView.reloadData()
     }
     //MARK: - 添加商品
     @objc func addItemAction(){
@@ -108,14 +147,21 @@ class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableVie
                 return cell
             }else if indexPath.row == 0{
                 let cell = tableView.dequeueReusableCell(withIdentifier: "CGDDayCell") as! CGDDayCell
+                if dayTimeStr.count > 0 {
+                    cell.dayLbl.text = dayTimeStr
+                }
                 return cell
             }else{
                 let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
                 cell.nameLbl.text = titleArr[indexPath.row]
                 cell.textTF.placeholder = holderArr[indexPath.row]
                 if indexPath.row == 3 {
+                    if typeSelect != nil {
+                        cell.textTF.text = typeArr[typeSelect!]
+                    }
                     cell.textTF.isUserInteractionEnabled = false
                 }
+                
                 return cell
             }
         }
@@ -198,4 +244,15 @@ class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableVie
         }
         return 0.001
     }
+    func GYSListViewControllerGetGYS(sender: VendorListDataModel) {
+        vendor = sender
+        holderArr.insert((vendor?.ven_name)!, at: 1)
+        holderArr.remove(at: 2)
+        listView.reloadData()
+    }
+   
+    
+    
+    
+    
 }