Skip to content

G
GeliBusinessPlatform
Commit 99b7768b authored by ljy's avatar ljy
Browse files
Options

列表点击通过不通过，未完善

parent 5d07c1f6
Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 37 deletions
GeliBusinessPlatform.xcworkspace/xcuserdata/nordin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file @ 99b7768b
......@@ -8,7 +8,7 @@
BreakpointExtensionID = "Xcode.Breakpoint.SwiftErrorBreakpoint">
<BreakpointContent
uuid = "FD43E86D-38D7-4600-B0BB-79E6930D5DF0"
shouldBeEnabled = "No"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No">
</BreakpointContent>
......@@ -17,7 +17,7 @@
BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
<BreakpointContent
uuid = "B1D5CEF0-844F-4D3D-BAEB-9139DD392272"
shouldBeEnabled = "No"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
breakpointStackSelectionBehavior = "1"
......
GeliBusinessPlatform/View/AlertView/GeliAlertTextView.swift
View file @ 99b7768b
......@@ -9,6 +9,7 @@
import UIKit
protocol GeliAlertTextViewDelegate {
func sureGeliAlertTextViewAction(sender:String)
}
class GeliAlertTextView: UIView, UITextViewDelegate {
var delegate: GeliAlertTextViewDelegate?
......
GeliBusinessPlatform/ViewController/出入库记录/CRKListVC.swift
View file @ 99b7768b
......@@ -9,7 +9,9 @@
import UIKit
import ViewAnimator //cell动效
class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CRKCellDelegate,UISearchBarDelegate, SearchBarViewDelegate,CRKXiangQVCDelegate ,MoreAndTimeSelectViewDelegate{
class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CRKCellDelegate,UISearchBarDelegate, SearchBarViewDelegate,CRKXiangQVCDelegate ,MoreAndTimeSelectViewDelegate,GeliAlertTextViewDelegate{
//刷新？？？
func CRKXiangQVCFinishAction() {
......@@ -23,7 +25,7 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
self.view.addSubview(blackBtnView)
blackBtnView.snp.makeConstraints { (make) in
make.top.equalTo(searchBgView.snp_bottom)
make.left.right.bottom.equalToSuperview()
}
......@@ -57,19 +59,21 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
}
}
removeBlackBtnView()
}
func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
print("点击搜索进行--")
searchBar.resignFirstResponder()
keyword = searchBar.text!
removeBlackBtnView()
listView.mj_header?.beginRefreshing()
}
var isGm = true
//MARK: - 权限控制
var isGm = false
private let animations = [AnimationType.from(direction: .bottom, offset: 300*glscale)]
@IBOutlet weak var topBtn: UIButton!
......@@ -82,7 +86,7 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
@IBAction func openViewAction(_ sender: Any) {
print("筛选选项")
removeBlackBtnView()
if moreTimeSelectView == nil {
moreTimeSelectView = MoreAndTimeSelectView()
moreTimeSelectView.delegate = self
......@@ -110,7 +114,7 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
paySArr = paySelectArr
bugSArr = bugSelectArr
sendSArr = sendSelectArr
if BeginDate == nil {
start_time = 0
end_time = 0
......@@ -120,7 +124,7 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
start_time = Int(timeInterval)
end_time = Int(timeIntervalEnd)
}
//单选处理--多选就做拼接。里层UI就不做限制
for i in 0..<paySArr.count {
......@@ -164,9 +168,9 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
i_type = 0
o_type = 0
}
listView.mj_header?.beginRefreshing()
}
//MARK:--筛选回调数据
func colseActionMoreAndTimeSelectView() {
......@@ -262,7 +266,7 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
print("page = ",page)
let UserToken = UserDefaults.standard.value(forKey: "user_token")
let dic = ["user_token":UserToken as Any,"status":status as Any,"page":page as Any,"io_type":io_type as Any ,"i_type":i_type as Any,"o_type":o_type as Any,"start_time":start_time as Any,"end_time":end_time as Any,"keyword":keyword as Any]
WarehouseIoList(dic, success: { (data) in
let dataM = data as! WarehouseIoListModel
if dataM.data?.count == 0 {
......@@ -283,15 +287,124 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
}
//MARK: - 提交申请
func sureGeliAlertTextViewAction(sender: String) {
HUD.show(.progress)
if sender.count == 0 {
HUD.flash(.label("请填写备注"), delay: 1.2)
return
}
let UserToken = UserDefaults.standard.value(forKey: "user_token")
if isPass {//通过
if io_type == 1 {//入库
let UserToken = UserDefaults.standard.value(forKey: "user_token")
//MARK: - 出入库列表 iog_id
let data = datas![selectIdx!]
var goodInfoArr:Array<Any> = []
// data.goods_res?.forEach({ (model) in
// let goods = [
// "w_id":.w_id as Any,
// "p_id":data.p_id as Any,
// "iog_id":data.iog_id as Any
// ]
// goodInfoArr.append(goods)
// })
let goodsInfo = dataChangeString(sender: goodInfoArr)
let dict = [
"user_token":UserToken as Any,
"io_id":data.io_id as Any,
"goods_info":goodsInfo as Any
]
GoodsInputAudit(dict, success: { (data) in
self.listView.mj_header?.beginRefreshing()
}) { (error) in
}
}else{//出库
let data = datas![selectIdx!]
var batchInfo:Array<Any> = []
// piCiArr.forEach { (batchArr) in
// batchArr.forEach { (model) in
// let batch = [
// "w_id":model.w_id as Any,
// "p_id":model.p_id as Any,
// "number":model.chuHuoLiang as Any,
// "production_data":model.production_data as Any,
// "shelf_life":model.shelf_life as Any,
// "valid_date":model.valid_date as Any,
// "batch_id":model.batch_id as Any,
// "report_id":model.report_id as Any
// ]
// batchInfo.append(batch)
// }
// }
var goodsInfoArr : Array<Any> = []
// outGoodsModels?.forEach({ (item) in
// let goods = [
// "goods_id":item.goods_id as Any,
// "goods_name":item.goods_name as Any,
// "goods_spec":item.goods_spec as Any,
// "sku_id":item.sku_id as Any,
// "number":item.number as Any,
// "batch_info":batchInfo
// ] as [String : Any]
// goodsInfoArr.append(goods)
// })
let goods_info = dataChangeString(sender: goodsInfoArr)
let dict = [
"user_token":UserToken as Any,
"io_id":data.io_id as Any,
"audit_remark":sender,
"goods_info":goods_info]
GoodsOutputAudit(dict, success: { (data) in
self.listView.mj_header?.beginRefreshing()
}) { (error) in
}
}
}else{//不通过
let data = datas![selectIdx!]
let dict = [
"user_token":UserToken as Any,
"io_id":data.io_id as Any,
"audit_remark":sender as Any
]
AuditFail(dict, success: { (data) in
self.listView.mj_header?.beginRefreshing()
}) { (error) in
}
}
}
var isPass = false
var selectIdx:Int?
var alterView:GeliAlertTextView?
//MARK: - 通过，不通过方法
func CRKCellBtnClick(sender: UIButton, cell: CRKCell) {
selectIdx = cell.tag
if sender.tag == 0 {//通过
print("1",cell.tag)
let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
alterView.delegate = self
self.view.window?.addSubview(alterView)
isPass = true
}else{//不通过
print("2",cell.tag)
let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
alterView.delegate = self
self.view.window?.addSubview(alterView)
isPass = false
}
}
//MARK: - CELL DELEGATE
......@@ -347,7 +460,7 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
num = 4
}
}
if model.status == 1 && isGm == false {
if model.status == 1 && isGm == false {//审核中&非管理者
return 174.5 + CGFloat(num * 49) - 45
}else{
return 174.5 + CGFloat(num * 49)
......
Pods/Pods.xcodeproj/xcuserdata/nordin.xcuserdatad/xcschemes/xcschememanagement.plist
View file @ 99b7768b
......@@ -7,112 +7,112 @@
<key>Alamofire.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>7</integer>
<integer>14</integer>
</dict>
<key>CryptoSwift.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>14</integer>
<integer>11</integer>
</dict>
<key>Dollar.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
<integer>13</integer>
</dict>
<key>ESTabBarController-swift.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>11</integer>
<integer>18</integer>
</dict>
<key>Hue.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>18</integer>
<integer>22</integer>
</dict>
<key>IQKeyboardManagerSwift.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>22</integer>
<integer>15</integer>
</dict>
<key>Kingfisher.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>12</integer>
<integer>8</integer>
</dict>
<key>LGButton.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>13</integer>
<integer>17</integer>
</dict>
<key>MJRefresh.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
<integer>20</integer>
</dict>
<key>ObjectMapper.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>8</integer>
<integer>9</integer>
</dict>
<key>Pods-GeliBusinessPlatform.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>15</integer>
<integer>2</integer>
</dict>
<key>ReachabilitySwift.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>16</integer>
<integer>12</integer>
</dict>
<key>Realm.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>20</integer>
<integer>4</integer>
</dict>
<key>RealmSwift.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>19</integer>
<integer>21</integer>
</dict>
<key>SVProgressHUD.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>9</integer>
<integer>7</integer>
</dict>
<key>SkeletonView.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>21</integer>
<integer>10</integer>
</dict>
<key>SnapKit.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>3</integer>
<integer>1</integer>
</dict>
<key>SwiftDate.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>17</integer>
<integer>5</integer>
</dict>
<key>SwifterSwift.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
<integer>16</integer>
</dict>
<key>SwiftyJSON.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>5</integer>
<integer>19</integer>
</dict>
<key>ViewAnimator.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>6</integer>
<integer>3</integer>
</dict>
<key>WYAutoLayout.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>10</integer>
<integer>6</integer>
</dict>
</dict>
</dict>
......
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