From 105e7032a3397f50e8e27471a626e862bf8dca2a Mon Sep 17 00:00:00 2001 From: ddisfriend Date: Tue, 28 Oct 2025 14:42:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=A4=87=E8=BF=94=E5=9B=9E=E8=80=81?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../History/ViewController/HistoryController.swift | 7 ++++--- .../Rescue/ViewController/RescueController.swift | 14 ++++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/OrderScheduling/History/ViewController/HistoryController.swift b/OrderScheduling/History/ViewController/HistoryController.swift index 365bf1b..fe0bd94 100644 --- a/OrderScheduling/History/ViewController/HistoryController.swift +++ b/OrderScheduling/History/ViewController/HistoryController.swift @@ -241,9 +241,10 @@ extension HistoryItemController : UITableViewDelegate, UITableViewDataSource { cell?.reportButton.rx.tap .observe(on: MainScheduler.instance) .subscribe(onNext: { _ in - if let supplierId = USER.supplierId { - WEBTOOL.open(name: .reportIndex,appending: "&userOrderId=\(model.userOrderId)&type=1&userOrderCode=\(model.taskCode)&supplierId=\(supplierId)") - } +// if let supplierId = USER.supplierId { +// WEBTOOL.open(name: .reportIndex,appending: "&userOrderId=\(model.userOrderId)&type=1&userOrderCode=\(model.taskCode)&supplierId=\(supplierId)") +// } + WEBTOOL.open(name: .reporting, appending: "&queryType=\(OrderTypeEnum.UNCLOSED_ORDER.rawValue)&userOrderId=\(model.userOrderId)&orderCode=\(model.orderCode)") }) .disposed(by: cell!.disposeBag) diff --git a/OrderScheduling/Rescue/ViewController/RescueController.swift b/OrderScheduling/Rescue/ViewController/RescueController.swift index 4d33563..dde8124 100644 --- a/OrderScheduling/Rescue/ViewController/RescueController.swift +++ b/OrderScheduling/Rescue/ViewController/RescueController.swift @@ -937,9 +937,10 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS cell?.reportButton.rx.tap .observe(on: MainScheduler.instance) .subscribe(onNext: { _ in - if let supplierId = USER.supplierId { - WEBTOOL.open(name: .reportIndex,appending: "&userOrderId=\(model.userOrderId)&type=1&userOrderCode=\(model.taskCode)&supplierId=\(supplierId)") - } +// if let supplierId = USER.supplierId { +// WEBTOOL.open(name: .reportIndex,appending: "&userOrderId=\(model.userOrderId)&type=1&userOrderCode=\(model.taskCode)&supplierId=\(supplierId)") +// } + WEBTOOL.open(name: .reporting,appending: "&queryType=\(OrderTypeEnum.TO_DISPATCH_VEHICLE.rawValue)&userOrderId=\(model.userOrderId)&orderCode=\(model.orderCode)") }) .disposed(by: cell!.disposeBag) cell?.contactButton.rx.tap @@ -1098,9 +1099,10 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource { cell?.reportButton.rx.tap .observe(on: MainScheduler.instance) .subscribe(onNext: { _ in - if let supplierId = USER.supplierId { - WEBTOOL.open(name: .reportIndex,appending: "&userOrderId=\(model.userOrderId)&type=1&userOrderCode=\(model.taskCode)&supplierId=\(supplierId)") - } +// if let supplierId = USER.supplierId { +// WEBTOOL.open(name: .reportIndex,appending: "&userOrderId=\(model.userOrderId)&type=1&userOrderCode=\(model.taskCode)&supplierId=\(supplierId)") +// } + WEBTOOL.open(name: .reporting,appending: "&queryType=\(OrderTypeEnum.TO_DISPATCH_VEHICLE.rawValue)&userOrderId=\(model.userOrderId)&orderCode=\(model.orderCode)") }) .disposed(by: cell!.disposeBag)