拉取代码

src/app/components/configurationCenter/configuration-drug/configuration-drug.component.html

@@ -38,7 +38,21 @@
                     <nz-form-label class="label">支持接单并签到</nz-form-label>
                     <nz-checkbox-group [(ngModel)]="item.postData.drugsReceiveSign"></nz-checkbox-group>
                   </div>
-
+									
+									<!-- 收药是否验证发药科室 -->
+									<div class="display_flex align-items_center mb8">
+									  <nz-form-label class="label">收药是否验证发药科室</nz-form-label>
+									  <nz-checkbox-group [(ngModel)]="item.postData.drugsVerifyPharmacy"></nz-checkbox-group>
+									</div>
+									
+									<!-- 终点清点方式 -->
+									<div class="display_flex align-items_center mb8" *ngIf="item.postData.drugsModel==2">
+									  <nz-form-label class="label" nzRequired>终点清点方式</nz-form-label>
+									  <nz-radio-group [(ngModel)]="item.postData.drugsEndCountMethod">
+									    <label nz-radio [nzValue]="item.value" *ngFor="let item of endClearingList">{{ item.label }}</label>
+									  </nz-radio-group>
+									</div>
+									
                   <!-- 起点科室支持核对 -->
                   <div class="display_flex align-items_center mb8">
                     <nz-form-label class="label">起点科室支持核对</nz-form-label>

src/app/components/configurationCenter/configuration-drug/configuration-drug.component.ts

@@ -40,7 +40,13 @@ export class ConfigurationDrugComponent implements OnInit {
     { label: '一单一码', value: 1 },
     { label: '一单多码', value: 2 },
   ];
-
+	
+	// 终点清点方式
+	endClearingList:any[] = [
+	  { label: '扫一扫清点', value: 1 },
+	  { label: '数量核对清点', value: 2 },
+	];
+	
   // 手动填写
   drugsManualList:any[] = [];
 
@@ -53,7 +59,9 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsModel: undefined,//工单模式
         drugsCreateSign: [{ label:'是否开启', value: 0 }],//支持建单并签到
         drugsReceiveSign: [{ label:'是否开启', value: 0 }],//支持接单并签到
-        drugsStartCheck: [{ label:'是否开启', value: 0 }],//起点科室支持核对
+				drugsVerifyPharmacy: [{ label:'是否开启', value: 0 }],//收药是否验证发药科室
+        drugsEndCountMethod: undefined,//终点清点方式
+				drugsStartCheck: [{ label:'是否开启', value: 0 }],//起点科室支持核对
         drugsStartCheckScanIds: [],//起点核对方式
         drugsStartManual: undefined,//起点科室手动填写
         drugsStartPhoto: [{ label:'是否开启', value: 0 }],//起点科室支持拍照留存
@@ -76,7 +84,9 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsModel: undefined,//工单模式
         drugsCreateSign: [{ label:'是否开启', value: 0 }],//支持建单并签到
         drugsReceiveSign: [{ label:'是否开启', value: 0 }],//支持接单并签到
-        drugsStartCheck: [{ label:'是否开启', value: 0 }],//起点科室支持核对
+				drugsVerifyPharmacy: [{ label:'是否开启', value: 0 }],//收药是否验证发药科室
+        drugsEndCountMethod: undefined,//终点清点方式
+				drugsStartCheck: [{ label:'是否开启', value: 0 }],//起点科室支持核对
         drugsStartCheckScanIds: [],//起点核对方式
         drugsStartManual: undefined,//起点科室手动填写
         drugsStartPhoto: [{ label:'是否开启', value: 0 }],//起点科室支持拍照留存
@@ -99,7 +109,9 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsModel: undefined,//工单模式
         drugsCreateSign: [{ label:'是否开启', value: 0 }],//支持建单并签到
         drugsReceiveSign: [{ label:'是否开启', value: 0 }],//支持接单并签到
-        drugsStartCheck: [{ label:'是否开启', value: 0 }],//起点科室支持核对
+				drugsVerifyPharmacy: [{ label:'是否开启', value: 0 }],//收药是否验证发药科室
+        drugsEndCountMethod: undefined,//终点清点方式
+				drugsStartCheck: [{ label:'是否开启', value: 0 }],//起点科室支持核对
         drugsStartCheckScanIds: [],//起点核对方式
         drugsStartManual: undefined,//起点科室手动填写
         drugsStartPhoto: [{ label:'是否开启', value: 0 }],//起点科室支持拍照留存
@@ -122,7 +134,9 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsModel: undefined,//工单模式
         drugsCreateSign: [{ label:'是否开启', value: 0 }],//支持建单并签到
         drugsReceiveSign: [{ label:'是否开启', value: 0 }],//支持接单并签到
-        drugsStartCheck: [{ label:'是否开启', value: 0 }],//起点科室支持核对
+				drugsVerifyPharmacy: [{ label:'是否开启', value: 0 }],//收药是否验证发药科室
+        drugsEndCountMethod: undefined,//终点清点方式
+				drugsStartCheck: [{ label:'是否开启', value: 0 }],//起点科室支持核对
         drugsStartCheckScanIds: [],//起点核对方式
         drugsStartManual: undefined,//起点科室手动填写
         drugsStartPhoto: [{ label:'是否开启', value: 0 }],//起点科室支持拍照留存
@@ -145,7 +159,9 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsModel: undefined,//工单模式
         drugsCreateSign: [{ label:'是否开启', value: 0 }],//支持建单并签到
         drugsReceiveSign: [{ label:'是否开启', value: 0 }],//支持接单并签到
-        drugsStartCheck: [{ label:'是否开启', value: 0 }],//起点科室支持核对
+				drugsVerifyPharmacy: [{ label:'是否开启', value: 0 }],//收药是否验证发药科室
+        drugsEndCountMethod: undefined,//终点清点方式
+				drugsStartCheck: [{ label:'是否开启', value: 0 }],//起点科室支持核对
         drugsStartCheckScanIds: [],//起点核对方式
         drugsStartManual: undefined,//起点科室手动填写
         drugsStartPhoto: [{ label:'是否开启', value: 0 }],//起点科室支持拍照留存
@@ -214,7 +230,7 @@ export class ConfigurationDrugComponent implements OnInit {
       this.msg.create("warning", "请选择工单模式！");
       return;
     }
-
+		
     if(this.activeDictionary.postData.drugsStartCheck[0].checked && !this.activeDictionary.postData.drugsStartCheckScanIds.filter(v => v.checked).length){
       this.msg.create("warning", "请选择起点科室的核对方式！");
       return;
@@ -224,14 +240,21 @@ export class ConfigurationDrugComponent implements OnInit {
       this.msg.create("warning", "请选择终点科室的核对方式！");
       return;
     }
-
+		
+		if(this.activeDictionary.postData.drugsModel==2 && !this.activeDictionary.postData.drugsEndCountMethod){
+		  this.msg.create("warning", "请选择终点清点方式！");
+		  return;
+		}
+		
     let postData:any = {
       id: this.configs.id,
       taskType: this.tasktype.id,
       hosId: this.hosId,
       drugsModel: this.activeDictionary.postData.drugsModel || undefined,
+			drugsEndCountMethod: this.activeDictionary.postData.drugsEndCountMethod || undefined,
       drugsCreateSign: this.activeDictionary.postData.drugsCreateSign[0].checked ? 1 : 0,
       drugsReceiveSign: this.activeDictionary.postData.drugsReceiveSign[0].checked ? 1 : 0,
+			drugsVerifyPharmacy: this.activeDictionary.postData.drugsVerifyPharmacy[0].checked ? 1 : 0,
       drugsStartCheck: this.activeDictionary.postData.drugsStartCheck[0].checked ? 1 : 0,
       drugsStartCheckScanIds: this.activeDictionary.postData.drugsStartCheckScanIds.filter(v => v.checked).map(v => v.value).toString() || undefined,
       drugsStartManual: this.activeDictionary.postData.drugsStartManual ? { id: this.activeDictionary.postData.drugsStartManual } : undefined,
@@ -330,9 +353,10 @@ export class ConfigurationDrugComponent implements OnInit {
         if (result.status == 200) {
           this.configs = result.list[0] || {};
           this.activeDictionary.postData.drugsModel = this.configs.drugsModel || undefined;
-          this.activeDictionary.postData.drugsCreateSign[0].checked = this.configs.drugsCreateSign == 1;
+					 this.activeDictionary.postData.drugsEndCountMethod = this.configs.drugsEndCountMethod || undefined;
+					this.activeDictionary.postData.drugsCreateSign[0].checked = this.configs.drugsCreateSign == 1;
           this.activeDictionary.postData.drugsReceiveSign[0].checked = this.configs.drugsReceiveSign == 1;
-
+					this.activeDictionary.postData.drugsVerifyPharmacy[0].checked = this.configs.drugsVerifyPharmacy == 1;
           this.activeDictionary.postData.drugsStartCheck[0].checked = this.configs.drugsStartCheck == 1;
           this.activeDictionary.postData.drugsStartCheckScanIds = this.activeDictionary.postData.drugsStartCheckScanIds.map(v => ({...v, checked: (this.configs.drugsStartCheckScanIds || '').split(',').includes(v.value.toString())}));
           this.activeDictionary.postData.drugsStartManual = this.configs.drugsStartManual ? this.configs.drugsStartManual.id : undefined;

src/app/components/configurationCenter/configuration-hospital/configuration-hospital.component.ts

@@ -76,6 +76,14 @@ export class ConfigurationHospitalComponent implements OnInit {
 			let item = this.hospitalList.find(i=>i.key == 'itsmConsumableQuoteDept')
 			item.value = null
 		}
+		
+		if(data.key=='itsmSimpleHandle' && data.value==1){
+			let item = this.hospitalList.find(i=>i.key == 'itsmWriteSolution')
+			item.show = false
+		}else if(data.key=='itsmSimpleHandle' && data.value==0){
+			let item = this.hospitalList.find(i=>i.key == 'itsmWriteSolution')
+			item.show = true
+		}
 	}
 	
 	changeSelect(data){
@@ -166,6 +174,14 @@ export class ConfigurationHospitalComponent implements OnInit {
 							arr = arr.map(i=>i = parseInt(i))
 							i.value = arr
 						}
+						
+						if(i.key=='itsmSimpleHandle' && i.value==1){
+							let item = newData.find(i=>i.key == 'itsmWriteSolution')
+							item.show = false
+						}else if(i.key=='itsmSimpleHandle' && i.value==0){
+							let item = newData.find(i=>i.key == 'itsmWriteSolution')
+							item.show = true
+						}
 					}
 
           this.hospitalList = newData || [];

src/app/components/display-form/display-form.component.html

@@ -68,6 +68,35 @@
             </nz-radio-group>
           </div>
         </div>
+				<div nz-row>
+				  <div nz-col nzSpan="4">左侧菜单：</div>
+				  <div nz-col nzSpan="20">
+				    <nz-radio-group class="w100" [(ngModel)]="leftMenuLocation">
+				      <label nz-radio [nzValue]="1">上</label>
+				      <label nz-radio [nzValue]="2">中</label>
+							<label nz-radio [nzValue]="3">下</label>
+				    </nz-radio-group>
+				  </div>
+				</div>
+				<div nz-row>
+				  <div nz-col nzSpan="4">右侧菜单：</div>
+				  <div nz-col nzSpan="20">
+				    <nz-radio-group class="w100" [(ngModel)]="rightMenuLocation">
+				      <label nz-radio [nzValue]="1">上</label>
+				      <label nz-radio [nzValue]="2">中</label>
+							<label nz-radio [nzValue]="3">下</label>
+				    </nz-radio-group>
+				  </div>
+				</div>
+				<div nz-row>
+				  <div nz-col nzSpan="4">是否展示来源：</div>
+				  <div nz-col nzSpan="20">
+				    <nz-radio-group class="w100" [(ngModel)]="showSource">
+				      <label nz-radio [nzValue]="1">是</label>
+				      <label nz-radio [nzValue]="2">否</label>
+				    </nz-radio-group>
+				  </div>
+				</div>
       </div>
       <div class="conditions display_flex align-items_center justify-content_flex-center" *ngIf="isLoading">
         <nz-spin nzSimple></nz-spin>

src/app/components/display-form/display-form.component.ts

@@ -28,7 +28,9 @@ export class DisplayFormComponent implements OnInit {
   workerInfoTime: number = 60; //配送人员刷新时间
   audioNotDispatched: boolean = true; //是否开启定时播报未派出工单提示音
   orderType: string = 'priority'; //排序方式
-
+	leftMenuLocation: any = 2; //左侧菜单
+	rightMenuLocation: any = 2; //右侧菜单
+	showSource: any = 0; //是否展示来源
   ngOnInit() {
     this.initControlView();
   }
@@ -66,6 +68,10 @@ export class DisplayFormComponent implements OnInit {
         this.workerRefreshTime = this.workerInfoTime = data.list[0].workerInfoTime;
         this.audioNotDispatched = data.list[0].unsendOrderVoice !== false;
         this.orderType = data.list[0].orderType || 'priority';
+				this.leftMenuLocation = data.list[0].leftMenuLocation;
+				this.rightMenuLocation = data.list[0].rightMenuLocation;
+				this.showSource = data.list[0].showSource;
+				
       });
   }
 
@@ -103,6 +109,9 @@ export class DisplayFormComponent implements OnInit {
         unsendOrderVoice: this.audioNotDispatched,
         hurseInfoHiding: this.hurseInfoHiding == 1,
         orderType: this.orderType,
+				leftMenuLocation: this.leftMenuLocation,
+				rightMenuLocation: this.rightMenuLocation,
+				showSource: this.showSource,
       },
     };
     if (this.controlView["id"]) {

src/app/components/incidentManagement/incident-handle-info-simple/incident-handle-info-simple.component.html

@@ -1,4 +1,13 @@
 <div class="incident_handle_info">
+	<div class="row" *ngIf="itsmSimpleHandle.value==1 && itsmWriteSolution.value==1">
+	  <div class="formItem">
+	    <div class="name"><i class="icon_transport transport-required red"></i>解决方案：</div>
+	    <div class="value w100">
+	      <textarea rows="4" nz-input [(ngModel)]="incidentDataCopy.handleDescription" placeholder="请输入解决方案"></textarea>
+	    </div>
+	  </div>
+	</div>
+	
   <div class="row">
     <div class="formItem">
       <div class="name"><i class="icon_transport transport-required red"></i>处理方式：</div>

src/app/components/incidentManagement/incident-handle-info-simple/incident-handle-info-simple.component.ts

@@ -117,6 +117,8 @@ export class IncidentHandleInfoSimpleComponent implements OnInit {
 
   // 获取院区配置信息
   itsmIncidentAsset:any = {};//是否事件关联资产
+	itsmSimpleHandle:any= {};//是否简单处理
+	itsmWriteSolution:any= {};//是否填写解决方案
   getHospitalConfig() {
     let postData = {
       idx: 0,
@@ -131,7 +133,10 @@ export class IncidentHandleInfoSimpleComponent implements OnInit {
       .subscribe((result) => {
         let list = result.list || [];
         this.itsmIncidentAsset = list.find(v => v.key == 'itsmIncidentAsset') || {};
-      });
+				this.itsmSimpleHandle = list.find(v => v.key == 'itsmSimpleHandle') || {};
+				this.itsmWriteSolution = list.find(v => v.key == 'itsmWriteSolution') || {};
+				// console.log(1,this.itsmSimpleHandle,this.itsmWriteSolution)
+			});
   }
 
   // 获取资产列表

src/app/components/incidentManagement/incident-handle-info/incident-handle-info.component.html

@@ -1,12 +1,12 @@
 <div class="incident_handle_info" [hidden]="handleInfoLoading">
-  <div class="formItem column">
+<!--  <div class="formItem column" *ngIf="itsmSimpleHandle.value==1 && itsmWriteSolution.value==1">
     <div class="name"><i class="icon_transport transport-required red"></i>解决方案：</div>
     <div class="value">
       <textarea rows="4" nz-input [(ngModel)]="incidentDataCopy.handleDescription" placeholder="请输入解决方案"></textarea>
     </div>
-  </div>
+  </div> -->
 
-  <div class="formItem">
+  <div class="formItem" *ngIf="itsmSimpleHandle.value != 1">
     <div class="name"><i class="icon_transport transport-required red"></i>故障现象：</div>
     <div class="value w100">
       <nz-select class="w100" [(ngModel)]="incidentDataCopy.category" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
@@ -31,7 +31,7 @@
       </div>
     </div>
 
-    <div class="formItem">
+    <div class="formItem" *ngIf="itsmSimpleHandle.value != 1">
       <div class="name"><i class="icon_transport transport-required red"></i>处理结果：</div>
       <div class="value w100">
         <nz-select class="w100" [(ngModel)]="incidentDataCopy.closecode" nzAllowClear nzPlaceHolder="请选择处理结果">

src/app/components/incidentManagement/incident-handle-info/incident-handle-info.component.ts

@@ -181,6 +181,8 @@ export class IncidentHandleInfoComponent implements OnInit, OnChanges {
 
   // 获取院区配置信息
   itsmIncidentAsset:any = {};//是否事件关联资产
+	itsmSimpleHandle:any= {};//是否简单处理
+	itsmWriteSolution:any= {};//是否填写解决方案
   getHospitalConfig() {
     let postData = {
       idx: 0,
@@ -195,7 +197,9 @@ export class IncidentHandleInfoComponent implements OnInit, OnChanges {
       .subscribe((result) => {
         let list = result.list || [];
         this.itsmIncidentAsset = list.find(v => v.key == 'itsmIncidentAsset') || {};
-      });
+				this.itsmSimpleHandle = list.find(v => v.key == 'itsmSimpleHandle') || {};
+				this.itsmWriteSolution = list.find(v => v.key == 'itsmWriteSolution') || {};
+			});
   }
 
   // 获取资产列表

src/app/components/incidentManagement/incident-handle/incident-handle.component.ts

@@ -79,6 +79,7 @@ export class IncidentHandleComponent implements OnInit {
   // 获取院区配置信息
   itsmSummarySheet:any = {};//是否需要填写汇总单
   itsmSimpleHandle:any = {};//是否简单处理
+	itsmWriteSolution:any = {};//是否填写解决方案
   getHospitalConfig() {
     let postData = {
       idx: 0,
@@ -94,7 +95,7 @@ export class IncidentHandleComponent implements OnInit {
         let list = result.list || [];
         this.itsmSummarySheet = list.find(v => v.key == 'itsmSummarySheet') || {};
         this.itsmSimpleHandle = list.find(v => v.key == 'itsmSimpleHandle') || {};
-        console.log(this.itsmSummarySheet)
+				this.itsmWriteSolution = list.find(v => v.key == 'itsmWriteSolution') || {};
         if(this.isInSummaryOrder()){
           let summary = this.tabs.some(v => v.value == 2);
           console.log(summary)
@@ -236,10 +237,10 @@ export class IncidentHandleComponent implements OnInit {
       // 详细处理
       console.log(this.incidentHandleInfoComponent)
       // return;
-      if(!this.incidentHandleInfoComponent.incidentDataCopy.handleDescription){
-        this.message.warning('请选择解决方案！');
-        return;
-      }
+      // if(!this.incidentHandleInfoComponent.incidentDataCopy.handleDescription){
+      //   this.message.warning('请选择解决方案！');
+      //   return;
+      // }
       if(!this.incidentHandleInfoComponent.incidentDataCopy.category){
         this.message.warning('请选择故障现象！');
         return;
@@ -307,6 +308,13 @@ export class IncidentHandleComponent implements OnInit {
       // 简单处理
       console.log(this.incidentHandleInfoSimpleComponent)
       // return;
+			if(this.itsmWriteSolution.value==1){
+				if(!this.incidentHandleInfoSimpleComponent.incidentDataCopy.handleDescription){
+				  this.message.warning('请选择解决方案！');
+				  return;
+				}
+			}
+			
       if(!this.incidentHandleInfoSimpleComponent.incidentDataCopy.handleCategory){
         this.message.warning('请选择处理方式！');
         return;

src/app/services/main.service.ts

@@ -1248,4 +1248,12 @@ export class MainService {
 		  headers: this.headers,
 		});
 	}
+	
+	// 调度台删除填写原因
+	delWorkOrderWithReason(id, data){
+		return this.http.post(host.host + `/workerOrder/delWorkOrderWithReason/${id}`, data, {
+		  headers: this.headers,
+		});
+	}
+	
 }

src/app/services/tool.service.ts

@@ -334,6 +334,9 @@ export class ToolService {
 				case "record":
 				  coopBtns.record = true; //任务记录
 				  break;
+				case "send":
+				  coopBtns.send = true; //发送消息
+				  break;
       }
     });
     console.log(coopBtns);

src/app/views/drug-search/drug-search-routing.module.ts

@@ -1,9 +1,21 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { DrugSearchComponent } from './drug-search.component';
+import { OrderDetailComponent } from '../../share/order-detail/order-detail.component';
 
-
-const routes: Routes = [{ path: "", component: DrugSearchComponent }];
+const routes: Routes = [
+	{
+	  path: '',
+	  component: DrugSearchComponent,
+	  children: [
+	    {
+	      // 查看详情
+	      path: 'orderDetail/:id',
+	      component: OrderDetailComponent,
+	    }
+	  ]
+	}
+];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],

src/app/views/drug-search/drug-search.component.html

@@ -56,9 +56,37 @@
             </nz-option>
           </nz-select>
         </div>
+				
+				<div class="list-template__searchItem">
+				  <span class="label">药品类型：</span>
+				  <nz-select [nzDropdownMatchSelectWidth]="false" class="formItem" nzShowSearch nzAllowClear
+				    nzPlaceHolder="请选择药品类型" [(ngModel)]="searchCriteria.drugsBagType">
+				    <ng-container *ngFor="let data of drugsList">
+				      <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}"></nz-option>
+				    </ng-container>
+				  </nz-select>
+				</div>
+				
+				<div class="list-template__searchItem">
+				  <span class="label">收取人：</span>
+				  <nz-select [nzDropdownMatchSelectWidth]="false" class="formItem" nzServerSearch nzShowSearch nzAllowClear
+				    nzPlaceHolder="请选择收取人" [(ngModel)]="searchCriteria.receiverName" (nzOnSearch)="changeUserInp($event)">
+				    <ng-container *ngFor="let data of userSearch">
+				      <nz-option *ngIf="!isLoading" nzLabel="{{data.name}}" nzValue="{{data.id}}"></nz-option>
+				    </ng-container>
+				    <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+				      <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+				    </nz-option>
+				  </nz-select>
+				</div>
+				
+				<div class="list-template__searchItem">
+				  <span class="label width-105">开始时间区间：</span>
+				  <nz-range-picker nzShowTime [(ngModel)]="searchCriteria.dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
+				</div>
       </div>
       <div nz-col nzXl="8" class="list-template__btns">
-        <!-- <button nz-button class="btn default" (click)="showDelModal('您确认要清空药品吗？')" *ngIf="currentUserAccount == 'dsadmin'">清空药品</button> -->
+        <button nz-button class="btn default" (click)="addMoadl()" *ngIf="coopBtns.add">新增</button>
         <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
         <button nz-button class="btn default ml8" (click)='getList(1)'>搜索</button>
       </div>
@@ -69,33 +97,51 @@
         <thead>
           <tr class="thead">
             <th nzWidth="5%">序号</th>
-            <th nzWidth="9%">发药科室</th>
-            <th nzWidth="9%">申请科室</th>
-            <th nzWidth="9%">收取人</th>
-            <th nzWidth="9%">同步时间</th>
-            <th nzWidth="9%">药品状态</th>
-            <th nzWidth="9%">记账时间</th>
-            <th nzWidth="9%">配药时间</th>
-            <th nzWidth="9%">核对时间</th>
-            <th nzWidth="9%">请领单号</th>
-            <th nzWidth="7%">药品标识</th>
-            <th nzWidth="7%">操作</th>
+						<th nzWidth="12%">请领单号|药品类型</th>
+            <th nzWidth="12%">发药科室|申请科室</th>
+            <th nzWidth="10%">同步时间</th>
+						<th nzWidth="12%">收取人|收取时间</th>
+						<th nzWidth="12%">送达人|送达时间</th>
+						<th nzWidth="8%">送达交接人</th>
+            <th nzWidth="7%">状态</th>
+            <th nzWidth="8%">工单号</th>
+            <th nzWidth="14%">操作</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let i = index">
             <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
-            <td>{{ data.launch?.dept}}</td>
-            <td>{{ data.target?.dept }}</td>
-            <td>{{ data.deliveryUser?.name }}</td>
-            <td>{{ data.creatTime }}</td>
-            <td>{{ data.drugsState?.name }}</td>
-            <td>{{data.bagTime}}</td>
-            <td>{{data.startDispensingTime}}</td>
-            <td>{{data.checkTime}}</td>
-            <td>{{data.packid}}</td>
-            <td>{{data.id}}</td>
-            <td><button (click)="showLogs(data)">查看历史</button></td>
+            <td>
+							<div>{{data.packid}}</div>
+							<div>{{data.drugsBagType && data.drugsBagType.name}}</div>
+						</td>
+            <td>
+							<div>{{ data.launch?.dept}}</div>
+							<div>{{ data.target?.dept }}</div>
+						</td>
+						<td>{{ data.creatTime }}</td>
+            <td>
+							<div>{{ data.deliveryUser?.name }}</div>
+							<div>{{ data.packTime }}</div>
+						</td>
+						<td>
+							<div>{{ data.sendUser?.name }}</div>
+							<div>{{ data.signtime }}</div>
+						</td>
+						<td>{{ data.sendHandoverUser?.name }}</td>
+						<td>{{ data.drugsState?.name }}</td>
+            <td class="text-underline" (click)="detail($event, data)">{{ data.workOrderDTO?.gdcode }}</td>
+            <td>
+							<div class="coop">
+							  <span (click)="showLogs(data)">查看日志</span>
+							</div>
+							<div class="coop" *ngIf="coopBtns.edit">
+							  <span (click)="edit(data)">编辑</span>
+							</div>
+							<div class="coop" *ngIf="coopBtns.send && (data.drugsState.value == 1 || data.drugsState.value == 2 || data.drugsState.value == 4 || data.drugsState.value == 8)">
+							  <span (click)="sendMsg(data)">消息发送</span>
+							</div>
+						</td>
           </tr>
         </tbody>
       </nz-table>
@@ -121,3 +167,119 @@
   [drugsBagId]="drugsBagId"
   (closeModelHs)="closeModelLog($event)"
 ></app-log-prompt-modal>
+
+<!-- 新增/编辑模态框 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="modal">
+  <div class="modalBody">
+    <div class="title">{{add?"新增":"编辑"}}<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <div class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="packid">请领单号</nz-form-label>
+          <nz-form-control nzErrorTip="请选择请领单号!">
+            <nz-input-group>
+        			<input nz-input class="formItem" formControlName="packid" placeholder="请输入请领单号" nzSize="default" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="batchNo">批次号</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择批次号!">
+				    <nz-input-group>
+							<input nz-input class="formItem" formControlName="batchNo" placeholder="请输入批次号" nzSize="default" />
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="launch">发药科室</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择发药科室!">
+				    <nz-input-group>
+							<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+							  (nzOnSearch)="changeDept($event)" nzAllowClear nzPlaceHolder="请选择发药科室" formControlName="launch">
+								<ng-container *ngFor="let option of deptList">
+								  <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+								</ng-container>
+								<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+								  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+								</nz-option>
+							</nz-select>
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="target">申请科室</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择申请科室!">
+				    <nz-input-group>
+							<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+							  (nzOnSearch)="changeDept($event)" nzAllowClear nzPlaceHolder="请选择申请科室" formControlName="target">
+								<ng-container *ngFor="let option of deptList">
+								  <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+								</ng-container>
+								<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+								  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+								</nz-option>
+							</nz-select>
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label [nzSm]="8" [nzXs]="24" nzRequired nzFor="creatTime">开始时间</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择同步时间!">
+				    <nz-input-group>
+				      <nz-date-picker
+								nzShowTime
+								nzFormat="yyyy-MM-dd HH:mm:ss"
+								nzPlaceHolder="请选择同步时间"
+								formControlName="creatTime"
+								(ngModelChange)="onStartChange($event)"
+							></nz-date-picker>
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="drugsState">药品状态</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择药品状态!">
+				    <nz-input-group>
+							<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择药品状态" formControlName="drugsState">
+							  <ng-container *ngFor="let option of types">
+							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+							</nz-select>
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="drugsBagType">药品类型</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择药品类型!">
+				    <nz-input-group>
+							<nz-select class="formItem" [nzDisabled]="!add" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择药品类型" formControlName="drugsBagType">
+							  <ng-container *ngFor="let option of drugsList">
+							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+							</nz-select>
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 发送消息 -->
+<app-dialog-delete [delModal]="sendModal" (hideDelModalEvent)="hideSendModal()" [btnLoading]="btnLoading" 
+  (confirmDelEvent)="confirmSend()" (cancelDelEvent)="cancelSend()" content="您确认发送消息吗？消息发送会进入建单通道" confirmTxt="是" cancelTxt="否">
+</app-dialog-delete>
+
+<!-- 查看详情 -->
+<router-outlet></router-outlet>

src/app/views/drug-search/drug-search.component.less

@@ -1,5 +1,14 @@
 @import "../../../../src/theme.less";
 
+.width-105{
+	width: 105px !important;
+}
+
+.text-underline{
+	text-decoration: underline;
+	cursor: pointer;
+}
+
 .save {
   position: fixed;
   left: 0;
@@ -104,7 +113,11 @@
         .addForm {
           .ant-form-item {
             margin-bottom: 15px;
-
+						
+						.ant-select{
+							width: 100% !important;
+						}
+						
             .ant-form-item-label {
               line-height: 14px;
               text-align: left;

src/app/views/drug-search/drug-search.component.ts

@@ -3,6 +3,9 @@ import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
 import { MainService } from "src/app/services/main.service";
 import { ToolService } from "src/app/services/tool.service";
+import { format, startOfDay, endOfDay } from 'date-fns';
+import { ActivatedRoute, Router } from "@angular/router";
+import { FormBuilder, Validators, FormGroup, FormControl } from "@angular/forms";
 
 @Component({
   selector: "app-drug-search",
@@ -10,7 +13,13 @@ import { ToolService } from "src/app/services/tool.service";
   styleUrls: ["./drug-search.component.less"],
 })
 export class DrugSearchComponent implements OnInit {
-  constructor(private mainService: MainService, private tool: ToolService) {}
+  constructor(
+	private fb: FormBuilder,
+	private mainService: MainService, 
+	private tool: ToolService,
+	private router: Router,
+	private route: ActivatedRoute
+	) {}
 
   currentUserAccount: any = JSON.parse(localStorage.getItem("user")).user.account; //当前登录人账号
   searchCriteria = {
@@ -19,6 +28,9 @@ export class DrugSearchComponent implements OnInit {
     launch: null, //发药科室
     target: null, //发药科室
     drugsState: null,
+		receiverName: null,
+		drugsBagType: null,
+		dateRange:[],
   };
   deptList = []; // 院区下的配送人员列表(搜索框)
   hosId;
@@ -27,11 +39,23 @@ export class DrugSearchComponent implements OnInit {
   pageSize: number = 10; //表格每页展示条数
   listLength: number = 10; //表格总数据量
   changeInpSubject = new Subject();
+	changeUserInpSubject = new Subject();
+	coopBtns:any;
+	validateForm: FormGroup; //新增/编辑表单
+	
   ngOnInit() {
+		this.coopBtns = this.tool.initCoopBtns(this.route);
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
       this.searchDept(v);
     });
+		this.changeUserInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  this.searchUser(v);
+		});
     this.getHospital();
+		this.getDrugsList();
+		this.searchDept('');
+		this.searchUser('');
+		this.searchTypes();
   }
   // 查看流程信息弹窗
   logPromptModalShow = false; //弹窗开关
@@ -104,6 +128,58 @@ export class DrugSearchComponent implements OnInit {
       this.searchTypes();
     }
   }
+	
+	// 获取药品类型
+	drugsList:any = [];
+	getDrugsList(){
+		this.mainService.getDictionary("list", "drugs_bag_type").subscribe((res) => {
+		  this.drugsList = res;
+		});
+	}
+	
+	//获取用户
+	userSearch:any = [];
+	searchUser(keyword) {
+	  let data = {
+	    user: {
+	      usertype: { id: 106 },
+	      name: keyword,
+	      hospital: {
+	        id: this.hosId,
+	      },
+	    },
+	    idx: 0,
+	    sum: 10,
+	  };
+	  this.mainService
+	    .getFetchDataList("data", "user", data)
+	    .subscribe((data) => {
+	      if (data.status == 200) {
+					this.isLoading = false;
+					this.userSearch = data.list;
+	      }
+	    });
+	}
+	
+	// 搜索用户
+	changeUserInp(e){
+		this.isLoading = true;
+		this.changeUserInpSubject.next(e);
+	}
+	
+	// 日期选择
+	startDate: string; //发起时间开始
+	endDate: string; //发起时间结束
+	changeDate(result?): void {
+	  if (result.length==0) {
+	    this.startDate = this.endDate = null;
+	    return;
+	  }
+		this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
+		this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
+	  this.searchCriteria.dateRange = [this.startDate,this.endDate]
+	}
+	
   // 重置
   reset() {
     this.searchCriteria = {
@@ -112,7 +188,12 @@ export class DrugSearchComponent implements OnInit {
       launch: null,
       target: null,
       drugsState: null,
+			receiverName: null,
+			drugsBagType: null,
+			dateRange:[]
     };
+		this.startDate = null;
+		this.endDate = null;
     this.getList(1);
   }
 
@@ -169,7 +250,166 @@ export class DrugSearchComponent implements OnInit {
         }
       });
   }
-
+	
+	// 查看
+	detail(e, data) {
+		if(!data.workOrderDTO){
+			return
+		}
+	  e.stopPropagation();
+	  this.router.navigateByUrl("/main/drugSearch/orderDetail/" + data.workOrderDTO.id);
+	}
+	
+	// 新增弹框
+	modal:boolean = false;
+	add:boolean = false;
+	addMoadl() {
+	  this.add = true;
+		this.modal = true;
+		this.itemData = null;
+	  this.initForm();
+	}
+	hideModal() {
+	  this.modal = false;
+	  this.initForm();
+	}
+	
+	// 搜索科室
+	changeDept(dept){
+		this.isLoading = true;
+		this.changeInpSubject.next(dept);
+	}
+	
+	// 初始化新增form表单
+	initForm() {
+	  this.validateForm = this.fb.group({
+			packid:[null, [Validators.required]],
+	    batchNo: [null, []],
+	    launch: [null, [Validators.required]],
+			target: [null, [Validators.required]],
+	    creatTime: [null, [Validators.required]],
+	    drugsState: [null, [Validators.required]],
+			drugsBagType: [null, []],
+	  });
+	}
+	
+	// // 选择开始时间
+	onStartChange(result: Date): void {
+		console.log('Selected Time: ', result);
+		let startTime = format(result, 'yyyy-MM-dd HH:mm:ss');
+		this.validateForm.controls.creatTime.setValue(startTime);
+	}
+		
+	// 表单提交
+	submitForm(): void {
+	  var that = this;
+		for (const i in that.validateForm.controls) {
+		  that.validateForm.controls[i].markAsDirty();
+		  that.validateForm.controls[i].updateValueAndValidity();
+		}
+		if (that.validateForm.invalid) return;
+	  let data = {
+			drugsBag:{
+				...this.itemData,
+				packid: this.validateForm.value.packid,
+				batchNo: this.validateForm.value.batchNo || undefined,
+				drugsState: {
+					id: this.validateForm.value.drugsState
+				},
+				drugsBagType: {
+					id: this.validateForm.value.drugsBagType
+				},
+				launch: {
+					id:this.validateForm.value.launch
+				},
+				target: {
+					id:this.validateForm.value.target
+				},
+				creatTime: this.validateForm.value.creatTime,
+				id:0,
+			}
+	  };
+	  if (!that.add) {
+	    data.drugsBag.id = that.coopId;
+	  }else{
+			delete data.drugsBag.id
+		}
+		if(this.validateForm.value.drugsBagType){
+			data.drugsBag.drugsBagType.id = this.validateForm.value.drugsBagType
+		}else{
+			delete data.drugsBag.drugsBagType
+		}
+		that.btnLoading = true;
+	  that.mainService
+	    .dataPost(this.add ? "addData":"updData", "drugsBag", data)
+	    .subscribe((data) => {
+	      that.btnLoading = false;
+	      that.hideModal();
+	      if (data.status == 200) {
+	        that.showPromptModal(that.add ? "新增" : "编辑", true, "");
+	      } else {
+	        that.showPromptModal(that.add ? "新增" : "编辑", false, data.msg);
+	      }
+	    });
+	}
+	
+	// 编辑
+	itemData:any;
+	coopId:any;
+	edit(data) {
+		this.add = false
+		this.initForm();
+		this.itemData = data;
+		this.coopId = data.id;
+		this.validateForm.controls.packid.setValue(data.packid);
+		this.validateForm.controls.batchNo.setValue(data.batchNo);
+		this.validateForm.controls.launch.setValue(data.launch.id);
+		this.validateForm.controls.target.setValue(data.target.id)
+		this.validateForm.controls.drugsState.setValue(data.drugsState.id)
+		this.validateForm.controls.drugsBagType.setValue(data.drugsBagType.id)
+		this.validateForm.controls.creatTime.setValue(data.creatTime);
+		this.modal = true
+	}
+	
+	// 消息发送
+	sendModal:boolean = false;
+	sendMsg(data){
+		this.itemData = data;
+		this.sendModal = true
+	}
+	
+	// 取消删除弹框
+	cancelSend(){
+		this.hideSendModal();
+	}
+	
+	hideSendModal(){
+		this.sendModal = false
+	}
+	
+	// 确认发送
+	confirmSend() {
+	  let that = this;
+		let query = {
+			drugsBag:{
+				...this.itemData,
+				operationType:'sendMsg'
+			}
+		}
+	  that.btnLoading = true;
+	  that.mainService
+	    .dataPost("updData", "drugsBag", query)
+	    .subscribe((data) => {
+	      that.btnLoading = false;
+				this.hideSendModal();
+	      if (data.status == 200) {
+	        that.showPromptModal("发送", true, "");
+	      } else {
+	        that.showPromptModal("发送", false, data.msg);
+	      }
+	    });
+	}
+	
   // 表格数据
   loading1 = false;
   getList(type) {
@@ -182,7 +422,15 @@ export class DrugSearchComponent implements OnInit {
       drugsBag: {
         hosId: this.hosId,
         drugsState: this.searchCriteria.drugsState ? { id: this.searchCriteria.drugsState } : undefined,
-      },
+				startTime: this.startDate || undefined,
+				endTime: this.endDate || undefined,
+				drugsBagType:{
+					id:null
+				},
+				deliveryUser:{
+					id:null
+				}
+			},
     };
     if (this.searchCriteria.target) {
       postData.drugsBag.target = { id: this.searchCriteria.target };
@@ -193,6 +441,16 @@ export class DrugSearchComponent implements OnInit {
     if (this.searchCriteria.packid) {
       postData.drugsBag.packid = this.searchCriteria.packid;
     }
+		if (this.searchCriteria.receiverName) {
+		  postData.drugsBag.deliveryUser.id = this.searchCriteria.receiverName;
+		}else{
+			delete postData.drugsBag.deliveryUser
+		}
+		if (this.searchCriteria.drugsBagType) {
+		  postData.drugsBag.drugsBagType.id = this.searchCriteria.drugsBagType;
+		}else{
+			delete postData.drugsBag.drugsBagType
+		}
     this.loading1 = true;
     this.mainService
       .getFetchDataList("drugsBag", "drugsBag", postData)

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

@@ -90,8 +90,8 @@
           <span class="itsmOrHsms" [ngClass]="{bold: flagList.hsmsFlag1}" *ngIf="hsmsData.hsmsSwitch" (click)="filterOrderList('hsms', 1)">配送</span>
           <span class="time">{{ orderRefreshTime }}s</span></span>
       </div>
-      <div class="searchBox" *ngIf="!flagList.itsmFlag1 && flagList.hsmsFlag1">
-        <label nz-checkbox [(ngModel)]="allUnassignedList" (ngModelChange)="changeAllUnassignedList($event)">全选</label>
+      <div class="searchBox">
+        <label *ngIf="!flagList.itsmFlag1 && flagList.hsmsFlag1" nz-checkbox [(ngModel)]="allUnassignedList" (ngModelChange)="changeAllUnassignedList($event)">全选</label>
         <div class="search wp60">
           <input class="wp75" type="text" placeholder="请输入关键字" [(ngModel)]="unassignedSearchCon" />
           <div class="magnifier wp20" (click)="searchUnassigned()">
@@ -99,7 +99,7 @@
             <span>搜索</span>
           </div>
         </div>
-        <button nz-button nzType="primary" (click)="batchDispatch()" [disabled]="!batchType">
+        <button *ngIf="!flagList.itsmFlag1 && flagList.hsmsFlag1" nz-button nzType="primary" (click)="batchDispatch()" [disabled]="!batchType">
           批量派单
         </button>
       </div>
@@ -182,7 +182,10 @@
                       </span>
                     </span>
                     <span class="right" nz-tooltip [nzTooltipTitle]="'总时长' + formatTime(data.data.expectTimeNum / 1000)">
-                      {{ data.data.showCreateTime }}
+											<span class="source-name" *ngIf="data.data.sourceName && showSource == 1">
+												{{data.data.sourceName}}
+											</span>
+											{{ data.data.showCreateTime }}
                     </span>
                   </div>
                   <!-- 急单 -->
@@ -246,6 +249,9 @@
                       </span>
                     </span>
                     <span class="right">
+											<span class="source-name" *ngIf="data.data.source && showSource == 1">
+												{{data.data.source.name}}
+											</span>
                       {{ data.data.startDate | date: 'yyyy-MM-dd HH:mm'}}
                     </span>
                   </div>
@@ -286,8 +292,8 @@
           <span class="itsmOrHsms" [ngClass]="{bold: flagList.hsmsFlag2}" *ngIf="hsmsData.hsmsSwitch" (click)="filterOrderList('hsms', 2)">配送</span>
           <span class="time">{{ orderRefreshTime }}s</span></span>
       </div>
-      <div class="searchBox" *ngIf="!flagList.itsmFlag2 && flagList.hsmsFlag2">
-        <label nz-checkbox [(ngModel)]="allArriveList" (ngModelChange)="changeAllArriveList($event)">全选</label>
+      <div class="searchBox">
+        <label *ngIf="!flagList.itsmFlag2 && flagList.hsmsFlag2" nz-checkbox [(ngModel)]="allArriveList" (ngModelChange)="changeAllArriveList($event)">全选</label>
         <div class="search wp60">
           <input class="wp75" type="text" placeholder="请输入关键字" [(ngModel)]="arriveSearchCon" />
           <div class="magnifier wp20" (click)="searchArrive()">
@@ -295,7 +301,7 @@
             <span>搜索</span>
           </div>
         </div>
-        <button nz-button nzType="primary" (click)="batchWithdrawal()" [disabled]="!batchType1">
+        <button *ngIf="!flagList.itsmFlag2 && flagList.hsmsFlag2" nz-button nzType="primary" (click)="batchWithdrawal()" [disabled]="!batchType1">
           批量撤回
         </button>
       </div>
@@ -375,7 +381,10 @@
                       <span nz-tooltip nzTooltipTitle="患者姓名（住院号）" *ngIf="data.data.taskType.associationType.value == 'patientTransport' || data.data.taskType.associationType.value == 'inspect'">{{ data.data.patient.patientName }}<span *ngIf="data.data.patient.residenceNo">（{{ data.data.patient.residenceNo }}）</span></span>
                     </span>
                     <span class="right" nz-tooltip [nzTooltipTitle]="'总时长' + formatTime(data.data.expectTimeNum / 1000)">
-                      {{ data.data.showCreateTime }}
+                      <span class="source-name" *ngIf="data.data.sourceName && showSource == 1">
+                      	{{data.data.sourceName}}
+                      </span>
+											{{ data.data.showCreateTime }}
                     </span>
                   </div>
                   <!-- 急单 -->
@@ -438,6 +447,9 @@
                       </span>
                     </span>
                     <span class="right">
+											<span class="source-name" *ngIf="data.data.source && showSource == 1">
+												{{data.data.source.name}}
+											</span>
                       {{ data.data.startDate | date: 'yyyy-MM-dd HH:mm'}}
                     </span>
                   </div>
@@ -475,7 +487,7 @@
           <span class="itsmOrHsms" [ngClass]="{bold: flagList.hsmsFlag3}" *ngIf="hsmsData.hsmsSwitch" (click)="filterOrderList('hsms', 3)">配送</span>
           <span class="time">{{ orderRefreshTime }}s</span></span>
       </div>
-      <div class="searchBox" *ngIf="!flagList.itsmFlag3 && flagList.hsmsFlag3">
+      <div class="searchBox">
         <div class="search">
           <input type="text" placeholder="请输入关键字" [(ngModel)]="executionSearchCon" />
           <div class="magnifier" (click)="searchExecution()">
@@ -560,7 +572,10 @@
                       <span nz-tooltip nzTooltipTitle="患者姓名（住院号）" *ngIf="data.data.taskType.associationType.value == 'patientTransport' || data.data.taskType.associationType.value == 'inspect'">{{ data.data.patient.patientName }}<span *ngIf="data.data.patient.residenceNo">（{{ data.data.patient.residenceNo }}）</span></span>
                     </span>
                     <span class="right" nz-tooltip [nzTooltipTitle]="'总时长' + formatTime(data.data.expectTimeNum / 1000)">
-                      {{ data.data.showCreateTime }}
+                     <span class="source-name" *ngIf="data.data.sourceName && showSource == 1">
+                     	{{data.data.sourceName}}
+                     </span>
+										 {{ data.data.showCreateTime }}
                     </span>
                   </div>
                   <!-- 急单 -->
@@ -622,6 +637,9 @@
                       </span>
                     </span>
                     <span class="right">
+											<span class="source-name" *ngIf="data.data.source && showSource == 1">
+												{{data.data.source.name}}
+											</span>
                       {{ data.data.startDate | date: 'yyyy-MM-dd HH:mm'}}
                     </span>
                   </div>
@@ -651,7 +669,7 @@
   </div>
 
   <!-- 右侧悬浮框 -->
-  <div id="fixedMenu" class="fixed">
+  <div id="fixedMenu" class="fixed" [ngStyle]="rightStyle">
     <div class="left" *ngIf="fixedTab != '' && showLastItems && fixedTab != 'newOrder' && fixedTab != 'toSystem' && fixedTab != 'logout'">
       <!-- 叫号信息 -->
       <div
@@ -766,7 +784,7 @@
     <div class="right">
       <div class="fixedMenu" *ngIf="hsmsData.hsmsSwitch || itsmData.mdv2Switch">
         <div class="menuItems">
-          <button nz-button nzType="link" class="item itemLink" (click)="showNewOrder()" [nzLoading]="getConfigTasktypeLoading || patientLogTasktypeLoading">
+          <button nz-button nzType="link" class="item itemLink" (click)="showNewOrder('1')" [nzLoading]="getConfigTasktypeLoading || patientLogTasktypeLoading">
             新建工单
           </button>
         </div>
@@ -877,7 +895,7 @@
   </div>
 
   <!-- 左侧悬浮框 -->
-  <div id="fixedMenuLeft" class="fixedLeft" [hidden]="!itsmData.mdv2Switch && !hsmsData.hsmsSwitch">
+  <div id="fixedMenuLeft" class="fixedLeft" [ngStyle]="leftStyle" [hidden]="!itsmData.mdv2Switch && !hsmsData.hsmsSwitch">
     <div class="right">
       <div class="fixedMenu">
         <div class="menuItems">
@@ -1064,6 +1082,14 @@
           </div>
         </div>
       </div>
+			<div class="title" *ngIf="currentTabIndex === '政务值班'">
+			  <div class="newTop">
+			    <div class="name">来电咨询</div>
+			    <div class="newTopItem">
+			      <span class="grayFont">来电电话：{{incidentModel.incomingPhone}}</span>
+			    </div>
+			  </div>
+			</div>
       <div nz-row class="content">
         <div nz-col nzSpan="15" class="col left">
           <div class="tabs">
@@ -1571,7 +1597,7 @@
         <div nz-col nzSpan="9" class="col right">
           <div class="rightTitle">
             <div class="rightTitle_tab" [class.active]="currentRTab == tab.id" *ngFor="let tab of rightTitle_tab;" (click)="rightTitleHandler(tab.id)">{{ tab.name }}</div>
-            <span class="toLastTime1"><span class="time" *ngIf="applyDept">{{ orderRefreshTime }}s</span></span>
+            <span class="toLastTime1"><span class="time" *ngIf="applyDept || incidentModel.requester">{{ orderRefreshTime }}s</span></span>
           </div>
           <!-- 近期配送 start -->
           <div class="cots_body weifenpai" *ngIf="currentRTab == 0 && currentTabIndex != '政务值班'" [ngClass]="{ top185: hurseInfoHiding != 1 }">
@@ -2027,3 +2053,16 @@
 
 <!-- 修改备注弹窗 -->
 <app-edit-work-order-remark *ngIf="isShowBuildQuickConfirm" [buildQuickConfirmData]="buildQuickConfirmData" (cancelModal)="cancelBuildQuickConfirm($event)" (confirmModal)="confirmBuildQuickConfirm($event)" [loading5]="loadingQuick"></app-edit-work-order-remark>
+
+<!-- 工单删除填写删除原因 -->
+<nz-modal
+	[(nzVisible)]="isDelVisible"
+	nzTitle="提示"
+	(nzOnCancel)="delOrderModal()"
+	(nzOnOk)="confirmDelOk()"
+	[nzOkLoading]="btnLoading"
+	>
+	<div class="del-modal">
+		<input nz-input type="text" placeholder="请输入删除原因" [(ngModel)]="delReason" />
+	</div>
+</nz-modal>

src/app/views/fuwutai/fuwutai.component.less

@@ -8,6 +8,12 @@
   flex-direction: column;
 }
 
+.source-name{
+	font-size: 12px;
+	margin-right: 10px;
+	color: #000;
+}
+
 .thumbList{
   display: flex;
   align-items: center;
@@ -1631,11 +1637,11 @@
 
   // 右侧悬浮菜单
   .fixed {
-    position: fixed;
-    top: calc(40% + 115px + 16px);
-    right: 0;
-    z-index: 9;
-    border-radius: 5px 0 0 5px;
+    // position: fixed;
+    // top: calc(40% + 115px + 16px);
+    // right: 0;
+    // z-index: 9;
+    // border-radius: 5px 0 0 5px;
 
     &.maskFull{
       &::after{
@@ -2094,11 +2100,11 @@
 
   // 左侧悬浮菜单
   .fixedLeft {
-    position: fixed;
-    top: 40%;
-    left: 0;
-    z-index: 8;
-    border-radius: 5px 0 0 5px;
+    // position: fixed;
+    // top: 40%;
+    // left: 0;
+    // z-index: 8;
+    // border-radius: 5px 0 0 5px;
 
     &.maskFull{
       &::after{

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

@@ -389,6 +389,8 @@ export class FuwutaiComponent implements OnInit {
 
   // 获取科室
   applyStartDept;
+	patientCode:any;
+	taskTypeId:any;
   // 患者转运表单提交
   submitFormZy(go?): void {
     let newOrderShowFlag = true; //是否可以关闭弹窗
@@ -458,6 +460,8 @@ export class FuwutaiComponent implements OnInit {
           if (go === "&go&") {
             this.applyDept = data["createDept"].id;
             this.applyStartDept = data["createDept"];
+						this.patientCode = data["patientId"];
+						this.taskTypeId = data["taskTypeId"];
             this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
             this.showPromptModal("建单", true, "", "closeGo");
           } else {
@@ -472,6 +476,8 @@ export class FuwutaiComponent implements OnInit {
 					if (go === "&go&") {
 					  this.applyDept = data["createDept"].id;
 					  this.applyStartDept = data["createDept"];
+						this.patientCode = data["patientId"];
+						this.taskTypeId = data["taskTypeId"];
 					  this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
 					}
 					//重复建单那策略
@@ -1412,7 +1418,7 @@ export class FuwutaiComponent implements OnInit {
   // 快捷键打开新建工单
   quickShowNewOrder(e){
     if (e.ctrlKey && e.key == "s") {
-      this.showNewOrder();
+      this.showNewOrder(1);
       e.preventDefault();
     }
   }
@@ -1676,7 +1682,7 @@ export class FuwutaiComponent implements OnInit {
           //没绑定科室
           if (!this.newOrderShow && !this.newOrderShowOpen) {
             this.applyDept = null;
-            this.showNewOrder("no", data.phone, true, '来电弹屏');
+            this.showNewOrder(1, "no", data.phone, true, '来电弹屏');
           }
         } else if (data.status == 202) {
           this.msg.warning(data.msg);
@@ -1730,7 +1736,7 @@ export class FuwutaiComponent implements OnInit {
               this.incidentMsg = incidentMsg;
               this.searchApplicationRequester();
               this.applyDeptMiddle = deptDTO;
-              this.showNewOrder("yes", this.incidentModel.incomingPhone, true, '来电弹屏');
+              this.showNewOrder(1, "yes", this.incidentModel.incomingPhone, true, '来电弹屏');
             // }
           } else {
             //没绑定科室
@@ -1740,7 +1746,7 @@ export class FuwutaiComponent implements OnInit {
             this.incidentMsg = {};
             if (!this.newOrderShow && !this.newOrderShowOpen) {
               this.applyDept = null;
-              this.showNewOrder("no", this.incidentModel.incomingPhone, true, '来电弹屏');
+              this.showNewOrder(1, "no", this.incidentModel.incomingPhone, true, '来电弹屏');
             }
           }
         }
@@ -1945,18 +1951,14 @@ export class FuwutaiComponent implements OnInit {
     if(!this.itsmData.mdv2Switch){
       return;
     }
-    if (id == -1 || id === null || id === undefined) {
+    if (id == -1 || id === null || id === undefined && this.incidentModel.repairIncidentType === 'dept') {
       this.itsmOrders = [];
       return;
     }
-		if(!this.incidentModel.department){
+		if(!this.incidentModel.department && this.incidentModel.repairIncidentType === 'dept'){
 			this.itsmOrders = [];
 			return;
 		}
-		if(this.incidentModel.repairIncidentType === 'public'){
-			this.itsmOrders = [];
-			return
-		}
     let postData = {
       incident: {
         "deleteFlag": 0,
@@ -1964,10 +1966,23 @@ export class FuwutaiComponent implements OnInit {
         department: {
           id,
         },
+				requester:{
+					id:null
+				}
       },
       idx: 0,
       sum: 6,
     };
+		if(this.incidentModel.repairIncidentType === 'public'){
+			if(!this.incidentModel.requester){
+				this.itsmOrders = [];
+				return
+			}
+			postData.incident.requester.id = this.incidentModel.requester || null
+			delete postData.incident.department
+		}else{
+			delete postData.incident.requester
+		}
     this.loading6 = true;
     this.mainService
       .getFetchDataList("simple/data", "incident", postData)
@@ -1982,7 +1997,7 @@ export class FuwutaiComponent implements OnInit {
 	// 获取政务值班近期记录
 	itsmZwOrders:any=[];
 	getZwOrders(){
-		if(!this.incidentModel.callID){
+		if(!this.incidentModel.callID && !this.selectProvince){
 			return
 		}
 		let postData = {
@@ -2325,6 +2340,13 @@ export class FuwutaiComponent implements OnInit {
     }
     // 运维
     if(this.flagList['itsmFlag' + stateId]){
+			if (stateId == 1) {
+			  keyWords = this.unassignedSearchCon || "";
+			} else if (stateId == 2) {
+			  keyWords = this.arriveSearchCon || "";
+			} else if (stateId == 3) {
+			  keyWords = this.executionSearchCon || "";
+			}
       postData.incidentQuery = {
         idx: 0,
         sum: 1,
@@ -2338,7 +2360,8 @@ export class FuwutaiComponent implements OnInit {
           "assignee": this.tool.getCurrentUserId(),
           "deleteFlag": 0,
 					"showReassign":null,
-					"showGovDuty":null
+					"showGovDuty":null,
+					keyWord: keyWords
         }
 				postData.incidentQuery.incident.showReassign = this.user.user.scope.showReassign==0 || !this.user.user.scope.showReassign ? undefined : this.user.user.scope.showReassign
 				postData.incidentQuery.incident.showGovDuty = 
@@ -2351,6 +2374,7 @@ export class FuwutaiComponent implements OnInit {
           "urgentType": +this.itsmData.orderScopeRadio + 1,
           "queryTask": "todoState",
           "deleteFlag": 0,
+					keyWord: keyWords
         }
       }else if(stateId == 3){
         postData.incidentQuery.incident = {
@@ -2361,6 +2385,7 @@ export class FuwutaiComponent implements OnInit {
           "assignee": this.tool.getCurrentUserId(),
           "deleteFlag": 0,
           "platform": 3,
+					keyWord: keyWords
         }
       }
     }
@@ -2716,7 +2741,7 @@ export class FuwutaiComponent implements OnInit {
 	applicantMustFillIn:any; //申请人是否必填 1是，0否
 	deptRepair:boolean = false; //科内报修
 	publicRepair:boolean = false; //公共报修
-	getSysConfig() {
+	getSysConfig(type) {
 		const postData = { idx: 0, sum: 99 };
 		this.mainService
 			.getFetchDataList("simple/data", "systemConfiguration", postData)
@@ -2746,21 +2771,30 @@ export class FuwutaiComponent implements OnInit {
 								case "hospitalModel":
 									this.hospitalModel = c[1]
 									if(this.hospitalModel==1){
-										this.incidentModel.hosId = this.tool.getCurrentHospital().id
+										if(this.tool.getCurrentHospital().parent){
+											this.incidentModel.hosId = this.tool.getCurrentHospital().parent.id
+										}else{
+											this.incidentModel.hosId = this.tool.getCurrentHospital().id
+										}
 									}
 									break;	
 								case "applicantMustFillIn":
 									this.applicantMustFillIn = c[1]
 									break;	
 							}
-							if(this.publicRepair && !this.deptRepair){
-								this.incidentModel.repairIncidentType = 'public'
-								this.isRelatedDepartment = false
-							}
-							if(!this.publicRepair && this.deptRepair){
-								this.incidentModel.repairIncidentType = 'dept'
+							if(type==1){
+								if(this.publicRepair && !this.deptRepair){
+									this.incidentModel.repairIncidentType = 'public'
+									this.isRelatedDepartment = false
+								}
+								if(!this.publicRepair && this.deptRepair){
+									this.incidentModel.repairIncidentType = 'dept'
+								}
 							}
 						});
+						if(this.hospitalModel==1){
+							this.searchApplicationBuilding()
+						}
 					}
 				}
 			});
@@ -2769,7 +2803,7 @@ export class FuwutaiComponent implements OnInit {
   // 打开新建工单
   deathTasktypeId; //获取这个写死的任务类型的id,送病人回病房
   deathTasktypeIdPatient; //获取这个写死的任务类型的id,转出院记录
-  async showNewOrder(des = '', phone = '', isInit = false, buildType = '') {
+  async showNewOrder(type, des = '', phone = '', isInit = false, buildType = '') {
     if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
       //进入弹窗,强制示忙
       setTimeout(()=>{
@@ -2784,15 +2818,15 @@ export class FuwutaiComponent implements OnInit {
       }else{
         this.resetOrderData2();
       }
-			this.getSysConfig();
+			this.getSysConfig(type);
       this.searchApplicationHospital();
       this.searchApplicationCategory();
       this.searchApplicationPriority();
       this.searchApplicationSource();
       this.getRepairIncidentType();
       isInit ? this.searchApplicationDepartment('itsm', undefined, undefined, undefined, true) : this.searchApplicationDepartment('itsm');
-      isInit && ((this.isRelatedDepartment && this.incidentModel.department) || (!this.isRelatedDepartment && this.incidentModel.hosId) || this.buildType === '报修转事件' ) && this.incidentModel.hosId && this.searchApplicationBuilding();
-      isInit && this.incidentModel.area && this.searchApplicationFloor();
+     	isInit && ((this.isRelatedDepartment && this.incidentModel.department) || (!this.isRelatedDepartment && this.incidentModel.hosId) || this.buildType === '报修转事件' ) && this.incidentModel.hosId && this.searchApplicationBuilding();
+			isInit && this.incidentModel.area && this.searchApplicationFloor();
       if(!this.hsmsData.hsmsSwitch){
         this.taskBuild = null;
         this.residenceNo = null;
@@ -2851,7 +2885,6 @@ export class FuwutaiComponent implements OnInit {
     this.applyDept = null;
     this.countRemarkIndex = -1;
     this.incidentModel.department = isInit ? this.incidentModel.department : null;
-    console.log(des);
     if (des === "no") {
       //没绑定科室
       this.searchApplicationDepartment("hsms", "", phone);
@@ -2928,6 +2961,9 @@ export class FuwutaiComponent implements OnInit {
     let preCurrentTabIndex = this.currentTabIndex;
     this.currentTabIndex = key;
 		console.log(1112233,this.currentTabIndex)
+		if(this.buildType !== '报修转事件'){
+			this.incidentModel.requester = null;
+		}
     this.radioValueQt = null;
     this.startDeptQt = null;
     this.endDeptQt = null;
@@ -2973,7 +3009,7 @@ export class FuwutaiComponent implements OnInit {
     // }else
 		 
 		 if(this.currentTabIndex === '故障报修'){
-				this.incidentModel.department = null;
+				// this.incidentModel.department = null;
 				this.rightTitle_tab = [
 					{ id: 2, name: '近期维修' },
 					{ id: 3, name: '知识库' },
@@ -3014,7 +3050,9 @@ export class FuwutaiComponent implements OnInit {
 	}
 	
 	// 选择省市区
+	selectProvince:boolean = false
 	onProvinceChanges	(values: any): void {
+		this.selectProvince = true;
 		this.getZwOrders();
 	}
 	
@@ -3106,7 +3144,9 @@ export class FuwutaiComponent implements OnInit {
 				that.initZwForm();
 				if (data.status == 200) {
 					this.getZwOrders();
+					this.selectProvince = false;
 					this.newOrderShow = false;
+					this.itsmZwOrders = [];
 					that.showPromptModal("新增", true, "");
 				} else {
 					that.showPromptModal("新增", false, data.msg);
@@ -3135,6 +3175,11 @@ export class FuwutaiComponent implements OnInit {
       this.isLoadingPatient = false;
       if (result["state"] == 200) {
         this.patientList = result["data"];
+				if(this.deathTasktypeId != this.taskTypeId){
+					// 患者信息自动带入
+					let item = this.patientList.find(i=> i.id == this.patientCode)
+					this.validateFormZy.controls.patient.setValue(item.patientCode+"");
+				}
         // if (this.patientList.length) {
         //   this.patientList = this.patientList.filter((item) => !!item.bednum);
         // }
@@ -3312,13 +3357,35 @@ export class FuwutaiComponent implements OnInit {
       });
   }
   // 修改申请人
+	userPriorityDTO:any;
   changeApplyRequester(e){
-    console.log(e)
     let userObj = this.applicationRequesterList.find(v => v.id == e);
+		console.log('选中的申请人',userObj)
     // 选择申请人回显申请人电话
     if(userObj){
       this.incidentMsg.requesterPhone = userObj.phone;
     }
+		if(userObj.priorityDTO){
+			this.userPriorityDTO = userObj.priorityDTO
+		}
+		let orders = [];
+		if(this.deptPriorityDTO&&this.deptPriorityDTO.orders){
+			orders.push(this.deptPriorityDTO.orders)
+		}
+		if(this.userPriorityDTO&&this.userPriorityDTO.orders){
+			orders.push(this.userPriorityDTO.orders)
+		}
+		if(this.malPriorityDTO&&this.malPriorityDTO.orders){
+			orders.push(this.malPriorityDTO.orders)
+		}
+		let minNumber = Math.min(...orders)
+		console.log('最小值的orders', orders, minNumber)
+		setTimeout(_=>{
+			this.incidentModel.priorityId = minNumber || null
+		})
+		if(this.incidentModel.repairIncidentType === 'public'){
+			this.getItsmOrders('')
+		}
   }
   // 故障现象列表
   applicationCategoryList:any[] = [];
@@ -3351,8 +3418,8 @@ export class FuwutaiComponent implements OnInit {
   }
   // 修改故障现象
   incidentCategoryConfig:any = {};//当前匹配的故障现象规则
+	malPriorityDTO:any;
   changeApplyCategory(e, isCoverage = false){
-    console.log(e)
     // 知识库
     this.getKnowageList();
     if(e && !isCoverage){
@@ -3363,6 +3430,7 @@ export class FuwutaiComponent implements OnInit {
         this.incidentModel.description = this.applicationCategoryList.find(v => v.id == e).mutiCategory;
       }
     }
+		
     // 根据院区和故障现象带出责任部门，优先级，维修人/组
     if(this.incidentModel.hosId && e && this.buildType !== '编辑事件'){
       let postData = {
@@ -3388,10 +3456,27 @@ export class FuwutaiComponent implements OnInit {
             }else{
               this.incidentCategoryConfig = {};
             }
-
+						if(this.incidentCategoryConfig.priorityDTO){
+							this.malPriorityDTO = this.incidentCategoryConfig.priorityDTO
+						}
+						let orders = [];
+						if(this.deptPriorityDTO&&this.deptPriorityDTO.orders){
+							orders.push(this.deptPriorityDTO.orders)
+						}
+						if(this.userPriorityDTO&&this.userPriorityDTO.orders){
+							orders.push(this.userPriorityDTO.orders)
+						}
+						if(this.malPriorityDTO&&this.malPriorityDTO.orders){
+							orders.push(this.malPriorityDTO.orders)
+						}
+						let minNumber = Math.min(...orders)
+						console.log('最小值的orders', orders, minNumber)
+						setTimeout(_=>{
+							this.incidentModel.priorityId = minNumber || null
+						})
             // 根据院区和故障现象带出责任部门，优先级，维修人/组
             this.incidentModel.duty = this.incidentCategoryConfig.dutyDTO;
-            this.incidentModel.priorityId = this.incidentCategoryConfig.priority;
+            // this.incidentModel.priorityId = this.incidentCategoryConfig.priority;
 
             // 回显维修人/组
             this.showGroupOrUser();
@@ -3417,6 +3502,7 @@ export class FuwutaiComponent implements OnInit {
   // 弹窗确定
   confirmDirectOrderModelOrder(incidentModel){
     console.log(incidentModel);
+		console.log(444,this.incidentModel.requester)
     this.maskFlag = this.msg.loading("正在加载中..", {
       nzDuration: 0,
     }).messageId;
@@ -3714,12 +3800,12 @@ export class FuwutaiComponent implements OnInit {
   }
   // 选择报修类型
   changeRepairIncidentType(value){
-    // this.incidentModel.department = undefined;
+		// this.incidentModel.department = undefined;
     this.incidentMsg.deptManyPhone = '';
-
+		this.incidentModel.requester = null;
     this.isRelatedDepartment = value !== 'public';
     this.changeApplyRelatedDepartment(this.isRelatedDepartment);
-		this.rightTitleHandler(this.rightTitle_tab[0].id);
+		this.rightTitleHandler(2);
   }
   // 楼栋列表
   applicationBuildingList:any[] = [];
@@ -3798,7 +3884,7 @@ export class FuwutaiComponent implements OnInit {
     if(!this.hsmsData.hsmsSwitch && !this.itsmData.mdv2Switch){
       return;
     }
-		console.log(8787878787878,type)
+		console.log(8787878787878,type, e)
     let keyWord = "";
     if (e && e !== "&ks&" && e !== "&go&") {
       keyWord = e;
@@ -3865,9 +3951,6 @@ export class FuwutaiComponent implements OnInit {
             this.applicationDeptList = data.list;
             let ids = this.applicationDeptList.map(v => v.id);
             isInit && !ids.includes(this.incidentModel.department) && (this.applicationDeptList.unshift({id: this.incidentModel.department, dept: this.incidentMsg.deptName}))
-            console.log(this.applicationDeptList);
-            console.log(this.incidentModel);
-            console.log(this.incidentMsg);
             deptId && this.changeApplyDept(deptId);
           }
         }
@@ -3892,8 +3975,28 @@ export class FuwutaiComponent implements OnInit {
     flag && this.searchApplicationUser()
   }
   // 配送-选择科室
+	deptPriorityDTO:any;
   changeApply(e) {
-    console.log(e, this.applicationDepartmentList);
+		let item = this.applicationDepartmentList.find(i=>i.id = e)
+		console.log('选中的科室11111',item);
+		if(item.priorityDTO){
+			this.deptPriorityDTO = item.priorityDTO
+		}
+		let orders = [];
+		if(this.deptPriorityDTO&&this.deptPriorityDTO.orders){
+			orders.push(this.deptPriorityDTO.orders)
+		}
+		if(this.userPriorityDTO&&this.userPriorityDTO.orders){
+			orders.push(this.userPriorityDTO.orders)
+		}
+		if(this.malPriorityDTO&&this.malPriorityDTO.orders){
+			orders.push(this.malPriorityDTO.orders)
+		}
+		let minNumber = Math.min(...orders)
+		console.log('最小值的orders', orders, minNumber)
+		setTimeout(_=>{
+			this.incidentModel.priorityId = minNumber || null
+		})
     this.changeApplicationDepartment("&same&");
     this.defaultInspectFn();
 
@@ -4107,7 +4210,7 @@ export class FuwutaiComponent implements OnInit {
   maskFlag:any = false;
   // 运维-直接解决
   directOrder(){
-    if(this.publicRepair && this.applicantMustFillIn==1 && !this.incidentModel.requester){
+    if(this.publicRepair && this.applicantMustFillIn==1 && !this.incidentModel.requester && this.buildType !== '报修转事件'){
       this.msg.warning('请选择申请人!');
       return;
     }
@@ -4162,7 +4265,8 @@ export class FuwutaiComponent implements OnInit {
   }
   // 运维-建单并派单
   assignOrder(){
-    if(this.publicRepair && this.applicantMustFillIn==1 && !this.incidentModel.requester){
+		console.log(8888,this.incidentModel.requester)
+    if(this.publicRepair && this.applicantMustFillIn==1 && !this.incidentModel.requester && this.buildType !== '报修转事件'){
       this.msg.warning('请选择申请人!');
       return;
     }
@@ -4355,7 +4459,7 @@ export class FuwutaiComponent implements OnInit {
 
   // 运维-保存
   saveOrder(){
-    if(this.publicRepair && this.applicantMustFillIn==1 && !this.incidentModel.requester){
+    if(this.publicRepair && this.applicantMustFillIn==1 && !this.incidentModel.requester && this.buildType !== '报修转事件'){
       this.msg.warning('请选择申请人!');
       return;
     }
@@ -4582,7 +4686,11 @@ export class FuwutaiComponent implements OnInit {
           this.workTypesFlag = arr.length >= 5;
           // 默认选中故障现象
           if (arr.length > 0) {
-            isFirst ? this.tabClick(arr[0].key, isInit) : this.tabClick(arr[arr.length - 2].key, isInit);
+						if(this.showGovDuty==1){
+							isFirst ? this.tabClick(arr[0].key, isInit) : this.tabClick(arr[arr.length - 2].key, isInit);
+						}else{
+							isFirst ? this.tabClick(arr[0].key, isInit) : this.tabClick(arr[arr.length - 1].key, isInit);
+						}
           }
         }
       });
@@ -5286,6 +5394,9 @@ export class FuwutaiComponent implements OnInit {
     }
     this.newOrderShow = false;
     this.newOrderShowOpen = false;
+		this.selectProvince = false;
+		this.itsmZwOrders = [];
+		this.patientCode = null;
     this.currentTabIndex = "";
     this.fixedTab = "";
     this.fixedMenuShangla();
@@ -5380,7 +5491,11 @@ export class FuwutaiComponent implements OnInit {
   openDelModal(id, type) {
     this.coopId = id;
     this.coopType = type;
-    this.delOrderShow = true;
+		if(type=='hsms'){
+			this.openReasonModal();
+		}else{
+			this.delOrderShow = true;
+		}
   }
   // 确认删除
   confirmDel() {
@@ -5415,6 +5530,39 @@ export class FuwutaiComponent implements OnInit {
   closeDelOrderModal() {
     this.delOrderShow = false;
   }
+	
+	// 打开删除模态框
+	delReason:any;
+	isDelVisible:boolean = false;
+	openReasonModal() {
+	  this.isDelVisible = true;
+	}
+	// 确认删除
+	confirmDelOk() {
+		if(!this.delReason){
+			this.msg.error('删除原因不能为空')
+			return
+		}
+	  let that = this;
+	  that.btnLoading = true;
+	  that.mainService.delWorkOrderWithReason(that.coopId, {
+			delReason: this.delReason
+		}).subscribe((data:any) => {
+	    that.btnLoading = false;
+	    that.delOrderModal();
+	    if (data.status == 200) {
+	      that.showPromptModal("删除", true, "");
+	    } else {
+	      that.showPromptModal("删除", false, data.msg);
+	    }
+	  });
+	}
+	
+	// 关闭模态框
+	delOrderModal() {
+	  this.isDelVisible = false;
+	}
+	
   // 新建工单
   // 提交选择转入科室的模态框
   submitFormHand(id) {
@@ -5500,7 +5648,7 @@ export class FuwutaiComponent implements OnInit {
 		this.confirmType = false;
 		if(this.goType=='&go&'){
 			console.log('fou222222')
-			this.showNewOrder("&go&");
+			this.showNewOrder(1,"&go&");
 			// this.showRepetitionModal("建单", true, "", "closeGo");
 		}
 	}
@@ -5653,6 +5801,11 @@ export class FuwutaiComponent implements OnInit {
 
   // 初始化展示形式
   controlView:any = {}; //展示形式
+	leftMenuLocation:any = 2;
+	rightMenuLocation:any = 2;
+	showSource:any = 0;
+	leftStyle:any;
+	rightStyle:any;
   initControlView() {
     let postData = {
       controlView: {},
@@ -5677,6 +5830,59 @@ export class FuwutaiComponent implements OnInit {
         this.workerRefreshTime = this.workerInfoTime = this.controlView.workerInfoTime;
         this.audioNotDispatched = this.controlView.unsendOrderVoice !== false;
         this.orderType = this.controlView.orderType || 'priority';
+				this.leftMenuLocation = this.controlView.leftMenuLocation || 2
+				this.rightMenuLocation = this.controlView.rightMenuLocation || 2
+				this.showSource = this.controlView.showSource || 0
+				if(this.leftMenuLocation==1){
+					this.leftStyle = {
+						'position': 'fixed',
+						'top': '0',
+						'left': '0',
+						'z-index': '8',
+						'border-radius': '5px 0 0 5px'
+					}
+				}else if(this.leftMenuLocation==2){
+					this.leftStyle = {
+						'position': 'fixed',
+						'top': '40%',
+						'left': '0',
+						'z-index': '8',
+						'border-radius': '5px 0 0 5px'
+					}
+				}else{
+					this.leftStyle = {
+						'position': 'fixed',
+						'bottom': '0',
+						'left': '0',
+						'z-index': '8',
+						'border-radius': '5px 0 0 5px'
+					}
+				}
+				if(this.rightMenuLocation==1){
+					this.rightStyle = {
+						'position': 'fixed',
+						'top': '0',
+						'right': '0',
+						'z-index': '8',
+						'border-radius': '5px 0 0 5px'
+					}
+				}else if(this.rightMenuLocation==2){
+					this.rightStyle = {
+						'position': 'fixed',
+						'top': '40%',
+						'right': '0',
+						'z-index': '8',
+						'border-radius': '5px 0 0 5px'
+					}
+				}else{
+					this.rightStyle = {
+						'position': 'fixed',
+						'bottom': '0',
+						'right': '0',
+						'z-index': '8',
+						'border-radius': '5px 0 0 5px'
+					}
+				}
         this.checkTab(this.typeId);
 
         this.getOrderList(1);
@@ -5750,10 +5956,10 @@ export class FuwutaiComponent implements OnInit {
       this.newOrderShowOpen = false; //此时可出现新的弹窗
     } else if (e === "closeGo") {
 			console.log(1111)
-      this.showNewOrder("&go&");
+      this.showNewOrder(1, "&go&");
     }else if(this.dataStatus==1000033 && this.goType=='&go&'){
 			console.log(2222)
-			this.showNewOrder("&go&");
+			this.showNewOrder(1, "&go&");
 		}
   }
 	
@@ -6014,7 +6220,7 @@ export class FuwutaiComponent implements OnInit {
     this.editOrder = cloneDeep(data);
     let incidentModel = cloneDeep(data);
     let incidentMsg:any = {};
-    console.log('data:', data)
+		
     // incidentModel.department && (this.applicationDeptList = [cloneDeep(incidentModel.department)]);
     incidentModel.department && (incidentMsg.deptManyPhone = incidentModel.department.manyPhone);
     incidentModel.department && (incidentMsg.deptName = incidentModel.department.dept);
@@ -6037,8 +6243,8 @@ export class FuwutaiComponent implements OnInit {
     this.incidentModel.category && this.changeApplyCategory(this.incidentModel.category, true);
     console.log('this.applicationDeptList:', this.applicationDeptList)
     console.log('incidentModel:', incidentModel)
-    this.showNewOrder('', '', true, '报修转事件');
-
+    this.showNewOrder(0, '', '', true, '报修转事件');
+		console.log(2345,this.incidentModel.repairIncidentType)
     // 查询报修图片
     this.getRepairImgs(data.id);
   }
@@ -6070,7 +6276,7 @@ export class FuwutaiComponent implements OnInit {
     this.incidentMsg = incidentMsg;
     console.log('this.applicationDeptList:', this.applicationDeptList)
     console.log('incidentModel:', incidentModel)
-    this.showNewOrder('', '', true, '继续建单');
+    this.showNewOrder(1, '', '', true, '继续建单');
 
     // 查询报修图片
     this.getRepairImgs(data.id);
@@ -6173,7 +6379,7 @@ export class FuwutaiComponent implements OnInit {
     console.log('this.applicationRequesterList:', this.applicationRequesterList)
     console.log('this.applicationDeptList:', this.applicationDeptList)
     console.log('incidentModel:', incidentModel)
-    this.showNewOrder('', '', true, '编辑事件');
+    this.showNewOrder(1, '', '', true, '编辑事件');
 
     // 查询报修图片
     this.getRepairImgs(data.id);
@@ -6377,12 +6583,12 @@ export class FuwutaiComponent implements OnInit {
                 this.incidentModel = incidentModel;
                 console.log('this.incidentModel:', this.incidentModel)
                 this.incidentMsg = incidentMsg;
-                this.showNewOrder('', '', true, '留言转事件');
+                this.showNewOrder(1, '', '', true, '留言转事件');
               } else {
                 //没绑定科室
                 this.incidentModel = incidentModel;
                 this.incidentMsg = incidentMsg;
-                this.showNewOrder('', '', true, '留言转事件');
+                this.showNewOrder(1, '', '', true, '留言转事件');
               }
             });
           }

src/app/views/hushijiandan/hushijiandan.component.html

@@ -596,7 +596,7 @@
                                               <nz-form-control nzErrorTip="请选择起点科室!">
                                                 <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" [nzServerSearch]="isStartFixedType"  (nzOnSearch)="searchDept('start', buildMsg, $event)" nzPlaceHolder="请选择起点科室">
                                                   <ng-container *ngFor="let option of buildMsg.start.start.list">
-                                                    <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
+                                                    <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias +'('+ option.inputcode+')' : option.dept +'('+ option.inputcode+')'" [nzValue]="option.id">
                                                     </nz-option>
                                                   </ng-container>
                                                   <nz-option *ngIf="false" nzDisabled nzCustomContent>
@@ -618,7 +618,7 @@
                                               <nz-form-control nzErrorTip="请选择目标科室!">
                                                 <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isEndFixedType" [nzServerSearch]="isEndFixedType"  (nzOnSearch)="searchDept('target', buildMsg, $event)" nzAllowClear nzPlaceHolder="请选择目标科室">
                                                   <ng-container *ngFor="let option of buildMsg.end.end.list">
-                                                    <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
+                                                    <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias +'('+ option.inputcode+')' : option.dept +'('+ option.inputcode+')'" [nzValue]="option.id">
                                                     </nz-option>
                                                   </ng-container>
                                                   <nz-option *ngIf="false" nzDisabled nzCustomContent>
@@ -640,7 +640,7 @@
                                               <nz-form-control nzErrorTip="请选择起点科室!">
                                                 <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" [nzServerSearch]="isStartFixedType"  (nzOnSearch)="searchDept('start', buildMsg, $event)" nzPlaceHolder="请选择起点科室">
                                                   <ng-container *ngFor="let option of buildMsg.start.start.list">
-                                                    <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
+                                                    <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias +'('+ option.inputcode+')' : option.dept +'('+ option.inputcode+')'" [nzValue]="option.id">
                                                     </nz-option>
                                                   </ng-container>
                                                   <nz-option *ngIf="false" nzDisabled nzCustomContent>
@@ -655,7 +655,7 @@
                                               <nz-form-control nzErrorTip="请选择目标科室!">
                                                 <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isEndFixedType" [nzServerSearch]="isEndFixedType"  (nzOnSearch)="searchDept('target', buildMsg, $event)" nzPlaceHolder="请选择目标科室">
                                                   <ng-container *ngFor="let option of buildMsg.end.end.list">
-                                                    <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
+                                                    <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias +'('+ option.inputcode+')' : option.dept +'('+ option.inputcode+')'" [nzValue]="option.id">
                                                     </nz-option>
                                                   </ng-container>
                                                   <nz-option *ngIf="false" nzDisabled nzCustomContent>
@@ -1344,14 +1344,21 @@
                                 ({{ item.drugs.packid }})
                               </ng-container>
                               <ng-container *ngIf="item.goodsRemark">-{{ item.goodsRemark }}</ng-container>
-                              <span *ngIf="item.patient && (item.taskType.associationType.value == 'patientTransport' || item.taskType.associationType.value == 'inspect')">
-                                （{{ item.patient.patientName }}）
-                              </span>
+                              
                             </div>
+		
                             <div nz-col nzSpan="12" class="col txtR">
                               {{ item.gdState.name }}
                             </div>
                           </div>
+													<div class="row" nz-row>
+														<span *ngIf="item.patient && (item.taskType.associationType.value == 'patientTransport' || item.taskType.associationType.value == 'inspect')">
+														  {{ item.patient.patientName }}
+														</span>
+														<span *ngIf="item.patient && item.patient.bedNum">
+															({{item.patient.bedNum || ''}})
+														</span>
+													</div>
                           <div class="row" nz-row>
                             <div nz-col nzSpan="24" class="col txtL">
                               {{item.workOrderRemark}}
@@ -1559,7 +1566,7 @@
                 <nz-form-control [nzSpan]="20" nzErrorTip="请选择起点科室!">
                   <nz-select formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" [nzServerSearch]="isStartFixedType"  (nzOnSearch)="searchDept('start', checkedShowMsg, $event)" nzPlaceHolder="请选择起点科室">
                     <ng-container *ngFor="let option of checkedShowMsg.start.start.list">
-                      <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>
+                      <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias +'('+ option.inputcode+')' : option.dept +'('+ option.inputcode+')'" [nzValue]="option.id"></nz-option>
                     </ng-container>
                     <nz-option *ngIf="false" nzDisabled nzCustomContent>
                       <i nz-icon nzType="loading" class="loading-icon"></i>
@@ -1587,7 +1594,7 @@
                 <nz-form-control [nzSpan]="20" nzErrorTip="请选择目标科室!">
                   <nz-select formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false"  [nzShowSearch]="isEndFixedType" [nzServerSearch]="isEndFixedType"  (nzOnSearch)="searchDept('target', checkedShowMsg, $event)" nzPlaceHolder="请选择目标科室">
                     <ng-container *ngFor="let option of checkedShowMsg.end.end.list">
-                      <nz-option [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>
+                      <nz-option [nzLabel]="deptDisplay == 2 ? option.deptalias +'('+ option.inputcode+')' : option.dept +'('+ option.inputcode+')'" [nzValue]="option.id"></nz-option>
                     </ng-container>
                   </nz-select>
                 </nz-form-control>
@@ -1743,7 +1750,7 @@
                   <nz-option
                     *ngIf="true"
                     [nzLabel]="
-                      deptDisplay == 2 ? option.deptalias : option.dept
+                      deptDisplay == 2 ? option.deptalias +'('+ option.inputcode+')' : option.dept +'('+ option.inputcode+')'
                     "
                     [nzValue]="option.id"
                   >
@@ -1789,7 +1796,7 @@
                   <nz-option
                     *ngIf="true"
                     [nzLabel]="
-                      deptDisplay == 2 ? option.deptalias : option.dept
+                      deptDisplay == 2 ? option.deptalias +'('+ option.inputcode+')' : option.dept +'('+ option.inputcode+')'
                     "
                     [nzValue]="option.id"
                   >
@@ -1834,7 +1841,7 @@
                   <nz-option
                     *ngIf="true"
                     [nzLabel]="
-                      deptDisplay == 2 ? option.deptalias : option.dept
+                      deptDisplay == 2 ? option.deptalias +'('+ option.inputcode+')' : option.dept +'('+ option.inputcode+')'
                     "
                     [nzValue]="option.id"
                   >
@@ -1869,7 +1876,7 @@
                   <nz-option
                     *ngIf="true"
                     [nzLabel]="
-                      deptDisplay == 2 ? option.deptalias : option.dept
+                      deptDisplay == 2 ? option.deptalias +'('+ option.inputcode+')' : option.dept +'('+ option.inputcode+')'
                     "
                     [nzValue]="option.id"
                   >

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

@@ -225,6 +225,26 @@
             </nz-radio-group>
           </nz-form-control>
         </nz-form-item>
+				<nz-form-item>
+				  <nz-form-label [nzSpan]="5" nzFor="repairsUser">报修人</nz-form-label>
+				  <nz-form-control [nzSpan]="19" nzErrorTip="请选择报修人!">
+				    <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+				    (nzOnSearch)="changeRepairsUser($event)" nzAllowClear nzPlaceHolder="请选择报修人" formControlName="repairsUser">
+				      <ng-container *ngFor="let option of repairsUserList">
+				        <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+				      </ng-container>
+				      <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+				        <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+				      </nz-option>
+				    </nz-select>
+				  </nz-form-control>
+				</nz-form-item>
+				<nz-form-item>
+				  <nz-form-label [nzSpan]="5" nzFor="incomingPhone">来电号码</nz-form-label>
+				  <nz-form-control [nzSpan]="19" nzErrorTip="请输入来电号码!">
+						<input type="text" nz-input placeHolder="请输入来电号码" formControlName="incomingPhone">
+				  </nz-form-control>
+				</nz-form-item>
       </form>
     </div>
     <div class="display_flex justify-content_flex-center">

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

@@ -125,6 +125,7 @@ export class IncidentManagementComponent implements OnInit, OnDestroy {
     this.loading1 = true;
     this.debounceSubject.next(true);
     this.autoRefresh();
+		this.getRepairsUser();
   }
 
   ngOnDestroy(){
@@ -251,7 +252,28 @@ export class IncidentManagementComponent implements OnInit, OnDestroy {
         }
       });
   }
-
+	
+	// 获取报修人
+	repairsUserList:any = [];
+	getRepairsUser(e?) {
+	  let that = this;
+	  let postData = {
+	    user: {
+	      name: e || "",
+	      hospital: { id: that.tool.getCurrentHospital().id },
+	    },
+	    idx: 0,
+	    sum: 20,
+	  };
+	  that.isLoading = true;
+	  that.mainService
+	    .getFetchDataList("data", "user", postData)
+	    .subscribe((data) => {
+	      that.isLoading = false;
+	      that.repairsUserList = data.list;
+	    });
+	}
+	
   onCalendarChangeDate(dateArr){
     console.log(dateArr)
     if(dateArr.length == 2){
@@ -374,7 +396,9 @@ export class IncidentManagementComponent implements OnInit, OnDestroy {
         source: this.validateSearchForm.value.sourceValue ? { value: this.validateSearchForm.value.sourceValue } : undefined,
         deleteFlag: this.validateSearchForm.value.deleteFlag,
 				busiParent: this.validateSearchForm.value.busiParent,
+				requester: this.validateSearchForm.value.repairsUser ? { id: this.validateSearchForm.value.repairsUser } : undefined,
 				candidateGroupId: null,
+				incomingPhone: this.validateSearchForm.value.incomingPhone || undefined
       },
     };
 
@@ -727,7 +751,9 @@ export class IncidentManagementComponent implements OnInit, OnDestroy {
         source: this.validateSearchForm.value.sourceValue ? { value: this.validateSearchForm.value.sourceValue } : undefined,
         deleteFlag: this.validateSearchForm.value.deleteFlag,
 				busiParent: this.validateSearchForm.value.busiParent,
-				candidateGroupId: undefined
+				requester: this.validateSearchForm.value.repairsUser ? { id: this.validateSearchForm.value.repairsUser } : undefined,
+				candidateGroupId: undefined,
+				incomingPhone: this.validateSearchForm.value.incomingPhone || undefined
       },
     };
 
@@ -800,7 +826,12 @@ export class IncidentManagementComponent implements OnInit, OnDestroy {
   changeUser(e, type) {
     this.searchTimer(this.getUsers, e, type);
   }
-
+	
+	// 人员边输边搜节流阀
+	changeRepairsUser(e, type) {
+	  this.searchTimer(this.getRepairsUser, e, type);
+	}
+	
   // 边输入边搜索节流阀
   searchTimer(fun, e, type?) {
     this.isLoading = true;
@@ -869,6 +900,8 @@ export class IncidentManagementComponent implements OnInit, OnDestroy {
       deleteFlag: [0],
       sourceValue: [null],
 			busiParent: [null],
+			incomingPhone: [null],
+			repairsUser: [null],
     });
   }
 

src/app/views/inspection-execute/inspection-execute.component.html

@@ -69,11 +69,11 @@
             <th nzWidth="9%">单号</th>
             <th nzWidth="9%">计划主题|批次号</th>
             <th nzWidth="9%">巡检点|巡检单</th>
-            <th nzWidth="9%">截至时间</th>
+            <th nzWidth="13%">截至时间|完成时间</th>
             <th nzWidth="9%">签到方式</th>
             <th nzWidth="9%">执行人|组</th>
-            <th nzWidth="9%">是否异常</th>
-            <th nzWidth="9%">状态</th>
+            <th nzWidth="7%">是否异常</th>
+            <th nzWidth="7%">状态</th>
             <th nzWidth="9%">故障单号|状态</th>
             <th nzWidth="14%">操作</th>
           </tr>
@@ -84,7 +84,10 @@
             <td>{{data.code}}</td>
             <td>{{data.inspectionDTO?.name}}<br>{{data.batchNo}}</td>
             <td>{{data.inspectionNodeDTO?.name}}<br>{{data.inspectionDTO?.inspectionFormDTO?.name}}</td>
-            <td>{{data.overtime | date:'yyyy-MM-dd HH:mm'}}</td>
+            <td>
+							<div>{{data.overtime | date:'yyyy-MM-dd HH:mm'}}</div>
+							<div>{{data.completeTime | date:'yyyy-MM-dd HH:mm'}}</div>
+						</td>
             <td>{{data.signType?.name}}</td>
             <td>{{data.userDTO?.name || data.groupDTO?.groupName}}</td>
             <td [ngClass]="{ red: data.exception === 1 }">{{data.exception === 1 ? '是' : '否'}}</td>

src/app/views/login/login.component.ts

@@ -227,6 +227,7 @@ export class LoginComponent implements OnInit {
 		let mzbl = false;
 		let bljjb = false;
 		let blk = false;
+		let web = false;
     let yfang = false;
     roleMenus.forEach((e) => {
       if (e.link == "pharmacy") {
@@ -251,6 +252,9 @@ export class LoginComponent implements OnInit {
       } else if (e.link == "pathology") {
         blk = true;
         console.log("病理科端");
+      } else if (e.link == "webRepairs") {
+        web = true;
+        console.log("web报修");
       }
       canLogin = true;
     });
@@ -343,6 +347,17 @@ export class LoginComponent implements OnInit {
       localStorage.setItem("user", JSON.stringify(data.user));
       this.router.navigateByUrl("/pathology");
       return;
+    }else if (web) {
+      // web报修
+      if (successLoginMsg) {
+        this.msg.success("登录成功！", {
+          nzDuration: 1000,
+        });
+      }
+      successLoginMsg = false;
+      localStorage.setItem("user", JSON.stringify(data.user));
+      this.router.navigateByUrl("/webRepairs");
+      return;
     }else if (yfang) {
       // 药房端2
       if (successLoginMsg) {

src/app/views/main/main.component.html

@@ -255,7 +255,7 @@
 										</nz-select>
 									</div>
 									<div class="col flex7">
-										<input class="addressFocus" nz-input placeholder="请填写详细地址" [(ngModel)]="incidentModel.houseNumber" (focus)="focusAddress()" />
+										<input class="addressFocus" nz-input placeholder="请填写详细地址" [(ngModel)]="incidentModel.houseNumber" />
 										<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>
@@ -412,7 +412,7 @@
 			<div nz-col nzSpan="9" class="col right">
 				<div class="rightTitle">
 					<div class="rightTitle_tab" [class.active]="currentRTab == tab.id" *ngFor="let tab of rightTitle_tab;" (click)="rightTitleHandler(tab.id)">{{ tab.name }}</div>
-					<span class="toLastTime1"><span class="time" *ngIf="applyDept">{{ orderRefreshTime }}s</span></span>
+					<span class="toLastTime1"><span class="time" *ngIf="applyDept || incidentModel.requester">{{ orderRefreshTime }}s</span></span>
 				</div>
 				<!-- 近期配送 start -->
 				<div class="cots_body weifenpai" *ngIf="currentRTab == 0" [ngClass]="{ top185: hurseInfoHiding != 1 }">

src/app/views/main/main.component.ts

@@ -292,11 +292,6 @@ export class MainComponent implements OnInit {
   }
   initMenu() {
     let menus = JSON.parse(localStorage.getItem("menu"));
-		let scopeInfo = this.userInfo.user.scope;
-		if (scopeInfo.mdv2Switch === 1 || scopeInfo.hsmsSwitch === 1) {
-		  this.speediness = true;
-		  console.log("新增报修权限");
-		}
     let arr = [];
     menus.forEach((e) => {
       if (e.link == "nurse") {
@@ -383,6 +378,16 @@ export class MainComponent implements OnInit {
 			  this.webRepairs = true;
 			  console.log("PC上下班");
 			}
+			if (e.title == "故障管理") {
+				let item = e.childrens.find(i=>i.link=="incidentManagement")
+				if(item){
+					let item2 = item.childrens.find(i=>i.link=="add")
+					if(item2){
+						this.speediness = true
+						console.log("新增故障工单权限");
+					}
+				}
+			}
       if (!e.link) {
         arr.push(e);
       }
@@ -921,14 +926,17 @@ export class MainComponent implements OnInit {
 	loading6 = false;
 	itsmOrders:any[] = [];
 	getItsmOrders(id) {
-	  // if(!this.itsmData.mdv2Switch){
-	  //   return;
-	  // }
-	  if (id == -1 || id === null || id === undefined) {
+	  if(!this.itsmData.mdv2Switch){
+	    return;
+	  }
+	  if (id == -1 || id === null || id === undefined && this.incidentModel.repairIncidentType === 'dept') {
 	    this.itsmOrders = [];
 	    return;
 	  }
-	
+	  if(!this.incidentModel.department && this.incidentModel.repairIncidentType === 'dept'){
+	  	this.itsmOrders = [];
+	  	return;
+	  }
 	  let postData = {
 	    incident: {
 	      "deleteFlag": 0,
@@ -936,10 +944,23 @@ export class MainComponent implements OnInit {
 	      department: {
 	        id,
 	      },
+	  		requester:{
+	  			id:null
+	  		}
 	    },
 	    idx: 0,
 	    sum: 6,
 	  };
+	  if(this.incidentModel.repairIncidentType === 'public'){
+	  	if(!this.incidentModel.requester){
+	  		this.itsmOrders = [];
+	  		return
+	  	}
+	  	postData.incident.requester.id = this.incidentModel.requester || null
+			delete postData.incident.department
+		}else{
+	  	delete postData.incident.requester
+	  }
 	  this.loading6 = true;
 	  this.mainService
 	    .getFetchDataList("simple/data", "incident", postData)
@@ -1086,7 +1107,7 @@ export class MainComponent implements OnInit {
 	// 院区列表
 	applicationHospitalList:any[] = [];
 	searchApplicationHospital() {
-		this.applicationHospitalList = this.tool.getHospitalList();
+		this.applicationHospitalList = this.tool.getHospitalList().filter(i=> !i.parent && !i.type);
 		this.incidentModel.hosId = this.currentHospital.id;
 	  // let dataObj = {
 	  //   idx: 0,
@@ -1211,6 +1232,9 @@ export class MainComponent implements OnInit {
 	  if(userObj){
 	    this.incidentMsg.requesterPhone = userObj.phone;
 	  }
+		if(this.incidentModel.repairIncidentType === 'public'){
+			this.getItsmOrders('')
+		}
 	}
 	// 故障现象列表
 	applicationCategoryList:any[] = [];
@@ -1226,7 +1250,7 @@ export class MainComponent implements OnInit {
 	  // }
 	  let postData = {
 	    category: {
-				hosId: this.currentHospital.id,
+				// hosId: this.currentHospital.id,
 	      category: keyWord,
 	      selectType: 'mutlQuery',
 	      hierarchy: 3,//只差有三级的故障现象列表
@@ -1611,11 +1635,12 @@ export class MainComponent implements OnInit {
 	}
 	// 选择报修类型
 	changeRepairIncidentType(value){
-	  this.incidentModel.department = undefined;
+	  // this.incidentModel.department = undefined;
 	  this.incidentMsg.deptManyPhone = '';
-	
+		this.incidentModel.requester = null;
 	  this.isRelatedDepartment = value !== 'public';
 	  this.changeApplyRelatedDepartment(this.isRelatedDepartment);
+		this.rightTitleHandler(2);
 	}
 	// 楼栋列表
 	applicationBuildingList:any[] = [];
@@ -3885,6 +3910,14 @@ export class MainComponent implements OnInit {
 						if(!this.publicRepair && this.deptRepair){
 							this.incidentModel.repairIncidentType = 'dept'
 						}
+						if(this.hospitalModel==1){
+							if(this.tool.getCurrentHospital().parent){
+								this.incidentModel.hosId = this.tool.getCurrentHospital().parent.id
+							}else{
+								this.incidentModel.hosId = this.tool.getCurrentHospital().id
+							}
+							this.searchApplicationBuilding()
+						}
 					}
 				}
 			});
@@ -3893,35 +3926,13 @@ export class MainComponent implements OnInit {
 	// 新增报修
 	speedinessAdd(): void {
 		this.addOrder();
-		let preCurrentTabIndex = this.currentTabIndex;
-		if(preCurrentTabIndex === '故障报修'){
-		  if(this.applyDept){
-		    this.rightTitle_tab = [
-		      { id: 0, name: '近期配送' },
-		      // { id: 1, name: '转出院记录' },
-		    ]
-		    this.rightTitleHandler(this.rightTitle_tab[0].id);
-		  }
-		  let deptObj = this.applicationDeptList.find(v => v.id == this.incidentModel.department);
-		  if(this.applyDept != this.incidentModel.department){
-		    this.applyDept = this.incidentModel.department;
-		    this.searchApplicationDepartment('hsms', deptObj ? deptObj.dept : '', undefined, this.incidentModel.department);
-		  }
-		}else if(this.currentTabIndex === '故障报修'){
-		  if(this.incidentModel.department){
-		    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 && !this.buildType){
-		    this.incidentModel.department = this.applyDept;
-		    this.searchApplicationDepartment('itsm', deptObj ? deptObj.dept : '', undefined, this.applyDept);
-		  }
+		if(this.currentTabIndex === '故障报修'){
+				this.incidentModel.department = null;
+		  	this.rightTitle_tab = [
+		  		{ id: 2, name: '近期维修' },
+		  		{ id: 3, name: '知识库' },
+		  	]
+		  	this.rightTitleHandler(this.rightTitle_tab[0].id);
 		}
 	}
 	

src/app/views/questionnaire-answer/questionnaire-answer.component.html

@@ -1,9 +1,20 @@
 <div class="list-template">
   <div class="list-template__content">
     <div class="list-template__top" nz-row>
-      <div nz-col nzXl="18" class="list-template__searchBox"></div>
+      <div nz-col nzXl="18" class="list-template__searchBox">
+				<div class="list-template__searchItem">
+				  <span class="label width-105">登记时间区间：</span>
+				  <nz-range-picker nzShowTime [(ngModel)]="dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
+				</div>
+				<nz-select [(ngModel)]="monthValue" nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="changeMonth($event)">
+					<nz-option nzValue="1" nzLabel="本月"></nz-option>
+					<nz-option nzValue="2" nzLabel="上月"></nz-option>
+				</nz-select>
+			</div>
       <div nz-col nzLg="6" class="list-template__btns">
-        <button nz-button class="btn default" (click)='export()' [nzLoading]="loading2">导出</button>
+				<button nz-button class="btn default" (click)='getList(1)'>搜索</button>
+				<button nz-button class="btn default ml8" (click)='reset()'>重置</button>
+        <button nz-button class="btn default ml8" (click)='export()' [nzLoading]="loading2">导出</button>
       </div>
     </div>
     <div class="list-template__bottom">
@@ -30,6 +41,7 @@
 						<td *ngFor="let item of data">
 							{{ item.answer }}
 						</td>
+						<td>{{data[0].addTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
           </tr>
         </tbody>
       </nz-table>

src/app/views/questionnaire-answer/questionnaire-answer.component.less

@@ -6,6 +6,14 @@
   }
 }
 
+.width-105{
+	width: 105px !important;
+}
+
+.ant-select{
+	width: 120px !important;
+}
+
 .save {
   position: fixed;
   left: 0;

src/app/views/questionnaire-answer/questionnaire-answer.component.ts

@@ -4,6 +4,9 @@ import { MainService } from "../../services/main.service";
 import { ToolService } from "../../services/tool.service";
 import { NzMessageService } from 'ng-zorro-antd';
 import { THIS_EXPR } from '@angular/compiler/src/output/output_ast';
+import { format, startOfDay, endOfDay } from 'date-fns';
+import { DateService } from 'src/app/services/date.service';
+
 @Component({
   selector: "app-questionnaire-answer",
   templateUrl: "./questionnaire-answer.component.html",
@@ -15,7 +18,8 @@ export class QuestionnaireAnswerComponent implements OnInit {
     private route: ActivatedRoute,
     private router: Router,
     private tool: ToolService,
-    private message: NzMessageService
+    private message: NzMessageService,
+		private dateService: DateService,
   ) {}
 
   userInfo: any = JSON.parse(localStorage.getItem("user")) || {}; //登录用户信息
@@ -41,6 +45,8 @@ export class QuestionnaireAnswerComponent implements OnInit {
       idx: 0,
       sum: 99999,
       qmId: this.route.snapshot.queryParams.id,
+			startTime: this.startDate || undefined,
+			endTime: this.endDate || undefined,
     };
     this.loading2 = true;
     this.mainService.exportReport("survey", postData).subscribe(
@@ -65,6 +71,48 @@ export class QuestionnaireAnswerComponent implements OnInit {
       }
     );
   }
+	
+	// 日期选择
+	startDate: string; //发起时间开始
+	endDate: string; //发起时间结束
+	dateRange: any = [];
+	changeDate(result?): void {
+	  if (result.length==0) {
+	    this.startDate = this.endDate = null;
+	    return;
+	  }
+		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]
+	}
+	
+	monthValue:any;
+	// 快捷选择 1：本月 2：上月
+	changeMonth(e){
+		if(e==2){
+			let lastmonthstartdate = this.dateService.date().lastMonthStartDate;
+			let lastmonthenddate = this.dateService.date().lastMonthEndDate;
+			this.startDate = format(lastmonthstartdate, 'yyyy-MM-dd HH:mm:ss');
+			this.endDate = format(lastmonthenddate, 'yyyy-MM-dd HH:mm:ss');
+			this.dateRange = [this.startDate,this.endDate]
+		}else{
+			let thismonthstartdate = this.dateService.date().thisMonthStartDate;
+			let thismonthenddate = this.dateService.date().thisMonthEndDate;
+			this.startDate = format(thismonthstartdate, 'yyyy-MM-dd HH:mm:ss');
+			this.endDate = format(thismonthenddate, 'yyyy-MM-dd HH:mm:ss');
+			this.dateRange = [this.startDate,this.endDate]
+		}
+	}
+	
+	// 重置
+	reset(){
+		this.pageIndex = 1;
+		this.startDate = null;
+		this.endDate = null;
+		this.dateRange = []
+		this.getList(1);
+	}
+	
   // 表格数据
   loading1 = false;
   getList(type) {
@@ -74,7 +122,9 @@ export class QuestionnaireAnswerComponent implements OnInit {
     let postData = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
-      qmId: this.route.snapshot.queryParams.id
+      qmId: this.route.snapshot.queryParams.id,
+			startTime: this.startDate || undefined,
+			endTime: this.endDate || undefined,
     };
     this.loading1 = true;
     this.mainService

src/app/views/task-type-management/task-type-management.component.less

@@ -738,17 +738,17 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  z-index: 10;
+  z-index: 99;
 
   .modalBody {
-    width: 480px; // height: 580px;
+    width: 70%; // height: 580px;
     background: #fff;
     border-radius: 5px;
     padding: 12px 20px;
     color: #333;
     font-size: 14px;
     .fixHieght {
-      max-height: 400px;
+      max-height: calc(100vh - 200px);
       overflow-y: auto;
     }
 

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

@@ -47,6 +47,9 @@
         <button nz-button *ngIf="coopBtns.import" class="btn ml8 default" (click)="excelImport()">导入</button>
       </div>
     </div>
+		<div class="list-template__checkBoxes">
+		  <nz-checkbox-group [(ngModel)]="checkOptionsOne" (ngModelChange)="log(checkOptionsOne)"></nz-checkbox-group>
+		</div>
     <div class="list-template__bottom">
       <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
         [nzLoading]="loading1">
@@ -88,10 +91,11 @@
             <td>{{ data.usertype ? data.usertype.name : '' }}</td>
             <td>
               <div class="coop">
-                <span *ngIf="coopBtns.look" (click)="detail(data.id)">查看</span>
-                <span *ngIf="coopBtns.edit" (click)="edit(data)">编辑</span>
-                <span *ngIf="coopBtns.del" (click)="del(data)">删除</span>
-                <span *ngIf="coopBtns.resetPwd" (click)="resetPwd(data)">重置密码</span>
+                <span *ngIf="coopBtns.look && !checkOptionsOne[0].checked" (click)="detail(data.id)">查看</span>
+                <span *ngIf="coopBtns.edit || checkOptionsOne[0].checked" (click)="edit(data)">编辑</span>
+								<span *ngIf="checkOptionsOne[0].checked" (click)="recover(data)">恢复</span>
+                <span *ngIf="coopBtns.del && !checkOptionsOne[0].checked" (click)="del(data)">删除</span>
+                <span *ngIf="coopBtns.resetPwd && !checkOptionsOne[0].checked" (click)="resetPwd(data)">重置密码</span>
               </div>
             </td>
           </tr>
@@ -261,7 +265,7 @@
 
 <!-- 恢复账号 -->
 <app-dialog-delete [delModal]="recoverModal" (hideDelModalEvent)="hideRecoverModal()" [btnLoading]="recoverLoading"
-  (confirmDelEvent)="confirmRecover()" [content]="recoverContent" [isShowConfirm]="false">
+  (confirmDelEvent)="confirmRecover()" content="您确认恢复此用户吗？" confirmTxt="是" cancelTxt="否">
 </app-dialog-delete>
 
 <!-- 重置密码模态框 -->

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

@@ -68,7 +68,10 @@ export class UsersManagementComponent implements OnInit {
   wxRequired = false; //新增或编辑用户的时候，微信号是否必填
   changeInpSubject = new Subject(); //防抖
   changeInpCompanySubject = new Subject(); //防抖
-
+	checkOptionsOne: Array<any> = [
+	  { label: "已删除", value: "0", checked: false },
+	];
+	
   ngOnInit() {
     //防抖
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
@@ -164,6 +167,21 @@ export class UsersManagementComponent implements OnInit {
       );
   }
   // 导入---end
+	
+	// 表格筛选
+	log(value: object[]): void {
+	  console.log(value);
+	  this.pageIndex = 1;
+	  this.getList();
+	}
+	
+	// 恢复
+	itemData:any;
+	recover(data){
+		this.itemData = data;
+		this.recoverModal = true;
+	}
+	
   // 搜索
   search() {
     this.pageIndex = 1;
@@ -193,7 +211,8 @@ export class UsersManagementComponent implements OnInit {
         account: this.num || "",
         groupdata: { id: this.userGroup1 || "" },
         hospital: { id: this.hosId || "" },
-        userTypeIds: String(this.userTypes.map(v => v.id))
+        userTypeIds: String(this.userTypes.map(v => v.id)),
+				deleted: this.checkOptionsOne[0].checked ? 1 : undefined
       },
     };
     if (!data.user.dept || !data.user.dept.id) {
@@ -660,24 +679,15 @@ export class UsersManagementComponent implements OnInit {
 
 	// 确认恢复
 	confirmRecover() {
-		this.hideRecoverModal();
-		return
 	  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
+			user:{
+				...this.itemData,
+				deleted: 0
+			}
 		}
 	  that.recoverLoading = true;
-	  that.mainService
-	    .recoveryUser(query)
-	    .subscribe((data) => {
+	  that.mainService.coopData("updData", "user", query).subscribe((data) => {
 	      that.recoverLoading = false;
 	      that.hideRecoverModal();
 	      if (data["status"] == 200) {

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

@@ -83,7 +83,8 @@
 								<td>{{ data.rsPrice?data.rsPrice : '-' }}</td>
 			          <td>
 			            <div class="coop">
-										<span (click)="delBx(data)">撤销</span>
+										<span (click)="showAppraiseBx(data)" *ngIf="data.state && data.state.value == 'close' && !data.wxdegree">评价</span>
+										<span (click)="delBx(data)" *ngIf="data.state && data.state.value=='accept'">撤销</span>
 										<span (click)="detailBx(data)">查看</span>
 			            </div>
 			          </td>
@@ -330,3 +331,61 @@
   (confirmDelEvent)="confirmDelBx()"
   content="您确认要撤销吗？"
 ></app-dialog-delete>
+
+<!-- 报修评价模态框 -->
+<div
+  class="save display_flex align-items_center justify-content_flex-center appraise"
+  *ngIf="appraiseModalBx"
+>
+  <div class="modalBody">
+    <div class="title">
+      评价<i
+        class="icon_transport transport-guanbi"
+        (click)="hideAppraiseBx()"
+      ></i>
+    </div>
+    <div class="content">
+      <div class="jiTit borderB">您的评价对我们至关重要，感谢您！</div>
+      <br />
+      <div class="star">
+        <div
+          nz-row
+          class="alignC display_flex justify-content_flex-center align-items_center"
+        >
+          <div nz-col nzSpan="4">星级：</div>
+          <div nz-col nzSpan="20">
+            <nz-rate [(ngModel)]="starNumBx"></nz-rate>
+          </div>
+        </div>
+        <div nz-row>
+          <div nz-col nzSpan="4">评级：</div>
+          <div nz-col nzSpan="20">
+            <textarea
+              rows="4"
+              nz-input
+              [(ngModel)]="appraiseContentBx"
+            ></textarea>
+          </div>
+        </div>
+      </div>
+      <br />
+    </div>
+    <div class="btns display_flex justify-content_flex-center">
+      <button
+        nz-button
+        nzType="primary"
+        [nzLoading]="btnLoading"
+        (click)="confirmAppraiseBx()"
+      >
+        确认
+      </button>
+      <button
+        class="btn cancel"
+        nz-button
+        nzType="default"
+        (click)="hideAppraiseBx()"
+      >
+        关闭
+      </button>
+    </div>
+  </div>

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

@@ -1192,7 +1192,7 @@
 
     .content {
       width: 100%;
-      height: 117px;
+      // height: 117px;
       background: #f9fafb;
       border: 1px solid #e5e9ed;
       border-radius: 5px;
@@ -1538,7 +1538,7 @@
 		
 		    .content {
 		      width: 100%;
-		      height: 117px;
+		      // height: 117px;
 		      background: #f9fafb;
 		      border: 1px solid #e5e9ed;
 		      border-radius: 5px;
@@ -1840,4 +1840,231 @@
 	      }
 	    }
 	  }
+	}
+	
+	.save {
+	  position: fixed;
+	  left: 0;
+	  top: 0;
+	  width: 100%;
+	  height: 100%;
+	  background: rgba(0, 0, 0, 0.4);
+	  z-index: 99;
+	  .modalBody {
+	    width: 480px;
+	    min-height: 220px;
+	    background: #fff;
+	    border-radius: 5px;
+	    padding: 10px 20px;
+	    color: #333;
+	
+	    &.sm {
+	      width: 350px;
+	    }
+	
+	    .title {
+	      width: 100%;
+	      text-align: center;
+	      font-size: 18px;
+	      position: relative;
+	
+	      i {
+	        position: absolute;
+	        right: 0;
+	        top: 0;
+	        font-size: 20px;
+	        color: #666;
+	        cursor: pointer;
+	        padding: 0 5px;
+	      }
+	    }
+	
+	    .content {
+	      width: 100%;
+	      min-height: 117px;
+	      background: #f9fafb;
+	      border: 1px solid @hs_border_color;
+	      border-radius: 5px;
+	      overflow: hidden;
+	      margin-top: 12px;
+	      padding: 16px 10px;
+	
+	      &.bb {
+	        display: flex;
+	        justify-content: center;
+	        align-items: center;
+	      }
+	
+	      .patientForm {
+	        padding-top: 15px;
+	
+	        .ant-form-item {
+	          margin-bottom: 5px;
+	
+	          .ant-form-item-label {
+	            line-height: 20px;
+	            text-align: left;
+	          }
+	
+	          .goods {
+	            line-height: 40px;
+	          }
+	
+	          .ant-form-item-control {
+	            line-height: 21px;
+	          }
+	
+	          .datesGroup {
+	            padding-top: 10px;
+	
+	            .linkCheckCheck {
+	              text-indent: 7px;
+	              margin-top: 0;
+	
+	              .priority {
+	                color: #d81e06;
+	              }
+	            }
+	          }
+	
+	          .radioGroup {
+	            line-height: 24px;
+	            padding-left: 14px;
+	          }
+	
+	          .desc {
+	            margin-top: 5px;
+	          }
+	        }
+	
+	        .linkCheckCheck {
+	          .ant-checkbox-wrapper {
+	            margin-left: 0 !important;
+	          }
+	        }
+	      }
+	
+	      .shortcutForm {
+	        padding-top: 20px;
+	
+	        .ant-form-item {
+	          margin-bottom: 15px;
+	        }
+	
+	        .ant-form-item-label {
+	          text-align: left;
+	          line-height: 0;
+	        }
+	
+	        .goods {
+	          line-height: 40px;
+	        }
+	      }
+	
+	      .jiTit {
+	        text-align: center;
+	        color: #666;
+	        padding: 8px 0;
+	
+	        &.jiTitB {
+	          color: @primary-color;
+	          font-size: 12px;
+	          font-weight: bold;
+	        }
+	      }
+	
+	      & > div {
+	        margin: 0;
+	
+	        &.title {
+	          text-align: left;
+	          color: #333;
+	          font-size: 14px;
+	          line-height: 30px;
+	        }
+	
+	        &.icon {
+	          i {
+	            color: #34b349;
+	            font-size: 30px !important;
+	
+	            &.transport-wenhao {
+	              color: #f5a523;
+	            }
+	
+	            &.transport-shibai {
+	              color: #ff3a52;
+	            }
+	          }
+	        }
+	
+	        &.defeat {
+	          color: #333;
+	          font-size: 16px;
+	        }
+	
+	        &.otherInfo {
+	          color: @primary-color;
+	          font-size: 12px;
+	        }
+	      }
+	
+	      // 评价
+	      .star {
+	        padding: 0 30px;
+	        font-size: 14px;
+	        color: #666;
+	
+	        i {
+	          font-size: 20px;
+	        }
+	      }
+	
+	      // 意见箱查看
+	      .conItem {
+	        padding-bottom: 50px;
+	        color: #333;
+	
+	        &.noCon {
+	          padding-bottom: 0;
+	        }
+	
+	        &:nth-child(1) {
+	          border-bottom: 1px solid @hs_border_color;
+	        }
+	
+	        &:nth-child(2) {
+	          padding-top: 20px;
+	        }
+	
+	        .defeat {
+	          padding-top: 10px;
+	        }
+	      }
+	    }
+	
+	    .btns {
+	      &.patientBtns{
+	        button {
+	          margin-top: 16px;
+	          font-size: 18px;
+	        }
+	      }
+	      button {
+	        margin-top: 10px;
+	
+	        &.btn {
+	          margin-left: 8px;
+	        }
+	
+	        &.knowBtn {
+	          color: @primary-color;
+	        }
+	      }
+	    }
+	  }
+	}
+	
+	.borderB {
+	  border-bottom: 1px solid @hs_border_color;
 	}

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

@@ -183,7 +183,7 @@ export class WebRepairsComponent implements OnInit {
 	currentDept:any;
   ngOnInit() {
 		this.coopBtns = this.tool.initCoopBtns(this.route);
-		this.hosId = this.tool.getCurrentHospital().id;
+		this.hosId = this.tool.getCurrentHospital().parent ? this.tool.getCurrentHospital().parent.id : this.tool.getCurrentHospital().id;
 		this.userId = this.tool.getCurrentUserId()
 		this.deptId = this.tool.getCurrentUserDept().id
 		this.deptName = this.tool.getCurrentUserDept().dept
@@ -192,7 +192,8 @@ export class WebRepairsComponent implements OnInit {
 		if(this.route.snapshot.queryParams && this.route.snapshot.queryParams.type){
 			this.backType = this.route.snapshot.queryParams.type
 		}
-		this.getStatusDic()
+		this.getStatusDic();
+		this.getDegrees();
   }
 	
 	// 初始化新增form表单
@@ -207,11 +208,12 @@ export class WebRepairsComponent implements OnInit {
 	    contacts: [this.loginUser.name, [Validators.required]],
 	    contactsInformation: [this.loginUser.phone, [Validators.required]],
 	  });
-		if(this.userInfo.buildingDTO){
-			this.changeHosp();
-		}else{
-			this.getUserInfo();
-		}
+		this.changeHosp();
+		// if(this.userInfo.buildingDTO){
+		// 	this.changeHosp();
+		// }else{
+		// 	this.getUserInfo();
+		// }
 	}
 	// 查询用户信息
 	deptDto:any = {};
@@ -426,6 +428,58 @@ export class WebRepairsComponent implements OnInit {
 	  this.reqModal = false;
 	}
 	
+	// 获取星级
+	degrees = [];
+	getDegrees() {
+	  this.iLoading = true;
+	  this.mainService.getDictionary("list", "incident_degree").subscribe((data: any) => {
+	    this.iLoading = false;
+	    this.degrees = data || [];
+	  });
+	}
+	iLoading = false;
+	
+	// 报修评价
+	appraiseModalBx: boolean = false;
+	starNumBx: number = 5; //评价星
+	appraiseContentBx: string = ""; //评级
+	appraiseDataBx: any;
+	showAppraiseBx(data) {
+	  this.appraiseDataBx = data;
+	  this.appraiseModalBx = true;
+	  this.starNumBx = 5;
+	  this.appraiseContentBx = "";
+	}
+	// 保存评价
+	confirmAppraiseBx() {
+	  console.log(this.starNumBx, this.appraiseContentBx);
+	  if (!this.starNumBx) return;
+	  this.btnLoading = true;
+	  let id = this.degrees.find(v=>v.value == this.starNumBx).id;
+	  let postData = {
+	    incident: {
+	      ...this.appraiseDataBx,
+	      wxdegree: { id },
+	      wxdegreeremark: this.appraiseContentBx,
+	    }
+	  };
+	  this.mainService
+	    .flowPost("incident/task/resolve", postData)
+	    .subscribe((data:any) => {
+				this.btnLoading = false;
+	      this.hideAppraiseBx();
+	      if (data.state == 200) {
+	        this.getConnectList();
+	        this.showPromptModal("评价", true, "");
+	      } else {
+	        this.showPromptModal("评价", false, data.msg);
+	      }
+	    });
+	}
+	hideAppraiseBx() {
+	  this.appraiseModalBx = false;
+	}
+	
 	// 预览图片
 	imgs = [];
 	isPreview = false;
@@ -913,12 +967,12 @@ export class WebRepairsComponent implements OnInit {
 	  that.btnLoading = true;
 	  let data = {
 	    user: {
-	      name: that.validateForm.value.name,
-	      account: that.validateForm.value.account,
-	      phone: that.validateForm.value.phone,
-				buildingId: that.validateForm.value.buildingId,
-				floorId: that.validateForm.value.floorId,
-				address: that.validateForm.value.address,
+	      name: that.validateForm.value.name || null,
+	      account: that.validateForm.value.account || null,
+	      phone: that.validateForm.value.phone || null,
+				buildingId: that.validateForm.value.buildingId || null,
+				floorId: that.validateForm.value.floorId || null,
+				address: that.validateForm.value.address || null,
 				id: that.userId
 	    },
 	  };