新增关联凭证

GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -3,27 +3,4 @@
    uuid = "4EFF3422-0342-402A-BFF0-17B15851B3EC"
    type = "0"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
-         <BreakpointContent
-            uuid = "C83E3376-0312-4D15-99E3-5CBF74F24A36"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            breakpointStackSelectionBehavior = "1"
-            scope = "1"
-            stopOnStyle = "0">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.SwiftErrorBreakpoint">
-         <BreakpointContent
-            uuid = "7F243655-7F7D-4E57-927F-4125D0651B3C"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>

GeliBusinessPlatform/AppDelegate.swift

@@ -38,7 +38,7 @@ import ESTabBarController_swift
 @available(iOS 10.0, *)
 
 @UIApplicationMain
-class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate, UITabBarControllerDelegate, JPUSHRegisterDelegate{
+  class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate, UITabBarControllerDelegate, JPUSHRegisterDelegate{
     
     var window:UIWindow?
     

GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift

@@ -102,10 +102,13 @@ class OrderDetailResModel: Mappable {
     var sum_commission_val : String? //总佣金
     var dbt_target : Int? //分销对象：1供应商 2分销商 3分销员
     var target_name : String? //分销商名称
+    var order_associated_code : String?//关联凭证
+    
     required init?( map: Map) {
 
     }
     func mapping(map: Map) {
+        order_associated_code <- map["order_associated_code"]
         sum_commission_val <- map["sum_commission_val"]
         dbt_target <- map["dbt_target"]
         target_name <- map["target_name"]

GeliBusinessPlatform/ViewController/供应商分销商品管理/GYS_FX_Product_VC.swift

@@ -34,8 +34,6 @@ class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataS
         }
     }
     
-  
-   
     @IBOutlet weak var center_select_btn: UIView!
     var page : Int = 0
     var isUpData = true{

GeliBusinessPlatform/ViewController/分销员管理/FXYGL_ViewController.swift

@@ -268,3 +268,4 @@ class FXYGL_ViewController: BaseViewController, UISearchBarDelegate, SearchBarVi
         }
     }
 }
+      

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

@@ -46,8 +46,8 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
 //    let YuShouPart3Arr = ["订单编号","下单时间","订单来源","提货方式","物流公司","运单号","支付方式","支付状态","买家留言","订单备注"]
 //    let isYuShouPart3Arr = ["订单编号","下单时间","订单来源","提货方式","物流公司","运单号","定金支付方式","定金支付状态","尾款支付方式","尾款支付状态","买家留言","订单备注"]
     //新的
-    let YuShouPart3Arr = ["订单编号","下单时间","订单来源","提货方式","支付方式","支付状态","买家留言","订单备注"]
-    let isYuShouPart3Arr = ["订单编号","下单时间","订单来源","提货方式","定金支付方式","定金支付状态","尾款支付方式","尾款支付状态","买家留言","订单备注"]
+    let YuShouPart3Arr = ["订单编号","下单时间","订单来源","关联凭证","提货方式","支付方式","支付状态","买家留言","订单备注"]
+    let isYuShouPart3Arr = ["订单编号","下单时间","订单来源","关联凭证","提货方式","定金支付方式","定金支付状态","尾款支付方式","尾款支付状态","买家留言","订单备注"]
     
     
     let nonYuShouPart3Arr = ["收货人","联系电话","地址"]
@@ -581,7 +581,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             if isYuShou {
                 isYushoucount = 2
             }
-            if  indexPath.row == (7 + isYushoucount){
+            if  indexPath.row == (8 + isYushoucount){
                 let cell = tableView.dequeueReusableCell(withIdentifier: "PingLunCell") as! PingLunCell
                 
                 cell.tag = indexPath.row
@@ -592,7 +592,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 }
                 
                 switch indexPath.row {
-                case 7:
+                case 8:
                     cell.contentLbl.text = self.dataMdoel?.order_res?.order_postscript
                     if self.dataMdoel?.order_res?.order_postscript == nil {
                         cell.contentLbl.text = "-"
@@ -618,7 +618,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 }
                 return cell
             }
-            if indexPath.row == 4 || indexPath.row == 5 || indexPath.row == (4 + isYushoucount) || indexPath.row == (5 + isYushoucount){
+            if indexPath.row == 5 || indexPath.row == 6 || indexPath.row == (5 + isYushoucount) || indexPath.row == (6 + isYushoucount){
 
                 if isYuShou {
                     cell.nameLbl.text = isYuShouPart3Arr[indexPath.row]
@@ -629,12 +629,12 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 cell.arrowImg.isHidden = false
                 cell.contentRight.constant = 32
                 
-                if indexPath.row == 7 {
+                if indexPath.row == 8 {
                     if self.dataMdoel?.order_res?.sale_res?.wk_pay_type == 11 || self.dataMdoel?.order_res?.sale_res?.wk_pay_type == 12 {
                         cell.arrowImg.isHidden = true
                         cell.contentRight.constant = 15
                     }
-                }else if indexPath.row == 5 {
+                }else if indexPath.row == 6 {
                     if isYuShou {
                         if self.dataMdoel?.order_res?.sale_res?.dj_pay_type == 11 || self.dataMdoel?.order_res?.sale_res?.dj_pay_type == 12 {
                             cell.arrowImg.isHidden = true
@@ -649,7 +649,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 }
                 
                 switch indexPath.row {
-                case 4:
+                case 5:
                     if isYuShou {
                         cell.contentLbl.text = self.dataMdoel?.order_res?.sale_res?.dj_pay_type_cn
                         
@@ -658,7 +658,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                         
                     }
                     break
-                case 5:
+                case 6:
                     if isYuShou {
                         cell.contentLbl.text = self.dataMdoel?.order_res?.sale_res?.dj_pay_status_cn
                         
@@ -669,14 +669,14 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                     cell.arrowImg.isHidden = true
                     cell.contentRight.constant = 15
                     break
-                case 6:
+                case 7:
                     if isYuShou {
                         cell.contentLbl.text = self.dataMdoel?.order_res?.sale_res?.wk_pay_type_cn
                     }else{
                         cell.contentLbl.text = StringByInt(number: (self.dataMdoel?.order_res?.sale_res?.wk_pay_type!)!)
                     }
                     break
-                case 7:
+                case 8:
                     cell.contentLbl.text = self.dataMdoel?.order_res?.sale_res?.wk_pay_status_cn
                     cell.arrowImg.isHidden = true
                     cell.contentRight.constant = 15
@@ -719,13 +719,16 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                 cell.textTF.text = self.dataMdoel?.order_res?.from_cn
                 break
             case 3:
+                cell.textTF.text = self.dataMdoel?.order_res?.order_associated_code
+                break
+            case 4:
                 if self.dataMdoel?.order_res?.shipping_type == 1 {
                     cell.textTF.text = "派送"
                 }else{
                     cell.textTF.text = "自提"
                 }
                 break
-            case (6 + isYushoucount):
+            case (7 + isYushoucount):
                 cell.textTF.text = self.dataMdoel?.order_res?.postscript
                 break
                 

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

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>