Skip to content

I
IFS
Commit 5f037245 authored by 曹云霄's avatar 曹云霄
Browse files
Options

修复海鼎bug

parent 5ac79384
Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 55 deletions
IFS/IFS/Main/Business/RepairOrder/Controller/RepairOrderCompletedViewController.swift
View file @ 5f037245
......@@ -57,9 +57,6 @@ class RepairOrderCompletedViewController: BaseTableViewController {
billCompleteViewModel.billCompltedModel.finishTime = NSDate().httpParameterString()
let finishModel = UCN(kUser().userCode, kUser().userName, kUser().userUuid)
billCompleteViewModel.billCompltedModel.finishUser = finishModel
billCompleteViewModel.billCompltedModel.store = billCompleteViewModel.billDetailModel.store
billCompleteViewModel.billCompltedModel.deviceadree = billCompleteViewModel.billDetailModel.deviceadree
billCompleteViewModel.billCompltedModel.reporterPhone = billCompleteViewModel.billDetailModel.reporterPhone
billCompleteViewModel.complteRepairOrderAction(billCompleteViewModel.billCompltedModel).subscribe(onNext: {[weak self] () in
self?.stateBlock(SUBMIT_REPAIR_ORDER_STATE.FINISHED.rawValue)
/// 延时一秒调用
......
IFS/IFS/Main/Business/RepairOrder/Controller/RepairOrderDetailBgController.swift
View file @ 5f037245
......@@ -49,6 +49,18 @@ class RepairOrderDetailBgController: BaseViewController {
// MARK: - UI
fileprivate func uiConfigAction() {
bottomBgView.addShadow(UIColor.black)
if !PermissionsManager.transferBillPermissions() {
transferButton.isHidden = true
}
if !PermissionsManager.finishBillPermissions() {
completeButton.isHidden = true
}
if !PermissionsManager.finishBillPermissions() && !PermissionsManager.transferBillPermissions() {
bottomLayoutHeight.constant = 0
UIView.animate(withDuration: kAnimationTime, animations: {
self.view.layoutIfNeeded()
})
}
}
// MARK: - 添加工单详情控制器
......@@ -101,12 +113,10 @@ class RepairOrderDetailBgController: BaseViewController {
}
}
let completeVc = RepairOrderCompletedViewController.instantiateViewController(.Function) as! RepairOrderCompletedViewController
let model = BillCompletedRequestModel(fromJson: JSON(detailVc.orderDetailViewModel.billDetailModel.toDictionary()))
completeVc.setStateBlock({[weak self] (state) in
self?.rapairBillBottomViewAction(state)
})
completeVc.billCompleteViewModel.billDetailModel = detailVc.orderDetailViewModel.billDetailModel
completeVc.billCompleteViewModel.billCompltedModel = model
completeVc.billCompleteViewModel.billCompltedModel = BillCompletedRequestModel(fromJson: JSON(detailVc.orderDetailViewModel.billDetailModel.toDictionary()))
pushVC(completeVc)
}
......
IFS/IFS/Main/Business/RepairOrder/Controller/RepairOrderDetailViewController.swift
View file @ 5f037245
......@@ -253,6 +253,7 @@ class RepairOrderDetailViewController: BaseTableViewController {
orderDetailViewModel.queryRepairOrderDepartmentAction(model).subscribe(onNext: {[weak self] (resuleModel) in
self?.orderDetailViewModel.repairOrderDepartmentChoice(resuleModel, self!).subscribe(onNext: { (result) in
ShowAlertView(hint, result.0, [cancel,sure], .alert, { (index) in
if index == kZERO { return }
self?.transferRepairOrderAction(result.1)
})
}).disposed(by: self!.disposeBag)
......
IFS/IFS/Main/Business/RepairOrder/Controller/RepairOrderEditSonOrderViewController.swift
View file @ 5f037245
......@@ -160,8 +160,12 @@ class RepairOrderEditSonOrderViewController: BaseTableViewController {
}).disposed(by: self!.disposeBag)
})
}).disposed(by: disposeBag)
tableView.tableFooterView = completeView
navigationItem.rightBarButtonItem = createButtonItem("保存", nil, self, #selector(RepairOrderEditSonOrderViewController.saveButtonClickAction))
if PermissionsManager.finishChildPermissions() {
tableView.tableFooterView = completeView
}
if PermissionsManager.saveChildPermissions() {
navigationItem.rightBarButtonItem = createButtonItem("保存", nil, self, #selector(RepairOrderEditSonOrderViewController.saveButtonClickAction))
}
}
// MARK: - 提交、保存子工单
......@@ -171,6 +175,7 @@ class RepairOrderEditSonOrderViewController: BaseTableViewController {
return;
}
ShowAlertView(hint, "确定保存此子工单吗？", [cancel,sure], .alert) {[weak self] (index) in
if index == kZERO { return }
self?.uploadActtachmentAction().subscribe(onNext: { (result) in
self?.childBillViewModel.saveChildBillAction().subscribe(onNext: { () in
self?.popVC()
......
IFS/IFS/Main/Business/RepairOrder/Model/BillCompletedRequestModel.swift
View file @ 5f037245
......@@ -10,29 +10,40 @@ import SwiftyJSON
open class BillCompletedRequestModel : NSObject{
var attachmentId : String!
var brokenTime : String!
var descriptionField : String!
var descriptionFieldHeight: CGFloat! = 10
var device : UCN!
var deviceadree: String!
var finish : Bool!
var deviceadree : String!
var finish : Bool! = false
var finishNote : String!
var finishNoteHeight : CGFloat! = 10
var finishTime : String!
var locationAttachmentId: String!
var finishUser : UCN!
var level : String!
var locationAttachmentId: String!
var store : UCN!
var note : String!
var noteHeight: CGFloat! = 10
var position : UCN!
var receiveTime : String!
var reportUser : UCN!
var reporterPhone : String!
var requestTime : String!
var reporterPhone: String!
var serviceType : String!
var source : String!
var state : String!
var store : UCN!
var tenant : UCN!
var uuid : String!
var version : Int!
var workNo : String!
init(_ state: String) {
self.state = state
}
/**
* Instantiate the instance using the passed json values to set the properties values
*/
......@@ -40,63 +51,79 @@ open class BillCompletedRequestModel : NSObject{
if json.isEmpty{
return
}
attachmentId = json["attachmentId"].stringValue
brokenTime = json["brokenTime"].stringValue
locationAttachmentId = json["locationAttachmentId"].stringValue
descriptionField = json["description"].stringValue
descriptionFieldHeight = descriptionField.calculateStringSize(CGSize(width: kWidth - 105, height: CGFloat.greatestFiniteMagnitude), font: UIFont.systemFont(ofSize: 13)).height
let deviceJson = json["device"]
if !deviceJson.isEmpty{
device = UCN(fromJson: deviceJson)
}
deviceadree = json["deviceadree"].stringValue
finish = json["finish"].boolValue
finishNote = json["finishNote"].stringValue
finishNoteHeight = finishNote.calculateStringSize(CGSize(width: kWidth - 105, height: CGFloat.greatestFiniteMagnitude), font: UIFont.systemFont(ofSize: 13)).height
finishTime = json["finishTime"].stringValue
let finishUserJson = json["finishUser"]
if !finishUserJson.isEmpty{
finishUser = UCN(fromJson: finishUserJson)
}
level = json["level"].stringValue
note = json["note"].stringValue
noteHeight = note.calculateStringSize(CGSize(width: kWidth - 105, height: CGFloat.greatestFiniteMagnitude), font: UIFont.systemFont(ofSize: 13)).height
let positionJson = json["position"]
if !positionJson.isEmpty{
store = UCN(fromJson: positionJson)
position = UCN(fromJson: positionJson)
}
receiveTime = json["receiveTime"].stringValue
let reportUserJson = json["reportUser"]
if !reportUserJson.isEmpty{
reportUser = UCN(fromJson: reportUserJson)
}
deviceadree = json["reporterPhone"].stringValue
locationAttachmentId = json["locationAttachmentId"].stringValue
reporterPhone = json["reporterPhone"].stringValue
requestTime = json["requestTime"].stringValue
serviceType = json["serviceType"].stringValue
source = json["source"].stringValue
state = json["state"].stringValue
let storeJson = json["store"]
if !storeJson.isEmpty{
store = UCN(fromJson: storeJson)
}
let tenantJson = json["tenant"]
if !tenantJson.isEmpty{
tenant = UCN(fromJson: tenantJson)
}
uuid = json["uuid"].stringValue
version = json["version"].intValue
workNo = json["workNo"].stringValue
}
/**
* Returns all the available property values in the form of [String:Any] object where the key is the approperiate json key and the value is the value of the corresponding property
*/
func toDictionary() -> [String:Any]
{
var dictionary = [String:Any]()
if attachmentId != nil{
dictionary["attachmentId"] = attachmentId
}
if brokenTime != nil{
dictionary["brokenTime"] = brokenTime
}
if descriptionField != nil{
dictionary["description"] = descriptionField
}
if locationAttachmentId != nil {
if locationAttachmentId != nil{
dictionary["locationAttachmentId"] = locationAttachmentId
}
if reporterPhone != nil {
dictionary["reporterPhone"] = reporterPhone
}
if device != nil{
dictionary["device"] = device.toDictionary()
}
if deviceadree != nil{
dictionary["deviceadree"] = deviceadree
}
if finish != nil{
dictionary["finish"] = finish
}
......@@ -112,8 +139,11 @@ open class BillCompletedRequestModel : NSObject{
if level != nil{
dictionary["level"] = level
}
if store != nil{
dictionary["store"] = store.toDictionary()
if note != nil{
dictionary["note"] = note
}
if position != nil{
dictionary["position"] = position.toDictionary()
}
if receiveTime != nil{
dictionary["receiveTime"] = receiveTime
......@@ -121,21 +151,27 @@ open class BillCompletedRequestModel : NSObject{
if reportUser != nil{
dictionary["reportUser"] = reportUser.toDictionary()
}
if reporterPhone != nil{
dictionary["reporterPhone"] = reporterPhone
}
if requestTime != nil{
dictionary["requestTime"] = requestTime
}
if serviceType != nil{
dictionary["serviceType"] = serviceType
}
if deviceadree != nil{
dictionary["deviceadree"] = deviceadree
}
if source != nil{
dictionary["source"] = source
}
if state != nil{
dictionary["state"] = state
}
if store != nil{
dictionary["store"] = store.toDictionary()
}
if tenant != nil{
dictionary["tenant"] = tenant.toDictionary()
}
if uuid != nil{
dictionary["uuid"] = uuid
}
......
IFS/IFS/Main/Business/RepairOrder/Model/RepairOrderDetailResultModel.swift
View file @ 5f037245
......@@ -55,34 +55,34 @@ class RepairOrderDetailResult : NSObject{
open class BillDetailData : NSObject{
var attachmentId : String!
var attachments : AnyObject!
var attachments : String!
var brokenTime : String!
var cancleReason : AnyObject!
var cancleTime : AnyObject!
var cancleUser : AnyObject!
var cancleReason : String!
var cancleTime : String!
var cancleUser : String!
var createId : String!
var createOperName : String!
var createTime : String!
var descriptionField : String!
var descriptionFieldHeight: CGFloat! = 10
var device : UCN!
var deviceType : AnyObject!
var deviceType : String!
var deviceadree : String!
var executes : [BillDetailExecute]!
var feedback : AnyObject!
var feedbackNote : AnyObject!
var feedback : String!
var feedbackNote : String!
var finish : Bool! = false
var finishNote : String!
var finishNoteHeight : CGFloat! = 10
var finishTime : String!
var locationAttachmentId: String!
var finishUser : UCN!
var labourfee : AnyObject!
var labourfee : String!
var lastModifyId : String!
var lastModifyOperName : String!
var lastModifyTime : String!
var level : String!
var materielfee : AnyObject!
var materielfee : String!
var note : String!
var noteHeight: CGFloat! = 10
var position : UCN!
......@@ -115,11 +115,11 @@ open class BillDetailData : NSObject{
}
isEditable = json["isEditable"].boolValue
attachmentId = json["attachmentId"].stringValue
attachments = json["attachments"] as AnyObject
attachments = json["attachments"].stringValue
brokenTime = json["brokenTime"].stringValue
cancleReason = json["cancleReason"] as AnyObject
cancleTime = json["cancleTime"] as AnyObject
cancleUser = json["cancleUser"] as AnyObject
cancleReason = json["cancleReason"].stringValue
cancleTime = json["cancleTime"].stringValue
cancleUser = json["cancleUser"].stringValue
createId = json["create_id"].stringValue
locationAttachmentId = json["locationAttachmentId"].stringValue
createOperName = json["create_operName"].stringValue
......@@ -130,7 +130,7 @@ open class BillDetailData : NSObject{
if !deviceJson.isEmpty{
device = UCN(fromJson: deviceJson)
}
deviceType = json["deviceType"] as AnyObject
deviceType = json["deviceType"].stringValue
deviceadree = json["deviceadree"].stringValue
executes = [BillDetailExecute]()
let executesArray = json["executes"].arrayValue
......@@ -138,8 +138,8 @@ open class BillDetailData : NSObject{
let value = BillDetailExecute(fromJson: executesJson)
executes.append(value)
}
feedback = json["feedback"] as AnyObject
feedbackNote = json["feedbackNote"] as AnyObject
feedback = json["feedback"].stringValue
feedbackNote = json["feedbackNote"].stringValue
finish = json["finish"].boolValue
finishNote = json["finishNote"].stringValue
finishNoteHeight = finishNote.calculateStringSize(CGSize(width: kWidth - 105, height: CGFloat.greatestFiniteMagnitude), font: UIFont.systemFont(ofSize: 13)).height
......@@ -148,12 +148,12 @@ open class BillDetailData : NSObject{
if !finishUserJson.isEmpty{
finishUser = UCN(fromJson: finishUserJson)
}
labourfee = json["labourfee"] as AnyObject
labourfee = json["labourfee"].stringValue
lastModifyId = json["lastModify_id"].stringValue
lastModifyOperName = json["lastModify_operName"].stringValue
lastModifyTime = json["lastModify_time"].stringValue
level = json["level"].stringValue
materielfee = json["materielfee"] as AnyObject
materielfee = json["materielfee"].stringValue
note = json["note"].stringValue
noteHeight = note.calculateStringSize(CGSize(width: kWidth - 105, height: CGFloat.greatestFiniteMagnitude), font: UIFont.systemFont(ofSize: 13)).height
......@@ -259,7 +259,7 @@ open class BillDetailData : NSObject{
dictionary["finishTime"] = finishTime
}
if finishUser != nil{
dictionary["finishUser"] = finishUser
dictionary["finishUser"] = finishUser.toDictionary()
}
if labourfee != nil{
dictionary["labourfee"] = labourfee
......@@ -310,7 +310,7 @@ open class BillDetailData : NSObject{
dictionary["state"] = state
}
if store != nil{
dictionary["store"] = store
dictionary["store"] = store.toDictionary()
}
if tenant != nil{
dictionary["tenant"] = tenant.toDictionary()
......
IFS/IFS/Main/Business/RepairOrder/ViewModel/RepairOrderAddViewModel.swift
View file @ 5f037245
......@@ -238,9 +238,11 @@ extension RepairOrderAddViewModel {
controller.pushVC(publicFilterVc)
publicFilterVc.setNavigationTitle("筛选报事人",.SINGLE, { (choices, index) in
let choiceModel = choices.first!
let model = result[index!]
controller.originatorLabel.text = choiceModel.title
controller.phoneNumberText.text = model.mobile
self?.saveOrderModel.reporterPhone = model.mobile
controller.originatorLabel.textColor = kBlackColor
let model = result[index!]
let user = UCN(model.login, model.name, model.uuid)
self?.saveOrderModel.reportUser = user
})
......@@ -364,7 +366,7 @@ extension RepairOrderAddViewModel {
break
case IndexPath(row: 2, section: 1):
let defaultDate = controller.deviceFaultTimeLabel.text == "设施故障时间" ? NSDate().httpParameterString() : controller.deviceFaultTimeLabel.text
YXPickerManager.share().showDatePickerView(kMainColor, datePickerModel: UIDatePickerMode.dateAndTime, minimumDate: Date(), maximumDate: nil, defaultDate: defaultDate, commit: {[weak self] (time) in
YXPickerManager.share().showDatePickerView(kMainColor, datePickerModel: UIDatePickerMode.dateAndTime, minimumDate: nil, maximumDate: nil, defaultDate: defaultDate, commit: {[weak self] (time) in
controller.deviceFaultTimeLabel.text = time
controller.deviceFaultTimeLabel.textColor = kBlackColor
self?.saveOrderModel.brokenTime = time
......
IFS/IFS/Main/Business/RepairOrder/ViewModel/RepairOrderDetailViewModel.swift
View file @ 5f037245
......@@ -25,7 +25,7 @@ class RepairOrderDetailViewModel: BaseViewModel {
return sectionArray
}()
/// 主工单完成Model
// 主工单完成Model
var billCompltedModel: BillCompletedRequestModel!
}
......
IFS/IFS/Main/Business/RepairOrder/ViewModel/RepairOrderViewModel.swift
View file @ 5f037245
......@@ -133,12 +133,18 @@ extension RepairOrderViewModel {
break
case REPAIR_ORDER_FILTER_BUTTON_TAG.SOURCE.rawValue:
self?.filterViewModel.queryProjectSponsors().subscribe(onNext: { (result) in
YXPickerManager.share().showGeneralPickerView(kNavColor, dataArray: result, defaultString: sender.currentTitle, commit: { (text, index) in
let array = NSMutableArray(array: result)
array.insert("全部来源", at: kZERO)
YXPickerManager.share().showGeneralPickerView(kNavColor, dataArray: array as! [String], defaultString: sender.currentTitle, commit: { (text, index) in
sender.isSelected = false
sender.addBorder(1.0, kGaryColor)
sender.setTitle(text, for: .normal)
sender.horizontalCenterTitleAndImage(5)
self?.queryModel.source = text
if index == kZERO {
self?.queryModel.source = nil
}else {
self?.queryModel.source = text
}
observer.onNext(())
}, cancel: {
sender.isSelected = false
......@@ -148,12 +154,18 @@ extension RepairOrderViewModel {
break
case REPAIR_ORDER_FILTER_BUTTON_TAG.PRIORITY.rawValue:
self?.filterViewModel.queryProrityOption().subscribe(onNext: {[weak self] (result) in
YXPickerManager.share().showGeneralPickerView(kNavColor, dataArray: result, defaultString: sender.currentTitle, commit: { (text, index) in
let array = NSMutableArray(array: result)
array.insert("全部优先级", at: kZERO)
YXPickerManager.share().showGeneralPickerView(kNavColor, dataArray: array as! [String], defaultString: sender.currentTitle, commit: { (text, index) in
sender.isSelected = false
sender.addBorder(1.0, kGaryColor)
sender.setTitle(text, for: .normal)
sender.horizontalCenterTitleAndImage(5)
self?.queryModel.level = text
if index == kZERO {
self?.queryModel.level = nil
}else {
self?.queryModel.level = text
}
observer.onNext(())
}, cancel: {
sender.isSelected = false
......
IFS/IFS/Main/Business/RepairOrder/ViewModel/ReparirChildBillViewModel.swift
View file @ 5f037245
......@@ -216,7 +216,7 @@ extension ReparirChildBillViewModel {
func childBillDetailAssignment(_ controller: RepairOrderChildBillDetailViewController) {
controller.workPersonLabel.text = disposeEmpty2(childBillDetailData.processor)
controller.placeTimeLabel.text = disposeEmpty2(childBillDetailData.processBegin)
controller.leaveTimeLabel.text = disposeEmpty2(childBillDetailData.processBegin)
controller.leaveTimeLabel.text = disposeEmpty2(childBillDetailData.processEnd)
controller.failureCauseLabel.text = disposeEmpty2(childBillDetailData.reason)
controller.processModeLabel.text = disposeEmpty2(childBillDetailData.processMode)
if childBillDetailData.owner != nil {
......
IFS/IFS/Main/Storyboards/Function.storyboard
View file @ 5f037245
......@@ -3305,6 +3305,6 @@
<image name="todo_icon" width="23" height="24"/>
</resources>
<inferredMetricsTieBreakers>
<segue reference="eK1-nw-kV4"/>
<segue reference="ui0-ve-aBK"/>
</inferredMetricsTieBreakers>
</document>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment