Merge branch 'master' into develop

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

@@ -5,7 +5,7 @@
         <div class="contentItem" [title]="item.name" [ngClass]="{ active: item.id === activeDictionaryKey.id }" (click)="clickDictionaryKey(item)" *ngFor="let item of hospitalTabList">{{ item.name }}</div>
       </overlay-scrollbars>
     </div>
-    <div class="addressAssign" *ngIf="activeDictionaryKey.key=='property'">
+    <div class="addressAssign" *ngIf="activeDictionaryKey.key=='asset_consumables'">
 			<div class="hos-title">{{currentHospital.hosName}}</div>
       <overlay-scrollbars #osComponentRef2 class="contentBody2">
         <div class="contentBody">
@@ -52,7 +52,7 @@
       	</div>
       </overlay-scrollbars>
     </div>
-		<div class="addressAssign" *ngIf="activeDictionaryKey.key=='evaluate'">
+		<div class="addressAssign" *ngIf="activeDictionaryKey.key=='evaluation'">
 			<div class="hos-title">{{currentHospital.hosName}}</div>
 		  <overlay-scrollbars #osComponentRef2 class="contentBody2">
 		    <div class="contentBody">
@@ -106,6 +106,50 @@
 		  	</div>
 		  </overlay-scrollbars>
 		</div>
+		<div class="addressAssign" *ngIf="activeDictionaryKey.key=='alarm'">
+			<div class="hos-title">{{currentHospital.hosName}}</div>
+		  <overlay-scrollbars #osComponentRef2 class="contentBody2">
+		    <div class="contentBody">
+		      <div class="classList" *ngFor="let item of hospitalList">
+						<div class="mar-10" *ngIf="item.value2 == 'alarm' && item.key=='itsmAlarmAutoCreate'">
+							<span>{{ item.desc }}：</span>
+							<nz-radio-group [(ngModel)]="item.value" (ngModelChange)="radioAutoChange(item)">
+							  <label nz-radio nzValue="1">是</label>
+							  <label nz-radio nzValue="0">否</label>
+							</nz-radio-group>
+						</div>
+						
+						<div class="mar-10" *ngIf="item.value2 == 'alarm' && item.key=='itsmAlarmDefaultCategory' && alarmAutoSwitch">
+							<span>{{ item.desc }}：</span>
+							<nz-select class="w350px" nzShowSearch nzAllowClear [nzPlaceHolder]="'请选择'+item.desc" [(ngModel)]="item.value" (nzOnSearch)="changeCommonInp('category', $event)">
+							  <ng-container *ngFor="let option of malfunctionData">
+							    <nz-option *ngIf="!isLoading" [nzLabel]="option.mutiCategory" [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>
+						</div>
+						
+						<div class="mar-10" *ngIf="item.value2 == 'alarm' && item.key=='itsmAlarmUrgentRange' && alarmAutoSwitch">
+							<span>{{ item.desc }}：</span>
+							<nz-select class="w350px" nzShowSearch nzAllowClear nzMode="multiple"
+								[nzPlaceHolder]="'请选择'+item.desc" [(ngModel)]="item.value">
+							  <ng-container *ngFor="let option of alarmData">
+							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+							</nz-select>
+						</div>
+		      </div>
+					<div class="mar-10 red" *ngIf="alarmAutoSwitch">
+						默认获取告警状态为“告警中”进行自动建单
+					</div>
+		    </div>
+		  	<div class="contentBtns">
+		  	  <button nz-button nzType="primary" [nzLoading]="btnLoading" (click)="submitMessageForm()">确定</button>
+		  	</div>
+		  </overlay-scrollbars>
+		</div>
   </div>
 </div>
 

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

@@ -8,6 +8,9 @@
 	.w220px{
 		width: 220px;
 	}
+	.w350px{
+		width: 350px;
+	}
 	.w100px{
 			width: 100px !important;
 		}

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

@@ -3,6 +3,8 @@ import { ActivatedRoute } from "@angular/router";
 import { MainService } from "../../../services/main.service";
 import { ToolService } from 'src/app/services/tool.service';
 import { NzMessageService } from 'ng-zorro-antd';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
 
 @Component({
   selector: "app-configuration-hospital",
@@ -21,12 +23,19 @@ export class ConfigurationHospitalComponent implements OnInit {
   currentHospital; //当前院区
 	maintainDept:any=[];
 	@Input() hospitalTabList: any[] = [];
+	changeCommonInpSubject = new Subject();
 	
   ngOnInit() {
 		this.activeDictionaryKey = this.hospitalTabList[0];
 		this.maintainDept = this.tool.getUserInfoPermission().dutyList
     this.currentHospital = this.tool.getCurrentHospital();
+		this.changeCommonInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  if(v[0] === 'category'){
+		    this.searchApplicationCategory(v[1]);
+		  }
+		});
 		this.getDicType();
+		this.searchApplicationCategory();
   }
 	
 	activeDictionaryKey:any;
@@ -37,11 +46,16 @@ export class ConfigurationHospitalComponent implements OnInit {
 	
 	// 获取评价字典
 	dicData:any=[];
+	alarmData:any = [];
 	getDicType(){
 		this.mainService.getDictionary("list", "incident_degree").subscribe((data) => {
 			this.dicData = data
 			this.getList();
 		});
+		
+		this.mainService.getDictionary("list", "alarm_urgency").subscribe((data) => {
+			this.alarmData = data
+		});
 	}
 	
 	itsmQuoteOtherDeptWorkHourType:any;
@@ -90,6 +104,42 @@ export class ConfigurationHospitalComponent implements OnInit {
 		
 	}
 	
+	// 获取故障现象数据
+	isLoading:boolean = false;
+	malfunctionData:any = [];
+	searchApplicationCategory(keyWord?){
+		let postData = {
+		  category: {
+	      category: keyWord,
+	      selectType: "mutlQuery",
+		    hierarchy: 3,
+		  },
+		};
+	  this.isLoading = true;
+		this.mainService.incidentPost("listIncidentCategory", postData).subscribe(data => {
+		  this.isLoading = false;
+	    if (data.status == 200) {
+	      this.malfunctionData = data.data || [];
+	    }
+		})
+	}
+	
+	// 是否开启告警自动建单
+	alarmAutoSwitch:boolean = false;
+	radioAutoChange(data){
+		if(data.key=='itsmAlarmAutoCreate' && data.value==1){
+			this.alarmAutoSwitch = true
+		}else if(data.key=='itsmAlarmAutoCreate' && data.value==0){
+			this.alarmAutoSwitch = false
+			this.hospitalList[1].value = null
+			this.hospitalList[2].value = null
+		}
+	}
+	
+	changeCommonInp(type, e) {
+	  this.changeCommonInpSubject.next([type, e]);
+	}
+	
   // 新增/编辑表单提交
   btnLoading: boolean = false; //提交按钮loading状态
   submitMessageForm(): void {
@@ -99,6 +149,11 @@ export class ConfigurationHospitalComponent implements OnInit {
 				i.value = i.value.join(',')
 			}
 		}
+		if(this.activeDictionaryKey.key=='alarm'){
+			if(this.hospitalList[0].value==1){
+				this.hospitalList[2].value = this.hospitalList[2].value.join(',')
+			}
+		}
 		setTimeout(_=>{
 			this.mainService
 			  .simplePost("addListData", "hospitalConfig", this.hospitalList)
@@ -124,6 +179,7 @@ export class ConfigurationHospitalComponent implements OnInit {
       hospitalConfig: {
         hosId: this.currentHospital.id,
         model: 'itsm',
+				value2: this.activeDictionaryKey.key
       },
     };
     this.loading1 = true;
@@ -165,14 +221,18 @@ export class ConfigurationHospitalComponent implements OnInit {
 							this.itsmQuoteOtherDeptConsumableType = false
 						}
 						
-						if(i.key=='itsmUserEvaluation' || i.key=='itsmCallbackEvaluation'){
-							i.value = Number(i.value)
+						if(i.key=='itsmUserEvaluation' || i.key=='itsmCallbackEvaluation' || i.key=='itsmAlarmDefaultCategory'){
+							if(i.value){
+								i.value = Number(i.value)
+							}
 						}
 						
-						if(i.key=='itsmUserBadEvaluationRange' || i.key=='itsmCallbackBadEvaluationRange'){
-							let arr = i.value.split(',')
-							arr = arr.map(i=>i = parseInt(i))
-							i.value = arr
+						if(i.key=='itsmUserBadEvaluationRange' || i.key=='itsmCallbackBadEvaluationRange' || i.key=='itsmAlarmUrgentRange'){
+							if(i.value){
+								let arr = i.value.split(',')
+								arr = arr.map(i=>i = parseInt(i))
+								i.value = arr
+							}
 						}
 						
 						if(i.key=='itsmSimpleHandle' && i.value==1){
@@ -182,6 +242,20 @@ export class ConfigurationHospitalComponent implements OnInit {
 							let item = newData.find(i=>i.key == 'itsmWriteSolution')
 							item.show = true
 						}
+						
+						if(i.key=='itsmAlarmAutoCreate' && i.value==1){
+							this.alarmAutoSwitch = true
+						}else if(i.key=='itsmAlarmAutoCreate' && i.value==0){
+							this.alarmAutoSwitch = false 
+							let item1 = newData.find(i=>i.key == 'itsmAlarmUrgentRange')
+							if(item1.value){
+								item1.value = null
+							}
+							let item2 = newData.find(i=>i.key == 'itsmAlarmDefaultCategory')
+							if(item2.value){
+								item2.value = null
+							}
+						}
 					}
 
           this.hospitalList = newData || [];

src/app/share/edit-inspect-info2/edit-inspect-info2.component.ts

@@ -57,6 +57,7 @@ export class EditInspectInfo2Component implements OnInit {
     if(this.patient){
       this.inspectData.patientId = this.patient.id;
       this.patientList = [this.patient];
+      this.patientDTO = this.patient;
     }
 
     if(this.date){
@@ -193,7 +194,7 @@ export class EditInspectInfo2Component implements OnInit {
     }
     this.submitFormHand.emit({
       applyDeptId: this.inspectData.applyDeptId,
-      patientDTO: this.patientList.find(v => v.id == this.inspectData.patientId),
+      patientDTO: this.patientDTO,
       deptId: this.deptId,
       remark: this.remark,
       date: format(this.yyDate, 'yyyy-MM-dd') + ' ' + format(startOfMinute(this.yyTime), 'HH:mm:ss'),

src/app/views/emergency-info/emergency-info.component.html

@@ -93,7 +93,7 @@
             <td>{{ data.alarmId || '-' }}</td>
             <td>{{ data.alarmSource || '-' }}</td>
             <td>{{ data.alarmContent || '-' }}</td>
-            <td>{{ data.alarmStatus?.name }}</td>
+            <td [ngClass]="{'red': data.alarmStatus?.value == 1, 'yellow ': data.alarmStatus?.value == 2, 'green ': data.alarmStatus?.value == 4}">{{ data.alarmStatus?.name }}</td>
 						<td>{{ data.alarmIp || '-' }}</td>
 						<td>{{ data.alarmUrgency?.name }}</td>
 						<td>{{ data.alarmActiveTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
@@ -101,7 +101,8 @@
             <td>
               <div class="coop">
                 <span *ngIf="coopBtns.view" (click)="look(data)">查看</span>
-                <span *ngIf="coopBtns.add && !data.incidentSign" (click)="addOrder(data)">建单</span>
+                <span *ngIf="coopBtns.send && data.alarmStatus.value == 1" (click)="send(data)">消息发送</span>
+								<span *ngIf="coopBtns.add && (data.alarmStatus.value == 1 || data.alarmStatus.value == 3)" (click)="addOrder(data)">建单</span>
               </div>
             </td>
           </tr>
@@ -213,6 +214,15 @@
  [btnLoading]="btnLoading" (confirmDelEvent)="confirmOpt()" 
  [content]="infoContent"></app-dialog-delete>
 
+<!-- 发送模态框 -->
+<app-dialog-delete
+  [delModal]="sendModal"
+  (hideDelModalEvent)="hideSendModal()"
+  [btnLoading]="btnLoading"
+  (confirmDelEvent)="confirmSend()"
+  [content]="tipsMsg2"
+></app-dialog-delete>
+
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow" [info]="promptInfo"></app-prompt-modal>
 

src/app/views/emergency-info/emergency-info.component.less

@@ -6,6 +6,19 @@
 	cursor: pointer;
 	text-decoration: underline;
 }
+
+.red{
+	color: red !important;
+}
+
+.yellow{
+	color: #ffaa00 !important;
+}
+
+.green{
+	color: #49b586 !important;
+}
+
 .save {
   position: fixed;
   left: 0;

src/app/views/emergency-info/emergency-info.component.ts

@@ -9,6 +9,7 @@ import { debounceTime } from "rxjs/operators";
 import { EmergencyInfoService } from './emergency-info.service';
 import { format, startOfDay, endOfDay } from 'date-fns';
 import { NzMessageService } from "ng-zorro-antd";
+import { MainService } from 'src/app/services/main.service';
 
 @Component({
   selector: "app-emergency-info",
@@ -28,6 +29,7 @@ export class EmergencyInfoComponent implements OnInit {
 		private router: Router,
     private tool: ToolService,
     private quickOrderAcceptanceService: EmergencyInfoService,
+		private mainService: MainService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -154,8 +156,8 @@ export class EmergencyInfoComponent implements OnInit {
     let data = {
       pageIndex: this.pageIndex,
       pageSize: this.pageSize,
-      hosId: this.hosId,
 			alarm:{
+				hosId: this.hosId,
 				alarmStatus:{
 					id:this.alarmStatus
 				},
@@ -274,6 +276,7 @@ export class EmergencyInfoComponent implements OnInit {
         this.btnLoading = false;
         this.hideModal();
         this.initForm();
+				this.operateType = 'no'
         if (data.status == 200) {
           this.showPromptModal(this.add ? "新增" : "编辑", true, "");
         } else {
@@ -293,6 +296,7 @@ export class EmergencyInfoComponent implements OnInit {
         this.btnLoading = false;
         this.hideModal();
         this.initForm();
+				this.operateType = 'no'
         if (data.status == 200) {
           this.showPromptModal(this.add ? "新增" : "编辑", true, "");
         } else {
@@ -338,6 +342,7 @@ export class EmergencyInfoComponent implements OnInit {
 	  .subscribe((data) => {
 	    this.btnLoading = false;
 	    this.hideOptModal();
+			this.operateType = 'no'
 	    if (data.status == 200) {
 	      this.showPromptModal("操作", true, "");
 	    } else {
@@ -351,6 +356,42 @@ export class EmergencyInfoComponent implements OnInit {
 	  this.optModal = false;
 	}
 	
+	// 消息发送
+	sendModal:boolean = false;
+	tipsMsg2:any = '您确定要发送消息吗？';
+	send(data){
+		this.itemData = data;
+		this.sendModal = true;
+	}
+	
+	hideSendModal(){
+		this.sendModal = false;
+	}
+	
+	// 确定发送消息
+	operateType:any;
+	confirmSend(){
+		let data = {
+			alarm:{
+				operationType: 'sendMsg',
+				id: this.itemData.id,
+			}
+		};
+		this.btnLoading = true;
+		this.mainService
+		  .dataPost("updData", "alarm", data)
+		  .subscribe((data) => {
+		    this.btnLoading = false;
+				this.sendModal = false;
+		    if (data.status == 200) {
+					this.operateType = 'send'
+		      this.showPromptModal("操作", true, "");
+		    } else {
+		      this.showPromptModal("操作", false, data.msg);
+		    }
+		  });
+	}
+	
 	// 建单
 	addOrder(data){
 		this.tool.triggerEvent({
@@ -460,7 +501,11 @@ export class EmergencyInfoComponent implements OnInit {
     setTimeout(() => {
       this.promptModalShow = true;
     }, 100);
-    this.getList(true);
+		if(this.operateType = 'send'){
+			this.getList();
+		}else{
+			this.getList(true);
+		}
   }
 
   // 边输边搜节流阀

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

@@ -3601,7 +3601,8 @@ export class FuwutaiComponent implements OnInit {
       idx: 0,
       sum: 20,
       user: {
-        hospital: this.isRelatedDepartment ? undefined : { id: this.incidentModel.hosId },
+				statisticalHosId: this.isRelatedDepartment ? undefined :  this.incidentModel.hosId,
+        // hospital: this.isRelatedDepartment ? undefined : { id: this.incidentModel.hosId },
         dept: this.isRelatedDepartment ? { id: this.incidentModel.department } : undefined,
         name: keyWord,
 				// phone: this.incidentModel.incomingPhone || undefined

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

@@ -36,8 +36,9 @@ export class IncidentConfigComponent implements OnInit, AfterViewInit {
 
   // 院区配置
   hospitalTabList:any[] = [
-    { id: 1, name: '资产及耗材', key: "property"},
-    { id: 2, name: '评价', key: "evaluate"}
+    { id: 1, name: '资产及耗材', key: "asset_consumables"},
+    { id: 2, name: '评价', key: "evaluation"},
+		{ id: 3, name: '告警自动建单', key: "alarm"},
   ]
 	
 	// 自动建单

src/app/views/main/main-routing.module.ts

@@ -677,7 +677,13 @@ const routes: Routes = [
 			{
 			  path: "commonInfo",
 			  loadChildren: () => import("../common-info/common-info.module").then((m) => m.CommonInfoModule),
+			},
+			// 系统运行配置-工作日志
+			{
+			  path: "workLog",
+			  loadChildren: () => import("../work-log/work-log.module").then((m) => m.WorkLogModule),
 			}
+			
     ],
   },
 ];

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

@@ -1261,7 +1261,8 @@ export class MainComponent implements OnInit, OnDestroy {
 	    idx: 0,
 	    sum: 20,
 	    user: {
-	      hospital: this.isRelatedDepartment ? undefined : { id: this.incidentModel.hosId },
+				statisticalHosId: this.isRelatedDepartment ? undefined :  this.incidentModel.hosId,
+	      // hospital: this.isRelatedDepartment ? undefined : { id: this.incidentModel.hosId },
 	      dept: this.isRelatedDepartment ? { id: this.incidentModel.department } : undefined,
 	      name: keyWord,
 	      // simpleQuery: true,

src/app/views/work-log/work-log-routing.module.ts

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { WorkLogComponent } from './work-log.component';
+
+
+const routes: Routes = [
+  { path: '', component: WorkLogComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class WorkLogRoutingModule { }

src/app/views/work-log/work-log.component.html

@@ -0,0 +1,70 @@
+<div class="list-template">
+  <div class="list-template__content">
+   <div class="list-template__top" nz-row>
+      <div nz-col nzXl='17' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <span class="label">操作时间</span>：
+          <nz-range-picker nzShowTime [(ngModel)]="dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)" (ngModelChange)="changeDate($event)"></nz-range-picker>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">操作人</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+            (nzOnSearch)="changeUser($event)" nzAllowClear nzPlaceHolder="请选择操作人" [(ngModel)]="operationUser">
+            <ng-container *ngFor="let option of allWorker">
+              <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>
+        </div>
+				<div class="list-template__searchItem">
+				  <span class="label">类型</span>：
+				  <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch
+				    nzAllowClear nzPlaceHolder="请选择类型" [(ngModel)]="logType">
+				    <ng-container *ngFor="let option of typeData">
+				      <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+				    </ng-container>
+				  </nz-select>
+				</div>
+      </div>
+      <div nz-col nzLg="7" class="list-template__btns">
+        <button nz-button class="btn default ml8" (click)='search()'>搜索</button>
+        <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
+      </div>
+    </div>
+    <div class="list-template__bottom">
+      <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="loading1">
+        <thead>
+          <tr class="thead">
+            <th nzWidth="20%">操作人</th>
+            <th nzWidth="20%">类型</th>
+            <th nzWidth="20%">动作</th>
+            <th nzWidth="20%">备注</th>
+            <th nzWidth="20%">操作时间</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData;let i = index">
+            <td>{{data.operationUserDTO?.name}}</td>
+            <td>{{data.logType?.name}}</td>
+            <td>{{data.operationType?.name}}</td>
+            <td>{{data.logRemarks}}</td>
+            <td>{{data.operationTime | date: "yyyy-MM-dd HH:mm:ss"}}</td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" nzShowSizeChanger
+          (nzPageIndexChange)="getList(0)" (nzPageSizeChange)="getList(0)">
+        </nz-pagination>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>

src/app/views/work-log/work-log.component.less

@@ -0,0 +1,293 @@
+@import "../../../../src/theme.less";
+
+:host {
+  // ::ng-deep .ant-calendar-picker {
+  //   width: 100% !important;
+  // }
+  .list-template__top{
+    overflow: visible!important;
+  }
+}
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .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: 310px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      padding: 16px 0;
+
+      .busyList{
+        display: flex;
+        margin-bottom: 8px;
+        .busyContent{
+          margin-right: 8px;
+          flex: 1;
+        }
+      }
+
+      & > div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          // margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 14px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+      .workAssignmentTips {
+        font-size: 12px;
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 16px;
+        max-height: 497px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 0;
+
+            .ant-form-item-label {
+              text-align: left;
+            }
+
+            .desc {
+              margin-top: 5px;
+            }
+          }
+
+          .datesControl {
+            margin-top: -16px;
+
+            .ant-form-item-label {
+              line-height: 40px;
+            }
+          }
+
+          .timer {
+            .ant-form-item-label {
+              width: 100%;
+              text-align: left;
+            }
+
+            .numInp {
+              margin-right: 5px;
+            }
+
+            .line {
+              margin-right: 5px;
+            }
+          }
+
+          .timer2 {
+            .ant-form-item-label {
+              line-height: 20px;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+      }
+    }
+		
+		.modalLogBody {
+		  width: 80%;
+		  height: auto;
+		
+		  .content {
+		    width: 100%;
+		    height: auto;
+		    padding: 19px 14px 0 14px;
+		    max-height: 500px;
+		    overflow-y: auto;
+				
+				.list-template__bottom {
+				  background: #f9fafb;
+				  border: 1px solid #e5e9ed;
+				  border-radius: 8px;
+				  // padding-bottom: 56px;
+				  position: relative;
+				  .list-template__nzTable {
+				    padding: 16px 16px 0;
+				
+				    .thead {
+				      background-image: linear-gradient(to right, @bg-start, @bg-end);
+				
+				      th {
+				        background: transparent;
+				        color: #fff;
+				        text-align: center;
+				      }
+				    }
+				
+				    .ant-table-body {
+				      border-bottom: 1px solid #e5e9ed;
+				    }
+				
+				    .ant-table-tbody {
+				      tr {
+				        text-align: center;
+				        color: #333;
+				
+				        td {
+				          border: none;
+				
+				          &.tab_hover:hover{
+				            text-decoration: underline;
+				            cursor: pointer;
+				          }
+				
+				          .coop {
+				            button{
+				              color: #333;
+				            }
+				            span,button {
+				              display: inline-block;
+				              padding: 0 8px;
+				              cursor: pointer;
+				              position: relative;
+				
+				              &::after {
+				                content: "|";
+				                position: absolute;
+				                top: 0;
+				                right: 0;
+				              }
+				
+				              &:hover,
+				              &:active {
+				                color: @primary-color;
+				              }
+				
+				              &:nth-last-child(1) {
+				                &::after {
+				                  content: "";
+				                }
+				              }
+				            }
+				          }
+				        }
+				      }
+				    }
+				  }
+				}
+									
+		    .addForm {
+		      .ant-form-item {
+		        margin-bottom: 14px;
+		
+		        .ant-form-item-label {
+		          line-height: 14px;
+		          text-align: left;
+		        }
+		      }
+		    }
+		
+		    .editForm {
+		      .ant-form-item {
+		        margin-bottom: 14px;
+		
+		        .ant-form-item-label {
+		          line-height: 0;
+		          text-align: left;
+		        }
+		      }
+		    }
+				.list-template__pagination {
+					text-align: right;
+					padding: 20px 0;
+				}
+		  }
+			
+			
+		  button {
+		    &:nth-child(1) {
+		      margin-right: 20px;
+		    }
+		  }
+		}
+  }
+}

src/app/views/work-log/work-log.component.ts

@@ -0,0 +1,196 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { FormBuilder, Validators, FormGroup } from "@angular/forms";
+
+import { MainService } from "../../services/main.service";
+import { ToolService } from "../../services/tool.service";
+import { NzMessageService } from 'ng-zorro-antd';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { format } from 'date-fns';
+
+@Component({
+  selector: "app-work-log",
+  templateUrl: "./work-log.component.html",
+  styleUrls: ["./work-log.component.less"],
+})
+export class WorkLogComponent implements OnInit {
+  constructor(
+    private fb: FormBuilder,
+    private mainService: MainService,
+    private route: ActivatedRoute,
+    private router: Router,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 10; //表格每页展示条数
+  listLength: number = 10; //表格总数据量
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopData: any; //当前操作列
+  currentHospital; //当前院区
+
+  btnLoading: boolean = false; //提交按钮loading状态
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  nextSchemeName = ""; //下一个开启的方案名称
+  modelName = ""; //模态框名称
+
+  changeInpSubject = new Subject(); //防抖
+  showDropdown:boolean = false;
+
+  ngOnInit() {
+    this.currentHospital = this.tool.getCurrentHospital();
+		this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  let fun = v[0];
+		  fun.call(this, v[1], v[2]);
+		});
+		this.getAllWorker();
+		this.getTypeData();
+    this.getList(1);
+  }
+	
+	// 日期选择
+	startDate: string; //发起时间开始
+	endDate: string; //发起时间结束
+	changeDate(result?): void {
+	  if (!result) {
+	    this.startDate = this.endDate = "";
+	    return;
+	  }
+	  this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
+	  this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
+	}
+	
+	// 选择时间
+	dateRange:any = [];
+	onCalendarChangeDate(dateArr){
+	  if(dateArr.length == 2){
+	    let dateStart = new Date(dateArr[0]);
+	    let dateEnd = new Date(dateArr[1]);
+	    dateStart.setHours(0,0,0);
+	    dateEnd.setHours(23,59,59);
+	    this.dateRange = [dateStart,dateEnd];
+	  }
+	}
+	
+	// 获取类型
+	typeData:any = [];
+	logType:any;
+	getTypeData(){
+		this.mainService.getDictionary("list", "work_log_type").subscribe((res) => {
+			this.typeData = res
+		});
+	}
+	
+	// 获取操作人
+	operationUser:any;
+	allWorker:any = [];
+	getAllWorker(e?, those?) {
+	  let that = those || this;
+	  let postData = {
+	    user: {
+	      name: e || "",
+	      hospital: { id: that.currentHospital.id },
+	    },
+	    idx: 0,
+	    sum: 20,
+	  };
+	  that.isLoading = true;
+	  that.mainService
+	    .getFetchDataList("data", "user", postData)
+	    .subscribe((data) => {
+	      that.allWorker = data.list;
+	      that.isLoading = false;
+	    });
+	}
+	
+	// 用户输入搜索配送人员
+	changeUser(e) {
+	  this.searchTimer(this.getAllWorker, e);
+	}
+	
+	// 边输入边搜索节流阀
+	isLoading:boolean = false;
+	searchTimer(fun, e) {
+	  this.isLoading = true;
+	  this.changeInpSubject.next([fun, e]);
+	}
+	
+  // 表格数据
+  searchDto: any = {};
+  productDto:any = {};
+  loading1 = false;
+  getList(type) {
+    if (type == 1) {
+      this.pageIndex = 1;
+    }
+    let data = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      baseWorkLog: {
+				hosId: this.currentHospital.id,
+        startTime: this.startDate || undefined,
+    		endTime: this.endDate || undefined,
+    		operationUser: this.operationUser || undefined,
+    		logType:{
+    			id: this.logType
+    		}
+      },
+    };
+    
+    if(this.logType){
+    	data.baseWorkLog.logType.id = this.logType
+    }else{
+    	delete data.baseWorkLog.logType 
+    }
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "baseWorkLog", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.listOfData = data.list;
+          this.listLength = data.totalNum;
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+	
+	// 搜索
+	search() {
+	  this.pageIndex = 1;
+	  this.getList(1);
+	}
+	
+	// 重置
+	reset() {
+	  this.pageIndex = 1;
+	  this.logType = null;
+	  this.dateRange = [];
+		this.startDate = null;
+		this.endDate = null;
+	  this.operationUser = null;
+	  this.getList(1);
+	}
+	
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList(0);
+  }
+}

src/app/views/work-log/work-log.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { WorkLogRoutingModule } from './work-log-routing.module';
+import { WorkLogComponent } from './work-log.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    WorkLogComponent
+  ],
+  imports: [
+    CommonModule,
+    WorkLogRoutingModule,
+    ShareModule
+  ]
+})
+export class WorkLogModule { }