Commit 1a03ff0f authored by wangqinghua's avatar wangqinghua

workService

parent 8dbe4035
...@@ -85,6 +85,7 @@ import {UploadComponent} from './work/modal/upload/upload.component'; ...@@ -85,6 +85,7 @@ import {UploadComponent} from './work/modal/upload/upload.component';
import {HandleDetailComponent} from './work/work-handle/handle-detail/handle-detail.component'; import {HandleDetailComponent} from './work/work-handle/handle-detail/handle-detail.component';
import {HandleEventComponent} from './work/work-handle/handle-event/handle-event.component'; import {HandleEventComponent} from './work/work-handle/handle-event/handle-event.component';
import {EventComponent} from './work/work-handle/Event/event.component'; import {EventComponent} from './work/work-handle/Event/event.component';
import {TransforComponent} from './work/modal/transfor/transfor.component';
@NgModule({ @NgModule({
imports: [ imports: [
...@@ -171,6 +172,7 @@ import {EventComponent} from './work/work-handle/Event/event.component'; ...@@ -171,6 +172,7 @@ import {EventComponent} from './work/work-handle/Event/event.component';
HandleComponent, HandleComponent,
HandleEventComponent, HandleEventComponent,
EventComponent, EventComponent,
TransforComponent,
], ],
providers:[ providers:[
OverAllService, OverAllService,
......
<!--事件转派-->
<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
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);
}
}
)
}
}
...@@ -91,29 +91,13 @@ ...@@ -91,29 +91,13 @@
<span (click)="lookEvent(data)">查看</span> <span (click)="lookEvent(data)">查看</span>
<span (click)="showEditModal(data)">编辑</span> <span (click)="showEditModal(data)">编辑</span>
<span (click)="showEditModal(data)">处理</span> <span (click)="showEditModal(data)">处理</span>
<span (click)="showTransfor(data)">转派</span> <span (click)="showTransforModal(data)">转派</span>
<span (click)="deleteHandle(data)">删除</span> <span (click)="deleteHandle(data)">删除</span>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</nz-table> </nz-table>
<!--事件转派--> <!--转派-->
<nz-modal [nzWidth]="780" [(nzVisible)]="isVisiable" nzTitle="事件转派" (nzOnCancel)="handleCancel()" <smart-transfor #smartTransfor (done)="getList()"></smart-transfor>
(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-event #smartEvent (done)="getList()"></smart-event> <smart-event #smartEvent (done)="getList()"></smart-event>
\ No newline at end of file
...@@ -6,6 +6,7 @@ import {Router} from '@angular/router'; ...@@ -6,6 +6,7 @@ import {Router} from '@angular/router';
import {EventComponent} from './Event/event.component'; import {EventComponent} from './Event/event.component';
import {CommonService} from '../../shared/common/common.service'; import {CommonService} from '../../shared/common/common.service';
import {SelectPersonComponent} from '../../modal/select-person/select-person.component'; import {SelectPersonComponent} from '../../modal/select-person/select-person.component';
import {TransforComponent} from '../modal/transfor/transfor.component';
@Component({ @Component({
selector: 'smart-work-handle', selector: 'smart-work-handle',
...@@ -14,6 +15,7 @@ import {SelectPersonComponent} from '../../modal/select-person/select-person.com ...@@ -14,6 +15,7 @@ import {SelectPersonComponent} from '../../modal/select-person/select-person.com
}) })
export class WorkHandleComponent implements OnInit { export class WorkHandleComponent implements OnInit {
@ViewChild('smartEvent') smartEvent: EventComponent; @ViewChild('smartEvent') smartEvent: EventComponent;
@ViewChild('smartTransfor') smartTransfor:TransforComponent;
@ViewChild('smartSelectPerson') smartSelectPerson:SelectPersonComponent; @ViewChild('smartSelectPerson') smartSelectPerson:SelectPersonComponent;
timeFormat = 'yyyy-MM-dd'; timeFormat = 'yyyy-MM-dd';
...@@ -35,11 +37,6 @@ export class WorkHandleComponent implements OnInit { ...@@ -35,11 +37,6 @@ export class WorkHandleComponent implements OnInit {
endTime: '', endTime: '',
}; };
//转派
isVisiable= false;
transforList = [];
transforId;
constructor(private workSer: WorkService, private message: NzMessageService, constructor(private workSer: WorkService, private message: NzMessageService,
private router: Router, private commonSer: CommonService) { private router: Router, private commonSer: CommonService) {
} }
...@@ -115,58 +112,8 @@ export class WorkHandleComponent implements OnInit { ...@@ -115,58 +112,8 @@ export class WorkHandleComponent implements OnInit {
}); });
} }
//事件转派--start //转派
showTransfor(item){ showTransforModal(item){
this.transforId = item.id; this.smartTransfor.showTransforModal("事件转派",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);
}
}
)
} }
} }
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