Commit a2f46fd8 authored by Steven杜宇's avatar Steven杜宇

// 续期资料管理bug修复

parent 05028574
...@@ -53,4 +53,5 @@ struct YHServiceCenterMainModel: SmartCodable { ...@@ -53,4 +53,5 @@ struct YHServiceCenterMainModel: SmartCodable {
var certificateSection: YHServiceProgressModel = YHServiceProgressModel() var certificateSection: YHServiceProgressModel = YHServiceProgressModel()
var renewalSection: YHServiceStepProgressModel = YHServiceStepProgressModel() var renewalSection: YHServiceStepProgressModel = YHServiceStepProgressModel()
var stage: Int = 0 // 1 申请阶段 2办证阶段 3续期阶段 var stage: Int = 0 // 1 申请阶段 2办证阶段 3续期阶段
var master_id: Int = 0 // 批次
} }
...@@ -87,7 +87,16 @@ class YHCertificateTemplateCell: UITableViewCell { ...@@ -87,7 +87,16 @@ class YHCertificateTemplateCell: UITableViewCell {
var templateModel: YHResignTemplateItemModel? { var templateModel: YHResignTemplateItemModel? {
didSet { didSet {
templateView.titleLabel.text = "查看资料示例模版" if let model = templateModel {
if !model.name.isEmpty {
templateView.titleLabel.text = model.name
} else {
templateView.titleLabel.text = "查看资料示例模版"
}
} else {
templateView.titleLabel.text = "查看资料示例模版"
}
} }
} }
......
...@@ -235,12 +235,11 @@ extension YHResignMaterialListVC { ...@@ -235,12 +235,11 @@ extension YHResignMaterialListVC {
func showUploadSheetView(_ material:YHMaterialModel, _ success: (()->())?) { func showUploadSheetView(_ material:YHMaterialModel, _ success: (()->())?) {
let sheetView = YHCertificateUploadSheetView.sheetView() let sheetView = YHCertificateUploadSheetView.sheetView()
sheetView.maxSelectImageCount = 9 sheetView.maxSelectImageCount = 9
sheetView.tips = "支持的文件格式为jpg/jpeg、png、bmp、doc/docx、xls/xlsx、pdf,最多可上传99张图片或文件"
sheetView.fileTypes = [ "public.image", sheetView.fileTypes = [ "public.image",
"com.adobe.pdf", "com.adobe.pdf",
"com.microsoft.word.doc", "com.microsoft.word.doc",
"org.openxmlformats.wordprocessingml.document", "org.openxmlformats.wordprocessingml.document",
"com.microsoft.powerpoint.ppt",
"org.openxmlformats.presentationml.presentation",
"org.openxmlformats.spreadsheetml.sheet", "org.openxmlformats.spreadsheetml.sheet",
"com.microsoft.excel.xls",] "com.microsoft.excel.xls",]
sheetView.uploadFilesBlock = { sheetView.uploadFilesBlock = {
......
...@@ -134,12 +134,11 @@ class YHResignMaterialUploadVC: YHBaseViewController { ...@@ -134,12 +134,11 @@ class YHResignMaterialUploadVC: YHBaseViewController {
let sheetView = YHCertificateUploadSheetView.sheetView() let sheetView = YHCertificateUploadSheetView.sheetView()
sheetView.maxSelectImageCount = 99-items.count sheetView.maxSelectImageCount = 99-items.count
sheetView.tips = "支持的文件格式为jpg/jpeg、png、bmp、doc/docx、xls/xlsx、pdf,最多可上传99张图片或文件"
sheetView.fileTypes = [ "public.image", sheetView.fileTypes = [ "public.image",
"com.adobe.pdf", "com.adobe.pdf",
"com.microsoft.word.doc", "com.microsoft.word.doc",
"org.openxmlformats.wordprocessingml.document", "org.openxmlformats.wordprocessingml.document",
"com.microsoft.powerpoint.ppt",
"org.openxmlformats.presentationml.presentation",
"org.openxmlformats.spreadsheetml.sheet", "org.openxmlformats.spreadsheetml.sheet",
"com.microsoft.excel.xls",] "com.microsoft.excel.xls",]
sheetView.uploadFilesBlock = { sheetView.uploadFilesBlock = {
......
...@@ -218,7 +218,6 @@ extension YHResignTemplateSheetView: UITableViewDelegate, UITableViewDataSource ...@@ -218,7 +218,6 @@ extension YHResignTemplateSheetView: UITableViewDelegate, UITableViewDataSource
if 0 <= indexPath.row && indexPath.row < templateArr.count { if 0 <= indexPath.row && indexPath.row < templateArr.count {
let path = templateArr[indexPath.row] let path = templateArr[indexPath.row]
scanTemplateBlock?(path) scanTemplateBlock?(path)
dismiss()
} }
} }
......
...@@ -562,6 +562,7 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource { ...@@ -562,6 +562,7 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
if let orderId = Int(msg.orderId) { if let orderId = Int(msg.orderId) {
let vc = YHResinMaterialManageContainerVC() let vc = YHResinMaterialManageContainerVC()
vc.orderId = orderId vc.orderId = orderId
vc.id = self.serviceCenterViewModel.mainModel.master_id
navigationController?.pushViewController(vc) navigationController?.pushViewController(vc)
} }
......
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