试管类型开发

src/app/app-routing.module.ts

@@ -32,6 +32,8 @@ import { SystemConfigGuard } from './guard/SystemConfig.guard';
 // 故障实时播报权限
 import { RealtimeBroadcastGuard } from './guard/realtimeBroadcast.guard';
 import { InspectClosedLoopViewGuard } from './guard/inspectClosedLoopView.guard';
+// web报修权限
+import { WebRepairsGuard } from './guard/WebRepairs.guard';
 const routes: Routes = [
   // 默认
   {
@@ -211,6 +213,12 @@ const routes: Routes = [
     path: 'batchSpecimen',
     loadChildren: () => import('./views/batch-specimen/batch-specimen.module').then(m => m.BatchSpecimenModule),
   },
+	// web报修
+	{
+	  path: 'webRepairs',
+	  loadChildren: () => import('./views/web-repairs/web-repairs.module').then(m => m.WebRepairsModule),
+		canActivate: [WebRepairsGuard]
+	},
   // 临时路由
   {
     path: "redirect",

src/app/guard/WebRepairs.guard.ts

@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { CanActivate, Router } from '@angular/router';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class WebRepairsGuard implements CanActivate {
+  constructor(public router: Router) { }
+
+  canActivate(): boolean {
+    const menus = JSON.parse(localStorage.getItem('menu'));
+    let can = false;
+    if (menus) {
+      can = menus.some(e => e.link == 'webRepairs');
+    }
+    if (!can) {
+      this.router.navigate(['login']);
+      return false
+    }
+    return true;
+  }
+}

src/app/services/tool.service.ts

@@ -318,6 +318,12 @@ export class ToolService {
 				case "viewGd":
 				  coopBtns.viewGd = true; //查看工单
 				  break;
+				case "updata":
+				  coopBtns.updata = true; //更新
+				  break;
+				case "download":
+				  coopBtns.download = true; //下载
+				  break;
       }
     });
     console.log(coopBtns);

src/app/share/businessData-detail-modal/businessData-detail-modal.component.html

@@ -136,7 +136,7 @@
         </div>
       </div>
       <nz-table *ngIf="type === 'specimen'" class="hospitalTable" [nzData]="specimenList" nzSize="middle" [nzShowPagination]="false"
-        [nzLoading]="hsLoading" [nzScroll]="{ y: '350px' }">
+        [nzLoading]="hsLoading">
         <thead>
           <tr class="thead">
             <th nzWidth="4%">序号</th>
@@ -156,7 +156,9 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of specimenList;let i = index;">
-            <td><span class="sign" *ngIf="orderId != data.gdid"></span>{{ (pageIndex - 1) * pageSize + i + 1 }}</td>
+            <td>
+							<span class="sign" *ngIf="orderId != data.gdIdSend && orderId != data.gdid"></span>
+						{{ (pageIndex - 1) * pageSize + i + 1 }}</td>
             <td>{{ data.sickRoom ? data.sickRoom.dept : "-" }}</td>
             <td>{{ data.patientName}}<span *ngIf="data.bedNum">({{data.bedNum}})</span><br>{{data.residenceNo}}</td>
             <td class="underline" (click)="viewSpecimenHistory(data)">{{ data.scode || "-" }}</td>

src/app/share/businessData-detail-modal/businessData-detail-modal.component.less

@@ -31,6 +31,8 @@
   }
   .hospitalTable {
     width: 100%;
+		height: calc(100vh - 360px);
+		overflow-y: auto;
     td {
       text-align: center !important;
       position: relative;
@@ -136,6 +138,7 @@
       flex-direction: column;
       justify-content: center;
       align-items: center;
+			
       &.content-search {
         min-height: 147px;
         justify-content: start;

src/app/share/businessData-detail-modal/businessData-detail-modal.component.ts

@@ -28,7 +28,7 @@ export class BusinessDataDetailModalComponent implements OnInit {
   @Input() orderId: String;
   @Input() type: String = '';
   @Input() dataInfo: any;
-
+	@Input() taskTypeValue: String;
   @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
 
   constructor(
@@ -75,6 +75,7 @@ export class BusinessDataDetailModalComponent implements OnInit {
         break;
 
     }
+		console.log(10010,this.taskTypeValue)
   }
 	
 	// 查看标本历史记录

src/app/share/detail-sample/detail-sample.component.html

@@ -116,6 +116,7 @@
   [show]="businessDataModalShow"
   [type]="businessDataModalType"
   [orderId]="orderId"
+	[taskTypeValue]="taskTypeValue"
   (closeModelHs)="closeModelBlood($event)"
 ></app-businessData-detail-modal>
 

src/app/share/detail-sample/detail-sample.component.ts

@@ -244,8 +244,10 @@ export class DetailSampleComponent implements OnInit {
   businessDataModalShow = false; //业务数据弹窗开关
   businessDataModalType = ''; //业务数据类型
   orderId = ""; //查看业务数据携带
+	taskTypeValue:any;
   viewDetail(data, type) {
     this.orderId = data.id;
+		this.taskTypeValue = data.taskType.associationType.value;
     this.businessDataModalType = type;
     this.businessDataModalShow = true;
   }

src/app/share/order-detail/order-detail.component.html

@@ -1298,6 +1298,7 @@
   [show]="businessDataModalShow"
   [type]="businessDataModalType"
   [orderId]="orderId"
+	[taskTypeValue]="taskTypeValue"
   (closeModelHs)="closeModelBlood($event)"
 ></app-businessData-detail-modal>
 

src/app/share/order-detail/order-detail.component.ts

@@ -165,8 +165,11 @@ export class OrderDetailComponent implements OnInit {
   businessDataModalShow = false; //业务数据弹窗开关
   businessDataModalType = ''; //业务数据类型
   orderId = ""; //查看业务数据携带
+	taskTypeValue:any;
   viewDetail(data, type) {
+		console.log(4444,data)
     this.orderId = data.id;
+		this.taskTypeValue = data.taskType.associationType.value;
     this.businessDataModalType = type;
     this.businessDataModalShow = true;
   }

src/app/views/common-document/common-document-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { CommonDocumentComponent } from './common-document.component';
+
+
+const routes: Routes = [
+  {
+    path: '',
+    component: CommonDocumentComponent,
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class CommonDocumentRoutingModule { }

src/app/views/common-document/common-document.component.html

@@ -0,0 +1,213 @@
+<div class="list-template">
+  <div class="content list-template__content">
+		<div class="list-left">
+			<div class="tree-top-add">
+				<button class="btn default" (click)='addTree(1)'>新增一级目录</button>
+			</div>
+			<div class="tree-opt">
+				<div class="item" (click)='addTree(2)'>新增</div>
+				<div class="item" (click)="treeDel()">删除</div>
+				<div class="item" (click)='editTree(3)'>修改</div>
+			</div>
+			<div class="tree-content">
+				<nz-tree [nzData]="nodes" 
+				(nzClick)="nodeClick($event)"
+				(nzDblClick)="openFolder($event)"
+				[nzExpandedIcon]="mutiExpandedIconTpl"
+				[nzTreeTemplate]="nzTreeTemplate"
+				[nzTreeTemplate]="nzTreeTemplate"
+				>
+<!-- 					<ng-template #mutiExpandedIconTpl let-node>
+						<i
+							*ngIf="!node.origin.isLeaf"
+							nz-icon
+							[nzType]="node.isExpanded ? 'folder-open' : 'folder'"
+							class="ant-tree-switcher-line-icon"
+						></i>
+						<i *ngIf="node.origin.isLeaf" nz-icon nzType="file" class="ant-tree-switcher-line-icon"></i>
+					</ng-template>
+					<ng-template #nzTreeTemplate let-node>
+						<div>{{node.folderName}}</div>
+					</ng-template> -->
+					<ng-template #nzTreeTemplate let-node>
+						<span class="custom-node" [class.active]="treeItem?.id === node.origin.id">
+							<span *ngIf="node.origin.children">
+								<i nz-icon [nzType]="node.origin.isExpanded ? 'folder-open' : 'folder'" (click)="openFolder(node)"></i>
+								<span class="folder-name">{{ node.origin.folderName }}</span>
+							</span>
+							<span *ngIf="!node.origin.children">
+								<i nz-icon nzType="file"></i>
+								<span class="file-name">{{ node.folderName }}</span>
+							</span>
+						</span>
+					</ng-template>
+				</nz-tree>
+			</div>
+		</div>
+		<div class="list-right">
+			<div class="list-template__top">
+			  <div class="list-template__searchBox">
+					<div class="list-template__searchItem">
+					  <span class="label">文档名称：</span>
+					  <input nz-input class="formItem" [(ngModel)]="batchNumber" placeholder="请输入文档名称" nzSize="default" />
+					</div>
+			    <div class="list-template__searchItem">
+			      <span class="label">文档格式：</span>
+			      <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp($event)" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择文档格式" [(ngModel)]="department">
+			        <ng-container *ngFor="let option of hospitals1">
+			          <nz-option *ngIf="!isDeptLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+			        </ng-container>
+			        <nz-option *ngIf="isDeptLoading" nzDisabled nzCustomContent>
+			          <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+			        </nz-option>
+			      </nz-select>
+			    </div>
+
+			  </div>
+			  <div class="list-template__btns">
+			    <button class="btn default" (click)='search()'>搜索</button>
+			    <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="10%">序号</th>
+			        <th>文档名称</th>
+			        <th>文档格式</th>
+			        <th>大小</th>
+			        <th>上传者</th>
+			        <th>更新时间</th>
+			        <th nzWidth="25%">操作</th>
+			      </tr>
+			    </thead>
+			    <tbody v-if="listOfData && listOfData.length>0">
+			      <tr *ngFor="let data of listOfData let index = index;" (click)="selectedListData(data.id)">
+							<td>{{ index+(pageIndex-1) * pageSize + 1 }}</td>
+			        <td>{{ data.applyDeptDTO?data.applyDeptDTO.dept :'-' }}</td>
+			        <td>{{ data.totalCount||'0' }}</td>
+			        <td>{{ data.expendPrice ||'0' }}</td>
+			        <td>{{ data.actualPrice || '0'}}</td>
+			        <td>{{ data.pharmacyDTO?data.pharmacyDTO.dept:'-'}}</td>
+			        <td>
+			          <div class="coop">
+									<span *ngIf="coopBtns.del" (click)="detail($event,data.id)">删除</span>
+									<span *ngIf="coopBtns.download" (click)="excelExport($event,data.id)">下载</span>
+			            <span *ngIf="coopBtns.updata" (click)="detail($event,data.id)">更新</span>
+									<span *ngIf="coopBtns.look" (click)="detail($event,data.id)">查看历史</span>
+								</div>
+			        </td>
+			      </tr>
+			    </tbody>
+			  </nz-table>
+			  <div class="list-template__pagination">
+			    <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+			      (nzPageIndexChange)="getList()" (nzPageSizeChange)="getList()">
+			    </nz-pagination>
+			  </div>
+			</div>
+		</div>
+
+  </div>
+
+  <!-- 新增/编辑模态框 -->
+  <div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="modal">
+    <div class="modalBody">
+      <div class="title">科室发药单-查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+      </div>
+      <overlay-scrollbars #osComponentRef1 class="content">
+        <div class="list-template__bottom">
+          <nz-table class="list-template__nzTable" [nzData]="viewData" nzSize="middle" [nzShowPagination]="false"
+            [nzLoading]="loading1">
+            <thead>
+              <tr class="thead">
+								<th nzWidth="10%">药品标识</th>
+                <th nzWidth="10%">药品名称</th>
+                <th nzWidth="10%">规格</th>
+                <th nzWidth="10%">消耗数量</th>
+                <th nzWidth="10%">实发数量</th>
+                <th nzWidth="10%">包装规格</th>
+                <th nzWidth="10%">发药药箱</th>
+                <th nzWidth="10%">原库存数</th>
+                <th nzWidth="10%">计算后库存</th>
+        				<th nzWidth="10%">增减</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of viewData">
+								<td>{{ data.drugsInfoDTO?data.drugsInfoDTO.drugCode:'无' }}</td>
+                <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.drugName:'无' }}</td>
+                <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.specs:'无' }}</td>
+                <td>{{ data.expendCount||'0' }}</td>
+                <td>{{ data.actualCount||'0' }}</td>
+                <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.packingSpecs:'0' }}</td>
+                <td>{{ data.cartonNum || '0' }}</td>
+                <td>{{ data.formerInventory || '0' }}</td>
+                <td>{{ data.afterInventory || '0'}}</td>
+        				<td>{{ data.addSub || '0' }}</td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </div>
+      </overlay-scrollbars>
+      <div class="display_flex justify-content_flex-center">
+        <button class="btn" nz-button nzType="primary" (click)="hideModal()">知道了</button>
+      </div>
+    </div>
+  </div>
+  <!-- 删除模态框 -->
+  <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+    (confirmDelEvent)="confirmDel()" content="您确认要删除科室吗？"></app-dialog-delete>
+
+  <!-- 启用停用模态框 -->
+  <app-dialog-delete [delModal]="delModal1" (hideDelModalEvent)="hideDelModal1()" [btnLoading]="btnLoading"
+    (confirmDelEvent)="confirmDel1()" [content]="'您确认要建立配送工单吗？'"></app-dialog-delete>
+
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo"></app-prompt-modal>
+
+<!-- 查看详情 -->
+<router-outlet></router-outlet>
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>
+<app-excel-import [isShow]="isShow" (hideFormHand)="hideExcelImport($event)" *ngIf="isShow" (submitFormHand)="submitExcelImport($event)"></app-excel-import>
+
+<!-- 删除树结构模态框 -->
+  <app-dialog-delete [delModal]="delTreeModal" (hideDelModalEvent)="hideTreeModal()" [btnLoading]="btnLoading"
+    (confirmDelEvent)="confirmTree()" content="您确认要删除目录吗？"></app-dialog-delete>
+		
+<!-- 新增一级目录 -->
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="addModal">
+	<div class="modalAddBody">
+		<div class="title">{{add?'新增':'编辑'}}<i class="icon_transport transport-guanbi" (click)="hideAddModal()"></i>
+		</div>
+		<div class="content">
+			<form nz-form [formGroup]="validateTreeForm" class="addForm" (ngSubmit)="submitForm()">
+				<nz-form-item *ngIf="treeType==2">
+					<nz-form-label [nzSpan]="7" nzRequired nzFor="parent">父级目录名称</nz-form-label>
+					<nz-form-control [nzSpan]="17" nzErrorTip="请输入父级目录名称!">
+						<nz-input-group>
+							<input nz-input disabled formControlName="parent" placeholder="请输入父级目录名称" />
+						</nz-input-group>
+					</nz-form-control>
+				</nz-form-item>
+				<nz-form-item>
+					<nz-form-label [nzSpan]="7" nzRequired nzFor="folderName">目录名称</nz-form-label>
+					<nz-form-control [nzSpan]="17" nzErrorTip="请输入目录名称!">
+						<nz-input-group>
+							<input nz-input formControlName="folderName" placeholder="请输入目录名称" />
+						</nz-input-group>
+					</nz-form-control>
+				</nz-form-item>
+			</form>
+		</div>
+		<div class=" display_flex justify-content_flex-center">
+			<button nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitAddForm()">确认</button>
+			<button class="btn cancel" nz-button nzType="default" (click)="hideAddModal()">取消</button>
+		</div>
+	</div>
+</div>

src/app/views/common-document/common-document.component.less

@@ -0,0 +1,276 @@
+@import "../../../../src/theme.less";
+:host {
+  .add-button {
+    margin: 0 auto 16px !important;
+  }
+  .targetDept {
+    overflow: hidden;
+    // width: 90px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .dynamic {
+    margin-bottom: 16px;
+    display: flex;
+    align-items: center;
+    input {
+      width: 90%;
+    }
+    i {
+      margin-left: 8px;
+      cursor: pointer;
+      font-size: 18px;
+    }
+  }
+}
+
+.list-template{
+	background: #eee;
+	.content{
+		display: flex;
+		.list-left{
+			width: 20%;
+			margin-right: 15px;
+			height: 100vh;
+			overflow-y: auto;
+			background: #fff;
+			.tree-top-add{
+				margin: 6px;
+			}
+			.tree-opt{
+				display: flex;
+				flex: 1;
+				.item{
+					width: 34%;
+					text-align: center;
+					height: 38px;
+					line-height: 38px;
+					color: #333;
+					background: #F0F6ED;
+					border: 1px solid #e5e9ed;
+					cursor: pointer;
+				}
+			}
+			.tree-content{
+				padding: 0 10px;
+				.ant-tree-node-content-wrapper{
+					width: 100%;
+				}
+			}
+		}
+		
+		.list-right{
+			width: 80%;
+			background: #fff;
+			padding: 10px;
+		}
+	}
+}
+
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalAddBody {
+    width: 480px;
+    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: 100%;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+			padding: 16px;
+			
+      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: 18px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      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: "";
+				                }
+				              }
+				            }
+				          }
+				        }
+				      }
+				    }
+				  }
+				  .list-template__pagination {
+				    height: 56px;
+				    display: flex;
+				    align-items: center;
+				    position: absolute;
+				    right: 8px;
+				  }
+				}
+				
+        .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;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}
+

src/app/views/common-document/common-document.module.ts

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

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

@@ -1015,7 +1015,7 @@
       <div class="title" *ngIf="currentTabIndex === '故障报修'">
         <div class="newTop">
           <div class="name">来电咨询</div>
-          <div class="newTopItem">
+          <div class="newTopItem" *ngIf="hospitalModel!=1">
             <span class="grayFont required">院区：</span>
             <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzPlaceHolder="请选择院区" [(ngModel)]="incidentModel.hosId" (ngModelChange)="changeApplyHospital($event)" nzAllowClear [nzDisabled]="buildType === '编辑事件'">
               <ng-container *ngFor="let option of applicationHospitalList">
@@ -1038,7 +1038,7 @@
             </nz-select>
           </div>
           <div class="newTopItem">
-            <span class="grayFont" [ngClass]="{'required': incidentModel.repairIncidentType === 'public'}">申请人：</span>
+            <span class="grayFont" [ngClass]="{'required': publicRepair && applicantMustFillIn==1}">申请人：</span>
             <ng-container *ngIf="buildType === '报修转事件'">{{incidentMsg.requesterName}}</ng-container>
             <ng-container *ngIf="buildType !== '报修转事件'">
               <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('requester', $event)" nzPlaceHolder="请选择申请人" [(ngModel)]="incidentModel.requester" (ngModelChange)="changeApplyRequester($event)" nzAllowClear (nzOpenChange)="openChangeApplyRequester($event)">
@@ -1055,7 +1055,7 @@
           <div class="newTopItem" *ngIf="incidentModel.incomingPhone">
             <span class="grayFont">来电电话：{{incidentModel.incomingPhone}}</span>
           </div>
-          <div class="newTopItem">
+          <div class="newTopItem" *ngIf="deptRepair && publicRepair">
             <span class="grayFont">
               <nz-radio-group [nzDisabled]="buildType === '编辑事件'" [(ngModel)]="incidentModel.repairIncidentType" (ngModelChange)="changeRepairIncidentType($event)">
                 <label nz-radio [nzValue]="item.value" *ngFor="let item of repairIncidentTypeList">{{item.name}}</label>

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

@@ -2625,6 +2625,54 @@ export class FuwutaiComponent implements OnInit {
       this.isRelatedDepartment = true;
     }
   }
+	
+	// 获取系统配置
+	initConfig:any;
+	config:any;
+	hospitalModel:any; //院区模式 1:单院区 -1：多院区
+	applicantMustFillIn:any; //申请人是否必填 1是，0否
+	deptRepair:any; //科内报修
+	publicRepair:any; //公共报修
+	getSysConfig() {
+		const postData = { idx: 0, sum: 99 };
+		this.mainService
+			.getFetchDataList("simple/data", "systemConfiguration", postData)
+			.subscribe((result) => {
+				if (result.status == 200) {
+					if (result.list && Array.isArray(result.list)) {
+						this.initConfig = JSON.parse(JSON.stringify(result.list));
+						this.config = result.list.map((item) => {
+							return [item.keyconfig, item.valueconfig, item.id, item.label];
+						});
+						this.config.forEach((c) => {
+							switch (c[0]) {
+								case "deptRepair":
+									if(c[1]=='1'){
+										this.deptRepair = true
+									}else{
+										this.deptRepair = false
+									}
+									break;
+								case "publicRepair":
+									if(c[1]=='1'){
+										this.publicRepair = true
+									}else{
+										this.publicRepair = false
+									}
+									break;
+								case "hospitalModel":
+									this.hospitalModel = c[1]
+									break;	
+								case "applicantMustFillIn":
+									this.applicantMustFillIn = c[1]
+									break;	
+							}
+						});
+					}
+				}
+			});
+	 }
+	 
   // 打开新建工单
   deathTasktypeId; //获取这个写死的任务类型的id,送病人回病房
   deathTasktypeIdPatient; //获取这个写死的任务类型的id,转出院记录
@@ -2643,6 +2691,7 @@ export class FuwutaiComponent implements OnInit {
       }else{
         this.resetOrderData2();
       }
+			this.getSysConfig();
       this.searchApplicationHospital();
       this.searchApplicationCategory();
       this.searchApplicationPriority();
@@ -3827,7 +3876,7 @@ export class FuwutaiComponent implements OnInit {
   maskFlag:any = false;
   // 运维-直接解决
   directOrder(){
-    if(this.incidentModel.repairIncidentType === 'public' && !this.incidentModel.requester){
+    if(this.publicRepair && this.applicantMustFillIn==1 && !this.incidentModel.requester){
       this.msg.warning('请选择申请人!');
       return;
     }
@@ -3882,7 +3931,7 @@ export class FuwutaiComponent implements OnInit {
   }
   // 运维-建单并派单
   assignOrder(){
-    if(this.incidentModel.repairIncidentType === 'public' && !this.incidentModel.requester){
+    if(this.publicRepair && this.applicantMustFillIn==1 && !this.incidentModel.requester){
       this.msg.warning('请选择申请人!');
       return;
     }
@@ -4075,7 +4124,7 @@ export class FuwutaiComponent implements OnInit {
 
   // 运维-保存
   saveOrder(){
-    if(this.incidentModel.repairIncidentType === 'public' && !this.incidentModel.requester){
+    if(this.publicRepair && this.applicantMustFillIn==1 && !this.incidentModel.requester){
       this.msg.warning('请选择申请人!');
       return;
     }

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

@@ -637,6 +637,16 @@ const routes: Routes = [
 			{
 			  path: "operationSearch",
 			  loadChildren: () => import("../operation-search/operation-search.module").then((m) => m.OperationSearchModule),
+			},
+			// 文档管理-公共文档
+			{
+			  path: "commonDocument",
+			  loadChildren: () => import("../common-document/common-document.module").then((m) => m.CommonDocumentModule),
+			},
+			// 文档管理-个人文档
+			{
+			  path: "personageDocument",
+			  loadChildren: () => import("../personage-document/personage-document.module").then((m) => m.PersonageDocumentModule),
 			}
     ],
   },

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

@@ -30,7 +30,7 @@
     <nz-header>
       <div class="app-header display_flex justify-content_space-between align-items_center">
         <div class="left">
-					<!-- <i class="icon_transport transport-bg-add green" *ngIf='speediness' (click)="speedinessAdd()" nz-tooltip nzTooltipTitle="新增报修"></i> -->
+					<i class="icon_transport transport-xinzeng green" *ngIf='speediness' (click)="speedinessAdd()" nz-tooltip nzTooltipTitle="新增报修"></i>
           <i class="icon_transport transport-tiaodu-fill green" *ngIf='deskRole' (click)="toFuwutai()" nz-tooltip nzTooltipTitle="调度台"></i>
           <i class="icon_transport transport-hushizhihanghuligongzuo green" *ngIf="nurseRole" (click)="toHuShi()" nz-tooltip nzTooltipTitle="护士端"></i>
           <i class="icon_transport transport-peizhi1 green" *ngIf="incidentConfigRole || otherConfigRole || pageConfigRole || nurseConfigRole" (click)="toConfigurationCenter()" nz-tooltip nzTooltipTitle="配置中心"></i>
@@ -53,7 +53,8 @@
 							<div class="dropdownItem" *ngIf="disinfectionSupplyRole" (click)="toDisinfectionSupply()">全局业务查看</div>
 							<div class="dropdownItem" *ngIf="realtimeBroadcastRole" (click)="toRealtimeBroadcast()">故障实时播报</div>
 							<div class="dropdownItem" *ngIf="inspectClosedLoopViewRole" (click)="toInspectClosedLoopView()">陪检闭环视图</div>
-            </div>
+							<div class="dropdownItem" *ngIf="webRepairs" (click)="toWebRepairs()">web报修</div>
+						</div>
           </div>
         </div>
         <div class="right">
@@ -155,14 +156,16 @@
 <app-select-menu (cancelMenuModal)="cancelMenuModal($event)" [iShowMenuModal]="iShowMenuModal"></app-select-menu>
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>
+<!-- 直接解决 -->
+<app-incident-direct-order *ngIf="directOrderModalShow" (closeModelHs)="closeDirectOrderModelOrder($event)" (confirmModelHs)="confirmDirectOrderModelOrder($event)"></app-incident-direct-order>
 
 <!-- 新建工单 -->
-<div class="newOrder display_flex justify-content_flex-center align-items_center" *ngIf="newOrderShowOpen" (click)="clickExtra($event)">
+<div class="newOrder display_flex justify-content_flex-center align-items_center" *ngIf="newOrderShowOpen">
 	<div class="modalBody">
 		<div class="title" *ngIf="currentTabIndex === '故障报修'">
 			<div class="newTop">
 				<div class="name">来电咨询</div>
-				<div class="newTopItem">
+				<div class="newTopItem" *ngIf="hospitalModel!=1">
 					<span class="grayFont required">院区：</span>
 					<nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzPlaceHolder="请选择院区" [(ngModel)]="incidentModel.hosId" (ngModelChange)="changeApplyHospital($event)" nzAllowClear [nzDisabled]="buildType === '编辑事件'">
 						<ng-container *ngFor="let option of applicationHospitalList">
@@ -185,7 +188,7 @@
 					</nz-select>
 				</div>
 				<div class="newTopItem">
-					<span class="grayFont" [ngClass]="{'required': incidentModel.repairIncidentType === 'public'}">申请人：</span>
+					<span class="grayFont" [ngClass]="{'required': publicRepair && applicantMustFillIn==1}">申请人：</span>
 					<ng-container *ngIf="buildType === '报修转事件'">{{incidentMsg.requesterName}}</ng-container>
 					<ng-container *ngIf="buildType !== '报修转事件'">
 						<nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('requester', $event)" nzPlaceHolder="请选择申请人" [(ngModel)]="incidentModel.requester" (ngModelChange)="changeApplyRequester($event)" nzAllowClear (nzOpenChange)="openChangeApplyRequester($event)">
@@ -202,7 +205,7 @@
 				<div class="newTopItem" *ngIf="incidentModel.incomingPhone">
 					<span class="grayFont">来电电话：{{incidentModel.incomingPhone}}</span>
 				</div>
-				<div class="newTopItem">
+				<div class="newTopItem" *ngIf="deptRepair && publicRepair">
 					<span class="grayFont">
 						<nz-radio-group [nzDisabled]="buildType === '编辑事件'" [(ngModel)]="incidentModel.repairIncidentType" (ngModelChange)="changeRepairIncidentType($event)">
 							<label nz-radio [nzValue]="item.value" *ngFor="let item of repairIncidentTypeList">{{item.name}}</label>
@@ -585,14 +588,14 @@
 			</div>
 		</div>
 		<div class="btns display_flex justify-content_flex-center align-items_center">
-			<ng-container *ngIf="applyDept && currentTabIndex !== '故障报修'">
+<!-- 			<ng-container *ngIf="applyDept && currentTabIndex !== '故障报修'">
 				<button nz-button class="btn" nzType="primary" (click)="newOrderOk('&go&')" [nzLoading]="isGoLoading" *ngIf="(radioValueQt || radioValueZy) && currentTasktype && currentTasktype.associationType && ((currentTasktype.associationType.value === 'inspect' && linkCheckLisTrue && !(currentTasktype.isMoreDept === 0 && isInspects)) || currentTasktype.associationType.value !== 'inspect')">
 					继续建单
 				</button>
 				<button nz-button class="btn" nzType="primary" (click)="newOrderOk()" [nzLoading]="isOkLoading" *ngIf="(radioValueQt || radioValueZy) && currentTasktype && currentTasktype.associationType && ((currentTasktype.associationType.value === 'inspect' && linkCheckLisTrue && !(currentTasktype.isMoreDept === 0 && isInspects)) || currentTasktype.associationType.value !== 'inspect')">
 					{{isYyInspect ? '预约建单' :'直接建单'}}
 				</button>
-			</ng-container>
+			</ng-container> -->
 			<ng-container *ngIf="currentTabIndex === '故障报修' && buildType !== '编辑事件'">
 				<label nz-checkbox [(ngModel)]="isBuildOrderAgagin" *ngIf="buildType !== '报修转事件' && buildType !== '留言转事件' && buildType !== '继续建单'">是否连续建单</label>
 				<button nz-button class="btn" nzType="primary" (click)="directOrder()">
@@ -616,3 +619,15 @@
 		</div>
 	</div>
 </div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal
+  *ngIf="promptModalShow"
+  [content]="promptContent"
+  [success]="ifSuccess"
+  [show]="promptModalShow"
+  [info]="promptInfo"
+  [back]="back"
+  (closeModel)="closeModel($event)"
+>
+

src/app/views/main/main.component.less

@@ -421,3 +421,779 @@ nz-header.ant-layout-header {
     }
   }
 }
+
+  // 新建工单弹框
+  .newOrder {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.5);
+    z-index: 99;
+
+    .modalBody {
+      width: 1318px;
+      // height: 580px;
+      background: #fff;
+      border-radius: 5px;
+      // padding: 12px 20px;
+      padding: 12px 0;
+      color: #333;
+      font-size: 14px;
+
+      .title {
+        font-size: 18px;
+        // text-align: center;
+        line-height: 24px;
+        margin: 6px 24px 18px;
+        position: relative;
+
+        i {
+          position: absolute;
+          right: 0;
+          top: 0;
+          font-size: 20px;
+          color: #666;
+          cursor: pointer;
+          padding: 0 5px;
+        }
+
+        .newTop{
+          display: flex;
+          align-items: center;
+          font-size: 14px;
+          .name{
+            font-weight: bold;
+            margin-right: 24px;
+          }
+          .newTopItem{
+            margin-right: 16px;
+            &:last-of-type{
+              margin-right: 0;
+            }
+          }
+        }
+      }
+
+      .content {
+        // width: 960px;
+        // height: 474px;
+        height: 603px;
+        // border: 1px solid #e5e9ed;
+        border-top: 1px solid #e5e9ed;
+        border-bottom: 1px solid #e5e9ed;
+        // background: #f9fafb;
+        // border-radius: 5px;
+        overflow: hidden;
+
+        .grayFont {
+          color: #666;
+        }
+
+        .col {
+          height: 100%;
+
+          &.left {
+            border-right: 2px solid #e5e9ed;
+            display: flex;
+            flex-direction: column;
+
+            .top {
+              padding: 8px;
+              nz-select {
+                margin-right: 8px;
+              }
+
+              .tel {
+                margin: 0 8px 0 0;
+              }
+            }
+            // tab 任务类型
+            .tabs {
+              display: flex;
+              height: 37px;
+              border-bottom: 1px solid #e5e9ed;
+              background-color: #fff;
+              .tabs__inner {
+                flex: 1;
+                overflow: hidden;
+                .tabs__wrap {
+                  position: relative;
+                  z-index: 1;
+                  display: flex;
+                  transition: all 1s;
+                  .tab {
+                    width: 120px;
+                    height: 36px;
+                    text-align: center;
+                    line-height: 36px;
+                    background: #fff;
+                    cursor: pointer;
+                    font-size: 14px;
+                    position: relative;
+
+                    &.checked {
+                      color: @primary-color;
+                      &::after{
+                        content: '';
+                        position: absolute;
+                        bottom: 0;
+                        left: 0;
+                        width: 100%;
+                        height: 1px;
+                        background-color: @primary-color;
+                      }
+                    }
+                  }
+                }
+              }
+              .tabs__operate {
+                border-bottom: 1px solid #e5e9ed;
+                border-left: 1px solid #e5e9ed;
+                width: 22px;
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+                justify-content: center;
+                position: relative;
+                z-index: 2;
+                .tabs__Icon--left {
+                  font-size: 12px;
+                  color: #e5e9ed;
+                  cursor: pointer;
+                  &:hover {
+                    color: #333;
+                  }
+                }
+                .tabs__Icon--right {
+                  transform: rotateY(180deg);
+                  font-size: 12px;
+                  color: #e5e9ed;
+                  cursor: pointer;
+                  &:hover {
+                    color: #333;
+                  }
+                }
+              }
+            }
+
+            // 底部tab页
+            .bottomWrap {
+              flex: 1;
+              height: 300px;
+              .bottom_req{
+                height: 100%;
+                padding: 16px;
+                ::ng-deep .ant-calendar-picker{
+                  width: 100%!important;
+                }
+                .row{
+                  display: flex;
+                  align-items: center;
+                  margin-bottom: 16px;
+                  &:last-of-type{
+                    margin-bottom: 0;
+                  }
+                  .col{
+                    flex: 1;
+                    flex-shrink: 0;
+                    display: flex;
+                    align-items: center;
+                    word-break: break-all;
+                    position: relative;
+                    margin-right: 8px;
+                    &:last-of-type{
+                      margin-right: 0;
+                    }
+                    &.alignItemsStart{
+                      align-items: flex-start;
+                    }
+                    &.flex2{
+                      flex: 2;
+                    }
+                    &.flex3{
+                      flex: 3;
+                    }
+                    &.flex4{
+                      flex: 4;
+                    }
+                    &.flex5{
+                      flex: 5;
+                    }
+                    &.flex6{
+                      flex: 6;
+                    }
+                    &.flex7{
+                      flex: 7;
+                    }
+                    .addressList{
+                      position: absolute;
+                      top: 100%;
+                      left: 0;
+                      width: 100%;
+                      max-height: 256px;
+                      z-index: 2;
+                      background: #fff;
+                      border: 1px solid #d9d9d9;
+                      border-radius: 4px;
+                      overflow: hidden auto;
+                      .addressItem{
+                        padding: 5px 12px;
+                        cursor: pointer;
+                        &:hover{
+                          background-color: #e9f7e9;
+                        }
+                      }
+                    }
+                    .ant-input-clear-icon{
+                      align-self: center;
+                      font-style: normal;
+                      cursor: pointer;
+                      margin-left: 8px;
+                      font-size: 12px;
+                      border-bottom: 1px solid #49b856;
+                      color: #49b856;
+                      flex-shrink: 0;
+                    }
+                    .name{
+                      flex-shrink: 0;
+                      width: 6em;
+                      text-align-last: justify;
+                      padding-left: 12px;
+                      box-sizing: content-box;
+                    }
+                    em{
+                      font-style: normal;
+                      cursor: pointer;
+                      margin-left: 8px;
+                      font-size: 12px;
+                      border-bottom: 1px solid @primary-color;
+                      color: @primary-color;
+                    }
+                  }
+                }
+              }
+              .bottom {
+                padding: 0 16px;
+                // height: 310px;
+                height: 567px;
+                overflow-y: auto;
+                .ant-form {
+                  height: 100%;
+                  .ant-form-item {
+                    margin-bottom: 0;
+                  }
+                }
+                .control-flex {
+                  margin-top: 16px;
+                  overflow: hidden;
+                  display: flex;
+                  justify-content: space-between;
+                  align-items: center;
+                  .patient-control{
+                    flex-shrink: 0;
+                  }
+                  .goods-control{
+                    display: flex;
+                    flex-shrink: 0;
+                    margin-left: 16px;
+                    align-items: center;
+                  }
+                }
+                .goods-wrap {
+                  margin-left: 8px;
+                  .goods-item {
+                    display: inline-block;
+                  }
+                }
+                // 标本轮巡
+                .bottom380256 {
+                  height: 100%;
+                  font-size: 16px;
+                  color: #333;
+                  display: flex;
+                  justify-content: center;
+                  align-items: center;
+                  text-align: center;
+                }
+                .bottom255 {
+                  height: 100%;
+                  // overflow-y: auto;
+                  .txtC {
+                    height: 100%;
+                    display: flex;
+                    flex-direction: column;
+                    justify-content: center;
+                    align-items: center;
+                  }
+                }
+
+                .label {
+                  text-align: left;
+                }
+
+                .handlerType {
+                  margin: 21px 0 0 0;
+                }
+
+                .radios {
+                  // height: 96px;
+                  max-height: 267px;
+                  width: 100%;
+                  overflow-y: auto;
+                  padding: 8px;
+                  background: #fff;
+                  border: 1px solid #e6dede;
+                  border-radius: 5px;
+                  .ant-row {
+                    width: 100%;
+                    display: flex;
+                    flex-wrap: wrap;
+                    .ant-radio-wrapper {
+                      width: 20%;
+                      display: flex;
+                      align-items: center;
+                      margin-right: 0;
+                      ::ng-deep span.ant-radio + * {
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        white-space: inherit;
+                      }
+                    }
+                  }
+                }
+              }
+            }
+            // 底部信息提示
+            .bottomInfo {
+              border-top: 2px solid #e5e9ed;
+              padding-left: 32px;
+              padding-right: 32px;
+              height: 52px;
+              line-height: 52px;
+              font-size: 14px;
+              color: #ff3b53;
+            }
+          }
+
+          &.right {
+            background: #fff;
+            position: relative;
+
+            .rightTitle {
+              position: absolute;
+              width: 100%;
+              height: 37px;
+              line-height: 37px;
+              font-size: 16px;
+              margin: 0;
+              border-bottom: 1px solid #e5e9ed;
+              background: #fff;
+              z-index: 9999;
+              display: flex;
+              align-items: center;
+              .rightTitle_tab {
+                width: 120px;
+                height: 36px;
+                text-align: center;
+                line-height: 36px;
+                background: #fff;
+                cursor: pointer;
+                font-size: 14px;
+                position: relative;
+                overflow: hidden;
+                &.active {
+                  color: @primary-color;
+                  &::after{
+                    content: '';
+                    position: absolute;
+                    bottom: 0;
+                    left: 0;
+                    width: 100%;
+                    height: 1px;
+                    background-color: @primary-color;
+                  }
+                }
+              }
+            }
+
+            .cots_body {
+              width: 100%;
+              height: 100%;
+              // overflow: scroll;
+              // padding-right: 2%;
+              padding-top: 47px;
+            }
+          }
+        }
+      }
+    }
+
+    .btns {
+      padding-top: 12px;
+      .btn {
+        margin: 0 4px;
+      }
+    }
+  }
+	
+	.required{
+	  position: relative;
+	  padding-left: 12px;
+	  box-sizing: content-box;
+	  &::before{
+	    font-family: icon_transport;
+	    font-size: 10px;
+	    content:'\e606';
+	    color: red;
+	    position: absolute;
+	    left: 0;
+	    top: 50%;
+	    transform: translateY(-50%);
+	  }
+	}
+	
+	/* 未分派 */
+	.weifenpai .list {
+	  // height: 100px;
+	  border-bottom: 1px rgb(225, 229, 232) solid;
+	  position: relative;
+	  // overflow: hidden;
+	  display: flex;
+	}
+	
+	// 转出院记录
+	.patientLog .list {
+	  height: auto !important;
+	  th,
+	  td {
+	    text-align: center !important;
+	  }
+	}
+	
+	/* 左边 */
+	.left_cots {
+	  // height: 100px;
+	  width: 78%;
+	  float: left;
+	  margin-left: 2%;
+	  padding-right: 2%;
+	  cursor: pointer;
+	  position: relative;
+	}
+	
+	/* 急标 */
+	.left_cots .ji {
+	  position: absolute;
+	  right: -3px;
+	  top: -3px;
+	  width: 30px;
+	}
+	
+	/* 右边 */
+	.right_bots {
+	  width: 20%;
+	  border-left: 1px #e1e5e8 solid;
+	  padding: 8px 0;
+	}
+	
+	/* 上按钮 */
+	.right_bots .top_bot {
+	  width: 70%;
+	  border-radius: 4px;
+	  color: white;
+	  background-color: @primary-color;
+	  border: 1px @primary-color solid;
+	  cursor: pointer;
+	  height: 27px;
+	  margin-bottom: 8px;
+	}
+	
+	.slider {
+	  position: absolute;
+	  // top: 98px;
+	  bottom: 0;
+	  right: 0;
+	  width: 100%;
+	  height: 2px;
+	
+	  &.sgreen {
+	    background: rgb(86, 186, 182);
+	  }
+	
+	  &.syellow {
+	    background: rgb(245, 166, 35);
+	  }
+	  &.sred {
+	    background: #d81e06;
+	  }
+	}
+	
+	/* 中按钮 */
+	.right_bots .mid_bot {
+	  width: 70%;
+	  border-radius: 4px;
+	  color: white;
+	  background-color: @primary-color;
+	  border: 1px @primary-color solid;
+	  cursor: pointer;
+	  height: 27px;
+	}
+	
+	/* 下按钮 */
+	.right_bots .btm_bot {
+	  width: 70%;
+	  border-radius: 4px;
+	  color: #78797a;
+	  background-color: #FFF;
+	  border: 1px #e5e9ed solid;
+	  cursor: pointer;
+	  height: 27px;
+	}
+	
+	/* 工单 */
+	.weifenpai .left_cots .gongdan {
+	  height: 24px;
+	  margin: 4px 0;
+	  line-height: 24px;
+	  text-align: center;
+	}
+	
+	.weifenpai .left_cots .gongdan .left {
+	  float: left;
+	  color: #333;
+	  font-size: 14px;
+	}
+	.gongdan_name {
+	  max-width: 80% !important;
+	  overflow: hidden !important;
+	  text-overflow: ellipsis !important;
+	  white-space: nowrap !important;
+	}
+	
+	.weifenpai .left_cots .gongdan .right {
+	  float: right;
+	  color: #666666;
+	
+	  &.colorRed {
+	    color: red;
+	  }
+	}
+	
+	.weifenpai .left_cots .gongdan .right span:nth-child(1) {
+	  float: right;
+	  font-size: 12px;
+	
+	  &.colorRed {
+	    color: red;
+	  }
+	}
+	
+	.weifenpai .left_cots .gongdan .right span:nth-child(2) {
+	  float: right;
+	  border-radius: 50%;
+	  width: 10px;
+	  height: 10px;
+	  background-color: red;
+	  margin-top: 7px;
+	  margin-right: 8px;
+	}
+	
+	/* 地点 */
+	.weifenpai .didian {
+	  height: 24px;
+	  line-height: 24px;
+	  margin: 4px 0;
+	  display: flex;
+	}
+	
+	.weifenpai .didian .left {
+	  float: left;
+	  color: #666666;
+	  font-size: 14px;
+	  flex: 1;
+	  white-space: nowrap;
+	  overflow: hidden;//文本超出隐藏
+	  text-overflow: ellipsis;//文本超出省略号替代
+	  &.noEllipsis{
+	    white-space: normal;
+	    overflow: visible;
+	    text-overflow: inherit;
+	    word-break: break-all;
+	  }
+	}
+	
+	.weifenpai .didian .right {
+	  float: right;
+	  flex: 1;
+	  white-space: nowrap;
+	  overflow: hidden;//文本超出隐藏
+	  text-overflow: ellipsis;//文本超出省略号替代
+	  text-align: right;
+	}
+	
+	.weifenpai .didian .right i {
+	  font-size: 12px;
+	  color: @primary-color;
+	}
+	
+	.weifenpai .didian .right span {
+	  font-size: 12px;
+	}
+	
+	/* 时间 */
+	.weifenpai .shijian {
+	  height: 24px;
+	  line-height: 24px;
+	  margin: 4px 0;
+	}
+	
+	.weifenpai .shijian .left {
+	  float: left;
+	}
+	
+	.weifenpai .shijian .right {
+	  float: right;
+	  font-size: 12px;
+	  color: #999999;
+	}
+	
+	.weifenpai .shijian .left i {
+	  color: @primary-color;
+	  font-size: 14px;
+	
+	  &.colorRed {
+	    color: red;
+	  }
+	}
+	
+	.weifenpai .shijian .left span {
+	  font-size: 12px;
+	  color: #666666;
+	}
+	
+	/* 待到达 */
+	.daidaoda .list {
+	  // height: 100px;
+	  // overflow: hidden;
+	  border-bottom: 1px rgb(225, 229, 232) solid;
+	  position: relative;
+	  display: flex;
+	}
+	
+	/* 左边 */
+	.daidaoda .left_cots {
+	  // height: 100px;
+	  width: 78%;
+	  float: left;
+	  margin-left: 2%;
+	  padding-right: 2%;
+	  cursor: pointer;
+	  position: relative;
+	}
+	
+	/* 急标 */
+	.daidaoda .left_cots .ji {
+	  position: absolute;
+	  right: -3px;
+	  top: -3px;
+	  width: 30px;
+	}
+	
+	/* 急标 */
+	.daidaoda .list .ji {
+	  position: absolute;
+	  right: -3px;
+	  top: -3px;
+	  width: 30px;
+	}
+	
+	/* 工单 */
+	.daidaoda .gongdan {
+	  height: 24px;
+	  margin: 4px 0;
+	  line-height: 24px;
+	  text-align: center;
+	}
+	
+	.daidaoda .gongdan .left {
+	  float: left;
+	  color: #333;
+	  font-size: 14px;
+	}
+	
+	.daidaoda .gongdan .right {
+	  float: right;
+	  color: #666666;
+	
+	  &.colorRed {
+	    color: red;
+	  }
+	}
+	
+	.cots_body .loading {
+	  width: 100%;
+	  height: 100%;
+	  position: absolute;
+	  left: 0;
+	  top: 0;
+	  // display: flex;
+	  // flex-flow: column;
+	  // justify-content: center;
+	  // align-items: center;
+	}
+	
+	/* 暂无数据 */
+	.cots_body .no_data {
+	  width: 100%;
+	  height: 100%;
+	  position: absolute;
+	  left: 0;
+	  top: 0;
+	  // text-align: center;
+	  // line-height: 593px;
+	  color: @primary-color;
+	  font-size: 24px;
+	  font-weight: bold;
+	  display: flex;
+	  justify-content: center;
+	  align-items: center;
+	}
+	
+	.toLastTime {
+	  margin-left: auto;
+	  color: #999999;
+	  font-size: 12px;
+	
+	  &.colorRed {
+	    color: red;
+	  }
+	  .order{
+	    color: #000;
+	    font-weight: bold;
+	    margin-right: 16px;
+	    cursor: pointer;
+	  }
+	}
+	
+	.toLastTime .time {
+	  font-size: 12px;
+	  color: @primary-color;
+	  margin-left: 8px;
+	}
+	.toLastTime1 {
+	  position: absolute;
+	  right: 10px;
+	  color: #999999;
+	  font-size: 12px;
+	
+	  &.colorRed {
+	    color: red;
+	  }
+	}
+	
+	.toLastTime1 .time {
+	  font-size: 12px;
+	  color: @primary-color;
+	}

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

@@ -5,6 +5,7 @@ import { MainRoutingModule } from './main-routing.module';
 import { MainComponent } from './main.component';
 import { ShareModule } from 'src/app/share/share.module';
 import { SelectMenuComponent } from 'src/app/components/select-menu/select-menu.component';
+import { IncidentDicrectOrderModule } from 'src/app/components/incidentManagement/incident-direct-order/incident-direct-order.module';
 
 @NgModule({
   declarations: [
@@ -14,7 +15,8 @@ import { SelectMenuComponent } from 'src/app/components/select-menu/select-menu.
   imports: [
     CommonModule,
     MainRoutingModule,
-    ShareModule
+    ShareModule,
+		IncidentDicrectOrderModule
   ]
 })
 export class MainModule { }

src/app/views/personage-document/personage-document-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { PersonageDocumentComponent } from './personage-document.component';
+
+
+const routes: Routes = [
+  {
+    path: '',
+    component: PersonageDocumentComponent,
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class PersonageDocumentRoutingModule { }

src/app/views/personage-document/personage-document.component.html

@@ -0,0 +1,279 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzLg='20' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <span class="label">申请科室：</span>
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp($event)" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择申请科室" [(ngModel)]="department">
+            <ng-container *ngFor="let option of hospitals1">
+              <nz-option *ngIf="!isDeptLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isDeptLoading" 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>
+          <input nz-input class="formItem" [(ngModel)]="batchNumber" placeholder="请输入批次号" nzSize="default" />
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">创建时间：</span>
+          <nz-range-picker [(ngModel)]="dateRange" nzFormat="yyyy-MM-dd"
+					(ngModelChange)="changeDate($event)"></nz-range-picker>
+        </div>
+      </div>
+      <div nz-col nzLg="4" class="list-template__btns">
+        <button class="btn default" (click)='search()'>搜索</button>
+        <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="10%">单号|创建时间</th>
+            <th nzWidth="10%">批次号</th>
+            <th nzWidth="10%">申请科室</th>
+            <th nzWidth="7%">总件数</th>
+            <th nzWidth="7%">品类数</th>
+            <th nzWidth="7%">消耗总价</th>
+            <th nzWidth="7%">实发总价</th>
+            <th nzWidth="10%">取药药房</th>
+						<th nzWidth="7%">是否已建单</th>
+						<th nzWidth="6%">状态</th>
+            <th nzWidth="18%">操作</th>
+          </tr>
+        </thead>
+        <tbody v-if="listOfData && listOfData.length>0">
+          <tr *ngFor="let data of listOfData" (click)="selectedListData(data.id)">
+            <td>
+							<div>{{ data.packingNo}}</div>
+							<div>{{ data.createTime|date:'yyyy-MM-dd HH:mm'}}</div>
+						</td>
+            <td>{{ data.batch?data.batch.batchNo:'-' }}</td>
+            <td>{{ data.applyDeptDTO?data.applyDeptDTO.dept :'-' }}</td>
+            <td>{{ data.totalCount||'0' }}</td>
+            <td>{{data.kindCount||'0'}}</td>
+            <td>{{ data.expendPrice ||'0' }}</td>
+            <td>{{ data.actualPrice || '0'}}</td>
+            <td>{{ data.pharmacyDTO?data.pharmacyDTO.dept:'-'}}</td>
+						<td>{{ data.createOrder==1?'是':'否'}}</td>
+						<td>{{ data.orderState.name}}</td>
+            <td>
+              <div class="coop">
+                <span *ngIf="coopBtns.look" (click)="detail($event,data.id)">查看</span>
+                <span *ngIf="coopBtns.print" (click)="print($event, data, data.id)">打印</span>
+                <span *ngIf="coopBtns.establish && ( data.createOrder=='0' || data.createOrder==null)" (click)="addDateModal(data)">配送建单</span>
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+          (nzPageIndexChange)="getList()" (nzPageSizeChange)="getList()">
+        </nz-pagination>
+      </div>
+    </div>
+  </div>
+
+  <!-- 新增/编辑模态框 -->
+  <div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="modal">
+    <div class="modalBody">
+      <div class="title">科室发药单-查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+      </div>
+      <overlay-scrollbars #osComponentRef1 class="content">
+        <div class="list-template__bottom">
+          <nz-table class="list-template__nzTable" [nzData]="viewData" nzSize="middle" [nzShowPagination]="false"
+            [nzLoading]="loading1">
+            <thead>
+              <tr class="thead">
+								<th nzWidth="10%">药品标识</th>
+                <th nzWidth="10%">药品名称</th>
+                <th nzWidth="10%">规格</th>
+                <th nzWidth="10%">消耗数量</th>
+                <th nzWidth="10%">实发数量</th>
+                <th nzWidth="10%">包装规格</th>
+                <th nzWidth="10%">发药药箱</th>
+                <th nzWidth="10%">原库存数</th>
+                <th nzWidth="10%">计算后库存</th>
+        				<th nzWidth="10%">增减</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of viewData">
+								<td>{{ data.drugsInfoDTO?data.drugsInfoDTO.drugCode:'无' }}</td>
+                <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.drugName:'无' }}</td>
+                <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.specs:'无' }}</td>
+                <td>{{ data.expendCount||'0' }}</td>
+                <td>{{ data.actualCount||'0' }}</td>
+                <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.packingSpecs:'0' }}</td>
+                <td>{{ data.cartonNum || '0' }}</td>
+                <td>{{ data.formerInventory || '0' }}</td>
+                <td>{{ data.afterInventory || '0'}}</td>
+        				<td>{{ data.addSub || '0' }}</td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </div>
+      </overlay-scrollbars>
+      <div class="display_flex justify-content_flex-center">
+        <button class="btn" nz-button nzType="primary" (click)="hideModal()">知道了</button>
+      </div>
+    </div>
+  </div>
+  <!-- 删除模态框 -->
+  <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+    (confirmDelEvent)="confirmDel()" content="您确认要删除科室吗？"></app-dialog-delete>
+
+  <!-- 启用停用模态框 -->
+  <app-dialog-delete [delModal]="delModal1" (hideDelModalEvent)="hideDelModal1()" [btnLoading]="btnLoading"
+    (confirmDelEvent)="confirmDel1()" [content]="'您确认要建立配送工单吗？'"></app-dialog-delete>
+
+  <!-- 打印 -->
+  <div id="report" style="display: none;">
+		<div class="monad" 
+				*ngIf="rowData"
+				style="padding: 10px;
+				border: 1px solid #e7e7e7;
+				border-radius: 5px;">
+			<div class="monad-title" 
+				style="text-align: center;
+				font-size: 18px;
+				border-bottom: 1px solid #e7e7e7;
+				padding-bottom: 10px;">
+				大输液发药单-{{rowData.applyDeptDTO?rowData.applyDeptDTO.dept:''}}
+			</div>
+			<div class="monad-sign" style="display: flex;line-height: 23px;font-size: 14px;">
+				<div style="margin-right: 15px;">日期：{{rowData.createTime|date:'yyyy-MM-dd HH:mm'}}</div>
+				<div style="margin-right: 15px;">批次号：{{rowData.batch?rowData.batch.batchNo:'-'}}</div>
+				<div style="margin-right: 15px;">单号：{{rowData.packingNo}}</div>
+			</div>
+			<div class="monad-sign" style="display: flex;line-height: 23px;font-size: 14px;">
+				<div style="margin-right: 15px;">取药药房：{{rowData.pharmacyDTO?rowData.pharmacyDTO.dept:'-'}}</div>
+			</div>
+			<div style="border: 1px solid #e7e7e7;border-bottom: none;font-size: 14px;">
+				<div class="thead" style="display: flex;">
+					<div style="width: 40%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">药品名称</div>
+					
+					<div style="width: 20%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">规格</div>
+					
+					<div style="width: 10%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">15日消耗</div>
+					
+					<div style="width: 8%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">包规</div>
+					
+					<div style="width: 8%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">实消</div>
+					
+					<div style="width: 10%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">临时增发</div>
+					
+					<div style="width: 10%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-bottom: 1px solid #e7e7e7;">箱数</div>
+				</div>
+				<div *ngFor="let data of codes" style="display: flex;">
+					<div style="width: 40%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.drugName }}</div>
+					
+					<div style="width: 20%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.specs }}</div>
+					
+					<div style="width: 10%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{data.fifteenExpendCount}}</div>
+					
+					<div style="width: 8%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.packingSpecs }}</div>
+					
+					<div style="width: 8%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.expendCount }}</div>
+					
+					<div style="width: 10%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.addSub || 0 }}</div>
+					
+					<div style="width: 10%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-bottom: 1px solid #e7e7e7;">
+						<span *ngIf="data.drugsInfoDTO.drugName!='合计'">
+							{{ data.giveOutType.value==1 ? data.actualCount :data.cartonNum }}
+							{{data.giveOutType && data.giveOutType.value==1?
+							data.drugsInfoDTO.unit:'箱'}}
+						</span>
+						<span *ngIf="data.drugsInfoDTO.drugName=='合计'">
+							{{ data.cartonActual}}
+						</span>
+					</div>
+					
+				</div>
+			</div>
+		</div>
+  </div>
+
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo"></app-prompt-modal>
+
+<!-- 查看详情 -->
+<router-outlet></router-outlet>
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>
+<app-excel-import [isShow]="isShow" (hideFormHand)="hideExcelImport($event)" *ngIf="isShow" (submitFormHand)="submitExcelImport($event)"></app-excel-import>

src/app/views/personage-document/personage-document.component.less

@@ -0,0 +1,233 @@
+@import "../../../../src/theme.less";
+:host {
+  .add-button {
+    margin: 0 auto 16px !important;
+  }
+  .targetDept {
+    overflow: hidden;
+    // width: 90px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .dynamic {
+    margin-bottom: 16px;
+    display: flex;
+    align-items: center;
+    input {
+      width: 90%;
+    }
+    i {
+      margin-left: 8px;
+      cursor: pointer;
+      font-size: 18px;
+    }
+  }
+}
+
+.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: 100%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      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: 18px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      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: "";
+				                }
+				              }
+				            }
+				          }
+				        }
+				      }
+				    }
+				  }
+				  .list-template__pagination {
+				    height: 56px;
+				    display: flex;
+				    align-items: center;
+				    position: absolute;
+				    right: 8px;
+				  }
+				}
+				
+        .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;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}
+

src/app/views/personage-document/personage-document.component.ts

@@ -0,0 +1,895 @@
+import { Component, OnInit, ViewChild} from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import {
+  FormBuilder,
+  Validators,
+  FormGroup,
+  FormControl,
+} from "@angular/forms";
+
+import { MainService } from "../../services/main.service";
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+import { ToolService } from "../../services/tool.service";
+import { format, startOfDay, endOfDay } from "date-fns";
+import { NzMessageService } from "ng-zorro-antd";
+import { Subject } from "rxjs";
+import { debounceTime, filter } from "rxjs/operators";
+import host from "../../../assets/js/http";
+import { HttpRequest, HttpResponse, HttpClient } from '@angular/common/http';
+
+@Component({
+  selector: "app-personage-document",
+  templateUrl: "./personage-document.component.html",
+  styleUrls: ["./personage-document.component.less"],
+})
+export class PersonageDocumentComponent implements OnInit{
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  constructor(
+    private message: NzMessageService,
+    private fb: FormBuilder,
+    private route: ActivatedRoute,
+    private router: Router,
+    private mainService: MainService,
+    private tool: ToolService,
+    private http: HttpClient,
+  ) {}
+
+  ngOnInit() {
+    this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
+      // this.getAllParentdepart(v).subscribe((result) => {
+      //   this.isLoading = false;
+      //   if (result.status == 200) {
+      //     this.allParentdepart = result.list;
+      //   }
+      // });
+			this.isDeptLoading = true;
+			this.getDeparts(e);
+    });
+		this.hosId = this.tool.getCurrentHospital().id;
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.initForm();
+    this.getAllHospital();
+    // this.getType();
+    // this.getDeptHandoverType();
+  }
+  listOfData: any[] = []; //表格数据
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopId: number; //表格中执行操作的id
+  department: ""; //所属科室
+	hosId: number;
+	dateRange;//时间
+  batchNumber; //批次号
+  num; //编码
+  deptalias; //别名
+  type; //类型
+  deptHandoverType; //类型
+  pageIndex: number = 1; //页码
+  listLength: number = 10; //总条数
+  pageSize: number = 10; //每页条数
+  btnLoading: boolean = false; //确认按钮loading状态
+  printLoading: boolean = false; //批量打印按钮loading状态
+  deptPhones: any = []; //新添加的科室电话列表
+  isAddDeptsPhone = true; //添加新的科室电话是否禁用
+  deptsPhoneId = 1; //科室电话自增id
+  allParentdepart: any = []; //所有的父级科室列表
+  hospitals1: any = []; //科室列表(搜索)
+	rowData: object = {}; //打印选择列表
+  searchParentDeptSubject = new Subject();
+  // 初始化增删改按钮
+  coopBtns: any = {};
+	viewData: any = []; //科室单查看数据
+  // 模板导出
+  excelExport(){
+    this.maskFlag = this.message.loading("下载模板中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService.exportExcel("department", {}).subscribe(
+      (data) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.message.success('下载模板成功');
+        var file = new Blob([data], {
+          type: "application/vnd.ms-excel",
+        });
+        //trick to download store a file having its URL
+        var fileURL = URL.createObjectURL(file);
+        var a = document.createElement("a");
+        a.href = fileURL;
+        a.target = "_blank";
+        a.download = "科室导入模板.xls";
+        document.body.appendChild(a);
+        a.click();
+      },
+      (err) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.message.error('下载模板失败');
+      }
+    );
+  }
+
+  // 导入---start
+  // model-取消
+  isShow = false;
+  hideExcelImport() {
+    this.isShow = false;
+  }
+  // 触发
+  excelImport() {
+    this.isShow = true;
+  }
+  submitExcelImport({fileList}){
+    this.isShow = false;
+    const formData = new FormData();
+    fileList.forEach((file: any) => {
+      formData.append('file', file);
+    });
+    this.maskFlag = this.message.loading("正在导入中..", {
+      nzDuration: 0,
+    }).messageId;
+    const req = new HttpRequest('Post', this.mainService.returnImportExcelUrl('department'), formData, {
+      reportProgress: true
+    });
+    this.http
+      .request(req)
+      .pipe(filter(e => e instanceof HttpResponse))
+      .subscribe(
+        (res:any) => {
+          if(res.body.status == 200){
+            this.message.remove(this.maskFlag);
+            this.maskFlag = false;
+            this.message.success('导入成功');
+            this.getList();
+          }else{
+            this.message.remove(this.maskFlag);
+            this.maskFlag = false;
+            this.showPromptModal("导入", false, res.body.msg);
+          }
+        },
+        () => {
+          this.message.remove(this.maskFlag);
+          this.maskFlag = false;
+          this.message.error('导入失败');
+        },
+      );
+  }
+  // 导入---end
+  //搜索父级科室
+	isDeptLoading = false;
+  changeInp(e) {
+    this.searchParentDeptSubject.next(e);
+  }
+  // 打开父级科室下拉框baba
+  isLoading = false;
+  openDeptSelect(flag) {
+    if (flag) {
+      this.isLoading = true;
+      this.getAllParentdepart().subscribe((result) => {
+        this.isLoading = false;
+        if (result.status == 200) {
+          this.allParentdepart = result.list;
+        }
+      });
+    }
+  }
+  // 配送建单
+  coopData:any = {};
+  addDateModal(data) {
+    this.coopData = data;
+    this.showDelModal1();
+  }
+  delModal1: boolean = false; //删除模态框
+
+  showDelModal1() {
+    this.delModal1 = true;
+  }
+  hideDelModal1() {
+    this.delModal1 = false;
+  }
+  // 确认配送工单
+  confirmDel1() {
+    this.btnLoading = true;
+    this.mainService
+      .transfusionBuildOrder({
+				drugsListId:this.coopData.id
+			})
+      .subscribe((data) => {
+        this.btnLoading = false;
+        this.delModal1 = false;
+        if (data.status == 200) {
+          this.showPromptModal('操作', true, "");
+        } else {
+          this.showPromptModal('操作', false, data.msg);
+        }
+      });
+  }
+  //获取所有的父级科室列表
+  getAllParentdepart(keyWord = "") {
+    let postData: any = {
+      idx: 0,
+      sum: 10,
+      department: {
+        // hospital: { id: this.add ? this.tool.getCurrentHospital().id : this.hospital },
+        keyWord: keyWord,
+      },
+    };
+    if (this.coopItem) {
+      // 过滤这个科室及其子科室
+      postData.department.filterByDeptId = this.coopItem.id;
+    }
+    return this.mainService.getFetchDataList("data", "department", postData);
+  }
+  // 新添加科室号码
+  addDeptPhone(e: MouseEvent) {
+    e.preventDefault();
+    this.deptPhones.push({ id: ++this.deptsPhoneId, phone: "" });
+    this.deptsPhoneChange();
+  }
+  // 删除新添加科室号码
+  removeDeptPhone(index: number, e: MouseEvent) {
+    e.preventDefault();
+    this.deptPhones.splice(index, 1);
+    this.deptsPhoneChange();
+  }
+  //监听科室电话输入事件
+  deptsPhoneChange(e?, phone?) {
+    if (e !== undefined && phone !== undefined) {
+      phone.phone = e;
+    }
+    // -------------判断添加按钮是否禁用 start
+    this.isAddDeptsPhone = !this.validateForm.value.officeNum;
+    if (!this.isAddDeptsPhone) {
+      //如果没禁用
+      this.isAddDeptsPhone = this.deptPhones.some((item) => item.phone === "");
+    }
+    // -------------判断添加按钮是否禁用 end
+  }
+
+  // 搜索
+  search() {
+    this.pageIndex = 1;
+    this.getList();
+  }
+  // 重置
+  reset() {
+    this.pageIndex = 1;
+    this.department = null;
+    this.batchNumber = "";
+		this.dateRange = [];
+		this.startDate = "";
+		this.endDate = "";
+    this.getList();
+  }
+  // 表格数据
+  loading1 = false;
+  getList() {
+    var that = this;
+    let data = {
+      idx: that.pageIndex - 1,
+      sum: that.pageSize,
+      drugsList: {
+        applyDept: that.department,
+				batch:{
+					batchNo:that.batchNumber
+				},
+        startTime: this.startDate,
+				endTime: this.endDate,
+				hosId: this.hosId
+      },
+    };
+		if(that.department){
+			data.drugsList.applyDept = that.department
+		}else{
+			delete data.drugsList.applyDept
+		}
+		if(that.batchNumber){
+			data.drugsList.batch.batchNo = that.batchNumber
+		}else{
+			delete data.drugsList.batch
+		}
+    this.loading1 = true;
+    that.mainService
+      .getFetchDataList("data", "drugsList", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        that.listOfData = data.list;
+        that.listLength = data.totalNum;
+      });
+  }
+
+	// 日期选择
+	startDate: string; //发起时间开始
+	endDate: string; //发起时间结束
+	changeDate(result?): void {
+	  if (!result) {
+	    this.startDate = this.endDate = "";
+	    return;
+	  }
+	  this.startDate = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+	  this.endDate = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+	}
+
+	// 获取所有科室
+  // snum = 0;
+  getDeparts(dept) {
+    var that = this;
+    let data:any = {
+      department: {
+        dept,
+        hosIds: this.hosId,
+      },
+      idx: 0,
+      sum: 20,
+    };
+		if(this.isParentData==1){
+			if(this.tool.getCurrentUserInfo().currentHospital &&
+			this.tool.getCurrentUserInfo().currentHospital.parent){
+				data.department.hosIds = this.hosId +','+this.tool.getCurrentUserInfo().currentHospital.parent.id
+			}else{
+				data.department.hosIds = this.hosId
+			}
+		}
+    that.mainService
+		.getFetchDataList("data", "department", data)
+		.subscribe((data) => {
+			setTimeout(_=>{
+				this.isDeptLoading = false
+				this.hospitals1 = data.list
+			},500)
+		});
+  }
+
+  // 获取所有院区
+	isParentData:any = null;
+  getAllHospital() {
+		this.mainService.getDictionary("list", "ordinary_field").subscribe((data) => {
+			let taskTypeData = data.find(i=>i.value=='infusionSolutions')
+			let postData = {
+			  idx: 0,
+			  sum: 10,
+			  taskTypeConfig: {
+					hosId:this.hosId,
+					taskType:taskTypeData.id
+			  }
+			};
+			this.mainService
+			  .getFetchDataList("simple/data", "taskTypeConfig", postData)
+			  .subscribe((result) => {
+			    if (result.status == 200) {
+						let data = result.list[0] || {};
+						this.isParentData = data.quoteParentData;
+						this.getDeparts('')
+						this.getList();
+			    }
+			  });
+		});
+  }
+
+  // 切换院区选项
+  buildings: any = []; //楼栋
+  maskFlag: any = false;
+  changeHosp(obj?) {
+    let hospitalId;
+    if (obj) {
+      hospitalId = obj.hospital.id;
+    }
+    let hid;
+    if (hospitalId || hospitalId == 0) {
+      hid = hospitalId - 0;
+    }
+		// else {
+  //     hid = this.hospital - 0;
+  //   }
+    let data = {
+      // hosId: this.add ? this.tool.getCurrentHospital().id : hid,
+    };
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService
+      .coopData("getBuildingOrFloor", "building", data)
+      .subscribe((data) => {
+        this.buildings = data.data;
+        this.floors = [];
+        // ---------
+        if (obj) {
+          //编辑
+          let arr = this.buildings.map((item) => item.id);
+          if (obj.building.id && arr.includes(obj.building.id)) {
+            //有楼栋
+            this.changeBuilding(obj.building.id, obj);
+            this.validateForm.controls.building.setValue(obj.building.id + "");
+          } else {
+            //无楼栋
+            this.floors = [];
+            this.message.remove(this.maskFlag);
+            this.maskFlag = false;
+            this.modal = true;
+            this.validateForm.controls.building.setValue(null);
+            this.validateForm.controls.officeAddress.setValue(null);
+          }
+        } else {
+          //新增
+          this.message.remove(this.maskFlag);
+          this.maskFlag = false;
+          this.modal = true;
+        }
+        // ---------
+      });
+  }
+
+  // 切换楼栋信息
+  floors: Array<any> = []; //楼层
+  floorLoading: boolean = false;
+  changeBuilding(buildingId?, obj?) {
+    var that = this;
+    that.floors = [];
+    var bid;
+    if (buildingId || buildingId == 0) {
+      bid = buildingId - 0;
+    } else if (!that.add && that.validateForm.value.building) {
+      bid = that.validateForm.value.building - 0;
+    } else {
+      return;
+    }
+    let data = {
+      buildingId: bid,
+    };
+    this.floorLoading = true;
+    that.mainService
+      .coopData("getBuildingOrFloor", "floor", data)
+      .subscribe((data) => {
+        this.floorLoading = false;
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.modal = true;
+        that.floors = data.data;
+        if (obj) {
+          let floorId = obj.floor.id;
+          let arr = that.floors.map((item) => item["id"]);
+          if (floorId && arr.includes(floorId)) {
+            this.validateForm.controls.floor.setValue(floorId + "");
+          } else {
+            this.validateForm.controls.floor.setValue(null);
+            this.validateForm.controls.officeAddress.setValue(null);
+          }
+        }
+      });
+  }
+
+  // 获取科室类型
+  types: Array<any> = [];
+  getType() {
+    var that = this;
+    that.mainService.getDictionary("list", "dept_type").subscribe((data) => {
+      console.log(data);
+      that.types = data;
+    });
+  }
+
+  // 获取科室汇总交接类型
+  deptHandoverTypes: Array<any> = [];
+  getDeptHandoverType() {
+    var that = this;
+    that.mainService.getDictionary("list", "dept_handover_type").subscribe((data) => {
+      console.log(data);
+      that.deptHandoverTypes = data;
+    });
+  }
+
+  // 新增弹框
+  showModal() {
+    this.initForm();
+    // this.changeHosp();
+    this.add = true;
+    this.isAddDeptsPhone = true;
+    this.deptPhones = [];
+  }
+  hideModal() {
+    this.coopItem = null;
+    this.modal = false;
+    this.initForm();
+  }
+  // 初始化新增form表单
+  initForm() {
+    this.endTime1Hourdis = () => [];
+    this.endTime1Mindis = () => [];
+    this.endTime2Hourdis = () => [];
+    this.endTime2Mindis = () => [];
+    this.startTime1Hourdis = () => [];
+    this.startTime1Mindis = () => [];
+    this.startTime2Hourdis = () => [];
+    this.startTime2Mindis = () => [];
+    this.validateForm = this.fb.group({
+      parentOfficeName: [null],
+      officeName: [null, [Validators.required]],
+      deptalias: [null],
+      officeNo: [null, [Validators.required]],
+      officeNum: [null, [Validators.required]],
+      building: [null, [Validators.required]],
+      floor: [null, [Validators.required]],
+      officeAddress: [null, [Validators.required]],
+      officeType: [null, [Validators.required]],
+      deptHandoverType: [null],
+      startTime1: [null],
+      endTime1: [null],
+      dynamicCode1: [null],
+      startTime2: [null],
+      endTime2: [null],
+      dynamicCode2: [null],
+    });
+  }
+  // 科室位置必填
+  buildValidator = (control: FormControl): { [s: string]: boolean } => {
+    if (
+      this.validateForm &&
+      this.validateForm.value &&
+      (!this.validateForm.value.building ||
+        !this.validateForm.value.floor ||
+        !this.validateForm.value.officeAddress)
+    ) {
+      return { required: true };
+    }
+  };
+  /**
+   * 生成一个从 start 到 end 的连续数组
+   * @param start
+   * @param end
+   */
+  generateArray(start, end) {
+    return Array.from(new Array(end).keys()).slice(start);
+  }
+
+  //服务时间选择
+  // 禁用的小时
+  startTime1Hourdis() {
+    return [];
+  }
+  endTime1Hourdis() {
+    return [];
+  }
+  startTime2Hourdis() {
+    return [];
+  }
+  endTime2Hourdis() {
+    return [];
+  }
+  // 禁用的分钟
+  startTime1Mindis() {
+    return [];
+  }
+  endTime1Mindis() {
+    return [];
+  }
+  startTime2Mindis() {
+    return [];
+  }
+  endTime2Mindis() {
+    return [];
+  }
+  timeChange(e: boolean, type: string, num: number) {
+    if (!e && this.validateForm.value[type + num]) {
+      let hour = new Date(this.validateForm.value[type + num]).getHours();
+      let minute = new Date(this.validateForm.value[type + num]).getMinutes();
+      if (type == "startTime" && num === 1) {
+        this.endTime1Hourdis = () => this.generateArray(0, hour);
+        this.endTime1Mindis = () => this.generateArray(0, minute + 1);
+      } else if (type == "startTime" && num === 2) {
+        this.endTime2Hourdis = () => this.generateArray(0, hour);
+        this.endTime2Mindis = () => this.generateArray(0, minute + 1);
+      } else if (type == "endTime" && num === 1) {
+        this.startTime1Hourdis = () => this.generateArray(hour + 1, 24);
+        this.startTime1Mindis = () => this.generateArray(minute, 60);
+      } else if (type == "endTime" && num === 2) {
+        this.startTime2Hourdis = () => this.generateArray(hour + 1, 24);
+        this.startTime2Mindis = () => this.generateArray(minute, 60);
+      }
+    }
+  }
+  // 表单提交
+  submitForm(): void {
+    var that = this;
+    for (const i in that.validateForm.controls) {
+      that.validateForm.controls[i].markAsDirty();
+      that.validateForm.controls[i].updateValueAndValidity();
+    }
+    console.log(that.validateForm);
+    if (that.validateForm.invalid) return;
+    let deptsPhone = this.deptPhones.map((item) => item.phone).join();
+    let data: any = {
+      department: {
+        dept: that.validateForm.value.officeName,
+        deptalias: that.validateForm.value.deptalias,
+        // hospital: { id: that.add ? that.tool.getCurrentHospital().id : that.hospital },
+        pcode: that.validateForm.value.officeNo,
+        manyPhone: deptsPhone
+          ? that.validateForm.value.officeNum + "," + deptsPhone
+          : that.validateForm.value.officeNum,
+        building: { id: that.validateForm.value.building - 0 },
+        floor: { id: that.validateForm.value.floor - 0 },
+        address: that.validateForm.value.officeAddress,
+        type: { id: that.validateForm.value.officeType },
+        deptHandoverType: { id: that.validateForm.value.deptHandoverType },
+      },
+    };
+    if (this.validateForm.value.parentOfficeName) {
+      data.department.parent = { id: this.validateForm.value.parentOfficeName };
+    }
+    if (
+      this.validateForm.value.startTime1 ||
+      this.validateForm.value.endTime1
+    ) {
+      if (
+        this.validateForm.value.startTime1 &&
+        this.validateForm.value.endTime1
+      ) {
+        data.department["startTime1"] = format(
+          this.validateForm.value.startTime1,
+          "yyyy-MM-dd HH:mm:ss"
+        );
+        data.department["endTime1"] = format(
+          this.validateForm.value.endTime1,
+          "yyyy-MM-dd HH:mm:ss"
+        );
+        data.department["dynamicCode1"] = this.validateForm.value.dynamicCode1 ? 1 : 0;
+      } else {
+        return;
+      }
+    }
+    if (
+      this.validateForm.value.startTime2 ||
+      this.validateForm.value.endTime2
+    ) {
+      if (
+        this.validateForm.value.startTime2 &&
+        this.validateForm.value.endTime2
+      ) {
+        data.department["startTime2"] = format(
+          this.validateForm.value.startTime2,
+          "yyyy-MM-dd HH:mm:ss"
+        );
+        data.department["endTime2"] = format(
+          this.validateForm.value.endTime2,
+          "yyyy-MM-dd HH:mm:ss"
+        );
+        data.department["dynamicCode2"] = this.validateForm.value.dynamicCode2 ? 1 : 0;
+      } else {
+        return;
+      }
+    }
+    if (!that.add) {
+      data.department["id"] = that.coopId;
+    }
+    that.btnLoading = true;
+    that.mainService
+      .coopData(that.add ? "addData" : "updData", "department", data)
+      .subscribe((data) => {
+        that.btnLoading = false;
+        that.hideModal();
+        that.initForm();
+        if (data.status == 200) {
+          that.showPromptModal(that.add ? "新增" : "编辑", true, "");
+        } else {
+          that.showPromptModal(that.add ? "新增" : "编辑", false, data.msg);
+        }
+      });
+  }
+
+  // 编辑
+  coopItem: any = null;
+  edit(e, data) {
+    e.stopPropagation();
+    this.add = false;
+    this.coopId = data.id;
+    this.coopItem = data;
+    this.isAddDeptsPhone = false;
+    this.deptPhones = [];
+    let phones = data.manyPhone ? data.manyPhone.split(",") : [];
+    if (phones.length === 0) {
+      this.validateForm.controls.officeNum.setValue("");
+      this.deptPhones = [];
+    } else if (phones.length === 1) {
+      this.validateForm.controls.officeNum.setValue(phones[0]);
+      this.deptPhones = [];
+    } else {
+      this.validateForm.controls.officeNum.setValue(phones[0]);
+      this.deptPhones = phones.slice(1).map((item) => {
+        return {
+          id: ++this.deptsPhoneId,
+          phone: item,
+        };
+      });
+    }
+    if (data.startTime1 && data.endTime1) {
+      this.validateForm.controls.startTime1.setValue(new Date(data.startTime1));
+      this.validateForm.controls.endTime1.setValue(new Date(data.endTime1));
+      this.validateForm.controls.dynamicCode1.setValue(data.dynamicCode1 == 1);
+    }
+    if (data.startTime2 && data.endTime2) {
+      this.validateForm.controls.startTime2.setValue(new Date(data.startTime2));
+      this.validateForm.controls.endTime2.setValue(new Date(data.endTime2));
+      this.validateForm.controls.dynamicCode2.setValue(data.dynamicCode2 == 1);
+    }
+    this.validateForm.controls.officeAddress.setValue(data.address);
+    if (data.parent) {
+      this.getAllParentdepart(data.parent.dept).subscribe((res) => {
+        if (res.status == 200) {
+          this.allParentdepart = res.list;
+          this.validateForm.controls.parentOfficeName.setValue(data.parent.id);
+        }
+      });
+    }
+    this.validateForm.controls.officeName.setValue(data.dept);
+    this.validateForm.controls.deptalias.setValue(data.deptalias);
+    this.validateForm.controls.officeNo.setValue(data.pcode);
+    this.validateForm.controls.officeType.setValue(data.type.id + "");
+    this.validateForm.controls.deptHandoverType.setValue(data.deptHandoverType ? data.deptHandoverType.id + "" : null);
+    // this.changeHosp(data);
+    this.validateForm.controls.officeAddress.setValue(data.address);
+  }
+
+  // 展示信息提示框（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();
+  }
+
+  delModal: boolean = false; //删除模态框
+  coopIds: any;
+  coopFlag: any = false;
+  /**
+   *
+   * @param e 事件对象
+   * @param flag true是批量删除，false是单个删除
+   * @param id
+   */
+  showDelModal(e, flag, id) {
+    e.stopPropagation();
+    this.delModal = true;
+    this.coopFlag = flag;
+    if (flag) {
+      this.coopIds = id;
+    } else {
+      this.coopId = id;
+    }
+  }
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    var that = this;
+    that.btnLoading = true;
+    that.mainService
+      .coopData(
+        "rmvData",
+        "department",
+        this.coopFlag ? this.coopIds : [that.coopId]
+      )
+      .subscribe((data) => {
+        that.btnLoading = false;
+        that.delModal = false;
+        if (data.data && data.data[0]) {
+          if (!data.data[0].msg) {
+            if (
+              that.listOfData.length == 1 &&
+              that.pageIndex == Math.ceil(that.listLength / that.pageSize)
+            ) {
+              that.listLength--;
+              that.pageIndex = Math.ceil(that.listLength / that.pageSize) || 1;
+            }
+            that.showPromptModal("删除", true, "");
+          } else {
+            that.showPromptModal("删除", false, data.data[0].msg);
+          }
+        } else {
+          that.showPromptModal("删除", false, "");
+        }
+      });
+  }
+
+  // 查看
+  detail(e, id) {
+    e.stopPropagation();
+		var that = this;
+		let data = {
+			idx: 0,
+			sum: 9999,
+			drugsConfigure: {
+			  hosId: this.hosId,
+			  drugListId: id
+			}
+		};
+		this.loading1 = true;
+		that.mainService
+		  .getFetchDataList("data", "drugsConfigure", data)
+		  .subscribe((data) => {
+		    this.loading1 = false;
+				this.modal = true
+		    that.viewData = data.list;
+		    // that.listLength = data.totalNum;
+		  });
+  }
+
+  // 选中表格中科室
+  mapOfCheckedId: { [key: string]: boolean } = {};
+  checkedDepIds = []; //已选中科室id
+  refreshStatus(): void {
+    this.isAllDisplayDataChecked = this.listOfData.every(
+      (item) => this.mapOfCheckedId[item.id]
+    );
+    let arr = [];
+    for (var k in this.mapOfCheckedId) {
+      if (this.mapOfCheckedId[k]) {
+        arr.push(Number(k));
+      }
+    }
+    this.checkedDepIds = arr;
+    console.log(this.checkedDepIds);
+  }
+  //表格整行选中
+  selectedListData(id) {
+    this.mapOfCheckedId[id] = !this.mapOfCheckedId[id];
+    this.refreshStatus();
+  }
+  // 全选
+  isAllDisplayDataChecked = false; //当前页是否全选
+  checkAll(value: boolean): void {
+    this.listOfData.forEach((item) => (this.mapOfCheckedId[item.id] = value));
+    this.refreshStatus();
+  }
+
+  // 打印
+  codes = []; //二维码
+  print(e, data, id) {
+		this.rowData = data
+    e.stopPropagation();
+    let that = this;
+    that.printLoading = true;
+    that.mainService
+      .transfusionPrint("drugsList", id)
+      .subscribe((res) => {
+				let arr = res.data.drugsConfigureDTOS;
+				for(let i of arr){
+					i.deptName = res.data.pharmacyDTO?res.data.pharmacyDTO.dept:'-'
+				}
+				arr.push({
+					drugsInfoDTO:{
+						drugName:'合计',
+						specs:'',
+					},
+					expendCount:res.data.totalExpendCount,
+					addSub:res.data.totalAddSub,
+					deptName:'',
+					cartonActual:res.data.cartonActual
+				})
+        that.codes = arr
+        that.printLoading = false;
+        setTimeout(() => {
+          const printContent = document.getElementById("report");
+          const WindowPrt = window.open("", "", "width=1000,height=900");
+          WindowPrt.document.write(printContent.innerHTML);
+          WindowPrt.document.close();
+          WindowPrt.focus();
+          WindowPrt.print();
+          WindowPrt.close();
+        }, 500);
+      });
+  }
+}

src/app/views/personage-document/personage-document.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { PersonageDocumentRoutingModule } from './personage-document-routing.module';
+import { PersonageDocumentComponent } from './personage-document.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    PersonageDocumentComponent,
+  ],
+  imports: [
+    CommonModule,
+    PersonageDocumentRoutingModule,
+    ShareModule
+  ]
+})
+export class PersonageDocumentModule { }

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

@@ -38,12 +38,12 @@ export class SpecimenSearchComponent implements OnInit {
   changeInpSubject = new Subject();
   changeInp2Subject = new Subject();
   ngOnInit() {
-		this.searchCriteria.dateRange = [
-			format(subDays(new Date(), 7), "yyyy-MM-dd") + ' ' +'00:00:00',
-			format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss")
-		]
-		this.startDate = format(subDays(new Date(), 7), "yyyy-MM-dd") + ' ' +'00:00:00';
-		this.endDate = format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
+		// this.searchCriteria.dateRange = [
+		// 	format(subDays(new Date(), 7), "yyyy-MM-dd") + ' ' +'00:00:00',
+		// 	format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss")
+		// ]
+		// this.startDate = format(subDays(new Date(), 7), "yyyy-MM-dd") + ' ' +'00:00:00';
+		// this.endDate = format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
       this.searchDepartment(v[0], v[1]);
     });

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

@@ -118,7 +118,7 @@
             <nz-input-group>
               <input type="name" nz-input formControlName="name" placeholder="请填写姓名" />
             </nz-input-group>
-          </nz-form-control>
+          </nz-form-contr(ngModelChange)ol>
         </nz-form-item>
         <nz-form-item>
           <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="account">用户名</nz-form-label>

src/app/views/web-repairs/web-repairs-routing.module.ts

@@ -0,0 +1,25 @@
+import { NgModule } from "@angular/core";
+import { Routes, RouterModule } from "@angular/router";
+import { WebRepairsComponent } from "./web-repairs.component";
+import { DetailSampleComponent } from 'src/app/share/detail-sample/detail-sample.component';
+import { DetailBxComponent } from 'src/app/share/detail-bx/detail-bx.component';
+
+const routes: Routes = [
+  {
+    path: "",
+    component: WebRepairsComponent,
+		children: [
+		  {
+		    // 报修详情
+		    path: 'detailBx/:id',
+		    component: DetailBxComponent
+		  },
+		]
+  },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class WebRepairsRoutingModule {}

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

@@ -0,0 +1,422 @@
+<div class="pharmacy">
+  <!-- 头部 start -->
+  <div class="pharmacy-header">
+   <div class="pharmacy-logo">
+			<div class="pharmacy-name__title">一站式服务管理平台</div>
+    </div>
+    <div class="pharmacy-name">
+			<div class="pharmacy-title">个人报修</div>
+			<div class="pharmacy-btn">
+				<button class="btn default" (click)='speediness()'>快速报修</button>
+			</div>
+    </div>
+    <div class="right">
+      <div class="userInfo dropdown">
+        <div class="user" (mouseenter)="showDropdown = true" (mouseleave)="showDropdown = false">
+          <img src="../../assets/images/icon_keshi.png" alt="">
+          <span><ng-container *ngIf="loginUser.dept">{{deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept}}-</ng-container>{{loginUser.name}}</span>
+          <i class="icon_transport transport-xiala1 ml8"></i>
+        </div>
+        <div class="dropdown-content r8" [hidden]="!showDropdown" (mouseenter)="showDropdown = true" (mouseleave)="showDropdown = false">
+          <div class="dropdownItem" (click)="etitPasswrod()">修改密码</div>
+					<div class="dropdownItem" (click)="editInfo()">修改个人信息</div>
+          <div class="dropdownItem" (click)="logOut()">退出</div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <!-- 头部 end -->
+  <div class="pharmacy-main">
+    <div class="list-template pharmacy-main__list pharmacy-main__print">
+			<div class="list-template__content">
+			  <div class="list-template__top" nz-row>
+			    <div nz-col nzLg='18' class="list-template__searchBox">
+			      <div class="list-template__searchItem">
+			        <span class="label width-108">报修时间区间：</span>
+			        <nz-range-picker [(ngModel)]="acceptTime" nzFormat="yyyy-MM-dd HH:mm:ss"
+							(ngModelChange)="changeDate($event)"></nz-range-picker>
+			      </div>
+						<div class="list-template__searchItem">
+						  <span class="label">状态：</span>
+							<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择状态"
+							  [(ngModel)]="status">
+							  <ng-container *ngFor="let option of statusData">
+							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+							</nz-select>
+						</div>
+						<div class="list-template__searchItem">
+						  <span class="label">单号：</span>
+							<input type="text" class="search-input" [(ngModel)]="incidentsign" nz-input placeholder="请输入患者" />
+						</div>
+			    </div>
+			    <div nz-col nzLg="6" class="list-template__btns">
+			      <button class="btn default" (click)='search()'>搜索</button>
+			      <button class="btn default ml8" (click)='reset()'>重置</button>
+			    </div>
+			  </div>
+			  <div class="list-template__bottom">
+			    <nz-table class="list-template__nzTable" [nzData]="listOneData" nzSize="middle" [nzShowPagination]="false"
+			      [nzLoading]="loading1">
+			      <thead>
+			        <tr class="thead">
+								<th nzWidth="80px">序号</th>
+			          <th>工单号</th>
+								<th>报修内容</th>
+			          <th>报修时间</th>
+			          <th>状态</th>
+			          <th>维修人</th>
+								<th>维修人电话</th>
+								<th>维修费用</th>
+			          <th nzWidth="150px">操作</th>
+			        </tr>
+			      </thead>
+			      <tbody>
+			        <tr *ngFor="let data of listOneData let index = index;">
+								<td>{{ index+(pageOneIndex-1) * pageSize + 1 }}</td>
+			          <td>{{ data.incidentsign}}</td>
+			          <td>{{ data.description}}</td>
+			          <td>{{ data.startDate | date: "yyyy-MM-dd HH:mm" }}</td>
+			          <td>{{ data.state?data.state.name:'无' }}</td>
+								<td>{{ data.handlingPersonnelUser ? data.handlingPersonnelUser.name : "无"}}</td>
+								<td>{{ data.handlingPersonnelUser ? data.handlingPersonnelUser.phone : "无"  }}</td>
+								<td>{{ data.rsPrice?data.rsPrice : '-' }}</td>
+			          <td>
+			            <div class="coop">
+										<span (click)="delBx(data)">撤销</span>
+										<span (click)="detailBx(data)">查看</span>
+			            </div>
+			          </td>
+			        </tr>
+			      </tbody>
+			    </nz-table>
+			    <div class="list-template__pagination">
+			      <nz-pagination [(nzPageIndex)]="pageOneIndex" [(nzTotal)]="listOneLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+			        (nzPageIndexChange)="getConnectList()" (nzPageSizeChange)="getConnectList()">
+			      </nz-pagination>
+			    </div>
+			  </div>
+			</div>
+    </div>
+  </div>
+</div>
+
+<!-- 修改密码 -->
+<nz-modal [(nzVisible)]="isPwdVisible" nzTitle="修改密码" (nzOnCancel)="pwdHandleCancel()" (nzOnOk)="pwdHandleOk()" [nzOkLoading]="pwdIsOkLoading" (nzAfterOpen)="pwdAfterOpen()">
+  <div>
+    <label>
+      原始密码:
+      <nz-input-group [nzSuffix]="suffixTemplate">
+        <input minlength="9" [type]="passwordVisible ? 'text' : 'password'" nz-input placeholder="原始密码" [(ngModel)]="upModalData.pwdOld" />
+      </nz-input-group>
+      <ng-template #suffixTemplate>
+        <i nz-icon [nzType]="passwordVisible ? 'eye-invisible' : 'eye'" (click)="passwordVisible = !passwordVisible"></i>
+      </ng-template>
+    </label>
+    <label>新密码:
+      <div style="display: flex;">
+        <nz-input-group [nzSuffix]="suffixTemplate">
+          <input minlength="9" [type]="passwordVisible ? 'text' : 'password'" nz-input placeholder="新密码" [(ngModel)]="upModalData.newPwd" (ngModelChange)="blurNewPwd()" />
+        </nz-input-group>
+        <ng-template #suffixTemplate>
+          <i nz-icon [nzType]="passwordVisible ? 'eye-invisible' : 'eye'" (click)="passwordVisible = !passwordVisible"></i>
+        </ng-template>
+        <div class="red" style="display: flex;justify-content: center;align-items: center;padding-left: 5px;" *ngIf="enoughRegFlag">弱</div>
+        <div style="display: flex;justify-content: center;align-items: center;padding-left: 5px;" *ngIf="mediumRegFlag">中</div>
+        <div class="green" style="display: flex;justify-content: center;align-items: center;padding-left: 5px;" *ngIf="strongRegFlag">强</div>
+      </div>
+    </label>
+    <div class="red">强密码需包含大小写字母、数字、特殊字符，长度至少9个字符</div>
+    <label>确认新密码:
+      <nz-input-group [nzSuffix]="suffixTemplate">
+        <input minlength="9" [type]="passwordVisible ? 'text' : 'password'" nz-input placeholder="确认新密码" [(ngModel)]="upModalData.newPwd2" />
+      </nz-input-group>
+      <ng-template #suffixTemplate>
+        <i nz-icon [nzType]="passwordVisible ? 'eye-invisible' : 'eye'" (click)="passwordVisible = !passwordVisible"></i>
+      </ng-template>
+    </label>
+  </div>
+</nz-modal>
+
+<!-- 修改个人信息 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="infoModal">
+  <div class="modalBody">
+    <div class="title">修改个人信息<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <overlay-scrollbars #osComponentRef1 class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="name">姓名</nz-form-label>
+          <nz-form-control nzErrorTip="请填写姓名!">
+            <nz-input-group>
+              <input type="name" nz-input formControlName="name" placeholder="请填写姓名" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="account">工号</nz-form-label>
+          <nz-form-control nzErrorTip="请填写工号!">
+            <nz-input-group>
+              <input type="account" nz-input formControlName="account" placeholder="请填写工号" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+
+				<nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="buildingId">楼栋</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择楼栋!">
+						<nz-select [nzDropdownMatchSelectWidth]="false" type="buildingId" nzAllowClear
+						  formControlName="buildingId" nzPlaceHolder="请选择楼栋" (ngModelChange)="buildingChange($event)">
+						  <nz-option nzLabel="{{data.buildingName}}" nzValue="{{data.id}}" *ngFor="let data of buildingList">
+						  </nz-option>
+						</nz-select>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="floorId">楼层</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择楼层!">
+				    <nz-select [nzDropdownMatchSelectWidth]="false" type="floorId" nzAllowClear
+				      formControlName="floorId" nzPlaceHolder="请选择楼层">
+				      <nz-option nzLabel="{{data.floorName}}" nzValue="{{data.id}}" *ngFor="let data of allFloorList">
+				      </nz-option>
+				    </nz-select>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="address">详细地址</nz-form-label>
+				  <nz-form-control>
+				    <nz-input-group>
+				      <input type="text" nz-input formControlName="address" placeholder="请填写详细地址" />
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="phone">联系电话</nz-form-label>
+          <nz-form-control>
+            <nz-input-group>
+              <input type="phone" nz-input formControlName="phone" placeholder="请填写联系电话" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </overlay-scrollbars>
+    <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>
+
+<!-- 查看详情 -->
+<div class="pathology-box display_flex align-items_center justify-content_flex-center" *ngIf="detailMoadl">
+	<div class="pathology-content">
+		<div class="title">查看详情
+		<i class="icon_transport transport-guanbi" (click)="closeDetailMoadl()"></i></div>
+		<div class="content border">
+			<div class="content-item boder-right">
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">是否术中快速：</span>{{detailsData.pathologyFormType==1?'是':'否'}}</div>
+					<div class="form-title"><span class="font-weight-500">申请单编号：</span>{{detailsData.applyCode}}</div>
+					<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status.name}}</div>
+					<div class="form-title"><span class="font-weight-500">科室名称：</span>{{detailsData.patientDTO.department.dept}}</div>
+				</div>
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">住院号：</span>{{detailsData.patientDTO.patientCode}}</div>
+					<div class="form-title"><span class="font-weight-500">患者信息：</span>{{detailsData.patientDTO.patientName}} ({{detailsData.patientDTO.bedNum}}床)</div>
+					<div class="form-title"><span class="font-weight-500">年龄：</span>{{detailsData.patientDTO.age||'-'}}岁</div>
+				</div>
+				
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">检验项目：</span>{{project||'无'}}</div>
+				</div>
+				
+				<div class="form-list">
+					<div class="form-title font-weight-500">诊断：</div>
+					<div class="indent">
+						{{detailsData.diagnose||'无'}}
+					</div>
+				</div>
+				
+				<div class="form-list">
+					<div class="form-title font-weight-500">病历摘要：</div>
+					<div class="indent">{{detailsData.medicalRecords||'无'}}</div>
+				</div>
+				<div class="form-list">
+					<div class="form-title font-weight-500">手术方案：</div>
+					<div class="indent">{{detailsData.surgicalPlan||'无'}}</div>
+				</div>
+
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">标本类型：</span>{{detailsData.specimenType.name||'无'}}</div>
+					<div class="form-title"><span class="font-weight-500">标本数量：</span>{{detailsData.specimenNum||'无'}}</div>
+					<div class="form-title"><span class="font-weight-500">部位：</span>{{detailsData.takePart||'无'}}</div>
+				</div>
+				
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">送检医生：</span>{{detailsData.surgeryDoctorDTO?detailsData.surgeryDoctorDTO.name : '-'}}</div>
+					<div class="form-title"><span class="font-weight-500">离体时间：</span>{{detailsData.inVitroTime?(detailsData.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</div>
+					<div class="form-title"><span class="font-weight-500">固定时间：</span>{{detailsData.fixationTime?(detailsData.fixationTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</div>
+				</div>
+				
+				<div class="form-list">
+					<div class="form-title font-weight-500">标本：</div>
+					<div class="form-title specimen-list">
+						<div *ngFor="let item of specimenList" class="specimen-item-class form-title cursors" (click)="specimenView(item)">
+							<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.specimenName}}({{item.specimenCode}})
+						</div>
+					</div>
+				</div>
+
+			</div>
+			
+			<div class="content-item-right">
+				<div class="step-title">病理闭环</div>
+				<nz-steps [nzCurrent]="stepLength" nzDirection="vertical" nzSize="small">
+					<ng-container *ngFor="let item of pathologyLogs; let index = index">
+							<nz-step
+								[nzDescription]="tpl"
+							>
+							</nz-step>
+							<ng-template #tpl>
+								<div *ngIf="index==pathologyLogs.length-1" class="step-size">
+									<div style="color: #49B856;">{{item.operationType.name}} {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
+									<div style="color:#333;">{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto?item.operationUserDto.name:''}}</div>
+								</div>
+								<div *ngIf="index!=pathologyLogs.length-1" class="step-size">
+									<div>{{item.operationType.name}} {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
+									<div>{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto?item.operationUserDto.name:''}}</div>
+								</div>
+							</ng-template>
+						</ng-container>
+				</nz-steps>
+			</div>
+		</div>
+		<div class="display_flex justify-content_flex-center bottom-btn">
+			<button class="btn btn-right" nz-button nzType="primary" (click)="closeDetailMoadl()">知道了</button>
+		</div>
+	</div>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo" (closeModel)="closeModel()"></app-prompt-modal>
+	
+
+<div class="mask-style" *ngIf="isSpinning">
+	<nz-spin nzSimple class="spin-style"></nz-spin>
+</div>
+
+<router-outlet (deactivate)="getConnectList($event)"></router-outlet>
+
+<!-- 快速报修 -->
+<div class="commonModal display_flex justify-content_flex-center align-items_center" *ngIf="bxModal" (click)="clickExtra($event)">
+  <div class="modalBody">
+    <div class="title">一键报修<i class="icon_transport transport-guanbi" (click)="hideBxModal()"></i>
+    </div>
+    <div class="content">
+      <form nz-form [formGroup]="validateBxForm" class="bxFormAdd" (ngSubmit)="confirmBx()">
+        <nz-form-item>
+          <nz-form-label [nzSm]="4" [nzXs]="4" nzRequired nzFor="description">故障描述</nz-form-label>
+          <nz-form-control>
+            <nz-input-group style="width:442px;">
+              <textarea nz-input formControlName="description" rows="4" placeholder="请输入故障描述"></textarea>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+				<nz-form-item>
+					<nz-form-label [nzSm]="4" [nzXs]="4" nzFor="description">图片上传</nz-form-label>
+					<nz-form-control style="display: inline-block;" *ngIf="repairImgs.length === 0">
+					  <nz-upload nzListType="picture-card" [(nzFileList)]="fileList"
+						[nzShowUploadList]="showUploadList" [nzPreview]="handlePreview"
+						nzFileType="image/jpeg,image/png" nzAccept="image/jpeg,image/png"
+						[nzShowButton]="fileList.length < 3"
+						[nzBeforeUpload]="beforeUpload" [nzAction]="temporarilyUrl"
+						[nzSize]="10240">
+					    <i nz-icon nzType="plus"></i>
+					    <div class="ant-upload-text">上传照片</div>
+					  </nz-upload>
+					  <nz-modal [nzVisible]="previewVisible" [nzContent]="modalContent" [nzFooter]="null" (nzOnCancel)="previewVisible = false">
+					    <ng-template #modalContent>
+					      <img [src]="previewImage" [ngStyle]="{ width: '100%' }" />
+					    </ng-template>
+					  </nz-modal>
+					  <div class="tips">只支持.jpg.png.jpg 格式，最多上传3 张图片。</div>
+					</nz-form-control>
+					<div class="thumbList" *ngIf="repairImgs.length > 0">
+					  <div class="thumb" *ngFor="let item of repairImgs;let index = index;" (click)="previewImageHandler(repairImgs, index)"><img [src]="item.thumbFilePath" alt=""></div>
+					</div>
+				</nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="4" [nzXs]="4" nzRequired nzFor="contacts">联系人</nz-form-label>
+          <nz-form-control style="display: inline-block;">
+            <nz-input-group>
+              <input style="width:168px;" class="mr8" nz-input formControlName="contacts" placeholder="请输入联系人" />
+            </nz-input-group>
+          </nz-form-control>
+
+          <nz-form-label nzRequired nzFor="contactsInformation">联系电话</nz-form-label>
+          <nz-form-control style="display: inline-block;">
+            <nz-input-group>
+              <input style="width:185px;" nz-input formControlName="contactsInformation" placeholder="请输入联系电话" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item style="display: inline-block;vertical-align:bottom;" class="last">
+          <nz-form-label [nzSm]="4" [nzXs]="4" nzRequired nzFor="building">详细地址</nz-form-label>
+          <nz-form-control style="display: inline-block;">
+            <nz-select [nzDropdownMatchSelectWidth]="false" style="width:120px;" class="mr8" type="building"
+              nzShowSearch formControlName="building" nzPlaceHolder="请选择楼栋"
+              (ngModelChange)="changeBuilding($event)">
+              <nz-option [nzLabel]="data.buildingName" [nzValue]="data.id" *ngFor="let data of buildings">
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+          <nz-form-label [nzSm]="4" [nzXs]="4" nzRequired nzFor="floor" hidden></nz-form-label>
+          <nz-form-control style="display: inline-block;">
+            <nz-select [nzDropdownMatchSelectWidth]="false" style="width:120px;" class="mr8" type="floor" nzShowSearch
+             formControlName="floor" nzPlaceHolder="请选择楼层" [nzLoading]="floorLoading">
+              <nz-option [nzLabel]="data.floorName" [nzValue]="data.id" *ngFor="let data of floors"></nz-option>
+            </nz-select>
+          </nz-form-control>
+          <nz-form-label [nzSm]="4" [nzXs]="4" nzRequired nzFor="officeAddress" hidden></nz-form-label>
+          <nz-form-control style="display: inline-block;" class="address">
+            <nz-input-group>
+              <input class="addressFocus" style="width:185px;" nz-input formControlName="officeAddress" placeholder="请输入详细位置" (focus)="focusAddress()" />
+              <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>
+                </ng-container>
+                <div *ngIf="!addressLoading && !addressList.length" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
+                  <nz-empty></nz-empty>
+                </div>
+                <div *ngIf="addressLoading" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
+                  <nz-spin nzSimple></nz-spin>
+                </div>
+              </div>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nz-button nzType="primary" (click)="confirmBx()">
+        确认
+      </button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideBxModal()">
+        取消
+      </button>
+    </div>
+  </div>
+</div>
+
+<!-- 撤销报修 -->
+<app-dialog-delete
+  [delModal]="delBxModal"
+  (hideDelModalEvent)="hideDelBxModal()"
+  [btnLoading]="btnLoading"
+  (confirmDelEvent)="confirmDelBx()"
+  content="您确认要撤销吗？"
+></app-dialog-delete>

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

@@ -0,0 +1,979 @@
+import { Component, OnInit, ViewChild, OnDestroy } from "@angular/core";
+import { MainService } from "../../services/main.service";
+import { ActivatedRoute, Router } from "@angular/router";
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+import { startOfDay, format, endOfDay } from "date-fns";
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService, UploadFile } from "ng-zorro-antd";
+import { debounceTime, filter } from 'rxjs/operators';
+import { Subject } from 'rxjs';
+import { DomSanitizer } from '@angular/platform-browser';
+import cloneDeep from 'lodash-es/cloneDeep'
+import { HttpRequest, HttpResponse, HttpClient } from '@angular/common/http';
+import {
+  FormBuilder,
+  Validators,
+  FormGroup,
+  FormControl,
+} from "@angular/forms";
+
+@Component({
+  selector: "app-web-repairs",
+  templateUrl: "./web-repairs.component.html",
+  styleUrls: ["./web-repairs.component.less"],
+})
+export class WebRepairsComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef2", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef2: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef3", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef3: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef4", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef4: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef5", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef5: OverlayScrollbarsComponent;
+  constructor(
+	private mainService: MainService,
+	public router: Router,
+	private route: ActivatedRoute,
+	public tool: ToolService,
+	private fb: FormBuilder,
+	private message: NzMessageService,
+	private sanitizer: DomSanitizer,
+	private http: HttpClient,
+	
+	) {}
+  // 今日药单量
+  todayTotal: undefined;
+  // 今日已完成
+  todayComplete: undefined;
+  //手术间数据
+  printPharmacyList = []; //数据列表
+  printPharmacyIdx = 0; //页码
+  printPharmacyTotal = 0; //总数
+  printPharmacyFlag = false; //是否查看更多
+  printPharmacySearchKey = ""; //搜索的内容
+  printPharmacyLoad = false; //按钮的loading
+  // 标本间列表
+  waitPharmacyList = [];
+  waitPharmacyIdx = 0;
+  waitPharmacyTotal = 0;
+  waitPharmacyFlag = false;
+  waitPharmacySearchKey = "";
+  waitPharmacyLoad = false;
+  // 今日离科列表
+  pharmacyList = [];
+  pharmacyIdx = 0;
+  pharmacyTotal = 0;
+  pharmacyFlag = false;
+  pharmacySearchKey = "";
+  pharmacyLoad = false;
+  // 配送中列表
+  distributionList = [];
+  distributionIdx = 0;
+  distributionTotal = 0;
+  distributionFlag = false;
+  distributionSearchKey = "";
+  distributionLoad = false;
+  // 已完成列表
+  completedList = [];
+  completedIdx = 0;
+  completedTotal = 0;
+  completedFlag = false;
+  completedSearchKey = "";
+  completedLoad = false;
+
+	barCode:any; //条码搜索
+  // other
+  loginUser: any = localStorage.getItem("user")
+    ? JSON.parse(localStorage.getItem("user")).user
+    : null; //登录人信息
+
+  logTimer = null; //定时器
+  logTime = 0; //自动刷新秒数
+  logTimeConst = 60; //自动刷新秒数
+
+  time = new Date().getTime(); // 时间戳
+  timer = null; // 时间定时器
+	showDropdown:boolean = false;
+	relevanceModal:boolean = false //关联标本和手术室
+	validateForm: FormGroup; //关联标本和手术室表单
+	validateVerificationForm: FormGroup; //核验标本
+	validateConnectForm: FormGroup; //核验标本
+	specimenData:any = []; //标本间数据
+	operationData:any = []; //手术间数据
+	fixationModal:boolean = false //标本接收固定
+	verificationMoadl:boolean = false //标本核验
+	specimenCode:any; //标本条码
+	listOneData:any=[];
+	listOneLength:any;
+	pageOneIndex:any = 1;
+	pageSize:any = 10;
+	listTwoData:any=[];
+	listTwoLength:any;
+	pageTwoIndex:any = 1;
+	listThreeData:any=[];
+	listThreeLength:any;
+	pageThreeIndex:any = 1;
+	loading1:boolean = false;
+	loading2:boolean = false;
+	loading3:boolean = false;
+	loading4:boolean = false;
+	loading5:boolean = false;
+	fixativeData:any = []; //固体液类型
+	hosId:any;
+	userId:any;
+	detailsData:any;
+	isSpinning:boolean = false; //全屏加载状态
+	codeData:any = []; //标本条码数据
+	btnInfoLoading :boolean = false; //标本加固加载
+	activeIndex:any = 0; //tabs选择状态
+	changeInpSubject = new Subject(); //防抖
+	changeInpSubjectUser = new Subject(); //防抖
+	changeInpSubjectSpecimen = new Subject(); //防抖
+	changeInpSubjectDepartment = new Subject(); //防抖
+	pathologyFormType:any = null; //术中快速
+	status:any; //状态
+	incidentsign:any //配送人
+	userData:any = []; //患者数据
+	statusData:any = []; //状态数据
+	isLoading:boolean = false;
+	listDetailMoadl:boolean = false; //详情弹框
+	department:any = []; //科室数据
+	hospital:any = []; //院区数据
+	distributionName:any;
+	businessType:any = null;
+	multiModal:boolean = false;
+	specimenMultiCode:any = null;
+	codeMultiData:any=[];
+	errorMultiMsg:any = null;
+	connectModal:boolean = false; //标本交接弹框
+	receptionModal:boolean = false; //标本接收弹框
+	deptId:any = null;
+	detailMoadl:boolean = false;
+	rowData:any = null; //table选中数据
+	toDayData:any = null;
+	toDayTime:any = null;
+	backType:any = 'list';
+	mainRole:any = false;
+	coopBtns:any = {};
+	deptName:any = null;
+	loginUserDeptId: number = JSON.parse(localStorage.getItem("user")).user.dept
+	  .id; //登录人所属科室
+	
+	buildingData:any = [];
+	floorData:any = [];
+	userInfo:any;
+	currentDept:any;
+  ngOnInit() {
+		this.coopBtns = this.tool.initCoopBtns(this.route);
+		this.hosId = this.tool.getCurrentHospital().id;
+		this.userId = this.tool.getCurrentUserId()
+		this.deptId = this.tool.getCurrentUserDept().id
+		this.deptName = this.tool.getCurrentUserDept().dept
+		this.userInfo = this.tool.getCurrentUserInfo();
+		this.currentDept = this.tool.getCurrentUserDept();
+		if(this.route.snapshot.queryParams && this.route.snapshot.queryParams.type){
+			this.backType = this.route.snapshot.queryParams.type
+		}
+		this.getStatusDic()
+  }
+	
+	// 初始化新增form表单
+	initBxForm(content) {
+	  this.validateBxForm = this.fb.group({
+	    description: [content || null, [Validators.required]],
+	    building: [null, [Validators.required]],
+	    floor: [null, [Validators.required]],
+	    officeAddress: [null, [Validators.required]],
+	    contacts: [this.loginUser.name, [Validators.required]],
+	    contactsInformation: [this.loginUser.phone, [Validators.required]],
+	  });
+	  this.getDeptById(this.currentDept.id);
+	}
+	// 根据科室ID获取详情
+	deptDto:any = {};
+	getDeptById(id){
+	  this.mainService
+	    .getFetchDataList("simple/data", "department", {
+	      idx: 0,
+	      sum: 1,
+	      department: {
+	        id,
+	      }
+	    })
+	    .subscribe((data:any) => {
+	      let list = data.list || [];
+	      this.deptDto = list.length > 0 ? list[0] : {};
+	      console.log(this.deptDto);
+	      this.changeHosp();
+	      // 回显楼栋
+	      if(this.deptDto.building){
+	        this.validateBxForm.controls.building.setValue(this.deptDto.building.id);
+	      }
+	
+	      // 回显楼层
+	      if(this.deptDto.floor){
+	        this.validateBxForm.controls.floor.setValue(this.deptDto.floor.id);
+	      }
+	    });
+	}
+	// 切换院区选项
+	buildings: any = []; //楼栋
+	changeHosp() {
+	  this.validateBxForm.controls.building.setValue(null);
+	  this.buildings = [];
+	  let data = {
+	    idx: 0,
+	    sum: 9999,
+	    building: {
+	      hosId: this.deptDto.hospital.id,
+	    }
+	  };
+	  this.mainService
+	    .getFetchDataList("simple/data", "building", data)
+	    .subscribe((data:any) => {
+	      this.buildings = data.list || [];
+	      this.floors = [];
+	      this.message.remove(this.maskFlag);
+	      this.maskFlag = false;
+	    });
+	}
+	
+	// 切换楼栋信息
+	floors: Array<any> = []; //楼层
+	floorLoading: boolean = false;
+	changeBuilding(buildingId) {
+	  if(!buildingId){
+	    return;
+	  }
+	  this.validateBxForm.controls.floor.setValue(null);
+	  this.validateBxForm.controls.officeAddress.setValue(null);
+	  this.floors = [];
+	
+	  let data = {
+	    idx: 0,
+	    sum: 9999,
+	    floor: {
+	      buildId: buildingId,
+	    }
+	  };
+	  this.floorLoading = true;
+	  this.mainService
+	    .getFetchDataList("simple/data", "floor", data)
+	    .subscribe((data:any) => {
+	      this.floorLoading = false;
+	      this.message.remove(this.maskFlag);
+	      this.maskFlag = false;
+	      this.floors = data.list || [];
+	    });
+	}
+	
+	// 快速报修
+	bxModal: boolean = false; //模态框
+	loading6 = false;
+	coopBx: any; //当前操作列
+	maskFlag:any;
+	fileList:any = [];
+	validateBxForm: FormGroup; //新增/编辑表单
+	speediness(data?) {
+	  this.maskFlag = this.message.loading("正在加载中..", {
+	    nzDuration: 0,
+	  }).messageId;
+	  this.bxModal = true;
+	  this.coopBx = data || {};
+		this.fileList = [];
+	  this.initBxForm(this.coopBx.content);
+	}
+	// 隐藏模态框
+	hideBxModal() {
+	  this.bxModal = false;
+		this.fileList = [];
+	}
+	// 确认
+	confirmBx() {
+	  for (const i in this.validateBxForm.controls) {
+	    this.validateBxForm.controls[i].markAsDirty();
+	    this.validateBxForm.controls[i].updateValueAndValidity();
+	  }
+	  if (this.validateBxForm.invalid){
+	    this.message.error('请填写必填字段！');
+	    return;
+	  };
+	  if (!this.deptDto.id){
+	    this.message.error('数据异常，无法建单！');
+	    return;
+	  };
+	  this.showReqModal();
+	}
+	
+	// 报修提示框
+	reqModal: boolean = false;
+	extraData:any = {};
+	showReqModal() {
+	  this.extraData.floor = this.floors.find(v => v.id == this.validateBxForm.value.floor);
+	  // this.reqModal = true;
+	  this.confirmBxNext(0);
+	}
+	
+	// 报修
+	// type, 1是，0否
+	cancenlLoading:boolean = false;
+	async confirmBxNext(type){
+	  this.maskFlag = this.message.loading("正在加载中..", {
+	    nzDuration: 0,
+	  }).messageId;
+	  if(type == 1){
+	    this.btnLoading = true;
+	    let loginUser:any = cloneDeep(this.loginUser);
+			// loginUser.upType = "changeDept";
+	    if(this.deptDto.hospital){
+	      loginUser.hospital = { id: this.deptDto.hospital.id };
+	    }
+	    if(this.deptDto){
+	      loginUser.dept = {id: this.deptDto.id};
+	    }
+	    if(this.validateBxForm.value.contacts){
+	      loginUser.name = this.validateBxForm.value.contacts;
+	    }
+	    // if(this.validateBxForm.value.floor){
+	    //   loginUser.place = {id: this.validateBxForm.value.floor, area: { id: this.validateBxForm.value.building }};
+	    // }
+	    // if(this.validateBxForm.value.officeAddress){
+	    //   loginUser.houseNumber = this.validateBxForm.value.officeAddress;
+	    // }
+	    if(this.validateBxForm.value.contactsInformation){
+	      loginUser.phone = this.validateBxForm.value.contactsInformation;
+	    }
+	    let result:any = await this.mainService.coopData("updData", "user", { user: loginUser }).toPromise();
+	    console.log(result);
+	    if(result.status != 200){
+	      this.hideReqModal();
+	      this.btnLoading = false;
+	      this.message.remove(this.maskFlag);
+	      this.maskFlag = false;
+	      this.message.error(result.msg);
+	      return;
+	    }
+	  }else{
+	    this.cancenlLoading = true;
+	  }
+	  this.mainService.getDictionary("list", "incident_source").subscribe((source:any) => {
+	    let incidentSourceList = source || [];
+	    let pc = incidentSourceList.find(v => v.value === 'pc');
+	    this.mainService.getDictionary("list", "repair_incident_type").subscribe((result) => {
+	      let repairIncidentTypeList = result || [];
+	      let repairIncidentType = repairIncidentTypeList.find(v => v.value === 'public');
+	      if (repairIncidentType) {
+	        let postData: any = {
+	          incident: {
+	            repairIncidentType,
+	            place: this.validateBxForm.value.floor ? { id: this.validateBxForm.value.floor } : undefined,
+	            description: this.validateBxForm.value.description,
+	            houseNumber: this.validateBxForm.value.officeAddress,
+	            contacts: this.validateBxForm.value.contacts,
+	            contactsInformation: this.validateBxForm.value.contactsInformation,
+	            hosId: this.deptDto.hospital.id,
+	            source: pc,
+	            fromWx: true,
+	            requester: this.loginUser,
+	            acceptUser: this.loginUser,
+	            deleteFlag: 0,
+	          },
+	        };
+	        if (this.coopBx.category) {
+	          postData.incident.category = this.coopBx.categoryDTO;
+	        }
+	        this.mainService.flowPost("incident/task/request", postData).subscribe((res) => {
+	          this.btnLoading = false;
+	          this.cancenlLoading = false;
+	          this.message.remove(this.maskFlag);
+	          this.maskFlag = false;
+	          this.bxModal = false;
+	          this.hideReqModal();
+	          if ((res as any).state == 200) {
+							// 图片上传
+							if(this.fileList.length){
+								console.log(this.fileList.map(v => v.originFileObj));
+								this.fileList.map(v => v.originFileObj).forEach(async file => {
+									await this.uploadImages(file, res.data.id);
+								})
+							}
+							this.getConnectList()
+	            this.showPromptModal("提交", true, "");
+	          } else {
+	            this.showPromptModal("提交", false, (res as any).msg);
+	          }
+	        });
+	      } else {
+	        this.btnLoading = false;
+	        this.showPromptModal("提交", false, "缺少【科室内报修】数据字典");
+	      }
+	    });
+	  })
+	}
+	
+	hideReqModal() {
+	  this.reqModal = false;
+	}
+	
+	// 预览图片
+	imgs = [];
+	isPreview = false;
+	initialViewIndex:number = 0;
+	previewImageHandler(data = [], index = 0) {
+	  this.initialViewIndex = index;
+	  console.log(index)
+	  this.isPreview = false;
+	  data = data || [];
+	  this.imgs = data.map((v) => location.origin + '/file' + v.relativeFilePath);
+	  setTimeout(() => {
+	    this.isPreview = true;
+	  }, 0)
+	}
+	
+	// 图片相关
+	showUploadList = {
+	  showPreviewIcon: true,
+	  showRemoveIcon: true,
+	  hidePreviewIconInNonImage: true
+	};
+	previewImage: string | undefined = '';
+	previewVisible = false;
+	repairImgs:any[] = [];//报修图片
+	handlePreview = (file: UploadFile) => {
+		console.log('file1:', file)
+	  this.previewImage = file.url || file.thumbUrl;
+	  this.previewVisible = true;
+	};
+	
+	beforeUpload = (file: UploadFile): boolean => {
+		console.log('file2:', file)
+	  this.fileList = [...this.fileList, file];
+	  setTimeout(async () => {
+	    file.url = await this.getBase64(file);
+	  }, 0);
+	  console.log('this.fileList:', this.fileList)
+	  return true;
+	};
+	
+	getBase64(file: any): Promise<any> {
+	  return new Promise((resolve, reject) => {
+	    const reader = new FileReader();
+	    reader.readAsDataURL(file);
+	    reader.onload = () => resolve(reader.result);
+	    reader.onerror = error => reject(error);
+	  });
+	}
+	
+	// 临时上传图片
+	temporarilyUrl = this.mainService.returnUploadUrl('wechatRequesterIncident', 0);
+	
+	// 图片上传
+	uploadImages(file, id){
+	  const formData = new FormData();
+	  formData.append('file', file);
+	  formData.append('fileName', file.name);
+	  const req = new HttpRequest('Post', this.mainService.returnUploadUrl('wechatRequesterIncident', id), formData, {
+	    reportProgress: true
+	  });
+	  return this.http.request(req).pipe(filter(e => e instanceof HttpResponse)).toPromise();
+	}
+	
+	isAllDisplayDataChecked:any = false;
+	isOperating:any  = false;
+	isIndeterminate:any = false;
+	listOfAllData: any = [];
+	mapOfCheckedId: { [key: string]: boolean } = {};
+	numberOfChecked = 0;
+	selectedData:any = null;
+	
+	// 获取状态字典
+	repairIncidentTypeList:any;
+	sourceData:any;
+	getStatusDic(){
+		this.mainService.getDictionary("list", "incident_status").subscribe((res) => {
+			this.statusData = res
+		});
+		
+		this.mainService.getDictionary("list", "incident_source").subscribe((res) => {
+			this.sourceData = res.find(i=>i.value == 'pc')
+			this.mainService.getDictionary("list", "repair_incident_type").subscribe((res) => {
+				this.repairIncidentTypeList = res
+				this.getConnectList()
+			});
+		});
+		
+	}
+
+	// 搜索
+	search() {
+	  this.pageOneIndex = 1;
+	  this.getConnectList();
+	}
+	// 重置
+	reset() {
+	  this.pageOneIndex = 1;
+		this.status = null;
+		this.incidentsign = null;
+		this.startDate = format(startOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
+		this.endDate = format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
+		this.acceptTime = [this.startDate,this.endDate];
+	  this.getConnectList();
+	}
+	// 交接本数据
+	getConnectList() {
+	  var that = this;
+	  let data = {
+	    idx: that.pageOneIndex - 1,
+	    sum: that.pageSize,
+	    incident: {
+				incidentsign: this.incidentsign || undefined,
+				statusId: this.status || undefined,
+	      repairIncidentType: { id: this.repairIncidentTypeList.find(v => v.value === 'public').id },
+	    	requester: {
+					id: this.userId
+				},
+				source:{
+					id: this.sourceData.id
+				},
+				startDate_start: this.startDate,
+				startDate_end: this.endDate
+	    }
+	  };
+	  this.loading1 = true;
+	  that.mainService
+	    .getFetchDataList("simple/data", "incident", data)
+	    .subscribe((data) => {
+	      this.loading1 = false;
+	      that.listOneData = data.list;
+	      that.listOneLength = data.totalNum;
+	    });
+	}
+	
+	// 报修撤销模态框
+	delBxModal: boolean = false;
+	delBxData: any; //删除的data
+	delBx(data) {
+	  this.delBxData = data;
+	  this.delBxModal = true;
+	}
+	confirmDelBx() {
+	  this.btnLoading = true;
+	  this.mainService
+	    .flowPost("incident/task/cancel", { incident: this.delBxData })
+	    .subscribe((result) => {
+	      if(result.state == 200){
+	        this.delBxModal = false;
+	        this.showPromptModal("撤销", true, "");
+	        this.getConnectList();
+	      }else{
+	        this.delBxModal = false;
+	        this.showPromptModal("撤销", false, result.msg);
+	      }
+	    });
+	}
+	hideDelBxModal() {
+	  this.delBxModal = false;
+	}
+	
+	// 查看
+	detailBx(data){
+	  this.router.navigateByUrl("webRepairs/detailBx/" + data.id);
+	}
+	
+	// 获取院区
+	getHospitalData(){
+		let arr = this.tool.getHospitalList().filter(i=>i.parent==undefined)
+		this.hospital = arr
+	}
+
+	// 选择院区
+	hospitalId:any=null;
+	changeHospDate(e){
+		this.validateForm.controls.department.setValue(null)
+		this.hospitalId = e
+		this.getDepartmentData('',e)
+	}
+
+	// 获取科室
+	isDeptLoading:boolean = false;
+	getDepartmentData(e,hospital){
+		// this.mainService.getDictionary("list", "dept_type").subscribe((res2) => {
+			// let item = res2.find(i=>i.name=='检验科室')
+			let data = {
+			  idx: 0,
+			  sum: 999,
+			  department: {
+					dept:e,
+			    hospital: { id: this.hospitalId || "" },
+			    type: {id:null},
+			  },
+			};
+			this.mainService
+			  .getFetchDataList("data", "department", data)
+			  .subscribe((res) => {
+					this.isDeptLoading = false
+			    this.department = res.list;
+			  });
+		// });
+	}
+
+	// 接收时间
+	startDate:any = format(startOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
+	endDate:any = format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
+	acceptTime:any = [this.startDate,this.endDate];
+	changeDate(result){
+		if(result.length>0){
+			this.startDate = format(result[0], 'yyyy-MM-dd' +' '+'00:00:00');
+			this.endDate = format(result[1], 'yyyy-MM-dd' +' '+'23:59:59');
+			this.acceptTime = [this.startDate,this.endDate]
+		}else{
+			this.startDate = null;
+			this.endDate = null;
+			this.acceptTime = []
+		}
+	}
+
+	// 获取当前用户信息
+	getCurrentUserNow() {
+	  this.mainService.getCurrentUser1().subscribe((data:any) => {
+	    if (data["status"] == 200) {
+				this.userInfo = data.data;
+				let user = JSON.parse(localStorage.getItem("user"));
+				user.user.name = data["data"].name;
+				user.user.account = data["data"].account;
+				user.user.floorDTO = data["data"].floorDTO;
+				user.user.buildingDTO = data["data"].buildingDTO;
+				user.user.phone = data["data"].phone;
+				user.user.address = data["data"].address;
+				localStorage.setItem("user", JSON.stringify(user));
+	    }
+	  });
+	}
+
+	// 成功/失败提示框
+	closeModel(){
+		
+	}
+
+
+	pathologyLogs:any=[];
+	specimenList:any=[]
+	stepLength:any = 0;
+	closeDetailMoadl(){
+		this.detailMoadl = false
+	}
+
+  // 退出
+  logOut(): void {
+    // 假退出
+    let hospital = this.tool.getCurrentHospital();
+    if(hospital){
+      this.router.navigate(["login", hospital.id]);
+    }else{
+      this.router.navigateByUrl("login");
+    }
+    localStorage.removeItem("user");
+    localStorage.removeItem("menu");
+    localStorage.removeItem("index");
+		localStorage.removeItem("scanCodeData");
+		localStorage.removeItem("dataType");
+		localStorage.removeItem("pathologyActiveIndex");
+    // 假退出
+    this.mainService.logOut().subscribe((data) => {
+      if (data.status == 200) {
+        if(hospital){
+          this.router.navigate(["login", hospital.id]);
+        }else{
+          this.router.navigateByUrl("login");
+        }
+        localStorage.removeItem("user");
+        localStorage.removeItem("menu");
+        localStorage.removeItem("index");
+				localStorage.removeItem("scanCodeData");
+				localStorage.removeItem("dataType");
+				localStorage.removeItem("pathologyActiveIndex");
+      }
+    });
+
+  }
+
+  // 右侧菜单
+  showLastItems: boolean = false;
+  // 下拉
+  fixedMenuXiala() {
+    this.showLastItems = true;
+  }
+
+  // 上拉
+  fixedMenuShangla() {
+    this.showLastItems = false;
+  }
+	
+	// 回到系统管理
+	toMain() {
+	  this.router.navigateByUrl("main");
+	}
+	
+  // 切换右侧菜单Tab
+  fixedTab: string = "";
+  checkFixedTab(type: string) {
+    if (type == "toSystem") {
+      this.router.navigateByUrl("main");
+    }
+    if (this.fixedTab == type) {
+      this.fixedTab = "";
+    } else {
+      this.fixedTab = type;
+    }
+  }
+	
+  //科室切换
+  changeShow = true;
+  closeTime = 3;
+  closeTimeFlag = 0;
+  hsPromptModalShow: boolean = false; //科室切换提示框是否展示
+  timerCloseTime = null;
+  deptDisplay = 1; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
+  // 修改密码
+	isPwdVisible:boolean = false
+  etitPasswrod() {
+    this.isPwdVisible= true;
+  }
+	
+	//打开修改密码弹窗
+	pwdAfterOpen(){
+	  this.passwordVisible = false;
+	  this.pwdIsOkLoading = false;
+	  this.enoughRegFlag = true; //弱
+	  this.mediumRegFlag = false; //中
+	  this.strongRegFlag = false; //强
+	  this.upModalData = {
+	    userid: "",
+	    pwdOld: "",
+	    newPwd: "",
+	    newPwd2: "",
+	  };
+	}
+	
+	// 修改密码
+	passwordVisible = false;
+	password?: string;
+	pwdIsOkLoading = false;
+	upModalData = {
+	  userid: "",
+	  pwdOld: "",
+	  newPwd: "",
+	  newPwd2: "",
+	};
+	upPwd(): void {
+	  if(this.upModalData.pwdOld.trim() === ''){
+	    this.message.error('请填写原始密码！', {
+	      nzDuration: 5000,
+	    });
+	    return;
+	  }
+	  if(!this.strongRegFlag){
+	    this.message.error('新密码不符合要求！', {
+	      nzDuration: 5000,
+	    });
+	    return;
+	  }
+	  if(this.upModalData.newPwd !== this.upModalData.newPwd2){
+	    this.message.error('新密码与确认新密码不一致！', {
+	      nzDuration: 5000,
+	    });
+	    return;
+	  }
+	
+	  this.pwdIsOkLoading = true;
+	  let userid = JSON.parse(localStorage.getItem("user")).user.id;
+	  this.upModalData.userid = userid;
+	  this.mainService.upPwd(this.upModalData).subscribe((data) => {
+	    if (data.status == 200) {
+	      this.isPwdVisible = false;
+	      this.pwdIsOkLoading = false;
+	      this.message.success("修改成功！", {
+	        nzDuration: 5000,
+	      });
+	    } else {
+	      this.pwdIsOkLoading = false;
+	      this.message.error(data.error, {
+	        nzDuration: 5000,
+	      });
+	    }
+	  });
+	}
+	showUpPwd(): void {
+	  this.isPwdVisible = true;
+	}
+	
+	pwdHandleOk(): void {
+	  this.upPwd();
+	}
+	
+	pwdHandleCancel(): void {
+	  this.isPwdVisible = false;
+	}
+	
+	// 新密码失去焦点
+	enoughRegFlag = true; //弱
+	mediumRegFlag = false; //中
+	strongRegFlag = false; //强
+	blurNewPwd(){
+	  let enoughReg = /^.{0,6}$/;//密码强度-弱
+	  let strongReg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[\!\@\#\$\%\^\&\*]).{9,}$/;//密码强度-强
+	  this.enoughRegFlag = enoughReg.test(this.upModalData.newPwd);
+	  this.strongRegFlag = strongReg.test(this.upModalData.newPwd);
+	  this.mediumRegFlag = !this.enoughRegFlag && !this.strongRegFlag;
+	  console.log(this.enoughRegFlag,this.mediumRegFlag,this.strongRegFlag);
+	}
+	
+	// 修改个人信息
+	infoModal:boolean = false
+	editInfo() {
+		this.initForm();
+		this.getBuildingList('edit');
+		setTimeout(_=>{
+			this.validateForm.controls.name.setValue(this.userInfo.name);
+			this.validateForm.controls.account.setValue(this.userInfo.account);
+			this.validateForm.controls.phone.setValue(this.userInfo.phone?this.userInfo.phone:null);
+			this.validateForm.controls.address.setValue(this.userInfo.address?this.userInfo.address:null);
+			this.infoModal= true;
+		})
+	}
+	
+	// 楼栋列表
+	buildingList:any = [];
+	getBuildingList(type:any = '') {
+		let postData = {
+			idx: 0,
+			sum: 9999,
+			building: { hosId: this.hosId },
+		};
+		this.mainService
+			.getFetchDataList("simple/data", "building", postData)
+			.subscribe((result) => {
+				if (result.status == 200) {
+					this.buildingList = result.list;
+					if(type=='edit'){
+						this.validateForm.controls.buildingId.setValue(this.userInfo.buildingDTO?this.userInfo.buildingDTO.id +"":null);
+						if(this.validateForm.value.buildingId){
+							this.getAllFloor(type)
+						}
+					}
+				}
+			});
+	}
+	
+	// 选择楼栋
+	buildingChange(e){
+		this.validateForm.controls.floorId.setValue(null);
+		this.getAllFloor()
+	}
+	
+	// 获取选中楼栋下楼层列表
+	allFloorList:any = [];
+	getAllFloor(type:any = '') {
+		let postData = {
+			idx: 0,
+			sum: 9999,
+			floor: { hosId: this.hosId, buildId: this.validateForm.value.buildingId },
+		};
+		this.mainService
+			.getFetchDataList("simple/data", "floor", postData)
+			.subscribe((result) => {
+				if (result.status == 200) {
+					this.allFloorList = result.list;
+					if(type=='edit'){
+						this.validateForm.controls.floorId.setValue(this.userInfo.floorDTO?this.userInfo.floorDTO.id+"":null);
+					}
+				}
+			});
+	}
+	
+	// 表单提交
+	btnLoading:boolean = false;
+	submitForm(): void {
+	  var that = this;
+	  for (const i in that.validateForm.controls) {
+	    that.validateForm.controls[i].markAsDirty({ onlySelf: true });
+	    that.validateForm.controls[i].updateValueAndValidity();
+	  }
+	  if (that.validateForm.invalid) return;
+	  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,
+				id: that.userId
+	    },
+	  };
+	  that.mainService
+	    .coopData("updData", "user", data)
+	    .subscribe((data) => {
+	      that.btnLoading = false;
+	      that.hideModal();
+	      that.initForm();
+	      if (data.status == 200) {
+	        that.showPromptModal("修改", true, "");
+					this.getCurrentUserNow();
+	      } else{
+					that.showPromptModal("修改", false, data.msg);
+				}
+	    });
+	}
+	
+	hideModal() {
+	  this.infoModal = false;
+	}
+	
+	// 初始化新增form表单
+	initForm() {
+	  this.validateForm = this.fb.group({
+	    name: [null, [Validators.required]],
+	    account: [null, [Validators.required]],
+			buildingId: [null],
+			floorId: [null],
+			address: [null],
+	    phone: [null],
+	  });
+	}
+	
+	promptModalShow:boolean = false;
+	promptContent:any = null;
+	ifSuccess:any = null;
+	promptInfo:any = null;
+	// 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+	showPromptModal(con, success, promptInfo?) {
+	  this.promptModalShow = false;
+	  this.promptContent = con;
+	  this.ifSuccess = success;
+	  this.promptInfo = promptInfo;
+	  setTimeout(() => {
+	    this.promptModalShow = true;
+	  }, 100);
+	}
+}
+

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

@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { WebRepairsRoutingModule } from './web-repairs-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { WebRepairsComponent } from './web-repairs.component';
+import { DragModule } from 'src/app/directives/drag/drag.module';
+
+@NgModule({
+  declarations: [WebRepairsComponent],
+  imports: [
+		DragModule,
+    CommonModule,
+    WebRepairsRoutingModule,
+    ShareModule
+  ]
+})
+export class WebRepairsModule { }

src/assets/iconfont/demo_index.html

@@ -55,6 +55,30 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon icon_transport">&#xe688;</span>
+                <div class="name">任务管理</div>
+                <div class="code-name">&amp;#xe688;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe672;</span>
+                <div class="name">新增</div>
+                <div class="code-name">&amp;#xe672;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xea41;</span>
+                <div class="name">文档管理</div>
+                <div class="code-name">&amp;#xea41;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe617;</span>
+                <div class="name">消息</div>
+                <div class="code-name">&amp;#xe617;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon icon_transport">&#xe671;</span>
                 <div class="name">bg-add</div>
                 <div class="code-name">&amp;#xe671;</div>
@@ -601,12 +625,6 @@
               </li>
           
             <li class="dib">
-              <span class="icon icon_transport">&#xe617;</span>
-                <div class="name">消息</div>
-                <div class="code-name">&amp;#xe617;</div>
-              </li>
-          
-            <li class="dib">
               <span class="icon icon_transport">&#xe673;</span>
                 <div class="name">向左</div>
                 <div class="code-name">&amp;#xe673;</div>
@@ -1086,9 +1104,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'icon_transport';
-  src: url('iconfont.woff2?t=1747898804538') format('woff2'),
-       url('iconfont.woff?t=1747898804538') format('woff'),
-       url('iconfont.ttf?t=1747898804538') format('truetype');
+  src: url('iconfont.woff2?t=1748055150475') format('woff2'),
+       url('iconfont.woff?t=1748055150475') format('woff'),
+       url('iconfont.ttf?t=1748055150475') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -1115,6 +1133,42 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon icon_transport transport-renwuguanli"></span>
+            <div class="name">
+              任务管理
+            </div>
+            <div class="code-name">.transport-renwuguanli
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-xinzeng"></span>
+            <div class="name">
+              新增
+            </div>
+            <div class="code-name">.transport-xinzeng
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-wendangguanli"></span>
+            <div class="name">
+              文档管理
+            </div>
+            <div class="code-name">.transport-wendangguanli
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-xiaoxi"></span>
+            <div class="name">
+              消息
+            </div>
+            <div class="code-name">.transport-xiaoxi
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon icon_transport transport-bg-add"></span>
             <div class="name">
               bg-add
@@ -1934,15 +1988,6 @@
           </li>
           
           <li class="dib">
-            <span class="icon icon_transport transport-xiaoxi"></span>
-            <div class="name">
-              消息
-            </div>
-            <div class="code-name">.transport-xiaoxi
-            </div>
-          </li>
-          
-          <li class="dib">
             <span class="icon icon_transport transport-xiangzuo1"></span>
             <div class="name">
               向左
@@ -2664,6 +2709,38 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-renwuguanli"></use>
+                </svg>
+                <div class="name">任务管理</div>
+                <div class="code-name">#transport-renwuguanli</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-xinzeng"></use>
+                </svg>
+                <div class="name">新增</div>
+                <div class="code-name">#transport-xinzeng</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-wendangguanli"></use>
+                </svg>
+                <div class="name">文档管理</div>
+                <div class="code-name">#transport-wendangguanli</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-xiaoxi"></use>
+                </svg>
+                <div class="name">消息</div>
+                <div class="code-name">#transport-xiaoxi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#transport-bg-add"></use>
                 </svg>
                 <div class="name">bg-add</div>
@@ -3392,14 +3469,6 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#transport-xiaoxi"></use>
-                </svg>
-                <div class="name">消息</div>
-                <div class="code-name">#transport-xiaoxi</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#transport-xiangzuo1"></use>
                 </svg>
                 <div class="name">向左</div>

src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "icon_transport"; /* Project id 4543613 */
-  src: url('iconfont.woff2?t=1747898804538') format('woff2'),
-       url('iconfont.woff?t=1747898804538') format('woff'),
-       url('iconfont.ttf?t=1747898804538') format('truetype');
+  src: url('iconfont.woff2?t=1748055150475') format('woff2'),
+       url('iconfont.woff?t=1748055150475') format('woff'),
+       url('iconfont.ttf?t=1748055150475') format('truetype');
 }
 
 .icon_transport {
@@ -13,6 +13,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.transport-renwuguanli:before {
+  content: "\e688";
+}
+
+.transport-xinzeng:before {
+  content: "\e672";
+}
+
+.transport-wendangguanli:before {
+  content: "\ea41";
+}
+
+.transport-xiaoxi:before {
+  content: "\e617";
+}
+
 .transport-bg-add:before {
   content: "\e671";
 }
@@ -377,10 +393,6 @@
   content: "\e628";
 }
 
-.transport-xiaoxi:before {
-  content: "\e617";
-}
-
 .transport-xiangzuo1:before {
   content: "\e673";
 }

src/assets/iconfont/iconfont.json

@@ -6,6 +6,34 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "6899011",
+      "name": "任务管理",
+      "font_class": "renwuguanli",
+      "unicode": "e688",
+      "unicode_decimal": 59016
+    },
+    {
+      "icon_id": "7366981",
+      "name": "新增",
+      "font_class": "xinzeng",
+      "unicode": "e672",
+      "unicode_decimal": 58994
+    },
+    {
+      "icon_id": "26851705",
+      "name": "文档管理",
+      "font_class": "wendangguanli",
+      "unicode": "ea41",
+      "unicode_decimal": 59969
+    },
+    {
+      "icon_id": "3315133",
+      "name": "消息",
+      "font_class": "xiaoxi",
+      "unicode": "e617",
+      "unicode_decimal": 58903
+    },
+    {
       "icon_id": "11882929",
       "name": "bg-add",
       "font_class": "bg-add",
@@ -643,13 +671,6 @@
       "unicode_decimal": 58920
     },
     {
-      "icon_id": "3315133",
-      "name": "消息",
-      "font_class": "xiaoxi",
-      "unicode": "e617",
-      "unicode_decimal": 58903
-    },
-    {
       "icon_id": "3292558",
       "name": "向左",
       "font_class": "xiangzuo1",