Merge branch 'master' of http://git.dashitech.com/seimin/zy-pc

src/app/components/bind-extension-number/bind-extension-number.component.ts

@@ -44,7 +44,7 @@ export class BindExtensionNumberComponent implements OnInit {
   scopeTabs:any[] = [];
   activeScopeTab:any;
 	menuList:any;
-	
+
   ngOnInit() {
     // console.log('itsmData', this.itsmData);
     // console.log('hsmsData', this.hsmsData);
@@ -56,7 +56,7 @@ export class BindExtensionNumberComponent implements OnInit {
     this.getHjzxCornetList();
     this.getCallCenterConfig();
   }
-	
+
 	init(){
 		if(this.menuList && this.menuList.childrens){
 			for(let i of this.menuList.childrens){
@@ -75,7 +75,7 @@ export class BindExtensionNumberComponent implements OnInit {
 			this.scopeTabs[0].checked = true
 		}
 	}
-	
+
   // 获取院区列表
   getHospitalList() {
     // 工单范围
@@ -85,9 +85,10 @@ export class BindExtensionNumberComponent implements OnInit {
       // 开通运维
       if(this.itsmData.allDuty === 1){
         // 不限制部门
-        let hospitals = this.user.infoPermission.hospitals || [];
-        let dutyList = this.user.infoPermission.dutyList || [];
-        this.hospitalList = hospitals.concat(dutyList);
+        this.hospitalList = this.user.infoPermission.hospitals || [];
+        // let hospitals = this.user.infoPermission.hospitals || [];
+        // let dutyList = this.user.infoPermission.dutyList || [];
+        // this.hospitalList = hospitals.concat(dutyList);
       }else{
         // 限制部门
         if(this.hsmsData.hsmsSwitch){

src/app/views/inspection-plan/inspection-plan.component.ts

@@ -360,10 +360,10 @@ export class InspectionPlanComponent implements OnInit {
     this.validateForm.controls.signType.setValue(data.signType ? data.signType.value : null);
     this.validateForm.controls.execDay.setValue(data.execDay);
 
-    if(data.formId){
+    if(data.formId && data.inspectionFormDTO){
       let obj = this.formIds.find(v => v.id == data.formId);
       if(!obj){
-        this.formIds.unshift(obj);
+        this.formIds.unshift(data.inspectionFormDTO);
       }
       this.validateForm.controls.formId.setValue(data.formId);