Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
smart
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangqinghua
smart
Commits
1a03ff0f
Commit
1a03ff0f
authored
Dec 16, 2018
by
wangqinghua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
workService
parent
8dbe4035
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
109 additions
and
77 deletions
+109
-77
app.main.module.ts
src/main/webapp/app/app.main.module.ts
+2
-0
transfor.component.html
...in/webapp/app/work/modal/transfor/transfor.component.html
+19
-0
transfor.component.ts
...main/webapp/app/work/modal/transfor/transfor.component.ts
+79
-0
work-handle.component.html
...in/webapp/app/work/work-handle/work-handle.component.html
+4
-19
work-handle.component.ts
...main/webapp/app/work/work-handle/work-handle.component.ts
+5
-58
No files found.
src/main/webapp/app/app.main.module.ts
View file @
1a03ff0f
...
...
@@ -85,6 +85,7 @@ import {UploadComponent} from './work/modal/upload/upload.component';
import
{
HandleDetailComponent
}
from
'./work/work-handle/handle-detail/handle-detail.component'
;
import
{
HandleEventComponent
}
from
'./work/work-handle/handle-event/handle-event.component'
;
import
{
EventComponent
}
from
'./work/work-handle/Event/event.component'
;
import
{
TransforComponent
}
from
'./work/modal/transfor/transfor.component'
;
@
NgModule
({
imports
:
[
...
...
@@ -171,6 +172,7 @@ import {EventComponent} from './work/work-handle/Event/event.component';
HandleComponent
,
HandleEventComponent
,
EventComponent
,
TransforComponent
,
],
providers
:[
OverAllService
,
...
...
src/main/webapp/app/work/modal/transfor/transfor.component.html
0 → 100644
View file @
1a03ff0f
<!--事件转派-->
<nz-modal
[
nzWidth
]="
780
"
[(
nzVisible
)]="
isVisiable
"
[
nzTitle
]="
title
"
(
nzOnCancel
)="
handleCancel
()"
(
nzOnOk
)="
handleOk
()"
>
<form
nz-form
>
<nz-form-item>
<nz-form-label
[
nzSpan
]="
4
"
nzRequired
>
转派给
</nz-form-label>
<nz-form-control
[
nzSpan
]="
14
"
>
<button
(
click
)="
selectPerson
()"
nz-button
><span>
选择
</span></button>
<ng-container
*
ngFor=
"let item of transforList;let i = index;"
>
<span>
{{item.username}}
</span><span
(
click
)="
deletePerson
(
i
)"
>
X
</span>
</ng-container>
</nz-form-control>
</nz-form-item>
</div>
</form>
</nz-modal>
<!--选择处理人-->
<smart-select-person
#
smartSelectPerson
(
done
)="
getUser
($
event
)"
></smart-select-person>
\ No newline at end of file
src/main/webapp/app/work/modal/transfor/transfor.component.ts
0 → 100644
View file @
1a03ff0f
import
{
Component
,
EventEmitter
,
OnInit
,
Output
,
ViewChild
}
from
'@angular/core'
;
import
{
SelectPersonComponent
}
from
'../../../modal/select-person/select-person.component'
;
import
{
WorkService
}
from
'../../work.service'
;
import
{
NzMessageService
}
from
'ng-zorro-antd'
;
@
Component
({
selector
:
'smart-transfor'
,
templateUrl
:
'./transfor.component.html'
,
styles
:
[]
})
export
class
TransforComponent
implements
OnInit
{
@
ViewChild
(
'smartSelectPerson'
)
smartSelectPerson
:
SelectPersonComponent
;
@
Output
()
done
=
new
EventEmitter
<
any
>
();
title
;
transforId
;
isVisiable
;
transforList
;
constructor
(
private
workSer
:
WorkService
,
private
message
:
NzMessageService
)
{
}
ngOnInit
()
{
}
//事件转派--start
showTransforModal
(
title
,
id
){
this
.
transforId
=
id
;
this
.
title
=
title
;
this
.
isVisiable
=
true
;
}
//选择处理人弹窗
selectPerson
(){
this
.
smartSelectPerson
.
showModal
(
"选择转派人"
);
}
//选择转派人done
getUser
(
e
){
const
arr
=
[];
e
.
forEach
(
res
=>
{
const
data
=
{
username
:
res
.
name
,
userId
:
res
.
id
};
arr
.
push
(
data
);
});
this
.
transforList
=
arr
;
}
//取消
handleCancel
(){
this
.
isVisiable
=
false
;
this
.
transforList
=
[];
}
deletePerson
(
i
){
this
.
transforList
.
splice
(
i
,
1
);
}
//确定
handleOk
(){
const
data
=
{
id
:
this
.
transforId
,
operators
:
this
.
transforList
};
this
.
workSer
.
transfer
(
data
).
subscribe
(
(
res
)
=>
{
if
(
res
.
errCode
==
10000
){
this
.
message
.
success
(
"事件转派成功"
);
this
.
isVisiable
=
false
;
this
.
transforList
=
[];
this
.
done
.
emit
();
}
else
{
this
.
message
.
error
(
res
.
errMsg
);
}
}
)
}
}
src/main/webapp/app/work/work-handle/work-handle.component.html
View file @
1a03ff0f
...
...
@@ -91,29 +91,13 @@
<span
(
click
)="
lookEvent
(
data
)"
>
查看
</span>
<span
(
click
)="
showEditModal
(
data
)"
>
编辑
</span>
<span
(
click
)="
showEditModal
(
data
)"
>
处理
</span>
<span
(
click
)="
showTransfor
(
data
)"
>
转派
</span>
<span
(
click
)="
showTransfor
Modal
(
data
)"
>
转派
</span>
<span
(
click
)="
deleteHandle
(
data
)"
>
删除
</span>
</td>
</tr>
</tbody>
</nz-table>
<!--事件转派-->
<nz-modal
[
nzWidth
]="
780
"
[(
nzVisible
)]="
isVisiable
"
nzTitle=
"事件转派"
(
nzOnCancel
)="
handleCancel
()"
(
nzOnOk
)="
handleOk
()"
>
<form
nz-form
>
<nz-form-item>
<nz-form-label
[
nzSpan
]="
4
"
nzRequired
>
转派给
</nz-form-label>
<nz-form-control
[
nzSpan
]="
14
"
>
<button
(
click
)="
selectPerson
()"
nz-button
><span>
选择
</span></button>
<ng-container
*
ngFor=
"let item of transforList;let i = index;"
>
<span>
{{item.username}}
</span><span
(
click
)="
deletePerson
(
i
)"
>
X
</span>
</ng-container>
</nz-form-control>
</nz-form-item>
</div>
</form>
</nz-modal>
<!--选择处理人-->
<smart-select-person
#
smartSelectPerson
(
done
)="
getUser
($
event
)"
></smart-select-person>
<!--转派-->
<smart-transfor
#
smartTransfor
(
done
)="
getList
()"
></smart-transfor>
<!--新增事件-->
<smart-event
#
smartEvent
(
done
)="
getList
()"
></smart-event>
\ No newline at end of file
src/main/webapp/app/work/work-handle/work-handle.component.ts
View file @
1a03ff0f
...
...
@@ -6,6 +6,7 @@ import {Router} from '@angular/router';
import
{
EventComponent
}
from
'./Event/event.component'
;
import
{
CommonService
}
from
'../../shared/common/common.service'
;
import
{
SelectPersonComponent
}
from
'../../modal/select-person/select-person.component'
;
import
{
TransforComponent
}
from
'../modal/transfor/transfor.component'
;
@
Component
({
selector
:
'smart-work-handle'
,
...
...
@@ -14,6 +15,7 @@ import {SelectPersonComponent} from '../../modal/select-person/select-person.com
})
export
class
WorkHandleComponent
implements
OnInit
{
@
ViewChild
(
'smartEvent'
)
smartEvent
:
EventComponent
;
@
ViewChild
(
'smartTransfor'
)
smartTransfor
:
TransforComponent
;
@
ViewChild
(
'smartSelectPerson'
)
smartSelectPerson
:
SelectPersonComponent
;
timeFormat
=
'yyyy-MM-dd'
;
...
...
@@ -35,11 +37,6 @@ export class WorkHandleComponent implements OnInit {
endTime
:
''
,
};
//转派
isVisiable
=
false
;
transforList
=
[];
transforId
;
constructor
(
private
workSer
:
WorkService
,
private
message
:
NzMessageService
,
private
router
:
Router
,
private
commonSer
:
CommonService
)
{
}
...
...
@@ -115,58 +112,8 @@ export class WorkHandleComponent implements OnInit {
});
}
//事件转派--start
showTransfor
(
item
){
this
.
transforId
=
item
.
id
;
this
.
isVisiable
=
true
;
}
//选择处理人弹窗
selectPerson
(){
this
.
smartSelectPerson
.
showModal
(
"选择转派人"
);
}
//选择转派人done
getUser
(
e
){
const
arr
=
[];
e
.
forEach
(
res
=>
{
const
data
=
{
username
:
res
.
name
,
userId
:
res
.
id
};
arr
.
push
(
data
);
});
this
.
transforList
=
arr
;
}
//取消
handleCancel
(){
this
.
isVisiable
=
false
;
this
.
transforList
=
[];
}
deletePerson
(
i
){
this
.
transforList
.
splice
(
i
,
1
);
}
//确定
handleOk
(){
const
data
=
{
id
:
this
.
transforId
,
operators
:
this
.
transforList
};
this
.
workSer
.
transfer
(
data
).
subscribe
(
(
res
)
=>
{
if
(
res
.
errCode
==
10000
){
this
.
message
.
success
(
"事件转派成功"
);
this
.
isVisiable
=
false
;
this
.
transforList
=
[];
this
.
getList
();
}
else
{
this
.
message
.
error
(
res
.
errMsg
);
}
}
)
//转派
showTransforModal
(
item
){
this
.
smartTransfor
.
showTransforModal
(
"事件转派"
,
item
.
id
);
}
}
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