Skip to content

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

1111

parent 77695bc6
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 16 deletions
GeliBusinessPlatform/Assets.xcassets/print/red_search.imageset/Contents.json 0 → 100644
View file @ f05e75bb
{
"images" : [
{
"filename" : "形状.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "形状@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "形状@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
GeliBusinessPlatform/View/MoreBtnView/MoreAndTimeSelectView.swift
View file @ f05e75bb
......@@ -300,7 +300,7 @@ class MoreAndTimeSelectView: UIView, TitleAndSelCalendarViewDelegate, TimeSelect
}
if index == 1{
let arrStr = ["全部","采购","调入","退货","生产","调出被拒绝","外采","其他","固定采购","临时采购"]
let arrStr = ["全部","采购","调入","退货","生产","调出被拒绝","外采","其他","固定采购","临时采购","直营入库"]
sendSArr.removeAll()
arrStr.forEach { (str) in
sendSArr.append(false)
......
GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift
View file @ f05e75bb
......@@ -671,7 +671,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
let alertView = LogisticalSelectView(frame: self.view.window!.bounds)
alertView.delegate = self
if logPayPriceModel?.price_jd != nil && logPayPriceModel?.price_jd != 0 {
alertView.jdPriceLbl.text = "京东冷运（预估运费\(logPayPriceModel!.price_jd!)元）"
alertView.jdPriceLbl.text = "京东冷运（预估运费\(String(format: "%.2f", (logPayPriceModel?.price_jd)!))元）"
}else{
alertView.jdPriceLbl.text = "京东冷运（待上门评估）"
}
......
GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuCell.xib
View file @ f05e75bb
......@@ -297,7 +297,7 @@
<outlet property="yong_jin_lbl" destination="X1B-vl-mvy" id="3Vm-LZ-a7G"/>
<outlet property="yu_shou_img" destination="2zV-nI-93U" id="uFW-s4-KdR"/>
</connections>
<point key="canvasLocation" x="131.15942028985509" y="121.20535714285714"/>
<point key="canvasLocation" x="131.15942028985509" y="120.87053571428571"/>
</tableViewCell>
</objects>
<resources>
......
GeliBusinessPlatform/ViewController/出入库记录/CRKListVC.xib
View file @ f05e75bb
<?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="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
......@@ -39,10 +40,10 @@
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LxK-xK-rbt">
<rect key="frame" x="0.0" y="0.0" width="374" height="44"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="LxK-xK-rbt" firstAttribute="leading" secondItem="av5-5Z-klb" secondAttribute="leading" id="GpW-SI-hii"/>
<constraint firstItem="LxK-xK-rbt" firstAttribute="top" secondItem="av5-5Z-klb" secondAttribute="top" id="HSt-0S-KSA"/>
......@@ -62,7 +63,8 @@
</connections>
</tableView>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="BU7-XP-2pP" firstAttribute="top" secondItem="av5-5Z-klb" secondAttribute="bottom" id="1wU-EB-aTe"/>
<constraint firstItem="BU7-XP-2pP" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="7YS-Hb-OyJ"/>
......@@ -72,7 +74,6 @@
<constraint firstItem="av5-5Z-klb" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="XVM-dV-raw"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="BU7-XP-2pP" secondAttribute="trailing" id="nuT-Ha-cUn"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<point key="canvasLocation" x="132" y="129"/>
</view>
</objects>
......@@ -81,5 +82,8 @@
<namedColor name="app底色">
<color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift
View file @ f05e75bb
......@@ -216,7 +216,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
cell.yuShouStatus.isHidden = true
}
}
if rowModel.from == 3 {
if rowModel.from == 3 || rowModel.from == 5{
cell.formLbl.isHidden = false
if cell.yuShouStatus.isHidden {
cell.formNSlayout.constant = 8
......@@ -263,7 +263,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
if rowModel.from == 3 || rowModel.from == 5 {//销售下单
btnStr = ["发货","取消订单并退款"]
if rowModel.pay_status != 2{
btnStr = ["发货","取消订单","确认收款"]
btnStr = ["发货","取消订单","确认收款","付款码"]
}
}else{
btnStr = ["发货","退款"]
......@@ -283,7 +283,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
if rowModel.from == 3 || rowModel.from == 5 {//销售下单
btnStr = ["确认收货","退款退货","退款"]
if rowModel.pay_status != 2{//未收款
btnStr = ["确认收货","确认收款","取消订单"]
btnStr = ["确认收货","确认收款","取消订单","付款码"]
}
}else{
btnStr = ["退款"]
......
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @ f05e75bb
......@@ -1366,7 +1366,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
titleArr = ["打印","取消订单并退款","发货"]
if self.dataMdoel!.order_res?.pay_status != 2{
titleArr = ["打印","确认收款","取消订单","发货"]
titleArr = ["打印","付款码","确认收款","取消订单","发货"]
}
}else{
titleArr = ["打印","退款","发货"]
......@@ -1386,7 +1386,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
titleArr = ["打印","退款","退款退货","确认收货"]
if self.dataMdoel?.order_res?.pay_status != 2{//未收款
titleArr = ["打印","取消订单","确认收款","确认收货"]
titleArr = ["打印","付款码","取消订单","确认收款","确认收货"]
}
}else{
titleArr = ["打印","退款"]
......
GeliBusinessPlatform/ViewController/采购单详情/CGDListCell.swift
View file @ f05e75bb
......@@ -144,6 +144,9 @@ class CGDListCell: UITableViewCell {
make.width.equalTo(110*glscale)
}else{
make.width.equalTo(80*glscale)
if arr.count > 3 {
make.width.equalTo(70*glscale)
}
}
make.height.equalTo(30)
make.right.equalTo(0)
......@@ -158,6 +161,9 @@ class CGDListCell: UITableViewCell {
make.width.equalTo(110*glscale)
}else{
make.width.equalTo(80*glscale)
if arr.count > 3 {
make.width.equalTo(70*glscale)
}
}
make.height.equalTo(30)
make.right.equalTo(tempBtn!.snp_left).offset(-15)
......
GeliBusinessPlatform/ViewController/采购单详情/CGDListCell.xib
View file @ f05e75bb
<?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"/>
......
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