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
6f7ca71f
Commit
6f7ca71f
authored
Jun 03, 2020
by
刘俊宏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
完善工作中心
parent
ee0bfbc8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
173 additions
and
73 deletions
+173
-73
GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
...ata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift
...essPlatform/ViewController/工作中心/WorkCViewController.swift
+161
-72
GeliBusinessPlatform/ViewController/订单列表/OrderListViewController.swift
...latform/ViewController/订单列表/OrderListViewController.swift
+12
-1
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
View file @
6f7ca71f
No preview for this file type
GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift
View file @
6f7ca71f
...
...
@@ -328,32 +328,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
return
tableV
.
rowHeight
}
//MARK:--
func
getTheWorkVcByAuthId
(
auth_id
:
Int
){
switch
auth_id
{
case
47
:
//订单列表
NotificationCenter
.
default
.
post
(
name
:
NSNotification
.
Name
(
rawValue
:
"changgeTabItem"
),
object
:
nil
,
userInfo
:
[
"tag"
:
0
])
return
case
48
:
//销售统计
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
50
:
//商品列表
NotificationCenter
.
default
.
post
(
name
:
NSNotification
.
Name
(
rawValue
:
"changgeTabItem"
),
object
:
nil
,
userInfo
:
[
"tag"
:
1
])
return
case
51
:
//品牌列表
let
vc
=
PinPaiListViewController
()
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
return
case
53
:
//销售下单-代客下单
let
vc
=
DaiKeXiaDanGouWuViewController
()
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
return
default
:
break
;
}
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
}
//MARK: - diy cell delegate
...
...
@@ -367,19 +342,25 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
switch
idx
.
row
{
case
0
:
//未发货订单
NotificationCenter
.
default
.
post
(
name
:
NSNotification
.
Name
(
rawValue
:
"changgeTabItem"
),
object
:
nil
,
userInfo
:
[
"tag"
:
0
])
NotificationCenter
.
default
.
post
(
name
:
NSNotification
.
Name
(
rawValue
:
"orderNavChange"
),
object
:
nil
,
userInfo
:
[
"tag"
:
3
])
return
case
1
:
//待确认订单
NotificationCenter
.
default
.
post
(
name
:
NSNotification
.
Name
(
rawValue
:
"changgeTabItem"
),
object
:
nil
,
userInfo
:
[
"tag"
:
0
])
NotificationCenter
.
default
.
post
(
name
:
NSNotification
.
Name
(
rawValue
:
"orderNavChange"
),
object
:
nil
,
userInfo
:
[
"tag"
:
1
])
return
case
2
:
//入库申请
let
vc
=
NewRKVc
()
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
return
case
3
:
//出库申请
let
vc
=
NewCKVc
()
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
return
case
4
:
//采购入库
...
...
@@ -388,49 +369,157 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
default
:
break
}
let
target
=
""
switch
target
{
case
"地址管理"
:
let
vc
=
DZGLViewController
()
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
break
case
"新增采购单"
:
let
vc
=
XinCaiGouViewController
()
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
break
case
"应收账款"
:
let
vc
=
YingFuZKListViewController
()
vc
.
barTitle
=
"应收账款"
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
break
case
"应付账款"
:
let
vc
=
YingFuZKListViewController
()
vc
.
barTitle
=
"应付账款"
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
break
case
"供应商管理"
:
let
vc
=
GYSListViewController
()
vc
.
barTitle
=
"供应商管理"
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
break
case
"收支统计"
:
let
vc
=
ShouZhiTongJiViewController
()
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
break
case
"客户管理"
:
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
}
}
//MARK:--item相关跳转
func
getTheWorkVcByAuthId
(
auth_id
:
Int
){
switch
auth_id
{
case
47
:
//订单列表
NotificationCenter
.
default
.
post
(
name
:
NSNotification
.
Name
(
rawValue
:
"changgeTabItem"
),
object
:
nil
,
userInfo
:
[
"tag"
:
0
])
return
case
48
:
//销售统计
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
50
:
//商品列表
NotificationCenter
.
default
.
post
(
name
:
NSNotification
.
Name
(
rawValue
:
"changgeTabItem"
),
object
:
nil
,
userInfo
:
[
"tag"
:
1
])
return
case
51
:
//品牌列表
let
vc
=
PinPaiListViewController
()
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
return
case
53
:
//销售下单-代客下单
let
vc
=
DaiKeXiaDanGouWuViewController
()
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
return
case
54
:
//扫码下单
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
55
:
//预售下单
let
vc
=
DaiKeXiaDanGouWuViewController
()
vc
.
orderType
=
1
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
return
case
57
:
//商家信息
let
vc
=
ShopInfoViewController
()
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
return
case
58
:
//支付账号==格利支付
let
vc
=
PayViewController
()
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
return
case
59
:
//地址管理
let
vc
=
DZGLViewController
()
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
return
case
61
:
//库存商品
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
62
:
//出入库记录
let
vc
=
CRKListVC
()
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
return
case
63
:
//入库--直接入库
let
vc
=
NewRKVc
()
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
return
case
64
:
//出库--直接出库
let
vc
=
NewCKVc
()
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
return
case
65
:
//申请入库
let
vc
=
NewRKVc
()
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
return
case
66
:
//申请出库
let
vc
=
NewCKVc
()
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
return
case
67
:
//仓库管理
NotificationCenter
.
default
.
post
(
name
:
NSNotification
.
Name
(
rawValue
:
"changgeTabItem"
),
object
:
nil
,
userInfo
:
[
"tag"
:
3
])
return
case
69
:
//主营收入
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
70
:
//其他收入
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
71
:
//费用支出
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
72
:
//样品福利
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
73
:
//主营成本
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
74
:
//现金记账
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
75
:
//收支统计
let
vc
=
ShouZhiTongJiViewController
()
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
return
case
76
:
//收支详情
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
77
:
//应收账款
let
vc
=
YingFuZKListViewController
()
vc
.
barTitle
=
"应收账款"
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
return
case
78
:
//应付账款
let
vc
=
YingFuZKListViewController
()
vc
.
barTitle
=
"应付账款"
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
return
case
80
:
//客户列表
let
vc
=
KeHuListViewController
()
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
return
case
82
:
//账期用户列表
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
83
:
//用户账期申请列表
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
84
:
//账期设置
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
86
:
//档口列表
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
88
:
//运单列表
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
89
:
//物流公司列表
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
90
:
//下运单
let
vc
=
XiaYunDanViewController
()
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
return
case
92
:
//采购订单管理
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
93
:
//供应商管理
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
113
:
//管理员列表
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
115
:
//角色列表
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
case
116
:
//字段列表
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
default
:
break
;
}
HUD
.
flash
(
.
label
(
"敬请期待"
),
delay
:
1.2
)
return
}
//MARK:--编辑页面保存回调(主要增加使用体验)不应网络请求出差而无法改变
func
updataUIbyEditWorkSave
()
{
//查询所有记录
...
...
GeliBusinessPlatform/ViewController/订单列表/OrderListViewController.swift
View file @
6f7ca71f
...
...
@@ -31,6 +31,10 @@ class OrderListViewController: BaseViewController ,UISearchBarDelegate, SearchBa
var
searchV
:
SearchBarView
?
=
nil
@IBOutlet
weak
var
contentView
:
UIView
!
@IBOutlet
weak
var
searchBgView
:
UIView
!
//头部滚动视图
weak
var
pagingVC
:
PagingViewController
?
override
func
viewDidLoad
()
{
super
.
viewDidLoad
()
...
...
@@ -49,7 +53,6 @@ class OrderListViewController: BaseViewController ,UISearchBarDelegate, SearchBa
searchBr
.
delegate
=
self
searchBr
.
delegateL
=
self
//头部滚动视图
let
pagingViewController
=
PagingViewController
(
viewControllers
:
viewControllers
)
pagingViewController
.
indicatorColor
=
UIColor
.
init
(
named
:
"蓝色字体颜色"
)
!
pagingViewController
.
menuItemSize
=
.
fixed
(
width
:
0
,
height
:
44*
glscale
)
...
...
@@ -64,12 +67,20 @@ class OrderListViewController: BaseViewController ,UISearchBarDelegate, SearchBa
contentView
.
addSubview
(
pagingViewController
.
view
)
contentView
.
constrainToEdges
(
pagingViewController
.
view
)
pagingViewController
.
didMove
(
toParent
:
self
)
pagingVC
=
pagingViewController
//MARK:--添加个刷新通知
NotificationCenter
.
default
.
addObserver
(
self
,
selector
:
#selector(
refreshingByOrderHavChange
)
,
name
:
NSNotification
.
Name
(
rawValue
:
"orderChange"
),
object
:
nil
)
NotificationCenter
.
default
.
addObserver
(
self
,
selector
:
#selector(
jpushServiceNotification(notion:)
)
,
name
:
NSNotification
.
Name
(
rawValue
:
"jpushServiceNotification0"
),
object
:
nil
)
//跳转对应的头部视图
NotificationCenter
.
default
.
addObserver
(
self
,
selector
:
#selector(
orderNavChange
)
,
name
:
NSNotification
.
Name
(
rawValue
:
"orderNavChange"
),
object
:
nil
)
}
@objc
func
orderNavChange
(
notion
:
Notification
){
let
dic
=
notion
.
userInfo
pagingVC
!.
select
(
index
:
dic
!
[
"tag"
]
as
Any
as!
Int
,
animated
:
true
)
}
//MARK:--jpushServiceNotification
@objc
func
jpushServiceNotification
(
notion
:
Notification
)
{
...
...
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