工单批次，开票信息

OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -462,8 +462,8 @@
             filePath = "OrderScheduling/Common/WebView/WebViewTool.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "60"
+            startingLineNumber = "61"
-            endingLineNumber = "60"
+            endingLineNumber = "61"
             landmarkName = "init()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2958,8 +2958,8 @@
             filePath = "OrderScheduling/Common/WebView/WebViewTool.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "63"
+            startingLineNumber = "64"
-            endingLineNumber = "63"
+            endingLineNumber = "64"
             landmarkName = "init()"
             landmarkType = "7">
          </BreakpointContent>

OrderScheduling/Common/WebView/WebViewTool.swift

@@ -25,7 +25,7 @@ open class WebViewTool : NSObject {
         case workOrderReconciliation = "工单对账"
         case vehicleManage = "车辆管理"
         case driverManage = "司机管理"
-        case invoicingNotify = "开票通知"
+        case invoicingNotify = "工单批次"
         case roadAndbridgeTollReimbursement = "路桥费报销"
         case reporting = "报备"
         case reportingList = "报备查看"
@@ -37,6 +37,7 @@ open class WebViewTool : NSObject {
         case newTrainingList = "新人培训"
         case kpiIndex = "KPI数据统计"
         case batteryList = "电瓶进销存"
+        case invoiceListInfo = "开票信息"
     }
     
     public override init() {
@@ -132,6 +133,9 @@ open class WebViewTool : NSObject {
         case .batteryList:
             vc = WebViewController(showNavBar:false, title: nil, url: "\((h5Models?.batteryList)!)?token=\((USER.token)!)"+(appending ?? ""))
             break
+        case .invoiceListInfo:
+            vc = WebViewController(showNavBar:false, title: nil, url: "\((h5Models?.invoiceListInfo)!)?token=\((USER.token)!)"+(appending ?? ""))
+            break
         }
         
         if let vc {

OrderScheduling/HttpResponseModel/ResponseModel.swift

@@ -261,6 +261,7 @@ public class DispatchAppH5UrlDataModel : Decodable {
     var newTrainingList : String
     var kpiIndex : String
     var batteryList : String
+    var invoiceListInfo : String
 }
 
 public class VersionCheckDataModel : Decodable {

OrderScheduling/Mine/ViewController/MineController.swift

@@ -97,10 +97,21 @@ extension MineController {
             })
             .disposed(by: disposeBag)
         
-        mineView.kaipiaotongzhiGes.rx.event
+        mineView.gongdanpiciGes.rx.event
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: { _ in
-                WEBTOOL.open(name: .invoicingNotify, appending: nil)
+                if let supplierId = USER.supplierId {
+                    WEBTOOL.open(name: .invoicingNotify, appending: "&supplierId=\(supplierId)")
+                }
+            })
+            .disposed(by: disposeBag)
+        
+        mineView.kaipiaoxinxiGes.rx.event
+            .observe(on: MainScheduler.instance)
+            .subscribe(onNext: { _ in
+                if let supplierId = USER.supplierId {
+                    WEBTOOL.open(name: .invoiceListInfo, appending: "&supplierId=\(supplierId)")
+                }
             })
             .disposed(by: disposeBag)
         
@@ -190,7 +201,8 @@ open class MineController : ZDViewController {
 
         mineView.shujutongji.titleLabel.text = "KPI数据统计"
         mineView.gongdanduizhang.titleLabel.text = "工单对账"
-        mineView.kaipiaotongzhi.titleLabel.text = "开票通知"
+        mineView.gongdanpici.titleLabel.text = "工单批次"
+        mineView.kaipiaoxinxi.titleLabel.text = "开票信息"
         mineView.luqiaofeibaoxiao.titleLabel.text = "路桥费报销"
         mineView.dianpingjinxiaocun.titleLabel.text = "电瓶进销存"
         mineView.peixunwendang.titleLabel.text = "培训文档"
@@ -221,9 +233,9 @@ open class MineController : ZDViewController {
         }
         
         if orderRadiusViewAddHeightCount > 0 {
-            mineView.kaipiaotongzhi.line.isHidden = false
+            mineView.kaipiaoxinxi.line.isHidden = false
         }else{
-            mineView.kaipiaotongzhi.line.isHidden = true
+            mineView.kaipiaoxinxi.line.isHidden = true
         }
         
         if orderRadiusViewAddHeightCount == 2 {
@@ -233,7 +245,7 @@ open class MineController : ZDViewController {
         }
         
         mineView.orderRadiusView.snp.updateConstraints({ make in
-            make.height.equalTo(auto(110) + CGFloat(orderRadiusViewAddHeightCount) * auto(55))
+            make.height.equalTo(auto(165) + CGFloat(orderRadiusViewAddHeightCount) * auto(55))
         })
         
         addActions()
@@ -266,8 +278,10 @@ open class MineView : DDView {
     public let shujutongji : MineCell
     public let gongdanduizhangGes : UITapGestureRecognizer
     public let gongdanduizhang : MineCell
-    public let kaipiaotongzhiGes : UITapGestureRecognizer
+    public let gongdanpiciGes : UITapGestureRecognizer
-    public let kaipiaotongzhi : MineCell
+    public let gongdanpici : MineCell
+    public let kaipiaoxinxiGes : UITapGestureRecognizer
+    public let kaipiaoxinxi : MineCell
     public let luqiaofeibaoxiaoGes : UITapGestureRecognizer
     public let luqiaofeibaoxiao : MineCell
     public let dianpingjinxiaocunGes : UITapGestureRecognizer
@@ -302,10 +316,12 @@ open class MineView : DDView {
         shujutongji = MineCell()
         gongdanduizhangGes = UITapGestureRecognizer()
         gongdanduizhang = MineCell()
+        gongdanpiciGes = UITapGestureRecognizer()
+        gongdanpici = MineCell()
+        kaipiaoxinxiGes = UITapGestureRecognizer()
+        kaipiaoxinxi = MineCell()
         luqiaofeibaoxiaoGes = UITapGestureRecognizer()
         luqiaofeibaoxiao = MineCell()
-        kaipiaotongzhiGes = UITapGestureRecognizer()
-        kaipiaotongzhi = MineCell()
         dianpingjinxiaocunGes = UITapGestureRecognizer()
         dianpingjinxiaocun = MineCell()
         peixunwendangGes = UITapGestureRecognizer()
@@ -355,9 +371,11 @@ open class MineView : DDView {
         statisticsRadiusView.addSubview(shujutongji)
         gongdanduizhang.addGestureRecognizer(gongdanduizhangGes)
         orderRadiusView.addSubview(gongdanduizhang)
-        kaipiaotongzhi.line.isHidden = true
+        gongdanpici.addGestureRecognizer(gongdanpiciGes)
-        kaipiaotongzhi.addGestureRecognizer(kaipiaotongzhiGes)
+        orderRadiusView.addSubview(gongdanpici)
-        orderRadiusView.addSubview(kaipiaotongzhi)
+        kaipiaoxinxi.line.isHidden = true
+        kaipiaoxinxi.addGestureRecognizer(kaipiaoxinxiGes)
+        orderRadiusView.addSubview(kaipiaoxinxi)
         luqiaofeibaoxiao.addGestureRecognizer(luqiaofeibaoxiaoGes)
         luqiaofeibaoxiao.line.isHidden = true
         luqiaofeibaoxiao.isHidden = true
@@ -441,7 +459,7 @@ open class MineView : DDView {
             make.top.equalTo(statisticsRadiusView.snp.bottom).offset(auto(10))
             make.width.equalTo(infoRadiusView)
             make.centerX.equalToSuperview()
-            make.height.equalTo(auto(110))
+            make.height.equalTo(auto(165))
         }
         
         materialRadiusView.snp.makeConstraints { make in
@@ -468,14 +486,20 @@ open class MineView : DDView {
             make.height.equalTo(auto(55))
         }
         
-        kaipiaotongzhi.snp.makeConstraints { make in
+        gongdanpici.snp.makeConstraints { make in
             make.top.equalTo(gongdanduizhang.snp.bottom)
             make.left.right.equalToSuperview()
             make.height.equalTo(gongdanduizhang)
         }
         
+        kaipiaoxinxi.snp.makeConstraints { make in
+            make.top.equalTo(gongdanpici.snp.bottom)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(gongdanduizhang)
+        }
+        
         luqiaofeibaoxiao.snp.makeConstraints { make in
-            make.top.equalTo(kaipiaotongzhi.snp.bottom)
+            make.top.equalTo(kaipiaoxinxi.snp.bottom)
             make.left.right.equalToSuperview()
             make.height.equalTo(0)
         }