打印待调整

GeliBusinessPlatform/Assets.xcassets/工作中心/items/work入库申请.imageset/Contents.json

 {
   "images" : [
     {
+      "filename" : "rukushenqing.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

GeliBusinessPlatform/Assets.xcassets/工作中心/items/work出库申请.imageset/Contents.json

 {
   "images" : [
     {
+      "filename" : "chukushenqing.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

GeliBusinessPlatform/Assets.xcassets/工作中心/items/work待确认订单.imageset/Contents.json

 {
   "images" : [
     {
+      "filename" : "daiquerendingdan.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

GeliBusinessPlatform/Assets.xcassets/工作中心/items/work未发货订单.imageset/Contents.json

 {
   "images" : [
     {
+      "filename" : "weifahuodingdan.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

GeliBusinessPlatform/Assets.xcassets/工作中心/items/work采购入库.imageset/Contents.json

 {
   "images" : [
     {
+      "filename" : "caigouruku.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

GeliBusinessPlatform/Interface/Interface_Z.plist

@@ -322,5 +322,7 @@
 	<string>Distribution/stopDbtCooperation</string>
 	<key>订单打印信息</key>
 	<string>Order/printOrder</string>
+	<key>打印订单链接</key>
+	<string>Order/printUrl</string>
 </dict>
 </plist>

GeliBusinessPlatform/Model/printOrderInterface.swift

@@ -21,3 +21,23 @@ func printOrder(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture
         failture(error)
     }
 }
+
+//MARK:--打印订单链接
+/*params-key
+ user_token 
+ order_id 订单id
+ remittance_account 汇款账户
+ province_id 省Id
+ city_id 市id
+ district_id 区id
+ mobile 手机
+ consignee 联系人
+ */
+func printUrl(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("打印订单链接", params, { (rep:DataResponse<printUrl_Model>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}

GeliBusinessPlatform/Model/printOrder_model/printOrderModel.swift

@@ -68,3 +68,19 @@ class printOrder_data_res_model: Mappable {
         consignee <- map["consignee"]
     }
 }
+
+
+class printUrl_Model: Mappable {
+    var code:Int?
+    var message : String?
+    var data :String?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}

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

@@ -444,8 +444,8 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
                         self.navigationController?.pushViewController(vc, animated: true)
             return
         case 53: //销售下单-代客下单
-//            let vc = DaiKeXiaDanGouWuViewController()
-            let vc = PrintListMgVc()
+            let vc = DaiKeXiaDanGouWuViewController()
+//            let vc = PrintListMgVc()
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 54: //扫码下单

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

@@ -9,8 +9,9 @@
 import UIKit
 import Parchment
 import LGButton
+import WebKit
 
-class PrintListMgVc: BaseViewController, PagingViewControllerDelegate,UIPrintInteractionControllerDelegate {
+class PrintListMgVc: BaseViewController, PagingViewControllerDelegate,UIPrintInteractionControllerDelegate,WKNavigationDelegate {
     let web_vc = WebViewController()
     @IBAction func check_detail(_ sender: UIButton) {
         web_vc.titleStr = "打印预览"
@@ -18,9 +19,10 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate,UIPrintInt
         self.navigationController?.pushViewController(web_vc, animated: true)
         
     }
+    let pc = UIPrintInteractionController.shared
     @IBAction func print_action(_ sender: LGButton) {
         
-        let pc = UIPrintInteractionController.shared
+        
         // 打印任务相关信息
         let printInfo = UIPrintInfo(dictionary:nil)
         printInfo.outputType = UIPrintInfo.OutputType.general
@@ -29,21 +31,62 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate,UIPrintInt
         pc.delegate = self
         
         if userName != "不二制油" { //普通
-            let formatter = web_vc.wkWebView.viewPrintFormatter()
-            pc.printFormatter = formatter
-            formatter.startPage = 0
-            pc.present(animated: true) { (printer, result, err) in
-                print(result)
+            let dic = ["user_token":UserToken as Any,
+                       "order_id":order_id as Any,
+                       "remittance_account":"" as Any,
+                       "province_id":"" as Any,
+                       "city_id":"" as Any,
+                       "district_id":"" as Any,
+                       "mobile":"" as Any,
+                       "consignee":"" as Any
+            ]
+            printUrl(dic) { (data) in
+                let d = data as! printUrl_Model
+                let url = URL(string: d.data!)
+                let request = URLRequest.init(url: url!, cachePolicy: .reloadRevalidatingCacheData, timeoutInterval: 10)
+                self.web_vc.wkWebView.load(request)
+                HUD.flash(.progress)
+            } failture: { (err) in
+                
             }
         }else{//不二
             let vc = viewControllers[selectIndex]
-            if selectIndex != 0 {
-                print(vc.FM_str,vc.detail_adr_str,vc.phone_str,vc.contect_str)
+            
+            let dic = ["user_token":UserToken as Any,
+                       "order_id":order_id as Any,
+                       "remittance_account":vc.FM_str as Any,
+                       "province_id":vc.provinceIndex as Any,
+                       "city_id":vc.cityIndex as Any,
+                       "district_id":vc.areaIndex as Any,
+                       "mobile":vc.phone_str as Any,
+                       "consignee":vc.consignee_str as Any
+            ]
+            printUrl(dic) { (data) in
+                let d = data as! printUrl_Model
+                let url = URL(string: d.data!)
+                let request = URLRequest.init(url: url!, cachePolicy: .reloadRevalidatingCacheData, timeoutInterval: 10)
+                self.web_vc.wkWebView.load(request)
+                HUD.flash(.progress)
+            } failture: { (err) in
+                
+            }
         }
     }
     
     
+    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!){
+        //        Log4jMessage(message: "页面加载完成...")
+        print("页面加载完成...")
+        HUD.hide()
+        let formatter = webView.viewPrintFormatter()
+        pc.printFormatter = formatter
+        formatter.startPage = 0
+        pc.present(animated: true) { (printer, result, err) in
+            print(result)
         }
+        
+    }
+    
     @IBOutlet weak var contentV: UIView!
     var printData:printOrder_data_res_model?{
         didSet{
@@ -55,7 +98,7 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate,UIPrintInt
                 }
                 vc.FM_str = (printData?.remittance_account)!
                 vc.phone_str = (printData?.mobile)!
-                vc.contect_str = (printData?.consignee)!
+                vc.consignee_str = (printData?.consignee)!
                 
             }
         }
@@ -80,10 +123,18 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate,UIPrintInt
     @IBOutlet weak var holder_img: UIImageView!
     let UserToken = UserDefaults.standard.value(forKey: "user_token")
     let userName = UserDefaults.standard.string(forKey: "userName")
-    
+    var order_id = 0 {
+        didSet {
+            viewControllers.forEach { (vc) in
+                vc.order_id = order_id
+            }
+        }
+    }
     @IBOutlet weak var normal_type_btn: UIButton!
     override func viewDidLoad() {
         super.viewDidLoad()
+        web_vc.wkWebView.navigationDelegate = self
+        
         navbar.title = "打印模版确认"
         navbar.lineView.isHidden = true
         self.view.addSubview(navbar)

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

@@ -10,7 +10,9 @@ import UIKit
 import SwiftyJSON
 
 class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,print_bottom_cellDelegate, UIPickerViewDataSource, UIPickerViewDelegate{
-    
+    let UserToken = UserDefaults.standard.value(forKey: "user_token")
+    var order_id = 0
+    let web_vc = WebViewController()
     //MARK: - 地址选择
     //选择的省索引
     var provinceIndex = 0
@@ -295,7 +297,7 @@ class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDat
     var FM_str = ""
     var detail_adr_str = ""
     var phone_str = ""
-    var contect_str = ""
+    var consignee_str = ""
     
     func print_bottom_cell_text_respose(tag: Int, text: String) {
         print(tag,text)
@@ -310,7 +312,7 @@ class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDat
             phone_str = text
             break
         default:
-            contect_str = text
+            consignee_str = text
             break
         }
     }
@@ -343,6 +345,26 @@ class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDat
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if indexPath.row == 0 {
             print("check print")
+            print("ck = ",order_id)
+            let dic = ["user_token":UserToken as Any,
+                       "order_id":order_id as Any,
+                       "remittance_account":FM_str as Any,
+                       "province_id":provinceIndex as Any,
+                       "city_id":cityIndex as Any,
+                       "district_id":areaIndex as Any,
+                       "mobile":phone_str as Any,
+                       "consignee":consignee_str as Any
+            ]
+            
+            printUrl(dic) { (data) in
+                let d = data as! printUrl_Model
+                self.web_vc.titleStr = "打印预览"
+                self.web_vc.urlStr = d.data
+                self.navigationController?.pushViewController(self.web_vc, animated: true)
+            } failture: { (err) in
+                
+            }
+
         }
     }
     
@@ -371,7 +393,7 @@ class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDat
         cell.payer_tf.text = FM_str
         cell.adr_tf.text = detail_adr_str
         cell.phone_tf.text = phone_str
-        cell.connect_tf.text = contect_str
+        cell.consignee_tf.text = consignee_str
         return cell
     }
     

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

@@ -15,7 +15,7 @@ class print_bottom_cell: UITableViewCell {
 
     var delegate:print_bottom_cellDelegate?
     @IBOutlet weak var adr_lbl: UILabel!
-    @IBOutlet weak var connect_tf: UITextField!
+    @IBOutlet weak var consignee_tf: UITextField!
     @IBOutlet weak var phone_tf: UITextField!
     @IBOutlet weak var payer_tf: UITextField!
     @IBOutlet weak var adr_tf: UITextField!
@@ -33,12 +33,12 @@ class print_bottom_cell: UITableViewCell {
         payer_tf.tag = 0
         adr_tf.tag = 1
         phone_tf.tag = 2
-        connect_tf.tag = 3
+        consignee_tf.tag = 3
         
         payer_tf.addTarget(self, action: #selector(textChange(tf:)), for: .allEditingEvents)
         adr_tf.addTarget(self, action: #selector(textChange(tf:)), for: .allEditingEvents)
         phone_tf.addTarget(self, action: #selector(textChange(tf:)), for: .allEditingEvents)
-        connect_tf.addTarget(self, action: #selector(textChange(tf:)), for: .allEditingEvents)
+        consignee_tf.addTarget(self, action: #selector(textChange(tf:)), for: .allEditingEvents)
     }
     
     @objc func textChange(tf:UITextField){

GeliBusinessPlatform/ViewController/打印订单/print_bottom_cell.xib

@@ -359,7 +359,7 @@
                 <outlet property="adr_lbl" destination="5gO-KT-url" id="Gof-9A-hSh"/>
                 <outlet property="adr_tf" destination="jiF-F7-HDQ" id="EKO-dE-F6M"/>
                 <outlet property="btm_bg" destination="H9o-Fl-UmR" id="NKR-ur-O5q"/>
-                <outlet property="connect_tf" destination="SHz-wb-OzF" id="EhO-Dh-mgr"/>
+                <outlet property="consignee_tf" destination="SHz-wb-OzF" id="OOx-5t-DuY"/>
                 <outlet property="payer_tf" destination="wL5-Yr-Phn" id="f83-HW-0zy"/>
                 <outlet property="phone_tf" destination="1EG-8Y-For" id="D9Y-cJ-4xS"/>
                 <outlet property="top_bg" destination="SAd-bP-2BG" id="Tpm-AX-ZUM"/>

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

@@ -1368,13 +1368,12 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             }
             break
         case "打印":
-            //暂无
-//            print("暂无")
-//            HUD.flash(.label("打印功能开发中"),delay: 1.2)
-            printOrder(["user_token":UserToken as Any,"order_id":dataMdoel?.order_res?.order_id as Any]) { (data) in
+//            dataMdoel?.order_res?.order_id
+            printOrder(["user_token":UserToken as Any,"order_id":12445 as Any]) { (data) in
                 let d = data as! printOrder_model
                 let vc = PrintListMgVc()
                 vc.printData = d.data?.order_res
+                vc.order_id = 12445
                 self.navigationController?.pushViewController(vc, animated: true)
             } failture: { (err) in