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-30 11:10:38 +08:00
parent dfcdee023c
commit b846be8803
17 changed files with 644 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -461,9 +461,9 @@ extension RescuePendingOrderController : UITableViewDelegate,UITableViewDataSour
})
}
cell?.serviceLabel.text = model.vehiclePointAddress
if model.destinationAddress?.isEmpty == false {
if model.destinationAddress?.isEmpty == false || (model.taskFlowId != 1) {
cell?.destinationTitleLabel.text = "目的地:"
cell?.destinationLabel.text = model.destinationAddress
cell?.destinationLabel.text = model.destinationAddress ?? " "
cell?.destinationTitleLabel.snp.updateConstraints({ make in
make.top.equalTo(cell!.serviceLabel.snp.bottom).offset(auto(8))
})
@@ -569,7 +569,7 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
cell?.destinationNoticeView.isHidden = false
cell?.serviceNoticeLabel.text = "备注:"+(model.vehiclePointRemark ?? "")
cell?.serviceNoticeView.snp.updateConstraints({ make in
make.top.equalTo(cell!.serviceLabel.snp.bottom).offset(auto(2.5))
make.top.equalTo(cell!.serviceLabel.snp.bottom).offset(auto(4))
})
cell?.serviceNoticeLabel.snp.updateConstraints({ make in
make.top.equalTo(auto(5))
@@ -586,11 +586,11 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
make.bottom.equalTo(0)
})
}
if model.destinationAddress?.isEmpty == false {
if model.destinationAddress?.isEmpty == false || (model.taskFlowId != 1) {
cell?.destinationTitleLabel.text = "目的地:"
cell?.destinationLabel.text = model.destinationAddress
cell?.destinationLabel.text = model.destinationAddress ?? " "
cell?.destinationTitleLabel.snp.updateConstraints({ make in
make.top.equalTo(cell!.serviceNoticeView.snp.bottom).offset(auto(2.5))
make.top.equalTo(cell!.serviceNoticeView.snp.bottom).offset(auto(4))
})
}else{
cell?.destinationTitleLabel.text = nil
@@ -624,7 +624,7 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
cell?.reserveTitleLabel.text = "预约时间:"
cell?.reserveLabel.text = model.appointTime
cell?.reserveTitleLabel.snp.updateConstraints({ make in
make.top.equalTo(cell!.destinationNoticeView.snp.bottom).offset(auto(2.5))
make.top.equalTo(cell!.destinationNoticeView.snp.bottom).offset(auto(4))
})
}else{
cell?.reserveTitleLabel.text = nil
@@ -640,7 +640,6 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
cell?.photoCollectionView.register(RescuePendingDispatchPhotoCell.self, forCellWithReuseIdentifier: "cell")
if model.environmentPic?.isEmpty == false {
let environmentPics = model.environmentPic?.components(separatedBy: ",")
cell?.photoTitleLabel.text = "查看照片:"
cell?.photoView.isHidden = false
cell?.photoTitleLabel.snp.updateConstraints({ make in
@@ -707,7 +706,7 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
cell?.serviceTitleLabel.text = "故障地:"
cell?.destinationTitleLabel.text = "目的地:"
cell?.reportButton.setTitle("报备", for: .normal)
cell?.dispatchButton.setTitle("改派单", for: .normal)
cell?.dispatchButton.setTitle("改派", for: .normal)
}
let model = resultArr[indexPath.row]
@@ -727,9 +726,9 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
}
cell?.serviceLabel.text = model.vehiclePointAddress
if model.destinationAddress?.isEmpty == false {
if model.destinationAddress?.isEmpty == false || (model.taskFlowId != 1) {
cell?.destinationTitleLabel.text = "目的地:"
cell?.destinationLabel.text = model.destinationAddress
cell?.destinationLabel.text = model.destinationAddress ?? " "
cell?.destinationTitleLabel.snp.updateConstraints({ make in
make.top.equalTo(cell!.serviceLabel.snp.bottom).offset(auto(8))
})
@@ -1408,7 +1407,7 @@ class RescuePendingDispatchCell : DDTableViewCell {
}
serviceNoticeView.snp.makeConstraints { make in
make.top.equalTo(serviceLabel.snp.bottom).offset(auto(2.5))
make.top.equalTo(serviceLabel.snp.bottom).offset(auto(4))
make.left.equalTo(auto(10))
make.right.equalTo(-auto(10))
}
@@ -1419,7 +1418,7 @@ class RescuePendingDispatchCell : DDTableViewCell {
}
destinationTitleLabel.snp.makeConstraints { make in
make.top.equalTo(serviceNoticeView.snp.bottom).offset(auto(2.5))
make.top.equalTo(serviceNoticeView.snp.bottom).offset(auto(4))
make.left.equalTo(typeLabel)
make.width.equalTo(merchantTitleLabel)
}
@@ -1431,7 +1430,7 @@ class RescuePendingDispatchCell : DDTableViewCell {
}
destinationNoticeView.snp.makeConstraints { make in
make.top.equalTo(destinationLabel.snp.bottom).offset(auto(2.5))
make.top.equalTo(destinationLabel.snp.bottom).offset(auto(4))
make.left.equalTo(auto(10))
make.right.equalTo(-auto(10))
}
@@ -1442,7 +1441,7 @@ class RescuePendingDispatchCell : DDTableViewCell {
}
reserveTitleLabel.snp.makeConstraints { make in
make.top.equalTo(destinationNoticeView.snp.bottom).offset(auto(2.5))
make.top.equalTo(destinationNoticeView.snp.bottom).offset(auto(4))
make.left.equalTo(typeLabel)
make.width.equalTo(merchantTitleLabel)
}
@@ -1631,7 +1630,7 @@ class RescueIsIngCell : DDTableViewCell {
}
orderStatusTitleLabel.snp.makeConstraints { make in
make.top.equalTo(driverLabel.snp.bottom).offset(auto(8))
make.top.equalTo(orderDateLabel.snp.bottom).offset(auto(8))
make.left.equalTo(typeLabel)
make.width.equalTo(auto(60))
}