|
|
@@ -32,7 +32,7 @@ export class OrderScopeComponent implements OnInit {
|
|
32
|
32
|
|
|
33
|
33
|
itsmCheckedHos:any[] = [];//运维-院区
|
|
34
|
34
|
itsmCheckedGroup:any[] = [];//运维-分组
|
|
35
|
|
- itsmOrderScopeRadio = '0';//运维-工单范围
|
|
|
35
|
+ itsmOrderScopeRadio:any = '0';//运维-工单范围
|
|
36
|
36
|
isAllItsmGroupChecked:boolean = false;//运维-是否全选分组
|
|
37
|
37
|
|
|
38
|
38
|
ngOnInit() {
|
|
|
@@ -41,6 +41,8 @@ export class OrderScopeComponent implements OnInit {
|
|
41
|
41
|
}
|
|
42
|
42
|
|
|
43
|
43
|
initHsms(){
|
|
|
44
|
+ console.log('hsmsData：', this.hsmsData);
|
|
|
45
|
+ this.scopeTabs[0].checked = this.hsmsData.hsmsSwitch;
|
|
44
|
46
|
this.checkedHos = this.hsmsData.checkedHos;
|
|
45
|
47
|
this.orderScopeRadio = this.hsmsData.orderScopeRadio;
|
|
46
|
48
|
this.initOrderScope();
|
|
|
@@ -48,23 +50,31 @@ export class OrderScopeComponent implements OnInit {
|
|
48
|
50
|
}
|
|
49
|
51
|
|
|
50
|
52
|
initItsm(){
|
|
|
53
|
+ console.log('itsmData', this.itsmData);
|
|
|
54
|
+ this.scopeTabs[1].checked = this.itsmData.mdv2Switch;
|
|
51
|
55
|
this.itsmOrderScopeRadio = this.itsmData.orderScopeRadio;
|
|
|
56
|
+ this.itsmInitOrderScope();
|
|
52
|
57
|
this.itsmGetOrderScope();
|
|
53
|
58
|
}
|
|
54
|
59
|
|
|
55
|
60
|
// 工单范选项卡
|
|
56
|
|
- activeScopeTabValue = 1;
|
|
57
|
61
|
scopeTabs:any[] = [
|
|
58
|
|
- { name: '运维', value: 1 },
|
|
59
|
|
- { name: '配送', value: 2 },
|
|
|
62
|
+ { name: '运维', value: 1, checked: false },
|
|
|
63
|
+ { name: '配送', value: 2, checked: false },
|
|
60
|
64
|
];
|
|
|
65
|
+ activeScopeTab = this.scopeTabs[0];
|
|
|
66
|
+ //#region 工单范围-运维start
|
|
|
67
|
+ allDuty:number = 1;
|
|
|
68
|
+ itsmInitOrderScope(){
|
|
61
|
69
|
|
|
62
|
|
- // =============================工单范围-运维start========================================
|
|
|
70
|
+ }
|
|
63
|
71
|
// 工单范围数据
|
|
64
|
72
|
itsmGetOrderScope() {
|
|
|
73
|
+ // 是否不限制部门
|
|
|
74
|
+ this.allDuty = this.itsmData.allDuty === undefined ? 1 : this.itsmData.allDuty;
|
|
65
|
75
|
// 权限内的院区和组
|
|
66
|
|
- let hosList = this.user.infoPermission.hospitals || [];
|
|
67
|
|
- let groups = this.user.infoPermission.groups || [];
|
|
|
76
|
+ let hosList = this.user.infoPermission.dutyList || [];
|
|
|
77
|
+ let groups = this.user.infoPermission.dutyGroupList || [];
|
|
68
|
78
|
|
|
69
|
79
|
// 选中的院区和组
|
|
70
|
80
|
let itsmCheckedHos = this.itsmData.checkedHos || [];
|
|
|
@@ -80,9 +90,7 @@ export class OrderScopeComponent implements OnInit {
|
|
80
|
90
|
|
|
81
|
91
|
// 全选、全不选分组
|
|
82
|
92
|
updateAllItsmGroupChecked(){
|
|
83
|
|
- this.isAllItsmGroupChecked = !this.isAllItsmGroupChecked;
|
|
84
|
|
- let flag = this.itsmCheckedGroup.length ? this.itsmCheckedGroup.every(v => v.checked) : false;
|
|
85
|
|
- this.itsmCheckedGroup.forEach(v => v.checked = !flag);
|
|
|
93
|
+ this.itsmCheckedGroup.forEach(v => v.checked = this.isAllItsmGroupChecked);
|
|
86
|
94
|
}
|
|
87
|
95
|
// 选择分组
|
|
88
|
96
|
changeItsmGroup(e){
|
|
|
@@ -90,8 +98,9 @@ export class OrderScopeComponent implements OnInit {
|
|
90
|
98
|
}
|
|
91
|
99
|
// 选择院区
|
|
92
|
100
|
changeItsmHospital(hospitalList){
|
|
|
101
|
+ console.log('hospitalList:', hospitalList)
|
|
93
|
102
|
// 权限内的院区和组
|
|
94
|
|
- let groups = this.user.infoPermission.groups || [];
|
|
|
103
|
+ let groups = this.user.infoPermission.dutyGroupList || [];
|
|
95
|
104
|
|
|
96
|
105
|
// 选中的院区和组
|
|
97
|
106
|
let itsmCheckedHos = this.itsmCheckedHos || [];
|
|
|
@@ -101,12 +110,12 @@ export class OrderScopeComponent implements OnInit {
|
|
101
|
110
|
let groupIds = itsmCheckedGroup.filter(v => v.checked).map(v => v.value);
|
|
102
|
111
|
|
|
103
|
112
|
this.itsmCheckedGroup = groups.filter(v => hosIds.includes(v.hospital.id)).map(v => ({ label: v.hospital.hosName + '-' + v.groupName, value: v.id, checked: groupIds.includes(v.id) }));
|
|
|
113
|
+ console.log('this.itsmCheckedGroup:', this.itsmCheckedGroup)
|
|
104
|
114
|
this.isAllItsmGroupChecked = this.itsmCheckedGroup.length ? this.itsmCheckedGroup.every(v => v.checked) : false;
|
|
105
|
115
|
}
|
|
106
|
|
- // =============================工单范围-运维end========================================
|
|
107
|
|
-
|
|
108
|
|
- // =============================工单范围-配送start========================================
|
|
|
116
|
+ //#endregion 工单范围-运维end
|
|
109
|
117
|
|
|
|
118
|
+ //#region 工单范围-配送start
|
|
110
|
119
|
// 工单范围数据
|
|
111
|
120
|
hosList = []; //院区
|
|
112
|
121
|
taskTypes = []; //当前权限下所有工单类型
|
|
|
@@ -114,9 +123,9 @@ export class OrderScopeComponent implements OnInit {
|
|
114
|
123
|
hosTaskTypes = {}; //当前权限下所有院区对应的任务类型
|
|
115
|
124
|
hosGroups = {}; //当前权限下所有院区对应的人员分组
|
|
116
|
125
|
getOrderScope() {
|
|
117
|
|
- this.hosList = this.user.infoPermission.hospitals;
|
|
|
126
|
+ this.hosList = this.user.infoPermission.hospitals.filter(v => !this.tool.isDuty(v));
|
|
118
|
127
|
this.taskTypes = this.user.infoPermission.taskTypes;
|
|
119
|
|
- this.userGroups = this.user.infoPermission.groups;
|
|
|
128
|
+ this.userGroups = this.user.infoPermission.groups.filter(v => v.type !== 3);
|
|
120
|
129
|
this.hosList.forEach((e) => {
|
|
121
|
130
|
let arrT = [],
|
|
122
|
131
|
arrG = [];
|
|
|
@@ -164,19 +173,15 @@ export class OrderScopeComponent implements OnInit {
|
|
164
|
173
|
this.hosTaskTypes["hos" + this.checkedHos].forEach((e) => {
|
|
165
|
174
|
arr.push(e.id);
|
|
166
|
175
|
});
|
|
167
|
|
- this.changeTaskTypes(this.allTypeChecked ? arr : []);
|
|
168
|
|
- let obj = {};
|
|
169
|
|
- arr.forEach((e) => {
|
|
170
|
|
- obj[e] = this.allTypeChecked;
|
|
171
|
|
- });
|
|
172
|
|
- this.initTypes = obj;
|
|
|
176
|
+ this.changeTaskTypes(this.allTypeChecked ? arr : [], false);
|
|
|
177
|
+
|
|
173
|
178
|
}
|
|
174
|
179
|
|
|
175
|
180
|
// 工单类型
|
|
176
|
181
|
checkedTypes = []; //已选中taskTypes的ID数组
|
|
177
|
182
|
changeType: boolean = false; //是否改变工单类型
|
|
178
|
183
|
hosTypesChecked = {}; //当前权限下所有院区下选中的工单类型
|
|
179
|
|
- changeTaskTypes(val) {
|
|
|
184
|
+ changeTaskTypes(val, isOwn = true) {
|
|
180
|
185
|
this.checkedTypes = val;
|
|
181
|
186
|
this.changeType = true;
|
|
182
|
187
|
this.hosTypesChecked["hos" + this.checkedHos] = val;
|
|
|
@@ -186,6 +191,24 @@ export class OrderScopeComponent implements OnInit {
|
|
186
|
191
|
} else {
|
|
187
|
192
|
this.allTypeChecked = false;
|
|
188
|
193
|
}
|
|
|
194
|
+
|
|
|
195
|
+ if(isOwn){
|
|
|
196
|
+ let obj = {};
|
|
|
197
|
+ console.log('arr:', val)
|
|
|
198
|
+ console.log('hosTaskTypes:', this.hosTaskTypes)
|
|
|
199
|
+ val.forEach((e) => {
|
|
|
200
|
+ obj[e] = true;
|
|
|
201
|
+ });
|
|
|
202
|
+ this.initTypes = obj;
|
|
|
203
|
+ }else{
|
|
|
204
|
+ let obj = {};
|
|
|
205
|
+ console.log('arr:', val)
|
|
|
206
|
+ console.log('hosTaskTypes:', this.hosTaskTypes)
|
|
|
207
|
+ val.forEach((e) => {
|
|
|
208
|
+ obj[e] = this.allTypeChecked;
|
|
|
209
|
+ });
|
|
|
210
|
+ this.initTypes = obj;
|
|
|
211
|
+ }
|
|
189
|
212
|
}
|
|
190
|
213
|
|
|
191
|
214
|
// 人员分组全选
|
|
|
@@ -195,18 +218,14 @@ export class OrderScopeComponent implements OnInit {
|
|
195
|
218
|
this.hosGroups["hos" + this.checkedHos].forEach((e) => {
|
|
196
|
219
|
arr.push(e.id);
|
|
197
|
220
|
});
|
|
198
|
|
- this.changeGroups(this.allGroupChecked ? arr : []);
|
|
199
|
|
- let obj = {};
|
|
200
|
|
- arr.forEach((e) => {
|
|
201
|
|
- obj[e] = this.allGroupChecked;
|
|
202
|
|
- });
|
|
203
|
|
- this.initGroups = obj;
|
|
|
221
|
+ this.changeGroups(this.allGroupChecked ? arr : [], false);
|
|
|
222
|
+
|
|
204
|
223
|
}
|
|
205
|
224
|
// 人员分组
|
|
206
|
225
|
checkedGroups = [];
|
|
207
|
226
|
changeGroup: boolean = false; //是否改变分组
|
|
208
|
227
|
hosGroupsChecked = {}; //当前权限下所有院区下选中的人员分组
|
|
209
|
|
- changeGroups(val) {
|
|
|
228
|
+ changeGroups(val, isOwn = true) {
|
|
210
|
229
|
this.checkedGroups = val;
|
|
211
|
230
|
this.changeGroup = true;
|
|
212
|
231
|
this.hosGroupsChecked["hos" + this.checkedHos] = val;
|
|
|
@@ -216,6 +235,20 @@ export class OrderScopeComponent implements OnInit {
|
|
216
|
235
|
} else {
|
|
217
|
236
|
this.allGroupChecked = false;
|
|
218
|
237
|
}
|
|
|
238
|
+
|
|
|
239
|
+ if(isOwn){
|
|
|
240
|
+ let obj = {};
|
|
|
241
|
+ val.forEach((e) => {
|
|
|
242
|
+ obj[e] = true;
|
|
|
243
|
+ });
|
|
|
244
|
+ this.initGroups = obj;
|
|
|
245
|
+ }else{
|
|
|
246
|
+ let obj = {};
|
|
|
247
|
+ val.forEach((e) => {
|
|
|
248
|
+ obj[e] = this.allGroupChecked;
|
|
|
249
|
+ });
|
|
|
250
|
+ this.initGroups = obj;
|
|
|
251
|
+ }
|
|
219
|
252
|
}
|
|
220
|
253
|
|
|
221
|
254
|
// 工单范围院区切换
|
|
|
@@ -276,20 +309,38 @@ export class OrderScopeComponent implements OnInit {
|
|
276
|
309
|
typesId.push({ id: e });
|
|
277
|
310
|
});
|
|
278
|
311
|
|
|
279
|
|
- let postData = {
|
|
|
312
|
+ let itsm = this.scopeTabs.find(v => v.value == 1);
|
|
|
313
|
+ let hsms = this.scopeTabs.find(v => v.value == 2);
|
|
|
314
|
+
|
|
|
315
|
+ let postData:any = {
|
|
280
|
316
|
workerOrderScope: {
|
|
281
|
|
- hospitalId: { id: this.checkedHos - 0 },
|
|
282
|
|
- typeIds: typesId,
|
|
283
|
|
- groupIds: groupsId,
|
|
284
|
|
- range: this.orderScopeRadio - 0,
|
|
285
|
317
|
userId: this.user.user.id,
|
|
|
318
|
+ mdv2Switch: Number(itsm.checked),
|
|
|
319
|
+ hsmsSwitch: Number(hsms.checked),
|
|
286
|
320
|
},
|
|
287
|
321
|
};
|
|
|
322
|
+
|
|
|
323
|
+ if(itsm.checked){
|
|
|
324
|
+ postData.workerOrderScope.allDuty = this.allDuty;
|
|
|
325
|
+ postData.workerOrderScope.dutyIds = this.itsmCheckedHos.filter(v => v.checked).map(v => v.value).toString();
|
|
|
326
|
+ postData.workerOrderScope.dutyGroupIds = this.itsmCheckedGroup.filter(v => v.checked).map(v => v.value).toString();
|
|
|
327
|
+ postData.workerOrderScope.dutyRange = this.itsmOrderScopeRadio - 0;
|
|
|
328
|
+ }
|
|
|
329
|
+ if(hsms.checked){
|
|
|
330
|
+ postData.workerOrderScope.hospitalId = { id: this.checkedHos - 0 };
|
|
|
331
|
+ postData.workerOrderScope.typeIds = typesId;
|
|
|
332
|
+ postData.workerOrderScope.groupIds = groupsId;
|
|
|
333
|
+ postData.workerOrderScope.range = this.orderScopeRadio - 0;
|
|
|
334
|
+ }
|
|
288
|
335
|
if (this.user.user.scope && this.user.user.scope.id) {
|
|
289
|
336
|
postData.workerOrderScope["id"] = this.user.user.scope.id;
|
|
290
|
337
|
}
|
|
|
338
|
+ console.log('allDuty', this.allDuty)
|
|
|
339
|
+ console.log('itsmCheckedHos', this.itsmCheckedHos)
|
|
|
340
|
+ console.log('itsmCheckedGroup', this.itsmCheckedGroup)
|
|
|
341
|
+ console.log('itsmOrderScopeRadio', this.itsmOrderScopeRadio)
|
|
291
|
342
|
console.log(postData);
|
|
292
|
|
- return;
|
|
|
343
|
+ // return;
|
|
293
|
344
|
this.mainService
|
|
294
|
345
|
.coopTypeConfig("addData", "workerOrderScope", postData)
|
|
295
|
346
|
.subscribe((data) => {
|
|
|
@@ -344,5 +395,5 @@ export class OrderScopeComponent implements OnInit {
|
|
344
|
395
|
console.log(this.initGroups);
|
|
345
|
396
|
console.log(this.initTypes);
|
|
346
|
397
|
}
|
|
347
|
|
- // =============================工单范围-配送end========================================
|
|
|
398
|
+ //#endregion 工单范围-配送end
|
|
348
|
399
|
}
|
seimin