Commit d2954003 authored by David黄金龙's avatar David黄金龙

正式批弹窗逻辑修改

parent b1714dc3
...@@ -128,7 +128,6 @@ class YHOfficialApprovalResultVC: YHBaseViewController { ...@@ -128,7 +128,6 @@ class YHOfficialApprovalResultVC: YHBaseViewController {
bannerView.reloadData() bannerView.reloadData()
bannerView.selectItem(at: 0, animated: false) bannerView.selectItem(at: 0, animated: false)
let aa: ASAttributedString = .init("左滑查看其他获批信,当前 ", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor(hex: 0xffffff, alpha: 0.6))) let aa: ASAttributedString = .init("左滑查看其他获批信,当前 ", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor(hex: 0xffffff, alpha: 0.6)))
let bb: ASAttributedString = .init("1/\(self.dataArr.count)", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor(hex: 0xffffff, alpha: 1.0))) let bb: ASAttributedString = .init("1/\(self.dataArr.count)", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor(hex: 0xffffff, alpha: 1.0)))
tipsLabel.attributed.text = aa + bb tipsLabel.attributed.text = aa + bb
...@@ -163,11 +162,11 @@ class YHOfficialApprovalResultVC: YHBaseViewController { ...@@ -163,11 +162,11 @@ class YHOfficialApprovalResultVC: YHBaseViewController {
getApprovalLetter() getApprovalLetter()
if !isFromHomeAlertViewFlag { // if !isFromHomeAlertViewFlag {
getAlertStatus() //// getAlertStatus()
} // }
getOfficalGuildCheckStatus() // getOfficalGuildCheckStatus()
} }
} }
...@@ -188,7 +187,6 @@ private extension YHOfficialApprovalResultVC { ...@@ -188,7 +187,6 @@ private extension YHOfficialApprovalResultVC {
let param = ["orderId":orderID,"searchType":1] let param = ["orderId":orderID,"searchType":1]
princleVM.getApprovalLetter(param: param) { success, error in princleVM.getApprovalLetter(param: param) { success, error in
if success { if success {
//1、更新主申请人信息 //1、更新主申请人信息
self.contentView.isHidden = false self.contentView.isHidden = false
self.updateMainApplicationInfo() self.updateMainApplicationInfo()
...@@ -196,6 +194,9 @@ private extension YHOfficialApprovalResultVC { ...@@ -196,6 +194,9 @@ private extension YHOfficialApprovalResultVC {
//2、更新letter信息 //2、更新letter信息
self.updateLetterListInfo() self.updateLetterListInfo()
self.getOfficalGuildCheckStatus()
} else { } else {
YHHUD.flash(message: "数据获取失败") YHHUD.flash(message: "数据获取失败")
} }
...@@ -220,6 +221,23 @@ private extension YHOfficialApprovalResultVC { ...@@ -220,6 +221,23 @@ private extension YHOfficialApprovalResultVC {
if success { if success {
if self.isFromHomeAlertViewFlag { if self.isFromHomeAlertViewFlag {
self.clickRightItemBtn() self.clickRightItemBtn()
} else {
if !self.princleVM.isOfficialGuildCheckFlag {
self.princleVM.postAlertStatus(15) { success, error in
}
let view = YHOffivialApprovalSuccessCheckView.sheetView()
view.days = self.princleVM.lettersModel?.days ?? 0
view.show()
view.block = { tag in
if tag == 0 {
self.clickRightItemBtn()
}
}
}
} }
} }
} }
......
...@@ -20,7 +20,7 @@ class YHPrincleViewModel: YHBaseViewModel { ...@@ -20,7 +20,7 @@ class YHPrincleViewModel: YHBaseViewModel {
var alertStatusModel : YHPrincipleAlertStatusModel? var alertStatusModel : YHPrincipleAlertStatusModel?
//正式批 操作指引是否确认 //正式批 操作指引是否确认
var isOfficialGuildCheckFlag : Bool = false var isOfficialGuildCheckFlag : Bool = false //true - 已确认 false - 未确认
//正式批 信件列表 //正式批 信件列表
var lettersModel : YHOfficalLetterListModel? var lettersModel : YHOfficalLetterListModel?
......
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