diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate
index 898ae8c..305cb24 100644
Binary files a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate and b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index db1f31a..c10b0c3 100644
--- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -395,8 +395,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1033"
- endingLineNumber = "1033"
+ startingLineNumber = "1010"
+ endingLineNumber = "1010"
landmarkName = "collectionView(_:cellForItemAt:)"
landmarkType = "7">
@@ -2221,8 +2221,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1044"
- endingLineNumber = "1044"
+ startingLineNumber = "1021"
+ endingLineNumber = "1021"
landmarkName = "collectionView(_:didSelectItemAt:)"
landmarkType = "7">
@@ -3601,54 +3601,6 @@
landmarkType = "7">
-
-
-
-
-
-
-
-
-
-
+ startingLineNumber = "947"
+ endingLineNumber = "947"
+ offsetFromSymbolStart = "11400">
+ startingLineNumber = "948"
+ endingLineNumber = "948"
+ offsetFromSymbolStart = "36">
@@ -3707,8 +3659,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "952"
- endingLineNumber = "952"
+ startingLineNumber = "962"
+ endingLineNumber = "962"
landmarkName = "tableView(_:cellForRowAt:)"
landmarkType = "7">
@@ -4679,8 +4631,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1975"
- endingLineNumber = "1975"
+ startingLineNumber = "1951"
+ endingLineNumber = "1951"
landmarkName = "init(style:reuseIdentifier:)"
landmarkType = "7">
@@ -4727,8 +4679,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1982"
- endingLineNumber = "1982"
+ startingLineNumber = "1958"
+ endingLineNumber = "1958"
landmarkName = "init(style:reuseIdentifier:)"
landmarkType = "7">
@@ -4845,5 +4797,53 @@
landmarkType = "7">
+
+
+
+
+
+
+
+
+
+
diff --git a/OrderScheduling/History/ViewController/HistoryController.swift b/OrderScheduling/History/ViewController/HistoryController.swift
index 63fb9f4..1a8342a 100644
--- a/OrderScheduling/History/ViewController/HistoryController.swift
+++ b/OrderScheduling/History/ViewController/HistoryController.swift
@@ -268,15 +268,6 @@ extension HistoryItemController : UITableViewDelegate, UITableViewDataSource {
})
}
- if USERP.canSupplierRemarkBtn == false && USERP.canSupplierAuditEditCostBtn == false {
- cell?.additionalButton.snp.updateConstraints({ make in
- make.height.equalTo(0)
- })
- }else{
- cell?.additionalButton.snp.updateConstraints({ make in
- make.height.equalTo(auto(30))
- })
- }
return cell!
}
@@ -619,24 +610,24 @@ class HistoryItemCell : DDTableViewCell {
additionalButton.snp.makeConstraints { make in
make.right.equalToSuperview().offset(-auto(8))
- make.top.equalTo(settlementRatioLabel.snp.bottom).offset(auto(10))
+ make.top.equalTo(reportDetailButton)
make.width.equalTo(auto(80))
make.height.equalTo(auto(30))
- make.bottom.equalToSuperview().offset(-auto(10))
}
reportButton.snp.makeConstraints { make in
make.right.equalTo(additionalButton.snp.left).offset(-auto(5))
- make.top.equalTo(additionalButton)
+ make.top.equalTo(reportDetailButton)
make.width.equalTo(auto(80))
make.height.equalTo(auto(30))
}
reportDetailButton.snp.makeConstraints { make in
make.right.equalTo(reportButton.snp.left).offset(-auto(5))
- make.top.equalTo(reportButton)
make.width.equalTo(auto(80))
make.height.equalTo(auto(30))
+ make.top.equalTo(settlementRatioLabel.snp.bottom).offset(auto(10))
+ make.bottom.equalToSuperview().offset(-auto(10))
}
}
diff --git a/OrderScheduling/Rescue/ViewController/RescueController.swift b/OrderScheduling/Rescue/ViewController/RescueController.swift
index 9ba5c21..cc24f2b 100644
--- a/OrderScheduling/Rescue/ViewController/RescueController.swift
+++ b/OrderScheduling/Rescue/ViewController/RescueController.swift
@@ -817,11 +817,13 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
if USERP.canSupplierRemarkBtn == true {
cell?.reportButton.isHidden = false
cell?.reportButton.snp.updateConstraints({ make in
+ make.right.equalTo(cell!.contactButton.snp.left).offset(-auto(5))
make.width.equalTo(auto(80))
})
}else{
cell?.reportButton.isHidden = true
cell?.reportButton.snp.updateConstraints({ make in
+ make.right.equalTo(cell!.contactButton.snp.left).offset(0)
make.width.equalTo(0)
})
}
@@ -929,11 +931,19 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
// 设置按钮权限
if USERP.canWaitModifyDispatchBtn == true {
- cell?.dispatchButton.isHidden = false
- cell?.dispatchButton.snp.updateConstraints({ make in
- make.right.equalTo(cell!.reportDetailButton.snp.left).offset(-auto(5))
- make.width.equalTo(auto(80))
- })
+ if (model.taskOrderStatus ?? 0) >= 12001 {
+ cell?.dispatchButton.isHidden = true
+ cell?.dispatchButton.snp.updateConstraints({ make in
+ make.right.equalTo(cell!.reportDetailButton.snp.left).offset(0)
+ make.width.equalTo(0)
+ })
+ }else{
+ cell?.dispatchButton.isHidden = false
+ cell?.dispatchButton.snp.updateConstraints({ make in
+ make.right.equalTo(cell!.reportDetailButton.snp.left).offset(-auto(5))
+ make.width.equalTo(auto(80))
+ })
+ }
}else{
cell?.dispatchButton.isHidden = true
cell?.dispatchButton.snp.updateConstraints({ make in
@@ -956,39 +966,6 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
})
}
- 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))
- })
- }
-
- // 需要放在权限的代码后面
- if (model.taskOrderStatus ?? 0) >= 12001 {
- cell?.dispatchButton.isHidden = true
- cell?.dispatchButton.snp.updateConstraints({ make in
- make.right.equalTo(cell!.reportDetailButton.snp.left).offset(0)
- make.width.equalTo(0)
- })
- }else{
- cell?.dispatchButton.isHidden = false
- cell?.dispatchButton.snp.updateConstraints({ make in
- make.right.equalTo(cell!.reportDetailButton.snp.left).offset(-auto(5))
- make.width.equalTo(auto(80))
- })
- }
-
return cell!
}
@@ -1743,22 +1720,22 @@ class RescuePendingDispatchCell : DDTableViewCell {
dispatchButton.snp.makeConstraints { make in
make.right.equalToSuperview().offset(-auto(8))
- make.top.equalTo(photoView.snp.bottom).offset(auto(10))
+ make.top.equalTo(contactButton)
make.width.equalTo(auto(80))
make.height.equalTo(auto(30))
- make.bottom.equalToSuperview().offset(-auto(10))
}
contactButton.snp.makeConstraints { make in
make.right.equalTo(dispatchButton.snp.left).offset(-auto(5))
- make.top.equalTo(dispatchButton)
make.width.equalTo(auto(80))
make.height.equalTo(auto(30))
+ make.top.equalTo(photoView.snp.bottom).offset(auto(10))
+ make.bottom.equalToSuperview().offset(-auto(10))
}
reportButton.snp.makeConstraints { make in
make.right.equalTo(contactButton.snp.left).offset(-auto(5))
- make.top.equalTo(dispatchButton)
+ make.top.equalTo(contactButton)
make.width.equalTo(auto(80))
make.height.equalTo(auto(30))
}
@@ -1966,31 +1943,31 @@ class RescueIsIngCell : DDTableViewCell {
reportButton.snp.makeConstraints { make in
make.right.equalToSuperview().offset(-auto(8))
- make.top.equalTo(destinationLabel.snp.bottom).offset(auto(10))
make.width.equalTo(auto(80))
make.height.equalTo(auto(30))
- make.bottom.equalToSuperview().offset(-auto(10))
+ make.top.equalTo(contactButton)
}
reportDetailButton.snp.makeConstraints { make in
make.right.equalTo(reportButton.snp.left).offset(-auto(5))
- make.top.equalTo(reportButton)
+ make.top.equalTo(contactButton)
make.width.equalTo(auto(80))
make.height.equalTo(auto(30))
}
dispatchButton.snp.makeConstraints { make in
make.right.equalTo(reportDetailButton.snp.left).offset(-auto(5))
- make.top.equalTo(reportButton)
+ make.top.equalTo(contactButton)
make.width.equalTo(auto(80))
make.height.equalTo(auto(30))
}
contactButton.snp.makeConstraints { make in
make.right.equalTo(dispatchButton.snp.left).offset(-auto(5))
- make.top.equalTo(reportButton)
make.width.equalTo(auto(80))
make.height.equalTo(auto(30))
+ make.top.equalTo(destinationLabel.snp.bottom).offset(auto(10))
+ make.bottom.equalToSuperview().offset(-auto(10))
}
}