Merge branch 'master' into develop

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

@@ -172,7 +172,7 @@ export class ConfigurationMessageComponent implements OnInit {
 				  "[$起点科室$]",
 				  "[$终点科室$]",
 				];
-			}else if(data.noticeCode === 'work_order_remind' || data.noticeCode ==='work_order_remind_freedom'){
+			}else if(data.noticeCode === 'work_order_remind' || data.noticeCode ==='work_order_remind_freedom' || data.noticeCode === 'work_order_dispatch_reminder'){
 				this.varArr = [
 				  "[$任务类型$]",
 				  "[$工单单号$]",
@@ -377,6 +377,29 @@ export class ConfigurationMessageComponent implements OnInit {
       .subscribe((data) => {
         this.loading1 = false;
         if (data.status == 200) {
+					// let arr = [
+					// 	{
+					// 		noticeNode: '复诊时间',
+					// 		noticeDetails: '患者',
+					// 		shortMessageFlag: '1',
+					// 		flag: '1'
+					// 	},
+					// 	{
+					// 		noticeNode: '用药提醒',
+					// 		noticeDetails: '患者',
+					// 		shortMessageFlag: '1',
+					// 		flag: '1'
+					// 	},
+					// 	{
+					// 		noticeNode: '注意事项',
+					// 		noticeDetails: '患者',
+					// 		shortMessageFlag: '1',
+					// 		flag: '1'
+					// 	}
+					// ]
+					// for(let i of arr){
+					// 	data.list.unshift(i)
+					// }
           this.messageList = data.list || [];
         }else{
           this.message.error(data.msg || "请求数据失败");

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

@@ -147,7 +147,6 @@
             <th >患者姓名</th>
             <th >标本编码</th>
             <th >检验项目</th>
-						<th >核收信息</th>
             <th >标本类型</th>
             <th >状态</th>
             <th >收取时间</th>
@@ -155,6 +154,7 @@
             <th >中转时间</th>
             <th >送达时间</th>
             <th >送达人</th>
+						<th >核收信息</th>
             <th >终点科室</th>
           </tr>
         </thead>
@@ -167,10 +167,6 @@
             <td>{{ data.patientName}}<span *ngIf="data.bedNum">({{data.bedNum}})</span><br>{{data.residenceNo || data.patientNo}}</td>
             <td class="underline" (click)="viewSpecimenHistory(data)">{{ data.scode || "-" }}</td>
             <td>{{ data.specimenDesc || "-" }}</td>
-						<td>
-							<div>{{ data.checkCollectUserDTO ? data.checkCollectUserDTO.name : "" }}</div>
-							<div>{{ data.checkCollectTime|date:'yyyy-MM-dd HH:mm:ss' || "" }}</div>
-						</td>
             <td>{{ data.stype ? data.stype.name : "-" }}<span *ngIf="data.tubeType">,</span>{{data.tubeType && data.tubeType.name}}</td>
             <td>{{ data.speState ? data.speState.name : "-" }}</td>
             <td>{{ data.arriveTime || "-" }}</td>
@@ -178,6 +174,10 @@
             <td>{{ data.transTime || '-' }}</td>
             <td>{{ data.sendTime || '-' }}</td>
             <td>{{ data.delivererName || "-" }}</td>
+						<td>
+							<div>{{ data.checkCollectUserDTO ? data.checkCollectUserDTO.name : "" }}</div>
+							<div>{{ data.checkCollectTime|date:'yyyy-MM-dd HH:mm:ss' || "" }}</div>
+						</td>
             <td>
               {{ data.checkDept ? data.checkDept.dept : "-" }}
               <img *ngIf="data.urgent == 1" src="../../assets/images/icon_ji.png" alt="" class="ji" />

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

@@ -89,6 +89,20 @@ export class CallLogComponent implements OnInit {
         this.loading1 = false;
         if (result["status"] == 200) {
           this.listOfData = result["list"];
+					// this.listOfData[0].callDept = '王茹'
+					// this.listOfData[1].callDept = '李丽'
+					// this.listOfData[1].path = '2222'
+					// this.listOfData[2].callDept = '何冲'
+					// this.listOfData[2].path = '2222'
+					// this.listOfData[3].callDept = '宋佳'
+					// this.listOfData[3].path = '2222'
+					// this.listOfData[4].callDept = '李招娣'
+					// this.listOfData[4].path = '2222'
+					// this.listOfData[5].callDept = '吴存福'
+					// this.listOfData[5].path = '2222'
+					// this.listOfData[6].callDept = '王春芳'
+					// this.listOfData[6].path = '2222'
+					// this.listOfData[7].callDept = '王林'
           this.listLength = result["totalNum"];
         }
       });

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

@@ -895,6 +895,28 @@
             </button>
           </div>
         </div>
+				<!-- 演示用 -->
+<!-- 				<div class="fixedMenu">
+				  <div class="menuItems">
+				    <div class="item itemLink ellipsis-oneline cursorDefault w100" nz-tooltip>
+				      通话保持
+				    </div>
+				  </div>
+				</div>
+				<div class="fixedMenu" (click)="openYsModal(1)">
+				  <div class="menuItems">
+				    <div class="item itemLink ellipsis-oneline cursorDefault w100" nz-tooltip>
+				      转接
+				    </div>
+				  </div>
+				</div>
+				<div class="fixedMenu" (click)="openYsModal(2)">
+				  <div class="menuItems">
+				    <div class="item itemLink ellipsis-oneline cursorDefault w100" nz-tooltip>
+				      三方通话
+				    </div>
+				  </div>
+				</div> -->
       </div>
     </div>
   </div>
@@ -2167,3 +2189,16 @@
 		<input nz-input type="text" placeholder="请输入删除原因" [(ngModel)]="delReason" />
 	</div>
 </nz-modal>
+
+<!-- 演示用 -->
+<nz-modal
+	[(nzVisible)]="ysModal"
+	[nzTitle]="textTitle"
+	(nzOnCancel)="ysOrderModal()"
+	(nzOnOk)="confirmTestOk()"
+	[nzOkLoading]="btnLoading"
+	>
+	<div class="del-modal">
+		<input nz-input type="text" [placeholder]="textPlaceholder" [(ngModel)]="testContent" />
+	</div>
+</nz-modal>

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

@@ -186,6 +186,42 @@ export class FuwutaiComponent implements OnInit {
   coopBtns: any = {};
 	validateZwForm: FormGroup; //新增政务值班表单
 	
+	/*  演示open start */
+	ysModal:boolean = false;
+	testContent:any = '';
+	textPlaceholder:any;
+	textTitle:any;
+	openYsModal(type){
+		if(type==1){
+			this.textTitle = '转接'
+			this.textPlaceholder = '请输入转接电话'
+		}else{
+			this.textTitle = '三方通话'
+			this.textPlaceholder = '请输入第三方号码'
+		}
+		this.ysModal = true
+	}
+	
+	// 确认
+	confirmTestOk() {
+		if(this.testContent==''){
+			this.msg.error('电话号码不能为空')
+			return
+		}
+	  this.btnLoading = true;
+		setTimeout(_=>{
+			this.ysOrderModal();
+			this.showPromptModal("操作", true, "");
+		}, 1500)
+	}
+	
+	// 关闭模态框
+	ysOrderModal() {
+	  this.ysModal = false;
+	}
+	
+	/*  演示open end */
+	
 	// 一键派单
 	sendModal:boolean = false;
 	allSendOrders(){

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

@@ -682,8 +682,12 @@ const routes: Routes = [
 			{
 			  path: "workLog",
 			  loadChildren: () => import("../work-log/work-log.module").then((m) => m.WorkLogModule),
-			}
-			
+			},
+			// 个人知识库
+			{
+			  path: "personageRepository",
+			  loadChildren: () => import("../personage-repository/personage-repository.module").then((m) => m.PersonageRepositoryModule),
+			},
     ],
   },
 ];

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

@@ -30,6 +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-xiaoxi green" (click)="toMessage()" nz-tooltip nzTooltipTitle="个人消息通知"></i> -->
           <div class="dropdown">
             <i class="icon_transport transport-tianjiahover green" (mouseenter)="showFastDropdown = true" (mouseleave)="showFastDropdown = false"></i>
             <div class="dropdown-content ct" [hidden]="!showFastDropdown" (mouseenter)="showFastDropdown = true" (mouseleave)="showFastDropdown = false">
@@ -654,3 +655,44 @@
   [back]="back"
   (closeModel)="closeModel($event)"
 ></app-prompt-modal>
+
+  <!-- 演示查看消息 -->
+  <div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="ysMessageMoadl">
+    <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]="ysData" nzSize="middle" [nzShowPagination]="false"
+        		[nzLoading]="grossLoading">
+        		<thead>
+        			<tr class="thead">
+        				<th>消息内容</th>
+        				<th nzWidth="15%">发送时间</th>
+								<th nzWidth="12%">发送方</th>
+								<th nzWidth="12%">是否已读</th>
+        				<th nzWidth="20%">操作</th>
+        			</tr>
+        		</thead>
+        		<tbody>
+        			<tr *ngFor="let data of ysData">
+								<td>{{data.content}}</td>
+        				<td>{{ data.time}}</td>
+								<td>{{ data.takePart}}</td>
+								<td>{{ data.specimenNum}}</td>
+        				<td>
+        				  <div class="coop">
+        				    <span>查看消息</span>
+										<span>标为已读</span>
+        				  </div>
+        				</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>

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

@@ -1197,3 +1197,210 @@ nz-header.ant-layout-header {
 	  font-size: 12px;
 	  color: @primary-color;
 	}
+
+.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/main/main.component.ts

@@ -120,7 +120,43 @@ export class MainComponent implements OnInit, OnDestroy {
 			// this.eventSubscription.unsubscribe();
 		// }
   }
-
+	
+	// 演示用
+	ysMessageMoadl:boolean = false;
+	ysData:any = [
+		{
+			content:'系统将于2025年8月11日 18:00 - 20:00进行升级，届时系统无法登录使用，请知悉。',
+			time:'2025-08-11 10:25:00',
+			takePart:'管理员',
+			specimenNum:'是'
+		},
+		{
+			content:'系统将于2025年8月13日 12:00 - 14:00进行系统维护，届时系统无法登录使用，请知悉。',
+			time:'2025-08-13 09:20:00',
+			takePart:'管理员',
+			specimenNum:'否'
+		},
+		{
+			content:'根据电梯维保计划，维保单位将于2025年8月15日对院区电梯进行维护保养，保养期间需逐栋停梯。',
+			time:'2025-08-15 12:00:00',
+			takePart:'管理员',
+			specimenNum:'否'
+		},
+		{
+			content:'为了广大住户的健康，给您提供干净的生活用水，根据服务中心供水水箱年度清洗计划，将于2025年8月18日9:00-18:00对生活水箱进行清洗，一期二期的所有楼栋二楼及以上楼层将会暂时停水，请您提前做好蓄水准备',
+			time:'2025-08-18 11:00:00',
+			takePart:'管理员',
+			specimenNum:'是'
+		},
+	]
+	toMessage(){
+		this.ysMessageMoadl = true
+	}
+	
+	hideModal(){
+		this.ysMessageMoadl = false
+	}
+	
   // 菜单图标名称是否包含transport-
   isTransportIcon(icon:any) {
     if(icon){

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

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

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

@@ -0,0 +1,204 @@
+<div class="list-template">
+  <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" *ngIf="coopBtns.strideLook">
+				  <span class="label">维修科室</span>：
+				  <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch
+				     nzAllowClear nzPlaceHolder="请选择维修科室" [(ngModel)]="maintainDepartment">
+				    <ng-container *ngFor="let option of maintainDept">
+				      <nz-option [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
+				    </ng-container>
+				  </nz-select>
+				</div>
+
+        <div class="list-template__searchItem">
+          <span class="label">标题：</span>
+          <input nz-input class="formItem" [(ngModel)]="title" placeholder="请输入标题" nzSize="default" />
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">编号：</span>
+          <input nz-input class="formItem" [(ngModel)]="solutionNumber" placeholder="请输入编号" nzSize="default" />
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">创建人</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+            (nzOnSearch)="changeUser($event)" nzAllowClear nzPlaceHolder="请选择创建人" [(ngModel)]="createUserId">
+            <ng-container *ngFor="let option of createUserList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
+      </div>
+      <div nz-col nzLg="6" class="list-template__btns">
+        <button class="btn default" (click)='search()'>搜索</button>
+        <button class="btn default ml8" (click)='reset()'>重置</button>
+				<button *ngIf="coopBtns.add" class="btn default ml8" (click)='addForm()'>新增</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="5%">序号</th>
+						<th nzWidth="10%">知识库编号</th>
+            <th nzWidth="25%">标题</th>
+            <th nzWidth="15%">版本号 | 分类</th>
+            <th nzWidth="15%">日期</th>
+						<th nzWidth="10%">状态</th>
+            <th nzWidth="20%">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData let index=index;" (click)="selectedListData(data.id)">
+            <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
+						<td>{{ data.solutionNumber }}</td>
+						<td>{{ data.title }}</td>
+						<td>
+							<div>V{{ data.versionNumber }}</div>
+							<div>{{ data.type ? data.type.name : '-' }}</div>
+						</td>
+						<td>
+							{{ data.createTime|date:'yyyy-MM-dd HH:mm' }}
+						</td>
+						<td>{{ data.status ? data.status.name : '-' }}</td>
+            <td>
+              <div class="coop">
+								<span *ngIf="coopBtns.edit && (data.status.name=='暂存' || data.status.name=='待整改')" (click)="edit($event,data)">编辑</span>
+								<span *ngIf="coopBtns.look" (click)="look($event,data)">查看</span>
+								<span *ngIf="coopBtns.upgrade && data.status.name=='已发布'" (click)="upgrade($event,data)">升级</span>
+								<span *ngIf="coopBtns.audit && data.status.name=='待审核'" (click)="audit($event,data)">审核</span>
+								<span *ngIf="coopBtns.pause && data.status.name=='已发布'" (click)="pause($event,data)">停用</span>
+								<span *ngIf="coopBtns.renew && data.status.name=='已停用'" (click)="renew($event,data)">恢复</span>
+								<span *ngIf="coopBtns.del" (click)="showDelModal($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 class="save add display_flex align-items_center justify-content_flex-center" *ngIf="modal">
+    <div class="modalBody">
+      <div class="title">{{optType=='audit'?'审核':'查看'}}</div>
+      <!-- <overlay-scrollbars #osComponentRef1 class="content"> -->
+       <div class="view-box">
+				 <div class="view-item left-box">
+					 <div class="item-left-list"
+					 [ngClass]="{'activeClass': index == vIndex}"
+					 *ngFor="let item of detailData let index=index;" (click)="versionsClick(item, index)">V{{item.versionNumber}}</div>
+				 </div>
+				 <div class="view-item center-box" *ngIf="lookData&&lookData.title">
+					 <div class="title">{{lookData.title}}</div>
+					 <div class="title-sign">
+						 <div class="width-180">知识分类：{{lookData.type.name}}</div>
+						 <div>报修可见：{{lookData.repairVisible=='1'?'是':'否'}}</div>
+						 <div>版本号：V{{lookData.versionNumber || ''}}</div>
+					 </div>
+					 <div class="title-sign">
+						 <div class="width-180" *ngIf="lookData.type.name=='故障现象'">关联故障：{{lookData.incidentCategory?lookData.incidentCategory.mutiCategory: ''}}</div>
+						 <div class="width-180" *ngIf="lookData.type.name=='日常巡检'">关联巡检：{{lookData.inspectionForm?lookData.inspectionForm.name: ''}}</div>
+						 <div>关联产品：{{lookData.assetProduct?lookData.assetProduct.name:''}}</div>
+					 </div>
+					 <div class="content-class" *ngIf="richText" [innerHTML]="richText"></div>
+					 <div class="file-box" *ngIf="fileData.length>0">
+						 <div>附件列表：</div>
+						 <div>
+							 <div class="file-class" *ngFor="let item of fileData" (click)="fileClick(item)">
+								 {{item.name}}
+								<span nz-icon nzType="download" nzTheme="outline" class="download-icon"></span>
+							 </div>
+						 </div>
+					 </div>
+				 </div>
+				 <div class="view-item right-box" *ngIf="solutionLogs">
+					 <nz-steps [nzCurrent]="stepLength" nzDirection="vertical" nzSize="small">
+						<ng-container *ngFor="let item of solutionLogs; let index = index">
+						    <nz-step
+						      [nzDescription]="tpl"
+						    >
+						    </nz-step>
+						    <ng-template #tpl>
+									<div *ngIf="index==solutionLogs.length-1" class="step-size">
+										<div>
+											<span style="color: #49B856;">{{item.operationStatus.name}}</span>
+											&nbsp;&nbsp;&nbsp;
+											<span style="color:#333;">{{item.operationUser.name}}</span>
+										</div>
+										<div style="color:#333;">{{ item.time }}</div>
+										<div class="back-class" nz-tooltip [nzTooltipTitle]="item.rejectedReason" *ngIf="item.operationStatus.name=='审核驳回'">(驳回原因)</div>
+									</div>
+									<div *ngIf="index!=solutionLogs.length-1" class="step-size">
+										<div>
+											<span>{{item.operationStatus.name}}</span>
+											&nbsp;&nbsp;&nbsp;
+											<span>{{item.operationUser.name}}</span>
+										</div>
+										<div>{{ item.time }}</div>
+										<div class="back-class" nz-tooltip [nzTooltipTitle]="item.rejectedReason" *ngIf="item.operationStatus.name=='审核驳回'">(驳回原因)</div>
+									</div>
+						    </ng-template>
+						  </ng-container>
+					 </nz-steps>
+				 </div>
+			 </div>
+      <!-- </overlay-scrollbars> -->
+      <div class="display_flex justify-content_flex-center">
+        <button class="btn" *ngIf="optType=='audit' && vIndex==0" nz-button nzType="primary" (click)="submitForm(1)" [nzLoading]="btnLoading1">通过</button>
+				<button class="btn" *ngIf="optType=='audit' && vIndex==0" nz-button nzType="primary" (click)="submitForm(2)" [nzLoading]="btnLoading2">驳回</button>
+				<button class="btn cancel" *ngIf="optType=='audit'" nz-button nzType="default" (click)="hideModal()">取消</button>
+				<button class="btn" *ngIf="optType=='look'" nz-button nzType="primary" (click)="hideModal()">知道了</button>
+
+			</div>
+			<div class="mask-style" *ngIf="isSpinning">
+				<nz-spin nzSimple class="spin-style"></nz-spin>
+			</div>
+    </div>
+  </div>
+  <!-- 删除模态框 -->
+  <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+    (confirmDelEvent)="confirmDel()" content="您确认要删除此知识库吗？"></app-dialog-delete>
+
+	<!-- 停用模态框 -->
+	<app-dialog-delete [delModal]="pauseModal" (hideDelModalEvent)="hideDelModal2()" [btnLoading]="btnLoading"
+	  (confirmDelEvent)="confirmDel2()" content="您确认要停用此知识库吗？"></app-dialog-delete>
+
+	<!-- 恢复模态框 -->
+	<app-dialog-delete [delModal]="renewModal" (hideDelModalEvent)="hideDelModal3()" [btnLoading]="btnLoading"
+		(confirmDelEvent)="confirmDel3()" content="您确认要恢复此知识库吗？"></app-dialog-delete>
+
+	<!-- 审核通过模态框 -->
+	<app-dialog-delete [delModal]="auditModal" (hideDelModalEvent)="hideDelModal4()" [btnLoading]="btnLoading"
+		(confirmDelEvent)="confirmDel4()" content="您确认通过此知识库的审核吗？"></app-dialog-delete>
+
+	<!-- 审核驳回模态框 -->
+	<nz-modal [(nzVisible)]="rejectModal" nzTitle="您确认驳回此知识库吗？" (nzOnCancel)="rejectCancel()" (nzOnOk)="rejectOk()">
+		<textarea
+			nz-input
+			[(ngModel)]="rejectData"
+			placeholder="请输入整改意见"
+			[nzAutosize]="{ minRows: 2, maxRows: 6 }"
+
+		></textarea>
+	</nz-modal>
+
+  <!-- 编辑模态框 -->
+  <app-dialog-delete [delModal]="editModal" (hideDelModalEvent)="hideDelModal1()" [btnLoading]="saveLoading"
+    (confirmDelEvent)="confirmDel1()" [content]="'保存后会重置您的发药科室的药品信息，您确认吗？'"></app-dialog-delete>
+
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo" (closeModel)="closeModel()"></app-prompt-modal>
+

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

@@ -0,0 +1,343 @@
+@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: 70%;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+			margin-bottom: 10px;
+      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: 70%;
+      height: auto;
+				.mask-style{
+					width: 100%;
+					height: 100%;
+					position: fixed;
+					top: 0;
+					left: 0;
+					z-index: 999;
+					display: flex;
+					background: rgba(0,0,0,0.2);
+					align-items: center;
+					justify-content: center;
+				}
+				.spin-style{
+					z-index:9999;
+				}
+			.view-box{
+				height: 400px;
+				display: flex;
+				border: 1px solid #eee;
+				.left-box{
+					flex: 1;
+					font-size: 14px;
+					border-right: 1px solid #E9E9E9;
+					overflow-y: auto;
+					.item-left-list{
+						display: flex;
+						align-items: center;
+						height: 35px;
+						padding-left: 10px;
+						cursor: pointer;
+					}
+				}
+				.center-box{
+					flex: 6;
+					padding: 0 20px 20px 20px;
+					border-right: 1px solid #E9E9E9;
+					height: auto;
+					overflow-y: auto;
+					.title{
+						margin: 10px 0 10px 0;
+						font-weight: bold;
+						font-size: 20px;
+						color: #000000;
+						font-style: normal;
+						text-transform: none;
+					}
+					.title-sign{
+						display: flex;
+						font-weight: 400;
+						font-size: 12px;
+						color: #555555;
+						margin-bottom: 5px;
+						.width-180{
+							width: 160px;
+						}
+						div{
+							margin-right: 60px;
+						}
+					}
+					.content-class{
+						margin-top: 20px;
+					}
+					.file-box{
+						margin-top: 30px;
+						font-size: 14px;
+						.file-class{
+							color: #1890FF;
+							text-decoration: underline;
+							margin-left: 10px;
+							cursor: pointer;
+						}
+						.download-icon{
+							margin-left: 8px;
+						}
+					}
+				}
+				.right-box{
+					flex: 1.6;
+					padding: 10px;
+					font-size: 14px;
+					overflow-y: auto;
+					.back-class{
+						color: red;
+						cursor: pointer;
+					}
+				}
+			}
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+				
+				.ant-select{
+					width: 100%;
+				}
+				.ant-calendar-picker{
+					width: 100% !important;
+				}
+				.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;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+.activeClass{
+	background: #F0F6ED;
+}
+
+.monad{
+	margin-top: 20px;
+	.monad-list{
+		border: 1px solid #e7e7e7;
+		border-radius: 5px;
+		margin-bottom: 40px;
+		padding: 20px;
+	}
+	.monad-title{
+		text-align: center;
+		font-weight: 700;
+		font-size: 16px;
+	}
+	.monad-sign{
+		display: flex;
+		line-height: 30px;
+		div{
+			margin-right: 15px;
+		}
+	}
+}

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

@@ -0,0 +1,578 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { DomSanitizer } from '@angular/platform-browser';
+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, subDays} 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-repository",
+  templateUrl: "./personage-repository.component.html",
+  styleUrls: ["./personage-repository.component.less"],
+})
+export class PersonageRepositoryComponent 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,
+		private sanitizer: DomSanitizer
+  ) {}
+  searchTimerSubject = new Subject();
+  ngOnInit() {
+    this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
+
+    });
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1], v[2]);
+    });
+		this.hosId = this.tool.getCurrentHospital().id;
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+		this.maintainDept = this.tool.getUserInfoPermission().dutyList
+		if(this.coopBtns.strideLook){
+			this.defaDept()
+		}
+		this.getList();
+    this.getUsers();
+  }
+  createUserList: any = []; //创建人列表
+	maintainDept:any = []; //维修科室
+	maintainDepartment:any;
+	hosIds:any; //当前院区
+	richText:any;
+  listOfData: any[] = []; //表格数据
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopId: number; //表格中执行操作的id
+  department: number; //所属科室
+	hosId: number;
+	loadAllConsumeDept: boolean = true;//是否加载所有消耗科室
+  solutionNumber; //编号
+  createUserId; //创建人
+	title; //标题
+  num; //编码
+  deptalias; //别名
+  type; //类型
+  deptHandoverType; //类型
+	vIndex:number = 0;//版本号下标
+	stepLength: number = 0; //步骤条
+  pageIndex: number = 1; //页码
+  listLength: number = 10; //总条数
+  pageSize: number = 10; //每页条数
+  btnLoading: boolean = false; //确认按钮loading状态
+	btnLoading1: boolean = false; //审核通过按钮loading状态
+	btnLoading2: boolean = false; //审核驳回按钮loading状态
+  printLoading: boolean = false; //批量打印按钮loading状态
+  deptPhones: any = []; //新添加的科室电话列表
+  isAddDeptsPhone = true; //添加新的科室电话是否禁用
+  deptsPhoneId = 1; //科室电话自增id
+  allParentdepart: any = []; //所有的父级科室列表
+  hospitals1: any = []; //科室列表(搜索)
+	rowData: object = {}; //打印选择列表
+	editModal:boolean = false; //编辑时弹框
+	isSpinning: boolean = false; //页面loading状态
+	detailData:any;
+	solutionLogs:any;
+	lookData:any;
+	versionsData: any = []; //审核版本数据
+	fileData: any = []; //上传的附件数据
+  searchParentDeptSubject = new Subject();
+  // 初始化增删改按钮
+  coopBtns: any = {};
+	saveLoading:boolean = false;
+	taskTypeData:{id:''};
+	rejectModal:boolean = false;
+	rejectData:null;
+	optType:string = '';
+  // 导入---end
+  //搜索父级科室
+	isDeptLoading = false;
+  changeInp(e) {
+    this.searchParentDeptSubject.next(e);
+  }
+  // 配送建单
+  coopData:any = {};
+  addDateModal(data) {
+    this.coopData = data;
+    this.showDelModal1();
+  }
+
+	// 默认科室
+	defaDept(){
+		let itemDept = this.maintainDept.find(i=>i.id == this.hosId)
+		if(itemDept){
+			this.maintainDepartment = itemDept.id
+		}
+	}
+
+  showDelModal1() {
+    this.editModal = true;
+  }
+  hideDelModal1() {
+    this.editModal = false;
+  }
+
+  // 编辑保存
+  confirmDel1() {
+    var that = this;
+		for (const i in that.validateForm.controls) {
+		  that.validateForm.controls[i].markAsDirty();
+		  that.validateForm.controls[i].updateValueAndValidity();
+		}
+		if (that.validateForm.invalid) return;
+    let data: any = {
+			hosId:this.hosId,
+			pharmacy:this.validateForm.value.department,
+			id:that.coopId,
+			loadAllConsumeDept:this.validateForm.value.loadAllConsumeDept?1:0
+    };
+		that.saveLoading = true;
+		that.mainService
+		  .simplePost("addData", "drugsBatch", data)
+		  .subscribe((data) => {
+		    that.saveLoading = false;
+		    that.hideModal();
+		    if (data.status == 200) {
+					this.editModal = false;
+		      that.showPromptModal("编辑", true, "");
+		    } else {
+		      that.showPromptModal("编辑", false, data.msg);
+		    }
+		  });
+  }
+
+  // 搜索
+  search() {
+    this.pageIndex = 1;
+    this.getList();
+  }
+  // 重置
+  reset() {
+    this.pageIndex = 1;
+		this.solutionNumber = null;
+		this.title = null;
+    this.createUserId = undefined;
+		if(this.coopBtns.strideLook){
+			this.defaDept()
+		}
+    this.getList();
+  }
+  // 表格数据
+  loading1 = false;
+  getList() {
+    var that = this;
+    let data = {
+      idx: that.pageIndex - 1,
+      sum: that.pageSize,
+      solution: {
+    		title:this.title,
+				solutionNumber:this.solutionNumber,
+        createUserId: this.createUserId || undefined,
+    		hosId: this.hosId,
+      },
+    };
+		if(this.maintainDepartment){
+			data.solution.hosId = this.maintainDepartment;
+		}
+    this.loading1 = true;
+    that.mainService
+      .getFetchDataList("data", "solution", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        that.listOfData = data.list;
+        that.listLength = data.totalNum;
+      });
+  }
+
+	// 版本号点击
+	versionsClick(data, index){
+		this.vIndex = index
+		this.lookData = data
+		let content = data.content
+		if(content){
+			this.richText = this.sanitizer.bypassSecurityTrustHtml(content);
+		}else{
+			this.richText = ''
+		}
+	}
+
+	// 点击附件
+	fileClick(data){
+		console.log(222,data)
+		let a: any = document.createElement('a') // 创建一个元素
+		a.style = 'display: none' // 不能在页面中被看到，把他隐藏起来
+		a.style.height = '0px' // 给个0高度，避免影响页面布局
+		a.download = data.name;
+		a.href = data.url // 文件url地址
+		document.body.appendChild(a)  //  将其绑定在body上才能发挥作用
+		a.click() // 触发a标签的click事件
+		document.body.removeChild(a) // 删除该元素
+	}
+
+  hideModal() {
+    this.modal = false;
+  }
+
+	// 审核通过
+	confirmDel4() {
+		let data: any = {
+			id:this.rowId,
+			operationType: 'approve'
+		};
+		this.btnLoading1 = true;
+		this.mainService
+			.simplePost("updData", "solution", data)
+			.subscribe((data) => {
+				this.btnLoading1 = false;
+				this.hideDelModal4()
+				if (data.status == 200) {
+					this.showPromptModal("审核", true, "");
+				} else {
+					this.showPromptModal("审核", false, data.msg);
+				}
+			});
+	}
+
+	hideDelModal4() {
+	  this.auditModal = false;
+	}
+
+	// 审核驳回
+	rejectCancel(){
+		this.rejectModal = false
+	}
+
+	// 审核驳回
+	rejectOk(){
+		if(this.rejectData==null){
+			this.message.error('请输入整改意见')
+			return
+		}
+		let data: any = {
+			id:this.rowId,
+			operationType: 'approve',
+			rejectReason:this.rejectData
+		};
+		this.btnLoading2 = true;
+		this.mainService
+			.simplePost("updData", "solution", data)
+			.subscribe((data) => {
+				this.btnLoading2 = false;
+				this.rejectCancel()
+				if (data.status == 200) {
+					this.showPromptModal("驳回", true, "");
+				} else {
+					this.showPromptModal("驳回", false, data.msg);
+				}
+			});
+	}
+
+	closeModel(){
+		this.hideModal()
+	}
+
+  // 表单提交
+	auditModal = false;
+  submitForm(type): void {
+    var that = this;
+		if(type==1){
+			this.auditModal = true
+		}else{
+			this.rejectData = null
+			this.rejectModal = true
+		}
+  }
+
+	// 升级
+	upgrade(e, data){
+		e.stopPropagation();
+		this.router.navigateByUrl(`/repositoryManageAdd/${data.id}?type=upgrade`);
+	}
+
+	// 新增
+	addForm(){
+		this.router.navigateByUrl(`/repositoryManageAdd/0?type=personage`);
+	}
+
+	// 查看
+	look(e, data){
+		e.stopPropagation();
+		this.optType = 'look'
+		this.rowId = data.id
+		this.vIndex = 0
+		this.modal = true
+		var that = this;
+		let query = {
+			idx: 0,
+			sum: 9999,
+			solution: {
+				hosId: this.hosId,
+				operationType:'lookOver',
+				solutionNumber:data.solutionNumber
+			}
+		};
+		this.isSpinning = true
+		that.mainService
+			.getFetchDataList("data", "solution", query)
+			.subscribe((res) => {
+				this.getFile()
+				let data = res.list
+				this.detailData = data
+				let content = data[0].content
+				if(content){
+					this.richText = this.sanitizer.bypassSecurityTrustHtml(content);
+				}else{
+					this.richText = ''
+				}
+				for(let i of data){
+					if(i.solutionLogs.length>0){
+						for(let t of i.solutionLogs){
+							t.time = format(t.operationTime, 'yyyy-MM-dd HH:mm')
+						}
+					}
+				}
+				this.lookData = data[0]
+				this.solutionLogs = data[0].solutionLogs
+				this.stepLength = this.solutionLogs.length
+				this.isSpinning = false
+			});
+	}
+
+	getFile(){
+		this.mainService
+			.getPreviewImage('solution', this.rowId)
+			.subscribe((res:any)=> {
+				this.fileData = res.data.map((v) =>{
+					return{
+						name: v.name,
+						url: location.origin + '/file' + v.relativeFilePath
+					}
+				});
+			});
+	}
+
+	// 审核
+	rowId=null;
+	audit(e, data){
+		e.stopPropagation();
+		this.rowId = data.id
+		this.vIndex = 0
+		this.optType = 'audit'
+		this.modal = true
+		var that = this;
+		let query = {
+			idx: 0,
+			sum: 9999,
+			solution: {
+				hosId: this.hosId,
+				operationType:'lookOver',
+				solutionNumber:data.solutionNumber
+			}
+		};
+		this.isSpinning = true
+		that.mainService
+			.getFetchDataList("data", "solution", query)
+			.subscribe((res) => {
+				this.getFile()
+				let data = res.list
+				this.detailData = data
+				this.richText = this.sanitizer.bypassSecurityTrustHtml(data[0].content);
+				for(let i of data[0].solutionLogs){
+					i.time = format(i.operationTime, 'yyyy-MM-dd HH:mm')
+				}
+				this.lookData = data[0]
+				this.solutionLogs = data[0].solutionLogs
+				this.stepLength = this.solutionLogs.length
+				this.isSpinning = false
+			});
+
+	}
+
+	// 编辑
+	edit(e, data) {
+	  e.stopPropagation();
+	  this.router.navigateByUrl(`/repositoryManageAdd/${data.id}?type=edit`);
+	}
+
+	// 停用
+	pauseModal = false;
+	pause(e, data){
+		e.stopPropagation();
+		this.pauseModal = true;
+		this.coopId = data.id;
+	}
+
+	// 确认停用
+	confirmDel2() {
+	  var that = this;
+	  that.btnLoading = true;
+		let data: any = {
+			id:this.coopId,
+			operationType: 'deactivate'
+		};
+		this.mainService
+			.simplePost("updData", "solution", data)
+			.subscribe((data) => {
+				that.btnLoading = false;
+				that.pauseModal = false;
+				if (data.status == 200) {
+					this.showPromptModal("停用", true, "");
+				} else {
+					this.showPromptModal("停用", false, data.msg);
+				}
+			});
+	}
+
+	hideDelModal2() {
+	  this.pauseModal = false;
+	}
+
+
+	// 恢复
+	renewModal = false;
+	renew(e, data){
+		e.stopPropagation();
+		this.renewModal = true;
+		this.coopId = data.id;
+	}
+
+	// 确认恢复
+	confirmDel3() {
+	  var that = this;
+		that.btnLoading = true;
+		let data: any = {
+			id:this.coopId,
+			operationType: 'recover'
+		};
+		this.mainService
+			.simplePost("updData", "solution", data)
+			.subscribe((data) => {
+				that.btnLoading = false;
+				that.renewModal = false;
+				if (data.status == 200) {
+					this.showPromptModal("恢复", true, "");
+				} else {
+					this.showPromptModal("恢复", false, data.msg);
+				}
+			});
+	}
+
+	hideDelModal3() {
+	  this.renewModal = false;
+	}
+
+
+  // 展示信息提示框（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 id
+   */
+  showDelModal(e, id) {
+    e.stopPropagation();
+    this.delModal = true;
+    this.coopId = id;
+  }
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    var that = this;
+    that.btnLoading = true;
+    that.mainService
+      .coopTypeConfig(
+        "rmvData",
+        "solution",
+         [that.coopId]
+      )
+      .subscribe((data) => {
+        that.btnLoading = false;
+        that.delModal = false;
+        if (data.status==200) {
+          that.showPromptModal("删除", true, "");
+        } else {
+          that.showPromptModal("删除", false, data.data[0].msg);
+        }
+      });
+  }
+
+  detail(e, data) {
+    e.stopPropagation();
+		this.router.navigateByUrl(`/dispensingDetail/${data.id}`);
+  }
+
+  // 人员边输边搜节流阀
+  changeUser(e) {
+    this.searchTimer(this.getUsers, e);
+  }
+
+  // 边输入边搜索节流阀
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  // 获取创建人
+  isLoading:boolean = false;
+  getUsers(e?) {
+    let postData = {
+      user: {
+        name: e,
+        hospital: { id: this.hosId },
+        simpleQuery: true,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "user", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.createUserList = data.list;
+      });
+  }
+
+}

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

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

src/app/views/repository-manage-add/repository-manage-add.component.html

@@ -46,6 +46,17 @@
 					</nz-form-control>
 				</nz-form-item>
 				
+				<nz-form-item class="form-item" *ngIf="optType=='personage'">
+				  <nz-form-label nzRequired nzFor="scopes" [nzSm]="6" [nzXs]="24">可见范围</nz-form-label>
+					<nz-form-control nzErrorTip="请选择!" [nzSm]="16" [nzXs]="24">
+						<nz-radio-group formControlName="scopes">
+						  <label nz-radio nzValue="1">个人知识</label>
+						  <label nz-radio nzValue="2">部门知识</label>
+							<label nz-radio nzValue="3">公开知识</label>
+						</nz-radio-group>
+					</nz-form-control>
+				</nz-form-item>
+				
 				<nz-form-item class="form-item" *ngIf="classItem==2">
 				  <nz-form-label nzRequired nzFor="polling" [nzSm]="6" [nzXs]="24">关联巡检表</nz-form-label>
 				  <nz-form-control nzErrorTip="请选择关联巡检表!" [nzSm]="16" [nzXs]="24">

src/app/views/repository-manage-add/repository-manage-add.component.ts

@@ -425,7 +425,11 @@ export class RepositoryManageAddComponent implements OnInit {
   }
 	// 返回
 	back(){
-		this.router.navigateByUrl(`/main/repositoryManage`);
+		if(this.optType == 'personage'){
+			this.router.navigateByUrl(`/main/personageRepository`);
+		}else{
+			this.router.navigateByUrl(`/main/repositoryManage`);
+		}
 	}
 
   hideModal() {
@@ -443,7 +447,16 @@ export class RepositoryManageAddComponent implements OnInit {
 			knowledgeClass: [null, [Validators.required]],
 			polling: [null,],
 			malfunction:[null,],
+			scopes:[null, [Validators.required]]
 		});
+		if(this.optType=='personage'){
+			this.validateForm.addControl(
+				'scopes',
+				new FormControl(null, Validators.required)
+			);
+		}else{
+			this.validateForm.removeControl('scopes')
+		}
   }
 
 	beforeUpload = (file: UploadFile) => {

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

@@ -167,13 +167,13 @@
             <th>科室信息</th>
             <th nzWidth="7%">患者信息</th>
             <th>标本信息</th>
-            <th>采集信息</th>
-						<th>核收信息</th>
             <th nzWidth="8%">标本类型</th>
             <th nzWidth="7%">状态</th>
+						<th>采集信息</th>
             <th nzShowSort nzSortKey="arrive_time" [(nzSort)]="sortCurrent.arrive_time">收取信息</th>
             <th nzWidth="8%">中转时间</th>
             <th>送达信息</th>
+						<th>核收信息</th>
             <th nzWidth="12%">操作</th>
           </tr>
         </thead>
@@ -194,17 +194,13 @@
 							<div><span *ngIf="data.urgent == 1" class="red">急&nbsp;</span>{{ data.scode }}</div>
 							<div>{{ data.specimenDesc || "-" }}</div>
 						</td>
-						<td>
-							<div>{{ data.collectNurseName || "-" }}</div>
-							<div>{{ data.printDate || "-" }}</div>
-						</td>
-						<td> 
-							<div>{{ data.checkCollectUserDTO ? data.checkCollectUserDTO.name : "" }}</div>
-							<div>{{ data.checkCollectTime|date:'yyyy-MM-dd HH:mm:ss' || "" }}</div>
-						</td>
             <td>{{ data.stype ? data.stype.name : "-" }}<span *ngIf="data.tubeType">,</span>{{data.tubeType && data.tubeType.name}}</td>
             <td>{{ data.speState ? data.speState.name : "-" }}</td>
-            <td>
+					 <td>
+					 	<div>{{ data.collectNurseName || "-" }}</div>
+					 	<div>{{ data.printDate || "-" }}</div>
+					 </td>
+						<td>
 							<div>{{ data.receiverName }}<ng-container *ngIf="data.packageId">-<span class="underline" (click)="viewSpe(data.packageId)">包</span></ng-container></div>
 							<div>{{ data.arriveTime || "-" }}</div>
 						</td>
@@ -213,6 +209,10 @@
 							<div>{{ data.delivererName || "-" }}</div>
 							<div>{{ data.sendTime || '-' }}</div>
 						</td>
+						<td>
+							<div>{{ data.checkCollectUserDTO ? data.checkCollectUserDTO.name : "" }}</div>
+							<div>{{ data.checkCollectTime|date:'yyyy-MM-dd HH:mm:ss' || "" }}</div>
+						</td>
             <td>
 							<!-- <button (click)="viewSpecimenHistory(data)">查看</button> -->
 							<div class="coop">