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-10-28 14:42:17 +08:00
parent 4dba7e5419
commit 105e7032a3
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OrderScheduling/History/ViewController/HistoryController.swift
View File

@@ -241,9 +241,10 @@ extension HistoryItemController : UITableViewDelegate, UITableViewDataSource {
cell?.reportButton.rx.tap cell?.reportButton.rx.tap
.observe(on: MainScheduler.instance) .observe(on: MainScheduler.instance)
.subscribe(onNext: { _ in .subscribe(onNext: { _ in
if let supplierId = USER.supplierId { // if let supplierId = USER.supplierId {
WEBTOOL.open(name: .reportIndex,appending: "&userOrderId=\(model.userOrderId)&type=1&userOrderCode=\(model.taskCode)&supplierId=\(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) .disposed(by: cell!.disposeBag)

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

@@ -937,9 +937,10 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
cell?.reportButton.rx.tap cell?.reportButton.rx.tap
.observe(on: MainScheduler.instance) .observe(on: MainScheduler.instance)
.subscribe(onNext: { _ in .subscribe(onNext: { _ in
if let supplierId = USER.supplierId { // if let supplierId = USER.supplierId {
WEBTOOL.open(name: .reportIndex,appending: "&userOrderId=\(model.userOrderId)&type=1&userOrderCode=\(model.taskCode)&supplierId=\(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) .disposed(by: cell!.disposeBag)
cell?.contactButton.rx.tap cell?.contactButton.rx.tap
@@ -1098,9 +1099,10 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
cell?.reportButton.rx.tap cell?.reportButton.rx.tap
.observe(on: MainScheduler.instance) .observe(on: MainScheduler.instance)
.subscribe(onNext: { _ in .subscribe(onNext: { _ in
if let supplierId = USER.supplierId { // if let supplierId = USER.supplierId {
WEBTOOL.open(name: .reportIndex,appending: "&userOrderId=\(model.userOrderId)&type=1&userOrderCode=\(model.taskCode)&supplierId=\(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) .disposed(by: cell!.disposeBag)