Commit 9224a35a authored by Steven杜宇's avatar Steven杜宇

// 方案

parent c2f3b41a
...@@ -222,7 +222,8 @@ extension YHInformationPerfectListVC { ...@@ -222,7 +222,8 @@ extension YHInformationPerfectListVC {
// vc.model = serviceCenterMainReqVM.allInfoScoreModel // vc.model = serviceCenterMainReqVM.allInfoScoreModel
// navigationController?.pushViewController(vc) // navigationController?.pushViewController(vc)
YHHUD.flash(message: "这里跳转 杜宇 新的我的方案") let vc = YHMyNewSchemeViewController()
navigationController?.pushViewController(vc)
} }
@objc func goInfoListVC( ) { @objc func goInfoListVC( ) {
......
...@@ -204,10 +204,10 @@ class YHMyNewSchemeViewController: YHBaseViewController { ...@@ -204,10 +204,10 @@ class YHMyNewSchemeViewController: YHBaseViewController {
guard let self = self else { return } guard let self = self else { return }
titleLabel.text = "尊敬的\(viewModel.schemeModel.username)\(viewModel.schemeModel.sex)" titleLabel.text = "尊敬的\(viewModel.schemeModel.username)\(viewModel.schemeModel.sex)"
passArr = self.viewModel.schemeModel.comprehensive_evaluation.filter { passArr = self.viewModel.schemeModel.comprehensive_evaluation.filter {
$0.is_pass == true $0.isPass == true
} }
unpassArr = self.viewModel.schemeModel.comprehensive_evaluation.filter { unpassArr = self.viewModel.schemeModel.comprehensive_evaluation.filter {
$0.is_pass == false $0.isPass == false
} }
isPass = passArr.count >= 6 isPass = passArr.count >= 6
...@@ -249,7 +249,7 @@ class YHMyNewSchemeViewController: YHBaseViewController { ...@@ -249,7 +249,7 @@ class YHMyNewSchemeViewController: YHBaseViewController {
func submitTargets() { func submitTargets() {
let targets: [String] = unpassArr.map { let targets: [String] = unpassArr.map {
return $0.standard_key return $0.standardKey
} }
YHHUD.show(.progress(message: "提交中...")) YHHUD.show(.progress(message: "提交中..."))
viewModel.postSelectImproveTargets(orderId: orderId, targets: targets) { viewModel.postSelectImproveTargets(orderId: orderId, targets: targets) {
......
...@@ -15,9 +15,9 @@ class YHSchemeModel: NSObject { ...@@ -15,9 +15,9 @@ class YHSchemeModel: NSObject {
class YHComprehensiveEevaluationModel: SmartCodable { class YHComprehensiveEevaluationModel: SmartCodable {
var standard_name: String = "" var standardName: String = ""
var standard_key: String = "" var standardKey: String = ""
var is_pass: Bool = false var isPass: Bool = false
var is_select: Bool = false var is_select: Bool = false
required init() { required init() {
...@@ -29,7 +29,8 @@ class YHMySchemeDetailModel: SmartCodable { ...@@ -29,7 +29,8 @@ class YHMySchemeDetailModel: SmartCodable {
var comprehensive_evaluation: [YHComprehensiveEevaluationModel] = [] var comprehensive_evaluation: [YHComprehensiveEevaluationModel] = []
var comprehensive_evaluation_selected: [String] = [] var comprehensive_evaluation_selected: [String] = []
var industry_positioning: Int = 0 var industry_positioning: String = ""
var industry_positioning_other: String = ""
var plan_skip_status: Bool = false var plan_skip_status: Bool = false
var supplement_skip_status: Bool = false var supplement_skip_status: Bool = false
var username: String = "" var username: String = ""
......
...@@ -24,7 +24,7 @@ class YHHKRequiredItemListCell: UITableViewCell { ...@@ -24,7 +24,7 @@ class YHHKRequiredItemListCell: UITableViewCell {
var lastItemView: YHHKRequiredItemView? = nil var lastItemView: YHHKRequiredItemView? = nil
for (index, model) in passArr.enumerated() { for (index, model) in passArr.enumerated() {
let itemView = YHHKRequiredItemView(frame: .zero) let itemView = YHHKRequiredItemView(frame: .zero)
itemView.text = model.standard_name itemView.text = model.standardName
itemView.backgroundColor = index%2 == 0 ? .white : .init(hex: 0xFBF7F3) itemView.backgroundColor = index%2 == 0 ? .white : .init(hex: 0xFBF7F3)
listView.addSubview(itemView) listView.addSubview(itemView)
itemView.snp.makeConstraints { make in itemView.snp.makeConstraints { make in
......
...@@ -25,7 +25,7 @@ class YHImproveRequireItemView: UIView { ...@@ -25,7 +25,7 @@ class YHImproveRequireItemView: UIView {
var item: YHComprehensiveEevaluationModel = YHComprehensiveEevaluationModel() { var item: YHComprehensiveEevaluationModel = YHComprehensiveEevaluationModel() {
didSet { didSet {
let a: ASAttributedString = .init(string:"港府要求:" , .font(UIFont.PFSC_M(ofSize: 14)), .foreground(UIColor.mainTextColor)) let a: ASAttributedString = .init(string:"港府要求:" , .font(UIFont.PFSC_M(ofSize: 14)), .foreground(UIColor.mainTextColor))
let b: ASAttributedString = .init(string: item.standard_name , .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor)) let b: ASAttributedString = .init(string: item.standardName , .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor))
titleLabel.attributed.text = a + b titleLabel.attributed.text = a + b
isSelect = item.is_select isSelect = item.is_select
} }
......
...@@ -377,9 +377,9 @@ class YHAllApiName { ...@@ -377,9 +377,9 @@ class YHAllApiName {
struct Assessment { struct Assessment {
//方案计划 //方案计划
static let applyPlanApi = "infoflow/assessment/apply_plan" static let applyPlanApi = "infoflow/assessment/apply_plan"
static let applyPlanNewApi = "infoflow/assessment/apply_plan" static let applyPlanNewApi = "infoflow/assessment/apply_plan_detail"
static let submitTargetsApi = "infoflow/assessment/save_apply_plan_target" static let submitTargetsApi = "infoflow/assessment/save_apply_plan_target"
static let modifyInfoApi = "infoflow/assessment/save_apply_plan_target" static let modifyInfoApi = "infoflow/assessment/update-info"
static let improveDetailApi = "infoflow/assessment/improve_plan_detail" static let improveDetailApi = "infoflow/assessment/improve_plan_detail"
} }
......
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