提交代码

src/app/components/order-scope/order-scope.component.html

@@ -49,6 +49,15 @@
             </nz-radio-group>
           </div>
         </div>
+				<div nz-row>
+				  <div nz-col nzSpan="5">是否展示重新指派：</div>
+				  <div nz-col nzSpan="19">
+				    <nz-radio-group class="w100" [(ngModel)]="showReassign" [nzDisabled]="!activeScopeTab.checked">
+				      <label nz-radio [nzValue]="1">是</label>
+				      <label nz-radio [nzValue]="0">否</label>
+				    </nz-radio-group>
+				  </div>
+				</div>
       </div>
       <!-- 配送 -->
       <div class="conditions" *ngIf="scopeTabs.length>0 && activeScopeTab.value == 2">

src/app/components/order-scope/order-scope.component.ts

@@ -45,6 +45,7 @@ export class OrderScopeComponent implements OnInit {
 	activeScopeTab:any;
 	//#region 工单范围-运维start
 	allDuty:number = 1;
+	showReassign:number = 0;
 	menuList:any;
 	
   ngOnInit() {
@@ -99,7 +100,8 @@ export class OrderScopeComponent implements OnInit {
     itsmGetOrderScope() {
       // 是否不限制部门
       this.allDuty = this.itsmData.allDuty === undefined ? 1 : this.itsmData.allDuty;
-      // 权限内的院区和组
+      this.showReassign = this.itsmData.showReassign;
+			// 权限内的院区和组
       let hosList = this.user.infoPermission.dutyList || [];
       let groups = this.user.infoPermission.dutyGroupList || [];
 
@@ -383,6 +385,7 @@ export class OrderScopeComponent implements OnInit {
 
       if(itsm && itsm.checked){
         postData.workerOrderScope.allDuty = this.allDuty;
+				postData.workerOrderScope.showReassign = this.showReassign;
         postData.workerOrderScope.dutyIds = this.itsmCheckedHos.filter(v => v.checked).map(v => v.value).toString() || undefined;
         postData.workerOrderScope.dutyGroupIds = this.itsmCheckedGroup.filter(v => v.checked).map(v => v.value).toString() || undefined;
         postData.workerOrderScope.dutyRange = this.itsmOrderScopeRadio - 0;

src/app/services/main.service.ts

@@ -1107,5 +1107,11 @@ export class MainService {
 			responseType: "arraybuffer",
 		});
 	}
+	// 恢复删除的用户
+	recoveryUser(data){
+		return this.http.post(host.host + `/user/data/recoveryUser`, data, {
+		  headers: this.headers,
+		});
+	}
 	
 }

src/app/views/fuwutai/fuwutai.component.ts

@@ -1377,7 +1377,6 @@ export class FuwutaiComponent implements OnInit {
   itsmCheckedHos;// 运维-院区选择
   itsmScopeGroups = []; //运维-当前所属人员分组
   itsmOrderScopeRadio;// 运维-工单范围
-
   hsmsData: any = {
     checkedHos: undefined,
     scopeGroups: [],
@@ -1423,6 +1422,7 @@ export class FuwutaiComponent implements OnInit {
       orderScopeRadio: this.itsmOrderScopeRadio || '0',
       mdv2Switch: scopeInfo.mdv2Switch === 1,
       allDuty: scopeInfo.allDuty === undefined ? 1 : scopeInfo.allDuty,
+			showReassign: scopeInfo.showReassign == null || scopeInfo.showReassign == 0 ? 0 : 1,
     }
     this.flagList.itsmFlag1 = this.itsmData.mdv2Switch;
     this.flagList.itsmFlag2 = this.itsmData.mdv2Switch;
@@ -1456,6 +1456,7 @@ export class FuwutaiComponent implements OnInit {
   }
 
   showOrderScope() {
+		console.log(1111,this.itsmData)
     this.showInitModal = true;
   }
 
@@ -2137,12 +2138,11 @@ export class FuwutaiComponent implements OnInit {
             range: this.orderScopeRadio,
             platform: 3,
             searchDays: 1,
-            keyWord: keyWords,
+            keyWord: keyWords
           },
           idx: 0,
-          sum: 1,
+          sum: 1
         }
-
         if (this.unassignedBuilding.length && stateId == 1) {
           postData.workOrderQuery.workOrder["deptIds"] = this.unassignedBuilding.toString();
         }
@@ -2162,7 +2162,9 @@ export class FuwutaiComponent implements OnInit {
           "queryTask": "storageAcceptReassign",
           "assignee": this.tool.getCurrentUserId(),
           "deleteFlag": 0,
+					"showReassign":null
         }
+				postData.incidentQuery.incident.showReassign = this.user.user.scope.showReassign==0 || !this.user.user.scope.showReassign ? undefined : this.user.user.scope.showReassign
       }else if(stateId == 2){
         postData.incidentQuery.incident = {
           // "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),

src/app/views/users-management/users-management.component.html

@@ -230,6 +230,12 @@
 <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading" [cancenlLoading]="cancenlLoading"
   (confirmDelEvent)="confirmDel()" (cancelDelEvent)="cancelDel()" content="是否删除企业微信同用户？" confirmTxt="是" cancelTxt="否">
 </app-dialog-delete>
+
+<!-- 恢复账号 -->
+<app-dialog-delete [delModal]="recoverModal" (hideDelModalEvent)="hideRecoverModal()" [btnLoading]="recoverLoading"
+  (confirmDelEvent)="confirmRecover()" [content]="recoverContent" confirmTxt="恢复账号" >
+</app-dialog-delete>
+
 <!-- 重置密码模态框 -->
 <app-dialog-delete [delModal]="resetModal" (hideDelModalEvent)="hideResetModal()" [btnLoading]="btnLoading" [cancenlLoading]="cancenlLoading"
   (confirmDelEvent)="confirmReset()" (cancelDelEvent)="cancelReset()" content="是否重置密码？">

src/app/views/users-management/users-management.component.ts

@@ -63,6 +63,8 @@ export class UsersManagementComponent implements OnInit {
   promptModalShow: boolean; //操作提示框是否展示
 
   btnLoading: boolean = false; //提交按钮loading状态
+	recoverLoading: boolean = false; //提交按钮loading状态
+	recoverModal: boolean = false; //恢复模态框
   wxRequired = false; //新增或编辑用户的时候，微信号是否必填
   changeInpSubject = new Subject(); //防抖
   changeInpCompanySubject = new Subject(); //防抖
@@ -392,6 +394,8 @@ export class UsersManagementComponent implements OnInit {
     }
   }
   // 表单提交
+	recoverContent:any;
+	userData:any;
   submitForm(): void {
     var that = this;
     for (const i in that.validateForm.controls) {
@@ -443,9 +447,13 @@ export class UsersManagementComponent implements OnInit {
         that.initForm();
         if (data.status == 200) {
           that.showPromptModal(that.add ? "新增" : "编辑", true, "");
-        } else {
-          that.showPromptModal(that.add ? "新增" : "编辑", false, data.msg);
-        }
+        } else if(data.status == 2002 || data.status == 2004){
+					this.userData = data
+					this.recoverContent = data.msg
+					this.recoverModal = true;
+        }else{
+					that.showPromptModal(that.add ? "新增" : "编辑", false, data.msg);
+				}
       });
   }
 
@@ -618,6 +626,40 @@ export class UsersManagementComponent implements OnInit {
         }
       });
   }
+	
+	// 确认恢复
+	confirmRecover() {
+	  let that = this;
+		let query = {
+			account:'',
+			weiXin:''
+		}
+		if(this.userData.status==2002){
+			query.account = this.userData.data.account
+			delete query.weiXin
+		}else if (this.userData.status==2004){
+			query.weiXin = this.userData.data.weixin
+			delete query.account
+		}
+	  that.recoverLoading = true;
+	  that.mainService
+	    .recoveryUser(query)
+	    .subscribe((data) => {
+	      that.recoverLoading = false;
+	      that.hideRecoverModal();
+	      if (data["status"] == 200) {
+	        that.showPromptModal("恢复", true, "");
+	      } else {
+	        that.showPromptModal("恢复", false, data["msg"]);
+	      }
+	    });
+	}
+	
+	// 关闭恢复模态框
+	hideRecoverModal() {
+	  this.recoverModal = false;
+	}
+	
   // 关闭删除模态框
   hideDelModal() {
     this.delModal = false;