文件清单 展示

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/C/YHFileListViewController.swift

@@ -69,12 +69,13 @@ extension YHFileListViewController {
     func loadData() {
         if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
             
+            YHHUD.show(.progress(message: ""))
             let tttt = "11758" //for test hjl
             let param = ["order_id":tttt,"node":"1","state":"1"]
             certificateReqVM.getCertificateFileListData(params: param) { success, error in
+                YHHUD.hide()
                 if success == true {
                     self.myContentView.dataModel = self.certificateReqVM.arrFileListData
-                    self.layoutMyUI()
                 } else {
                     YHHUD.flash(message: error?.errorMsg ?? "请求出错")
                 }
@@ -96,9 +97,11 @@ extension YHFileListViewController {
             make.left.right.bottom.equalToSuperview()
             make.height.equalTo(YHFileListBottomView.viewH)
         }
+        
         bottomView.block = { flag in
             if flag == 1 {
                 printLog("生成清单")
+                YHHUD.flash(message: "保存成功")
             }
         }
         
@@ -124,8 +127,6 @@ extension YHFileListViewController {
             make.width.equalTo(KScreenWidth - 2*kMargin)
         }
         
-       
-        
         myScrollView.addSubview(footLable)
         footLable.snp.makeConstraints { make in
             make.top.equalTo(myContentView.snp.bottom).offset(29)
@@ -133,35 +134,6 @@ extension YHFileListViewController {
             make.width.equalTo(KScreenWidth - 2*28)
             make.bottom.equalToSuperview().offset(-41)
         }
-        
-        myScrollView.layoutIfNeeded()
-        
-        printLog(myScrollView.contentSize)
         return
     }
-    
-    func layoutMyUI() {
-        myContentView.snp.removeConstraints()
-        myContentView.snp.remakeConstraints { make in
-            make.top.equalTo(217)
-            make.left.equalTo(kMargin)
-            make.width.equalTo(KScreenWidth - 2*kMargin)
-//            make.height.equalTo(2700) //for test hjl
-        }
-        myContentView.backgroundColor = .yellow//for test hjl
-        
-       
-        
-        footLable.snp.removeConstraints()
-        footLable.snp.remakeConstraints { make in
-            make.top.equalTo(myContentView.snp.bottom).offset(29)
-            make.left.equalTo(28)
-            make.width.equalTo(KScreenWidth - 2*28)
-            make.bottom.equalToSuperview().offset(-41)
-        }
-        
-        myScrollView.layoutIfNeeded()
-        
-        printLog("============")
-    }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/M/YHFileListModel.swift

@@ -23,7 +23,7 @@ class YHFileListModel: SmartCodable {
 class YHFileListSubModel: SmartCodable {
     var name : String = ""
     var type_name : String = ""
-    var checks_tatus : Int = -1
+    var check_status : Int = -1
     
     required init() {
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/V/YHFileListContentView.swift

@@ -37,13 +37,13 @@ private extension YHFileListContentView {
 extension YHFileListContentView {
     func updataUI() {
         guard let arrData = dataModel,arrData.count > 0 else { return }
+        
         removeSubviews()
         
         let sessionBkgImageV : UIImageView = UIImageView(image: UIImage(named: "file_list_head_bkg"))
         sessionBkgImageV.contentMode = .scaleAspectFill
         
         addSubview(sessionBkgImageV)
-        
         if arrData.isEmpty {
             sessionBkgImageV.snp.makeConstraints { make in
                 make.top.equalToSuperview().offset(2)
@@ -55,14 +55,12 @@ extension YHFileListContentView {
             }
             
         } else {
-            
             sessionBkgImageV.snp.makeConstraints { make in
                 make.top.equalToSuperview().offset(2)
                 make.left.equalToSuperview().offset(2)
                 make.right.equalToSuperview().offset(-2)
                 make.height.equalTo(70)
             }
-            
         }
         
         var lastView : UIView?
@@ -70,17 +68,17 @@ extension YHFileListContentView {
             let view = YHFileListItemsView()
             view.dataModel = item
             addSubview(view)
-            if let lastView = lastView {
+            
+            if let tttttt = lastView {
                 if index == arrData.count - 1 {
-                    
                     view.snp.makeConstraints { make in
-                        make.top.equalTo(lastView.snp.bottom)
+                        make.top.equalTo(tttttt.snp.bottom)
                         make.left.right.equalToSuperview()
                         make.bottom.equalToSuperview().offset(-20)
                     }
                 } else {
                     view.snp.makeConstraints { make in
-                        make.top.equalTo(lastView.snp.bottom)
+                        make.top.equalTo(tttttt.snp.bottom)
                         make.left.right.equalToSuperview()
                     }
                 }
@@ -100,6 +98,5 @@ extension YHFileListContentView {
             }
             lastView = view
         }
-        layoutIfNeeded()
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/V/YHFileListItemView.swift

@@ -22,34 +22,35 @@ class YHFileListItemView: UIView {
     //index
     private lazy var indexLable : UILabel = {
         let lable0 = UILabel(text: "index")
-        lable0.textColor = UIColor.labelTextColor2
+        lable0.textColor = UIColor.mainTextColor
         lable0.font = UIFont.PFSC_B(ofSize: 19)
+        lable0.textAlignment = .center
         return lable0
     }()
     
     //title
     private lazy var titleLable : UILabel = {
         let lable0 = UILabel(text: "title")
-        lable0.textColor = UIColor.labelTextColor2
+        lable0.textColor = UIColor.mainTextColor
         lable0.font = UIFont.PFSC_R(ofSize: 15)
+        lable0.numberOfLines = 0
         return lable0
     }()
     
     //subtitle
     private lazy var subtitleLable : UILabel = {
         let lable0 = UILabel(text: "subtitle")
-        lable0.textColor = UIColor.mainTextColor
+        lable0.textColor = UIColor.labelTextColor2
         lable0.font = UIFont.PFSC_R(ofSize: 12)
         lable0.numberOfLines = 0
         lable0.lineBreakMode = .byWordWrapping
-        lable0.textAlignment = .right
         return lable0
     }()
     
     //status
     private lazy var statusLable : UILabel = {
         let lable0 = UILabel(text: "状态")
-        lable0.textColor = UIColor.mainTextColor
+        lable0.textColor = UIColor.brandMainColor
         lable0.font = UIFont.PFSC_R(ofSize: 12)
         lable0.numberOfLines = 0
         lable0.lineBreakMode = .byWordWrapping
@@ -71,6 +72,12 @@ class YHFileListItemView: UIView {
             updateUI()
         }
     }
+    
+    var myIndex : Int  = -1 {
+        didSet {
+            updateIndex()
+        }
+    }
 }
 
 private extension YHFileListItemView {
@@ -79,6 +86,7 @@ private extension YHFileListItemView {
         indexLable.snp.makeConstraints { make in
             make.left.equalTo(8)
             make.width.equalTo(26)
+            make.height.equalTo(20)
             make.centerY.equalToSuperview()
         }
         
@@ -86,7 +94,8 @@ private extension YHFileListItemView {
         statusLable.snp.makeConstraints { make in
             make.right.equalTo(-26)
             make.centerY.equalToSuperview()
-            make.height.equalTo(18)
+            make.height.equalTo(20)
+            make.width.equalTo(60)
         }
         
         
@@ -94,7 +103,7 @@ private extension YHFileListItemView {
         titleLable.snp.makeConstraints { make in
             make.top.equalTo(kMargin)
             make.left.equalTo(40)
-            make.right.equalTo(statusLable.snp.left).offset(6)
+            make.right.equalTo(statusLable.snp.left).offset(-6)
         }
         
         
@@ -125,18 +134,26 @@ extension YHFileListItemView {
         var color : UIColor = .failColor
         
         
-        if dataModel.checks_tatus == 2 {
+        if dataModel.check_status == 2 {
             text = "需重传"
             color = .failColor
-        } else if  dataModel.checks_tatus == 3 {
+        } else if  dataModel.check_status == 3 {
             text = "待提交"
             color = .brandMainColor
         } else {
-            text = "需过滤" + String(dataModel.checks_tatus)
+            text = "需过滤" + String(dataModel.check_status)
             color = UIColor.purple
         }
         
         statusLable.text = text
         statusLable.textColor = color
+        
+        
+    }
+    
+    
+    func updateIndex() {
+        let index = String(myIndex + 1)
+        indexLable.text = index.defaultStringIfEmpty(detaultValue: "-")
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/V/YHFileListItemsView.swift

@@ -36,6 +36,7 @@ class YHFileListItemsView: UIView {
         let lable0 = UILabel(text: "title")
         lable0.textColor = UIColor.mainTextColor
         lable0.font = UIFont.PFSC_R(ofSize: 18)
+        lable0.textAlignment = .center
         return lable0
     }()
     
@@ -48,9 +49,7 @@ class YHFileListItemsView: UIView {
 private extension YHFileListItemsView {
     func updateUI() {
         removeSubviews()
-        
         guard let dataModel = dataModel else { return }
-        
         addSubview(topBkg)
         topBkg.snp.makeConstraints { make in
             make.top.equalTo(22)
@@ -78,25 +77,23 @@ private extension YHFileListItemsView {
         addSubview(holdView)
         holdView.snp.makeConstraints { make in
             make.top.equalTo(titleLable.snp.bottom).offset(14)
-            make.left.right.equalToSuperview()
+            make.left.equalToSuperview().offset(kMargin)
+            make.right.equalToSuperview().offset(-kMargin)
+            make.bottom.equalToSuperview()
         }
         
-    
         let sessionView : UIView = UIView()
         sessionView.backgroundColor = UIColor(hex: 0xD9E4FD, alpha: 1.0)
         holdView.addSubview(sessionView)
         
         if dataModel.supplement_list.isEmpty {
-            
             sessionView.snp.makeConstraints { make in
                 make.top.left.right.equalToSuperview()
                 make.height.equalTo(38)
                 
                 make.bottom.equalToSuperview()
             }
-            
         } else {
-            
             sessionView.snp.makeConstraints { make in
                 make.top.left.right.equalToSuperview()
                 make.height.equalTo(38)
@@ -104,10 +101,37 @@ private extension YHFileListItemsView {
         }
         
         
+        let leftLabel : UILabel = UILabel()
+        leftLabel.text = "内容"
+        leftLabel.font = UIFont.PFSC_R(ofSize: 12)
+        leftLabel.textColor = UIColor.labelTextColor2
+        
+        holdView.addSubview(leftLabel)
+        leftLabel.snp.makeConstraints { make in
+            make.left.equalTo(40)
+            make.top.equalToSuperview()
+            make.height.equalTo(38)
+        }
+        
+        
+        let rightLabel : UILabel = UILabel()
+        rightLabel.text = "状态"
+        rightLabel.font = UIFont.PFSC_R(ofSize: 12)
+        rightLabel.textColor = UIColor.labelTextColor2
+        
+        holdView.addSubview(rightLabel)
+        rightLabel.snp.makeConstraints { make in
+            make.right.equalTo(-34)
+            make.top.equalToSuperview()
+            make.height.equalTo(38)
+        }
+        
+        
         var lastView : UIView = sessionView
         for (index,item) in dataModel.supplement_list.enumerated() {
             
             let view = YHFileListItemView()
+            view.myIndex = index
             view.dataModel = item
             holdView.addSubview(view)
             
@@ -115,25 +139,20 @@ private extension YHFileListItemsView {
                 view.snp.makeConstraints { make in
                     make.top.equalTo(lastView.snp.bottom)
                     make.left.right.equalToSuperview()
-                    
-                    
-                    make.height.equalTo(72) //for test hjl
-                    
                     make.bottom.equalToSuperview()
-                    
-                    
                 }
-                
             } else {
                 view.snp.makeConstraints { make in
                     make.top.equalTo(lastView.snp.bottom)
                     make.left.right.equalToSuperview()
-                    
-                    make.height.equalTo(72)
                 }
             }
             lastView = view
         }
         
+        holdView.layer.cornerRadius = kCornerRadius6
+        holdView.clipsToBounds = true
+        holdView.layer.borderWidth = 1
+        holdView.layer.borderColor = UIColor(hex: 0xDEE5F1, alpha: 1.0).cgColor
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/VM/YHCertificateViewModel.swift

@@ -59,6 +59,17 @@ class YHCertificateViewModel: YHBaseViewModel {
                     callBackBlock(false,err)
                     return
                 }
+                
+                
+                for (index,item) in resultModel.enumerated() {
+                    let arr = item?.supplement_list.filter { (item) -> Bool in
+                        return item.check_status == 2 || item.check_status == 3
+                     }
+                    item?.supplement_list = arr ?? []
+                }
+                
+                
+                
                 self.arrFileListData = resultModel
                 callBackBlock(true,nil)
             } else {