|
@@ -328,9 +328,9 @@
|
328
|
328
|
<ng-container *ngIf="data.type === 'hsms'">
|
329
|
329
|
<div class="left_cots" (click)="openDetails(data.data)">
|
330
|
330
|
<!-- 工单 -->
|
331
|
|
- <div class="gongdan" (click)="batchWithdrawalSelect(!data.data.checked, data.data.id, $event)">
|
332
|
|
- <span class="left mr8">
|
333
|
|
- <label nz-checkbox [ngModel]="data.data.checked" (ngModelChange)="batchWithdrawalSelect($event, data.data.id)"></label>
|
|
331
|
+ <div class="gongdan" (click)="batchWithdrawalSelect(!data.checked, data.data.id, $event)">
|
|
332
|
+ <span class="left mr8" *ngIf="!flagList.itsmFlag2 && flagList.hsmsFlag2">
|
|
333
|
+ <label nz-checkbox [ngModel]="data.checked" (ngModelChange)="batchWithdrawalSelect($event, data.data.id)"></label>
|
334
|
334
|
</span>
|
335
|
335
|
<span class="left gongdan_name" nz-tooltip [nzTooltipTitle]="data.data.taskType.taskName + (data.data.goodsRemark?'-'+data.data.goodsRemark:'')+'(' + data.data.gdcode + ')'">
|
336
|
336
|
{{ data.data.isHalfInspect === 1 ? "半程陪检" : data.data.taskType.taskName }}<ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
|
|
@@ -338,7 +338,7 @@
|
338
|
338
|
<div class="right_all">
|
339
|
339
|
<span nz-tooltip [nzTooltipTitle]="data.data.worker ? data.data.worker.phone : ''" class="right_all_name">{{ data.data.worker ? data.data.worker.name : "" }}</span>
|
340
|
340
|
<span class="right">
|
341
|
|
- <span [ngClass]="{ colorRed: data.data.timeOut == true }">{{ data.gdState.name }}</span>
|
|
341
|
+ <span [ngClass]="{ colorRed: data.data.timeOut == true }">{{ data.data.gdState.name }}</span>
|
342
|
342
|
</span>
|
343
|
343
|
</div>
|
344
|
344
|
</div>
|
|
@@ -478,26 +478,26 @@
|
478
|
478
|
<div class="left_cots" (click)="openDetails(data)">
|
479
|
479
|
<!-- 工单 -->
|
480
|
480
|
<div class="gongdan">
|
481
|
|
- <span class="left">{{ data.taskType.associationType.name }}{{ data.createDeptDTO ? "(" + data.createDeptDTO.dept + ")" : "" }}</span>
|
482
|
|
- <span [ngClass]="{ right: true, colorRed: data.timeOut == true }">{{ data.gdState.name }}</span>
|
|
481
|
+ <span class="left">{{ data.data.taskType.associationType.name }}{{ data.data.createDeptDTO ? "(" + data.data.createDeptDTO.dept + ")" : "" }}</span>
|
|
482
|
+ <span [ngClass]="{ right: true, colorRed: data.data.timeOut == true }">{{ data.data.gdState.name }}</span>
|
483
|
483
|
</div>
|
484
|
484
|
<!-- 时间 -->
|
485
|
485
|
<div class="shijian">
|
486
|
486
|
<span class="left">
|
487
|
|
- {{ data.worker ? data.worker.name : "" }}
|
|
487
|
+ {{ data.data.worker ? data.data.worker.name : "" }}
|
488
|
488
|
</span>
|
489
|
489
|
<span class="right">
|
490
|
|
- <span>{{ data.showCreateTime }}</span>
|
|
490
|
+ <span>{{ data.data.showCreateTime }}</span>
|
491
|
491
|
</span>
|
492
|
492
|
</div>
|
493
|
493
|
<!-- 急标 -->
|
494
|
494
|
<!-- 急单 -->
|
495
|
|
- <img *ngIf="data.emergencyType && data.emergencyType.id == 300" src="../../assets/images/icon_ji.png" alt="" class="ji" />
|
|
495
|
+ <img *ngIf="data.data.emergencyType && data.data.emergencyType.id == 300" src="../../assets/images/icon_ji.png" alt="" class="ji" />
|
496
|
496
|
<!-- 加急单 -->
|
497
|
|
- <img *ngIf="data.emergencyType && data.emergencyType.id == 301" src="../../assets/images/icon_jiaji.png" alt="" class="ji" />
|
|
497
|
+ <img *ngIf="data.data.emergencyType && data.data.emergencyType.id == 301" src="../../assets/images/icon_jiaji.png" alt="" class="ji" />
|
498
|
498
|
</div>
|
499
|
|
- <div *ngIf="data.timeOut != true" class="slider sgreen" [ngStyle]="{ width: data.percent + '%' }"></div>
|
500
|
|
- <div *ngIf="data.timeOut == true" class="slider sred" [ngStyle]="{ width: '100%' }"></div>
|
|
499
|
+ <div *ngIf="data.data.timeOut != true" class="slider sgreen" [ngStyle]="{ width: data.data.percent + '%' }"></div>
|
|
500
|
+ <div *ngIf="data.data.timeOut == true" class="slider sred" [ngStyle]="{ width: '100%' }"></div>
|
501
|
501
|
</div>
|
502
|
502
|
</ng-container>
|
503
|
503
|
<div class="loading display_flex col-flex justify-content_flex-center align-items_center" *ngIf="loading2">
|
|
@@ -533,8 +533,8 @@
|
533
|
533
|
<div class="left_cots" (click)="openDetails(data.data)">
|
534
|
534
|
<!-- 工单 -->
|
535
|
535
|
<div class="gongdan">
|
536
|
|
- <span class="left mr8">
|
537
|
|
- <label nz-checkbox [ngModel]="data.data.checked" (ngModelChange)="batchWithdrawalSelect($event, data.data.id)"></label>
|
|
536
|
+ <span class="left mr8" *ngIf="!flagList.itsmFlag3 && flagList.hsmsFlag3">
|
|
537
|
+ <label nz-checkbox [ngModel]="data.checked" (ngModelChange)="batchWithdrawalSelect($event, data.data.id)"></label>
|
538
|
538
|
</span>
|
539
|
539
|
<span class="left gongdan_name" nz-tooltip [nzTooltipTitle]="data.data.taskType.taskName + (data.data.goodsRemark?'-'+data.data.goodsRemark:'')+'(' + data.data.gdcode + ')'">
|
540
|
540
|
{{ data.data.isHalfInspect === 1 ? "半程陪检" : data.data.taskType.taskName }}<ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
|
|
@@ -542,7 +542,7 @@
|
542
|
542
|
<div class="right_all">
|
543
|
543
|
<span nz-tooltip [nzTooltipTitle]="data.data.worker ? data.data.worker.phone : ''" class="right_all_name">{{ data.data.worker ? data.data.worker.name : "" }}</span>
|
544
|
544
|
<span class="right">
|
545
|
|
- <span [ngClass]="{ colorRed: data.data.timeOut == true }">{{ data.gdState.name }}</span>
|
|
545
|
+ <span [ngClass]="{ colorRed: data.data.timeOut == true }">{{ data.data.gdState.name }}</span>
|
546
|
546
|
</span>
|
547
|
547
|
</div>
|
548
|
548
|
</div>
|
|
@@ -682,25 +682,25 @@
|
682
|
682
|
<div class="left_cots" (click)="openDetails(data)">
|
683
|
683
|
<!-- 工单 -->
|
684
|
684
|
<div class="gongdan">
|
685
|
|
- <span class="left">{{ data.taskType.associationType.name }}{{ data.createDeptDTO ? "(" + data.createDeptDTO.dept + ")" : "" }}</span>
|
686
|
|
- <span [ngClass]="{ right: true, colorRed: data.timeOut == true }">{{ data.gdState.name }}</span>
|
|
685
|
+ <span class="left">{{ data.data.taskType.associationType.name }}{{ data.data.createDeptDTO ? "(" + data.data.createDeptDTO.dept + ")" : "" }}</span>
|
|
686
|
+ <span [ngClass]="{ right: true, colorRed: data.data.timeOut == true }">{{ data.data.gdState.name }}</span>
|
687
|
687
|
</div>
|
688
|
688
|
<!-- 时间 -->
|
689
|
689
|
<div class="shijian">
|
690
|
690
|
<span class="left">
|
691
|
|
- {{ data.worker ? data.worker.name : "" }}
|
|
691
|
+ {{ data.data.worker ? data.data.worker.name : "" }}
|
692
|
692
|
</span>
|
693
|
693
|
<span class="right">
|
694
|
|
- <span>{{ data.showCreateTime }}</span>
|
|
694
|
+ <span>{{ data.data.showCreateTime }}</span>
|
695
|
695
|
</span>
|
696
|
696
|
</div>
|
697
|
697
|
<!-- 急单 -->
|
698
|
|
- <img *ngIf="data.emergencyType && data.emergencyType.id == 300" src="../../assets/images/icon_ji.png" alt="" class="ji" />
|
|
698
|
+ <img *ngIf="data.data.emergencyType && data.data.emergencyType.id == 300" src="../../assets/images/icon_ji.png" alt="" class="ji" />
|
699
|
699
|
<!-- 加急单 -->
|
700
|
|
- <img *ngIf="data.emergencyType && data.emergencyType.id == 301" src="../../assets/images/icon_jiaji.png" alt="" class="ji" />
|
|
700
|
+ <img *ngIf="data.data.emergencyType && data.data.emergencyType.id == 301" src="../../assets/images/icon_jiaji.png" alt="" class="ji" />
|
701
|
701
|
</div>
|
702
|
|
- <div *ngIf="data.timeOut != true" class="slider sgreen" [ngStyle]="{ width: data.percent + '%' }"></div>
|
703
|
|
- <div *ngIf="data.timeOut == true" class="slider sred" [ngStyle]="{ width: '100%' }"></div>
|
|
702
|
+ <div *ngIf="data.data.timeOut != true" class="slider sgreen" [ngStyle]="{ width: data.data.percent + '%' }"></div>
|
|
703
|
+ <div *ngIf="data.data.timeOut == true" class="slider sred" [ngStyle]="{ width: '100%' }"></div>
|
704
|
704
|
</div>
|
705
|
705
|
</ng-container>
|
706
|
706
|
<div class="loading display_flex col-flex justify-content_flex-center align-items_center" *ngIf="loading3">
|
|
@@ -817,13 +817,7 @@
|
817
|
817
|
<div nz-row>
|
818
|
818
|
<div nz-col nzSpan="">
|
819
|
819
|
<nz-input-group nzAddOnAfter="秒">
|
820
|
|
- <nz-input-number
|
821
|
|
- class="w100"
|
822
|
|
- [(ngModel)]="workerInfoTime"
|
823
|
|
- [nzMin]="10"
|
824
|
|
- [nzStep]="1"
|
825
|
|
- placeholder="请输入配送人员刷新时间"
|
826
|
|
- ></nz-input-number>
|
|
820
|
+ <nz-input-number class="w100" [(ngModel)]="workerInfoTime" [nzMin]="10" [nzStep]="1" placeholder="请输入配送人员刷新时间"></nz-input-number>
|
827
|
821
|
</nz-input-group>
|
828
|
822
|
</div>
|
829
|
823
|
</div>
|
|
@@ -835,13 +829,7 @@
|
835
|
829
|
<div nz-row>
|
836
|
830
|
<div nz-col nzSpan="">
|
837
|
831
|
<nz-input-group nzAddOnAfter="秒">
|
838
|
|
- <nz-input-number
|
839
|
|
- class="w100"
|
840
|
|
- [(ngModel)]="orderInfoTime"
|
841
|
|
- [nzMin]="10"
|
842
|
|
- [nzStep]="1"
|
843
|
|
- placeholder="请输入工单刷新时间"
|
844
|
|
- ></nz-input-number>
|
|
832
|
+ <nz-input-number class="w100" [(ngModel)]="orderInfoTime" [nzMin]="10" [nzStep]="1" placeholder="请输入工单刷新时间"></nz-input-number>
|
845
|
833
|
</nz-input-group>
|
846
|
834
|
</div>
|
847
|
835
|
</div>
|
|
@@ -1073,7 +1061,7 @@
|
1073
|
1061
|
<div class="fixedMenu">
|
1074
|
1062
|
<div class="menuItems">
|
1075
|
1063
|
<div class="others">
|
1076
|
|
- <div class="item" (click)="visitOrder()">回访-{{visitNum}}</div>
|
|
1064
|
+ <div class="item" (click)="visitOrder()">回访<span *ngIf="visitNum !== undefined">-{{visitNum}}</span></div>
|
1077
|
1065
|
<div class="item">留言-10</div>
|
1078
|
1066
|
<div class="item itemLink">通话</div>
|
1079
|
1067
|
</div>
|
|
@@ -2443,5 +2431,5 @@
|
2443
|
2431
|
<!-- 处理 -->
|
2444
|
2432
|
<app-incident-handle [id]="coopData.id" *ngIf="handleModalShow" (closeModelHs)="closeHandleModelOrder($event)" (confirmModelHs)="confirmHandleModelOrder($event)"></app-incident-handle>
|
2445
|
2433
|
|
2446
|
|
-<!-- 回访 -->
|
2447
|
|
-<app-incident-ser-visit *ngIf="visitShow" (closeModelHs)="closeVisit($event)"></app-incident-ser-visit>
|
|
2434
|
+<!-- 回访列表 -->
|
|
2435
|
+<app-incident-ser-visit [itsmData]="itsmData" *ngIf="visitShow" (closeModelHs)="closeVisit($event)"></app-incident-ser-visit>
|