Skip to content

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

修复详情图片显示bug

parent ed648c5e
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 20 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ b14017e4
......@@ -88,6 +88,8 @@
E0516F7F244806C500E373CE /* MsgCenterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0516F7E244806C500E373CE /* MsgCenterViewController.swift */; };
E0516F822448086700E373CE /* MsgCenterCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0516F802448086700E373CE /* MsgCenterCell.swift */; };
E0516F832448086700E373CE /* MsgCenterCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0516F812448086700E373CE /* MsgCenterCell.xib */; };
E0647AC12468E30B008C5A34 /* EditProductViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0647ABF2468E30B008C5A34 /* EditProductViewController.swift */; };
E0647AC22468E30B008C5A34 /* EditProductViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0647AC02468E30B008C5A34 /* EditProductViewController.xib */; };
E06524ED2458008900CA22E2 /* RuKuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E06524EB2458008900CA22E2 /* RuKuViewController.swift */; };
E06524EE2458008900CA22E2 /* RuKuViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E06524EC2458008900CA22E2 /* RuKuViewController.xib */; };
E06524F124580AAC00CA22E2 /* RuKuJiaGeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E06524EF24580AAC00CA22E2 /* RuKuJiaGeCell.swift */; };
......@@ -480,6 +482,8 @@
E0516F7E244806C500E373CE /* MsgCenterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MsgCenterViewController.swift; sourceTree = "<group>"; };
E0516F802448086700E373CE /* MsgCenterCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MsgCenterCell.swift; sourceTree = "<group>"; };
E0516F812448086700E373CE /* MsgCenterCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MsgCenterCell.xib; sourceTree = "<group>"; };
E0647ABF2468E30B008C5A34 /* EditProductViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditProductViewController.swift; sourceTree = "<group>"; };
E0647AC02468E30B008C5A34 /* EditProductViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = EditProductViewController.xib; sourceTree = "<group>"; };
E06524EB2458008900CA22E2 /* RuKuViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RuKuViewController.swift; sourceTree = "<group>"; };
E06524EC2458008900CA22E2 /* RuKuViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RuKuViewController.xib; sourceTree = "<group>"; };
E06524EF24580AAC00CA22E2 /* RuKuJiaGeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RuKuJiaGeCell.swift; sourceTree = "<group>"; };
......@@ -1540,6 +1544,8 @@
children = (
E0F97B062451620B001BD600 /* ProductDetailViewController.swift */,
E0F97B072451620B001BD600 /* ProductDetailViewController.xib */,
E0647ABF2468E30B008C5A34 /* EditProductViewController.swift */,
E0647AC02468E30B008C5A34 /* EditProductViewController.xib */,
);
path = "商品详情";
sourceTree = "<group>";
......@@ -2052,6 +2058,7 @@
E0273DDA24551B6D00B3FCAE /* SendTimeSelectView.xib in Resources */,
E0A409C42463F31600CFF109 /* ShouZhiTongJiViewController.xib in Resources */,
E01C26B72446AF3100ADCC70 /* DemoViewController.xib in Resources */,
E0647AC22468E30B008C5A34 /* EditProductViewController.xib in Resources */,
F9DDBE972457D3EC00A32CB2 /* WebViewController.xib in Resources */,
E0F97B0424512299001BD600 /* GLAlertSelectView.xib in Resources */,
F9023F6E2449A9B100DD5A63 /* TitleAndTFCell.xib in Resources */,
......@@ -2425,6 +2432,7 @@
F933F6CC2452C68B00189561 /* WindowRootViewController.swift in Sources */,
F9531F442465108800724BEE /* JXPhotoBrowserFadeAnimator.swift in Sources */,
E088CC8D24470BF0000DAA8A /* CodeView.swift in Sources */,
E0647AC12468E30B008C5A34 /* EditProductViewController.swift in Sources */,
E01EA1A4245A60E000F019D5 /* XiaDanChengGongViewController.swift in Sources */,
F94A314D2462582F00FEC38E /* GeneralInfoModel.swift in Sources */,
E02DDD8D244FE43900ABB707 /* NewCreateFooter.swift in Sources */,
......
GeliBusinessPlatform/ViewController/供应商管理/GYSListViewController.swift
View file @ b14017e4
......@@ -9,30 +9,34 @@
import UIKit
class GYSListViewController: BaseViewController,UITableViewDataSource,UITableViewDelegate,UISearchBarDelegate,SearchBarViewDelegate{
var searchV : SearchBarView? = nil
@IBOutlet weak var topView: UIView!
@IBOutlet weak var btmLbl: UILabel!
@IBOutlet weak var listView: UITableView!
var barTitle:String?
override func viewDidLoad() {
super.viewDidLoad()
navbar.title = "供应商管理"
navbar.title = barTitle
if barTitle != "供应商管理" {
btmLbl.text = "确定"
}
self.view.addSubview(navbar)
let searchBr = SearchBarView.init()
topView.addSubview(searchBr)
searchBr.snp.makeConstraints { (make) in
make.left.equalTo(10)
make.right.equalTo(-10)
make.centerY.equalToSuperview()
make.height.equalTo(30)
}
searchV = searchBr
searchBr.placeholderStr = "供应商名称/联系人/电话号码"
searchBr.cornerRadius = 30*0.5
searchBr.delegate = self
searchBr.delegateL = self
let searchBr = SearchBarView.init()
topView.addSubview(searchBr)
searchBr.snp.makeConstraints { (make) in
make.left.equalTo(10)
make.right.equalTo(-10)
make.centerY.equalToSuperview()
make.height.equalTo(30)
}
searchV = searchBr
searchBr.placeholderStr = "供应商名称/联系人/电话号码"
searchBr.cornerRadius = 30*0.5
searchBr.delegate = self
searchBr.delegateL = self
SetTopFrame(view: topView, height: 44)
listView.separatorStyle = .none
......@@ -41,8 +45,12 @@ class GYSListViewController: BaseViewController,UITableViewDataSource,UITableVie
}
@IBAction func addAction(_ sender: Any) {
let vc = GYSGLViewController()
self.navigationController?.pushViewController(vc, animated: true)
if barTitle != "供应商管理" {
let vc = GYSGLViewController()
self.navigationController?.pushViewController(vc, animated: true)
}else{
}
}
//MARK: - 自定义DELEGATE
func clearSearchAction() {
......@@ -62,6 +70,11 @@ class GYSListViewController: BaseViewController,UITableViewDataSource,UITableVie
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "GYSGLCell") as! GYSGLCell
if barTitle != "供应商管理" {
cell.selectTypeView.isHidden = false
}else{
cell.selectTypeView.isHidden = true
}
return cell
}
}
GeliBusinessPlatform/ViewController/入库/BaoZhiQiCell.xib
View file @ b14017e4
......@@ -148,7 +148,7 @@
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色字体颜色">
<color red="0.40000000596046448" green="0.40000000596046448" blue="0.40000000596046448" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="白色背景色">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......
GeliBusinessPlatform/ViewController/入库/RuKuViewController.swift
View file @ b14017e4
......@@ -8,7 +8,7 @@
import UIKit
class RuKuViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource{
class RuKuViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,AddGuiGeCellDelegate{
let p1Arr1 = ["仓库：","库位：","入库类型：","入库时间："]
......@@ -147,6 +147,7 @@ class RuKuViewController: BaseViewController,UITableViewDelegate,UITableViewData
case 1:
let cell = tableView.dequeueReusableCell(withIdentifier: "AddGuiGeCell") as! AddGuiGeCell
cell.imgBtn.setImage(UIImage(named: "tianjiashangpin"), for: .normal)
cell.delegate = self
return cell
default:
if barTitle == "入库" {
......@@ -207,6 +208,9 @@ class RuKuViewController: BaseViewController,UITableViewDelegate,UITableViewData
}
}
}
//MARK: - 自定义delegate
func AddGuiGeCellClick(cell: AddGuiGeCell) {
print("添加商品")
}
}
GeliBusinessPlatform/ViewController/商品详情/EditProductViewController.swift 0 → 100644
View file @ b14017e4
//
// EditProductViewController.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/5/11.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class EditProductViewController: BaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
// 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/商品详情/EditProductViewController.xib 0 → 100644
View file @ b14017e4
<?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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<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"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="EditProductViewController" customModule="GeliBusinessPlatform" 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="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X0s-yO-37R">
<rect key="frame" x="0.0" y="813" width="414" height="49"/>
<constraints>
<constraint firstAttribute="height" constant="49" id="YYe-mM-oaY"/>
</constraints>
<attributedString key="attributedText">
<fragment content="Label">
<attributes>
<color key="NSColor" name="白色背景色"/>
<font key="NSFont" metaFont="system" size="17"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
</attributedString>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="X0s-yO-37R" secondAttribute="bottom" id="LDc-AA-slZ"/>
<constraint firstItem="X0s-yO-37R" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="dc1-QT-r3z"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="X0s-yO-37R" secondAttribute="trailing" id="nUn-zW-kaH"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<point key="canvasLocation" x="131.8840579710145" y="131.91964285714286"/>
</view>
</objects>
<resources>
<namedColor name="白色背景色">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/商品详情/ProductDetailViewController.swift
View file @ b14017e4
......@@ -117,6 +117,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
case 2:
let cell = tableView.dequeueReusableCell(withIdentifier: "AddGuiGe") as! AddGuiGeCell
cell.imgBtn.addTarget(self, action: #selector(addGuiGe), for: .touchUpInside)
cell.imgBtn.setImage(UIImage(named: "xinzeng"), for: .normal)
return cell
case 3:
if indexPath.row == 0 {
......
GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift
View file @ b14017e4
......@@ -140,6 +140,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
break
case "供应商管理":
let vc = GYSListViewController()
vc.barTitle = "供应商管理"
self.navigationController?.pushViewController(vc, animated: true)
break
case "收支统计":
......@@ -150,6 +151,11 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
let vc = KeHuListViewController()
self.navigationController?.pushViewController(vc, animated: true)
break
case "入库":
let vc = RuKuViewController()
vc.barTitle = "入库"
self.navigationController?.pushViewController(vc, animated: true)
break
default:
break
}
......
GeliBusinessPlatform/ViewController/新增采购单/XinCaiGouViewController.swift
View file @ b14017e4
......@@ -188,6 +188,7 @@ class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableVie
if indexPath.section == 0 {
if indexPath.row == 2{//跳转供应商选择
let vc = GYSListViewController()
vc.barTitle = "请选择供应商"
self.navigationController?.pushViewController(vc, animated: true)
}
if indexPath.row == 5 {
......
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