增加报备查看

This commit is contained in:
DDIsFriend
2023-10-16 10:43:45 +08:00
parent 04a8b72449
commit 2055e88022
9 changed files with 207 additions and 26 deletions

View File

@@ -1122,7 +1122,7 @@
CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 8; CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@@ -1337,7 +1337,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Haifeng Cen (F2QAMRC42Q)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Haifeng Cen (F2QAMRC42Q)";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 8; CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "$(inherited)"; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "$(inherited)";
@@ -1395,7 +1395,7 @@
CODE_SIGN_ENTITLEMENTS = OrderScheduling/OrderSchedulingRelease.entitlements; CODE_SIGN_ENTITLEMENTS = OrderScheduling/OrderSchedulingRelease.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 8; CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1430" LastUpgradeVersion = "1430"
version = "1.7"> version = "1.8">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"> buildImplicitDependencies = "YES">
@@ -28,6 +28,8 @@
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES" shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES"> shouldAutocreateTestPlan = "YES">
<Testables>
</Testables>
</TestAction> </TestAction>
<LaunchAction <LaunchAction
buildConfiguration = "Release" buildConfiguration = "Release"

View File

@@ -48,8 +48,8 @@
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "219" startingLineNumber = "219"
endingLineNumber = "219" endingLineNumber = "219"
landmarkName = "unknown" landmarkName = "textView(_:shouldInteractWith:in:interaction:)"
landmarkType = "0"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy <BreakpointProxy
@@ -411,8 +411,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "936" startingLineNumber = "965"
endingLineNumber = "936" endingLineNumber = "965"
landmarkName = "collectionView(_:cellForItemAt:)" landmarkName = "collectionView(_:cellForItemAt:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -874,8 +874,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewTool.swift" filePath = "OrderScheduling/Common/WebView/WebViewTool.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "55" startingLineNumber = "56"
endingLineNumber = "55" endingLineNumber = "56"
landmarkName = "init()" landmarkName = "init()"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -2237,8 +2237,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "947" startingLineNumber = "976"
endingLineNumber = "947" endingLineNumber = "976"
landmarkName = "collectionView(_:didSelectItemAt:)" landmarkName = "collectionView(_:didSelectItemAt:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -2971,8 +2971,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "1030" startingLineNumber = "1059"
endingLineNumber = "1030" endingLineNumber = "1059"
landmarkName = "viewSafeAreaInsetsDidChange()" landmarkName = "viewSafeAreaInsetsDidChange()"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -3643,8 +3643,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "852" startingLineNumber = "861"
endingLineNumber = "852" endingLineNumber = "861"
landmarkName = "tableView(_:cellForRowAt:)" landmarkName = "tableView(_:cellForRowAt:)"
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
@@ -3691,8 +3691,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "866" startingLineNumber = "875"
endingLineNumber = "866" endingLineNumber = "875"
landmarkName = "tableView(_:cellForRowAt:)" landmarkName = "tableView(_:cellForRowAt:)"
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
@@ -3739,8 +3739,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift" filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "871" startingLineNumber = "886"
endingLineNumber = "871" endingLineNumber = "886"
landmarkName = "tableView(_:cellForRowAt:)" landmarkName = "tableView(_:cellForRowAt:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
@@ -4749,5 +4749,101 @@
</Locations> </Locations>
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "C7B6F81D-14A8-447E-8D82-A7DD0B487A09"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1856"
endingLineNumber = "1856"
landmarkName = "init(style:reuseIdentifier:)"
landmarkType = "7">
<Locations>
<Location
uuid = "C7B6F81D-14A8-447E-8D82-A7DD0B487A09 - e646295a0bee57c4"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.RescueIsIngCell.init(style: __C.UITableViewCellStyle, reuseIdentifier: Swift.Optional&lt;Swift.String&gt;) -&gt; OrderScheduling.RescueIsIngCell"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1856"
endingLineNumber = "1856"
offsetFromSymbolStart = "14292">
</Location>
<Location
uuid = "C7B6F81D-14A8-447E-8D82-A7DD0B487A09 - bf6e4b2488e48af"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "closure #14 (SnapKit.ConstraintMaker) -&gt; () in OrderScheduling.RescueIsIngCell.init(style: __C.UITableViewCellStyle, reuseIdentifier: Swift.Optional&lt;Swift.String&gt;) -&gt; OrderScheduling.RescueIsIngCell"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1857"
endingLineNumber = "1857"
offsetFromSymbolStart = "60">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "7FE3ABC3-AFD1-45C4-9359-EAB6B6141667"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1863"
endingLineNumber = "1863"
landmarkName = "init(style:reuseIdentifier:)"
landmarkType = "7">
<Locations>
<Location
uuid = "7FE3ABC3-AFD1-45C4-9359-EAB6B6141667 - e646295a0bee56fd"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.RescueIsIngCell.init(style: __C.UITableViewCellStyle, reuseIdentifier: Swift.Optional&lt;Swift.String&gt;) -&gt; OrderScheduling.RescueIsIngCell"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1863"
endingLineNumber = "1863"
offsetFromSymbolStart = "14508">
</Location>
<Location
uuid = "7FE3ABC3-AFD1-45C4-9359-EAB6B6141667 - 35efcaec2f16e211"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "closure #15 (SnapKit.ConstraintMaker) -&gt; () in OrderScheduling.RescueIsIngCell.init(style: __C.UITableViewCellStyle, reuseIdentifier: Swift.Optional&lt;Swift.String&gt;) -&gt; OrderScheduling.RescueIsIngCell"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1864"
endingLineNumber = "1864"
offsetFromSymbolStart = "60">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
</Breakpoints> </Breakpoints>
</Bucket> </Bucket>

View File

@@ -27,6 +27,7 @@ open class WebViewTool : NSObject {
case driverManage = "司机管理" case driverManage = "司机管理"
case invoicingNotify = "开票通知" case invoicingNotify = "开票通知"
case reporting = "报备" case reporting = "报备"
case reportingList = "报备查看"
case supplySettlement = "补结算单" case supplySettlement = "补结算单"
case workOrderDetail = "工单详情" case workOrderDetail = "工单详情"
case trainDocment = "培训文档" case trainDocment = "培训文档"
@@ -92,6 +93,9 @@ open class WebViewTool : NSObject {
case .reporting: case .reporting:
vc = WebViewController(title: WebViewNameEnum.reporting.rawValue, url: "\((h5Models?.reporting)!)?token=\((USER.token)!)"+(appending ?? "")) vc = WebViewController(title: WebViewNameEnum.reporting.rawValue, url: "\((h5Models?.reporting)!)?token=\((USER.token)!)"+(appending ?? ""))
break break
case .reportingList:
vc = WebViewController(title: WebViewNameEnum.reportingList.rawValue, url: "\((h5Models?.reportingList)!)?token=\((USER.token)!)"+(appending ?? ""))
break
case .supplySettlement: case .supplySettlement:
vc = WebViewController(title: WebViewNameEnum.supplySettlement.rawValue, url: "\((h5Models?.supplySettlement)!)?token=\((USER.token)!)"+(appending ?? "")) vc = WebViewController(title: WebViewNameEnum.supplySettlement.rawValue, url: "\((h5Models?.supplySettlement)!)?token=\((USER.token)!)"+(appending ?? ""))
break break

View File

@@ -158,6 +158,7 @@ extension HistoryItemController : UITableViewDelegate, UITableViewDataSource {
cell?.orderStatusTitleLabel.text = "状态:" cell?.orderStatusTitleLabel.text = "状态:"
cell?.serviceTitleLabel.text = "故障地:" cell?.serviceTitleLabel.text = "故障地:"
cell?.reportButton.setTitle("报备", for: .normal) cell?.reportButton.setTitle("报备", for: .normal)
cell?.reportDetailButton.setTitle("报备查看", for: .normal)
cell?.additionalButton.setTitle("补结算单", for: .normal) cell?.additionalButton.setTitle("补结算单", for: .normal)
} }
let model = resultArr[indexPath.row] let model = resultArr[indexPath.row]
@@ -222,6 +223,13 @@ extension HistoryItemController : UITableViewDelegate, UITableViewDataSource {
}) })
.disposed(by: cell!.disposeBag) .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 cell?.additionalButton.rx.tap
.observe(on: MainScheduler.instance) .observe(on: MainScheduler.instance)
.subscribe(onNext: { _ in .subscribe(onNext: { _ in
@@ -235,12 +243,24 @@ extension HistoryItemController : UITableViewDelegate, UITableViewDataSource {
make.width.equalTo(auto(80)) make.width.equalTo(auto(80))
make.right.equalTo(cell!.additionalButton.snp.left).offset(-auto(10)) 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{ }else{
cell?.reportButton.isHidden = true cell?.reportButton.isHidden = true
cell?.reportButton.snp.updateConstraints({ make in cell?.reportButton.snp.updateConstraints({ make in
make.width.equalTo(0) make.width.equalTo(0)
make.right.equalTo(cell!.additionalButton.snp.left).offset(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 { if USERP.canSupplierAuditEditCostBtn == true {
@@ -430,6 +450,7 @@ class HistoryItemCell : DDTableViewCell {
public let settlementRatioLabel : DDLabel public let settlementRatioLabel : DDLabel
public let additionalButton : DDButton public let additionalButton : DDButton
public let reportButton : DDButton public let reportButton : DDButton
public let reportDetailButton : DDButton
public var disposeBag : DisposeBag public var disposeBag : DisposeBag
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
@@ -455,6 +476,9 @@ class HistoryItemCell : DDTableViewCell {
reportButton = DDButton.dd_initCustom() reportButton = DDButton.dd_initCustom()
reportButton.titleLabel?.font = .mediumFont(13) reportButton.titleLabel?.font = .mediumFont(13)
reportButton.setTitleColor(.hex("000000").alpha(0.7), for: .normal) 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() disposeBag = DisposeBag()
super.init(style: style, reuseIdentifier: reuseIdentifier) super.init(style: style, reuseIdentifier: reuseIdentifier)
@@ -492,6 +516,10 @@ class HistoryItemCell : DDTableViewCell {
reportButton.layer.borderWidth = 1 reportButton.layer.borderWidth = 1
reportButton.layer.cornerRadius = auto(4) reportButton.layer.cornerRadius = auto(4)
radiusView.addSubview(reportButton) 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 radiusView.snp.makeConstraints { make in
make.left.equalTo(auto(12)) make.left.equalTo(auto(12))
@@ -603,6 +631,12 @@ class HistoryItemCell : DDTableViewCell {
make.height.equalTo(auto(30)) 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) { required public init?(coder: NSCoder) {

View File

@@ -242,6 +242,7 @@ public class DispatchAppH5UrlDataModel : Decodable {
var driverManage : String var driverManage : String
var invoicingNotify : String var invoicingNotify : String
var reporting : String var reporting : String
var reportingList : String
var supplySettlement : String var supplySettlement : String
var workOrderDetail : String var workOrderDetail : String
var trainDocment : String var trainDocment : String

View File

@@ -791,6 +791,7 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
cell?.serviceTitleLabel.text = "故障地:" cell?.serviceTitleLabel.text = "故障地:"
cell?.destinationTitleLabel.text = "目的地:" cell?.destinationTitleLabel.text = "目的地:"
cell?.reportButton.setTitle("报备", for: .normal) cell?.reportButton.setTitle("报备", for: .normal)
cell?.reportDetailButton.setTitle("报备查看", for: .normal)
cell?.dispatchButton.setTitle("改派", for: .normal) cell?.dispatchButton.setTitle("改派", for: .normal)
} }
let model = resultArr[indexPath.row] 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)") WEBTOOL.open(name: .reporting,appending: "&queryType=\(OrderTypeEnum.TO_RESCUE.rawValue)&userOrderId=\(model.userOrderId)&orderCode=\(model.orderCode)")
}) })
.disposed(by: cell!.disposeBag) .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 { if USERP.canWaitModifyDispatchBtn == true {
cell?.dispatchButton.isHidden = false cell?.dispatchButton.isHidden = false
cell?.dispatchButton.snp.updateConstraints({ make in 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)) make.width.equalTo(auto(80))
}) })
}else{ }else{
cell?.dispatchButton.isHidden = true cell?.dispatchButton.isHidden = true
cell?.dispatchButton.snp.updateConstraints({ make in 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) make.width.equalTo(0)
}) })
} }
@@ -867,22 +876,42 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
make.width.equalTo(auto(80)) make.width.equalTo(auto(80))
make.right.equalTo(-auto(10)) 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{ }else{
cell?.reportButton.isHidden = true cell?.reportButton.isHidden = true
cell?.reportButton.snp.updateConstraints({ make in cell?.reportButton.snp.updateConstraints({ make in
make.width.equalTo(0) make.width.equalTo(0)
make.right.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 { if USERP.canWaitModifyDispatchBtn == false && USERP.canSupplierRemarkBtn == false {
cell?.reportButton.snp.updateConstraints({ make in cell?.reportButton.snp.updateConstraints({ make in
make.height.equalTo(0) make.height.equalTo(0)
}) })
cell?.reportDetailButton.snp.updateConstraints({ make in
make.height.equalTo(0)
})
}else{ }else{
cell?.reportButton.snp.updateConstraints({ make in cell?.reportButton.snp.updateConstraints({ make in
make.height.equalTo(auto(30)) 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 destinationLabel : DDLabel
public let dispatchButton : DDButton public let dispatchButton : DDButton
public let reportButton : DDButton public let reportButton : DDButton
public let reportDetailButton : DDButton
public var disposeBag : DisposeBag public var disposeBag : DisposeBag
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
@@ -1706,6 +1736,9 @@ class RescueIsIngCell : DDTableViewCell {
reportButton = DDButton.dd_initCustom() reportButton = DDButton.dd_initCustom()
reportButton.titleLabel?.font = .mediumFont(13) reportButton.titleLabel?.font = .mediumFont(13)
reportButton.setTitleColor(.hex("FFFFFF"), for: .normal) reportButton.setTitleColor(.hex("FFFFFF"), for: .normal)
reportDetailButton = DDButton.dd_initCustom()
reportDetailButton.titleLabel?.font = .mediumFont(13)
reportDetailButton.setTitleColor(.hex("FFFFFF"), for: .normal)
disposeBag = DisposeBag() disposeBag = DisposeBag()
super.init(style: style, reuseIdentifier: reuseIdentifier) super.init(style: style, reuseIdentifier: reuseIdentifier)
@@ -1739,6 +1772,10 @@ class RescueIsIngCell : DDTableViewCell {
reportButton.layer.masksToBounds = true reportButton.layer.masksToBounds = true
reportButton.backgroundColor = .hex("2A5094") reportButton.backgroundColor = .hex("2A5094")
radiusView.addSubview(reportButton) radiusView.addSubview(reportButton)
reportDetailButton.layer.cornerRadius = auto(4)
reportDetailButton.layer.masksToBounds = true
reportDetailButton.backgroundColor = .hex("2A5094")
radiusView.addSubview(reportDetailButton)
radiusView.snp.makeConstraints { make in radiusView.snp.makeConstraints { make in
make.left.equalTo(auto(12)) make.left.equalTo(auto(12))
@@ -1816,12 +1853,19 @@ class RescueIsIngCell : DDTableViewCell {
make.bottom.equalToSuperview().offset(-auto(10)) 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.right.equalTo(reportButton.snp.left).offset(-auto(10))
make.top.equalTo(reportButton) make.top.equalTo(reportButton)
make.width.equalTo(auto(80)) make.width.equalTo(auto(80))
make.height.equalTo(auto(30)) 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))
}
} }

View File

@@ -5,17 +5,17 @@
<testcase classname="fastlane.lanes" name="0: default_platform" time="0.000174"> <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000168">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="1: gym" time="77.548882"> <testcase classname="fastlane.lanes" name="1: gym" time="76.936236">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="2: pgyer" time="12.984647"> <testcase classname="fastlane.lanes" name="2: pgyer" time="11.120719">
</testcase> </testcase>