Browse Source

待接单支持转派,转派指派建单根据组查询人员

seimin 4 months ago
parent
commit
e1bc4f4ddf

+ 0 - 1
src/app/components/configurationCenter/configuration-category/configuration-category.component.ts

@@ -136,7 +136,6 @@ export class ConfigurationCategoryComponent implements OnInit {
136
     }
136
     }
137
     let postData = {
137
     let postData = {
138
       user: {
138
       user: {
139
-        hospital: { id: this.validateConfigForm.value.dutyId },
140
         name: keyword,
139
         name: keyword,
141
         simpleQuery: true,
140
         simpleQuery: true,
142
         groupdata: { id: this.validateConfigForm.value.groupId },
141
         groupdata: { id: this.validateConfigForm.value.groupId },

+ 0 - 1
src/app/components/configurationCenter/configuration-deptUser/configuration-deptUser.component.ts

@@ -165,7 +165,6 @@ export class ConfigurationDeptUserComponent implements OnInit {
165
 			sum: 9999,
165
 			sum: 9999,
166
 			user: {
166
 			user: {
167
 				// name:name,
167
 				// name:name,
168
-				hospital: { id: this.hosId || "" },
169
 				groupdata:{id:groupId || ""},
168
 				groupdata:{id:groupId || ""},
170
         roleCodes: 'first-line support',
169
         roleCodes: 'first-line support',
171
         engineer: 1,
170
         engineer: 1,

+ 0 - 1
src/app/components/incidentManagement/incident-create/incident-create.component.ts

@@ -558,7 +558,6 @@ export class IncidentCreateComponent implements OnInit {
558
       sum: 20,
558
       sum: 20,
559
       user: {
559
       user: {
560
         name:keyWord,
560
         name:keyWord,
561
-				hospital: this.incidentModel.duty ? { id: this.incidentModel.duty.id } : undefined,
562
 				groupdata: this.incidentModel.group ? { id: this.incidentModel.group } : undefined,
561
 				groupdata: this.incidentModel.group ? { id: this.incidentModel.group } : undefined,
563
         roleCodes: 'first-line support',
562
         roleCodes: 'first-line support',
564
         engineer: 1,
563
         engineer: 1,

+ 0 - 1
src/app/components/incidentManagement/incident-substitutio-assign/incident-substitution-assign.component.ts

@@ -156,7 +156,6 @@ export class IncidentSubstitutionAssignComponent implements OnInit {
156
     }
156
     }
157
     let postData = {
157
     let postData = {
158
       user: {
158
       user: {
159
-        hospital: { id: this.validateForm.value.dutyId },
160
         name: keyword,
159
         name: keyword,
161
         simpleQuery: true,
160
         simpleQuery: true,
162
         groupdata: { id: this.validateForm.value.groupId },
161
         groupdata: { id: this.validateForm.value.groupId },

+ 0 - 1
src/app/components/incidentManagement/incident-substitutio-redeploy/incident-substitution-redeploy.component.ts

@@ -91,7 +91,6 @@ export class IncidentSubstitutionRedeployComponent implements OnInit {
91
     }
91
     }
92
     let postData = {
92
     let postData = {
93
       user: {
93
       user: {
94
-        hospital: { id: this.duty.id },
95
         name: keyword,
94
         name: keyword,
96
         simpleQuery: true,
95
         simpleQuery: true,
97
         groupdata: { id: this.validateForm.value.groupId },
96
         groupdata: { id: this.validateForm.value.groupId },

+ 14 - 0
src/app/components/incidentManagement/incident-substitution/incident-substitution.component.ts

@@ -88,6 +88,20 @@ export class IncidentSubstitutionComponent implements OnInit {
88
         // 转派
88
         // 转派
89
         if(this.incidentData.state.value == 'handler' && this.incidentData.handlingPersonnelUser && this.incidentData.handlingPersonnelUser.id == this.tool.getCurrentUserId() && !this.coopBtns.assign && this.coopBtns.transfer){
89
         if(this.incidentData.state.value == 'handler' && this.incidentData.handlingPersonnelUser && this.incidentData.handlingPersonnelUser.id == this.tool.getCurrentUserId() && !this.coopBtns.assign && this.coopBtns.transfer){
90
           this.tabs.splice(0, 0, {id: 1, name: '转派', value: 'redeploy', num: ''});
90
           this.tabs.splice(0, 0, {id: 1, name: '转派', value: 'redeploy', num: ''});
91
+        }else if(this.incidentData.state.value == 'pending'){
92
+          let inUser = this.incidentData.currentLog && this.incidentData.currentLog.workerId == this.tool.getCurrentUserId();
93
+          let inGroup = false;
94
+          let groupList = this.tool.getCurrentGroupList();
95
+          groupList.forEach(item => {
96
+              if(this.incidentData.currentLog){
97
+                  if (item.id == this.incidentData.currentLog.groupId) {
98
+                      inGroup = true;
99
+                  }
100
+              }
101
+          })
102
+          if((inUser || inGroup)){
103
+            this.tabs.splice(0, 0, {id: 1, name: '转派', value: 'redeploy', num: ''});
104
+          }
91
         }
105
         }
92
 
106
 
93
         // 指派
107
         // 指派

+ 0 - 1
src/app/views/fuwutai/fuwutai.component.ts

@@ -3235,7 +3235,6 @@ export class FuwutaiComponent implements OnInit {
3235
       sum: 20,
3235
       sum: 20,
3236
       user: {
3236
       user: {
3237
         name:keyWord,
3237
         name:keyWord,
3238
-				hospital: this.incidentModel.duty ? { id: this.incidentModel.duty.id } : undefined,
3239
 				groupdata: this.incidentModel.group ? { id: this.incidentModel.group } : undefined,
3238
 				groupdata: this.incidentModel.group ? { id: this.incidentModel.group } : undefined,
3240
         roleCodes: 'first-line support',
3239
         roleCodes: 'first-line support',
3241
         engineer: 1,
3240
         engineer: 1,