配置打印2

GeliBusinessPlatform/Model/printOrder_model/printOrderModel.swift

@@ -36,19 +36,18 @@ class printOrder_data_model: Mappable {
     }
 }
 class printOrder_data_res_model: Mappable {
-    var remittance_account:String?
-    var cus_company : String?
-    var province_id :Int?
+    var remittance_account:String? //汇款账户（order_res）
+    var cus_company : String?// TO/单位公司名称（order_res
+    var province_id :Int?//省id（order_res）
+    var city_id:Int?// 市id（order_res）
+    var district_id : Int?// 区id（order_res）
+    var province :String?//省
     
-    var city_id:Int?
-    var district_id : Int?
-    var province :String?
+    var city:String?//市
+    var district : String?//区
+    var mobile :String?//手机
     
-    var city:String?
-    var district : String?
-    var mobile :String?
-    
-    var consignee :String?
+    var consignee :String?//联系人
     
     required init?( map: Map) {
         

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

@@ -28,7 +28,7 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate,UIPrintInt
         pc.printInfo = printInfo
         pc.delegate = self
         
-        if userName == "不二制油" { //普通
+        if userName != "不二制油" { //普通
             let formatter = web_vc.wkWebView.viewPrintFormatter()
             pc.printFormatter = formatter
             formatter.startPage = 0
@@ -48,7 +48,15 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate,UIPrintInt
     var printData:printOrder_data_res_model?{
         didSet{
             viewControllers.forEach { (vc) in
-                vc.printData = printData
+                if printData?.province_id != nil {
+                    vc.provinceIndex = (printData?.province_id)!
+                    vc.cityIndex = (printData?.city_id)!
+                    vc.areaIndex = (printData?.district_id)!
+                }
+                vc.FM_str = (printData?.remittance_account)!
+                vc.phone_str = (printData?.mobile)!
+                vc.contect_str = (printData?.consignee)!
+                
             }
         }
     }
@@ -81,7 +89,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

@@ -11,11 +11,6 @@ import SwiftyJSON
 
 class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,print_bottom_cellDelegate, UIPickerViewDataSource, UIPickerViewDelegate{
     
-    var printData:printOrder_data_res_model?{
-        didSet{
-            
-        }
-    }
     //MARK: - 地址选择
     //选择的省索引
     var provinceIndex = 0
@@ -329,7 +324,6 @@ class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDat
         list_view.register(UINib(nibName: "print_bottom_cell", bundle: nil), forCellReuseIdentifier: "print_bottom_cell")
         list_view.separatorStyle = .none
         list_view.showsVerticalScrollIndicator = false
-        
         getIndex()
     }
     //MARK:--VC 初始化
@@ -369,7 +363,15 @@ class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDat
         
         let cell = tableView.dequeueReusableCell(withIdentifier: "print_bottom_cell") as! print_bottom_cell
         cell.delegate = self
-        cell.adr_lbl.text = dzStr
+        if dzStr.count > 0 {
+            cell.adr_lbl.text = dzStr
+            cell.adr_lbl.textColor = UIColor(named: "标题字颜色")
+        }
+       
+        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
         return cell
     }
     

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

@@ -142,10 +142,10 @@
                                 <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="5gO-KT-url">
-                                <rect key="frame" x="15" y="151.5" width="26" height="18.5"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请选择区域" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5gO-KT-url">
+                                <rect key="frame" x="15" y="151.5" width="65" height="18.5"/>
                                 <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
-                                <color key="textColor" name="标题字颜色"/>
+                                <color key="textColor" name="提示语字体颜色"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="p9c-1h-uVq">
@@ -376,6 +376,9 @@
         <namedColor name="#F57575">
             <color red="0.96100002527236938" green="0.45899999141693115" blue="0.45899999141693115" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <namedColor name="提示语字体颜色">
+            <color red="0.70588235294117652" green="0.70588235294117652" blue="0.70588235294117652" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
         <namedColor name="标题字颜色">
             <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>