veron:1.4 build:1.24

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -3499,7 +3499,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.23;
+				CURRENT_PROJECT_VERSION = 1.24;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
 				DEVELOPMENT_TEAM = K48346UACH;
@@ -3544,7 +3544,7 @@
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Define/融云",
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
 				);
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -3631,7 +3631,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.23;
+				CURRENT_PROJECT_VERSION = 1.24;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
 				DEVELOPMENT_TEAM = K48346UACH;
@@ -3676,7 +3676,7 @@
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Define/融云",
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
 				);
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/IDEFindNavigatorScopes.plist

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array/>
+</plist>

GeliBusinessPlatform/Info.plist

@@ -43,10 +43,10 @@
 	<string>我们需要通过您同意获取地理位置,查询周边的相关数据</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>我们需要通过您同意使用麦克风，才能与你进行语音交流</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>我们需要通过您同意使用相册,才能获取相关数据</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
 	<string>我们需要通过您同意使用相册,才能添加相关数据</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>我们需要通过您同意使用相册,才能获取相关数据</string>
 	<key>UIBackgroundModes</key>
 	<array/>
 	<key>UILaunchImageFile</key>

GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift

@@ -490,16 +490,16 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
             HUD.flash(.label("敬请期待"),delay: 1.2)
             return
         case 77: //应收账款
-            //            HUD.flash(.label("敬请期待"),delay: 1.2)
-            let vc = YingFuZKListViewController()
-            vc.barTitle = "应收账款"
-            self.navigationController?.pushViewController(vc, animated: true)
+                        HUD.flash(.label("敬请期待"),delay: 1.2)
+//            let vc = YingFuZKListViewController()
+//            vc.barTitle = "应收账款"
+//            self.navigationController?.pushViewController(vc, animated: true)
             return
         case 78: //应付账款
-            //            HUD.flash(.label("敬请期待"),delay: 1.2)
-            let vc = YingFuZKListViewController()
-            vc.barTitle = "应付账款"
-            self.navigationController?.pushViewController(vc, animated: true)
+                        HUD.flash(.label("敬请期待"),delay: 1.2)
+//            let vc = YingFuZKListViewController()
+//            vc.barTitle = "应付账款"
+//            self.navigationController?.pushViewController(vc, animated: true)
             return
         case 80: //客户列表
             //            HUD.flash(.label("敬请期待"),delay: 1.2)

GeliBusinessPlatform/ViewController/采购单列表/CGDListViewController.swift

@@ -44,21 +44,32 @@ class CGDListViewController: BaseViewController  ,UISearchBarDelegate, SearchBar
         vc.delegate = self
         self.navigationController?.pushViewController(vc, animated: true)
     }
-    
+    var vc1Refresh = false
+    var vc2Refresh = false
     @objc func updateXQ(nofi : Notification){
+        vc1Refresh = true
+        vc2Refresh = true
         
-        let vc1 = viewControllers[1]
-        if vc1.listView != nil {
-            vc1.listView.mj_header?.beginRefreshing()
+        if vc1Refresh {
+            let vc1 = viewControllers[1]
+            if vc1.listView != nil {
+                vc1.listView.mj_header?.beginRefreshing {
+                    self.vc1Refresh = false
+                }
+            }
         }
-        let vc3 = viewControllers[3]
-        if vc3.listView != nil {
-            vc3.listView.mj_header?.beginRefreshing()
+        if vc2Refresh {
+            let vc3 = viewControllers[3]
+            if vc3.listView != nil {
+                vc3.listView.mj_header?.beginRefreshing {
+                    self.vc2Refresh = false
+                }
+            }
         }
     }
     deinit {
-           /// 移除通知
-           NotificationCenter.default.removeObserver(self)
+        /// 移除通知
+        NotificationCenter.default.removeObserver(self)
     }
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -104,34 +115,34 @@ class CGDListViewController: BaseViewController  ,UISearchBarDelegate, SearchBar
         pagingVC?.select(index: selectIndex)
         
     }
-     //MARK:--搜索按钮代理
-       var keyword = ""
-       func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
-           print("点击搜索进行--")
-           searchBar.resignFirstResponder()
-           keyword = searchBar.text!
-           viewControllers.forEach { (vc) in
-               vc.keyword = keyword
-               vc.isUpData = false
-           }
-           let vc = viewControllers[selectIndex]
-           vc.listView.mj_header?.beginRefreshing()
-       }
-       //MARK:--取消搜索代理
-      
-       func searchBarTextDidEndEditing(_ searchBar: UISearchBar) {
-           print("编辑即将结束了--")
-           removeBlackBtnView()
-           if searchBar.text?.count == 0 && keyword.count != 0{
-               keyword = searchBar.text!
-               viewControllers.forEach { (vc) in
-                   vc.keyword = keyword
-                   vc.isUpData = false
-               }
-               let vc = viewControllers[selectIndex]
-               vc.listView.mj_header?.beginRefreshing()
-           }
-       }
+    //MARK:--搜索按钮代理
+    var keyword = ""
+    func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
+        print("点击搜索进行--")
+        searchBar.resignFirstResponder()
+        keyword = searchBar.text!
+        viewControllers.forEach { (vc) in
+            vc.keyword = keyword
+            vc.isUpData = false
+        }
+        let vc = viewControllers[selectIndex]
+        vc.listView.mj_header?.beginRefreshing()
+    }
+    //MARK:--取消搜索代理
+    
+    func searchBarTextDidEndEditing(_ searchBar: UISearchBar) {
+        print("编辑即将结束了--")
+        removeBlackBtnView()
+        if searchBar.text?.count == 0 && keyword.count != 0{
+            keyword = searchBar.text!
+            viewControllers.forEach { (vc) in
+                vc.keyword = keyword
+                vc.isUpData = false
+            }
+            let vc = viewControllers[selectIndex]
+            vc.listView.mj_header?.beginRefreshing()
+        }
+    }
     //MAKR:--调起搜索后添加个蒙版本
     var blackBtnView:UIButton! = nil
     func searchBarShouldBeginEditing(_ searchBar: UISearchBar) -> Bool {

GeliBusinessPlatform/ViewController/采购单详情/CGDXQVc.swift

@@ -337,6 +337,15 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
                 let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndBtnCell") as! TitleAndBtnCell
                 cell.nameLbl.text = titleArr[indexPath.row]
                 cell.contentLbl.text = holderArr[indexPath.row]
+                if indexPath.row == 6 {
+                    if cell.contentLbl.text == "已付款"{
+                        cell.arrowImg.isHidden = true
+                        cell.contentRight.constant = 15
+                    }else{
+                        cell.arrowImg.isHidden = false
+                        cell.contentRight.constant = 32
+                    }
+                }
                 cell.btn.isUserInteractionEnabled = false
                 if model?.order_status == 1 {
                     cell.arrowImg.isHidden = true