dezhong/OrderScheduling
18
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
DDIsFriend
2023-09-06 15:17:24 +08:00
parent 177b77c044
commit 7fda9d2650
37 changed files with 9331 additions and 8117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
OrderScheduling/Rescue/ViewController/RescueController.swift
View File

@@ -66,28 +66,6 @@ extension RescueController {
WEBTOOL.open(name: .todoList,appending: nil)
})
.disposed(by: disposeBag)
// 刷新token,全屏都不许动
Observable.just(1)
.observe(on: MainScheduler.instance)
.do(onNext: { _ in
UIApplication.shared.dd_keyWindow.dd_showHUD()
})
.flatMapLatest { _ in
return RQ.token(parameters: TokenParameters(refresh_token: USER.refreshToken!))
}
.observe(on: MainScheduler.instance)
.do(onNext: { _ in
UIApplication.shared.dd_keyWindow.dd_hideHUD()
})
.subscribe(onNext: { response in
if response?.success == true {
USER.setToken(token: response?.data?.accessToken.tokenValue)
USER.setRefreshToken(token: response?.data?.refreshToken.tokenValue)
}
USER.refreshTokenSub.onNext(true)
})
.disposed(by: disposeBag)
// 点击tabBar 需要刷下下列
preRefreshRelay
@@ -220,6 +198,13 @@ extension RescuePendingOrderController {
self?.pendingOrderView.tableView.mj_header?.beginRefreshing()
})
.disposed(by: disposeBag)
USERP.userPermissionRelay
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] _ in
self?.pendingOrderView.tableView.reloadData()
})
.disposed(by: disposeBag)
}
func entry(model:OrderListDataModel,remarkId:String?) {
@@ -351,6 +336,13 @@ extension RescuePendingDispatchController {
self?.pendingDispatchView.tableView.mj_header?.beginRefreshing()
})
.disposed(by: disposeBag)
USERP.userPermissionRelay
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] _ in
self?.pendingDispatchView.tableView.reloadData()
})
.disposed(by: disposeBag)
}
}
@@ -413,6 +405,13 @@ extension RescueIsIngController {
self?.pendingIsIngView.tableView.mj_header?.beginRefreshing()
})
.disposed(by: disposeBag)
USERP.userPermissionRelay
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] _ in
self?.pendingIsIngView.tableView.reloadData()
})
.disposed(by: disposeBag)
}
}
@@ -531,6 +530,44 @@ extension RescuePendingOrderController : UITableViewDelegate,UITableViewDataSour
self?.acceptOrderRelay.accept(model)
})
.disposed(by: cell!.disposeBag)
if USERP.canRejectDispatchHandle == true {
cell?.refuseButton.isHidden = false
cell?.refuseButton.snp.updateConstraints({ make in
make.right.equalTo(cell!.acceptButton.snp.left).offset(-auto(10))
make.width.equalTo(auto(80))
})
}else{
cell?.refuseButton.isHidden = true
cell?.refuseButton.snp.updateConstraints({ make in
make.right.equalTo(cell!.acceptButton.snp.left).offset(0)
make.width.equalTo(0)
})
}
if USERP.canAcceptDispatchHandle == true {
cell?.acceptButton.isHidden = false
cell?.acceptButton.snp.updateConstraints({ make in
make.width.equalTo(auto(80))
make.right.equalTo(-auto(10))
})
}else{
cell?.acceptButton.isHidden = true
cell?.acceptButton.snp.updateConstraints({ make in
make.width.equalTo(0)
make.right.equalTo(0)
})
}
if USERP.canRejectDispatchHandle == false && USERP.canAcceptDispatchHandle == false {
cell?.acceptButton.snp.updateConstraints({ make in
make.height.equalTo(0)
})
}else{
cell?.acceptButton.snp.updateConstraints({ make in
make.height.equalTo(auto(30))
})
}
return cell!
}
@@ -712,6 +749,20 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
self?.navigationController?.pushViewController(vc, animated: true)
})
.disposed(by: cell!.disposeBag)
if USERP.canWaitdispatchBtn == true {
cell?.dispatchButton.isHidden = false
cell?.dispatchButton.snp.updateConstraints({ make in
make.right.equalTo(auto(10))
make.width.equalTo(auto(80))
})
}else{
cell?.dispatchButton.isHidden = true
cell?.dispatchButton.snp.updateConstraints({ make in
make.right.equalTo(0)
make.width.equalTo(0)
})
}
return cell!
}
@@ -800,6 +851,44 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
WEBTOOL.open(name: .reporting,appending: "&queryType=\(OrderTypeEnum.TO_RESCUE.rawValue)&userOrderId=\(model.userOrderId)&orderCode=\(model.orderCode)")
})
.disposed(by: cell!.disposeBag)
if USERP.canWaitModifyDispatchBtn == true {
cell?.dispatchButton.isHidden = false
cell?.dispatchButton.snp.updateConstraints({ make in
make.right.equalTo(cell!.reportButton.snp.left).offset(-auto(10))
make.width.equalTo(auto(80))
})
}else{
cell?.dispatchButton.isHidden = true
cell?.dispatchButton.snp.updateConstraints({ make in
make.right.equalTo(cell!.reportButton.snp.left).offset(0)
make.width.equalTo(0)
})
}
if USERP.canSupplierRemarkBtn == true {
cell?.reportButton.isHidden = false
cell?.reportButton.snp.updateConstraints({ make in
make.width.equalTo(auto(80))
make.right.equalTo(-auto(10))
})
}else{
cell?.reportButton.isHidden = true
cell?.reportButton.snp.updateConstraints({ make in
make.width.equalTo(0)
make.right.equalTo(0)
})
}
if USERP.canWaitModifyDispatchBtn == false && USERP.canSupplierRemarkBtn == false {
cell?.reportButton.snp.updateConstraints({ make in
make.height.equalTo(0)
})
}else{
cell?.reportButton.snp.updateConstraints({ make in
make.height.equalTo(auto(30))
})
}
return cell!
}
@@ -1240,7 +1329,8 @@ class RescuePendingOrderCell : DDTableViewCell {
refuseButton.snp.makeConstraints { make in
make.right.equalTo(acceptButton.snp.left).offset(-auto(10))
make.top.equalTo(acceptButton)
make.width.height.equalTo(acceptButton)
make.width.equalTo(auto(80))
make.height.equalTo(auto(30))
}
}
@@ -1528,7 +1618,8 @@ class RescuePendingDispatchCell : DDTableViewCell {
contactButton.snp.makeConstraints { make in
make.right.equalTo(dispatchButton.snp.left).offset(-auto(10))
make.top.equalTo(dispatchButton)
make.width.height.equalTo(dispatchButton)
make.width.equalTo(auto(80))
make.height.equalTo(auto(30))
}
}
@@ -1725,7 +1816,8 @@ class RescueIsIngCell : DDTableViewCell {
dispatchButton.snp.makeConstraints { make in
make.right.equalTo(reportButton.snp.left).offset(-auto(10))
make.top.equalTo(reportButton)
make.width.height.equalTo(reportButton)
make.width.equalTo(auto(80))
make.height.equalTo(auto(30))
}
}