修改bug禅道

GeliBusinessPlatform/Model/yfzkModel/accountsPayableListModel.swift

@@ -135,7 +135,7 @@ class accountReceivableListModel: Mappable {
 
 class accountReceivableDataModel: Mappable {
     var list:Array<accountReceivableListDataModel>?
-    var arrears_money_sum :Int?
+    var arrears_money_sum :Float?
 
     required init?( map: Map) {
         

GeliBusinessPlatform/ViewController/应付账款/YingFuZKListViewController.swift

@@ -8,7 +8,11 @@
 
 import UIKit
 
-class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchBarViewDelegate,UITableViewDataSource,UITableViewDelegate {
+class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchBarViewDelegate,UITableViewDataSource,UITableViewDelegate,YingFuZhangKuanXQViewControllerDelegate {
+    func YingFuZhangKuanXQViewControllerFinish() {
+        listView.mj_header?.beginRefreshing()
+    }
+    
     let UserToken = UserDefaults.standard.value(forKey: "user_token")
     var page : Int = 0
     var keyword: String = ""
@@ -40,7 +44,11 @@ class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchB
             make.height.equalTo(30)
         }
         searchV = searchBr
-        searchBr.placeholderStr = "请输入单号"
+        if (barTitle?.contains("应收"))! {
+            searchBr.placeholderStr = "请输入客户名字或ID"
+        }else{
+            searchBr.placeholderStr = "请输入供应商名字或ID"
+        }
         searchBr.cornerRadius = 35/2.0
         searchBr.delegate = self
         searchBr.delegateL = self
@@ -49,9 +57,6 @@ class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchB
         //下拉刷新相关设置
         headerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadData))
         listView.mj_header = headerMJ
-        //上拉加载相关设置
-        footerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadMoreData))
-        listView.mj_footer = footerMJ
         listView.mj_header?.beginRefreshing()
     }
     
@@ -61,14 +66,15 @@ class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchB
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
        
         let vc = YingFuZhangKuanXQViewController()
-        vc.navTitle = "\(barTitle!)详情"
-        
+        vc.delegate = self
         if (barTitle?.contains("应付"))!{
             let model = dataArr[indexPath.row]
             vc.ven_id = model.ven_id!
+            vc.navTitle = "\(model.ven_name!)-\(barTitle!)详情"
         }else{
             let model = datas[indexPath.row]
             vc.ven_id = model.cus_id!
+            vc.navTitle = "\(model.cus_name!)-\(barTitle!)详情"
         }
         self.navigationController?.pushViewController(vc, animated: true)
     }
@@ -86,6 +92,7 @@ class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchB
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "YingFuZhangKuanCell") as! YingFuZhangKuanCell
         if (barTitle?.contains("应付"))!{
+            
             let mo = dataArr[indexPath.row]
             cell.nameLbl.text = mo.ven_name!
             if mo.payable_money != "0.00" {
@@ -158,6 +165,12 @@ class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchB
                 model.data?.vendor_res?.forEach({ (model) in
                     self.dataArr.append(model)
                 })
+                if self.dataArr.count == 20 {
+                    //上拉加载相关设置
+                    self.footerMJ.setRefreshingTarget(self, refreshingAction: #selector(self.loadMoreData))
+                    self.listView.mj_footer = self.footerMJ
+                    
+                }
                 self.totalPriceLbl.text = "¥\(model.data!.total_payable_money!)"
                 self.listView.reloadData()
                 self.listView.mj_header?.endRefreshing()
@@ -177,6 +190,11 @@ class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchB
                 model.data?.list?.forEach({ (model) in
                     self.datas.append(model)
                 })
+                if self.datas.count == 20 {
+                    //上拉加载相关设置
+                    self.footerMJ.setRefreshingTarget(self, refreshingAction: #selector(self.loadMoreData))
+                    self.listView.mj_footer = self.footerMJ
+                }
                 self.totalPriceLbl.text = "¥\(model.data!.arrears_money_sum!)"
                 self.listView.reloadData()
                 self.listView.mj_header?.endRefreshing()
@@ -199,7 +217,8 @@ class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchB
         if (barTitle?.contains("应付"))!{
             accountsPayableList(dic, success: { (data) in
                 let dataM = data as! accountsPayableListModel
-                if dataM.data?.vendor_res?.count == 0 {
+                if dataM.data?.vendor_res == nil {
+                    self.footerMJ.setTitle("看完了", for: .noMoreData)
                     self.listView.mj_footer?.endRefreshingWithNoMoreData()
                 }else{
                     self.page += 1
@@ -216,8 +235,9 @@ class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchB
         }else{//应收
             accountReceivableList(dic, success: { (data) in
                     let model = (data as! accountReceivableListModel)
-                if model.data?.list?.count == 0 {
+                if model.data?.list == nil {
                     self.listView.mj_footer?.endRefreshingWithNoMoreData()
+                    self.footerMJ.setTitle("看完了", for: .noMoreData)
                 }else{
                     self.page += 1
                     model.data?.list?.forEach({ (model) in

GeliBusinessPlatform/ViewController/应付账款/YingFuZKListViewController.xib

@@ -105,7 +105,7 @@
                 <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="csq-EP-8sj" secondAttribute="trailing" id="uFJ-q9-Jjb"/>
             </constraints>
             <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
-            <point key="canvasLocation" x="133" y="132"/>
+            <point key="canvasLocation" x="131.8840579710145" y="131.91964285714286"/>
         </view>
     </objects>
     <resources>

GeliBusinessPlatform/ViewController/应付账款/YingFuZhangKuanXQCell.swift

@@ -11,6 +11,7 @@ import UIKit
     @objc optional func YingFuZhangKuanXQCellBtnClick(cell:YingFuZhangKuanXQCell,sender:UIButton)
 }
 class YingFuZhangKuanXQCell: UITableViewCell {
+    @IBOutlet weak var date2Lbl: UILabel!
     var delegate:YingFuZhangKuanXQCellDelegate?
     @IBAction func submitAction(_ sender: UIButton) {
         delegate?.YingFuZhangKuanXQCellBtnClick?(cell: self,sender:sender)
@@ -44,20 +45,24 @@ class YingFuZhangKuanXQCell: UITableViewCell {
         if data != nil {
             nameLbl.text = data?.order_sn
             dateLbl.text = dayAndTimeByDouble(sender: (data?.create_time)!)
+            date2Lbl.text = "收款时间:" + dateLbl.text!
             priceLbl3.text = data?.arrears_money!
-            if data?.type == 1 {
+//            if data?.type == 1 {
                 priceLbl1.text = data?.money
-            }else{
+//            }else{
                 priceLbl2.text = data?.money
-            }
+//            }
             submitBtn.isUserInteractionEnabled = true
-//            print("abc === ",data?.type,data?.status)
+            
             if data?.type == 2 && data?.status == 0 {
                 submitBtn.backgroundColor = UIColor.clear
                 submitBtn.setTitleColor(UIColor(named: "灰色字体颜色"), for: .normal)
                 submitBtn.setTitle("设置未收款", for: .normal)
                 submitBtn.layer.borderWidth = 1
+                date2Lbl.isHidden = false
             }else if data?.type == 1 && data?.status == 1 {
+                date2Lbl.isHidden = true
+                priceLbl2.text = "-"
                 submitBtn.backgroundColor = UIColor(named: "按钮渐变色下,字体颜色")
                 submitBtn.setTitle("收款", for: .normal)
                 submitBtn.setTitleColor(UIColor.white, for: .normal)
@@ -72,19 +77,24 @@ class YingFuZhangKuanXQCell: UITableViewCell {
         }
         
         if model != nil {
+            
             nameLbl.text = model?.po_no!
             dateLbl.text = dayAndTimeByDouble(sender: (model?.create_time!)!)
-            if model?.type == 1 {//应付
+            date2Lbl.text = "付款时间:" + dateLbl.text!
+//            if model?.type == 1 {//应付
                 priceLbl1.text = model?.money
-            }else{//已付
+//            }else{//已付
                 priceLbl2.text = model?.money
-            }
+//            }
             priceLbl3.text = model?.payable_money
             submitBtn.backgroundColor = UIColor.clear
             submitBtn.setTitleColor(UIColor(named: "灰色字体颜色"), for: .normal)
             submitBtn.setTitle("设置未付款", for: .normal)
             submitBtn.layer.borderWidth = 1
+            date2Lbl.isHidden = false
             if model?.status == 1 {
+                date2Lbl.isHidden = true
+                priceLbl2.text = "-"
                 submitBtn.backgroundColor = UIColor(named: "按钮渐变色下,字体颜色")
                 submitBtn.setTitle("付款", for: .normal)
                 submitBtn.setTitleColor(UIColor.white, for: .normal)

GeliBusinessPlatform/ViewController/应付账款/YingFuZhangKuanXQCell.xib

@@ -72,7 +72,7 @@
                                 <color key="textColor" name="灰色字体颜色"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="欠款" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RSl-kj-jqv">
+                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="欠款" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RSl-kj-jqv">
                                 <rect key="frame" x="288" y="67" width="27" height="18.5"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="27" id="2af-ty-x0d"/>
@@ -97,7 +97,7 @@
                                 <color key="textColor" name="标题字颜色"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥654156" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yzg-sO-UiV">
+                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥654156" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yzg-sO-UiV">
                                 <rect key="frame" x="274" y="102" width="55" height="16"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="16" id="dST-8e-7Vb"/>
@@ -138,6 +138,15 @@
                                     <action selector="submitAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="7XF-JR-TWc"/>
                                 </connections>
                             </button>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cWT-1r-bcL">
+                                <rect key="frame" x="15" y="158" width="35.5" height="14"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="14" id="zSW-RA-m01"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <color key="textColor" name="标题字颜色"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
@@ -152,6 +161,7 @@
                             <constraint firstItem="GK8-LK-p2U" firstAttribute="top" secondItem="mZ1-IS-Gq8" secondAttribute="bottom" constant="15" id="MON-X4-c8s"/>
                             <constraint firstItem="RSl-kj-jqv" firstAttribute="centerY" secondItem="lYj-2P-xvL" secondAttribute="centerY" id="Meo-pV-ZyW"/>
                             <constraint firstItem="lYj-2P-xvL" firstAttribute="leading" secondItem="mZ1-IS-Gq8" secondAttribute="trailing" constant="77.5" id="TWf-Vx-QCT"/>
+                            <constraint firstItem="cWT-1r-bcL" firstAttribute="centerY" secondItem="aK8-v9-yu2" secondAttribute="centerY" id="UYh-gf-Kej"/>
                             <constraint firstItem="GK8-LK-p2U" firstAttribute="centerX" secondItem="mZ1-IS-Gq8" secondAttribute="centerX" id="XIb-Wn-ESB"/>
                             <constraint firstItem="udA-Dy-1uY" firstAttribute="leading" secondItem="aJi-Jr-f6i" secondAttribute="leading" constant="15" id="aQb-AI-hZG"/>
                             <constraint firstItem="RGB-nZ-T7S" firstAttribute="centerY" secondItem="GK8-LK-p2U" secondAttribute="centerY" id="cPg-Do-HMj"/>
@@ -163,6 +173,7 @@
                             <constraint firstAttribute="trailing" secondItem="zMA-He-uue" secondAttribute="trailing" constant="15" id="qIW-lQ-lj4"/>
                             <constraint firstItem="mZ1-IS-Gq8" firstAttribute="top" secondItem="Lpy-Zy-rfr" secondAttribute="bottom" constant="15" id="qka-J7-HMe"/>
                             <constraint firstItem="zMA-He-uue" firstAttribute="bottom" secondItem="1cr-dE-HXU" secondAttribute="bottom" id="s0s-gy-ZxM"/>
+                            <constraint firstItem="cWT-1r-bcL" firstAttribute="leading" secondItem="zMA-He-uue" secondAttribute="leading" id="suK-ht-MOf"/>
                             <constraint firstAttribute="trailing" secondItem="1cr-dE-HXU" secondAttribute="trailing" constant="15" id="tRN-Kz-anf"/>
                             <constraint firstAttribute="trailing" secondItem="Lpy-Zy-rfr" secondAttribute="trailing" id="uG7-Ii-LWf"/>
                             <constraint firstItem="lYj-2P-xvL" firstAttribute="centerY" secondItem="mZ1-IS-Gq8" secondAttribute="centerY" id="y88-hN-GHh"/>
@@ -185,6 +196,7 @@
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
             <connections>
+                <outlet property="date2Lbl" destination="cWT-1r-bcL" id="ehi-ue-oUg"/>
                 <outlet property="dateLbl" destination="zMA-He-uue" id="Pth-Hf-3tq"/>
                 <outlet property="nameLbl" destination="1cr-dE-HXU" id="Fi1-r1-Cgf"/>
                 <outlet property="p1Title" destination="mZ1-IS-Gq8" id="xRe-eG-eYb"/>

GeliBusinessPlatform/ViewController/应付账款/YingFuZhangKuanXQViewController.swift

@@ -7,17 +7,46 @@
 //
 
 import UIKit
+protocol YingFuZhangKuanXQViewControllerDelegate {
+    func YingFuZhangKuanXQViewControllerFinish()
+}
+
+
 
 class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,SearchBarViewDelegate,UITableViewDelegate,UITableViewDataSource,YingFuZhangKuanXQCellDelegate,GLAlertSelectViewDelegate, GeliAlertViewDelegate{
+    var delegate:YingFuZhangKuanXQViewControllerDelegate?
+    
+
+    
+    
+    override func backAction() {
+        self.navigationController?.popViewController(animated: true)
+       
+    }
+    
     func sureGeliAlertViewAction(sender: UIButton) {
         HUD.flash(.progress)
+        if navTitle.contains("应收") {
         let model = datas[sender.tag]
             uncollected(["user_token":UserToken as Any,"cus_log_id":model.cus_log_id as Any], success: { (data) in
                 HUD.hide()
                 self.listView.mj_header?.beginRefreshing()
+                self.delegate?.YingFuZhangKuanXQViewControllerFinish()
             }) { (err) in
                 
             }
+        }else{
+            var dict = ["user_token":UserToken as Any]
+            let model = dataArr[sender.tag]
+            dict["po_id"] = model.po_id
+            dict["pay_type"] = 0
+            dict["pay_status"] = 1
+            payStatus(dict, success: { (data) in
+                HUD.hide()
+                self.listView.mj_header?.beginRefreshing()
+                self.delegate?.YingFuZhangKuanXQViewControllerFinish()
+            }) { (err) in}
+        }
     }
     
     
@@ -45,6 +74,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
             payStatus(dict, success: { (data) in
                 HUD.hide()
                 self.listView.mj_header?.beginRefreshing()
+                self.delegate?.YingFuZhangKuanXQViewControllerFinish()
             }) { (err) in}
             break
         case "设置未付款":
@@ -55,6 +85,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
             payStatus(dict, success: { (data) in
                 HUD.hide()
                 self.listView.mj_header?.beginRefreshing()
+                self.delegate?.YingFuZhangKuanXQViewControllerFinish()
             }) { (err) in}
             break
         case "收款":
@@ -68,6 +99,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
             confirmReceipt(dict, success: { (data) in
                 HUD.hide()
                 self.listView.mj_header?.beginRefreshing()
+                self.delegate?.YingFuZhangKuanXQViewControllerFinish()
             }) { (err) in
                 
             }
@@ -94,7 +126,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        super.viewDidLoad()
+    
         navbar.title = navTitle
         self.view.addSubview(navbar)
         //searchbar
@@ -106,7 +138,11 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
             make.height.equalTo(35)
         }
         searchV = searchBr
-        searchBr.placeholderStr = "请输入单号"
+        if (navTitle.contains("应收")) {
+            searchBr.placeholderStr = "请输入客户名字或ID"
+        }else{
+            searchBr.placeholderStr = "请输入供应商名字或ID"
+        }
         searchBr.cornerRadius = 35/2.0
         searchBr.delegate = self
         searchBr.delegateL = self
@@ -119,8 +155,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
         headerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadData))
         listView.mj_header = headerMJ
         //上拉加载相关设置
-        footerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadMoreData))
-        listView.mj_footer = footerMJ
+      
         listView.mj_header?.beginRefreshing()
         
     }
@@ -237,12 +272,15 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
         cell.delegate = self
         cell.submitBtn.tag = indexPath.row
         cell.tag = indexPath.row
+    
         if navTitle.contains("应付"){
             if dataArr.count > 0 {
                 let model = dataArr[indexPath.row]
                 cell.model = model
             }
         }else{
+            cell.p1Title.text = "应收余额"
+            cell.p2Title.text = "已收余额"
             let model = datas[indexPath.row]
             cell.data = model
         }
@@ -265,13 +303,13 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
             }
             break
         case "设置未付款":
-            if glSelectView == nil {
-                view.titleLbl.text = "请选择付款状态"
-                view.selectNum = 0
-                view.dataArr = payTypeArr
-                glSelectView = view
-                self.view.addSubview(view)
-            }
+            let alertView = GeliAlertView(frame: self.view.window!.bounds)
+            alertView.delegate = self;
+            alertView.tishiLbl.text = ""
+            alertView.rightBtn.tag = cell.tag
+            alertView.titileLbl.text = "确定设为未付款？"
+            alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确定"), for: .normal)
+            self.view.window?.addSubview(alertView)
             break
         case "收款":
             if glSelectView == nil {
@@ -349,18 +387,30 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
                 model.data?.list?.forEach({ (item) in
                     self.dataArr.append(item)
                 })
+                
                 if model.data?.payable != nil{
                     self.first = model.data?.payable as! String
                 }
+                if self.first.count == 0 {
+                    self.first = "0"
+                }
                 if model.data?.already != nil {
                     self.second = "\(model.data!.already!)"
+                }else{
+                    self.second = "0"
                 }
                
                 self.listView.reloadData()
                 self.listView.mj_header?.endRefreshing()
                 self.page = 2
-                if model.data?.list?.count == 0 {
+                if self.dataArr.count == 20 {
+                    self.footerMJ.setRefreshingTarget(self, refreshingAction: #selector(self.loadMoreData))
+                          self.listView.mj_footer = self.footerMJ
+                }
+                if model.data?.list == nil {
                     self.listView.mj_footer?.endRefreshingWithNoMoreData()
+                    self.footerMJ.setTitle("暂无应付账款记录", for: .noMoreData)
+                    
                 }else{
                     self.listView.mj_footer?.endRefreshing()
                 }
@@ -370,17 +420,26 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
         }else{//应收
             let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"cus_id":ven_id as Any]
             accountReceivableDetail(dic, success: { (data) in
+                
+                self.second = "0.00"
+                self.third = "0.00"
                 let model = data as! accountReceivableDetailModel
+                if model.code == 2 {
+                    self.listView.mj_header?.endRefreshing()
+                    return
+                }
                 self.datas.removeAll()
                 model.data?.list?.forEach({ (item) in
                     self.datas.append(item)
                 })
+                if model.data?.arrears_money != nil {
                     self.first = model.data?.arrears_money! as! String
-                self.second = "0.00"
+                }
+                
                 if model.data!.jf != nil {
                     self.second = "\(model.data!.jf!)"
                 }
-                self.third = "0.00"
+                
                 if model.data!.df != nil {
                     self.third = "\(model.data!.df!)"
                 }
@@ -388,8 +447,13 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
                 self.listView.reloadData()
                 self.listView.mj_header?.endRefreshing()
                 self.page = 2
-                if model.data?.list?.count == 0 {
+                if self.datas.count == 20 {
+                    self.footerMJ.setRefreshingTarget(self, refreshingAction: #selector(self.loadMoreData))
+                          self.listView.mj_footer = self.footerMJ
+                }
+                if model.data?.list == nil {
                     self.listView.mj_footer?.endRefreshingWithNoMoreData()
+                    self.footerMJ.setTitle("暂无应收账款记录", for: .noMoreData)
                 }else{
                     self.listView.mj_footer?.endRefreshing()
                 }
@@ -405,8 +469,9 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
             let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"ven_id":ven_id as Any]
             accountsPayableDetail(dic, success: { (data) in
                 let dataM = data as! accountsPayableDetailModel
-                if dataM.data?.list?.count == 0 {
+                if dataM.data?.list == nil {
                     self.listView.mj_footer?.endRefreshingWithNoMoreData()
+                    self.footerMJ.setTitle("看完了", for: .noMoreData)
                 }else{
                     self.page += 1
                     dataM.data?.list?.forEach({ (model) in
@@ -423,8 +488,9 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
             let dic = ["user_token":UserToken as Any,"keyword":keyword as Any,"page":page as Any,"cus_id":ven_id as Any]
             accountReceivableDetail(dic, success: { (data) in
                 let model = data as! accountReceivableDetailModel
-                if model.data?.list?.count == 0 {
+                if model.data?.list == nil {
                     self.listView.mj_footer?.endRefreshingWithNoMoreData()
+                    self.footerMJ.setTitle("看完了", for: .noMoreData)
                 }else{
                     self.page += 1
                     model.data?.list?.forEach({ (item) in

GeliBusinessPlatform/ViewController/新增、编辑品牌/XinZengPinPaiViewController.swift

@@ -69,10 +69,10 @@ class XinZengPinPaiViewController: BaseViewController,UITableViewDataSource,UITa
 //            HUD.flash(.label("请输入品牌链接"), delay: 1.2)
 //            return
 //        }
-        if commend.count == 0 {
-            HUD.flash(.label("请填写品牌描述"), delay: 1.2)
-            return
-        }
+//        if commend.count == 0 {
+//            HUD.flash(.label("请填写品牌描述"), delay: 1.2)
+//            return
+//        }
         let dict = [
             "user_token":UserToken as Any,
             "brand_name":pinPaiName as Any,