From 4179a8057cf384a94f2b565505cc5f093579f173 Mon Sep 17 00:00:00 2001
From: ddisfriend <chemailaddress2@gmail.com>
Date: Wed, 20 Aug 2025 16:03:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=9A=E5=90=88=E4=B8=8D=E8=83=BD=E6=94=B9?=
 =?UTF-8?q?=E6=B4=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HttpResponseModel/ResponseModel.swift     |  2 ++
 .../ViewController/RescueController.swift     | 29 +++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/OrderScheduling/HttpResponseModel/ResponseModel.swift b/OrderScheduling/HttpResponseModel/ResponseModel.swift
index 8a3567d..2827306 100644
--- a/OrderScheduling/HttpResponseModel/ResponseModel.swift
+++ b/OrderScheduling/HttpResponseModel/ResponseModel.swift
@@ -85,6 +85,8 @@ class OrderListDataModel: Decodable {
     var auditFailReason : String?
     var isSupplierSettle : SupplierSettleModel?
     var supplierSettleRatio : SupplierSettleRatioModel?
+    /// 案件类型  0 传统案件 1 聚合派工
+    var schedulingFinalRule : Int?
     class SupplierSettleModel : Decodable {
         var code : Int
         var label : String
diff --git a/OrderScheduling/Rescue/ViewController/RescueController.swift b/OrderScheduling/Rescue/ViewController/RescueController.swift
index fc157de..4cab337 100644
--- a/OrderScheduling/Rescue/ViewController/RescueController.swift
+++ b/OrderScheduling/Rescue/ViewController/RescueController.swift
@@ -1037,6 +1037,12 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
         cell?.dispatchButton.rx.tap
             .observe(on: MainScheduler.instance)
             .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)
                 vc.dispatchCompletionHandler = {[weak self] _ in
                     self?.resultArr.removeAll(where: { _model in
@@ -1067,27 +1073,18 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
             })
             .disposed(by: cell!.disposeBag)
         
-        // 设置按钮权限
-        if USERP.canWaitModifyDispatchBtn == true {
-            if (model.taskOrderStatus ?? 0) >= 12001 {
-                cell?.dispatchButton.isHidden = true
-                cell?.dispatchButton.snp.updateConstraints({ make in
-                    make.right.equalTo(cell!.reportDetailButton.snp.left).offset(0)
-                    make.width.equalTo(0)
-                })
-            }else{
-                cell?.dispatchButton.isHidden = false
-                cell?.dispatchButton.snp.updateConstraints({ make in
-                    make.right.equalTo(cell!.reportDetailButton.snp.left).offset(-auto(5))
-                    make.width.equalTo(auto(80))
-                })
-            }
-        }else{
+        if (model.taskOrderStatus ?? 0) >= 12001 {
             cell?.dispatchButton.isHidden = true
             cell?.dispatchButton.snp.updateConstraints({ make in
                 make.right.equalTo(cell!.reportDetailButton.snp.left).offset(0)
                 make.width.equalTo(0)
             })
+        }else{
+            cell?.dispatchButton.isHidden = false
+            cell?.dispatchButton.snp.updateConstraints({ make in
+                make.right.equalTo(cell!.reportDetailButton.snp.left).offset(-auto(5))
+                make.width.equalTo(auto(80))
+            })
         }
         
         if USERP.canSupplierRemarkBtn == true {