Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
GeliBusinessPlatform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ljy
GeliBusinessPlatform
Commits
07848f25
Commit
07848f25
authored
Jun 24, 2020
by
lujunye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
禅道bug修复
parent
6f3b472c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
7 deletions
+16
-7
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
...erdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/View/AlertView/GLAlertSelectView.swift
GeliBusinessPlatform/View/AlertView/GLAlertSelectView.swift
+6
-0
GeliBusinessPlatform/ViewController/客户管理/XinZengAndBianJiKeHuViewController.swift
...wController/客户管理/XinZengAndBianJiKeHuViewController.swift
+4
-7
GeliBusinessPlatform/ViewController/采购单详情/CGDXQVc.swift
GeliBusinessPlatform/ViewController/采购单详情/CGDXQVc.swift
+6
-0
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
View file @
07848f25
No preview for this file type
GeliBusinessPlatform/View/AlertView/GLAlertSelectView.swift
View file @
07848f25
...
...
@@ -11,6 +11,7 @@ import IQKeyboardManagerSwift
@objc
protocol
GLAlertSelectViewDelegate
{
@objc
optional
func
GLAlertSelectViewFinish
(
sender
:
UIButton
,
title
:
String
,
cellTag
:
Int
)
@objc
optional
func
GLAlertSelectDone
()
//普通状态(单多选)
@objc
optional
func
GLAlertSelectViewClick
(
selectNum
:
Int
,
view
:
GLAlertSelectView
)
//单选
@objc
optional
func
GLAlertMoreSelectViewClick
(
sender
:
Array
<
Int
>
,
view
:
UIView
)
//多选
...
...
@@ -273,6 +274,10 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
return
}
if
isYsYf
{
if
deSelectArr
.
count
>
0
{
delegate
?
.
GLAlertSelectDone
?()
return
}
let
alertView
=
GeliAlertView
(
frame
:
self
.
window
!.
bounds
)
alertView
.
delegate
=
self
;
alertView
.
tishiLbl
.
text
=
""
...
...
@@ -281,6 +286,7 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
alertView
.
rightBtn
.
tag
=
selectNum
!
self
.
window
?
.
addSubview
(
alertView
)
}
else
{
delegate
?
.
GLAlertSelectViewClick
?(
selectNum
:
selectNum
!
,
view
:
self
)
}
}
else
{
...
...
GeliBusinessPlatform/ViewController/客户管理/XinZengAndBianJiKeHuViewController.swift
View file @
07848f25
...
...
@@ -113,10 +113,10 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour
HUD
.
flash
(
.
label
(
"请填写客户公司名称"
),
delay
:
1.2
)
return
}
if
bindKehu
.
count
==
0
{
HUD
.
flash
(
.
label
(
"请选择绑定用户"
),
delay
:
1.2
)
return
}
//
if bindKehu.count == 0 {
//
HUD.flash(.label("请选择绑定用户"), delay: 1.2)
//
return
//
}
// if discount.count == 0 {
// HUD.flash(.label("请填写折扣数,没有折扣请输入0"), delay: 1.2)
// return
...
...
@@ -141,9 +141,6 @@ class XinZengAndBianJiKeHuViewController: BaseViewController,UITableViewDataSour
override
func
viewDidLoad
()
{
super
.
viewDidLoad
()
print
(
"==="
,
bindKehu
,
phoneNum
,
companyName
)
navbar
.
title
=
titleStr
if
(
titleStr
?
.
contains
(
"编辑"
))
!
{
navbar
.
rightTitle
=
"删除"
...
...
GeliBusinessPlatform/ViewController/采购单详情/CGDXQVc.swift
View file @
07848f25
...
...
@@ -408,6 +408,12 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
}
}
}
func
GLAlertSelectDone
()
{
glSelectView
?
.
removeFromSuperview
()
glSelectView
=
nil
}
func
tableView
(
_
tableView
:
UITableView
,
heightForRowAt
indexPath
:
IndexPath
)
->
CGFloat
{
if
indexPath
.
section
==
0
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment