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

聚合不能改派

Browse Source
This commit is contained in:
ddisfriend
2025-08-20 16:03:44 +08:00
parent 294ec07f6e
commit 4179a8057c
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OrderScheduling/HttpResponseModel/ResponseModel.swift
View File

@@ -85,6 +85,8 @@ class OrderListDataModel: Decodable {
var auditFailReason : String? var auditFailReason : String?
var isSupplierSettle : SupplierSettleModel? var isSupplierSettle : SupplierSettleModel?
var supplierSettleRatio : SupplierSettleRatioModel? var supplierSettleRatio : SupplierSettleRatioModel?
/// 案件类型 0 传统案件 1 聚合派工
var schedulingFinalRule : Int?
class SupplierSettleModel : Decodable { class SupplierSettleModel : Decodable {
var code : Int var code : Int
var label : String var label : String

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

@@ -1037,6 +1037,12 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
cell?.dispatchButton.rx.tap cell?.dispatchButton.rx.tap
.observe(on: MainScheduler.instance) .observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] _ in .subscribe(onNext: {[weak self] _ in
// 没有权限且已聚合成功不能改派
if USERP.canWaitModifyDispatchBtn != true && model.schedulingFinalRule == 1 {
self?.view.dd_makeToast("上游聚合成功案件，不得改派，如有特殊需要，请联系中道")
return
}
let vc = DispatchOrderController.init(userOrderId: model.userOrderId, taskOrderId: model.taskOrderId,serviceAddressLat: model.vehiclePointLatitude,serviceAddressLon: model.vehiclePointLongitude) let vc = DispatchOrderController.init(userOrderId: model.userOrderId, taskOrderId: model.taskOrderId,serviceAddressLat: model.vehiclePointLatitude,serviceAddressLon: model.vehiclePointLongitude)
vc.dispatchCompletionHandler = {[weak self] _ in vc.dispatchCompletionHandler = {[weak self] _ in
self?.resultArr.removeAll(where: { _model in self?.resultArr.removeAll(where: { _model in
@@ -1067,8 +1073,6 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
}) })
.disposed(by: cell!.disposeBag) .disposed(by: cell!.disposeBag)
// 设置按钮权限
if USERP.canWaitModifyDispatchBtn == true {
if (model.taskOrderStatus ?? 0) >= 12001 { if (model.taskOrderStatus ?? 0) >= 12001 {
cell?.dispatchButton.isHidden = true cell?.dispatchButton.isHidden = true
cell?.dispatchButton.snp.updateConstraints({ make in cell?.dispatchButton.snp.updateConstraints({ make in
@@ -1082,13 +1086,6 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
make.width.equalTo(auto(80)) make.width.equalTo(auto(80))
}) })
} }
}else{
cell?.dispatchButton.isHidden = true
cell?.dispatchButton.snp.updateConstraints({ make in
make.right.equalTo(cell!.reportDetailButton.snp.left).offset(0)
make.width.equalTo(0)
})
}
if USERP.canSupplierRemarkBtn == true { if USERP.canSupplierRemarkBtn == true {
cell?.reportButton.isHidden = false cell?.reportButton.isHidden = false