报备

.gitignore

@@ -6,6 +6,8 @@ DerivedData/
 !default.xcworkspace
 
 # iOS 编译产物
+**/*.xcuserdata/
+**/*.xcuserdatad/
 *.xcuserstate
 *.xcuserdata/
 *.xcuserdatad/

OrderScheduling/Common/WebView/WebViewTool.swift

@@ -27,7 +27,7 @@ open class WebViewTool : NSObject {
         case driverManage = "司机管理"
         case invoicingNotify = "工单批次"
         case roadAndbridgeTollReimbursement = "路桥费报销"
-        case reporting = "报备"
+        case reporting = "报备(废弃)"
         case reportingList = "报备查看"
         case supplySettlement = "补结算单"
         case workOrderDetail = "工单详情"
@@ -39,6 +39,7 @@ open class WebViewTool : NSObject {
         case batteryList = "电瓶进销存"
         case invoiceListInfo = "开票信息"
         case indexList = "二手车信息"
+        case reportIndex = "报备"
     }
     
     public override init() {
@@ -140,6 +141,9 @@ open class WebViewTool : NSObject {
         case .indexList:
             vc = WebViewController(showNavBar:false, title: nil, url: "\((h5Models?.indexList)!)?token=\((USER.token)!)"+(appending ?? ""))
             break
+        case .reportIndex:
+            vc = WebViewController(showNavBar:true, title: WebViewNameEnum.reportIndex.rawValue, url: "\((h5Models?.reportIndex)!)?token=\((USER.token)!)"+(appending ?? ""))
+            break
         }
         
         if let vc {

OrderScheduling/History/ViewController/HistoryController.swift

@@ -241,7 +241,9 @@ extension HistoryItemController : UITableViewDelegate, UITableViewDataSource {
         cell?.reportButton.rx.tap
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: { _ in
-                WEBTOOL.open(name: .reporting, appending: "&queryType=\(OrderTypeEnum.UNCLOSED_ORDER.rawValue)&userOrderId=\(model.userOrderId)&orderCode=\(model.orderCode)")
+                if let supplierId = USER.supplierId {
+                    WEBTOOL.open(name: .reportIndex,appending: "&userOrderId=\(model.userOrderId)&type=1&userOrderCode=\(model.taskCode)&supplierId=\(supplierId)")
+                }
             })
             .disposed(by: cell!.disposeBag)
         

OrderScheduling/HttpResponseModel/ResponseModel.swift

@@ -69,6 +69,7 @@ class OrderListDataModel: Decodable {
     var taskOrderStatusString : String?
     var taskOrderStatus : Int?
     var orderCode : String
+    var taskCode : String
     var createTime : String
     var driverName : String?
     var driverPhone : String?
@@ -265,6 +266,7 @@ public class DispatchAppH5UrlDataModel : Decodable {
     var batteryList : String
     var invoiceListInfo : String
     var indexList : String
+    var reportIndex : String
 }
 
 public class VersionCheckDataModel : Decodable {

OrderScheduling/Rescue/ViewController/RescueController.swift

@@ -899,7 +899,9 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
         cell?.reportButton.rx.tap
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: { _ in
-                WEBTOOL.open(name: .reporting,appending: "&queryType=\(OrderTypeEnum.TO_DISPATCH_VEHICLE.rawValue)&userOrderId=\(model.userOrderId)&orderCode=\(model.orderCode)")
+                if let supplierId = USER.supplierId {
+                    WEBTOOL.open(name: .reportIndex,appending: "&userOrderId=\(model.userOrderId)&type=1&userOrderCode=\(model.taskCode)&supplierId=\(supplierId)")
+                }
             })
             .disposed(by: cell!.disposeBag)
         cell?.contactButton.rx.tap
@@ -1044,7 +1046,9 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
         cell?.reportButton.rx.tap
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: { _ in
-                WEBTOOL.open(name: .reporting,appending: "&queryType=\(OrderTypeEnum.TO_RESCUE.rawValue)&userOrderId=\(model.userOrderId)&orderCode=\(model.orderCode)")
+                if let supplierId = USER.supplierId {
+                    WEBTOOL.open(name: .reportIndex,appending: "&userOrderId=\(model.userOrderId)&type=1&userOrderCode=\(model.taskCode)&supplierId=\(supplierId)")
+                }
             })
             .disposed(by: cell!.disposeBag)