|
@@ -106,7 +106,7 @@ export class FuwutaiComponent implements OnInit {
|
106
|
106
|
private notification: NzNotificationService,
|
107
|
107
|
private phones: WebsocketPhoneService,
|
108
|
108
|
private sers: WebsocketSerService
|
109
|
|
- ) { }
|
|
109
|
+ ) {}
|
110
|
110
|
validateFormZy!: FormGroup;
|
111
|
111
|
validateFormQt!: FormGroup;
|
112
|
112
|
// ---------------------------------------
|
|
@@ -267,11 +267,11 @@ export class FuwutaiComponent implements OnInit {
|
267
|
267
|
});
|
268
|
268
|
this.router.navigateByUrl(
|
269
|
269
|
"dispatchingDesk/allotWorker/" +
|
270
|
|
- ids_types.join("-") +
|
271
|
|
- "/" +
|
272
|
|
- stateIds.join("-") +
|
273
|
|
- "/2/" +
|
274
|
|
- this.checkedHos
|
|
270
|
+ ids_types.join("-") +
|
|
271
|
+ "/" +
|
|
272
|
+ stateIds.join("-") +
|
|
273
|
+ "/2/" +
|
|
274
|
+ this.checkedHos
|
275
|
275
|
);
|
276
|
276
|
}
|
277
|
277
|
// 批量撤回
|
|
@@ -355,8 +355,8 @@ export class FuwutaiComponent implements OnInit {
|
355
|
355
|
if (newOrderShowFlag) {
|
356
|
356
|
let goods = this.validateFormZy.controls.goods.value
|
357
|
357
|
? this.validateFormZy.controls.goods.value.filter(
|
358
|
|
- (item) => item.checked === true
|
359
|
|
- )
|
|
358
|
+ (item) => item.checked === true
|
|
359
|
+ )
|
360
|
360
|
: [];
|
361
|
361
|
goods = goods.map((current) => current.value).join();
|
362
|
362
|
let postData = {
|
|
@@ -549,7 +549,7 @@ export class FuwutaiComponent implements OnInit {
|
549
|
549
|
workerMessage: any = []; //顶部全部工单
|
550
|
550
|
// 展示形式
|
551
|
551
|
patientCareCol: number = 6; //顶部工单列数(4列-8人,7列-14人,6列-单排 )
|
552
|
|
- hurseInfoHiding; //护工信息隐藏
|
|
552
|
+ hurseInfoHiding = '1'; //护工信息隐藏
|
553
|
553
|
txtLabelCol: number = 1; //工单信息列数
|
554
|
554
|
workerInfoTime: number = 30; //支助人员刷新时间
|
555
|
555
|
orderInfoTime: number = 30; //工单刷新时间
|
|
@@ -848,11 +848,17 @@ export class FuwutaiComponent implements OnInit {
|
848
|
848
|
});
|
849
|
849
|
postData.groups = groups;
|
850
|
850
|
}
|
851
|
|
- // if (!postData.groups.length) return;
|
852
|
|
- that.mainService.getSerInfo("getWorkInfo", postData).subscribe((data) => {
|
853
|
|
- that.workerMessage = data.data ? data.data : [];
|
854
|
|
- that.initTopCount();
|
855
|
|
- });
|
|
851
|
+ // if (this.hurseInfoHiding == '1'){
|
|
852
|
+ // that.workerMessage = [];
|
|
853
|
+ // that.initTopCount();
|
|
854
|
+ // return;
|
|
855
|
+ // }
|
|
856
|
+ // that.mainService.getSerInfo("getWorkInfo", postData).subscribe((data) => {
|
|
857
|
+ // that.workerMessage = data.data ? data.data : [];
|
|
858
|
+ // that.initTopCount();
|
|
859
|
+ // });
|
|
860
|
+ that.workerMessage = [];
|
|
861
|
+ that.initTopCount();
|
856
|
862
|
}
|
857
|
863
|
|
858
|
864
|
// 获取三个状态数据数据
|
|
@@ -911,14 +917,14 @@ export class FuwutaiComponent implements OnInit {
|
911
|
917
|
// 未分派
|
912
|
918
|
that.unassignedList = data.list || [];
|
913
|
919
|
// if (that.unassignedListClone === null) {
|
914
|
|
- that.unassignedList.forEach((item) => {
|
915
|
|
- item.checked = false;
|
916
|
|
- });
|
917
|
|
- that.batchType = false;
|
918
|
|
- that.allUnassignedList = false;
|
919
|
|
- that.unassignedListClone = JSON.parse(
|
920
|
|
- JSON.stringify(that.unassignedList)
|
921
|
|
- );
|
|
920
|
+ that.unassignedList.forEach((item) => {
|
|
921
|
+ item.checked = false;
|
|
922
|
+ });
|
|
923
|
+ that.batchType = false;
|
|
924
|
+ that.allUnassignedList = false;
|
|
925
|
+ that.unassignedListClone = JSON.parse(
|
|
926
|
+ JSON.stringify(that.unassignedList)
|
|
927
|
+ );
|
922
|
928
|
// } else {
|
923
|
929
|
// that.unassignedList.forEach((item1) => {
|
924
|
930
|
// that.unassignedListClone.forEach((item2) => {
|
|
@@ -949,21 +955,21 @@ export class FuwutaiComponent implements OnInit {
|
949
|
955
|
// 待到达
|
950
|
956
|
that.arriveList = data.list || [];
|
951
|
957
|
// if (that.arriveListClone === null) {
|
952
|
|
- that.arriveList.forEach((item) => {
|
953
|
|
- item.checked = false;
|
954
|
|
- });
|
955
|
|
- that.batchType1 = false;
|
956
|
|
- that.allArriveList = false;
|
957
|
|
- that.arriveListClone = JSON.parse(JSON.stringify(that.arriveList));
|
|
958
|
+ that.arriveList.forEach((item) => {
|
|
959
|
+ item.checked = false;
|
|
960
|
+ });
|
|
961
|
+ that.batchType1 = false;
|
|
962
|
+ that.allArriveList = false;
|
|
963
|
+ that.arriveListClone = JSON.parse(JSON.stringify(that.arriveList));
|
958
|
964
|
// } else {
|
959
|
|
- // that.arriveList.forEach((item1) => {
|
960
|
|
- // that.arriveListClone.forEach((item2) => {
|
961
|
|
- // if (item1.id == item2.id) {
|
962
|
|
- // item1.checked = item2.checked;
|
963
|
|
- // }
|
964
|
|
- // });
|
965
|
|
- // });
|
966
|
|
- // this.batchType1 = this.arriveListClone.some((item) => item.checked);
|
|
965
|
+ // that.arriveList.forEach((item1) => {
|
|
966
|
+ // that.arriveListClone.forEach((item2) => {
|
|
967
|
+ // if (item1.id == item2.id) {
|
|
968
|
+ // item1.checked = item2.checked;
|
|
969
|
+ // }
|
|
970
|
+ // });
|
|
971
|
+ // });
|
|
972
|
+ // this.batchType1 = this.arriveListClone.some((item) => item.checked);
|
967
|
973
|
// }
|
968
|
974
|
that.loading2 = false;
|
969
|
975
|
} else if (stateId == 3) {
|
|
@@ -1070,20 +1076,20 @@ export class FuwutaiComponent implements OnInit {
|
1070
|
1076
|
if (flag == 1) {
|
1071
|
1077
|
this.router.navigateByUrl(
|
1072
|
1078
|
"dispatchingDesk/allotWorker/" +
|
1073
|
|
- id +
|
1074
|
|
- "/" +
|
1075
|
|
- stateId +
|
1076
|
|
- "/1/" +
|
1077
|
|
- this.checkedHos
|
|
1079
|
+ id +
|
|
1080
|
+ "/" +
|
|
1081
|
+ stateId +
|
|
1082
|
+ "/1/" +
|
|
1083
|
+ this.checkedHos
|
1078
|
1084
|
);
|
1079
|
1085
|
} else {
|
1080
|
1086
|
this.router.navigateByUrl(
|
1081
|
1087
|
"dispatchingDesk/allotWorker/" +
|
1082
|
|
- id +
|
1083
|
|
- "/" +
|
1084
|
|
- stateId +
|
1085
|
|
- "/0/" +
|
1086
|
|
- this.checkedHos
|
|
1088
|
+ id +
|
|
1089
|
+ "/" +
|
|
1090
|
+ stateId +
|
|
1091
|
+ "/0/" +
|
|
1092
|
+ this.checkedHos
|
1087
|
1093
|
);
|
1088
|
1094
|
}
|
1089
|
1095
|
}
|
|
@@ -1323,13 +1329,13 @@ export class FuwutaiComponent implements OnInit {
|
1323
|
1329
|
this.binding = 1;
|
1324
|
1330
|
this.phoneNumList.forEach((item) => {
|
1325
|
1331
|
item.checked = false;
|
1326
|
|
- })
|
|
1332
|
+ });
|
1327
|
1333
|
this.phoneNumList.forEach((item) => {
|
1328
|
|
- this.phoneNumListBind.forEach(v => {
|
|
1334
|
+ this.phoneNumListBind.forEach((v) => {
|
1329
|
1335
|
if (item.value == v) {
|
1330
|
1336
|
item.checked = true;
|
1331
|
1337
|
}
|
1332
|
|
- })
|
|
1338
|
+ });
|
1333
|
1339
|
});
|
1334
|
1340
|
}
|
1335
|
1341
|
// 点击tab切换
|