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-08-24 11:55:03 +08:00
parent 976a905872
commit 8e1c1e732e
9 changed files with 76 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,10 +144,18 @@ extension RescuePendingOrderController {
pendingOrderView.tableView.mj_header?.beginRefreshing()
refuseRemarkIdRelay
.observe(on: MainScheduler.instance)
.do(onNext: {[weak self] _ in
self?.view.dd_showHUD()
})
.flatMapLatest { model in
return Observable.zip(RQ.refuseDispatch(parameters: RefuseDispatchParameters(userOrderId: model.userOrderId, taskOrderId: model.taskOrderId)).asObservable(), Observable.just(model))
}
.observe(on: MainScheduler.instance)
.do(onNext: {[weak self] _ in
self?.view.dd_hideHUD()
})
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] (response,model) in
if response?.success == true {
self?.entry(model: model,remarkId: response?.data)
@@ -223,11 +231,19 @@ extension RescuePendingOrderController {
var refuseReasonDesc : String?
if view.timeView.selectButton.isSelected == true {
refuseReasonItem = RefuseDispatchParameters.RefuseReasonItemEnum.time.rawValue
refuseReasonDesc = view.timeTextFieldView.textFiled.text
if view.timeTextFieldView.textFiled.text?.isEmpty != false {
refuseReasonDesc = (view.timeTextFieldView.textFiled.text)!+(view.timeTextFieldView.unitLabel.text)!
}else{
refuseReasonDesc = nil
}
}
if view.distanceView.selectButton.isSelected == true {
refuseReasonItem = RefuseDispatchParameters.RefuseReasonItemEnum.disatance.rawValue
refuseReasonDesc = view.distanceTextFieldView.textFiled.text
if view.distanceTextFieldView.textFiled.text?.isEmpty != false {
refuseReasonDesc = (view.distanceTextFieldView.textFiled.text)!+(view.distanceTextFieldView.unitLabel.text)!
}else{
refuseReasonDesc = nil
}
}
if view.cannotDispatchView.selectButton.isSelected == true {
refuseReasonItem = RefuseDispatchParameters.RefuseReasonItemEnum.cannotDispatch.rawValue
@@ -563,17 +579,17 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
make.top.equalTo(cell!.serviceNoticeView.snp.bottom).offset(0)
})
}
if model.destinationRemark?.isEmpty == false {
cell?.destinationNoticeView.isHidden = false
cell?.destinationNoticeLabel.text = "备注:"+(model.destinationRemark ?? "")
cell?.destinationNoticeView.snp.updateConstraints({ make in
make.top.equalTo(cell!.destinationLabel.snp.bottom).offset(auto(2.5))
})
cell?.destinationNoticeLabel.snp.updateConstraints({ make in
make.top.equalTo(auto(5))
make.bottom.equalTo(-auto(5))
})
}else{
// if model.destinationRemark?.isEmpty == false {
// cell?.destinationNoticeView.isHidden = false
// cell?.destinationNoticeLabel.text = "备注:"+(model.destinationRemark ?? "")
// cell?.destinationNoticeView.snp.updateConstraints({ make in
// make.top.equalTo(cell!.destinationLabel.snp.bottom).offset(auto(2.5))
// })
// cell?.destinationNoticeLabel.snp.updateConstraints({ make in
// make.top.equalTo(auto(5))
// make.bottom.equalTo(-auto(5))
// })
// }else{
cell?.destinationNoticeView.isHidden = true
cell?.destinationNoticeLabel.text = nil
cell?.destinationNoticeView.snp.updateConstraints({ make in
@@ -583,7 +599,7 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
make.top.equalTo(0)
make.bottom.equalTo(0)
})
}
// }
if model.appointTime?.isEmpty == false {
cell?.reserveTitleLabel.text = "预约时间:"
cell?.reserveLabel.text = model.appointTime
@@ -1077,7 +1093,7 @@ class RescuePendingOrderCell : DDTableViewCell {
merchantTitleLabel.snp.makeConstraints { make in
make.top.equalTo(line.snp.bottom).offset(auto(8))
make.left.equalTo(typeLabel)
make.width.equalTo(auto(80))
make.width.equalTo(auto(60))
}
merchantLabel.snp.makeConstraints { make in
@@ -1314,7 +1330,7 @@ class RescuePendingDispatchCell : DDTableViewCell {
merchantTitleLabel.snp.makeConstraints { make in
make.top.equalTo(line.snp.bottom).offset(auto(8))
make.left.equalTo(typeLabel)
make.width.equalTo(auto(70))
make.width.equalTo(auto(60))
}
merchantLabel.snp.makeConstraints { make in