权限按钮之前4.0.0版本有问题，改正

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"
+            startingLineNumber = "1010"
-            endingLineNumber = "1033"
+            endingLineNumber = "1010"
             landmarkName = "collectionView(_:cellForItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2221,8 +2221,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1044"
+            startingLineNumber = "1021"
-            endingLineNumber = "1044"
+            endingLineNumber = "1021"
             landmarkName = "collectionView(_:didSelectItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -3601,54 +3601,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "D242BE6B-F51B-45F2-BFEA-829872E24978"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "933"
-            endingLineNumber = "933"
-            landmarkName = "tableView(_:cellForRowAt:)"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "D242BE6B-F51B-45F2-BFEA-829872E24978 - b8ab704301458127"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "OrderScheduling.RescueIsIngController.tableView(_: __C.UITableView, cellForRowAt: Foundation.IndexPath) -&gt; __C.UITableViewCell"
-                  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 = "857"
-                  endingLineNumber = "857"
-                  offsetFromSymbolStart = "10851">
-               </Location>
-               <Location
-                  uuid = "D242BE6B-F51B-45F2-BFEA-829872E24978 - a65e7ca50fc68a8"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "closure #5 (SnapKit.ConstraintMaker) -&gt; () in OrderScheduling.RescueIsIngController.tableView(_: __C.UITableView, cellForRowAt: Foundation.IndexPath) -&gt; __C.UITableViewCell"
-                  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 = "858"
-                  endingLineNumber = "858"
-                  offsetFromSymbolStart = "77">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -3659,13 +3611,13 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "947"
+            startingLineNumber = "957"
-            endingLineNumber = "947"
+            endingLineNumber = "957"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "9D2B5A65-D238-4600-B88F-FED82BC497D8 - b8ab7043014587f1"
+                  uuid = "9D2B5A65-D238-4600-B88F-FED82BC497D8 - b8ab704301458dbd"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -3675,24 +3627,24 @@
                   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 = "871"
+                  startingLineNumber = "947"
-                  endingLineNumber = "871"
+                  endingLineNumber = "947"
-                  offsetFromSymbolStart = "11587">
+                  offsetFromSymbolStart = "11400">
                </Location>
                <Location
-                  uuid = "9D2B5A65-D238-4600-B88F-FED82BC497D8 - d42d1355e00f52fc"
+                  uuid = "9D2B5A65-D238-4600-B88F-FED82BC497D8 - 96f2bcd171518cce"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
-                  symbolName = "closure #7 (SnapKit.ConstraintMaker) -&gt; () in OrderScheduling.RescueIsIngController.tableView(_: __C.UITableView, cellForRowAt: Foundation.IndexPath) -&gt; __C.UITableViewCell"
+                  symbolName = "closure #9 (SnapKit.ConstraintMaker) -&gt; () in OrderScheduling.RescueIsIngController.tableView(_: __C.UITableView, cellForRowAt: Foundation.IndexPath) -&gt; __C.UITableViewCell"
                   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 = "872"
+                  startingLineNumber = "948"
-                  endingLineNumber = "872"
+                  endingLineNumber = "948"
-                  offsetFromSymbolStart = "35">
+                  offsetFromSymbolStart = "36">
                </Location>
             </Locations>
          </BreakpointContent>
@@ -3707,8 +3659,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "952"
+            startingLineNumber = "962"
-            endingLineNumber = "952"
+            endingLineNumber = "962"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -4679,8 +4631,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1975"
+            startingLineNumber = "1951"
-            endingLineNumber = "1975"
+            endingLineNumber = "1951"
             landmarkName = "init(style:reuseIdentifier:)"
             landmarkType = "7">
             <Locations>
@@ -4727,8 +4679,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1982"
+            startingLineNumber = "1958"
-            endingLineNumber = "1982"
+            endingLineNumber = "1958"
             landmarkName = "init(style:reuseIdentifier:)"
             landmarkType = "7">
             <Locations>
@@ -4845,5 +4797,53 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "04A7FBE8-07BD-41C0-98B9-A3FC8FE0DF05"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "949"
+            endingLineNumber = "949"
+            landmarkName = "tableView(_:cellForRowAt:)"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "04A7FBE8-07BD-41C0-98B9-A3FC8FE0DF05 - b8ab704301458cb5"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.RescueIsIngController.tableView(_: __C.UITableView, cellForRowAt: Foundation.IndexPath) -&gt; __C.UITableViewCell"
+                  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 = "939"
+                  endingLineNumber = "939"
+                  offsetFromSymbolStart = "11036">
+               </Location>
+               <Location
+                  uuid = "04A7FBE8-07BD-41C0-98B9-A3FC8FE0DF05 - f711451329f63739"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #8 (SnapKit.ConstraintMaker) -&gt; () in OrderScheduling.RescueIsIngController.tableView(_: __C.UITableView, cellForRowAt: Foundation.IndexPath) -&gt; __C.UITableViewCell"
+                  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 = "940"
+                  endingLineNumber = "940"
+                  offsetFromSymbolStart = "84">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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))
         }
     }
     

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
+            if (model.taskOrderStatus ?? 0) >= 12001 {
-            cell?.dispatchButton.snp.updateConstraints({ make in
+                cell?.dispatchButton.isHidden = true
-                make.right.equalTo(cell!.reportDetailButton.snp.left).offset(-auto(5))
+                cell?.dispatchButton.snp.updateConstraints({ make in
-                make.width.equalTo(auto(80))
+                    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))
         }
     }