diff --git a/OrderScheduling.xcodeproj/project.pbxproj b/OrderScheduling.xcodeproj/project.pbxproj index 61cd07d..2933606 100644 --- a/OrderScheduling.xcodeproj/project.pbxproj +++ b/OrderScheduling.xcodeproj/project.pbxproj @@ -1122,7 +1122,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 8; + CURRENT_PROJECT_VERSION = 9; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; FRAMEWORK_SEARCH_PATHS = ( @@ -1337,7 +1337,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Haifeng Cen (F2QAMRC42Q)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 8; + CURRENT_PROJECT_VERSION = 9; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "$(inherited)"; @@ -1395,7 +1395,7 @@ CODE_SIGN_ENTITLEMENTS = OrderScheduling/OrderSchedulingRelease.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 8; + CURRENT_PROJECT_VERSION = 9; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; FRAMEWORK_SEARCH_PATHS = ( diff --git a/OrderScheduling.xcodeproj/xcshareddata/xcschemes/Release.xcscheme b/OrderScheduling.xcodeproj/xcshareddata/xcschemes/Release.xcscheme index 3ea2924..85c05ed 100644 --- a/OrderScheduling.xcodeproj/xcshareddata/xcschemes/Release.xcscheme +++ b/OrderScheduling.xcodeproj/xcshareddata/xcschemes/Release.xcscheme @@ -1,7 +1,7 @@ + version = "1.8"> @@ -28,6 +28,8 @@ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES" shouldAutocreateTestPlan = "YES"> + + + landmarkName = "textView(_:shouldInteractWith:in:interaction:)" + landmarkType = "7"> @@ -874,8 +874,8 @@ filePath = "OrderScheduling/Common/WebView/WebViewTool.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "55" - endingLineNumber = "55" + startingLineNumber = "56" + endingLineNumber = "56" landmarkName = "init()" landmarkType = "7"> @@ -2237,8 +2237,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "947" - endingLineNumber = "947" + startingLineNumber = "976" + endingLineNumber = "976" landmarkName = "collectionView(_:didSelectItemAt:)" landmarkType = "7"> @@ -2971,8 +2971,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1030" - endingLineNumber = "1030" + startingLineNumber = "1059" + endingLineNumber = "1059" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -3643,8 +3643,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "852" - endingLineNumber = "852" + startingLineNumber = "861" + endingLineNumber = "861" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -3691,8 +3691,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "866" - endingLineNumber = "866" + startingLineNumber = "875" + endingLineNumber = "875" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -3739,8 +3739,8 @@ filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "871" - endingLineNumber = "871" + startingLineNumber = "886" + endingLineNumber = "886" landmarkName = "tableView(_:cellForRowAt:)" landmarkType = "7"> @@ -4749,5 +4749,101 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/OrderScheduling/Common/WebView/WebViewTool.swift b/OrderScheduling/Common/WebView/WebViewTool.swift index db9949b..7b4b18b 100644 --- a/OrderScheduling/Common/WebView/WebViewTool.swift +++ b/OrderScheduling/Common/WebView/WebViewTool.swift @@ -27,6 +27,7 @@ open class WebViewTool : NSObject { case driverManage = "司机管理" case invoicingNotify = "开票通知" case reporting = "报备" + case reportingList = "报备查看" case supplySettlement = "补结算单" case workOrderDetail = "工单详情" case trainDocment = "培训文档" @@ -92,6 +93,9 @@ open class WebViewTool : NSObject { case .reporting: vc = WebViewController(title: WebViewNameEnum.reporting.rawValue, url: "\((h5Models?.reporting)!)?token=\((USER.token)!)"+(appending ?? "")) break + case .reportingList: + vc = WebViewController(title: WebViewNameEnum.reportingList.rawValue, url: "\((h5Models?.reportingList)!)?token=\((USER.token)!)"+(appending ?? "")) + break case .supplySettlement: vc = WebViewController(title: WebViewNameEnum.supplySettlement.rawValue, url: "\((h5Models?.supplySettlement)!)?token=\((USER.token)!)"+(appending ?? "")) break diff --git a/OrderScheduling/History/ViewController/HistoryController.swift b/OrderScheduling/History/ViewController/HistoryController.swift index 9225ea4..96738e8 100644 --- a/OrderScheduling/History/ViewController/HistoryController.swift +++ b/OrderScheduling/History/ViewController/HistoryController.swift @@ -158,6 +158,7 @@ extension HistoryItemController : UITableViewDelegate, UITableViewDataSource { cell?.orderStatusTitleLabel.text = "状态:" cell?.serviceTitleLabel.text = "故障地:" cell?.reportButton.setTitle("报备", for: .normal) + cell?.reportDetailButton.setTitle("报备查看", for: .normal) cell?.additionalButton.setTitle("补结算单", for: .normal) } let model = resultArr[indexPath.row] @@ -222,6 +223,13 @@ extension HistoryItemController : UITableViewDelegate, UITableViewDataSource { }) .disposed(by: cell!.disposeBag) + cell?.reportDetailButton.rx.tap + .observe(on: MainScheduler.instance) + .subscribe(onNext: { _ in + WEBTOOL.open(name: .reportingList,appending: "&queryType=\(OrderTypeEnum.UNCLOSED_ORDER.rawValue)&userOrderId=\(model.userOrderId)&orderCode=\(model.orderCode)&taskOrderId=\(model.taskOrderId)") + }) + .disposed(by: disposeBag) + cell?.additionalButton.rx.tap .observe(on: MainScheduler.instance) .subscribe(onNext: { _ in @@ -235,12 +243,24 @@ extension HistoryItemController : UITableViewDelegate, UITableViewDataSource { make.width.equalTo(auto(80)) make.right.equalTo(cell!.additionalButton.snp.left).offset(-auto(10)) }) + + cell?.reportDetailButton.isHidden = false + cell?.reportDetailButton.snp.updateConstraints({ make in + make.width.equalTo(auto(80)) + make.right.equalTo(cell!.reportButton.snp.left).offset(-auto(10)) + }) }else{ cell?.reportButton.isHidden = true cell?.reportButton.snp.updateConstraints({ make in make.width.equalTo(0) make.right.equalTo(cell!.additionalButton.snp.left).offset(0) }) + + cell?.reportDetailButton.isHidden = true + cell?.reportDetailButton.snp.updateConstraints({ make in + make.width.equalTo(0) + make.right.equalTo(cell!.reportButton.snp.left).offset(0) + }) } if USERP.canSupplierAuditEditCostBtn == true { @@ -430,6 +450,7 @@ class HistoryItemCell : DDTableViewCell { public let settlementRatioLabel : DDLabel public let additionalButton : DDButton public let reportButton : DDButton + public let reportDetailButton : DDButton public var disposeBag : DisposeBag override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { @@ -455,6 +476,9 @@ class HistoryItemCell : DDTableViewCell { reportButton = DDButton.dd_initCustom() reportButton.titleLabel?.font = .mediumFont(13) reportButton.setTitleColor(.hex("000000").alpha(0.7), for: .normal) + reportDetailButton = DDButton.dd_initCustom() + reportDetailButton.titleLabel?.font = .mediumFont(13) + reportDetailButton.setTitleColor(.hex("000000").alpha(0.7), for: .normal) disposeBag = DisposeBag() super.init(style: style, reuseIdentifier: reuseIdentifier) @@ -492,6 +516,10 @@ class HistoryItemCell : DDTableViewCell { reportButton.layer.borderWidth = 1 reportButton.layer.cornerRadius = auto(4) radiusView.addSubview(reportButton) + reportDetailButton.layer.borderColor = UIColor.hex("DDDDDD").cgColor + reportDetailButton.layer.borderWidth = 1 + reportDetailButton.layer.cornerRadius = auto(4) + radiusView.addSubview(reportDetailButton) radiusView.snp.makeConstraints { make in make.left.equalTo(auto(12)) @@ -603,6 +631,12 @@ class HistoryItemCell : DDTableViewCell { make.height.equalTo(auto(30)) } + reportDetailButton.snp.makeConstraints { make in + make.right.equalTo(reportButton.snp.left).offset(-auto(10)) + make.top.equalTo(reportButton) + make.width.equalTo(auto(80)) + make.height.equalTo(auto(30)) + } } required public init?(coder: NSCoder) { diff --git a/OrderScheduling/HttpResponseModel/ResponseModel.swift b/OrderScheduling/HttpResponseModel/ResponseModel.swift index 8de9aa0..838b217 100644 --- a/OrderScheduling/HttpResponseModel/ResponseModel.swift +++ b/OrderScheduling/HttpResponseModel/ResponseModel.swift @@ -242,6 +242,7 @@ public class DispatchAppH5UrlDataModel : Decodable { var driverManage : String var invoicingNotify : String var reporting : String + var reportingList : String var supplySettlement : String var workOrderDetail : String var trainDocment : String diff --git a/OrderScheduling/Rescue/ViewController/RescueController.swift b/OrderScheduling/Rescue/ViewController/RescueController.swift index 8a04667..48146c4 100644 --- a/OrderScheduling/Rescue/ViewController/RescueController.swift +++ b/OrderScheduling/Rescue/ViewController/RescueController.swift @@ -791,6 +791,7 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource { cell?.serviceTitleLabel.text = "故障地:" cell?.destinationTitleLabel.text = "目的地:" cell?.reportButton.setTitle("报备", for: .normal) + cell?.reportDetailButton.setTitle("报备查看", for: .normal) cell?.dispatchButton.setTitle("改派", for: .normal) } let model = resultArr[indexPath.row] @@ -846,17 +847,25 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource { WEBTOOL.open(name: .reporting,appending: "&queryType=\(OrderTypeEnum.TO_RESCUE.rawValue)&userOrderId=\(model.userOrderId)&orderCode=\(model.orderCode)") }) .disposed(by: cell!.disposeBag) + + cell?.reportDetailButton.rx.tap + .observe(on: MainScheduler.instance) + .subscribe(onNext: { _ in + WEBTOOL.open(name: .reportingList,appending: "&queryType=\(OrderTypeEnum.TO_RESCUE.rawValue)&userOrderId=\(model.userOrderId)&orderCode=\(model.orderCode)&taskOrderId=\(model.taskOrderId)") + }) + .disposed(by: disposeBag) + // 设置按钮权限 if USERP.canWaitModifyDispatchBtn == true { cell?.dispatchButton.isHidden = false cell?.dispatchButton.snp.updateConstraints({ make in - make.right.equalTo(cell!.reportButton.snp.left).offset(-auto(10)) + make.right.equalTo(cell!.reportDetailButton.snp.left).offset(-auto(10)) make.width.equalTo(auto(80)) }) }else{ cell?.dispatchButton.isHidden = true cell?.dispatchButton.snp.updateConstraints({ make in - make.right.equalTo(cell!.reportButton.snp.left).offset(0) + make.right.equalTo(cell!.reportDetailButton.snp.left).offset(0) make.width.equalTo(0) }) } @@ -867,22 +876,42 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource { make.width.equalTo(auto(80)) make.right.equalTo(-auto(10)) }) + + cell?.reportDetailButton.isHidden = false + cell?.reportDetailButton.snp.updateConstraints({ make in + make.width.equalTo(auto(80)) + make.right.equalTo(cell!.reportButton.snp.left).offset(-auto(10)) + }) }else{ cell?.reportButton.isHidden = true cell?.reportButton.snp.updateConstraints({ make in make.width.equalTo(0) make.right.equalTo(0) }) + + cell?.reportDetailButton.isHidden = true + cell?.reportDetailButton.snp.updateConstraints({ make in + make.width.equalTo(0) + make.right.equalTo(0) + }) } if USERP.canWaitModifyDispatchBtn == false && USERP.canSupplierRemarkBtn == false { cell?.reportButton.snp.updateConstraints({ make in make.height.equalTo(0) }) + + cell?.reportDetailButton.snp.updateConstraints({ make in + make.height.equalTo(0) + }) }else{ cell?.reportButton.snp.updateConstraints({ make in make.height.equalTo(auto(30)) }) + + cell?.reportDetailButton.snp.updateConstraints({ make in + make.height.equalTo(auto(30)) + }) } // 需要放在权限的代码后面 @@ -1685,6 +1714,7 @@ class RescueIsIngCell : DDTableViewCell { public let destinationLabel : DDLabel public let dispatchButton : DDButton public let reportButton : DDButton + public let reportDetailButton : DDButton public var disposeBag : DisposeBag override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { @@ -1706,6 +1736,9 @@ class RescueIsIngCell : DDTableViewCell { reportButton = DDButton.dd_initCustom() reportButton.titleLabel?.font = .mediumFont(13) reportButton.setTitleColor(.hex("FFFFFF"), for: .normal) + reportDetailButton = DDButton.dd_initCustom() + reportDetailButton.titleLabel?.font = .mediumFont(13) + reportDetailButton.setTitleColor(.hex("FFFFFF"), for: .normal) disposeBag = DisposeBag() super.init(style: style, reuseIdentifier: reuseIdentifier) @@ -1739,6 +1772,10 @@ class RescueIsIngCell : DDTableViewCell { reportButton.layer.masksToBounds = true reportButton.backgroundColor = .hex("2A5094") radiusView.addSubview(reportButton) + reportDetailButton.layer.cornerRadius = auto(4) + reportDetailButton.layer.masksToBounds = true + reportDetailButton.backgroundColor = .hex("2A5094") + radiusView.addSubview(reportDetailButton) radiusView.snp.makeConstraints { make in make.left.equalTo(auto(12)) @@ -1816,12 +1853,19 @@ class RescueIsIngCell : DDTableViewCell { make.bottom.equalToSuperview().offset(-auto(10)) } - dispatchButton.snp.makeConstraints { make in + reportDetailButton.snp.makeConstraints { make in make.right.equalTo(reportButton.snp.left).offset(-auto(10)) make.top.equalTo(reportButton) make.width.equalTo(auto(80)) make.height.equalTo(auto(30)) } + + dispatchButton.snp.makeConstraints { make in + make.right.equalTo(reportDetailButton.snp.left).offset(-auto(10)) + make.top.equalTo(reportButton) + make.width.equalTo(auto(80)) + make.height.equalTo(auto(30)) + } } diff --git a/fastlane/report.xml b/fastlane/report.xml index 2f510ce..3b21bae 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,17 +5,17 @@ - + - + - +