diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate
index ec26c10..1c33d1d 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 6c97232..bb2b2be 100644
--- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -46,8 +46,8 @@
filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "291"
- endingLineNumber = "291"
+ startingLineNumber = "292"
+ endingLineNumber = "292"
landmarkName = "textView(_:shouldInteractWith:in:interaction:)"
landmarkType = "7">
@@ -62,8 +62,8 @@
filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "295"
- endingLineNumber = "295"
+ startingLineNumber = "296"
+ endingLineNumber = "296"
landmarkName = "textView(_:shouldInteractWith:in:interaction:)"
landmarkType = "7">
@@ -1082,10 +1082,10 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "121"
- endingLineNumber = "121"
- landmarkName = "WebViewController"
- landmarkType = "21">
+ startingLineNumber = "133"
+ endingLineNumber = "133"
+ landmarkName = "userContentController(_:didReceive:)"
+ landmarkType = "7">
@@ -1605,8 +1605,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "126"
- endingLineNumber = "126"
+ startingLineNumber = "138"
+ endingLineNumber = "138"
landmarkName = "webView(_:didFinish:)"
landmarkType = "7">
@@ -1621,8 +1621,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "133"
- endingLineNumber = "133"
+ startingLineNumber = "145"
+ endingLineNumber = "145"
landmarkName = "webView(_:didFail:withError:)"
landmarkType = "7">
@@ -1637,8 +1637,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "141"
- endingLineNumber = "141"
+ startingLineNumber = "153"
+ endingLineNumber = "153"
landmarkName = "webView(_:didFailProvisionalNavigation:withError:)"
landmarkType = "7">
@@ -1653,8 +1653,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "140"
- endingLineNumber = "140"
+ startingLineNumber = "152"
+ endingLineNumber = "152"
landmarkName = "webView(_:didFailProvisionalNavigation:withError:)"
landmarkType = "7">
@@ -2353,68 +2353,6 @@
endingLineNumber = "112"
landmarkName = "userContentController(_:didReceive:)"
landmarkType = "7">
-
-
-
-
-
-
-
-
-
-
@@ -4383,5 +4321,257 @@
landmarkType = "7">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OrderScheduling/Common/WebView/WebViewController.swift b/OrderScheduling/Common/WebView/WebViewController.swift
index 3a32937..a083469 100644
--- a/OrderScheduling/Common/WebView/WebViewController.swift
+++ b/OrderScheduling/Common/WebView/WebViewController.swift
@@ -117,6 +117,18 @@ extension WebViewController : WKScriptMessageHandler {
if let supplierId = USER.supplierId,let userId = USER.userId, let id {
WEBTOOL.open(name: .docmentDetail, appending: "&supplierId=\(supplierId)&userId=\(userId)&id=\(id)")
}
+ }else if action == "orderPhoto" {
+ let params = dict?["params"] as? [String:Any]
+ if let userOrderId = params?["userOrderId"] as? String,let taskOrderId = params?["taskOrderId"] as? String,let orderCode = params?["orderCode"] as? String {
+ let isAllowImage = params?["isAllowImage"] as? Int
+ var canModify = true
+ // 0可以补传，1不可以补传
+ if isAllowImage == 1 {
+ canModify = false
+ }
+ let vc = AdditionalPhotoController(userOrderId: Int(userOrderId) ?? 0, orderCode: orderCode, taskOrderId: Int(taskOrderId) ?? 0,canModify: canModify)
+ navigationController?.pushViewController(vc, animated: true)
+ }
}
}
}
diff --git a/OrderScheduling/Login/ViewController/LoginController.swift b/OrderScheduling/Login/ViewController/LoginController.swift
index 3ccee22..1fe4bd2 100644
--- a/OrderScheduling/Login/ViewController/LoginController.swift
+++ b/OrderScheduling/Login/ViewController/LoginController.swift
@@ -223,6 +223,7 @@ extension LoginController {
NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_loginSuccessToRescueController), object: nil)
}else{
print("错误")
+ self?.view.dd_makeToast(responseModel?.msg)
}
})
.disposed(by: disposeBag)
diff --git a/OrderScheduling/ReviewFailed/ViewController/AdditionalPhotoController.swift b/OrderScheduling/ReviewFailed/ViewController/AdditionalPhotoController.swift
index 2efc45f..05ac124 100644
--- a/OrderScheduling/ReviewFailed/ViewController/AdditionalPhotoController.swift
+++ b/OrderScheduling/ReviewFailed/ViewController/AdditionalPhotoController.swift
@@ -125,6 +125,7 @@ extension AdditionalPhotoController : UICollectionViewDelegate, UICollectionView
}
})
.disposed(by: cell!.disposeBag)
+ cell?.takePhotoButton.isHidden = !canModify
return cell!
}
@@ -145,11 +146,13 @@ open class AdditionalPhotoController : ZDViewController {
private let userOrderId : Int
private let orderCode : String
private let taskOrderId : Int
+ private let canModify : Bool
private var resultArr : [OrderPhotoListDataModel] = []
- public init(userOrderId: Int, orderCode: String, taskOrderId: Int){
+ public init(userOrderId: Int, orderCode: String, taskOrderId: Int, canModify:Bool){
self.userOrderId = userOrderId
self.orderCode = orderCode
self.taskOrderId = taskOrderId
+ self.canModify = canModify
super.init(nibName: nil, bundle: nil)
}
diff --git a/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift b/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift
index 0064725..6428219 100644
--- a/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift
+++ b/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift
@@ -164,7 +164,7 @@ extension ReviewFailedController : UITableViewDelegate,UITableViewDataSource {
cell!.additionalButton.rx.tap
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] _ in
- let vc = AdditionalPhotoController(userOrderId: model.userOrderId, orderCode: model.orderCode, taskOrderId: model.taskOrderId)
+ let vc = AdditionalPhotoController(userOrderId: model.userOrderId, orderCode: model.orderCode, taskOrderId: model.taskOrderId,canModify: true)
self?.navigationController?.pushViewController(vc, animated: true)
})
.disposed(by: cell!.disposeBag)