白求恩标本优化

src/app/services/main.service.ts

@@ -1284,4 +1284,9 @@ export class MainService {
 	getLoginCode(data){
 		return this.http.get(host.host + "/auth/captcha", {});
 	}
+	
+	// 根据包号查看标本
+	getInfoPack(packageId, data){
+		return this.http.post(host.host + `/nurse/specimen/getInfo/${packageId}`, data);
+	}
 }

src/app/share/share.module.ts

@@ -74,6 +74,7 @@ import { InspectLogPromptModalComponent } from './inspect-log-prompt-modal/inspe
 import { UploadFileComponent } from './upload-file/upload-file.component';
 import { AddInspectTwoModalComponent } from './add-inspect-two-modal/add-inspect-two-modal.component';
 import { AddInspectThreeModalComponent } from './add-inspect-three-modal/add-inspect-three-modal.component';
+import { ViewSpecimenComponent } from './view-specimen/view-specimen.component';
 
 @NgModule({
   declarations: [
@@ -144,6 +145,7 @@ import { AddInspectThreeModalComponent } from './add-inspect-three-modal/add-ins
     AddInspectModalComponent,
     AddInspectTwoModalComponent,
     AddInspectThreeModalComponent,
+		ViewSpecimenComponent,
     SelectDateYytimeComponent,
     PackageSpecimenRuleComponent,
     SpecimenPackageListModalComponent,
@@ -229,6 +231,7 @@ import { AddInspectThreeModalComponent } from './add-inspect-three-modal/add-ins
     AddInspectModalComponent,
     AddInspectTwoModalComponent,
     AddInspectThreeModalComponent,
+		ViewSpecimenComponent,
     SelectDateYytimeComponent,
     PackageSpecimenRuleComponent,
     SpecimenPackageListModalComponent,

src/app/share/specimen-package-list-modal/specimen-package-list-modal.component.html

@@ -34,7 +34,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of packageList;let i = index;">
-            <td>{{ data.packCode }}</td>
+            <td class="underline" (click)="viewSpe(data)">{{ data.packCode }}</td>
             <td>{{ data.packUserDTO?.name }}</td>
             <td>{{ data.packTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td>{{ data.specimenNum }}</td>
@@ -112,4 +112,8 @@
     </div>
   </div>
 </div>
+
+<!-- 查看标本 -->
+<app-view-specimen *ngIf="showModal" [speId]="speId" (closeModelHs)="closeModel($event)"></app-view-specimen>
+
 <button ngxPrint printSectionId="print-section-package" #printBtnPackage hidden [printStyle]="{ '@page': { margin: '0 !important' }, 'body': { margin: '0 !important' } }">打印</button>

src/app/share/specimen-package-list-modal/specimen-package-list-modal.component.less

@@ -173,7 +173,12 @@
           }
         }
       }
-
+			
+			.underline{
+				text-decoration: underline;
+				cursor: pointer;
+			}
+			
       div {
         text-align: center;
         margin: 0;

src/app/share/specimen-package-list-modal/specimen-package-list-modal.component.ts

@@ -50,7 +50,20 @@ export class SpecimenPackageListModalComponent implements OnInit {
   getList(){
     this.getSpecimenPackageList();
   }
-
+	
+	// 关闭弹窗
+	closeModel(e){
+		this.showModal = false;
+	}
+	
+	// 查看标本
+	speId:any;
+	showModal:boolean = false;
+	viewSpe(data){
+		this.speId = data.id;
+		this.showModal = true;
+	}
+	
   // 获取状态
   specimentPackageTypeList: any[] = [];
   getStatusList() {

src/app/share/view-specimen/view-specimen.component.html

@@ -0,0 +1,104 @@
+<div
+  class="modal display_flex justify-content_flex-center align-items_center"
+>
+  <div class="modalBody" style="width: 1200px;">
+    <div class="title">
+      标本查看<i
+        class="icon_transport transport-guanbi"
+        (click)="hideModal()"
+      ></i>
+    </div>
+		<div class="list-template">
+		  <div class="list-template__content">
+				<div class="list-template__top" nz-row>
+				  <div nz-col nzXl='18' class="list-template__searchBox">
+				    <div class="list-template__searchItem">
+				      <span class="label">患者</span>：
+				      <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [(ngModel)]="userId" nzShowSearch nzAllowClear nzPlaceHolder="请选择患者" (ngModelChange)="userChange($event)">
+				        <ng-container *ngFor="let data of userList">
+				          <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.patientNo">
+				          </nz-option>
+				        </ng-container>
+				      </nz-select>
+				    </div>
+				    <div class="list-template__searchItem">
+							<span class="label">试管类型</span>：
+							<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [(ngModel)]="tubeTypeId" nzShowSearch nzAllowClear nzPlaceHolder="请选择试管类型" (ngModelChange)="tubeChange($event)">
+							  <ng-container *ngFor="let data of tubeList">
+							    <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.tubeTypeId">
+							    </nz-option>
+							  </ng-container>
+							</nz-select>
+				    </div>
+				  </div>
+				  <div nz-col nzXl='6' class="list-template__btns">
+						<button nz-button class="btn default" (click)="reset()">重置</button>
+				  </div>
+				</div>
+		  </div>
+		</div>
+    <div class="content">
+      <nz-table
+        class="hospitalTable"
+        [nzData]="historySpecimenList"
+        nzSize="middle"
+        [nzShowPagination]="false"
+        [nzLoading]="hsLoading"
+				[nzScroll]="{ y: '500px' }"
+      >
+        <thead>
+          <tr class="thead">
+            <th nzWidth="16%">科室信息</th>
+            <th nzWidth="16%">患者信息</th>
+            <th nzWidth="16%">标本信息</th>
+            <th nzWidth="16%">采集信息</th>
+            <th nzWidth="16%">标本类型</th>
+						<th nzWidth="16%">状态</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of historySpecimenList; let i = index">
+            <td>
+							<div>{{ data.sickRoom?.dept }}</div>
+							<div>{{ data.checkDept?.dept }}</div>
+						</td>
+            <td>
+							<div>{{ data.residenceNo?data.residenceNo:data.patientNo }}</div>
+							<div>{{ data.patientName}} <span *ngIf="data.bedNum">({{data.bedNum}})</span></div>
+						</td>
+            <td>
+              <div>{{ data.scode }}</div>
+              <div>{{ data.specimenDesc}}</div>
+            </td>
+						<td>
+						  <div>{{ data.collectNurseName }}</div>
+						  <div>{{ data.printDate | date: "MM-dd HH:mm:ss"}}</div>
+						</td>
+            <td>
+              <div>{{ data.stype?.name }}</div>
+              <div>{{ data.tubeType?.name }}</div>
+            </td>
+						<td>
+						  {{ data.speState?.name }}
+						</td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="pagination">
+        <nz-pagination
+          [(nzPageIndex)]="historySpecimenPageIndex"
+          [(nzTotal)]="historySpecimenListLength"
+          [(nzPageSize)]="historySpecimenPageSize"
+          (nzPageIndexChange)="getHistorySpecimen()"
+          (nzPageSizeChange)="getHistorySpecimen()"
+        >
+        </nz-pagination>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button class="btn know" nz-button nzType="primary" (click)="hideModal()">
+        知道了
+      </button>
+    </div>
+  </div>
+</div>

src/app/share/view-specimen/view-specimen.component.less

@@ -0,0 +1,177 @@
+@import "../../../../src/theme.less";
+.modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+  .hospitalTable {
+    width: 100%;
+    td {
+      text-align: center !important;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
+  .modalBody {
+   min-height: 760px;
+   width: 700px;
+	 padding: 10px 20px;
+   background: #fff;
+   border-radius: 5px;
+   color: #333;
+   position: relative;
+   &.modalBody-search {
+     width: 480px;
+     min-height: 250px;
+   }
+
+    .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 {
+      min-height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      &.content-search {
+        min-height: 147px;
+        justify-content: start;
+        .defeat-search {
+          width: 100%;
+          height: 52px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          border-bottom: solid 1px #e5e9ed;
+          em {
+            color: #666;
+            font-style: normal;
+          }
+        }
+        .form {
+          width: 100%;
+          padding: 0 16px;
+          .ant-form-item-label,
+          .ant-form-explain {
+            text-align: left !important;
+          }
+        }
+      }
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.defeat {
+          color: #333;
+          font-size: 28px;
+        }
+        &.countDown {
+          font-size: 14px;
+          color: 666;
+          em {
+            font-style: normal;
+            color: @primary-color;
+          }
+        }
+				
+				&.pagination {
+				  font-size: 14px;
+				  color: #666;
+				  padding-top: 16px;
+				  padding-bottom: 16px;
+				  margin-left: auto;
+				  margin-right: 16px;
+				}
+				
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+          padding-bottom: 10px;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+		.know{
+			position: absolute;
+			bottom: 20px;
+		}
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

src/app/share/view-specimen/view-specimen.component.ts

@@ -0,0 +1,101 @@
+import { Component, OnInit, Input, Output, EventEmitter } from "@angular/core";
+import { MainService } from "../../services/main.service";
+import { ToolService } from "src/app/services/tool.service";
+import { Subject } from "rxjs";
+import { debounceTime } from "rxjs/operators";
+
+@Component({
+  selector: "app-view-specimen",
+  templateUrl: "./view-specimen.component.html",
+  styleUrls: ["./view-specimen.component.less"],
+})
+export class ViewSpecimenComponent implements OnInit {
+  hosId;
+  // 切换科室，切换弹窗
+  hsLoading = false;
+  historySpecimenList: any = [];
+  historySpecimenPageIndex: number = 1; //表格当前页码
+  historySpecimenPageSize: number = 10; //表格每页展示条数
+  historySpecimenListLength: number = 10; //表格总数据量
+	changeInpSubject = new Subject(); //防抖
+	userId:any = 0;
+	tubeTypeId:any = 0;
+	
+  @Input() speId: String;
+
+  @Output() closeModelHs = new EventEmitter<any>(); //1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(private mainService: MainService, private tool: ToolService) {}
+
+  ngOnInit() {
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.getHistorySpecimen();
+  }
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false })); //emits(向上弹射)事件
+  }
+	
+	// 重置
+	reset(){
+		this.userId = 0
+		this.tubeTypeId = 0
+		this.getHistorySpecimen(true)
+	}
+	
+	// 选择患者
+	userChange(e){
+		this.getHistorySpecimen(true)
+	}
+	
+	// 选择试管类型
+	tubeChange(e){
+		this.getHistorySpecimen(true)
+	}
+	
+  // 获取列表数据
+	userList:any = [];
+	tubeList:any = [];
+  getHistorySpecimen(idx?) {
+    if (idx) {
+      this.historySpecimenPageIndex = 1;
+    }
+    let postData = {
+      idx: this.historySpecimenPageIndex - 1,
+      sum: this.historySpecimenPageSize,
+			patientNo: this.userId!=0 ? this.userId : undefined,
+			tubeTypeId: this.tubeTypeId!=0 ? this.tubeTypeId: undefined
+    };
+    this.hsLoading = true;
+    this.mainService
+      .getInfoPack(this.speId, postData)
+      .subscribe((data:any) => {
+        this.hsLoading = false;
+        this.historySpecimenList = data.specimen || [];
+				data.patient.forEach(i=>{
+					if(i.bedNum){
+						i.name = i.patientName + '-' + i.bedNum + '-' + i.patientNo
+					}else{
+						i.name = i.patientName + '-' + i.patientNo
+					}
+				})
+				data.patient.unshift({
+					name: '全部',
+					patientName:'',
+					patientNo: 0,
+				})
+				this.userList = data.patient || [];
+				data.tubeType.forEach(i=>{
+					i.name = i.tubeTypeName +'('+ i.specimenNum +')'
+				})
+				data.tubeType.unshift({
+					name: '全部',
+					tubeTypeName: '',
+					specimenNum: '',
+					tubeTypeId: 0
+				})
+				this.tubeList = data.tubeType || [];
+        this.historySpecimenListLength = data.totalNum || 0;
+      });
+  }
+}

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

@@ -4,7 +4,8 @@
   </div>
   <input class="specimenCode" #specimenCodeElement nz-input placeholder="可扫描标本条码快速添加" [(ngModel)]="specimenCode" (input)="inputChange($event)" />
   <div class="display_flex align-items_center">
-    <button nz-button class="btn default" (click)="showDelModal({}, '您确认要重置标本吗，重置会先清空标本在根据规则自动清点？','重置标本','reset')">重置标本</button>
+		<button nz-button class="btn default" (click)="batchDel()">批量移除</button>
+    <button nz-button class="btn default ml8" (click)="showDelModal({}, '您确认要重置标本吗，重置会先清空标本在根据规则自动清点？','重置标本','reset')">重置标本</button>
     <button nz-button nzType="default" class="ml8" *ngIf="configs.spePackageAutoPack == 1" (click)='showPackageSpecimenRule()'>自动清点规则</button>
   </div>
 </div>
@@ -27,6 +28,8 @@
   <nz-table class="list-template__nzTable filter_table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1">
     <thead>
       <tr class="thead">
+				<th nzWidth="5%" nzShowCheckbox [(nzChecked)]="isAllDisplayDataChecked"
+				  (nzCheckedChange)="checkAll($event)"></th>
         <th nzWidth="11%">患者姓名</th>
         <th nzWidth="11%">住院号</th>
         <th nzWidth="11%">标本条码</th>
@@ -40,6 +43,7 @@
     </thead>
     <tbody>
       <tr *ngFor="let data of listOfData">
+				<td nzShowCheckbox [(nzChecked)]="mapOfCheckedId[data.id]" (nzCheckedChange)="refreshStatus()"></td>
         <td>{{ data.patientName }}<span *ngIf="data.bedNum">({{ data.bedNum }})</span></td>
         <td>{{ data.residenceNo }}</td>
         <td>{{ data.scode }}</td>
@@ -57,6 +61,10 @@
     </tbody>
   </nz-table>
 </div>
+<div class="bottom-content">
+	<span class="mal-50">包号：{{package.packCode}}</span>
+	<span>状态：{{package.status?.name}}</span>
+</div>
 <div class="footer display_flex align-items_center justify-content_flex-center">
   <button nzType="primary" class="btn" nz-button (click)='packageHandler()' *ngIf="this.total > 0 && package.status.value === '0'">打包</button>
   <button nzType="primary" class="btn" nz-button (click)='printPackage()' *ngIf="this.total > 0 && package.status.value === '1'">补打</button>

src/app/views/batch-specimen/batch-specimen.component.less

@@ -186,6 +186,13 @@
       }
     }
   }
+	.bottom-content{
+		padding-left: 200px;
+		background: #fff;
+		.mal-50{
+			margin-right: 50px;
+		}
+	}
   .footer{
     height: 60px;
     background-color: #fff;

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

@@ -116,7 +116,49 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
         }
       })
   }
-
+	
+	// 批量移除
+	infoContent:any;
+	batchDel(){
+		if(this.checkedDepIds.length==0){
+			this.message.error('请勾选标本列表')
+			return
+		}
+		this.confirmDelType = 'batchDel';
+		this.tipsMsg1 = `您确认要移除${this.checkedDepIds.length}项标本吗？`
+		this.delModal = true;
+	}
+	
+	// 选中表格中科室
+	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();
+	}
+	
   inspectActiveList: any = [];//选中检查列表
   patientActiveList: any = [];//选中患者列表
 
@@ -148,10 +190,10 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
   confirmDel(e) {
     console.log(e)
     this.btnLoading = true;
-    if (this.confirmDelType === "del") {
+    if (this.confirmDelType === "del" || this.confirmDelType ==='batchDel') {
       //删除-移除标本
       let postData = {
-        speIds: this.coopData.id.toString(),
+        speIds: this.confirmDelType === "del" ? this.coopData.id.toString() : this.checkedDepIds.toString(),
         packageId: this.package.id,
       }
 
@@ -161,9 +203,9 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
           this.btnLoading = false;
           this.delModal = false;
           if (data.state == 200) {
-            this.showPromptModal(this.tipsMsg2, true, "");
+            this.showPromptModal('移除', true, "");
           } else {
-            this.showPromptModal(this.tipsMsg2, false, data.msg);
+            this.showPromptModal('移除', false, data.msg);
           }
         });
     }else if (this.confirmDelType === "reset") {
@@ -204,6 +246,10 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
           }
         });
     }
+		if(this.listOfData.length){
+			this.listOfData.forEach(item => (this.mapOfCheckedId[item.id] = false));
+			this.refreshStatus();
+		}
   }
 
   // 打印
@@ -289,6 +335,12 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
         this.loading1 = false;
         if (data.status == 200) {
           this.listOfData = data.list;
+					// if(this.confirmDelType ==='batchDel'){
+					// 	this.listOfData.forEach(item => (this.mapOfCheckedId[item.id] = false));
+					// 	setTimeout(_=>{
+					// 		this.refreshStatus();
+					// 	})
+					// }
         }else{
           this.message.error(data.msg || "请求数据失败");
         }

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

@@ -2834,7 +2834,7 @@ export class FuwutaiComponent implements OnInit {
     this.applicationRequesterList = [];
     this.fileList = [];
     this.repairImgs = [];
-    this.isRelatedDepartment = true;
+    this.isRelatedDepartment = false;
     this.solutionId = undefined;
     delete this.incidentMsg.requesterPhone;
   }
@@ -2845,7 +2845,7 @@ export class FuwutaiComponent implements OnInit {
     if(this.incidentModel.repairIncidentType === 'public'){
       this.isRelatedDepartment = false;
     }else{
-      this.isRelatedDepartment = true;
+      this.isRelatedDepartment = false;
     }
   }
 	
@@ -3095,6 +3095,9 @@ export class FuwutaiComponent implements OnInit {
 		if(this.buildType !== '报修转事件'){
 			this.incidentModel.requester = null;
 		}
+		if(this.buildType == '编辑事件' && this.editOrder.requester){
+			this.incidentModel.requester = this.editOrder.requester.id;
+		}
     this.radioValueQt = null;
     this.startDeptQt = null;
     this.endDeptQt = null;
@@ -3582,7 +3585,7 @@ export class FuwutaiComponent implements OnInit {
   }
   // 申请人列表（搜索）
   applicationRequesterList:any[] = [];
-  isRelatedDepartment:boolean = true;
+  isRelatedDepartment:boolean = false;
   searchApplicationRequester(keyWord?) {
     // 关联查询，且没选择申请科室
     if(this.isRelatedDepartment && !this.incidentModel.department){
@@ -3611,48 +3614,70 @@ export class FuwutaiComponent implements OnInit {
       .subscribe((data) => {
         this.isLoading = false;
         if (data.status == 200) {
-          this.applicationRequesterList = data.list;
+					if(this.buildType == '编辑事件' && this.editOrder.requester){
+					  let item = data.list.find(i=> i.id == this.editOrder.requester.id)
+					  if(!item){
+					  	data.list.push({
+					  		name: this.editOrder.requester.name,
+					  		account: this.editOrder.requester.account,
+					  		id: this.editOrder.requester.id
+					  	})
+					  }
+						this.applicationRequesterList = data.list;
+					}else{
+						this.applicationRequesterList = data.list;
+					}
         }
       });
   }
   // 修改申请人
 	userPriorityDTO:any;
   changeApplyRequester(e){
-    let userObj = this.applicationRequesterList.find(v => v.id == e);
-		console.log('选中的申请人',userObj)
-    // 选择申请人回显申请人电话
-    if(userObj){
-      this.incidentMsg.requesterPhone = userObj.phone;
-    }
-		if(userObj && userObj.priorityDTO){
-			this.userPriorityDTO = userObj.priorityDTO
-		}else{
-			this.userPriorityDTO = null
-		}
-		let orders = [];
-		let id = [];
-		if(this.addressDTO&&this.addressDTO.id){
-			orders.push(this.addressDTO.orders)
-			id.push(this.addressDTO.id)
-		}
-		if(this.deptPriorityDTO&&this.deptPriorityDTO.id){
-			orders.push(this.deptPriorityDTO.orders)
-			id.push(this.deptPriorityDTO.id)
-		}
-		if(this.userPriorityDTO&&this.userPriorityDTO.id){
-			orders.push(this.userPriorityDTO.orders)
-			id.push(this.userPriorityDTO.id)
-		}
-		if(this.malPriorityDTO&&this.malPriorityDTO.id){
-			orders.push(this.malPriorityDTO.orders)
-			id.push(this.malPriorityDTO.id)
+		if(this.buildType !== '编辑事件'){
+			let userObj = this.applicationRequesterList.find(v => v.id == e);
+			console.log('选中的申请人',userObj)
+			// 选择申请人回显申请人电话
+			if(userObj){
+			  this.incidentMsg.requesterPhone = userObj.phone;
+			}
+			if(userObj && userObj.priorityDTO){
+				this.userPriorityDTO = userObj.priorityDTO
+			}else{
+				this.userPriorityDTO = null
+			}
+			let orders = [];
+			let id = [];
+			if(this.addressDTO&&this.addressDTO.id){
+				orders.push(this.addressDTO.orders)
+				id.push(this.addressDTO.id)
+			}
+			if(this.deptPriorityDTO&&this.deptPriorityDTO.id){
+				orders.push(this.deptPriorityDTO.orders)
+				id.push(this.deptPriorityDTO.id)
+			}
+			if(this.userPriorityDTO&&this.userPriorityDTO.id){
+				orders.push(this.userPriorityDTO.orders)
+				id.push(this.userPriorityDTO.id)
+			}
+			if(this.malPriorityDTO&&this.malPriorityDTO.id){
+				orders.push(this.malPriorityDTO.orders)
+				id.push(this.malPriorityDTO.id)
+			}
+			if(orders.length>0){
+				let minNumber = Math.min(...orders)
+				let index = orders.indexOf(minNumber)
+				console.log('最小值的orders', orders, minNumber)
+				setTimeout(_=>{
+					if(index!=-1){
+						this.incidentModel.priorityId = minNumber != Infinity ? id[index] : null
+					}else{
+						this.incidentModel.priorityId = null
+					}
+				})
+			}else{
+				this.incidentModel.priorityId = null
+			}
 		}
-		let minNumber = Math.min(...orders)
-		let index = orders.indexOf(minNumber) 
-		console.log('最小值的orders', orders, minNumber)
-		setTimeout(_=>{
-			this.incidentModel.priorityId = minNumber != Infinity ? id[index] : null
-		})
 		if(this.incidentModel.repairIncidentType === 'public'){
 			this.getItsmOrders('')
 			if(this.cmdbRepair){
@@ -3757,8 +3782,14 @@ export class FuwutaiComponent implements OnInit {
 							let index = orders.indexOf(minNumber)
 							console.log('最小值的orders', orders, minNumber)
 							setTimeout(_=>{
-								this.incidentModel.priorityId = minNumber != Infinity ? id[index] : null
+								if(index!=-1){
+									this.incidentModel.priorityId = minNumber != Infinity ? id[index] : null
+								}else{
+									this.incidentModel.priorityId = null
+								}
 							})
+						}else{
+							this.incidentModel.priorityId = null
 						}
 
             // 根据院区和故障现象带出责任部门，优先级，维修人/组
@@ -4091,7 +4122,7 @@ export class FuwutaiComponent implements OnInit {
 		// this.incidentModel.department = undefined;
     this.incidentMsg.deptManyPhone = '';
 		this.incidentModel.requester = null;
-    this.isRelatedDepartment = value !== 'public';
+    // this.isRelatedDepartment = value !== 'public';
     this.changeApplyRelatedDepartment(this.isRelatedDepartment);
 		this.rightTitleHandler(2);
   }
@@ -4289,41 +4320,51 @@ export class FuwutaiComponent implements OnInit {
   // 运维-选择科室
   changeApplyDept(e) {
     console.log(e, this.applicationDeptList);
-		let item = this.applicationDeptList.find(i=>i.id == e)
-		console.log('选中的科室11111',item);
-		if(item && item.priorityDTO){
-			this.addressDTO = null;
-			this.userPriorityDTO = null;
-			this.deptPriorityDTO = item.priorityDTO
-		}else{
-			this.addressDTO = null;
-			this.userPriorityDTO = null;
-			this.deptPriorityDTO = null
-		}
-		let orders = [];
-		let id = [];
-		if(this.addressDTO&&this.addressDTO.id){
-			orders.push(this.addressDTO.orders)
-			id.push(this.addressDTO.id)
-		}
-		if(this.deptPriorityDTO&&this.deptPriorityDTO.id){
-			orders.push(this.deptPriorityDTO.orders)
-			id.push(this.deptPriorityDTO.id)
-		}
-		if(this.userPriorityDTO&&this.userPriorityDTO.id){
-			orders.push(this.userPriorityDTO.orders)
-			id.push(this.userPriorityDTO.id)
-		}
-		if(this.malPriorityDTO&&this.malPriorityDTO.id){
-			orders.push(this.malPriorityDTO.orders)
-			id.push(this.malPriorityDTO.id)
+		if(this.buildType !== '编辑事件'){
+			let item = this.applicationDeptList.find(i=>i.id == e)
+			console.log('选中的科室11111',item);
+			if(item && item.priorityDTO){
+				this.addressDTO = null;
+				this.userPriorityDTO = null;
+				this.deptPriorityDTO = item.priorityDTO
+			}else{
+				this.addressDTO = null;
+				this.userPriorityDTO = null;
+				this.deptPriorityDTO = null
+			}
+			let orders = [];
+			let id = [];
+			if(this.addressDTO&&this.addressDTO.id){
+				orders.push(this.addressDTO.orders)
+				id.push(this.addressDTO.id)
+			}
+			if(this.deptPriorityDTO&&this.deptPriorityDTO.id){
+				orders.push(this.deptPriorityDTO.orders)
+				id.push(this.deptPriorityDTO.id)
+			}
+			if(this.userPriorityDTO&&this.userPriorityDTO.id){
+				orders.push(this.userPriorityDTO.orders)
+				id.push(this.userPriorityDTO.id)
+			}
+			if(this.malPriorityDTO&&this.malPriorityDTO.id){
+				orders.push(this.malPriorityDTO.orders)
+				id.push(this.malPriorityDTO.id)
+			}
+			if(orders.length>0){
+				let minNumber = Math.min(...orders)
+				let index = orders.indexOf(minNumber)
+				console.log('最小值的orders', orders, minNumber)
+				setTimeout(_=>{
+					if(index!=-1){
+						this.incidentModel.priorityId = minNumber != Infinity ? id[index] : null
+					}else{
+						this.incidentModel.priorityId = null
+					}
+				})
+			}else{
+				this.incidentModel.priorityId = null
+			}
 		}
-		let minNumber = Math.min(...orders)
-		let index = orders.indexOf(minNumber) 
-		console.log('最小值的orders', index)
-		setTimeout(_=>{
-			this.incidentModel.priorityId = minNumber != Infinity ? id[index] : null
-		})
     if(this.incidentModel.department && this.currentTabIndex === '故障报修'){
       this.rightTitle_tab = [
         { id: 2, name: '近期维修' },
@@ -6871,7 +6912,7 @@ export class FuwutaiComponent implements OnInit {
     incidentModel.requester && (incidentMsg.requesterPhone = incidentModel.requester.phone);
     incidentModel.requester && (incidentMsg.requesterName = incidentModel.requester.name);
     incidentModel.requester && (incidentModel.requester = incidentModel.requester.id);
-    if(incidentModel.repairIncidentType){
+		if(incidentModel.repairIncidentType){
       incidentModel.repairIncidentType = incidentModel.repairIncidentType.value
       this.changeRepairIncidentType(incidentModel.repairIncidentType);
     }
@@ -6885,6 +6926,7 @@ export class FuwutaiComponent implements OnInit {
     console.log('this.applicationRequesterList:', this.applicationRequesterList)
     console.log('this.applicationDeptList:', this.applicationDeptList)
     console.log('incidentModel:', incidentModel)
+		this.searchApplicationRequester();
     this.showNewOrder(1, '', '', true, '编辑事件');
 
     // 查询报修图片
@@ -7132,37 +7174,47 @@ export class FuwutaiComponent implements OnInit {
   // 选择地址
 	addressDTO:any;
   selectAddress(name, idx){
-		let item = this.addressList.find(i=>i.id == idx)
-		console.log('选中的地址11111',item);
-		if(item && item.priority){
-			this.addressDTO = item.priority
-		}else{
-			this.addressDTO = null
-		}
-		let orders = [];
-		let id = [];
-		if(this.addressDTO&&this.addressDTO.id){
-			orders.push(this.addressDTO.orders)
-			id.push(this.addressDTO.id)
-		}
-		if(this.deptPriorityDTO&&this.deptPriorityDTO.id){
-			orders.push(this.deptPriorityDTO.orders)
-			id.push(this.deptPriorityDTO.id)
-		}
-		if(this.userPriorityDTO&&this.userPriorityDTO.id){
-			orders.push(this.userPriorityDTO.orders)
-			id.push(this.userPriorityDTO.id)
-		}
-		if(this.malPriorityDTO&&this.malPriorityDTO.id){
-			orders.push(this.malPriorityDTO.orders)
-			id.push(this.malPriorityDTO.id)
+		if(this.buildType !== '编辑事件'){
+			let item = this.addressList.find(i=>i.id == idx)
+			console.log('选中的地址11111',item);
+			if(item && item.priority){
+				this.addressDTO = item.priority
+			}else{
+				this.addressDTO = null
+			}
+			let orders = [];
+			let id = [];
+			if(this.addressDTO&&this.addressDTO.id){
+				orders.push(this.addressDTO.orders)
+				id.push(this.addressDTO.id)
+			}
+			if(this.deptPriorityDTO&&this.deptPriorityDTO.id){
+				orders.push(this.deptPriorityDTO.orders)
+				id.push(this.deptPriorityDTO.id)
+			}
+			if(this.userPriorityDTO&&this.userPriorityDTO.id){
+				orders.push(this.userPriorityDTO.orders)
+				id.push(this.userPriorityDTO.id)
+			}
+			if(this.malPriorityDTO&&this.malPriorityDTO.id){
+				orders.push(this.malPriorityDTO.orders)
+				id.push(this.malPriorityDTO.id)
+			}
+			if(orders.length>0){
+				let minNumber = Math.min(...orders)
+				let index = orders.indexOf(minNumber)
+				console.log('最小值的orders', orders, minNumber)
+				setTimeout(_=>{
+					if(index!=-1){
+						this.incidentModel.priorityId = minNumber != Infinity ? id[index] : null
+					}else{
+						this.incidentModel.priorityId = null
+					}
+				})
+			}else{
+				this.incidentModel.priorityId = null
+			}
 		}
-		let minNumber = Math.min(...orders)
-		let index = orders.indexOf(minNumber) 
-		console.log('最小值的orders', orders, minNumber)
-		setTimeout(_=>{
-			this.incidentModel.priorityId = minNumber != Infinity ? id[index] : null
-		})
     this.incidentModel.houseNumber = name;
     this.isShowAddressList = false;
   }

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

@@ -170,7 +170,7 @@
 					  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="priority">优先级</nz-form-label>
 					  <nz-form-control nzErrorTip="请选择优先级!">
 					    <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="priority" nzShowSearch
-					    nzPlaceHolder="请选择优先级" nzServerSearch>
+					    nzPlaceHolder="请选择优先级" nzAllowClear nzServerSearch>
 					      <ng-container *ngFor="let option of priority_c_List">
 					        <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
 					      </ng-container>

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

@@ -64,7 +64,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let i = index">
-            <td>{{data.packCode}}</td>
+            <td class="underline" (click)="viewSpe(data)">{{data.packCode}}</td>
             <td>{{ data.packUserDTO?.name }}<br>{{ data.packTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td>{{data.packDeptDTO?.dept}}</td>
             <td>{{ data.endDeptNames }}</td>
@@ -109,3 +109,6 @@
 
 <!-- 查看详情 -->
 <router-outlet></router-outlet>
+
+<!-- 查看标本 -->
+<app-view-specimen *ngIf="showModal" [speId]="speId" (closeModelHs)="closeModel($event)"></app-view-specimen>

src/app/views/specimen-package/specimen-package.component.less

@@ -8,6 +8,12 @@
     }
   }
 }
+
+.underline{
+	text-decoration: underline;
+	cursor: pointer;
+}
+
 .save {
   position: fixed;
   left: 0;

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

@@ -141,7 +141,20 @@ export class SpecimenPackageComponent implements OnInit {
       this.searchTimer(this.getDeliveryUserList, e);
     }
   }
-
+	
+	// 关闭弹窗
+	closeModel(e){
+		this.showModal = JSON.parse(e).show;
+	}
+	
+	// 查看标本
+	speId:any;
+	showModal:boolean = false;
+	viewSpe(data){
+		this.speId = data.id;
+		this.showModal = true;
+	}
+	
   // 设置标志
   setIsSelecting(flag){
     this.isSelecting = flag; // 设置标志