// 方案

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/C/YHImproveSchemeViewController.swift

@@ -171,6 +171,8 @@ class YHImproveSchemeViewController: YHBaseViewController {
         }
         view.bringSubviewToFront(gk_navigationBar)
         tableView.reloadData()
+        
+        requestData()
     }
     
     override func backItemClick(_ sender: Any) {
@@ -198,6 +200,7 @@ class YHImproveSchemeViewController: YHBaseViewController {
                 let vc = YHInformationPerfectListVC()
                 vc.orderId = orderId
                 navigationController?.pushViewController(vc)
+                return
             }
             YHHUD.flash(message: error?.errorMsg ?? "修改失败")
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/C/YHMyNewSchemeViewController.swift

@@ -210,6 +210,14 @@ class YHMyNewSchemeViewController: YHBaseViewController {
                 $0.isPass == false
             }
             
+            for item in unpassArr {
+                if self.viewModel.schemeModel.comprehensive_evaluation_selected.contains(item.standardKey)  {
+                    item.is_select = true
+                } else {
+                    item.is_select = false
+                }
+            }
+            
             isPass = passArr.count >= 6
             if isPass {
                 let item1 = YHSchemeItem(type: .evaluate)
@@ -248,17 +256,23 @@ class YHMyNewSchemeViewController: YHBaseViewController {
     }
     
     func submitTargets() {
-        let targets: [String] = unpassArr.map {
+        
+        let selectTargets: [YHComprehensiveEevaluationModel] = unpassArr.filter {
+            return $0.is_select
+        }
+        let selectKeys: [String] = selectTargets.map {
             return $0.standardKey
         }
+        
         YHHUD.show(.progress(message: "提交中..."))
-        viewModel.postSelectImproveTargets(orderId: orderId, targets: targets) {
+        viewModel.postSelectImproveTargets(orderId: orderId, targets: selectKeys) {
             [weak self] success, error in
             YHHUD.hide()
             guard let self = self else { return }
 
             if success {
                 let vc = YHImproveSchemeViewController()
+                vc.orderId = orderId
                 vc.isPass = self.isPass
                 UIViewController.current?.navigationController?.pushViewController(vc)
                 return
@@ -278,6 +292,7 @@ class YHMyNewSchemeViewController: YHBaseViewController {
                 let vc = YHInformationPerfectListVC()
                 vc.orderId = orderId
                 navigationController?.pushViewController(vc)
+                return
             }
             YHHUD.flash(message: error?.errorMsg ?? "修改失败")
         }
@@ -389,6 +404,7 @@ extension YHMyNewSchemeViewController : UITableViewDelegate, UITableViewDataSour
                             return
                         }
                         let vc = YHImproveSchemeViewController()
+                        vc.orderId = orderId
                         vc.isPass = self.isPass
                         UIViewController.current?.navigationController?.pushViewController(vc)
                     }
@@ -407,6 +423,7 @@ extension YHMyNewSchemeViewController : UITableViewDelegate, UITableViewDataSour
                 
                 if item.type == .improveTarget {
                     let cell = tableView.dequeueReusableCell(withIdentifier: YHImproveTargetCell.cellReuseIdentifier, for: indexPath) as! YHImproveTargetCell
+                    cell.unpassArr = unpassArr
                     cell.submitClick = {
                         [weak self] in
                         guard let self = self else { return }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHImproveHKView.swift

@@ -14,7 +14,6 @@ class YHImproveHKView: UIView {
         didSet {
             titleLabel.text = "港府要求：\(item.hk_require)"
             tipsLabel.text = item.improve_content
-            numLabel.text = "\(item.sort_num)"
             showTemplateBtn = item.templates.count > 0
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHImproveSchemeTemplateListCell.swift

@@ -11,13 +11,7 @@ import UIKit
 class YHImproveSchemeTemplateListCell: UITableViewCell {
 
     static let cellReuseIdentifier = "YHImproveSchemeTemplateListCell"
-    
-    var model = YHSchemeTemplatesModel() {
-        didSet {
-            titleLabel.text = model.name
-        }
-    }
-    
+        
     lazy var previewFileTool:YHFilePreviewTool = {
         let tool = YHFilePreviewTool(targetVC: UIViewController.current)
        return tool
@@ -92,6 +86,5 @@ class YHImproveSchemeTemplateListCell: UITableViewCell {
             make.right.equalTo(-20)
             make.centerY.equalToSuperview()
         }
-
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHImproveSchemeTemplateListView.swift

@@ -137,6 +137,7 @@ extension YHImproveSchemeTemplateListView : UITableViewDelegate, UITableViewData
         if 0 <= indexPath.row && indexPath.row < items.count {
             let item = items[indexPath.row]
             let cell = tableView.dequeueReusableCell(withIdentifier: YHImproveSchemeTemplateListCell.cellReuseIdentifier, for: indexPath) as! YHImproveSchemeTemplateListCell
+            cell.titleLabel.text = "\(indexPath.row+1)、\(item.name)"
             return cell
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHImproveTargetCell.swift

@@ -17,7 +17,7 @@ class YHImproveTargetCell: UITableViewCell {
 
     var unpassArr: [YHComprehensiveEevaluationModel] = [] {
         didSet {
-            
+            updateRequireArrUI()
         }
     }
     
@@ -41,6 +41,8 @@ class YHImproveTargetCell: UITableViewCell {
             }
             lastView = view
         }
+        self.setNeedsLayout()
+        self.layoutIfNeeded()
     }
     
     lazy var whiteContentView: UIView = {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHImproveTargetListCell.swift

@@ -19,6 +19,7 @@ class YHImproveTargetListCell: UITableViewCell {
             for (i, item) in arr.enumerated() {
                 let itemView = YHImproveHKView(frame: .zero)
                 itemView.item = item
+                itemView.numLabel.text = "\(i+1)"
                 listView.addSubview(itemView)
                 itemView.snp.makeConstraints { make in
                     make.left.equalTo(0)