Commit 5cd7a42b authored by Steven杜宇's avatar Steven杜宇

// 方案

parent 982e1f9e
...@@ -45,6 +45,7 @@ class YHImproveDetailModel: SmartCodable { ...@@ -45,6 +45,7 @@ class YHImproveDetailModel: SmartCodable {
var hk_require: String = "" var hk_require: String = ""
var improve_content: String = "" var improve_content: String = ""
var sort_num: Int = -1 var sort_num: Int = -1
var templates: [YHSchemeTemplatesModel] = []
required init() { required init() {
...@@ -63,8 +64,7 @@ class YHSchemeTemplatesModel: SmartCodable { ...@@ -63,8 +64,7 @@ class YHSchemeTemplatesModel: SmartCodable {
class YHImproveSchemeDetailModel: SmartCodable { class YHImproveSchemeDetailModel: SmartCodable {
var comprehensive_evaluation: [YHImproveDetailModel] = [] var improvePlanItem: [YHImproveDetailModel] = []
var templates: [YHSchemeTemplatesModel] = []
var username: String = "" var username: String = ""
var sex: String = "" var sex: String = ""
......
...@@ -10,6 +10,15 @@ import UIKit ...@@ -10,6 +10,15 @@ import UIKit
class YHImproveHKView: UIView { class YHImproveHKView: UIView {
var item = YHImproveDetailModel() {
didSet {
titleLabel.text = "港府要求:\(item.hk_require)"
tipsLabel.text = item.improve_content
numLabel.text = "\(item.sort_num)"
showTemplateBtn = item.templates.count > 0
}
}
var showTemplateBtn: Bool = true { var showTemplateBtn: Bool = true {
didSet { didSet {
templateBtn.isHidden = !showTemplateBtn templateBtn.isHidden = !showTemplateBtn
...@@ -115,7 +124,9 @@ class YHImproveHKView: UIView { ...@@ -115,7 +124,9 @@ class YHImproveHKView: UIView {
} }
@objc func didRightBtnClicked() { @objc func didRightBtnClicked() {
YHImproveSchemeTemplateListView.listView().show() let view = YHImproveSchemeTemplateListView.listView()
view.arr = item.templates
view.show()
} }
func setupUI() { func setupUI() {
......
...@@ -11,6 +11,17 @@ import UIKit ...@@ -11,6 +11,17 @@ import UIKit
class YHImproveSchemeTemplateListCell: UITableViewCell { class YHImproveSchemeTemplateListCell: UITableViewCell {
static let cellReuseIdentifier = "YHImproveSchemeTemplateListCell" static let cellReuseIdentifier = "YHImproveSchemeTemplateListCell"
var model = YHSchemeTemplatesModel() {
didSet {
titleLabel.text = model.name
}
}
lazy var previewFileTool:YHFilePreviewTool = {
let tool = YHFilePreviewTool(targetVC: UIViewController.current)
return tool
}()
lazy var lineView:UIView = { lazy var lineView:UIView = {
let view = UIView() let view = UIView()
...@@ -23,7 +34,6 @@ class YHImproveSchemeTemplateListCell: UITableViewCell { ...@@ -23,7 +34,6 @@ class YHImproveSchemeTemplateListCell: UITableViewCell {
label.font = UIFont.PFSC_R(ofSize: 14) label.font = UIFont.PFSC_R(ofSize: 14)
label.textColor = .mainTextColor label.textColor = .mainTextColor
label.numberOfLines = 0 label.numberOfLines = 0
label.text = "5、持股证明文件.pdf(周年申报表/工商备案的公司章程/验资报告/国家企业信用信息公示报告)"
return label return label
}() }()
...@@ -33,11 +43,17 @@ class YHImproveSchemeTemplateListCell: UITableViewCell { ...@@ -33,11 +43,17 @@ class YHImproveSchemeTemplateListCell: UITableViewCell {
btn.setTitle("查看示例", for: .normal) btn.setTitle("查看示例", for: .normal)
btn.setTitleColor(.mainTextColor, for: .normal) btn.setTitleColor(.mainTextColor, for: .normal)
btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 11) btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 11)
// btn.addTarget(self, action: #selector(didRightBtnClicked), for: .touchUpInside) btn.addTarget(self, action: #selector(didBtnClicked), for: .touchUpInside)
btn.layer.cornerRadius = kCornerRadius2 btn.layer.cornerRadius = kCornerRadius2
return btn return btn
}() }()
@objc func didBtnClicked() {
if !model.url.isEmpty {
self.previewFileTool.openXLSXRemoteFile(urlString:model.url, fileName:"预览")
}
}
required init?(coder: NSCoder) { required init?(coder: NSCoder) {
super.init(coder: coder) super.init(coder: coder)
} }
......
...@@ -15,8 +15,12 @@ class YHImproveSchemeTemplateListView: UIView { ...@@ -15,8 +15,12 @@ class YHImproveSchemeTemplateListView: UIView {
return v return v
} }
var items: [String] = ["", "", "", ""] var items: [YHSchemeTemplatesModel] = [] {
didSet {
tableView.reloadData()
}
}
lazy var blackMaskView: UIView = { lazy var blackMaskView: UIView = {
let view = UIView() let view = UIView()
view.backgroundColor = .alertMaskColor view.backgroundColor = .alertMaskColor
......
...@@ -18,10 +18,7 @@ class YHImproveTargetListCell: UITableViewCell { ...@@ -18,10 +18,7 @@ class YHImproveTargetListCell: UITableViewCell {
var lastView: YHImproveHKView? = nil var lastView: YHImproveHKView? = nil
for (i, item) in arr.enumerated() { for (i, item) in arr.enumerated() {
let itemView = YHImproveHKView(frame: .zero) let itemView = YHImproveHKView(frame: .zero)
itemView.titleLabel.text = "港府要求:\(item.hk_require)" itemView.item = item
itemView.tipsLabel.text = item.improve_content
itemView.numLabel.text = "\(i+1)"
itemView.showTemplateBtn = i%2 == 0
listView.addSubview(itemView) listView.addSubview(itemView)
itemView.snp.makeConstraints { make in itemView.snp.makeConstraints { make in
make.left.equalTo(0) make.left.equalTo(0)
......
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