更新提示

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -66,8 +66,6 @@
 		E0206335246CE45A007A40C4 /* HeaderOnlyTitleView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0206334246CE45A007A40C4 /* HeaderOnlyTitleView.xib */; };
 		E0228BB0246FDA9A005812FA /* TitleAndLblCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0228BAE246FDA9A005812FA /* TitleAndLblCell.swift */; };
 		E0228BB1246FDA9A005812FA /* TitleAndLblCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0228BAF246FDA9A005812FA /* TitleAndLblCell.xib */; };
-		E0232D6425C260A800FB56D4 /* Refund_Commend_View.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0232D6325C260A800FB56D4 /* Refund_Commend_View.swift */; };
-		E0232D6925C260B200FB56D4 /* Refund_Commend_View.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0232D6825C260B200FB56D4 /* Refund_Commend_View.xib */; };
 		E0239202249069FD00C4C632 /* CGDXQVc.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0239200249069FD00C4C632 /* CGDXQVc.swift */; };
 		E0239203249069FD00C4C632 /* CGDXQVc.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0239201249069FD00C4C632 /* CGDXQVc.xib */; };
 		E02392062490819600C4C632 /* CGDListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E02392042490819600C4C632 /* CGDListCell.swift */; };
@@ -785,8 +783,6 @@
 		E0206334246CE45A007A40C4 /* HeaderOnlyTitleView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HeaderOnlyTitleView.xib; sourceTree = "<group>"; };
 		E0228BAE246FDA9A005812FA /* TitleAndLblCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleAndLblCell.swift; sourceTree = "<group>"; };
 		E0228BAF246FDA9A005812FA /* TitleAndLblCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TitleAndLblCell.xib; sourceTree = "<group>"; };
-		E0232D6325C260A800FB56D4 /* Refund_Commend_View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Refund_Commend_View.swift; sourceTree = "<group>"; };
-		E0232D6825C260B200FB56D4 /* Refund_Commend_View.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Refund_Commend_View.xib; sourceTree = "<group>"; };
 		E0239200249069FD00C4C632 /* CGDXQVc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGDXQVc.swift; sourceTree = "<group>"; };
 		E0239201249069FD00C4C632 /* CGDXQVc.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CGDXQVc.xib; sourceTree = "<group>"; };
 		E02392042490819600C4C632 /* CGDListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGDListCell.swift; sourceTree = "<group>"; };
@@ -3266,8 +3262,6 @@
 				F97E73312552A22000A11F98 /* DistributorSettingAlertView.xib */,
 				E0F038FB2599C5F500721011 /* GLTimeSelectView.swift */,
 				E0F039002599C60200721011 /* GLTimeSelectView.xib */,
-				E0232D6325C260A800FB56D4 /* Refund_Commend_View.swift */,
-				E0232D6825C260B200FB56D4 /* Refund_Commend_View.xib */,
 			);
 			path = AlertView;
 			sourceTree = "<group>";
@@ -3827,7 +3821,6 @@
 				E0A7548B244A8F0F00A84B67 /* CheckWareHourseViewController.xib in Resources */,
 				F956D5A4246A2D9C003FF510 /* .gitignore in Resources */,
 				E0BE8A80245A740600E80134 /* ChengGongCell.xib in Resources */,
-				E0232D6925C260B200FB56D4 /* Refund_Commend_View.xib in Resources */,
 				E0190A2E2487696F00B1E067 /* NewSelectItemVc.xib in Resources */,
 				F95D9B5024484FAE0080D6E3 /* GeliAlertView.xib in Resources */,
 				F91E9EBF2579D00900FAFCFA /* RetailListMgVC.xib in Resources */,
@@ -4210,7 +4203,6 @@
 				E02392062490819600C4C632 /* CGDListCell.swift in Sources */,
 				F950FDAB2451634B00C40530 /* LocationGeliPayModel.swift in Sources */,
 				E0CC84802482378D009B1FE9 /* IoGoodsDetailModel.swift in Sources */,
-				E0232D6425C260A800FB56D4 /* Refund_Commend_View.swift in Sources */,
 				E0D197C6244845FD002B080C /* PersonCenterViewController.swift in Sources */,
 				E0F1BE4824692379003015B2 /* ItemCell.swift in Sources */,
 				E09B03AB2445B0A300211A51 /* LoginModel.swift in Sources */,

GeliBusinessPlatform/View/AlertView/Refund_Commend_View.swift

-//
-//  Refund_Commend_View.swift
-//  GeliBusinessPlatform
-//
-//  Created by junye lu on 2021/1/28.
-//  Copyright © 2021 junye lu. All rights reserved.
-//
-
-import UIKit
-protocol Refund_Commend_View_Delegate {
-    func Refund_Commend_View_submit(type:Int)
-}
-class Refund_Commend_View: UIView {
-    var delegate:Refund_Commend_View_Delegate?
-    var is_pay_own = 1
-    @IBAction func submit_action(_ sender: UIButton) {
-        delegate?.Refund_Commend_View_submit(type: is_pay_own)
-    }
-    @IBAction func btn_click(_ sender: UIButton) {
-        btns_select_bg.isHidden = true
-        status_lbl.text = sender.titleLabel?.text
-        is_pay_own = sender.tag
-    }
-    @IBOutlet weak var btns_select_bg: UIView!
-    @IBAction func show_hide_action(_ sender: UIButton) {
-        btns_select_bg.isHidden = !btns_select_bg.isHidden
-    }
-    @IBOutlet weak var status_lbl: UILabel!
-    @IBAction func closet_action(_ sender: UIButton) {
-        self.removeFromSuperview()
-    }
-    var contentView:UIView!
-    //初始化时将xib中的view添加进来
-    override init(frame: CGRect) {
-        super.init(frame: frame)
-        contentView = loadViewFromNib()
-        addSubview(contentView)
-        contentView.snp.makeConstraints { (make) in
-            make.left.top.right.bottom.equalToSuperview()
-        }
-        
-    }
-    //    /初始化时将xib中的view添加进来
-    required init?(coder aDecoder: NSCoder) {
-        super.init(coder: aDecoder)
-        contentView = loadViewFromNib()
-        addSubview(contentView)
-        contentView.snp.makeConstraints { (make) in
-            make.left.top.right.bottom.equalToSuperview()
-        }
-    }
-    //加载xib
-    func loadViewFromNib() -> UIView {
-        let className = type(of: self)
-        let bundle = Bundle(for: className)
-        let name = NSStringFromClass(className).components(separatedBy: ".").last
-        let nib = UINib(nibName: name!, bundle: bundle)
-        let view = nib.instantiate(withOwner: self, options: nil).first as! UIView
-        return view
-    }
-
-}

GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewRKVc.swift

@@ -81,6 +81,14 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
             HUD.flash(.label("请选择入库类型"), delay: 1.2)
             return
         }
+        if holderArr[3] == "请选择供应商" {
+            HUD.flash(.label("请选择供应商"), delay: 1.2)
+            return
+        }
+        if holderArr[4] == "请选择商品类型" {
+            HUD.flash(.label("请选择商品类型"), delay: 1.2)
+            return
+        }
         if rkSelectArr.count == 0 {
             HUD.flash(.label("请选择商品"), delay: 1.2)
             return
@@ -214,8 +222,8 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
     @IBOutlet weak var lgBtnTitLbl: UILabel!
     @IBOutlet weak var lgBtn: LGButton!
     var isGm = false
-    var titleArr = ["仓库：","库位：","入库类型：","选择供应商：","备注："]
-    var holderArr = ["请选择仓库","请选择库位","请选择入库类型","请选择供应商","请输入备注"]
+    var titleArr = ["仓库：","库位：","入库类型：","选择供应商：","选择商品类型：","备注："]
+    var holderArr = ["请选择仓库","请选择库位","请选择入库类型","请选择供应商","请选择商品类型","请输入备注"]
     //入库类型
     var rkTypeArr = ["采购","调入","退货","生产","调出被拒绝","外采","其他","固定采购","临时采购"]
     var typeSelect:Int?
@@ -372,6 +380,9 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
             self.navigationController?.pushViewController(vc, animated: true)
         }
         if indexPath.row == 4 {
+            print("选择商品类型")
+        }
+        if indexPath.row == 5 {
             let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
             alterView.delegate = self
             alterView.titleLbl.text = "请填写入库备注"
@@ -518,7 +529,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
             return cell
         }
         
-        if indexPath.row == 4 {
+        if indexPath.row == 5 {
             let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndLblCell") as! TitleAndLblCell
             cell.nameLbl.text = titleArr[indexPath.row]
             if orderNumStr.count == 0 {
@@ -546,7 +557,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
         cell.mustLbl.isHidden = true
         cell.nameLeft.constant = 0
         cell.mustWidth.constant = 0
-        if indexPath.row > 3 {
+        if indexPath.row > 4 {
             setCellUI(cell: cell)
         }
         return cell
@@ -668,11 +679,8 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
                     return 0.001
                 }
             }
-            if indexPath.row == 4 {
+            if indexPath.row == 5 {
                 return UITableView.automaticDimension
-//                if getStrHeight(str: remark)+30 > 49 {
-//                    return getStrHeight(str: remark)+30
-//                }
             }
             return 49
         }

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

@@ -476,10 +476,10 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 63: //入库--直接入库
-//            let vc = NewRKVc()
+            let vc = NewRKVc()
 //            self.navigationController?.pushViewController(vc, animated: true)
-            let vc = S_Y_Detail_Vc()
-            vc.user_type = 1
+//            let vc = S_Y_Detail_Vc()
+//            vc.user_type = 1
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 64: //出库--直接出库

GeliBusinessPlatform/ViewController/打印订单/PrintListMgVc.swift

@@ -39,7 +39,7 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate,UIPrintInt
     @IBAction func print_action(_ sender: LGButton) {
         
         
-        if userName == "不二制油" { //普通
+        if userName != "不二制油" { //普通
             let dic = ["user_token":UserToken as Any,
                        "order_id":order_id as Any,
                        "remittance_account":"" as Any,
@@ -257,7 +257,7 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate,UIPrintInt
         self.view.addSubview(navbar)
         SetTopFrameView(view: contentV, btmView: self.view)
         
-        if userName == "不二制油" {
+        if userName != "不二制油" {
             normal_type_btn.isHidden = false
         }else{
             normal_type_btn.isHidden = true

GeliBusinessPlatform/ViewController/打印订单/PrintViewController.swift

@@ -378,7 +378,7 @@ class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDat
         list_view.separatorStyle = .none
         list_view.showsVerticalScrollIndicator = false
         getIndex()
-        if userName != "不二制油"{
+        if userName == "不二制油"{
             get_location_id()
         }
     }

GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift

@@ -9,14 +9,11 @@
 import UIKit
 import ViewAnimator //cell动效
 
-class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSource, GeliAlertViewDelegate, OrderDViewControllerDelegate,CGDListCellDelegate, Refund_Commend_View_Delegate{
-    func Refund_Commend_View_submit(type: Int) {
-        is_pay_own = type
-    }
+class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSource, GeliAlertViewDelegate, OrderDViewControllerDelegate,CGDListCellDelegate{
+  
     
     let UserToken = UserDefaults.standard.value(forKey: "user_token")
     //MARK:--基础数据
-    var is_pay_own = 0
     var keyword: String = ""
     var startTime : Int = 0
     var endTime : Int = 0
@@ -378,17 +375,17 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             self.view.window?.addSubview(alertView)
         }else if sender.titleLabel?.text == "退款" || sender.titleLabel?.text == "取消订单并退款"{
             isSrueOrder = 3
+            var content = "暂不支持原路退款，请注意使用其他渠道退还金额"
+            var remind = "继续退款"
             if rowModel.commission_time_type == 1 && rowModel.order_type == 5 {
-                let alertView = Refund_Commend_View(frame: self.view.window!.bounds)
-                alertView.delegate = self
-                self.view.window?.addSubview(alertView)
-                return
+                content = "该笔分销订单已结算佣金至分销商/员格利支付账户，如果您确认退款需要先垫付该笔分销订单佣金，等分销商/员账户入帐系统将自动扣还；是否确认退款？"
+                remind = "确认"
             }
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
             alertView.delegate = self;
             alertView.tishiLbl.text = ""
-            alertView.titileLbl.text = "暂不支持原路退款，请注意使用其他渠道退还金额"
-            alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "继续退款"), for: .normal)
+            alertView.titileLbl.text = content
+            alertView.rightBtn.setAttributedTitle(NSAttributedString(string: remind), for: .normal)
             alertView.rightBtn.tag = rowModel.order_id!
             self.view.window?.addSubview(alertView)
         }else if sender.titleLabel?.text == "确认收款"{
@@ -587,7 +584,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             }
             break
         case 3:
-            orderRefund(["user_token":UserToken as Any,"order_id" : sender.tag as Any , "is_pay_own":is_pay_own as Any], success: { (data) in
+            orderRefund(["user_token":UserToken as Any,"order_id" : sender.tag as Any , "is_pay_own":1 as Any], success: { (data) in
                 HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
                 

GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift

@@ -11,11 +11,8 @@ import Photos
 protocol OrderDViewControllerDelegate {
     func refishingOrderDchange()
 }
-class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndBtnCellDelegate,GuanLianKehuVCDelegate,OrderDViewFooterViewDelegate,TitleAndTFCellDelegate,GeliAlertViewDelegate,GLAlertSelectViewDelegate,XiuGaiYuShouJiaViewControllerDelegate,ChangeGoodsPriceVCDelegate,GeliAlertTextFiledDelegate,GeliAlertTextViewDelegate,UpBillDataTableViewCellDelegate, DaiKeXiaDanGouWuCellDelegate, S_Y_View_Delegate, Refund_Commend_View_Delegate{
-    func Refund_Commend_View_submit(type: Int) {
-        is_pay_own = type
-    }
-    var is_pay_own = 0
+class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndBtnCellDelegate,GuanLianKehuVCDelegate,OrderDViewFooterViewDelegate,TitleAndTFCellDelegate,GeliAlertViewDelegate,GLAlertSelectViewDelegate,XiuGaiYuShouJiaViewControllerDelegate,ChangeGoodsPriceVCDelegate,GeliAlertTextFiledDelegate,GeliAlertTextViewDelegate,UpBillDataTableViewCellDelegate, DaiKeXiaDanGouWuCellDelegate, S_Y_View_Delegate {
+   
     func S_Y_View_Check_Detail() {
         print("查看溯源")
         let vc = S_Y_Detail_Vc()
@@ -1455,18 +1452,17 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             self.view.window?.addSubview(alertView)
             break
         case "退款","取消订单并退款":
-            
+            var content = "暂不支持原路退款，请注意使用其他渠道退还金额"
+            var remind = "继续退款"
             if self.dataMdoel?.order_res?.commission_time_type == 1 && self.dataMdoel?.order_res?.order_type == 5 {
-                let alertView = Refund_Commend_View(frame: self.view.window!.bounds)
-                alertView.delegate = self
-                self.view.window?.addSubview(alertView)
-                return
+                content = "该笔分销订单已结算佣金至分销商/员格利支付账户，如果您确认退款需要先垫付该笔分销订单佣金，等分销商/员账户入帐系统将自动扣还；是否确认退款？"
+                remind = "确认"
             }
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
             alertView.delegate = self;
             alertView.tishiLbl.text = ""
-            alertView.titileLbl.text = "暂不支持原路退款，请注意使用其他渠道退还金额"
-            alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "继续退款"), for: .normal)
+            alertView.titileLbl.text = content
+            alertView.rightBtn.setAttributedTitle(NSAttributedString(string:remind ), for: .normal)
             alertView.rightBtn.tag = 1004
             self.view.window?.addSubview(alertView)
             break
@@ -1644,7 +1640,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             }
         }else if sender.tag == 1004 {
             HUD.flash(.progress)
-            orderRefund(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any,"is_pay_own":is_pay_own as Any], success: { (data) in
+            orderRefund(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any,"is_pay_own":1 as Any], success: { (data) in
                 HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
                 self.delegate?.refishingOrderDchange()