bug修复

galaxy/galaxy/Classes/Modules/Home(首页)/YHSelect/C/YHSelectViewController.swift

@@ -65,7 +65,12 @@ extension YHSelectViewController {
             }
             self.headView.items = dataSource
         }
-        self.viewModel.getGoodsList(categoryID: "0", sortType: 0) {[weak self] success, error in
+        var id = "0"
+        if selectItem < self.viewModel.categoryArray.count {
+            let model = self.viewModel.categoryArray[selectItem]
+            id = model.id
+        }
+        self.viewModel.getGoodsList(categoryID: id, sortType: 0) {[weak self] success, error in
             guard let self = self else { return }
             self.tableView.reloadData()
             if self.viewModel.goodsArray.count == 0 {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MySignature(我的签字)/C/YHGCMySignatureDetailViewController.swift

@@ -350,12 +350,11 @@ extension YHGCMySignatureDetailViewController: UITableViewDelegate, UITableViewD
                         }  
                     } else {
                         if self.viewModel.mainModel?.commonFile.count != 0 {
-                            let url = URL(string: self.viewModel.mainModel?.commonFile) ?? URL(fileURLWithPath: "")
-                            let safariViewController = SFSafariViewController(url: url)
-                            safariViewController.dismissButtonStyle = .close
-                            safariViewController.delegate = self
-                            safariViewController.modalPresentationStyle = .fullScreen
-                            present(safariViewController, animated: true, completion: nil)
+                            self.viewModel.getPublicImageUrl(self.viewModel.mainModel?.commonFile ?? "") { success, error in
+                                if let success = success {
+                                    self.previewFileTool.openXLSXRemoteFile(urlString: success, fileName: "")
+                                }
+                            }
                         } else {
                             
                         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MySignature(我的签字)/V/YHGCDocListCell.swift

@@ -162,7 +162,7 @@ class YHGCDocListCell: UITableViewCell {
                     statusTxt = "待补充"
                     color = UIColor.brandMainColor
                 } else if status == 1003 {
-                    statusTxt = "待签署"
+                    statusTxt = "待签章"
                     color = UIColor.brandMainColor
                 } else if status == 1004 || status == 1005 || status == 1006 {
                     statusTxt = "审核中"

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MySignature(我的签字)/V/YHGCSignatureToActionTableViewCell.swift

@@ -285,14 +285,19 @@ class YHGCSignatureToActionTableViewCell: UITableViewCell {
             }
             flagLabel.text = "待补充"
             flagLabel.backgroundColor = UIColor(hex: 0xebf0f9)
-        } else if dataSource.docStatus == 1003 {
+        } else if dataSource.docStatus == 1003 || dataSource.docStatus == 1006 {
             bottomLeftLineView.isHidden = true
             editButton.isHidden = false
             submitButton.isHidden = true
             lookButton.isHidden = true
             flagLabel.textColor = UIColor.brandMainColor
-            flagLabel.text = "待签署"
+            if dataSource.docType == 1001 {
+                flagLabel.text = "待签章"
+            } else {
+                flagLabel.text = "待签署"
+            }
             flagLabel.backgroundColor = UIColor(hex: 0xebf0f9)
+            editButton.setTitle("查看", for: .normal)
         } else if dataSource.docStatus == 1004 {
             bottomLeftLineView.isHidden = true
             editButton.isHidden = true
@@ -316,14 +321,6 @@ class YHGCSignatureToActionTableViewCell: UITableViewCell {
             flagLabel.textColor = UIColor(hex: 0xff8000)
             flagLabel.text = "审核中"
             flagLabel.backgroundColor = UIColor(hex: 0xfff5eb)
-        } else if dataSource.docStatus == 1006 {
-            bottomLeftLineView.isHidden = true
-            editButton.isHidden = false
-            submitButton.isHidden = true
-            lookButton.isHidden = true
-            flagLabel.textColor = UIColor.failColor
-            flagLabel.text = "已驳回"
-            flagLabel.backgroundColor = UIColor.failColor.withAlphaComponent(0.3)
         } else if dataSource.docStatus == 1007 {
             bottomLeftLineView.isHidden = false
             editButton.isHidden = true
@@ -349,8 +346,14 @@ class YHGCSignatureToActionTableViewCell: UITableViewCell {
                 block(.add)
             }
         } else {
-            if let block = block {
-                block(.sign)
+            if dataSource?.docType == 1001 {
+                if let block = block {
+                    block(.look)
+                }
+            } else {
+                if let block = block {
+                    block(.sign)
+                }
             }
         }
     }