Skip to content

G
GeliBusinessPlatform
Commit b128187b authored by lujunye's avatar lujunye
Browse files
Options

图标修改

parent 56a0ba03
Show whitespace changes
Inline Side-by-side
Showing with 156 additions and 28 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ b128187b
......@@ -290,6 +290,8 @@
E0A409D524640B8300CFF109 /* DZGLViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0A409D324640B8300CFF109 /* DZGLViewController.xib */; };
E0A7548A244A8F0F00A84B67 /* CheckWareHourseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0A75488244A8F0F00A84B67 /* CheckWareHourseViewController.swift */; };
E0A7548B244A8F0F00A84B67 /* CheckWareHourseViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0A75489244A8F0F00A84B67 /* CheckWareHourseViewController.xib */; };
E0A804B325B81A000082F56B /* printOrderModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0A804B225B81A000082F56B /* printOrderModel.swift */; };
E0A804BB25B81B790082F56B /* printOrderInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0A804BA25B81B790082F56B /* printOrderInterface.swift */; };
E0AA3A87248F3C5E00CBFC27 /* StatisticsModel.swif.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0AA3A86248F3C5E00CBFC27 /* StatisticsModel.swif.swift */; };
E0AA3A89248F3E1400CBFC27 /* StatisticsInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0AA3A88248F3E1400CBFC27 /* StatisticsInterface.swift */; };
E0AA3A91248F626400CBFC27 /* XinCaiGouViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0AA3A8F248F626400CBFC27 /* XinCaiGouViewController.swift */; };
......@@ -990,6 +992,8 @@
E0A409D324640B8300CFF109 /* DZGLViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DZGLViewController.xib; sourceTree = "<group>"; };
E0A75488244A8F0F00A84B67 /* CheckWareHourseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckWareHourseViewController.swift; sourceTree = "<group>"; };
E0A75489244A8F0F00A84B67 /* CheckWareHourseViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CheckWareHourseViewController.xib; sourceTree = "<group>"; };
E0A804B225B81A000082F56B /* printOrderModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = printOrderModel.swift; sourceTree = "<group>"; };
E0A804BA25B81B790082F56B /* printOrderInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = printOrderInterface.swift; sourceTree = "<group>"; };
E0AA3A86248F3C5E00CBFC27 /* StatisticsModel.swif.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatisticsModel.swif.swift; sourceTree = "<group>"; };
E0AA3A88248F3E1400CBFC27 /* StatisticsInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatisticsInterface.swift; sourceTree = "<group>"; };
E0AA3A8F248F626400CBFC27 /* XinCaiGouViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XinCaiGouViewController.swift; sourceTree = "<group>"; };
......@@ -2081,6 +2085,7 @@
E09B03A92445B09200211A51 /* Model */ = {
isa = PBXGroup;
children = (
E0A804B125B819DF0082F56B /* printOrder_model */,
E0B903B6259AD9490041EF62 /* dbtIncomeInfo_model */,
E0A0A66B255A2C0300B0D1A5 /* get_dbt_rule_model */,
E040399424D14D1F008CF965 /* LalamoveInterface */,
......@@ -2099,6 +2104,7 @@
F956D5BD246A3629003FF510 /* PersonCenterModel */,
F956D5BC246A35DB003FF510 /* GoodsManageMoel */,
F9171EFB245128B200359C2B /* Interface.swift */,
E0A804BA25B81B790082F56B /* printOrderInterface.swift */,
E0B903BC259ADAFE0041EF62 /* dbtIncomeInfoInterface.swift */,
E0A0A674255A2CFC00B0D1A5 /* getDbtRuleInterface.swift */,
E040399724D14E0E008CF965 /* LalamoveInterface.swift */,
......@@ -2423,6 +2429,14 @@
path = "新增、编辑（查看）仓库";
sourceTree = "<group>";
};
E0A804B125B819DF0082F56B /* printOrder_model */ = {
isa = PBXGroup;
children = (
E0A804B225B81A000082F56B /* printOrderModel.swift */,
);
path = printOrder_model;
sourceTree = "<group>";
};
E0AA3A85248F3C1B00CBFC27 /* StatisticsModel */ = {
isa = PBXGroup;
children = (
......@@ -3866,6 +3880,7 @@
F950FDE224518B9500C40530 /* FSCalendarCalculator.m in Sources */,
E0D197C12448431C002B080C /* BabyToy.m in Sources */,
E0F97B0C24516B1F001BD600 /* AddImgCell.swift in Sources */,
E0A804BB25B81B790082F56B /* printOrderInterface.swift in Sources */,
E0B9462B2456AABE00FBEC9A /* YuShouWeiKuanFaHuoCell.swift in Sources */,
E09B03C32445BD9500211A51 /* NavViewController.swift in Sources */,
E06524F124580AAC00CA22E2 /* RuKuJiaGeCell.swift in Sources */,
......@@ -4064,6 +4079,7 @@
F924B3962497241500A913CD /* GetBindUserModel.swift in Sources */,
F956D5A1246A2D9C003FF510 /* LMNToolBar.m in Sources */,
F9011C1024CE6FB200AAF4F5 /* LogisticalSelectView.swift in Sources */,
E0A804B325B81A000082F56B /* printOrderModel.swift in Sources */,
F950FDDC24518B9500C40530 /* FSCalendar.m in Sources */,
F9FF7BA124760DA9006E305E /* LogisticsCompanyModel.swift in Sources */,
E030515324E2304600AFB9E9 /* OnlyViewCell.swift in Sources */,
......
GeliBusinessPlatform/Assets.xcassets/工作中心/items/work入库申请.imageset/Contents.json
View file @ b128187b
{
"images" : [
{
"filename" : "work入库申请.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "work入库申请@2x.png",
"filename" : "rukushenqing@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "work入库申请@3x.png",
"filename" : "rukushenqing@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
GeliBusinessPlatform/Assets.xcassets/工作中心/items/work出库申请.imageset/Contents.json
View file @ b128187b
{
"images" : [
{
"filename" : "work出库申请.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "work出库申请@2x.png",
"filename" : "chukushenqing@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "work出库申请@3x.png",
"filename" : "chukushenqing@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
GeliBusinessPlatform/Assets.xcassets/工作中心/items/work待确认订单.imageset/Contents.json
View file @ b128187b
{
"images" : [
{
"filename" : "work待确认订单.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "work待确认订单@2x.png",
"filename" : "daiquerendingdan@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "work待确认订单@3x.png",
"filename" : "daiquerendingdan@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
GeliBusinessPlatform/Assets.xcassets/工作中心/items/work未发货订单.imageset/Contents.json
View file @ b128187b
{
"images" : [
{
"filename" : "work未发货订单.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "work未发货订单@2x.png",
"filename" : "weifahuodingdan@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "work未发货订单@3x.png",
"filename" : "weifahuodingdan@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
GeliBusinessPlatform/Assets.xcassets/工作中心/items/work采购入库.imageset/Contents.json
View file @ b128187b
{
"images" : [
{
"filename" : "work采购入库.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "work采购入库@2x.png",
"filename" : "caigouruku@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "work采购入库@3x.png",
"filename" : "caigouruku@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
GeliBusinessPlatform/Interface/Interface_Z.plist
View file @ b128187b
......@@ -320,5 +320,7 @@
<string>Distribution/addDistributor</string>
<key>删除分销员</key>
<string>Distribution/stopDbtCooperation</string>
<key>订单打印信息</key>
<string>Order/printOrder</string>
</dict>
</plist>
GeliBusinessPlatform/Model/printOrderInterface.swift 0 → 100644
View file @ b128187b
//
// printOrderInterface.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2021/1/20.
// Copyright © 2021 junye lu. All rights reserved.
//
import Foundation
import Alamofire
import SwiftyJSON
import ObjectMapper
//MARK:--订单打印信息
//params-key(user_name(用户名),order_id:订单id)
func printOrder(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("订单打印信息", params, { (rep:DataResponse<printOrder_model>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
GeliBusinessPlatform/Model/printOrder_model/printOrderModel.swift 0 → 100644
View file @ b128187b
//
// printOrderModel.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2021/1/20.
// Copyright © 2021 junye lu. All rights reserved.
//
import Foundation
import ObjectMapper
//MARK: - 订单打印信息
class printOrder_model: Mappable {
var code:Int?
var message : String?
var data :printOrder_data_model?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class printOrder_data_model: Mappable {
var order_res :printOrder_data_res_model?
required init?( map: Map) {
}
func mapping(map: Map) {
order_res <- map["order_res"]
}
}
class printOrder_data_res_model: Mappable {
var remittance_account:String?
var cus_company : String?
var province_id :Int?
var city_id:Int?
var district_id : Int?
var province :String?
var city:String?
var district : String?
var mobile :String?
var consignee :String?
required init?( map: Map) {
}
func mapping(map: Map) {
remittance_account <- map["remittance_account"]
cus_company <- map["cus_company"]
province_id <- map["province_id"]
city_id <- map["city_id"]
district_id <- map["district_id"]
province <- map["province"]
city <- map["city"]
district <- map["district"]
mobile <- map["mobile"]
consignee <- map["consignee"]
}
}
GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift
View file @ b128187b
......@@ -671,16 +671,18 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
let alertView = LogisticalSelectView(frame: self.view.window!.bounds)
alertView.delegate = self
if logPayPriceModel?.price_jd != nil {
print("abc == ",logPayPriceModel?.price_jd)
alertView.jdPriceLbl.text = "京东冷运（预估运费" + String(format: "%.2f", (logPayPriceModel?.price_jd)!) + "元）"
alertView.jdPriceLbl.text = "京东冷运（预估运费" + (logPayPriceModel?.price_jd)! + "元）"
}
if logPayPriceModel?.price_sf != nil {
if logPayPriceModel?.price_sf != nil && logPayPriceModel?.price_sf != 0 {
alertView.sfPriceLbl.text = "顺丰冷运（预估运费" + String(format: "%.2f", (logPayPriceModel?.price_sf)!) + "元）"
}else{
alertView.sfPriceLbl.text = "顺丰冷运（待上门评估）"
}
if logPayPriceModel?.price_xy != nil {
if logPayPriceModel?.price_xy != nil && logPayPriceModel?.price_xy != 0 {
alertView.xyPriceLbl.text = "鑫源物流（预估运费" + String(format: "%.2f", (logPayPriceModel?.price_xy)!) + "元）"
}else{
alertView.setXingYuan()
// alertView.setXingYuan()
alertView.xyPriceLbl.text = "鑫源物流（待上门评估）"
}
self.view.window?.addSubview(alertView)
......
GeliBusinessPlatform/ViewController/工作中心/WorkBannerTableViewCell.xib
View file @ b128187b
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" 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="16087"/>
<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="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
......@@ -44,7 +44,7 @@
<rect key="frame" x="15" y="129" width="323" height="94"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5bk-NQ-8kk">
<rect key="frame" x="135" y="20" width="53" height="19"/>
<rect key="frame" x="135.5" y="20" width="52" height="19"/>
<attributedString key="attributedText">
<fragment content="已收款：">
<attributes>
......
GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift
View file @ b128187b
......@@ -318,6 +318,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
case 1:
let tempArr:[String] = ["未发货订单","待确认订单","入库申请","出库申请","采购入库"]
cell.dataModel = self.dataModel //对本地数据库进行更新，每次进入工作中心就可以刷新啦
cell.isOften = false
cell.reloadData(title: arr[indexPath.row - 1], items: tempArr)
......
GeliBusinessPlatform/ViewController/工作中心/WorkItemTableViewCell.swift
View file @ b128187b
......@@ -88,6 +88,7 @@ class WorkItemTableViewCell: UITableViewCell , UICollectionViewDelegate, UIColle
}
if dataIndexSection == 1 {
cell.itemImgV.image = UIImage.init(named: ("work" + itemArrs[indexPath.row]))
switch indexPath.row {
case 0:
......
GeliBusinessPlatform/ViewController/打印订单/PrintListMgVc.swift
View file @ b128187b
......@@ -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
......@@ -45,7 +45,13 @@ class PrintListMgVc: BaseViewController, PagingViewControllerDelegate,UIPrintInt
}
@IBOutlet weak var contentV: UIView!
var printData:printOrder_data_res_model?{
didSet{
viewControllers.forEach { (vc) in
vc.printData = printData
}
}
}
fileprivate let cities = [
"普通订单打印",
......@@ -75,7 +81,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
View file @ b128187b
......@@ -11,6 +11,11 @@ import SwiftyJSON
class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,print_bottom_cellDelegate, UIPickerViewDataSource, UIPickerViewDelegate{
var printData:printOrder_data_res_model?{
didSet{
}
}
//MARK: - 地址选择
//选择的省索引
var provinceIndex = 0
......
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @ b128187b
......@@ -1369,11 +1369,17 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
break
case "打印":
//暂无
print("暂无")
// print("暂无")
// HUD.flash(.label("打印功能开发中"),delay: 1.2)
printOrder(["user_token":UserToken as Any,"order_id":dataMdoel?.order_res?.order_id as Any]) { (data) in
let d = data as! printOrder_model
let vc = PrintListMgVc()
vc.printData = d.data?.order_res
self.navigationController?.pushViewController(vc, animated: true)
} failture: { (err) in
}
break
case "确认订单":
let alertView = GeliAlertView(frame: self.view.window!.bounds)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment