拉取代码

src/app/views/fuwutai/fuwutai.component.html

@@ -1529,12 +1529,12 @@
 										</div>
 										<div class="df-fl margin-right">
 											<span class="label"><span class="red">*</span> 联系电话：</span>
-											<input nz-input type="number" class="formItem" [(ngModel)]="contactsPhone" placeholder="请输入联系电话" nzSize="default" />
+											<input nz-input class="formItem" [(ngModel)]="contactsPhone" placeholder="请输入联系电话" nzSize="default" />
 										</div>
 									</div>
 									<div class="item df">
 										<span class="label"><span class="red">*</span> 投诉人：</span>
-										<input nz-input class="formItem" [(ngModel)]="complainant" placeholder="请输入联系人" nzSize="default" />
+										<input nz-input class="formItem" [(ngModel)]="complainant" placeholder="请输入投诉人" nzSize="default" />
 									</div>
 									<div class="item df">
 										<span class="label"><span class="red">*</span> 省市区：</span>
@@ -1542,7 +1542,7 @@
 									</div>
 									<div class="item df">
 										<span class="label"><span class="red">*</span> 详细地址：</span>
-										<input nz-input class="formItem" [(ngModel)]="detailedAddress" placeholder="请输入联系电话" nzSize="default" />
+										<input nz-input class="formItem" [(ngModel)]="detailedAddress" placeholder="请输入详细地址" nzSize="default" />
 									</div>
 									<div class="item df">
 										<span class="label"><span class="red">*</span> 简述：</span>

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

@@ -456,8 +456,8 @@ export class FuwutaiComponent implements OnInit {
         if (data["status"] == 200) {
           this.newOrderShow = false; //关闭弹窗
           if (go === "&go&") {
-            this.applyDept = data["startDept"].id;
-            this.applyStartDept = data["startDept"];
+            this.applyDept = data["createDept"].id;
+            this.applyStartDept = data["createDept"];
             this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
             this.showPromptModal("建单", true, "", "closeGo");
           } else {
@@ -470,8 +470,8 @@ export class FuwutaiComponent implements OnInit {
 				else if(data["status"] == 1000033){
 					this.newOrderShow = false; //关闭弹窗
 					if (go === "&go&") {
-					  this.applyDept = data["startDept"].id;
-					  this.applyStartDept = data["startDept"];
+					  this.applyDept = data["createDept"].id;
+					  this.applyStartDept = data["createDept"];
 					  this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
 					}
 					//重复建单那策略
@@ -555,8 +555,8 @@ export class FuwutaiComponent implements OnInit {
         if (data["status"] == 200) {
           this.newOrderShow = false; //关闭弹窗
           if (go === "&go&") {
-            this.applyDept = data["startDept"].id;
-            this.applyStartDept = data["startDept"];
+            this.applyDept = data["createDept"].id;
+            this.applyStartDept = data["createDept"];
             this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
             this.showPromptModal("建单", true, "", "closeGo");
           } else {
@@ -568,8 +568,8 @@ export class FuwutaiComponent implements OnInit {
         } else if(data["status"] == 100042){
           this.newOrderShow = false; //关闭弹窗
 					if (go === "&go&") {
-						this.applyDept = data["startDept"].id;
-						this.applyStartDept = data["startDept"];
+						this.applyDept = data["createDept"].id;
+						this.applyStartDept = data["createDept"];
 						this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
 						this.showPromptModal("建单", false, data["msg"], "closeGo");
 					}else{
@@ -579,8 +579,8 @@ export class FuwutaiComponent implements OnInit {
 				else if(data["status"] == 1000033){
 					this.newOrderShow = false; //关闭弹窗
 					if (go === "&go&") {
-						this.applyDept = data["startDept"].id;
-						this.applyStartDept = data["startDept"];
+						this.applyDept = data["createDept"].id;
+						this.applyStartDept = data["createDept"];
 						this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
 					}
 					//重复建单那策略
@@ -620,8 +620,8 @@ export class FuwutaiComponent implements OnInit {
       if (data["status"] == 200) {
         this.newOrderShow = false; //关闭弹窗
         if (go === "&go&") {
-          this.applyDept = data["startDept"].id;
-          this.applyStartDept = data["startDept"];
+          this.applyDept = data["createDept"].id;
+          this.applyStartDept = data["createDept"];
           this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
           this.showPromptModal("建单", true, "", "closeGo");
         } else {
@@ -633,8 +633,8 @@ export class FuwutaiComponent implements OnInit {
       }else if(data["status"] == 1000033){
 				 this.newOrderShow = false; //关闭弹窗
 				 if (go === "&go&") {
-				 	this.applyDept = data["startDept"].id;
-				 	this.applyStartDept = data["startDept"];
+				 	this.applyDept = data["createDept"].id;
+				 	this.applyStartDept = data["createDept"];
 				 	this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
 				 }
 				 //重复建单那策略
@@ -695,8 +695,8 @@ export class FuwutaiComponent implements OnInit {
       if (data["status"] == 200) {
         this.newOrderShow = false; //关闭弹窗
         if (go === "&go&") {
-          this.applyDept = data["startDept"].id;
-          this.applyStartDept = data["startDept"];
+          this.applyDept = data["createDept"].id;
+          this.applyStartDept = data["createDept"];
           this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
           this.showPromptModal("建单", true, "", "closeGo");
         } else {
@@ -709,8 +709,8 @@ export class FuwutaiComponent implements OnInit {
 			else if(data["status"] == 1000033){
 				this.newOrderShow = false; //关闭弹窗
 				if (go === "&go&") {
-					this.applyDept = data["startDept"].id;
-					this.applyStartDept = data["startDept"];
+					this.applyDept = data["createDept"].id;
+					this.applyStartDept = data["createDept"];
 					this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
 				}
 				//重复建单那策略
@@ -765,8 +765,8 @@ export class FuwutaiComponent implements OnInit {
       if (data["status"] == 200) {
         this.newOrderShow = false; //关闭弹窗
         if (go === "&go&") {
-          this.applyDept = data["startDept"].id;
-          this.applyStartDept = data["startDept"];
+          this.applyDept = data["createDept"].id;
+          this.applyStartDept = data["createDept"];
           this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
           this.showPromptModal("建单", true, "", "closeGo");
         } else {
@@ -779,8 +779,8 @@ export class FuwutaiComponent implements OnInit {
 			else if(data["status"] == 1000033){
 				this.newOrderShow = false; //关闭弹窗
 				if (go === "&go&") {
-					this.applyDept = data["startDept"].id;
-					this.applyStartDept = data["startDept"];
+					this.applyDept = data["createDept"].id;
+					this.applyStartDept = data["createDept"];
 					this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
 				}
 				//重复建单那策略
@@ -1269,6 +1269,7 @@ export class FuwutaiComponent implements OnInit {
       console.log(jso);
       _this.incidentModel = { repairIncidentType: 'dept' };
       _this.callNumber = _this.incidentModel.incomingPhone = jso.caller;//来电的电话
+			_this.contactsPhone = jso.caller
       _this.incidentModel.callID = jso.crs;//来电的话机id
       if (jso) {
         console.log('呼入坐席成功，请摘机-----seimin');
@@ -1665,7 +1666,7 @@ export class FuwutaiComponent implements OnInit {
           this.incidentModel = { repairIncidentType: 'dept' };
           this.incidentMsg = {};
           this.incidentModel.callID = data.callId || undefined;
-
+					this.contactsPhone = data.phone;
           this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data.phone;
           this.searchBxDept();
         } else if (data.status == 201 && data.phone === "") {
@@ -1948,7 +1949,14 @@ export class FuwutaiComponent implements OnInit {
       this.itsmOrders = [];
       return;
     }
-
+		if(!this.incidentModel.department){
+			this.itsmOrders = [];
+			return;
+		}
+		if(this.incidentModel.repairIncidentType === 'public'){
+			this.itsmOrders = [];
+			return
+		}
     let postData = {
       incident: {
         "deleteFlag": 0,
@@ -1974,6 +1982,9 @@ export class FuwutaiComponent implements OnInit {
 	// 获取政务值班近期记录
 	itsmZwOrders:any=[];
 	getZwOrders(){
+		if(!this.incidentModel.callID){
+			return
+		}
 		let postData = {
 		  governmentDuty: {
 				callAccept: this.incidentModel.callID || undefined,
@@ -1997,7 +2008,7 @@ export class FuwutaiComponent implements OnInit {
 		}else{
 			delete postData.governmentDuty.province
 			delete postData.governmentDuty.city
-			delete postData.governmentDuty.province
+			delete postData.governmentDuty.district
 		}
 		this.loading6 = true;
 		this.mainService
@@ -2916,6 +2927,7 @@ export class FuwutaiComponent implements OnInit {
   tabClick(key, isInit = false, patient?) {
     let preCurrentTabIndex = this.currentTabIndex;
     this.currentTabIndex = key;
+		console.log(1112233,this.currentTabIndex)
     this.radioValueQt = null;
     this.startDeptQt = null;
     this.endDeptQt = null;
@@ -2961,32 +2973,32 @@ export class FuwutaiComponent implements OnInit {
     // }else
 		 
 		 if(this.currentTabIndex === '故障报修'){
-      if(this.incidentModel.department){
-        this.rightTitle_tab = [
-          { id: 2, name: '近期维修' },
-          { id: 3, name: '知识库' },
-        ]
-        this.rightTitleHandler(this.rightTitle_tab[0].id);
-      }
+				this.incidentModel.department = null;
+				this.rightTitle_tab = [
+					{ id: 2, name: '近期维修' },
+					{ id: 3, name: '知识库' },
+				]
+				this.rightTitleHandler(this.rightTitle_tab[0].id);
+			
 
       let deptObj = this.applicationDepartmentList.find(v => v.id == this.applyDept);
 
       if(this.incidentModel.department != this.applyDept && (!isInit || !this.buildType)){
-        this.incidentModel.department = this.applyDept;
-        this.searchApplicationDepartment('itsm', deptObj ? deptObj.dept : '', undefined, this.applyDept);
+				if(this.incidentModel.repairIncidentType === 'dept'){
+					this.incidentModel.department = this.applyDept;
+					this.searchApplicationDepartment('itsm', deptObj ? deptObj.dept : '', undefined, this.applyDept);
+				}
       }
     }else if (this.currentTabIndex === '政务值班'){
 			this.rightTitle_tab = [
 			  { id: 4, name: '近期记录' },
 			]
 			this.rightTitleHandler(4);
-			
-			let deptObj = this.applicationDepartmentList.find(v => v.id == this.applyDept);
-			
-			if(this.incidentModel.department != this.applyDept && (!isInit || !this.buildType)){
-			  this.incidentModel.department = this.applyDept;
-			  this.searchApplicationDepartment('itsm', deptObj ? deptObj.dept : '', undefined, this.applyDept);
-			}
+		}else{
+			this.rightTitle_tab = [
+			  { id: 0, name: '近期配送' },
+			]
+			this.rightTitleHandler(this.rightTitle_tab[0].id);
 		}
   }
 	
@@ -3063,19 +3075,29 @@ export class FuwutaiComponent implements OnInit {
 				contactsPhone: this.contactsPhone,
 				contacts: this.contacts,
 				complainant: this.complainant,
-				detailedAddress: this.complainant,
+				detailedAddress: this.detailedAddress,
 				province: {
-					id: this.province[0]
+					id: null
 				},
 				city: {
-					id: this.province[1]
+					id: null
 				},
 				district: {
-					id: this.province[2]
+					id: null
 				},
-				callAccept: this.incidentModel.callID || undefined
+				callAccept: this.incidentModel.callID || undefined,
+				platform: '3'
 			}
 		};
+		if(this.province.length>0){
+			data.governmentDuty.province.id = this.province[0]
+			data.governmentDuty.city.id = this.province[1]
+			data.governmentDuty.district.id = this.province[2]
+		}else{
+			delete data.governmentDuty.province
+			delete data.governmentDuty.city
+			delete data.governmentDuty.district
+		}
 		that.zwLoading = true;
 		that.mainService
 			.dataPost("addData", "governmentDuty", data)
@@ -3084,6 +3106,7 @@ export class FuwutaiComponent implements OnInit {
 				that.initZwForm();
 				if (data.status == 200) {
 					this.getZwOrders();
+					this.newOrderShow = false;
 					that.showPromptModal("新增", true, "");
 				} else {
 					that.showPromptModal("新增", false, data.msg);
@@ -3691,11 +3714,12 @@ export class FuwutaiComponent implements OnInit {
   }
   // 选择报修类型
   changeRepairIncidentType(value){
-    this.incidentModel.department = undefined;
+    // this.incidentModel.department = undefined;
     this.incidentMsg.deptManyPhone = '';
 
     this.isRelatedDepartment = value !== 'public';
     this.changeApplyRelatedDepartment(this.isRelatedDepartment);
+		this.rightTitleHandler(this.rightTitle_tab[0].id);
   }
   // 楼栋列表
   applicationBuildingList:any[] = [];
@@ -4556,9 +4580,9 @@ export class FuwutaiComponent implements OnInit {
           // 任务类型是否显示操作项
           let arr = this.workTypesArrange;
           this.workTypesFlag = arr.length >= 5;
-          // 默认选中第一项
+          // 默认选中故障现象
           if (arr.length > 0) {
-            isFirst ? this.tabClick(arr[0].key, isInit) : this.tabClick(arr[arr.length - 1].key, isInit);
+            isFirst ? this.tabClick(arr[0].key, isInit) : this.tabClick(arr[arr.length - 2].key, isInit);
           }
         }
       });
@@ -5427,8 +5451,8 @@ export class FuwutaiComponent implements OnInit {
       } 
 			else if(result["status"] == 1000033){
 				if (this.goType === "&go&") {
-					this.applyDept = result["startDept"].id;
-					this.applyStartDept = result["startDept"];
+					this.applyDept = result["createDept"].id;
+					this.applyStartDept = result["createDept"];
 					this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = result["phone"];
 				}
 				//重复建单那策略

src/app/views/government-duty/government-duty.component.html

@@ -111,7 +111,7 @@
 				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="contactsPhone">联系电话</nz-form-label>
 				  <nz-form-control nzErrorTip="请选择联系电话!">
 				    <nz-input-group>
-							<input nz-input type="number" class="formItem" formControlName="contactsPhone" placeholder="请输入联系电话" nzSize="default" />
+							<input nz-input class="formItem" formControlName="contactsPhone" placeholder="请输入联系电话" nzSize="default" />
 				    </nz-input-group>
 				  </nz-form-control>
 				</nz-form-item>

src/app/views/government-duty/government-duty.component.ts

@@ -165,8 +165,8 @@ export class GovernmentDutyComponent implements OnInit {
 	    this.startDate = this.endDate = null;
 	    return;
 	  }
-	  this.startDate = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
-	  this.endDate = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+		this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
+		this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
 	  this.dateRange = [this.startDate,this.endDate]
 	}
 	

src/app/views/monthly-task/monthly-task.component.html

@@ -118,7 +118,7 @@
           </nz-form-control>
         </nz-form-item>
 				
-				<nz-form-item>
+				<nz-form-item *ngIf="add">
 				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="liableUser">责任人</nz-form-label>
 				  <nz-form-control nzErrorTip="请选择责任人!">
 				    <nz-input-group>
@@ -135,6 +135,15 @@
 				  </nz-form-control>
 				</nz-form-item>
 				
+				<nz-form-item *ngIf="!add">
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="liableUserNmae">责任人</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择责任人!">
+				    <nz-input-group>
+							<input nz-input class="formItem" disabled formControlName="liableUserNmae" placeholder="请选择责任人" nzSize="default" />
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
 				<div class="df">
 					<nz-form-item>
 					  <nz-form-label [nzSm]="8" [nzXs]="24" nzRequired nzFor="startTime">开始时间</nz-form-label>

src/app/views/monthly-task/monthly-task.component.ts

@@ -143,8 +143,8 @@ export class MonthlyTaskComponent implements OnInit {
 	    this.startDate = this.endDate = null;
 	    return;
 	  }
-	  this.startDate = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
-	  this.endDate = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+		this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
+		this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
 	  this.dateRange = [this.startDate,this.endDate]
 	}
 	
@@ -154,7 +154,9 @@ export class MonthlyTaskComponent implements OnInit {
 	  let data:any = {
 	    user: {
 				name,
-	      hosIds: this.hosId,
+	      hospital: {
+					id: this.hosId
+				},
 	    },
 	    idx: 0,
 	    sum: 20,
@@ -310,6 +312,7 @@ export class MonthlyTaskComponent implements OnInit {
       taskDescribe: [null, [Validators.required]],
       priority: [null, [Validators.required]],
 			liableUser: [null, [Validators.required]],
+			liableUserNmae: [null, []],
       startTime: [null, [Validators.required]],
       endTime: [null, [Validators.required]],
     });
@@ -381,6 +384,7 @@ export class MonthlyTaskComponent implements OnInit {
 		this.validateForm.controls.taskDescribe.setValue(data.taskDescribe);
 		this.validateForm.controls.priority.setValue(data.priority.id);
 		this.validateForm.controls.liableUser.setValue(data.liableUserDTO.id)
+		this.validateForm.controls.liableUserNmae.setValue(data.liableUserDTO.name)
 		this.validateForm.controls.startTime.setValue(data.startTime);
 		this.validateForm.controls.endTime.setValue(data.endTime);
 		this.modal = true

src/app/views/task-list/task-list.component.html

@@ -26,7 +26,7 @@
 						</ng-container>
 					</nz-select>
 				</div>
-				<div class="list-template__searchItem">
+			<!-- 	<div class="list-template__searchItem">
 					<span class="label">执行人：</span>
 					<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
 						(nzOnSearch)="changeUser($event)" nzAllowClear nzPlaceHolder="请选择执行人员" [(ngModel)]="executor">
@@ -37,7 +37,7 @@
 							<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
 						</nz-option>
 					</nz-select>
-				</div>
+				</div> -->
 		  </div>
 			<div class="list-template__btns">
 				<button class="btn default" (click)='search()'>搜索</button>

src/app/views/task-list/task-list.component.ts

@@ -72,6 +72,7 @@ export class TaskListComponent implements OnInit {
 	specimenNameList:any = [];
 	addressLoading:any = false;
 	month:any = [];
+	userId:any;
 	
   ngOnInit() {
 		for(let i=1; i<13; i++){
@@ -81,6 +82,7 @@ export class TaskListComponent implements OnInit {
 		}
     this.coopBtns = this.tool.initCoopBtns(this.route);
 		this.hosId = this.tool.getCurrentHospital().id;
+		this.userId = this.tool.getCurrentUserId();
 		this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
 			this.isLoading = true;
 			this.getAllUser(e[0])
@@ -141,7 +143,7 @@ export class TaskListComponent implements OnInit {
 					id: '',
 				},
 				monthTask:this.monthTask || undefined,
-        executor: this.executor || undefined,
+        executor: this.userId,
       },
     };
 		if(this.priority){

src/app/views/web-repairs/web-repairs.component.html

@@ -14,7 +14,7 @@
       <div class="userInfo dropdown">
         <div class="user" (mouseenter)="showDropdown = true" (mouseleave)="showDropdown = false">
           <img src="../../assets/images/icon_keshi.png" alt="">
-          <span><ng-container *ngIf="loginUser.dept">{{deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept}}-</ng-container>{{loginUser.name}}</span>
+          <span><ng-container *ngIf="loginUser.dept"></ng-container>{{loginUser.name}}</span>
           <i class="icon_transport transport-xiala1 ml8"></i>
         </div>
         <div class="dropdown-content r8" [hidden]="!showDropdown" (mouseenter)="showDropdown = true" (mouseleave)="showDropdown = false">
@@ -47,7 +47,7 @@
 						</div>
 						<div class="list-template__searchItem">
 						  <span class="label">单号：</span>
-							<input type="text" class="search-input" [(ngModel)]="incidentsign" nz-input placeholder="请输入患者" />
+							<input type="text" class="search-input" [(ngModel)]="incidentsign" nz-input placeholder="请输入单号" />
 						</div>
 			    </div>
 			    <div nz-col nzLg="6" class="list-template__btns">
@@ -210,96 +210,6 @@
   </div>
 </div>
 
-<!-- 查看详情 -->
-<div class="pathology-box display_flex align-items_center justify-content_flex-center" *ngIf="detailMoadl">
-	<div class="pathology-content">
-		<div class="title">查看详情
-		<i class="icon_transport transport-guanbi" (click)="closeDetailMoadl()"></i></div>
-		<div class="content border">
-			<div class="content-item boder-right">
-				<div class="form-title-box">
-					<div class="form-title"><span class="font-weight-500">是否术中快速：</span>{{detailsData.pathologyFormType==1?'是':'否'}}</div>
-					<div class="form-title"><span class="font-weight-500">申请单编号：</span>{{detailsData.applyCode}}</div>
-					<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status.name}}</div>
-					<div class="form-title"><span class="font-weight-500">科室名称：</span>{{detailsData.patientDTO.department.dept}}</div>
-				</div>
-				<div class="form-title-box">
-					<div class="form-title"><span class="font-weight-500">住院号：</span>{{detailsData.patientDTO.patientCode}}</div>
-					<div class="form-title"><span class="font-weight-500">患者信息：</span>{{detailsData.patientDTO.patientName}} ({{detailsData.patientDTO.bedNum}}床)</div>
-					<div class="form-title"><span class="font-weight-500">年龄：</span>{{detailsData.patientDTO.age||'-'}}岁</div>
-				</div>
-
-				<div class="form-title-box">
-					<div class="form-title"><span class="font-weight-500">检验项目：</span>{{project||'无'}}</div>
-				</div>
-
-				<div class="form-list">
-					<div class="form-title font-weight-500">诊断：</div>
-					<div class="indent">
-						{{detailsData.diagnose||'无'}}
-					</div>
-				</div>
-
-				<div class="form-list">
-					<div class="form-title font-weight-500">病历摘要：</div>
-					<div class="indent">{{detailsData.medicalRecords||'无'}}</div>
-				</div>
-				<div class="form-list">
-					<div class="form-title font-weight-500">手术方案：</div>
-					<div class="indent">{{detailsData.surgicalPlan||'无'}}</div>
-				</div>
-
-				<div class="form-title-box">
-					<div class="form-title"><span class="font-weight-500">标本类型：</span>{{detailsData.specimenType.name||'无'}}</div>
-					<div class="form-title"><span class="font-weight-500">标本数量：</span>{{detailsData.specimenNum||'无'}}</div>
-					<div class="form-title"><span class="font-weight-500">部位：</span>{{detailsData.takePart||'无'}}</div>
-				</div>
-
-				<div class="form-title-box">
-					<div class="form-title"><span class="font-weight-500">送检医生：</span>{{detailsData.surgeryDoctorDTO?detailsData.surgeryDoctorDTO.name : '-'}}</div>
-					<div class="form-title"><span class="font-weight-500">离体时间：</span>{{detailsData.inVitroTime?(detailsData.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</div>
-					<div class="form-title"><span class="font-weight-500">固定时间：</span>{{detailsData.fixationTime?(detailsData.fixationTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</div>
-				</div>
-
-				<div class="form-list">
-					<div class="form-title font-weight-500">标本：</div>
-					<div class="form-title specimen-list">
-						<div *ngFor="let item of specimenList" class="specimen-item-class form-title cursors" (click)="specimenView(item)">
-							<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.specimenName}}({{item.specimenCode}})
-						</div>
-					</div>
-				</div>
-
-			</div>
-
-			<div class="content-item-right">
-				<div class="step-title">病理闭环</div>
-				<nz-steps [nzCurrent]="stepLength" nzDirection="vertical" nzSize="small">
-					<ng-container *ngFor="let item of pathologyLogs; let index = index">
-							<nz-step
-								[nzDescription]="tpl"
-							>
-							</nz-step>
-							<ng-template #tpl>
-								<div *ngIf="index==pathologyLogs.length-1" class="step-size">
-									<div style="color: #49B856;">{{item.operationType.name}} {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
-									<div style="color:#333;">{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto?item.operationUserDto.name:''}}</div>
-								</div>
-								<div *ngIf="index!=pathologyLogs.length-1" class="step-size">
-									<div>{{item.operationType.name}} {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
-									<div>{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto?item.operationUserDto.name:''}}</div>
-								</div>
-							</ng-template>
-						</ng-container>
-				</nz-steps>
-			</div>
-		</div>
-		<div class="display_flex justify-content_flex-center bottom-btn">
-			<button class="btn btn-right" nz-button nzType="primary" (click)="closeDetailMoadl()">知道了</button>
-		</div>
-	</div>
-</div>
-
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
   [info]="promptInfo" (closeModel)="closeModel()"></app-prompt-modal>
@@ -312,7 +222,7 @@
 <router-outlet (deactivate)="getConnectList()"></router-outlet>
 
 <!-- 快速报修 -->
-<div class="commonModal display_flex justify-content_flex-center align-items_center" *ngIf="bxModal" (click)="clickExtra($event)">
+<div class="commonModal display_flex justify-content_flex-center align-items_center" *ngIf="bxModal">
   <div class="modalBody">
     <div class="title">一键报修<i class="icon_transport transport-guanbi" (click)="hideBxModal()"></i>
     </div>
@@ -384,7 +294,7 @@
           <nz-form-label [nzSm]="4" [nzXs]="4" nzRequired nzFor="officeAddress" hidden></nz-form-label>
           <nz-form-control style="display: inline-block;" class="address">
             <nz-input-group>
-              <input class="addressFocus" style="width:185px;" nz-input formControlName="officeAddress" placeholder="请输入详细位置" (focus)="focusAddress()" />
+              <input class="addressFocus" style="width:185px;" nz-input formControlName="officeAddress" placeholder="请输入详细位置"/>
               <div class="addressList" *ngIf="isShowAddressList">
                 <ng-container *ngIf="!addressLoading && addressList.length">
                   <div class="addressItem ellipsis-oneline" *ngFor="let item of addressList" [title]="item.name" (click)="selectAddress(item.name)">{{item.name}}</div>

src/app/views/web-repairs/web-repairs.component.ts

@@ -196,7 +196,9 @@ export class WebRepairsComponent implements OnInit {
   }
 	
 	// 初始化新增form表单
+	initNum:any = 0;
 	initBxForm(content) {
+		this.initNum++;
 	  this.validateBxForm = this.fb.group({
 	    description: [content || null, [Validators.required]],
 	    building: [null, [Validators.required]],
@@ -205,54 +207,50 @@ export class WebRepairsComponent implements OnInit {
 	    contacts: [this.loginUser.name, [Validators.required]],
 	    contactsInformation: [this.loginUser.phone, [Validators.required]],
 	  });
-	  this.getDeptById(this.currentDept.id);
+		if(this.userInfo.buildingDTO){
+			this.changeHosp();
+		}else{
+			this.getUserInfo();
+		}
 	}
-	// 根据科室ID获取详情
+	// 查询用户信息
 	deptDto:any = {};
-	getDeptById(id){
-	  this.mainService
-	    .getFetchDataList("simple/data", "department", {
-	      idx: 0,
-	      sum: 1,
-	      department: {
-	        id,
-	      }
-	    })
-	    .subscribe((data:any) => {
-	      let list = data.list || [];
-	      this.deptDto = list.length > 0 ? list[0] : {};
-	      console.log(this.deptDto);
-	      this.changeHosp();
-	      // 回显楼栋
-	      if(this.deptDto.building){
-	        this.validateBxForm.controls.building.setValue(this.deptDto.building.id);
-	      }
-	
-	      // 回显楼层
-	      if(this.deptDto.floor){
-	        this.validateBxForm.controls.floor.setValue(this.deptDto.floor.id);
-	      }
-	    });
+	getUserInfo(){
+		// 回显楼栋
+		if(this.userInfo.buildingDTO){
+		  this.validateBxForm.controls.building.setValue(this.userInfo.buildingDTO.id);
+		}
+		// 回显楼层
+		if(this.userInfo.floorDTO){
+		  this.validateBxForm.controls.floor.setValue(this.userInfo.floorDTO.id);
+		}
+		if(this.userInfo.address){
+			this.validateBxForm.controls.officeAddress.setValue(this.userInfo.address);
+		}	
+		if(this.userInfo.name){
+			this.validateBxForm.controls.contacts.setValue(this.userInfo.name);
+		}
+		if(this.userInfo.phone){
+			this.validateBxForm.controls.contactsInformation.setValue(this.userInfo.phone);
+		}
 	}
 	// 切换院区选项
 	buildings: any = []; //楼栋
 	changeHosp() {
-	  this.validateBxForm.controls.building.setValue(null);
 	  this.buildings = [];
 	  let data = {
 	    idx: 0,
 	    sum: 9999,
 	    building: {
-	      hosId: this.deptDto.hospital.id,
+	      hosId: this.hosId,
 	    }
 	  };
 	  this.mainService
 	    .getFetchDataList("simple/data", "building", data)
 	    .subscribe((data:any) => {
 	      this.buildings = data.list || [];
-	      this.floors = [];
-	      this.message.remove(this.maskFlag);
 	      this.maskFlag = false;
+				this.getUserInfo();
 	    });
 	}
 	
@@ -263,8 +261,8 @@ export class WebRepairsComponent implements OnInit {
 	  if(!buildingId){
 	    return;
 	  }
-	  this.validateBxForm.controls.floor.setValue(null);
-	  this.validateBxForm.controls.officeAddress.setValue(null);
+		this.validateBxForm.controls.floor.setValue(null);
+		this.validateBxForm.controls.officeAddress.setValue(null);
 	  this.floors = [];
 	
 	  let data = {
@@ -293,9 +291,6 @@ export class WebRepairsComponent implements OnInit {
 	fileList:any = [];
 	validateBxForm: FormGroup; //新增/编辑表单
 	speediness(data?) {
-	  this.maskFlag = this.message.loading("正在加载中..", {
-	    nzDuration: 0,
-	  }).messageId;
 	  this.bxModal = true;
 	  this.coopBx = data || {};
 		this.fileList = [];
@@ -303,6 +298,7 @@ export class WebRepairsComponent implements OnInit {
 	}
 	// 隐藏模态框
 	hideBxModal() {
+		this.initNum = 0;
 	  this.bxModal = false;
 		this.fileList = [];
 	}
@@ -316,10 +312,6 @@ export class WebRepairsComponent implements OnInit {
 	    this.message.error('请填写必填字段！');
 	    return;
 	  };
-	  if (!this.deptDto.id){
-	    this.message.error('数据异常，无法建单！');
-	    return;
-	  };
 	  this.showReqModal();
 	}
 	
@@ -389,7 +381,7 @@ export class WebRepairsComponent implements OnInit {
 	            houseNumber: this.validateBxForm.value.officeAddress,
 	            contacts: this.validateBxForm.value.contacts,
 	            contactsInformation: this.validateBxForm.value.contactsInformation,
-	            hosId: this.deptDto.hospital.id,
+	            hosId: this.hosId,
 	            source: pc,
 	            fromWx: true,
 	            requester: this.loginUser,
@@ -408,6 +400,7 @@ export class WebRepairsComponent implements OnInit {
 	          this.bxModal = false;
 	          this.hideReqModal();
 	          if ((res as any).state == 200) {
+							this.initNum = 0;
 							// 图片上传
 							if(this.fileList.length){
 								console.log(this.fileList.map(v => v.originFileObj));
@@ -546,7 +539,6 @@ export class WebRepairsComponent implements OnInit {
 	    incident: {
 				incidentsign: this.incidentsign || undefined,
 				statusId: this.status || undefined,
-	      repairIncidentType: { id: this.repairIncidentTypeList.find(v => v.value === 'public').id },
 	    	requester: {
 					id: this.userId
 				},