Skip to content

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

待完善

parent cf4d49d2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 157 additions and 35 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ cb4f379d
......@@ -77,6 +77,8 @@
E02FD9FB24557E8600E10E27 /* XinZengDiZhiViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E02FD9F924557E8600E10E27 /* XinZengDiZhiViewController.xib */; };
E030DF362485DD3E002764D3 /* NewRKCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E030DF342485DD3E002764D3 /* NewRKCell.swift */; };
E030DF372485DD3E002764D3 /* NewRKCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E030DF352485DD3E002764D3 /* NewRKCell.xib */; };
E030DF3B248651A5002764D3 /* NewRKVc.swift in Sources */ = {isa = PBXBuildFile; fileRef = E030DF39248651A5002764D3 /* NewRKVc.swift */; };
E030DF3C248651A5002764D3 /* NewRKVc.xib in Resources */ = {isa = PBXBuildFile; fileRef = E030DF3A248651A5002764D3 /* NewRKVc.xib */; };
E0336DD5244EC40000380BE9 /* CreatNewSpecsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0336DD3244EC40000380BE9 /* CreatNewSpecsViewController.swift */; };
E0336DD6244EC40000380BE9 /* CreatNewSpecsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0336DD4244EC40000380BE9 /* CreatNewSpecsViewController.xib */; };
E0337EED2464EED000952EF4 /* PinPaiListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0337EEB2464EED000952EF4 /* PinPaiListViewController.swift */; };
......@@ -580,6 +582,8 @@
E02FD9F924557E8600E10E27 /* XinZengDiZhiViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = XinZengDiZhiViewController.xib; sourceTree = "<group>"; };
E030DF342485DD3E002764D3 /* NewRKCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewRKCell.swift; sourceTree = "<group>"; };
E030DF352485DD3E002764D3 /* NewRKCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NewRKCell.xib; sourceTree = "<group>"; };
E030DF39248651A5002764D3 /* NewRKVc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewRKVc.swift; sourceTree = "<group>"; };
E030DF3A248651A5002764D3 /* NewRKVc.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NewRKVc.xib; sourceTree = "<group>"; };
E0336DD3244EC40000380BE9 /* CreatNewSpecsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreatNewSpecsViewController.swift; sourceTree = "<group>"; };
E0336DD4244EC40000380BE9 /* CreatNewSpecsViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CreatNewSpecsViewController.xib; sourceTree = "<group>"; };
E0337EEB2464EED000952EF4 /* PinPaiListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PinPaiListViewController.swift; sourceTree = "<group>"; };
......@@ -1318,6 +1322,15 @@
path = "地址管理";
sourceTree = "<group>";
};
E030DF382486517E002764D3 /* 1.1入库&出库 */ = {
isa = PBXGroup;
children = (
E030DF39248651A5002764D3 /* NewRKVc.swift */,
E030DF3A248651A5002764D3 /* NewRKVc.xib */,
);
path = "1.1入库&出库";
sourceTree = "<group>";
};
E0336DD2244EC3CA00380BE9 /* 新增规格 */ = {
isa = PBXGroup;
children = (
......@@ -1574,6 +1587,7 @@
E07B1E75245966C90055BA3C /* 新增采购单 */,
E07B1E64245925F30055BA3C /* 供应商管理 */,
E03549AA24582806008BD021 /* 客户管理 */,
E030DF382486517E002764D3 /* 1.1入库&出库 */,
E06524EA2458006600CA22E2 /* 入库 */,
E02C88232456B23400925766 /* 物流跟踪 */,
E02FD9EE2455704600E10E27 /* 出入库记录 */,
......@@ -2641,6 +2655,7 @@
E01C26B12446989700ADCC70 /* Interface_Z.plist in Resources */,
E0A409CD2464026B00CFF109 /* SecondCell.xib in Resources */,
F95A9EEA24558B8800867849 /* ShowAlGoodsViewController.xib in Resources */,
E030DF3C248651A5002764D3 /* NewRKVc.xib in Resources */,
F969BF08244EC38000C79953 /* GoodsCollectionViewCell.xib in Resources */,
E0D4166524483058008DCAB4 /* ChangePassViewController.xib in Resources */,
F95A9ED9245520E500867849 /* OrderListVC.xib in Resources */,
......@@ -2773,6 +2788,7 @@
F956D59C246A2D9C003FF510 /* UIFont+LMNote.m in Sources */,
F961D264244FD744007FBE70 /* SearchBarView.swift in Sources */,
F950FDE124518B9500C40530 /* FSCalendarConstants.m in Sources */,
E030DF3B248651A5002764D3 /* NewRKVc.swift in Sources */,
F9023F712449ACA800DD5A63 /* TitleAndSwitchCell.swift in Sources */,
E0C4F4BD244EF53D00CC7E2F /* BindStepTwoViewController.swift in Sources */,
E0A409CC2464026B00CFF109 /* SecondCell.swift in Sources */,
......
GeliBusinessPlatform/AppDelegate.swift
View file @ cb4f379d
......@@ -226,6 +226,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate, UITabBarCon
// Saves changes in the application's managed object context before the application terminates.
}
//MARK:--tabbarVCs
weak var tabBarC:ESTabBarController!
func addTabBarVcs (isAgain:Bool) {
......@@ -240,7 +241,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate, UITabBarCon
tabBarC = tabBarController
let v1 = OrderListViewController()
let v2 = GoodsManageListVC()
let v2 = CRKListVC()
let v3 = WorkCViewController()
let v4 = WarehoseMangementListVC()
let v5 = PersonCenterViewController()
......@@ -255,7 +256,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate, UITabBarCon
tabBarController.viewControllers = [v1, v2, v3, v4, v5]
tabBarController.selectedIndex = 2
tabBarController.selectedIndex = 1
......@@ -275,6 +276,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate, UITabBarCon
window.rootViewController = rootV;
self.window = window
window.makeKeyAndVisible()
}
NotificationCenter.default.addObserver(self, selector: #selector(changgeTabItem(notion:)), name: NSNotification.Name(rawValue: "changgeTabItem"), object: nil)
......
GeliBusinessPlatform/View/AlertView/GLAlertSelectView.swift
View file @ cb4f379d
......@@ -27,7 +27,7 @@ import IQKeyboardManagerSwift
class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleAndSelectCellDelegate,KuWeiCellCellDelegate,UITextFieldDelegate{
var deSelectArr:Array<Int> = []
var isOnlySelectKuWei = false
var isMultipleS:Bool = false
var contentView:UIView!
var delegate:GLAlertSelectViewDelegate?
......@@ -105,7 +105,7 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
make.left.top.right.bottom.equalToSuperview()
}
titleLbl.text = title
if title.contains("库位") {
if title.contains("库位") && isOnlySelectKuWei == false{
self.setKuWeiView()
}else{
self.setSelectView()
......@@ -158,21 +158,21 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
return 49
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
if (titleLbl.text?.contains("库位"))!{
if (titleLbl.text?.contains("库位"))! && isOnlySelectKuWei == false{
return kuWeiArr.count
}
return dataArr.count
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if (titleLbl.text?.contains("库位"))! {
if (titleLbl.text?.contains("库位"))! && isOnlySelectKuWei == false{
selectNum = indexPath.row
selectTbv.reloadData()
}
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if (titleLbl.text?.contains("库位"))! {
if (titleLbl.text?.contains("库位"))! && isOnlySelectKuWei == false {
let cell = tableView.dequeueReusableCell(withIdentifier: "KuWei") as! KuWeiCell
cell.delegate = self
......@@ -215,7 +215,7 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
}
@IBAction func submitClick(_ sender: Any) {
if (titleLbl.text?.contains("库位"))! {
if (titleLbl.text?.contains("库位"))! && isOnlySelectKuWei == false{
delegate?.KuWeiDataArr?(sender: kuWeiArr)
return
}
......@@ -304,7 +304,7 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
func deleClickAction(sender: Int) {
print("sender == ",sender)
if (titleLbl.text?.contains("库位"))!{
if (titleLbl.text?.contains("库位"))! && isOnlySelectKuWei == false{
kuWeiArr.remove(at: sender)
delegate?.GLAlertSelectDelAction?(sender: kuWeiArr)
}else{
......
GeliBusinessPlatform/View/AlertView/GeliAlertTextView.xib
View file @ cb4f379d
<?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="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina5_5" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<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"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="GeliAlertTextView" customModule="GeliBusinessPlatform" customModuleProvider="target">
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="GeliAlertTextView" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="placerLbl" destination="9Qr-Ot-aRg" id="JP0-4t-4py"/>
<outlet property="textview" destination="wXk-Gr-x6B" id="Tv2-Vn-k9E"/>
......@@ -188,7 +189,7 @@
<color red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="蓝色字体颜色">
<color red="0.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/1.1入库&出库/NewRKVc.swift 0 → 100644
View file @ cb4f379d
//
// NewRKVc.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/6/2.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class NewRKVc: BaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
navbar.title = "入库"
self.view.addSubview(navbar)
// Do any additional setup after loading the view.
}
/*
// MARK: - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// Get the new view controller using segue.destination.
// Pass the selected object to the new view controller.
}
*/
}
GeliBusinessPlatform/ViewController/1.1入库&出库/NewRKVc.xib 0 → 100644
View file @ cb4f379d
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13142" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12042"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="NewRKVc" customModuleProvider="target">
<connections>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
</view>
</objects>
</document>
GeliBusinessPlatform/ViewController/仓库管理/WarehoseMangementListVC.swift
View file @ cb4f379d
......@@ -9,17 +9,22 @@
import UIKit
import ViewAnimator
import SwipeCellKit
protocol WarehoseMangementListVCDelegate {
func WarehoseMangementListVCSelectFinish(sender:ShopWarehouseListDataModel,kuWeiArr:Array<ShopWarehouseDetailDataPositionModel>)
}
class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableViewDelegate, UITableViewDataSource, SearchBarViewDelegate,SwipeTableViewCellDelegate,CheckWareHourseViewControllerDelegate{
func CheckWareHourseViewControllerRefresh() {
tableV.mj_header?.beginRefreshing()
}
var delegate:WarehoseMangementListVCDelegate?
@IBOutlet weak var topBgView: UIView!
weak var searchV: SearchBarView? = nil
@IBOutlet weak var contentView: UIView!
@IBOutlet weak var searchView: UIView!
var page : Int = 0
var isUpData = false
var keyWord = ""
var isSelectWarehouse = false
override func viewDidLoad() {
super.viewDidLoad()
self.view.backgroundColor = UIColor.white
......@@ -28,10 +33,18 @@ class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableV
searchV = searchBr
self.searchView.addSubview(searchBr)
searchBr.snp.makeConstraints { (make) in
make.left.right.equalTo(0)
make.left.equalTo(0)
make.right.equalTo(0)
make.centerY.equalToSuperview()
make.height.equalTo(35)
}
if isSelectWarehouse{
navbar.title = "仓库选择"
self.view.addSubview(navbar)
SetTopFrame(view: topBgView, height: 45)
}
searchBr.delegateL = self
searchBr.placeholderStr = "请输入仓库名称"
searchBr.cornerRadius = 35/2.0
......@@ -212,15 +225,32 @@ class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableV
return cell
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
print(indexPath)
let vc = CheckWareHourseViewController()
vc.titleStr = "编辑仓库"
let model = warehourseArr[indexPath.row]
vc.w_id = model.w_id
vc.editIdx = indexPath.row
vc.delegate = self
self.navigationController?.pushViewController(vc, animated: true)
if isSelectWarehouse {
let model = warehourseArr[indexPath.row]
let UserToken = UserDefaults.standard.value(forKey: "user_token")
WarehouseDetail(["user_token":UserToken as Any,"w_id":model.w_id as Any], success: { (data) in
var arr:Array<ShopWarehouseDetailDataPositionModel> = []
let mo = data as! ShopWarehouseDetailModel
mo.data?.position_res?.forEach({ (item) in
arr.append(item)
})
self.delegate?.WarehoseMangementListVCSelectFinish(sender: model, kuWeiArr: arr)
self.navigationController?.popViewController(animated: true)
}) { (error) in
}
}else{
let vc = CheckWareHourseViewController()
vc.titleStr = "编辑仓库"
let model = warehourseArr[indexPath.row]
vc.w_id = model.w_id
vc.editIdx = indexPath.row
vc.delegate = self
self.navigationController?.pushViewController(vc, animated: true)
}
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
......
GeliBusinessPlatform/ViewController/入库/PiCiXuanZeViewController.swift
View file @ cb4f379d
......@@ -8,7 +8,7 @@
import UIKit
protocol PiCiXuanZeViewControllerDelegate {
func PiCiXuanZeViewControllerPiCiSelect(data:Array<GetGoodBatchDataModel>)
func PiCiXuanZeViewControllerPiCiSelect(data:Array<GetGoodBatchDataModel>,p_id:Int)
}
class PiCiXuanZeViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,PiCiXuanZeCellDelegate{
......@@ -16,7 +16,7 @@ class PiCiXuanZeViewController: BaseViewController,UITableViewDelegate,UITableVi
var p_id:Int?
var sku_id:Int?
var tag:Int?
var totalCount = 0
var selectArr:Array<Int> = []
var recordArr:Array<GetGoodBatchDataModel> = []
......@@ -25,8 +25,13 @@ class PiCiXuanZeViewController: BaseViewController,UITableViewDelegate,UITableVi
@IBOutlet weak var btmLbl: UILabel!
var delegate:PiCiXuanZeViewControllerDelegate?
@IBAction func submitAction(_ sender: Any) {
delegate?.PiCiXuanZeViewControllerPiCiSelect(data: recordArr)
for item in recordArr {
if item.chuHuoLiang == nil {
HUD.flash(.label("请输入数量"), delay: 1.2)
return
}
}
delegate?.PiCiXuanZeViewControllerPiCiSelect(data: recordArr,p_id: tag!)
self.navigationController?.popViewController(animated: true)
}
@IBOutlet weak var listView: UITableView!
......@@ -54,6 +59,14 @@ class PiCiXuanZeViewController: BaseViewController,UITableViewDelegate,UITableVi
}) { (error) in
}
totalCount = 0
if recordArr.count > 0 {
for item in recordArr{
totalCount += item.chuHuoLiang!
}
}
}
......@@ -71,6 +84,7 @@ class PiCiXuanZeViewController: BaseViewController,UITableViewDelegate,UITableVi
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if indexPath.section == 1 {
let cell = tableView.dequeueReusableCell(withIdentifier: "CRKSumCell") as! CRKSumCell
cell.countLbl.text = "\(totalCount)"
return cell
}
......@@ -127,7 +141,9 @@ class PiCiXuanZeViewController: BaseViewController,UITableViewDelegate,UITableVi
if selectArr.contains(cell.tag) {
let idx = selectArr.index(of: cell.tag)
selectArr.remove(at: idx!)
recordArr.remove(at: idx!)
if recordArr[idx!] != nil {
recordArr.remove(at: idx!)
}
}else{
selectArr.append(cell.tag)
recordArr.append(dataArray[cell.tag])
......
GeliBusinessPlatform/ViewController/入库/RuKuViewController.xib
View file @ cb4f379d
<?xml version="1.0" encoding="UTF-8"?>
<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">
<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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<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"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="RuKuViewController" customModule="GeliBusinessPlatform" customModuleProvider="target">
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="RuKuViewController" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="btmView" destination="fQY-7f-kO1" id="HbX-Sx-tdn"/>
<outlet property="listVIew" destination="lkk-Dx-Gzp" id="Wgw-dT-DDW"/>
......@@ -125,7 +126,7 @@
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="蓝色字体颜色">
<color red="0.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/出入库记录/CRKBtnCell.xib
View file @ cb4f379d
......@@ -2,6 +2,7 @@
<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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
......@@ -34,14 +35,14 @@
<constraint firstAttribute="height" constant="1" id="Nfs-G0-ITG"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="标题" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rZC-N1-umj">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="标题" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rZC-N1-umj">
<rect key="frame" x="26" y="0.0" width="27" height="64"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="内容" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rkw-Cn-WEC">
<rect key="frame" x="275" y="0.0" width="27" height="64"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="内容" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rkw-Cn-WEC">
<rect key="frame" x="63" y="0.0" width="239" height="64"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/>
......@@ -60,6 +61,7 @@
<constraint firstItem="rkw-Cn-WEC" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="GO6-2i-dbD"/>
<constraint firstAttribute="bottom" secondItem="SIv-LZ-Qvo" secondAttribute="bottom" id="JRt-yC-B1M"/>
<constraint firstAttribute="trailing" secondItem="SIv-LZ-Qvo" secondAttribute="trailing" id="SfM-z2-ukI"/>
<constraint firstItem="rkw-Cn-WEC" firstAttribute="leading" secondItem="rZC-N1-umj" secondAttribute="trailing" constant="10" id="UZv-pz-g3K"/>
<constraint firstItem="WFz-VU-QFC" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="bh9-uJ-vUl"/>
<constraint firstItem="WFz-VU-QFC" firstAttribute="leading" secondItem="rkw-Cn-WEC" secondAttribute="trailing" constant="10" id="d6D-Rr-GGf"/>
<constraint firstItem="rZC-N1-umj" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="e7e-it-4oh"/>
......
GeliBusinessPlatform/ViewController/出入库记录/CRKListVC.swift
View file @ cb4f379d
......@@ -12,7 +12,7 @@ import ViewAnimator //cell动效
class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CRKCellDelegate,UISearchBarDelegate, SearchBarViewDelegate {
var page = 0
var isGm = false
var isGm = true
private let animations = [AnimationType.from(direction: .bottom, offset: 300*glscale)]
@IBOutlet weak var topBtn: UIButton!
......@@ -139,6 +139,7 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
let vc = CRKXiangQVC()
vc.isGm = isGm
vc.model = model
vc.status = model.status
self.navigationController?.pushViewController(vc, animated: true)
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
......
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