Skip to content

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

新增库位

parent 4ac1a51d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 110 additions and 15 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 52634ad5
......@@ -42,6 +42,8 @@
E09B03C82445BF9300211A51 /* SwiftNotice.swift in Sources */ = {isa = PBXBuildFile; fileRef = E09B03C72445BF9300211A51 /* SwiftNotice.swift */; };
E0A7548A244A8F0F00A84B67 /* CheckWareHourseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0A75488244A8F0F00A84B67 /* CheckWareHourseViewController.swift */; };
E0A7548B244A8F0F00A84B67 /* CheckWareHourseViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0A75489244A8F0F00A84B67 /* CheckWareHourseViewController.xib */; };
E0B6036E244D376900A56B38 /* KuWeiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B6036C244D376900A56B38 /* KuWeiCell.swift */; };
E0B6036F244D376900A56B38 /* KuWeiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0B6036D244D376900A56B38 /* KuWeiCell.xib */; };
E0D197BA2448431C002B080C /* BabyDefine.m in Sources */ = {isa = PBXBuildFile; fileRef = E0D197A92448431B002B080C /* BabyDefine.m */; };
E0D197BB2448431C002B080C /* BabyCallback.m in Sources */ = {isa = PBXBuildFile; fileRef = E0D197AB2448431B002B080C /* BabyCallback.m */; };
E0D197BC2448431C002B080C /* BabyPeripheralManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E0D197AD2448431B002B080C /* BabyPeripheralManager.m */; };
......@@ -147,6 +149,8 @@
E09B03C72445BF9300211A51 /* SwiftNotice.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftNotice.swift; 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>"; };
E0B6036C244D376900A56B38 /* KuWeiCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KuWeiCell.swift; sourceTree = "<group>"; };
E0B6036D244D376900A56B38 /* KuWeiCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KuWeiCell.xib; sourceTree = "<group>"; };
E0D197A82448431B002B080C /* BabyCentralManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BabyCentralManager.h; sourceTree = "<group>"; };
E0D197A92448431B002B080C /* BabyDefine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BabyDefine.m; sourceTree = "<group>"; };
E0D197AA2448431B002B080C /* BabyOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BabyOptions.h; sourceTree = "<group>"; };
......@@ -473,6 +477,8 @@
E0A75489244A8F0F00A84B67 /* CheckWareHourseViewController.xib */,
E08B0672244A98B2001D2E01 /* WareHouseSpCell.swift */,
E08B0673244A98B2001D2E01 /* WareHouseSpCell.xib */,
E0B6036C244D376900A56B38 /* KuWeiCell.swift */,
E0B6036D244D376900A56B38 /* KuWeiCell.xib */,
);
path = "新增、编辑（查看）仓库";
sourceTree = "<group>";
......@@ -734,6 +740,7 @@
E09B03B72445B85A00211A51 /* LoginViewController.xib in Resources */,
E09B03C12445B96500211A51 /* FgPassViewController.xib in Resources */,
E0D197C7244845FD002B080C /* PersonCenterViewController.xib in Resources */,
E0B6036F244D376900A56B38 /* KuWeiCell.xib in Resources */,
E01C26B72446AF3100ADCC70 /* DemoViewController.xib in Resources */,
F9023F6E2449A9B100DD5A63 /* TitleAndTFCell.xib in Resources */,
F9023F6A2449A50900DD5A63 /* TitleContentCell.xib in Resources */,
......@@ -823,6 +830,7 @@
buildActionMask = 2147483647;
files = (
F9023F6D2449A9B100DD5A63 /* TitleAndTFCell.swift in Sources */,
E0B6036E244D376900A56B38 /* KuWeiCell.swift in Sources */,
E0D197BA2448431C002B080C /* BabyDefine.m in Sources */,
F9023F712449ACA800DD5A63 /* TitleAndSwitchCell.swift in Sources */,
E0DDCB13244ADF2C00DF54C7 /* ChangePriceNormalCell.swift in Sources */,
......
GeliBusinessPlatform/Assets.xcassets/仓库/bianji.imageset/Contents.json 0 → 100644
View file @ 52634ad5
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "bianji@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "bianji@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
GeliBusinessPlatform/Assets.xcassets/仓库/shanchu.imageset/Contents.json 0 → 100644
View file @ 52634ad5
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "shanchu@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "shanchu@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
GeliBusinessPlatform/BaseView/NavViewController.swift
View file @ 52634ad5
......@@ -16,9 +16,9 @@ class NavViewController: UINavigationController {
UIBarButtonItem.appearance().setBackButtonTitlePositionAdjustment(UIOffset(horizontal: -2000, vertical: 0), for: UIBarMetrics.default)//去掉返回图片后面的文字
}
override var preferredStatusBarStyle: UIStatusBarStyle{
return UIStatusBarStyle.lightContent
}
// override var preferredStatusBarStyle: UIStatusBarStyle{
// return UIStatusBarStyle.lightContent
// }
// override func viewDidLayoutSubviews() {
// super.viewDidLayoutSubviews()
//
......
GeliBusinessPlatform/ViewController/仓库管理/WarehoseMangementCell.swift
View file @ 52634ad5
......@@ -12,6 +12,8 @@ class WarehoseMangementCell: UITableViewCell {
override func awakeFromNib() {
super.awakeFromNib()
self.selectionStyle = .none
// Initialization code
}
......
GeliBusinessPlatform/ViewController/新增、编辑（查看）仓库/KuWeiCell.swift 0 → 100644
View file @ 52634ad5
//
// KuWeiCell.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/4/20.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
@objc protocol KuWeiCellCellDelegate {
@objc optional func editClickAction(sender:Int)
@objc optional func deleClickAction(sender:Int)
}
class KuWeiCell: UITableViewCell {
var delegate:KuWeiCellCellDelegate?
@IBOutlet weak var nameLbl: UILabel!
@IBOutlet weak var countLbl: UILabel!
@IBAction func editClick(_ sender: Int) {
delegate?.editClickAction?(sender: Int(self.tag))
}
@IBAction func deleClick(_ sender: Int) {
delegate?.deleClickAction?(sender: Int(self.tag))
}
override func awakeFromNib() {
super.awakeFromNib()
self.selectionStyle = .none
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}
GeliBusinessPlatform/ViewController/新增、编辑（查看）仓库/WareHouseSpCell.xib
View file @ 52634ad5
......@@ -18,9 +18,9 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="仓库类型：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Nns-NP-fAD">
<rect key="frame" x="15" y="0.0" width="67" height="44"/>
<rect key="frame" x="15" y="0.0" width="80" height="44"/>
<constraints>
<constraint firstAttribute="width" constant="67" id="bdp-Qd-CdZ"/>
<constraint firstAttribute="width" constant="80" id="bdp-Qd-CdZ"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
......@@ -41,7 +41,7 @@
</constraints>
</view>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入库位名" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="zsG-fB-Zeb">
<rect key="frame" x="82" y="0.0" width="193" height="43"/>
<rect key="frame" x="95" y="0.0" width="180" height="43"/>
<color key="textColor" name="标题字颜色"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<textInputTraits key="textInputTraits"/>
......
GeliBusinessPlatform/ViewController/消息中心/MsgCenterCell.xib
View file @ 52634ad5
......@@ -100,16 +100,16 @@
</objects>
<resources>
<namedColor name="app底色">
<color red="0.94900000095367432" green="0.94900000095367432" blue="0.94900000095367432" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" 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"/>
<color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" 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>
<namedColor name="灰色字体颜色">
<color red="0.60000002384185791" green="0.60000002384185791" blue="0.60000002384185791" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/登录/LoginViewController.swift
View file @ 52634ad5
......@@ -81,7 +81,7 @@ class LoginViewController: BaseViewController {
@IBAction func loginAction(_ sender: Any) {
print("loginAction")
let vc = XiuGaiYuShouJiaViewController()
let vc = CheckWareHourseViewController()
self.navigationController?.pushViewController(vc, animated: true)
// let alertView = GeliAlertView(frame: self.view.window!.bounds)
// alertView.tishiLbl.text = "202121";
......
GeliBusinessPlatform/ViewController/订单管理/关联客户cell/GuanLianKeHuCell.xib
View file @ 52634ad5
......@@ -163,7 +163,7 @@
<image name="guanlian" width="15.5" height="12.5"/>
<image name="yuxuan" width="19" height="19"/>
<namedColor name="企业、预售字体">
<color red="1" green="0.69019607843137254" blue="0.47058823529411764" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="1" green="0.68999999761581421" blue="0.47099998593330383" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="按钮渐变色下,字体颜色">
<color red="0.27450980392156865" green="0.5607843137254902" blue="0.88627450980392153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......
GeliBusinessPlatform/ViewController/账号信息/AccountViewController.xib
View file @ 52634ad5
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<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"/>
......@@ -293,10 +293,10 @@
<color red="0.27450980392156865" green="0.5607843137254902" blue="0.88627450980392153" 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"/>
<color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色分界线">
<color red="0.92900002002716064" green="0.92900002002716064" blue="0.92900002002716064" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="白色背景色">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......
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