拉取代码

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

@@ -29,6 +29,11 @@
 							<label nz-radio [nzValue]="0">否</label>
 						</nz-radio-group>
 					</div>
+					
+					<div class="mar-10">
+						<nz-form-label class="label">调度政务值班</nz-form-label>
+						<nz-checkbox-group [(ngModel)]="government"></nz-checkbox-group>
+					</div>
 		    </div>
 		  	<div class="contentBtns">
 		  	  <button nz-button nzType="primary" [nzLoading]="btnLoading" (click)="submitMessageForm()">确定</button>

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

@@ -26,6 +26,9 @@ export class ConfigurationSysComponent implements OnInit {
 		{ label: '科内报修', value: 'deptRepair', checked:false},
 		{ label: '公共报修', value: 'publicRepair', checked:false },
 	];
+	government:any = [
+    {label:'是否开启',value: 0}
+  ];
 	
 	// 申请人是否必填
 	applicantMustFillIn:any= 0;
@@ -45,7 +48,8 @@ export class ConfigurationSysComponent implements OnInit {
 				item.keyconfig === "deptRepair" ||
 				item.keyconfig === "publicRepair" ||
 				item.keyconfig === "hospitalModel" ||
-				item.keyconfig === "applicantMustFillIn"
+				item.keyconfig === "applicantMustFillIn"||
+				item.keyconfig === "governmentDuty"
 		)
 		filterData.forEach((item) => {
 		 if (item.keyconfig === "deptRepair") {
@@ -68,6 +72,14 @@ export class ConfigurationSysComponent implements OnInit {
 		    item.valueconfig = this.hospitalModel;
 		  }else if (item.keyconfig === "applicantMustFillIn") {
 		    item.valueconfig = this.applicantMustFillIn;
+		  }else if (item.keyconfig === "governmentDuty") {
+				let value = null
+				if(this.government[0].checked){
+					value = '1'
+				}else{
+					value = '0'
+				}
+				item.valueconfig = value;
 		  }
 		});
 		const postData = filterData;
@@ -121,13 +133,18 @@ export class ConfigurationSysComponent implements OnInit {
 								}
 								break;
 							case "hospitalModel":
-							console.log(111,c)
 								this.hospitalModel =  Number(c[1])
 								break;	
 							case "applicantMustFillIn":
-							console.log(222,c)
 								this.applicantMustFillIn =  Number(c[1])
-								break;	
+								break;
+							case "governmentDuty":
+								if(c[1]=='1'){
+									this.government[0].checked = true
+								}else{
+									this.government[0].checked = false
+								}
+								break;
 						}
 					});
 				} else {

src/app/components/order-scope/order-scope.component.html

@@ -58,6 +58,15 @@
 				    </nz-radio-group>
 				  </div>
 				</div>
+				<div nz-row *ngIf="showGovDutyConfig==1">
+				  <div nz-col nzSpan="5">是否开通政务值班：</div>
+				  <div nz-col nzSpan="19">
+				    <nz-radio-group class="w100" [(ngModel)]="showGovDuty" [nzDisabled]="!activeScopeTab.checked">
+				      <label nz-radio [nzValue]="1">是</label>
+				      <label nz-radio [nzValue]="0">否</label>
+				    </nz-radio-group>
+				  </div>
+				</div>
       </div>
       <!-- 配送 -->
       <div class="conditions" *ngIf="scopeTabs.length>0 && activeScopeTab.value == 2">

src/app/components/order-scope/order-scope.component.ts

@@ -22,7 +22,7 @@ export class OrderScopeComponent implements OnInit {
     orderScopeRadio: undefined,
   }
 	@Input() coopBtns:any;
-
+	@Input() showGovDutyConfig:any;
   @Output() confirmModal = new EventEmitter();
   @Output() cancelModal = new EventEmitter();
   constructor(
@@ -47,6 +47,7 @@ export class OrderScopeComponent implements OnInit {
 	//#region 工单范围-运维start
 	allDuty:number = 1;
 	showReassign:any = 0;
+	showGovDuty:any = 0;
 	menuList:any;
 
   ngOnInit() {
@@ -101,9 +102,11 @@ export class OrderScopeComponent implements OnInit {
     }
     // 工单范围数据
     itsmGetOrderScope() {
+			console.log(444,this.itsmData)
       // 是否不限制部门
       this.allDuty = this.itsmData.allDuty === undefined ? 1 : this.itsmData.allDuty;
       this.showReassign = this.itsmData.showReassign || 0;
+			this.showGovDuty = this.itsmData.showGovDuty || 0;
 			// 权限内的院区和组
       let hosList = this.user.infoPermission.dutyList || [];
       let groups = this.user.infoPermission.dutyGroupList || [];
@@ -389,6 +392,7 @@ export class OrderScopeComponent implements OnInit {
       if(itsm && itsm.checked){
         postData.workerOrderScope.allDuty = this.allDuty;
 				postData.workerOrderScope.showReassign = this.showReassign;
+				postData.workerOrderScope.showGovDuty = this.showGovDuty;
         postData.workerOrderScope.dutyIds = this.itsmCheckedHos.filter(v => v.checked).map(v => v.value).toString() || undefined;
         postData.workerOrderScope.dutyGroupIds = this.itsmCheckedGroup.filter(v => v.checked).map(v => v.value).toString() || undefined;
         postData.workerOrderScope.dutyRange = this.itsmOrderScopeRadio - 0;

src/app/services/main.service.ts

@@ -1217,5 +1217,22 @@ export class MainService {
 		  headers: this.headers,
 		});
 	}
-
+	
+	// 文档管理上传
+	documentImport(folderId, personal): string {
+	  return `${host.host}/document/importFile/${folderId}/${personal}`;
+	}
+	
+	// 文档管理更新
+	documentUpdateFile(fileId): string {
+	  return `${host.host}/document/updateFile/${fileId}`;
+	}
+	
+	// 文档管理导出
+	documentExport(fileToken): any {
+	  return this.http.post(host.host + `/document/downloadFile/${fileToken}`,{}, {
+	    headers: this.exportHeader,
+	    responseType: "arraybuffer",
+	  });
+	}
 }

src/app/services/tool.service.ts

@@ -324,6 +324,18 @@ export class ToolService {
 				case "download":
 				  coopBtns.download = true; //下载
 				  break;
+				case "allocation":
+				  coopBtns.allocation = true; //分配任务
+				  break;
+				case "accomplish":
+				  coopBtns.accomplish = true; //任务完成
+				  break;
+				case "startTask":
+				  coopBtns.startTask = true; //开始任务
+				  break;
+				case "record":
+				  coopBtns.record = true; //任务记录
+				  break;
       }
     });
     console.log(coopBtns);

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

@@ -26,6 +26,7 @@ export class BusinessDataDetailModalComponent implements OnInit {
   }
   @Input() show: Boolean;
   @Input() orderId: String;
+	@Input() orderHosId: String;
   @Input() type: String = '';
   @Input() dataInfo: any;
 	@Input() taskTypeValue: String;
@@ -317,7 +318,7 @@ export class BusinessDataDetailModalComponent implements OnInit {
       taskTypeConfig: {
         taskTypeDTO: {
           hosId: {
-            id: this.hosId
+            id: this.orderHosId
           },
           ordinaryField: {
             key: 'ordinary_field',

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

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

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

@@ -75,8 +75,10 @@ export class DetailOrdinaryComponent implements OnInit {
   bloodModalShow = false; //业务数据弹窗开关
   orderId = ""; //查看业务数据携带
   businessDataModalType = ''; //业务数据类型
+	orderHosId:any; //创建工单院区id
   viewDetail(data, type) {
     this.orderId = data.id;
+		this.orderHosId = data.hosId;
     this.businessDataModalType = type;
     this.bloodModalShow = true;
   }

src/app/share/share.module.ts

@@ -66,6 +66,7 @@ import { PackageSpecimenRuleComponent } from './package-specimen-rule/package-sp
 import { SpecimenPackageListModalComponent } from './specimen-package-list-modal/specimen-package-list-modal.component';
 import { NgxPrintModule } from 'ngx-print';
 import { SpecimenPackageLogPromptModalComponent } from './specimen-package-log-prompt-modal/specimen-package-log-prompt-modal.component';
+import { UploadFileComponent } from './upload-file/upload-file.component';
 
 @NgModule({
   declarations: [
@@ -134,6 +135,7 @@ import { SpecimenPackageLogPromptModalComponent } from './specimen-package-log-p
     PackageSpecimenRuleComponent,
     SpecimenPackageListModalComponent,
     SpecimenPackageLogPromptModalComponent,
+		UploadFileComponent
   ],
   imports: [
     CommonModule,
@@ -211,6 +213,7 @@ import { SpecimenPackageLogPromptModalComponent } from './specimen-package-log-p
     PackageSpecimenRuleComponent,
     SpecimenPackageListModalComponent,
     SpecimenPackageLogPromptModalComponent,
+		UploadFileComponent
   ]
 })
 export class ShareModule { }

src/app/share/upload-file/upload-file.component.html

@@ -0,0 +1,36 @@
+<div
+  class="save add display_flex align-items_center justify-content_flex-center excelUpload"
+  *ngIf="isShow"
+>
+  <div class="modalBody">
+    <div class="title"> 选择导入的文件<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <div class="content">
+      <div>
+        <nz-upload [(nzFileList)]="fileList" [nzBeforeUpload]="beforeUpload" nzType="drag">
+          <p class="ant-upload-drag-icon">
+            <i nz-icon nzType="inbox"></i>
+          </p>
+          <p class="ant-upload-text">单击或将文件拖到此区域以上传</p>
+        </nz-upload>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button
+        nzType="primary"
+        nz-button
+        (click)="submitForm()"
+      >
+        确认导入
+      </button>
+      <button
+        class="btn cancel"
+        nz-button
+        nzType="default"
+        (click)="hideModal()"
+      >
+        取消
+      </button>
+    </div>
+  </div>
+</div>

src/app/share/upload-file/upload-file.component.less

@@ -0,0 +1,76 @@
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+  &.excelUpload ::ng-deep .ant-upload-list-item .anticon-close{
+    opacity: 1!important;
+    transition: all 0.2s;
+  }
+  .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;
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        padding: 14px;
+        height: 200px;
+        .isNumOrIntegral {
+          margin: 24px 0;
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

src/app/share/upload-file/upload-file.component.ts

@@ -0,0 +1,39 @@
+import { Component, OnInit, Output, Input } from "@angular/core";
+import { EventEmitter } from "@angular/core";
+import { UploadFile, NzMessageService} from 'ng-zorro-antd';
+
+
+@Component({
+  selector: "app-upload-file",
+  templateUrl: "./upload-file.component.html",
+  styleUrls: ["./upload-file.component.less"],
+})
+export class UploadFileComponent implements OnInit {
+  @Output() submitFormHand = new EventEmitter();
+  @Output() hideFormHand = new EventEmitter();
+  @Input() isShow: boolean = false; //模态框
+  fileList: UploadFile[] = [];
+
+  constructor(private message: NzMessageService) {}
+
+  beforeUpload = (file: UploadFile): boolean => {
+    if(this.fileList.length === 0){
+      this.fileList = this.fileList.concat(file);
+    }
+    return false;
+  };
+
+  ngOnInit() {}
+  // 隐藏模态框
+  hideModal() {
+    this.hideFormHand.emit();
+  }
+  // 表单提交
+  submitForm(): void {
+    if(this.fileList.length === 0){
+      this.message.warning('请选择一个文件');
+      return;
+    }
+    this.submitFormHand.emit({fileList: this.fileList});
+  }
+}

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

@@ -12,36 +12,21 @@
 			<div class="tree-content">
 				<nz-tree [nzData]="nodes" 
 				(nzClick)="nodeClick($event)"
-				(nzDblClick)="openFolder($event)"
-				[nzExpandedIcon]="mutiExpandedIconTpl"
-				[nzTreeTemplate]="nzTreeTemplate"
+				[nzExpandedKeys]="defaultExpandedKeys"
 				[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>
+				</nz-tree>
+				<ng-template #nzTreeTemplate let-node>
+					 <span class="custom-node" [ngClass]="treeItem?.id === node.origin.id?'activeClass':''">
+							<span *ngIf="!node.isLeaf">
+								<i nz-icon [nzType]="node.isExpanded ? 'minus-square' : 'plus-square'" (click)="openFolder(node)"></i>
+								<span class="folder-name">{{ node.title }}</span>
 							</span>
-							<span *ngIf="!node.origin.children">
-								<i nz-icon nzType="file"></i>
-								<span class="file-name">{{ node.folderName }}</span>
+							<span *ngIf="node.isLeaf">
+								<span class="file-name">{{ node.title }}</span>
 							</span>
 						</span>
-					</ng-template>
-				</nz-tree>
+				</ng-template>
 			</div>
 		</div>
 		<div class="list-right">
@@ -49,24 +34,13 @@
 			  <div class="list-template__searchBox">
 					<div class="list-template__searchItem">
 					  <span class="label">文档名称：</span>
-					  <input nz-input class="formItem" [(ngModel)]="batchNumber" placeholder="请输入文档名称" nzSize="default" />
+					  <input nz-input class="formItem" [(ngModel)]="fileName" 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>
+					<button class="btn default ml8" (click)='excelImport("",1)'>上传文档</button>
 			  </div>
 			</div>
 			<div class="list-template__bottom">
@@ -84,19 +58,19 @@
 			      </tr>
 			    </thead>
 			    <tbody v-if="listOfData && listOfData.length>0">
-			      <tr *ngFor="let data of listOfData let index = index;" (click)="selectedListData(data.id)">
+			      <tr *ngFor="let data of listOfData let index = index;">
 							<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>{{ data.fileName || '-' }}</td>
+			        <td>{{ data.fileType||'0' }}</td>
+			        <td>{{ data.docSize ||'0' }}</td>
+			        <td>{{ data.createUserDTO && data.createUserDTO.name || '0'}}</td>
+			        <td>{{ data.updateTime|date:'yyyy-MM-dd HH:mm:ss'}}</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>
+									<span *ngIf="coopBtns.del" (click)="delList($event,data.id)">删除</span>
+									<span *ngIf="coopBtns.download" (click)="excelExport($event,data)">下载</span>
+			            <span *ngIf="coopBtns.updata" (click)="excelImport(data.id,2)">更新</span>
+									<span *ngIf="coopBtns.look" (click)="detail(data)">查看历史</span>
 								</div>
 			        </td>
 			      </tr>
@@ -115,7 +89,7 @@
   <!-- 新增/编辑模态框 -->
   <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 class="title">查看历史<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
       </div>
       <overlay-scrollbars #osComponentRef1 class="content">
         <div class="list-template__bottom">
@@ -123,30 +97,29 @@
             [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>
+								<th>文档名称</th>
+								<th>文档格式</th>
+                <th>上传者</th>
+                <th>版本号</th>
+                <th>大小</th>
+                <th>上传时间</th>
+        				<th>操作</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>
+								<td>{{ data.fileName }}</td>
+								<td>{{ data.fileType||'-' }}</td>
+                <td>{{ data.createUserDTO?data.createUserDTO.name:'-' }}</td>
+                <td>{{ data.fileVersion||'-' }}</td>
+                <td>{{ data.docSize||'0' }}</td>
+                <td>{{ data.createTime|date:'yyyy-MM-dd HH:mm:ss'}}</td>
+								<td>
+								  <div class="coop">
+										<!-- <span *ngIf="coopBtns.del" (click)="delHistory(data)">删除</span> -->
+										<span *ngIf="coopBtns.download" (click)="excelHistory(data)">下载</span>
+									</div>
+								</td>
               </tr>
             </tbody>
           </nz-table>
@@ -159,12 +132,11 @@
   </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>
-
+    (confirmDelEvent)="confirmDel()" content="您确认要删除文档吗？"></app-dialog-delete>
+		
+	<!-- 删除模态框 -->
+	<app-dialog-delete [delModal]="delHistoryModal" (hideDelModalEvent)="hideHistoryModal()" [btnLoading]="btnLoading"
+		(confirmDelEvent)="confirmHistory()" content="您确认要删除吗？"></app-dialog-delete>
 </div>
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
@@ -174,7 +146,8 @@
 <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-upload-file [isShow]="isShow" (hideFormHand)="hideExcelImport($event)" *ngIf="isShow" (submitFormHand)="submitExcelImport($event)"></app-upload-file>
 
 <!-- 删除树结构模态框 -->
   <app-dialog-delete [delModal]="delTreeModal" (hideDelModalEvent)="hideTreeModal()" [btnLoading]="btnLoading"
@@ -188,7 +161,7 @@
 		<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-label [nzSpan]="7" nzFor="parent">父级目录名称</nz-form-label>
 					<nz-form-control [nzSpan]="17" nzErrorTip="请输入父级目录名称!">
 						<nz-input-group>
 							<input nz-input disabled formControlName="parent" placeholder="请输入父级目录名称" />

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

@@ -1,5 +1,9 @@
 @import "../../../../src/theme.less";
 :host {
+	.activeClass{
+		background: #34b349;
+		color: #fff;
+	}
   .add-button {
     margin: 0 auto 16px !important;
   }
@@ -33,6 +37,7 @@
 			margin-right: 15px;
 			height: 100vh;
 			overflow-y: auto;
+			overflow-x: hidden;
 			background: #fff;
 			.tree-top-add{
 				margin: 6px;
@@ -53,8 +58,14 @@
 			}
 			.tree-content{
 				padding: 0 10px;
-				.ant-tree-node-content-wrapper{
+				.custom-node{
+					display: inline-block;
 					width: 100%;
+					cursor: pointer;
+					padding: 5px;
+					.folder-name{
+						margin-left: 2px;
+					}
 				}
 			}
 		}
@@ -155,8 +166,27 @@
   &.add {
     .modalBody {
       width: 80%;
-      height: auto;
-
+      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: auto;
@@ -268,6 +298,7 @@
       button {
         &:nth-child(1) {
           margin-right: 20px;
+					margin-top: 15px;
         }
       }
     }

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

@@ -41,24 +41,10 @@ export class CommonDocumentComponent implements OnInit{
   ) {}
 
   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.userId = this.tool.getCurrentUserId();
     this.coopBtns = this.tool.initCoopBtns(this.route);
 		this.getTreeData();
-    this.initForm();
-    this.getAllHospital();
-    // this.getType();
-    // this.getDeptHandoverType();
   }
 	userId:any;
   listOfData: any[] = []; //表格数据
@@ -105,11 +91,13 @@ export class CommonDocumentComponent implements OnInit{
 				this.message.error('请先选择目录！')
 				return
 			}
+		}else if(type==1){
+			this.treeItem = null
+			this.parentNode = null
 		}
 		this.treeType = type
 		this.add = true
 		this.initAddForm();
-		this.addModal = true
 	}	
 	
 	// 编辑目录
@@ -121,7 +109,6 @@ export class CommonDocumentComponent implements OnInit{
 		this.treeType = type
 		this.add = false
 		this.initAddForm('edit');
-		this.addModal = true
 	}
 	
 	hideAddModal(){
@@ -133,21 +120,15 @@ export class CommonDocumentComponent implements OnInit{
 	parentNode:any; //父级节点
 	activedNode:any;
 	nodeClick(data: NzFormatEmitEvent): void{
-		console.log(123,data)
 		this.treeItem = data.node.origin
 		this.parentNode = data.node.parentNode ? data.node.parentNode.origin : null
+		// console.log(123,this.treeItem)
+		// console.log(456,this.parentNode)
+		this.getList();
 	}
 	
 	openFolder(data: NzTreeNode | Required<NzFormatEmitEvent>): void {
-		console.log(456, data)
-		if (data instanceof NzTreeNode) {
-			data.isExpanded = !data.isExpanded;
-		} else {
-			const node = data.node;
-			if (node) {
-				node.isExpanded = !node.isExpanded;
-			}
-		}
+		console.log(9998, data)
 	}
 		
 	// 删除目录
@@ -170,56 +151,77 @@ export class CommonDocumentComponent implements OnInit{
 	  that.mainService
 	    .coopData(
 	      "rmvData",
-	      "department",
+	      "documentFolder",
 	      [that.treeItem.id]
 	    )
 	    .subscribe((data) => {
 	      that.btnLoading = false;
 	      that.delTreeModal = false;
-	      if (data.data && data.data[0]) {
-	        if (!data.data[0].msg) {
-	          that.showPromptModal("删除", true, "");
-						this.getTreeData();
-	        } else {
-	          that.showPromptModal("删除", false, data.data[0].msg);
-	        }
-	      } else {
-	        that.showPromptModal("删除", false, "");
-	      }
+				if (data.status==200) {
+					that.showPromptModal("删除", true, "");
+					this.treeItem = null
+					this.parentNode = null
+					this.getTreeData();
+				} else {
+					that.showPromptModal("删除", false, data.msg);
+				}
+
 	    });
 	}
 	// 获取目录数据
+	defaultExpandedKeys:any = [];	
 	getTreeData(){
-		let data = {
+		let query = {
 			idx: 0,
 			sum: 9999,
 			documentFolder:{
 				personal: 0,
-				createUser: this.userId,
+				// createUser: this.userId,
 				hosId: this.hosId
 			}
 		}
 		this.mainService
-		  .getFetchDataList("data", "documentFolder", data)
-		  .subscribe((data) => {
-		    this.nodes = data.list;
-		  });
+		  .getFetchDataList("data", "documentFolder", query)
+		  .subscribe((res) => {
+		    let data = res.list;
+				data = data.map(v => ({...v, parentId: v.parent ? v.parent.id : undefined, title: v.folderName, key: v.id}));
+				this.nodes = this.tool.tranListToTreeDataLeaf(data, undefined, "parentId");
+				this.defaultExpandedKeys = [this.nodes.length>0?this.nodes[0].key:null]
+				// if(this.nodes[0].children && this.nodes[0].children.length>0){
+				// 	this.defaultExpandedKeys.push(this.nodes[0].key)
+				// 	this.setSelectKey(this.nodes[0].children);
+				// 	console.log(4444,this.defaultExpandedKeys)
+				// }
+			});
+	}
+	
+	setSelectKey(data){
+		for(let i of data){
+			this.defaultExpandedKeys.push(i.key)
+			if(i.children && i.children.length>0){
+				this.setSelectKey(i.children);
+			}
+		}
 	}
 	
 	// 初始化新增form表单
 	initAddForm(type:any = 'add') {
 		this.validateTreeForm = this.fb.group({
 			folderName: [type=='edit' ? this.treeItem.folderName : null, [Validators.required]],
-			parent: [type=='edit' && this.parentNode ? this.parentNode.folderName : this.treeItem.folderName, [Validators.required]],
+			parent: [null, []],
 		});
 		if(this.treeType==2){
 			this.validateTreeForm.addControl(
 			  "parent",
-			  new FormControl(type=='edit' && this.parentNode ? this.parentNode.folderName : this.treeItem.folderName, Validators.required)
+			  new FormControl(null)
 			);
+			this.validateTreeForm.controls.parent.setValue(this.treeItem.folderName);
 		}else{
 			this.validateTreeForm.removeControl("parent");
 		}
+		setTimeout(_=>{
+			this.addModal = true
+		},50)
 	}
 	
 	// 新增/编辑树
@@ -231,28 +233,33 @@ export class CommonDocumentComponent implements OnInit{
 	  if (this.validateTreeForm.invalid) return;
 	  this.btnLoading = true;
 		let postData = {
-			personal: 0,
-			hosId: this.hosId,
-			folderName: this.validateTreeForm.value.folderName,
-			parent:{
-				id:''
-			},
-			id:null,
+			documentFolder:{
+				personal: 0,
+				hosId: this.hosId,
+				folderName: this.validateTreeForm.value.folderName,
+				parent:{
+					id:''
+				},
+				id:null,
+			}
 		};
 	  if (this.treeType==1) {
-	    delete postData.parent
-			delete postData.id
+	    delete postData.documentFolder.parent
+			delete postData.documentFolder.id
 	  } else if(this.treeType==2) {
-			postData.parent.id = this.treeItem.id
+			postData.documentFolder.parent.id = this.treeItem.id
 		} else if(this.treeType==3) {
-			postData.id = this.treeItem.id
+			postData.documentFolder.id = this.treeItem.id
+			delete postData.documentFolder.parent
 		}
 	  this.mainService
-	    .simplePost("addData", "documentFolder", postData)
+	    .coopData(this.add ? "addData" : "updData", "documentFolder", postData)
 	    .subscribe((result) => {
 	      this.hideAddModal();
 	      this.btnLoading = false;
 	      if (result["status"] == 200) {
+					this.treeItem = null
+					this.parentNode = null
 					this.getTreeData();
 	        this.showPromptModal(this.add ? "新增" : "编辑", true, "");
 	      } else {
@@ -266,31 +273,53 @@ export class CommonDocumentComponent implements OnInit{
 	}
 	
   // 模板导出
-  excelExport(e, id){
-    this.maskFlag = this.message.loading("下载模板中..", {
+  excelExport(e, item){
+    this.maskFlag = this.message.loading("下载中..", {
       nzDuration: 0,
     }).messageId;
-    this.mainService.exportExcel("department", {}).subscribe(
+    this.mainService.documentExport(item.fileToken).subscribe(
       (data) => {
         this.message.remove(this.maskFlag);
         this.maskFlag = false;
-        this.message.success('下载模板成功');
+        this.message.success('下载成功');
+				let type = null
+				if(item.fileType=='xls'){
+					console.log(1)
+					type = 'application/vnd.ms-excel'
+				}else if(item.fileType=='xlsx'){
+					type = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+				}else if(item.fileType=='doc'){
+					type = 'application/msword'
+				}else if(item.fileType=='docx'){
+					type = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+				}else if(item.fileType=='pdf'){
+					type = 'application/pdf'
+				}else if(item.fileType=='ppt'){
+					type = 'application/vnd.ms-powerpoint'
+				}else if(item.fileType=='pptx'){
+					type = 'application/vnd.openxmlformats-officedocument.presentationml.presentation'
+				}else if(item.fileType=='png'){
+					type = 'image/png'
+				}else if(item.fileType=='gif'){
+					type = 'image/gif'
+				}else if(item.fileType=='jpeg' || item.fileType=='jpg'){
+					type = 'image/jpeg'
+				}
         var file = new Blob([data], {
-          type: "application/vnd.ms-excel",
+          type: type,
         });
-        //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";
+        a.download = item.fileName;
         document.body.appendChild(a);
         a.click();
       },
       (err) => {
         this.message.remove(this.maskFlag);
         this.maskFlag = false;
-        this.message.error('下载模板失败');
+        this.message.error('下载失败');
       }
     );
   }
@@ -302,19 +331,39 @@ export class CommonDocumentComponent implements OnInit{
     this.isShow = false;
   }
   // 触发
-  excelImport() {
+	uploadType:any;
+	itemId:any;
+  excelImport(id, type) {
+		if(!this.treeItem && type==1){
+			this.message.error('请先选择目录！')
+			return
+		}
+		this.uploadType = type
+		this.itemId = id
     this.isShow = true;
   }
+	maskFlag:any;
   submitExcelImport({fileList}){
     this.isShow = false;
     const formData = new FormData();
     fileList.forEach((file: any) => {
       formData.append('file', file);
+			formData.append('filename', file.name);
     });
-    this.maskFlag = this.message.loading("正在导入中..", {
+		let url = null
+		let title = null
+		if(this.uploadType==1){
+			url = this.mainService.documentImport(this.treeItem.id, 0);
+			title = '上传'
+		}else{
+			url = this.mainService.documentUpdateFile(this.itemId);
+			title = '更新'
+		}
+    this.maskFlag = this.message.loading(`正在${title}中..`, {
       nzDuration: 0,
     }).messageId;
-    const req = new HttpRequest('Post', this.mainService.returnImportExcelUrl('department'), formData, {
+
+    const req = new HttpRequest('Post', url, formData, {
       reportProgress: true
     });
     this.http
@@ -325,18 +374,18 @@ export class CommonDocumentComponent implements OnInit{
           if(res.body.status == 200){
             this.message.remove(this.maskFlag);
             this.maskFlag = false;
-            this.message.success('导入成功');
+            this.message.success(`${title}成功`);
             this.getList();
           }else{
             this.message.remove(this.maskFlag);
             this.maskFlag = false;
-            this.showPromptModal("导入", false, res.body.msg);
+            this.showPromptModal(`${title}`, false, res.body.msg);
           }
         },
         () => {
           this.message.remove(this.maskFlag);
           this.maskFlag = false;
-          this.message.error('导入失败');
+          this.message.error(`${title}失败`);
         },
       );
   }
@@ -348,90 +397,14 @@ export class CommonDocumentComponent implements OnInit{
   }
   // 打开父级科室下拉框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) {
+  delList(e,data) {
     this.coopData = data;
-    this.showDelModal1();
+    this.showDelModal(e,data);
   }
   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;
@@ -440,43 +413,26 @@ export class CommonDocumentComponent implements OnInit{
   // 重置
   reset() {
     this.pageIndex = 1;
-    this.department = null;
-    this.batchNumber = "";
-		this.dateRange = [];
-		this.startDate = "";
-		this.endDate = "";
     this.getList();
   }
   // 表格数据
   loading1 = false;
+	fileName:any;
   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
+      documentFile: {
+				hosId: this.hosId,
+				fileName: this.fileName,
+				personal: 0,
+				folderId: this.treeItem && this.treeItem.id || undefined
       },
     };
-		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)
+      .getFetchDataList("data", "documentFile", data)
       .subscribe((data) => {
         this.loading1 = false;
         that.listOfData = data.list;
@@ -496,174 +452,6 @@ export class CommonDocumentComponent implements OnInit{
 	  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();
@@ -864,57 +652,6 @@ export class CommonDocumentComponent implements OnInit{
 
   // 编辑
   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;
@@ -937,15 +674,10 @@ export class CommonDocumentComponent implements OnInit{
    * @param flag true是批量删除，false是单个删除
    * @param id
    */
-  showDelModal(e, flag, id) {
+  showDelModal(e, id) {
     e.stopPropagation();
     this.delModal = true;
-    this.coopFlag = flag;
-    if (flag) {
-      this.coopIds = id;
-    } else {
-      this.coopId = id;
-    }
+    this.coopId = id;
   }
   hideDelModal() {
     this.delModal = false;
@@ -957,54 +689,130 @@ export class CommonDocumentComponent implements OnInit{
     that.mainService
       .coopData(
         "rmvData",
-        "department",
-        this.coopFlag ? this.coopIds : [that.coopId]
+        "documentFile",
+        [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);
-          }
+        if (data.status==200) {
+          that.showPromptModal("删除", true, "");
         } else {
-          that.showPromptModal("删除", false, "");
+          that.showPromptModal("删除", false, data.msg);
         }
       });
   }
 
   // 查看
-  detail(e, id) {
-    e.stopPropagation();
+  detail(item) {
+		this.coopData = item;
 		var that = this;
 		let data = {
 			idx: 0,
 			sum: 9999,
-			drugsConfigure: {
+			documentFile: {
 			  hosId: this.hosId,
-			  drugListId: id
+			  fileCode: item.fileCode
 			}
 		};
 		this.loading1 = true;
 		that.mainService
-		  .getFetchDataList("data", "drugsConfigure", data)
+		  .getFetchDataList("data", "documentFile", data)
 		  .subscribe((data) => {
 		    this.loading1 = false;
 				this.modal = true
 		    that.viewData = data.list;
-		    // that.listLength = data.totalNum;
 		  });
   }
-
+	
+	// 删除历史
+	delHistory(e,data){
+		this.coopData = data;
+		this.showHistoryModal(e,data);
+	}
+	
+	HistoryId:any;
+	showHistoryModal(e, id) {
+	  e.stopPropagation();
+	  this.delModal = true;
+	  this.HistoryId = id;
+	}
+	hideHistoryModal() {
+	  this.delModal = false;
+	}
+	// 确认删除
+	confirmHistory() {
+	  var that = this;
+	  that.btnLoading = true;
+	  that.mainService
+	    .coopData(
+	      "rmvData",
+	      "documentFile",
+	      [that.HistoryId]
+	    )
+	    .subscribe((data) => {
+	      that.btnLoading = false;
+	      that.delModal = false;
+	      if (data.status==200) {
+	        that.showPromptModal("删除", true, "");
+					this.detail(this.coopData)
+	      } else {
+	        that.showPromptModal("删除", false, data.msg);
+	      }
+	    });
+	}
+	
+	// 下载历史
+	excelHistory(item){
+		this.maskFlag = this.message.loading("下载中..", {
+		  nzDuration: 0,
+		}).messageId;
+		this.mainService.documentExport(item.fileToken).subscribe(
+		  (data) => {
+		    this.message.remove(this.maskFlag);
+		    this.maskFlag = false;
+		    this.message.success('下载成功');
+				let type = null
+				if(item.fileType=='xls'){
+					type = 'application/vnd.ms-excel'
+				}else if(item.fileType=='xlsx'){
+					type = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+				}else if(item.fileType=='doc'){
+					type = 'application/msword'
+				}else if(item.fileType=='docx'){
+					type = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+				}else if(item.fileType=='pdf'){
+					type = 'application/pdf'
+				}else if(item.fileType=='ppt'){
+					type = 'application/vnd.ms-powerpoint'
+				}else if(item.fileType=='pptx'){
+					type = 'application/vnd.openxmlformats-officedocument.presentationml.presentation'
+				}else if(item.fileType=='png'){
+					type = 'image/png'
+				}else if(item.fileType=='gif'){
+					type = 'image/gif'
+				}else if(item.fileType=='jpeg' || item.fileType=='.jpg'){
+					type = 'image/jpeg'
+				}
+		    var file = new Blob([data], {
+		      type: type,
+		    });
+		    var fileURL = URL.createObjectURL(file);
+		    var a = document.createElement("a");
+		    a.href = fileURL;
+		    a.target = "_blank";
+		    a.download = item.fileName + item.fileType;
+		    document.body.appendChild(a);
+		    a.click();
+		  },
+		  (err) => {
+		    this.message.remove(this.maskFlag);
+		    this.maskFlag = false;
+		    this.message.error('下载失败');
+		  }
+		);
+	}
+	
   // 选中表格中科室
   mapOfCheckedId: { [key: string]: boolean } = {};
   checkedDepIds = []; //已选中科室id

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

@@ -977,7 +977,7 @@
   <!-- 新建工单 -->
   <div class="newOrder display_flex justify-content_flex-center align-items_center" *ngIf="newOrderShow && newOrderShowOpen" (click)="clickExtra($event)">
     <div class="modalBody">
-      <div class="title" *ngIf="currentTabIndex !== '故障报修'">
+      <div class="title" *ngIf="currentTabIndex !== '故障报修' && currentTabIndex !== '政务值班'">
         <div class="newTop">
           <div class="name">来电咨询</div>
           <div class="newTopItem">
@@ -1519,6 +1519,41 @@
                   </div>
                 </div>
               </overlay-scrollbars>
+							<!-- 政务值班 -->
+							<overlay-scrollbars #osComponentRef25 *ngIf="currentTabIndex == item.key && item.key  == '政务值班'">
+								<div class="zw-content">
+									<div class="item df">
+										<div class="df-fl margin-right">
+											<span class="label mar"><span class="red">*</span> 联系人：</span>
+											<input nz-input class="formItem" [(ngModel)]="contacts" placeholder="请输入联系人" nzSize="default" />
+										</div>
+										<div class="df-fl margin-right">
+											<span class="label"><span class="red">*</span> 联系电话：</span>
+											<input nz-input type="number" class="formItem" [(ngModel)]="contactsPhone" placeholder="请输入联系电话" nzSize="default" />
+										</div>
+									</div>
+									<div class="item df">
+										<span class="label"><span class="red">*</span> 投诉人：</span>
+										<input nz-input class="formItem" [(ngModel)]="complainant" placeholder="请输入联系人" nzSize="default" />
+									</div>
+									<div class="item df">
+										<span class="label"><span class="red">*</span> 省市区：</span>
+										<nz-cascader [nzOptions]="nzOptions" [(ngModel)]="province" placeholder="请选择省市区" (ngModelChange)="onProvinceChanges($event)"></nz-cascader>
+									</div>
+									<div class="item df">
+										<span class="label"><span class="red">*</span> 详细地址：</span>
+										<input nz-input class="formItem" [(ngModel)]="detailedAddress" placeholder="请输入联系电话" nzSize="default" />
+									</div>
+									<div class="item df">
+										<span class="label"><span class="red">*</span> 简述：</span>
+										<textarea [(ngModel)]="sketch" nz-input rows="1" placeholder="请输入简述"></textarea>
+									</div>
+									<div class="item lw-df">
+										<span class="label"><span class="red">*</span> 记录内容：</span>
+										<textarea [(ngModel)]="record" nz-input rows="3" placeholder="请输入记录内容"></textarea>
+									</div>
+								</div>
+							</overlay-scrollbars>
             </ng-container>
             <!-- loading -->
             <div class="bottom" *ngIf="newLoading">
@@ -1539,7 +1574,7 @@
             <span class="toLastTime1"><span class="time" *ngIf="applyDept">{{ orderRefreshTime }}s</span></span>
           </div>
           <!-- 近期配送 start -->
-          <div class="cots_body weifenpai" *ngIf="currentRTab == 0" [ngClass]="{ top185: hurseInfoHiding != 1 }">
+          <div class="cots_body weifenpai" *ngIf="currentRTab == 0 && currentTabIndex != '政务值班'" [ngClass]="{ top185: hurseInfoHiding != 1 }">
             <overlay-scrollbars #osComponentRef12 [ngStyle]="{ height: '100%' }">
               <div *ngIf="noArrives.length && !loading4">
                 <div class="list listsTypeColor" *ngFor="let data of noArrives">
@@ -1756,6 +1791,36 @@
             </overlay-scrollbars>
           </div>
           <!-- 知识库 end -->
+					<!-- 政务值班-近期记录 -->
+					<div class="cots_body weifenpai" *ngIf="currentRTab == 4 && currentTabIndex == '政务值班'" [ngClass]="{ top185: hurseInfoHiding != 1 }">
+					  <overlay-scrollbars #osComponentRef26 [ngStyle]="{ height: '100%' }">
+					    <div class="record" *ngIf="itsmZwOrders.length>0">
+								<div class="content" *ngFor="let i of itsmZwOrders">
+									<div class="item ju-sb">
+										<div class="item-code">{{i.govDutySign}}</div>
+										<div>{{i.addTime|date:'yyyy-MM-dd HH:mm:ss'}}</div>
+									</div>
+									<div class="item">
+										{{i.record}}
+									</div>
+									<div class="item">
+										{{ i.province && i.province.name || '-'}}{{ i.city && i.city.name || '-'}}{{ i.district && i.district.name || '-'}}{{ i.detailedAddress || '-'}}
+									</div>
+								</div>
+					    </div>
+					    <div class="no_data" *ngIf="itsmZwOrders.length == 0 && !loading6">
+					      暂无数据
+					    </div>
+					    <div class="no_data" *ngIf="loading6">
+					      <div class="loadingFull display_flex justify-content_flex-center align-items_center">
+					        <div class="loadingFullInner">
+					          <img src="../../../assets/images/loading.gif" alt="" />
+					          <div>加载中...</div>
+					        </div>
+					      </div>
+					    </div>
+					  </overlay-scrollbars>
+					</div>
         </div>
       </div>
       <div class="btns display_flex justify-content_flex-center align-items_center">
@@ -1787,6 +1852,11 @@
         <button class="btn cancel" nz-button nzType="default" (click)="newOrderCancel()">
           取消
         </button>
+				<ng-container *ngIf="currentTabIndex === '政务值班'">
+				  <button nz-button [nzLoading]="zwLoading" class="btn" nzType="primary" (click)="saveZwOrder()">
+				    保存
+				  </button>
+				</ng-container>
       </div>
     </div>
   </div>
@@ -1878,7 +1948,7 @@
 <!-- 绑定分机 -->
 <app-bind-extension-number [hsmsData]="hsmsData" [itsmData]="itsmData" [coopBtns]="coopBtns" [websocketLoading]="websocketLoading" *ngIf="showBindExtensionNumberModal" (confirmModal)="checkIn($event)" (cancelModal)="cancelBindExtensionNumber($event)"></app-bind-extension-number>
 <!-- 工单范围 -->
-<app-order-scope *ngIf="showInitModal" [hsmsData]="hsmsData" [itsmData]="itsmData" [coopBtns]="coopBtns" (confirmModal)="confirmOrderScope($event)" (cancelModal)="cancelOrderScope($event)"></app-order-scope>
+<app-order-scope *ngIf="showInitModal" [showGovDutyConfig]="showGovDutyConfig" [hsmsData]="hsmsData" [itsmData]="itsmData" [coopBtns]="coopBtns" (confirmModal)="confirmOrderScope($event)" (cancelModal)="cancelOrderScope($event)"></app-order-scope>
 <!-- 展示形式 -->
 <app-display-form *ngIf="showDisplayFormModal" (confirmModal)="confirmDisplayForm($event)" (cancelModal)="cancelDisplayForm($event)"></app-display-form>
 <!-- 消息弹框模板 -->

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

@@ -2568,6 +2568,24 @@
               // overflow: scroll;
               // padding-right: 2%;
               padding-top: 47px;
+							.record{
+								.content{
+									color: #555555;
+									padding: 10px;
+									height: 115px;
+									border-bottom: 1px solid #E9E9E9;
+									.item{
+										display: flex;
+										margin-bottom: 10px;
+										.item-code{
+											color: #000;
+										}
+									}
+									.ju-sb{
+										justify-content: space-between;
+									}
+								}
+							}
             }
           }
         }
@@ -2796,3 +2814,40 @@
     }
   }
 }
+
+.zw-content {
+	width: 100%;
+	padding: 20px;
+	
+	.item{
+		width: 100%;
+		margin-bottom: 20px;
+		.res{
+			color: red;
+			color: 18px;
+		}
+		.label{
+			width: 120px;
+		}
+		.mar{
+			margin-right: 24px;
+		}
+		.ant-cascader-picker{
+			width: 100% !important;
+		}
+	}
+	.df{
+		display: flex;
+		align-items: center;
+		.df-fl{
+			display: flex;
+			align-items: center;
+		}
+		.margin-right{
+			margin-right: 20px;
+		}
+	}
+	.lw-df{
+		display: flex;
+	}
+}

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

@@ -104,6 +104,16 @@ export class FuwutaiComponent implements OnInit {
     static: false,
   })
   osComponentRef17: OverlayScrollbarsComponent;
+	@ViewChild("osComponentRef25", {
+	  read: OverlayScrollbarsComponent,
+	  static: false,
+	})
+	osComponentRef25: OverlayScrollbarsComponent;
+	@ViewChild("osComponentRef26", {
+	  read: OverlayScrollbarsComponent,
+	  static: false,
+	})
+	osComponentRef26: OverlayScrollbarsComponent;
   constructor(
     private fb: FormBuilder,
     public router: Router,
@@ -174,7 +184,8 @@ export class FuwutaiComponent implements OnInit {
 
   // 初始化增删改按钮
   coopBtns: any = {};
-
+	validateZwForm: FormGroup; //新增政务值班表单
+	
   // 获取院区配置配置，是否核酸打印
   isShowNucleicAcidPrinting = false;
   getHospitalConfigList(key) {
@@ -1487,7 +1498,7 @@ export class FuwutaiComponent implements OnInit {
     scopeGroups: [],
     orderScopeRadio: '0',
   }; //转运工单范围相关信息
-
+	showGovDuty:any; //是否开通政务值班
   itsmData: any = {
     checkedHos: [],
     scopeGroups: [],
@@ -1502,6 +1513,7 @@ export class FuwutaiComponent implements OnInit {
     this.checkedHos = scopeInfo.hospitalId ? scopeInfo.hospitalId.id : undefined;
     this.checkedHosDTO = scopeInfo.hospitalId || undefined;
     this.orderScopeRadio = scopeInfo.range + "";
+		this.showGovDuty = scopeInfo.showGovDuty;
     let groupIds = scopeInfo.groupIds || [];
     let dutyGroupList = scopeInfo.dutyGroupList || [];
     this.scopeGroups = dutyGroupList.concat(groupIds);
@@ -1528,7 +1540,8 @@ export class FuwutaiComponent implements OnInit {
       mdv2Switch: scopeInfo.mdv2Switch === 1,
       allDuty: scopeInfo.allDuty === undefined ? 1 : scopeInfo.allDuty,
 			showReassign: scopeInfo.showReassign == null || scopeInfo.showReassign == 0 ? 0 : 1,
-    }
+			showGovDuty: scopeInfo.showGovDuty == null || scopeInfo.showGovDuty == 0 ? 0 : 1,
+		}
     this.flagList.itsmFlag1 = this.itsmData.mdv2Switch;
     this.flagList.itsmFlag2 = this.itsmData.mdv2Switch;
     this.flagList.itsmFlag3 = this.itsmData.mdv2Switch;
@@ -1880,6 +1893,8 @@ export class FuwutaiComponent implements OnInit {
       this.getItsmOrders(this.incidentModel.department);
     } else if (i === 3) {
       this.getDictionaryList();
+    }else if (i === 4) {
+      this.getZwOrders();
     }
   }
   // 服务台新建工单—根据申请科室id来查询未到达工单(科室id)
@@ -1955,6 +1970,45 @@ export class FuwutaiComponent implements OnInit {
         }
       });
   }
+	
+	// 获取政务值班近期记录
+	itsmZwOrders:any=[];
+	getZwOrders(){
+		let postData = {
+		  governmentDuty: {
+				callAccept: this.incidentModel.callID || undefined,
+		    province: {
+		    	id:null
+		    },
+		    city: {
+		    	id:null
+		    },
+		    district: {
+		    	id:null
+		    }
+		  },
+		  idx: 0,
+		  sum: 6,
+		};
+		if(this.province.length>0){
+			postData.governmentDuty.province.id = this.province[0]
+			postData.governmentDuty.city.id = this.province[1]
+			postData.governmentDuty.district.id = this.province[2]
+		}else{
+			delete postData.governmentDuty.province
+			delete postData.governmentDuty.city
+			delete postData.governmentDuty.province
+		}
+		this.loading6 = true;
+		this.mainService
+		  .getFetchDataList("data", "governmentDuty", postData)
+		  .subscribe((data) => {
+		    this.loading6 = false;
+		    if (data.status == 200) {
+		      this.itsmZwOrders = data.list;
+		    }
+		  });
+	}
   //获取知识库状态/类型
   getDictionaryList() {
     let solutionStatus$ = this.mainService.getDictionary('list', 'solution_status', true);
@@ -2053,7 +2107,9 @@ export class FuwutaiComponent implements OnInit {
           this.getItsmOrders(this.incidentModel.department);
         } else if (this.currentRTab === 3) {
           this.getDictionaryList();
-        }
+        } else if (this.currentRTab === 4) {
+					this.getZwOrders();
+				}
         this.orderRefreshTime = this.orderInfoTime;
       }
       if (this.workerRefreshTime == 0) {
@@ -2088,7 +2144,9 @@ export class FuwutaiComponent implements OnInit {
       this.getItsmOrders(this.incidentModel.department);
     } else if (this.currentRTab === 3) {
       this.getDictionaryList();
-    }
+    }else if (this.currentRTab === 4) {
+			this.getZwOrders();
+		}
   }
 
   // 切换顶部tab栏
@@ -2268,10 +2326,14 @@ export class FuwutaiComponent implements OnInit {
           "queryTask": "storageAcceptReassign",
           "assignee": this.tool.getCurrentUserId(),
           "deleteFlag": 0,
-					"showReassign":null
+					"showReassign":null,
+					"showGovDuty":null
         }
 				postData.incidentQuery.incident.showReassign = this.user.user.scope.showReassign==0 || !this.user.user.scope.showReassign ? undefined : this.user.user.scope.showReassign
-      }else if(stateId == 2){
+				postData.incidentQuery.incident.showGovDuty = 
+				this.user.user.scope.showGovDuty==0 || 
+				!this.user.user.scope.showGovDuty ? undefined : this.user.user.scope.showGovDuty
+			}else if(stateId == 2){
         postData.incidentQuery.incident = {
           // "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
           "dutyIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
@@ -2585,22 +2647,32 @@ export class FuwutaiComponent implements OnInit {
   }
   // 获取配置文件写死的任务类型ID(转科，给转出院记录用6)
   patientLogTasktypeLoading: boolean = false;
+	showGovDutyConfig:any;
   patientLogTasktype() {
     if(!this.hsmsData.hsmsSwitch){
       return;
     }
     let postData = {
       idx: 0,
-      sum: 1,
-      systemConfiguration: {
-        keyconfig: "transDeptTypeId",
-      },
+      sum: 999,
+      // systemConfiguration: {
+      //   keyconfig: "transDeptTypeId",
+      // },
     };
     this.patientLogTasktypeLoading = true;
     this.mainService.getFetchDataList("simple/data", "systemConfiguration", postData).subscribe(res => {
       this.patientLogTasktypeLoading = false;
       if (res.status == 200) {
-        this.deathTasktypeIdPatient = res.list.length ? res.list[0].valueconfig : undefined;
+				res.list.forEach((c) => {
+					switch (c.keyconfig) {
+						case "transDeptTypeId":
+							this.deathTasktypeIdPatient =  c.valueconfig
+							break;
+						case "governmentDuty":
+							this.showGovDutyConfig =  c.valueconfig
+							break;
+					}
+				});
       } else {
         this.msg.error('请求数据失败');
       }
@@ -2662,6 +2734,10 @@ export class FuwutaiComponent implements OnInit {
 									break;
 								case "hospitalModel":
 									this.hospitalModel = c[1]
+									if(this.hospitalModel==1){
+										this.incidentModel.hosId = this.tool.getCurrentHospital().id
+										console.log(777777,this.incidentModel.hosId)
+									}
 									break;	
 								case "applicantMustFillIn":
 									this.applicantMustFillIn = c[1]
@@ -2840,6 +2916,9 @@ export class FuwutaiComponent implements OnInit {
     this.radioValueZy = null;
     this.radioValueZyPre = null;
     this.defaultInspectFn();
+		if(this.showGovDuty==1){
+			this.initZwForm()
+		}
     if(this.currentTabIndex === '患者转运'){
       this.getPatientList(this.applyDept, "", patient);
     }
@@ -2858,23 +2937,24 @@ export class FuwutaiComponent implements OnInit {
     this.deptQtList["endDept"] = [];
     this.deptQtList["startStatus"] = 0;
     this.deptQtList["endStatus"] = 0;
+    // if(preCurrentTabIndex === '故障报修'){
+    //   if(this.applyDept){
+    //     this.rightTitle_tab = [
+    //       { id: 0, name: '近期配送' },
+    //       // { id: 1, name: '转出院记录' },
+    //     ]
+    //     this.rightTitleHandler(this.rightTitle_tab[0].id);
+    //   }
 
-    if(preCurrentTabIndex === '故障报修'){
-      if(this.applyDept){
-        this.rightTitle_tab = [
-          { id: 0, name: '近期配送' },
-          // { id: 1, name: '转出院记录' },
-        ]
-        this.rightTitleHandler(this.rightTitle_tab[0].id);
-      }
-
-      let deptObj = this.applicationDeptList.find(v => v.id == this.incidentModel.department);
+    //   let deptObj = this.applicationDeptList.find(v => v.id == this.incidentModel.department);
 
-      if(this.applyDept != this.incidentModel.department){
-        this.applyDept = this.incidentModel.department;
-        this.searchApplicationDepartment('hsms', deptObj ? deptObj.dept : '', undefined, this.incidentModel.department);
-      }
-    }else if(this.currentTabIndex === '故障报修'){
+    //   if(this.applyDept != this.incidentModel.department){
+    //     this.applyDept = this.incidentModel.department;
+    //     this.searchApplicationDepartment('hsms', deptObj ? deptObj.dept : '', undefined, this.incidentModel.department);
+    //   }
+    // }else
+		 
+		 if(this.currentTabIndex === '故障报修'){
       if(this.incidentModel.department){
         this.rightTitle_tab = [
           { id: 2, name: '近期维修' },
@@ -2889,8 +2969,122 @@ export class FuwutaiComponent implements OnInit {
         this.incidentModel.department = this.applyDept;
         this.searchApplicationDepartment('itsm', deptObj ? deptObj.dept : '', undefined, this.applyDept);
       }
-    }
+    }else if (this.currentTabIndex === '政务值班'){
+			this.rightTitle_tab = [
+			  { id: 4, name: '近期记录' },
+			]
+			this.rightTitleHandler(4);
+			
+			let deptObj = this.applicationDepartmentList.find(v => v.id == this.applyDept);
+			
+			if(this.incidentModel.department != this.applyDept && (!isInit || !this.buildType)){
+			  this.incidentModel.department = this.applyDept;
+			  this.searchApplicationDepartment('itsm', deptObj ? deptObj.dept : '', undefined, this.applyDept);
+			}
+		}
   }
+	
+	// 获取省市区
+	priorityData:any = [];
+	nzOptions:any = [];
+	getCity(){
+		this.mainService.getDictionary("tree", "administrative_division").subscribe((res) => {
+			let list = res;
+			list = list.map(v => ({...v, parentId: v.parent ? v.parent : undefined, label: v.name, value: v.id}));
+			this.nzOptions = this.tool.tranListToTreeDataLeaf(list, undefined, "parentId");
+		});
+	}
+	
+	// 选择省市区
+	onProvinceChanges	(values: any): void {
+		this.getZwOrders();
+	}
+	
+	// 初始化政务值班form
+	sketch:any = null;
+	record:any = null;
+	contactsPhone:any = null;
+	contacts:any = null;
+	province:any = [];
+	complainant:any = null;
+	detailedAddress:any = null;
+	initZwForm(){
+		this.sketch = null;
+		this.record = null;
+		this.contactsPhone = null;
+		this.contacts = null;
+		this.province = [];
+		this.complainant = null;
+		this.detailedAddress = null;
+	}
+	
+	// 保存政务值班
+	zwLoading:boolean = false;
+	saveZwOrder(): void{
+		var that = this;
+		if(!this.contacts){
+			this.msg.error('联系人不能为空')
+			return
+		}
+		if(!this.contactsPhone){
+			this.msg.error('联系电话不能为空')
+			return
+		}
+		if(!this.complainant){
+			this.msg.error('投诉人不能为空')
+			return
+		}
+		if(this.province.length==0){
+			this.msg.error('省市区不能为空')
+			return
+		}
+		if(this.detailedAddress.length==0){
+			this.msg.error('详细地址不能为空')
+			return
+		}
+		if(!this.sketch){
+			this.msg.error('简述不能为空')
+			return
+		}
+		if(!this.record){
+			this.msg.error('记录内容不能为空')
+			return
+		}
+		let data = {
+			governmentDuty:{
+				sketch: this.sketch,
+				record: this.record,
+				contactsPhone: this.contactsPhone,
+				contacts: this.contacts,
+				complainant: this.complainant,
+				detailedAddress: this.complainant,
+				province: {
+					id: this.province[0]
+				},
+				city: {
+					id: this.province[1]
+				},
+				district: {
+					id: this.province[2]
+				},
+				callAccept: this.incidentModel.callID || undefined
+			}
+		};
+		that.zwLoading = true;
+		that.mainService
+			.dataPost("addData", "governmentDuty", data)
+			.subscribe((data) => {
+				that.zwLoading = false;
+				that.initZwForm();
+				if (data.status == 200) {
+					this.getZwOrders();
+					that.showPromptModal("新增", true, "");
+				} else {
+					that.showPromptModal("新增", false, data.msg);
+				}
+			});
+	}
+	
   // 获取患者信息
   searchPatientList(id, searchWords) {
     this.searchPatientListSubject.next([id, searchWords]);
@@ -3574,6 +3768,7 @@ export class FuwutaiComponent implements OnInit {
     if(!this.hsmsData.hsmsSwitch && !this.itsmData.mdv2Switch){
       return;
     }
+		console.log(8787878787878,type)
     let keyWord = "";
     if (e && e !== "&ks&" && e !== "&go&") {
       keyWord = e;
@@ -3828,7 +4023,9 @@ export class FuwutaiComponent implements OnInit {
         this.getItsmOrders(this.incidentModel.department);
       } else if (this.currentRTab === 3) {
         this.getDictionaryList();
-      }
+      }else if (this.currentRTab === 4) {
+				this.getZwOrders();
+			}
     } else if (phone === "&go&") {
       if (this.currentTabIndex == "患者转运") {
         //患者转运
@@ -3843,7 +4040,9 @@ export class FuwutaiComponent implements OnInit {
         this.getItsmOrders(this.incidentModel.department);
       } else if (this.currentRTab === 3) {
         this.getDictionaryList();
-      }
+      }else if (this.currentRTab === 4) {
+				this.getZwOrders();
+			}
     } else if (phone === "&same&") {
       if (this.currentTabIndex == "患者转运") {
         //患者转运
@@ -3858,7 +4057,9 @@ export class FuwutaiComponent implements OnInit {
         this.getItsmOrders(this.incidentModel.department);
       } else if (this.currentRTab === 3) {
         this.getDictionaryList();
-      }
+      }else if (this.currentRTab === 4) {
+				this.getZwOrders();
+			}
     }
   }
 
@@ -4297,6 +4498,13 @@ export class FuwutaiComponent implements OnInit {
     // 运维
     if(this.itsmData.mdv2Switch){
       this.workTypesArrange = [{key:'故障报修', value: []}];
+			if(this.showGovDuty==1){
+				this.workTypesArrange.push({
+					key:'政务值班', value: []
+				})
+				this.initZwForm();
+				this.getCity();
+			}
       if(!this.hsmsData.hsmsSwitch){
         console.log('workTypesArrange', this.workTypesArrange);
         // 是否显示操作项
@@ -5565,7 +5773,9 @@ export class FuwutaiComponent implements OnInit {
       this.getItsmOrders(this.incidentModel.department);
     } else if (this.currentRTab === 3) {
       this.getDictionaryList();
-    }
+    }else if (this.currentRTab === 4) {
+			this.getZwOrders();
+		}
 		// this.newOrderShow = false;
 		// this.newOrderShowOpen = false;
     this.fixedTab = "";

src/app/views/government-duty/government-duty-routing.module.ts

@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { GovernmentDutyComponent } from './government-duty.component';
+
+
+const routes: Routes = [{
+  path: '',
+  component: GovernmentDutyComponent
+}];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class GovernmentDutyRoutingModule { }

src/app/views/government-duty/government-duty.component.html

@@ -0,0 +1,247 @@
+<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 width-105">记录时间区间：</span>
+				  <nz-range-picker nzShowTime [(ngModel)]="dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
+				</div>
+				<div class="list-template__searchItem">
+				  <span class="label">来电电话</span>：
+				  <input nz-input class="formItem" [(ngModel)]="incomingCall" placeholder="请输入来电电话" nzSize="default" />
+				</div>
+				<div class="list-template__searchItem">
+				  <span class="label">投诉人</span>：
+				  <input nz-input class="formItem" [(ngModel)]="complainant" placeholder="请输入投诉人" nzSize="default" />
+				</div>
+				<div class="list-template__searchItem">
+				  <span class="label">省市区：</span>
+					<nz-cascader [nzOptions]="nzOptions" [(ngModel)]="district" (ngModelChange)="onChanges($event)"></nz-cascader>
+				</div>
+      </div>
+      <div nz-col nzXl='6' class="list-template__btns">
+        <button nz-button class="btn default" (click)='search()'>搜索</button>
+        <button nz-button class="btn ml8 default" (click)='reset()'>重置</button>
+        <button nz-button *ngIf="coopBtns.add" class="btn ml8 default" (click)="showModal()">新增</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>单号</th>
+            <th>来电电话</th>
+            <th>投诉人</th>
+            <th>记录人</th>
+            <th>记录内容</th>
+						<th>记录时间</th>
+						<th>联系电话</th>
+						<th>省/市/区/详细地址</th>
+            <th nzWidth="180px">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData;let index=index;">
+            <td>{{ data.govDutySign||'-' }}</td>
+            <td>{{ data.incomingCall||'-' }}</td>
+            <td>{{ data.complainant||'-'}}</td>
+						<td>{{ data.userDTO && data.userDTO.name ||'-'}}</td>
+            <td>{{ data.record||'-' }}</td>
+            <td>{{ data.addTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
+            <td>{{ data.contactsPhone || '-'}}</td>
+						<td>
+							{{ data.province && data.province.name || '-'}}/
+							{{ data.city && data.city.name || '-'}}/
+							{{ data.district && data.district.name || '-'}}/
+							{{ data.detailedAddress || '-'}}
+						</td>
+            <td>
+              <div class="coop">
+                <span *ngIf="coopBtns.edit" (click)="edit(data)">编辑</span>
+                <span *ngIf="coopBtns.del" (click)="del(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>
+<!-- 新增/编辑模态框 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="modal">
+  <div class="modalBody">
+    <div class="title">{{add?"新增":"编辑"}}<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <div class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="incomingCall">来电电话</nz-form-label>
+          <nz-form-control nzErrorTip="请选择来电电话!">
+            <nz-input-group>
+        			<input nz-input type="number" class="formItem" formControlName="incomingCall" placeholder="请输入来电电话" nzSize="default" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label class="margin-label" [nzSm]="6" [nzXs]="24" nzRequired nzFor="sketch">简述</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择简述!">
+				    <nz-input-group>
+							<textarea formControlName="sketch" nz-input rows="1" placeholder="请输入简述"></textarea>
+						</nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label class="margin-label" [nzSm]="6" [nzXs]="24" nzRequired nzFor="record">记录内容</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择记录内容!">
+				    <nz-input-group>
+							<textarea formControlName="record" nz-input rows="3" placeholder="请输入记录内容"></textarea>
+						</nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="contactsPhone">联系电话</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择联系电话!">
+				    <nz-input-group>
+							<input nz-input type="number" class="formItem" formControlName="contactsPhone" placeholder="请输入联系电话" nzSize="default" />
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="contacts">联系人</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择联系人!">
+				    <nz-input-group>
+							<input nz-input class="formItem" formControlName="contacts" placeholder="请输入联系人" nzSize="default" />
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="complainant">投诉人</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择投诉人!">
+				    <nz-input-group>
+							<input nz-input class="formItem" formControlName="complainant" placeholder="请输入投诉人" nzSize="default" />
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="province">省市区</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择省市区!">
+				    <nz-input-group>
+							<nz-cascader [nzOptions]="nzOptions" formControlName="province" placeholder="请选择省市区" (ngModelChange)="onProvinceChanges($event)"></nz-cascader>
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="detailedAddress">详细地址</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择详细地址!">
+				    <nz-input-group>
+							<input nz-input class="formItem" formControlName="detailedAddress" placeholder="请输入详细地址" nzSize="default" />
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 分配任务 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="allocationModal">
+  <div class="modalBody">
+    <div class="title">分配任务<i class="icon_transport transport-guanbi" (click)="hideAllocationModal()"></i>
+    </div>
+    <div class="content">
+      <form nz-form [formGroup]="validateAllocationForm" class="addForm" (ngSubmit)="submitAllocationForm()">
+				
+				<nz-form-item>
+				  <nz-form-label class="margin-label" [nzSm]="6" [nzXs]="24" nzRequired nzFor="taskContent">任务内容</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择任务内容!">
+				    <nz-input-group>
+							<textarea formControlName="taskContent" nz-input rows="3" placeholder="请输入任务内容"></textarea>
+						</nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="executor">执行人</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择执行人!">
+				    <nz-input-group>
+							<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+							  (nzOnSearch)="changeUser($event)" nzAllowClear nzPlaceHolder="请选择执行人" formControlName="executor">
+							  <ng-container *ngFor="let option of dutyUser">
+							    <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+								<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+								  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+								</nz-option>
+							</nz-select>
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+          <nz-form-label [nzSm]="8" [nzXs]="24" nzRequired nzFor="estimatedCompletionTime">预计完成时间</nz-form-label>
+          <nz-form-control nzErrorTip="请选择预计完成时间!">
+            <nz-input-group>
+              <nz-date-picker
+								class="width-100"
+								nzShowTime
+								nzFormat="yyyy-MM-dd HH:mm:ss"
+								nzPlaceHolder="请选择预计完成时间"
+								formControlName="estimatedCompletionTime"
+								(ngModelChange)="onAllocationChange($event)"
+							></nz-date-picker>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitAllocationForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideAllocationModal()">取消</button>
+    </div>
+  </div>
+</div>
+<!-- 任务完成 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="accomplishModal">
+  <div class="modalBody">
+    <div class="title">任务完成<i class="icon_transport transport-guanbi"></i>
+    </div>
+    <div class="content padding-bottom">
+			<span class="label"><span class="sign">*</span> 月度任务总结:</span>
+      <textarea [(ngModel)]="taskConclusion" nz-input rows="3" placeholder="请输入任务内容"></textarea>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitAccomplishForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideAccomplishModal()">取消</button>
+    </div>
+  </div>
+</div>
+<!-- 删除模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading" 
+  (confirmDelEvent)="confirmDel()" (cancelDelEvent)="cancelDel()" content="您确认要删除吗？" confirmTxt="是" cancelTxt="否">
+</app-dialog-delete>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo"></app-prompt-modal>
+
+<!-- 查看详情 -->
+<router-outlet (deactivate)="getList()"></router-outlet>
+

src/app/views/government-duty/government-duty.component.less

@@ -0,0 +1,178 @@
+@import "../../../../src/theme.less";
+.width-105{
+	width: 105px !important;
+}
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 60%;
+    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: 40%;
+      height: auto;
+			
+			.padding-bottom{
+				padding-bottom: 20px !important;
+				.label{
+					margin-bottom: 5px;
+					.sign{
+						color: red;
+						font-size: 15px;
+					}
+				}
+			}
+			
+      .content {
+        width: 100%;
+        // height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 450px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 8px;
+						.ant-select{
+							width: 100% !important;
+						}
+						.ant-input-number{
+							width: 100% !important;
+						}
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+						.margin-label{
+							margin-bottom: 5px !important;
+						}
+						.ant-calendar-picker{
+							width: 100% !important;
+						}
+						.ant-cascader-picker{
+							width: 100% !important;
+						}
+          }
+					.address{
+					  position: relative;
+					  .addressList{
+					    position: absolute;
+					    bottom: 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;
+					      }
+					    }
+					  }
+					}
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+						.ant-input-number{
+							width: 100% !important;
+						}
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

src/app/views/government-duty/government-duty.component.ts

@@ -0,0 +1,452 @@
+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 { forkJoin, Subject } from "rxjs";
+import { debounceTime } from "rxjs/operators";
+import { NzMessageService } from "ng-zorro-antd";
+import { format, startOfDay, endOfDay } from 'date-fns';
+
+@Component({
+  selector: "app-government-duty",
+  templateUrl: "./government-duty.component.html",
+  styleUrls: ["./government-duty.component.less"],
+})
+export class GovernmentDutyComponent 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
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+	validateAllocationForm: FormGroup; //新增/编辑表单
+  coopId: number; //表格中执行操作的id
+  dept: any; //所属科室
+  drugCode; //编号
+  name; //名称
+  userType: any; //用户类型
+  hosId: any; //院区（搜索）
+  userGroup; //所属组
+  userGroup1; //所属组(搜索)
+  userTypes: Array<any>; //所有用户类型
+  alldepart: any = []; //所有所属科室
+  alldepart1: any = []; //所有所属科室(搜索)
+  hospitals1: any = []; //院区列表(搜索)
+	drugTypeData: any = []; //药品类型
+  allUserGroup: Array<any>; //所有用户组
+  allUserGroup1: Array<any>; //用户组(搜索)
+  allUserRole: Array<any>; //所有角色
+  pageIndex: number = 1; //页码
+  listLength: number = 10; //总条数
+  pageSize: number = 10; //每页条数
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+
+  btnLoading: boolean = false; //提交按钮loading状态
+  wxRequired = false; //新增或编辑用户的时候，微信号是否必填
+  changeInpSubject = new Subject(); //防抖
+	searchParentDeptSubject = new Subject();
+	specimenName:any = null;
+	containPosition:any = null;
+	placeList:any = [];
+	systemList:any = [];
+	apparatusList:any = [];
+	specimenNameList:any = [];
+	addressLoading:any = false;
+	complainant:any;
+	incomingCall:any;
+	options:any = [];
+	nzOptions:any;
+	district:any = [];
+	stateData:any = [];
+	
+  ngOnInit() {
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+		this.hosId = this.tool.getCurrentHospital().id;
+    this.initForm();
+		this.getList();
+		this.getDicData();
+  }
+	
+	// 选择省市区
+	onChanges(values: any): void {
+		// console.log(values, this.district);
+	}
+	
+	onProvinceChanges	(values: any): void {
+		console.log(111,values);
+	}
+	
+  // 初始化增删改按钮
+  coopBtns: any = {};
+  // 搜索
+  search() {
+    this.pageIndex = 1;
+    this.getList();
+  }
+  // 重置
+  reset() {
+    this.pageIndex = 1;
+    this.complainant = null;
+    this.incomingCall = null;
+    this.startDate = null;
+    this.endDate = null;
+		this.dateRange = [];
+		this.district = [];
+    this.getList();
+  }
+	
+  // 表格数据
+  loading1 = false;
+  getList() {
+    let data = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      governmentDuty: {
+				complainant: this.complainant || undefined,
+				incomingCall: this.incomingCall || undefined,
+				startTime: this.startDate || undefined,
+				endTime: this.endDate || undefined,
+				province: {
+					id:null
+				},
+				city: {
+					id:null
+				},
+				district: {
+					id:null
+				}
+      }
+    };
+		if(this.district.length>0){
+			data.governmentDuty.province.id = this.district[0]
+			data.governmentDuty.city.id = this.district[1]
+			data.governmentDuty.district.id = this.district[2]
+		}else{
+			delete data.governmentDuty.province
+			delete data.governmentDuty.city
+			delete data.governmentDuty.district
+		}
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("data", "governmentDuty", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        this.listOfData = data.list;
+        this.listLength = data.totalNum;
+      });
+  }
+	
+	// 日期选择
+	startDate: string; //发起时间开始
+	endDate: string; //发起时间结束
+	dateRange: any = [];
+	changeDate(result?): void {
+	  if (result.length==0) {
+	    this.startDate = this.endDate = null;
+	    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');
+	  this.dateRange = [this.startDate,this.endDate]
+	}
+	
+	// 获取责任人
+	dutyUser:any= [];
+	getAllUser(name) {
+	  let data:any = {
+	    user: {
+				name,
+	      hosIds: this.hosId,
+	    },
+	    idx: 0,
+	    sum: 20,
+	  };
+	  this.mainService
+	    .getFetchDataList("data", "user", data)
+	    .subscribe((data) => {
+				this.isLoading = false
+				this.dutyUser = data.list
+	    });
+	}
+	
+	// 搜索责任人
+	isLoading = false;
+	changeUser(e,type) {
+	  this.searchParentDeptSubject.next([e,type]);
+	}
+	
+	// 获取省市区
+	priorityData:any = [];
+	getDicData(){
+		this.mainService.getDictionary("tree", "administrative_division").subscribe((res) => {
+			let list = res;
+			list = list.map(v => ({...v, parentId: v.parent ? v.parent : undefined, label: v.name, value: v.id}));
+			this.nzOptions = this.tool.tranListToTreeDataLeaf(list, undefined, "parentId");
+		});
+	}
+	
+	// 分配任务
+	allocationModal:boolean = false;
+	allocation(data){
+		this.coopId = data.id;
+		this.allocationModal = true
+		this.initAllocationForm();
+	}
+	
+	hideAllocationModal() {
+	  this.allocationModal = false;
+		this.initAllocationForm();
+	}
+	
+	// 初始化新增form表单
+	initAllocationForm() {
+	  this.validateAllocationForm = this.fb.group({
+	    taskContent: [null, [Validators.required]],
+			executor: [null, [Validators.required]],
+	    estimatedCompletionTime: [null, [Validators.required]],
+	  });
+	}
+	
+	onAllocationChange(result?): void {
+		console.log('Selected Time: ', result);
+		let endTime = format(result, 'yyyy-MM-dd HH:mm:ss');
+		this.validateAllocationForm.controls.estimatedCompletionTime.setValue(endTime);
+	}
+		
+	// 表单提交
+	submitAllocationForm(): void {
+	  var that = this;
+		for (const i in that.validateAllocationForm.controls) {
+		  that.validateAllocationForm.controls[i].markAsDirty();
+		  that.validateAllocationForm.controls[i].updateValueAndValidity();
+		}
+		if (that.validateAllocationForm.invalid) return;
+	  let data = {
+			governmentDutyList:{
+				taskContent: this.validateAllocationForm.value.taskContent,
+				executor: this.validateAllocationForm.value.executor,
+				estimatedCompletionTime: this.validateAllocationForm.value.estimatedCompletionTime,
+				governmentDuty: that.coopId,
+			}
+	  };
+
+		that.btnLoading = true;
+	  that.mainService
+	    .dataPost("addData", "governmentDutyList", data)
+	    .subscribe((data) => {
+	      that.btnLoading = false;
+	      that.hideAllocationModal();
+	      if (data.status == 200) {
+	        that.showPromptModal("分配", true, "");
+	      } else {
+	        that.showPromptModal("分配", false, data.msg);
+	      }
+	    });
+	}
+	
+	// 任务完成
+	accomplishModal:boolean = false;
+	taskConclusion:any;
+	accomplish(data){
+		this.coopId = data.id;
+		this.taskConclusion = null;
+		this.accomplishModal = true
+	}
+	
+	// 任务完成提交
+	submitAccomplishForm(){
+		if(!this.taskConclusion){
+			this.message.error('月度任务总结不能为空！')
+			return
+		}
+		let data = {
+			governmentDuty:{
+				taskConclusion: this.taskConclusion,
+				operationType: 'taskDone',
+				id:this.coopId
+			}
+		};
+		this.btnLoading = true;
+		this.mainService
+		  .dataPost("updData", "governmentDuty", data)
+		  .subscribe((data) => {
+		    this.btnLoading = false;
+		    this.hideAccomplishModal();
+		    if (data.status == 200) {
+		      this.showPromptModal("操作", true, "");
+		    } else {
+		      this.showPromptModal("操作", false, data.msg);
+		    }
+		  });
+	}
+	
+	hideAccomplishModal(){
+		this.accomplishModal = false
+	}
+	
+  // 新增弹框
+  showModal() {
+    this.add = true;
+		this.modal = true;
+		this.itemData = null;
+    this.initForm();
+  }
+  hideModal() {
+    this.modal = false;
+    this.initForm();
+  }
+	
+  // 初始化新增form表单
+  initForm() {
+    this.validateForm = this.fb.group({
+			incomingCall:[null, []],
+      sketch: [null, [Validators.required]],
+      record: [null, [Validators.required]],
+			contactsPhone: [null, [Validators.required]],
+      contacts: [null, [Validators.required]],
+      province: [null, [Validators.required]],
+			detailedAddress: [null, [Validators.required]],
+			complainant: [null, [Validators.required]],
+    });
+  }
+		
+  // 表单提交
+  submitForm(): void {
+    var that = this;
+		for (const i in that.validateForm.controls) {
+		  that.validateForm.controls[i].markAsDirty();
+		  that.validateForm.controls[i].updateValueAndValidity();
+		}
+		if (that.validateForm.invalid) return;
+    let data = {
+			governmentDuty:{
+				...this.itemData,
+				incomingCall:this.validateForm.value.incomingCall,
+				sketch: this.validateForm.value.sketch,
+				record: this.validateForm.value.record,
+				contactsPhone: this.validateForm.value.contactsPhone,
+				contacts: this.validateForm.value.contacts,
+				detailedAddress: this.validateForm.value.detailedAddress,
+				complainant: this.validateForm.value.complainant,
+				province: {
+					id: this.validateForm.value.province[0]
+				},
+				city: {
+					id: this.validateForm.value.province[1]
+				},
+				district: {
+					id: this.validateForm.value.province[2]
+				},
+				state:{
+					id: null
+				},
+				id:0,
+			}
+    };
+    if (!that.add) {
+      data.governmentDuty.id = that.coopId;
+			data.governmentDuty.state.id =  this.itemData.state.id
+    }else{
+			delete data.governmentDuty.id
+			delete data.governmentDuty.state.id
+		}
+		that.btnLoading = true;
+    that.mainService
+      .dataPost(this.add ? "addData":"updData", "governmentDuty", 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);
+        }
+      });
+  }
+
+  // 编辑
+	itemData:any;
+  edit(data) {
+		this.add = false
+		this.itemData = data;
+		this.coopId = data.id;
+		this.validateForm.controls.incomingCall.setValue(data.incomingCall);
+		this.validateForm.controls.sketch.setValue(data.sketch);
+		this.validateForm.controls.record.setValue(data.record);
+		this.validateForm.controls.contactsPhone.setValue(data.contactsPhone)
+		this.validateForm.controls.contacts.setValue(data.contacts);
+		this.validateForm.controls.detailedAddress.setValue(data.detailedAddress);
+		this.validateForm.controls.complainant.setValue(data.complainant);
+		this.validateForm.controls.province.setValue([data.province && data.province.id || null, data.city && data.city.id || null, data.district && data.district.id || null]);
+		this.modal = true
+  }
+
+  // 删除
+  delModal: boolean = false; //删除模态框
+  del(data) {
+    let that = this;
+    that.coopId = data.id;
+    that.delModal = true;
+  }
+	
+	// 取消删除弹框
+	cancelDel(){
+		this.hideDelModal();
+	}
+	
+  // 确认删除
+  confirmDel() {
+    let that = this;
+    that.btnLoading = true;
+    that.mainService
+      .apiPublicData('rmvData', 'governmentDuty', [this.coopId])
+      .subscribe((data) => {
+        that.btnLoading = false;
+        that.hideDelModal();
+        if (data["status"] == 200) {
+          that.showPromptModal("删除", true, "");
+        } else {
+          that.showPromptModal("删除", false, data["msg"]);
+        }
+      });
+  }
+	
+	// 展示信息提示框（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();
+	}
+	
+  // 关闭删除模态框
+  hideDelModal() {
+    this.delModal = false;
+  }
+}
+

src/app/views/government-duty/government-duty.module.ts

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

src/app/views/home/home.component.ts

@@ -410,7 +410,7 @@ export class HomeComponent implements OnInit {
 		if(data.orderType.value==1){
 			this.detailModalShow = true;
 		}else{
-			this.router.navigateByUrl("/main/orderManagement/orderDetail/" + data.workOrder);
+			this.router.navigateByUrl("/main/home/orderDetail/" + data.workOrder);
 		}
 	}
 	

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

@@ -647,7 +647,28 @@ const routes: Routes = [
 			{
 			  path: "personageDocument",
 			  loadChildren: () => import("../personage-document/personage-document.module").then((m) => m.PersonageDocumentModule),
-			}
+			},
+			// 任务管理-月度任务
+			{
+			  path: "monthlyTask",
+			  loadChildren: () => import("../monthly-task/monthly-task.module").then((m) => m.MonthlyTaskModule),
+			},
+			// 任务管理-任务列表
+			{
+			  path: "taskList",
+			  loadChildren: () => import("../task-list/task-list.module").then((m) => m.TaskListModule),
+			},
+			// 任务管理-任务清单
+			{
+			  path: "taskInventory",
+			  loadChildren: () => import("../task-inventory/task-inventory.module").then((m) => m.TaskInventoryModule),
+			},
+			// 故障管理-政务值班
+			{
+			  path: "governmentDuty",
+			  loadChildren: () => import("../government-duty/government-duty.module").then((m) => m.GovernmentDutyModule),
+			},
+			
     ],
   },
 ];

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

@@ -30,8 +30,14 @@
     <nz-header>
       <div class="app-header display_flex justify-content_space-between align-items_center">
         <div class="left">
-					<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-tianjiahover green" *ngIf='speediness' (click)="speedinessAdd()" 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">
+              <div class="dropdownItem" *ngIf="speediness" (click)="speedinessAdd()">新增报修</div>
+          	</div>
+          </div>
+					<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>
           <i class="icon_transport transport-tongji-2 green" *ngIf="newStatisticsRole" (click)="toNewStatistics()" nz-tooltip nzTooltipTitle="统计"></i>

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

@@ -4042,7 +4042,8 @@ export class MainComponent implements OnInit {
   // 下拉
   showDropdown:boolean = false;
   showDropdown1:boolean = false;
-
+	showFastDropdown:boolean = false;
+	
   // 选择院区
   selectHospital(){
     this.hosFlag1 = true

src/app/views/monthly-task/monthly-task-routing.module.ts

@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { MonthlyTaskComponent } from './monthly-task.component';
+
+
+const routes: Routes = [{
+  path: '',
+  component: MonthlyTaskComponent
+}];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class MonthlyTaskRoutingModule { }

src/app/views/monthly-task/monthly-task.component.html

@@ -0,0 +1,261 @@
+<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>：
+				  <input nz-input class="formItem" [(ngModel)]="taskTitle" 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)]="liableUser">
+					  <ng-container *ngFor="let option of dutyUser">
+					    <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+					  </ng-container>
+					  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+					    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+					  </nz-option>
+					</nz-select>
+				</div>
+        <div class="list-template__searchItem">
+          <span class="label">优先级：</span>
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择优先级" [(ngModel)]="priority">
+            <ng-container *ngFor="let option of priorityData">
+              <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+            </ng-container>
+          </nz-select>
+        </div>
+				<div class="list-template__searchItem">
+				  <span class="label width-105">开始时间区间：</span>
+				  <nz-range-picker nzShowTime [(ngModel)]="dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
+				</div>
+      </div>
+      <div nz-col nzXl='6' class="list-template__btns">
+        <button nz-button class="btn default" (click)='search()'>搜索</button>
+        <button nz-button class="btn ml8 default" (click)='reset()'>重置</button>
+        <button nz-button *ngIf="coopBtns.add" class="btn ml8 default" (click)="showModal()">新增</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>任务标题</th>
+            <th>任务描述</th>
+            <th>优先级</th>
+            <th>责任人</th>
+            <th>开始时间</th>
+						<th>结束时间</th>
+						<th>状态</th>
+            <th nzWidth="250px">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData;let index=index;">
+            <td>{{ data.taskTitle||'-' }}</td>
+            <td>{{ data.taskDescribe||'-' }}</td>
+            <td>{{ data.priority && data.priority.name||'-'}}</td>
+            <td>{{ data.liableUserDTO && data.liableUserDTO.name||'-' }}</td>
+            <td>{{ data.startTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
+            <td>{{ data.endTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
+						<td>{{ data.state && data.state.name||'-'}}</td>
+            <td>
+              <div class="coop">
+                <span *ngIf="coopBtns.edit && data.state.value==1" (click)="edit(data)">编辑</span>
+                <span *ngIf="coopBtns.del && data.state.value==1" (click)="del(data)">删除</span>
+								<span *ngIf="coopBtns.allocation && data.state.value==1" (click)="allocation(data)">分配任务</span>
+								<span *ngIf="coopBtns.accomplish && data.state.value==1" (click)="accomplish(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>
+<!-- 新增/编辑模态框 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="modal">
+  <div class="modalBody">
+    <div class="title">{{add?"新增":"编辑"}}<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <div class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="taskTitle">任务标题</nz-form-label>
+          <nz-form-control nzErrorTip="请选择任务标题!">
+            <nz-input-group>
+        			<input nz-input class="formItem" formControlName="taskTitle" placeholder="请输入任务标题" nzSize="default" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label class="margin-label" [nzSm]="6" [nzXs]="24" nzRequired nzFor="taskDescribe">任务描述</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择任务描述!">
+				    <nz-input-group>
+							<textarea formControlName="taskDescribe" nz-input rows="3" placeholder="请输入任务描述"></textarea>
+						</nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="priority">优先级</nz-form-label>
+          <nz-form-control nzErrorTip="请选择优先级!">
+            <nz-input-group>
+							<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择优先级" formControlName="priority">
+							  <ng-container *ngFor="let option of priorityData">
+							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+							</nz-select>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="liableUser">责任人</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择责任人!">
+				    <nz-input-group>
+							<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+							  (nzOnSearch)="changeUser($event)" nzAllowClear nzPlaceHolder="请选择责任人" formControlName="liableUser">
+								<ng-container *ngFor="let option of dutyUser">
+								  <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+								</ng-container>
+								<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+								  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+								</nz-option>
+							</nz-select>
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<div class="df">
+					<nz-form-item>
+					  <nz-form-label [nzSm]="8" [nzXs]="24" nzRequired nzFor="startTime">开始时间</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择开始时间!">
+					    <nz-input-group>
+					      <nz-date-picker
+									nzShowTime
+									nzFormat="yyyy-MM-dd HH:mm:ss"
+									nzPlaceHolder="请选择开始时间"
+									formControlName="startTime"
+									(ngModelChange)="onStartChange($event)"
+								></nz-date-picker>
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item>
+					  <nz-form-label [nzSm]="8" [nzXs]="24" nzRequired nzFor="endTime">结束时间</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择结束时间!">
+					    <nz-input-group>
+					      <nz-date-picker
+									nzShowTime
+									nzFormat="yyyy-MM-dd HH:mm:ss"
+									nzPlaceHolder="请选择结束时间"
+									formControlName="endTime"
+									(ngModelChange)="onEndChange($event)"
+								></nz-date-picker>
+					    </nz-input-group>
+					  </nz-form-control>
+					</nz-form-item>
+				</div>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 分配任务 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="allocationModal">
+  <div class="modalBody">
+    <div class="title">分配任务<i class="icon_transport transport-guanbi" (click)="hideAllocationModal()"></i>
+    </div>
+    <div class="content">
+      <form nz-form [formGroup]="validateAllocationForm" class="addForm" (ngSubmit)="submitAllocationForm()">
+				
+				<nz-form-item>
+				  <nz-form-label class="margin-label" [nzSm]="6" [nzXs]="24" nzRequired nzFor="taskContent">任务内容</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择任务内容!">
+				    <nz-input-group>
+							<textarea formControlName="taskContent" nz-input rows="3" placeholder="请输入任务内容"></textarea>
+						</nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="executor">执行人</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择执行人!">
+				    <nz-input-group>
+							<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+							  (nzOnSearch)="changeUser($event)" nzAllowClear nzPlaceHolder="请选择执行人" formControlName="executor">
+							  <ng-container *ngFor="let option of dutyUser">
+							    <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+								<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+								  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+								</nz-option>
+							</nz-select>
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+          <nz-form-label [nzSm]="8" [nzXs]="24" nzRequired nzFor="estimatedCompletionTime">预计完成时间</nz-form-label>
+          <nz-form-control nzErrorTip="请选择预计完成时间!">
+            <nz-input-group>
+              <nz-date-picker
+								class="width-100"
+								nzShowTime
+								nzFormat="yyyy-MM-dd HH:mm:ss"
+								nzPlaceHolder="请选择预计完成时间"
+								formControlName="estimatedCompletionTime"
+								(ngModelChange)="onAllocationChange($event)"
+							></nz-date-picker>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitAllocationForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideAllocationModal()">取消</button>
+    </div>
+  </div>
+</div>
+<!-- 任务完成 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="accomplishModal">
+  <div class="modalBody">
+    <div class="title">任务完成<i class="icon_transport transport-guanbi"></i>
+    </div>
+    <div class="content padding-bottom">
+			<span class="label"><span class="sign">*</span> 月度任务总结:</span>
+      <textarea [(ngModel)]="taskConclusion" nz-input rows="3" placeholder="请输入任务内容"></textarea>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitAccomplishForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideAccomplishModal()">取消</button>
+    </div>
+  </div>
+</div>
+<!-- 删除模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading" 
+  (confirmDelEvent)="confirmDel()" (cancelDelEvent)="cancelDel()" content="您确认要删除吗？" confirmTxt="是" cancelTxt="否">
+</app-dialog-delete>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo"></app-prompt-modal>
+
+<!-- 查看详情 -->
+<router-outlet (deactivate)="getList()"></router-outlet>
+

src/app/views/monthly-task/monthly-task.component.less

@@ -0,0 +1,180 @@
+@import "../../../../src/theme.less";
+.width-105{
+	width: 105px !important;
+}
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 60%;
+    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: 40%;
+      height: auto;
+			
+			.padding-bottom{
+				padding-bottom: 20px !important;
+				.label{
+					margin-bottom: 5px;
+					.sign{
+						color: red;
+						font-size: 15px;
+					}
+				}
+			}
+			
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        // max-height: 500px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 8px;
+						.ant-select{
+							width: 100% !important;
+						}
+						.ant-input-number{
+							width: 100% !important;
+						}
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+							overflow: visible !important;
+            }
+						.margin-label{
+							margin-bottom: 5px !important;
+						}
+						.ant-calendar-picker{
+							width: 100% !important;
+						}
+          }
+					.address{
+					  position: relative;
+					  .addressList{
+					    position: absolute;
+					    bottom: 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;
+					      }
+					    }
+					  }
+					}
+					.df{
+						display: flex;
+						justify-content: space-between;
+					}
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+						.ant-input-number{
+							width: 100% !important;
+						}
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

src/app/views/monthly-task/monthly-task.component.ts

@@ -0,0 +1,436 @@
+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 { forkJoin, Subject } from "rxjs";
+import { debounceTime } from "rxjs/operators";
+import { NzMessageService } from "ng-zorro-antd";
+import { format, startOfDay, endOfDay } from 'date-fns';
+
+@Component({
+  selector: "app-monthly-task",
+  templateUrl: "./monthly-task.component.html",
+  styleUrls: ["./monthly-task.component.less"],
+})
+export class MonthlyTaskComponent 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
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+	validateAllocationForm: FormGroup; //新增/编辑表单
+  coopId: number; //表格中执行操作的id
+  dept: any; //所属科室
+  drugCode; //编号
+  name; //名称
+  userType: any; //用户类型
+  hosId: any; //院区（搜索）
+  userGroup; //所属组
+  userGroup1; //所属组(搜索)
+  userTypes: Array<any>; //所有用户类型
+  alldepart: any = []; //所有所属科室
+  alldepart1: any = []; //所有所属科室(搜索)
+  hospitals1: any = []; //院区列表(搜索)
+	drugTypeData: any = []; //药品类型
+  allUserGroup: Array<any>; //所有用户组
+  allUserGroup1: Array<any>; //用户组(搜索)
+  allUserRole: Array<any>; //所有角色
+  pageIndex: number = 1; //页码
+  listLength: number = 10; //总条数
+  pageSize: number = 10; //每页条数
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+
+  btnLoading: boolean = false; //提交按钮loading状态
+  wxRequired = false; //新增或编辑用户的时候，微信号是否必填
+  changeInpSubject = new Subject(); //防抖
+	searchParentDeptSubject = new Subject();
+	specimenName:any = null;
+	containPosition:any = null;
+	placeList:any = [];
+	systemList:any = [];
+	apparatusList:any = [];
+	specimenNameList:any = [];
+	addressLoading:any = false;
+	priority:any;
+	liableUser:any;
+	taskTitle:any;
+	
+  ngOnInit() {
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+		this.hosId = this.tool.getCurrentHospital().id;
+		this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
+			this.isLoading = true;
+			this.getAllUser(e[0])
+		});
+    this.initForm();
+		this.getList();
+		this.getAllUser('');
+		this.getPriorityData();
+  }
+
+  // 初始化增删改按钮
+  coopBtns: any = {};
+  // 搜索
+  search() {
+    this.pageIndex = 1;
+    this.getList();
+  }
+  // 重置
+  reset() {
+    this.pageIndex = 1;
+    this.priority = null;
+    this.liableUser = null;
+    this.taskTitle = null;
+    this.startDate = null;
+    this.endDate = null;
+		this.dateRange = [];
+    this.getList();
+  }
+	
+  // 表格数据
+  loading1 = false;
+  getList() {
+    let data = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      monthTask: {
+				priority: {
+					id:this.priority || undefined,
+				},
+				liableUser: this.liableUser || undefined,
+				taskTitle: this.taskTitle || undefined,
+				startTime: this.startDate || undefined,
+				endTime: this.endDate || undefined
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("data", "monthTask", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        this.listOfData = data.list;
+        this.listLength = data.totalNum;
+      });
+  }
+	
+	// 日期选择
+	startDate: string; //发起时间开始
+	endDate: string; //发起时间结束
+	dateRange: any = [];
+	changeDate(result?): void {
+	  if (result.length==0) {
+	    this.startDate = this.endDate = null;
+	    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');
+	  this.dateRange = [this.startDate,this.endDate]
+	}
+	
+	// 获取责任人
+	dutyUser:any= [];
+	getAllUser(name) {
+	  let data:any = {
+	    user: {
+				name,
+	      hosIds: this.hosId,
+	    },
+	    idx: 0,
+	    sum: 20,
+	  };
+	  this.mainService
+	    .getFetchDataList("data", "user", data)
+	    .subscribe((data) => {
+				this.isLoading = false
+				this.dutyUser = data.list
+	    });
+	}
+	
+	// 搜索责任人
+	isLoading = false;
+	changeUser(e,type) {
+	  this.searchParentDeptSubject.next([e,type]);
+	}
+	
+	// 获取优先级
+	priorityData:any = [];
+	getPriorityData(){
+		let postData = {
+		  idx: 0,
+		  sum: 9999,
+		  priority: {},
+		};
+		this.isLoading = true;
+		this.mainService
+		.getFetchDataList("simple/data", "priority", postData)
+		.subscribe((data) => {
+			this.isLoading = false;
+			if (data.status == 200) {
+				this.priorityData = data.list;
+			}
+		});
+	}
+	
+	// 分配任务
+	allocationModal:boolean = false;
+	allocation(data){
+		this.coopId = data.id;
+		this.allocationModal = true
+		this.initAllocationForm();
+	}
+	
+	hideAllocationModal() {
+	  this.allocationModal = false;
+		this.initAllocationForm();
+	}
+	
+	// 初始化新增form表单
+	initAllocationForm() {
+	  this.validateAllocationForm = this.fb.group({
+	    taskContent: [null, [Validators.required]],
+			executor: [null, [Validators.required]],
+	    estimatedCompletionTime: [null, [Validators.required]],
+	  });
+	}
+	
+	onAllocationChange(result?): void {
+		console.log('Selected Time: ', result);
+		let endTime = format(result, 'yyyy-MM-dd HH:mm:ss');
+		this.validateAllocationForm.controls.estimatedCompletionTime.setValue(endTime);
+	}
+		
+	// 表单提交
+	submitAllocationForm(): void {
+	  var that = this;
+		for (const i in that.validateAllocationForm.controls) {
+		  that.validateAllocationForm.controls[i].markAsDirty();
+		  that.validateAllocationForm.controls[i].updateValueAndValidity();
+		}
+		if (that.validateAllocationForm.invalid) return;
+	  let data = {
+			monthTaskList:{
+				taskContent: this.validateAllocationForm.value.taskContent,
+				executor: this.validateAllocationForm.value.executor,
+				estimatedCompletionTime: this.validateAllocationForm.value.estimatedCompletionTime,
+				monthTask: that.coopId,
+			}
+	  };
+
+		that.btnLoading = true;
+	  that.mainService
+	    .dataPost("addData", "monthTaskList", data)
+	    .subscribe((data) => {
+	      that.btnLoading = false;
+	      that.hideAllocationModal();
+	      if (data.status == 200) {
+	        that.showPromptModal("分配", true, "");
+	      } else {
+	        that.showPromptModal("分配", false, data.msg);
+	      }
+	    });
+	}
+	
+	// 任务完成
+	accomplishModal:boolean = false;
+	taskConclusion:any;
+	accomplish(data){
+		this.coopId = data.id;
+		this.taskConclusion = null;
+		this.accomplishModal = true
+	}
+	
+	// 任务完成提交
+	submitAccomplishForm(){
+		if(!this.taskConclusion){
+			this.message.error('月度任务总结不能为空！')
+			return
+		}
+		let data = {
+			monthTask:{
+				taskConclusion: this.taskConclusion,
+				operationType: 'taskDone',
+				id:this.coopId
+			}
+		};
+		this.btnLoading = true;
+		this.mainService
+		  .dataPost("updData", "monthTask", data)
+		  .subscribe((data) => {
+		    this.btnLoading = false;
+		    this.hideAccomplishModal();
+		    if (data.status == 200) {
+		      this.showPromptModal("操作", true, "");
+		    } else {
+		      this.showPromptModal("操作", false, data.msg);
+		    }
+		  });
+	}
+	
+	hideAccomplishModal(){
+		this.accomplishModal = false
+	}
+	
+  // 新增弹框
+  showModal() {
+    this.add = true;
+		this.modal = true;
+		this.itemData = null;
+    this.initForm();
+  }
+  hideModal() {
+    this.modal = false;
+    this.initForm();
+  }
+	
+  // 初始化新增form表单
+  initForm() {
+    this.validateForm = this.fb.group({
+			taskTitle:[null, [Validators.required]],
+      taskDescribe: [null, [Validators.required]],
+      priority: [null, [Validators.required]],
+			liableUser: [null, [Validators.required]],
+      startTime: [null, [Validators.required]],
+      endTime: [null, [Validators.required]],
+    });
+  }
+	
+	// 选择开始时间
+	onStartChange(result: Date): void {
+		console.log('Selected Time: ', result);
+		let startTime = format(result, 'yyyy-MM-dd HH:mm:ss');
+		this.validateForm.controls.startTime.setValue(startTime);
+	}
+	
+	// 选择结束时间
+	onEndChange(result: Date): void {
+		console.log('Selected Time: ', result);
+		let endTime = format(result, 'yyyy-MM-dd HH:mm:ss');
+		this.validateForm.controls.endTime.setValue(endTime);
+	}
+		
+  // 表单提交
+  submitForm(): void {
+    var that = this;
+		for (const i in that.validateForm.controls) {
+		  that.validateForm.controls[i].markAsDirty();
+		  that.validateForm.controls[i].updateValueAndValidity();
+		}
+		if (that.validateForm.invalid) return;
+    let data = {
+			monthTask:{
+				...this.itemData,
+				taskTitle: this.validateForm.value.taskTitle,
+				taskDescribe: this.validateForm.value.taskDescribe,
+				priority: {
+					id: this.validateForm.value.priority
+				},
+				liableUser: this.validateForm.value.liableUser,
+				startTime: this.validateForm.value.startTime,
+				endTime: this.validateForm.value.endTime,
+				id:0,
+			}
+    };
+    if (!that.add) {
+      data.monthTask.id = that.coopId;
+    }else{
+			delete data.monthTask.id
+		}
+		that.btnLoading = true;
+    that.mainService
+      .dataPost(this.add ? "addData":"updData", "monthTask", 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);
+        }
+      });
+  }
+
+  // 编辑
+	itemData:any;
+  edit(data) {
+		this.add = false
+		this.itemData = data;
+		this.coopId = data.id;
+		this.validateForm.controls.taskTitle.setValue(data.taskTitle);
+		this.validateForm.controls.taskDescribe.setValue(data.taskDescribe);
+		this.validateForm.controls.priority.setValue(data.priority.id);
+		this.validateForm.controls.liableUser.setValue(data.liableUserDTO.id)
+		this.validateForm.controls.startTime.setValue(data.startTime);
+		this.validateForm.controls.endTime.setValue(data.endTime);
+		this.modal = true
+  }
+
+  // 删除
+  delModal: boolean = false; //删除模态框
+  del(data) {
+    let that = this;
+    that.coopId = data.id;
+    that.delModal = true;
+  }
+	
+	// 取消删除弹框
+	cancelDel(){
+		this.hideDelModal();
+	}
+	
+  // 确认删除
+  confirmDel() {
+    let that = this;
+    that.btnLoading = true;
+    that.mainService
+      .apiPublicData('rmvData', 'monthTask', [this.coopId])
+      .subscribe((data) => {
+        that.btnLoading = false;
+        that.hideDelModal();
+        if (data["status"] == 200) {
+          that.showPromptModal("删除", true, "");
+        } else {
+          that.showPromptModal("删除", false, data["msg"]);
+        }
+      });
+  }
+	
+	// 展示信息提示框（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();
+	}
+	
+  // 关闭删除模态框
+  hideDelModal() {
+    this.delModal = false;
+  }
+}
+

src/app/views/monthly-task/monthly-task.module.ts

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

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

@@ -1,88 +1,95 @@
 <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 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)"
+				[nzExpandedKeys]="defaultExpandedKeys"
+				[nzTreeTemplate]="nzTreeTemplate"
+				>
+					<ng-template #nzTreeTemplate let-node>
+						<span class="custom-node" [ngClass]="treeItem?.id === node.origin.id?'activeClass':''">
+							<span *ngIf="!node.isLeaf">
+								<i nz-icon [nzType]="node.isExpanded ? 'minus-square' : 'plus-square'" (click)="openFolder(node)"></i>
+								<span class="folder-name">{{ node.title }}</span>
+							</span>
+							<span *ngIf="node.isLeaf">
+								<span class="file-name">{{ node.title }}</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)]="fileName" placeholder="请输入文档名称" nzSize="default" />
+					</div>
+			  </div>
+			  <div class="list-template__btns">
+			    <button class="btn default" (click)='search()'>搜索</button>
+			    <button class="btn default ml8" (click)='reset()'>重置</button>
+					<button class="btn default ml8" (click)='excelImport("",1)'>上传文档</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;">
+							<td>{{ index+(pageIndex-1) * pageSize + 1 }}</td>
+			        <td>{{ data.fileName || '-' }}</td>
+			        <td>{{ data.fileType||'0' }}</td>
+			        <td>{{ data.docSize ||'0' }}</td>
+			        <td>{{ data.createUserDTO && data.createUserDTO.name || '0'}}</td>
+			        <td>{{ data.updateTime|date:'yyyy-MM-dd HH:mm:ss'}}</td>
+			        <td>
+			          <div class="coop">
+									<span *ngIf="coopBtns.del" (click)="delList($event,data.id)">删除</span>
+									<span *ngIf="coopBtns.download" (click)="excelExport($event,data)">下载</span>
+			            <span *ngIf="coopBtns.updata" (click)="excelImport(data.id,2)">更新</span>
+									<span *ngIf="coopBtns.look" (click)="detail(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>
 
   <!-- 新增/编辑模态框 -->
   <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 class="title">查看历史<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
       </div>
       <overlay-scrollbars #osComponentRef1 class="content">
         <div class="list-template__bottom">
@@ -90,30 +97,29 @@
             [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>
+								<th>文档名称</th>
+								<th>文档格式</th>
+                <th>上传者</th>
+                <th>版本号</th>
+                <th>大小</th>
+                <th>上传时间</th>
+        				<th>操作</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>
+								<td>{{ data.fileName }}</td>
+								<td>{{ data.fileType||'-' }}</td>
+                <td>{{ data.createUserDTO?data.createUserDTO.name:'-' }}</td>
+                <td>{{ data.fileVersion||'-' }}</td>
+                <td>{{ data.docSize||'0' }}</td>
+                <td>{{ data.createTime|date:'yyyy-MM-dd HH:mm:ss'}}</td>
+								<td>
+								  <div class="coop">
+										<!-- <span *ngIf="coopBtns.del" (click)="delHistory(data)">删除</span> -->
+										<span *ngIf="coopBtns.download" (click)="excelHistory(data)">下载</span>
+									</div>
+								</td>
               </tr>
             </tbody>
           </nz-table>
@@ -126,147 +132,11 @@
   </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>
-
+    (confirmDelEvent)="confirmDel()" content="您确认要删除文档吗？"></app-dialog-delete>
+		
+	<!-- 删除模态框 -->
+	<app-dialog-delete [delModal]="delHistoryModal" (hideDelModalEvent)="hideHistoryModal()" [btnLoading]="btnLoading"
+		(confirmDelEvent)="confirmHistory()" content="您确认要删除吗？"></app-dialog-delete>
 </div>
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
@@ -276,4 +146,41 @@
 <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-upload-file [isShow]="isShow" (hideFormHand)="hideExcelImport($event)" *ngIf="isShow" (submitFormHand)="submitExcelImport($event)"></app-upload-file>
+
+<!-- 删除树结构模态框 -->
+  <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" 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/personage-document/personage-document.component.less

@@ -1,5 +1,9 @@
 @import "../../../../src/theme.less";
 :host {
+	.activeClass{
+		background: #34b349;
+		color: #fff;
+	}
   .add-button {
     margin: 0 auto 16px !important;
   }
@@ -24,6 +28,56 @@
   }
 }
 
+.list-template{
+	background: #eee;
+	.content{
+		display: flex;
+		.list-left{
+			width: 20%;
+			margin-right: 15px;
+			height: 100vh;
+			overflow-y: auto;
+			overflow-x: hidden;
+			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;
+				.custom-node{
+					display: inline-block;
+					width: 100%;
+					cursor: pointer;
+					padding: 5px;
+					.folder-name{
+						margin-left: 2px;
+					}
+				}
+			}
+		}
+		
+		.list-right{
+			width: 80%;
+			background: #fff;
+			padding: 10px;
+		}
+	}
+}
+
 .save {
   position: fixed;
   left: 0;
@@ -33,8 +87,8 @@
   background: rgba(0, 0, 0, 0.4);
   z-index: 99;
 
-  .modalBody {
-    width: 350px;
+  .modalAddBody {
+    width: 480px;
     background: #fff;
     border-radius: 5px;
     padding: 10px 20px;
@@ -59,13 +113,13 @@
 
     .content {
       width: 100%;
-      height: 117px;
       background: #f9fafb;
       border: 1px solid #e5e9ed;
       border-radius: 5px;
       overflow: hidden;
       margin-top: 12px;
-
+			padding: 16px;
+			
       div {
         text-align: center;
         margin: 0;
@@ -112,8 +166,27 @@
   &.add {
     .modalBody {
       width: 80%;
-      height: auto;
-
+      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: auto;
@@ -225,6 +298,7 @@
       button {
         &:nth-child(1) {
           margin-right: 20px;
+					margin-top: 15px;
         }
       }
     }

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

@@ -16,6 +16,8 @@ import { Subject } from "rxjs";
 import { debounceTime, filter } from "rxjs/operators";
 import host from "../../../assets/js/http";
 import { HttpRequest, HttpResponse, HttpClient } from '@angular/common/http';
+import { NzContextMenuService, NzDropdownMenuComponent } from 'ng-zorro-antd/dropdown';
+import { NzFormatEmitEvent, NzTreeNode } from 'ng-zorro-antd/core';
 
 @Component({
   selector: "app-personage-document",
@@ -39,23 +41,12 @@ export class PersonageDocumentComponent implements OnInit{
   ) {}
 
   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.userId = this.tool.getCurrentUserId();
     this.coopBtns = this.tool.initCoopBtns(this.route);
-    this.initForm();
-    this.getAllHospital();
-    // this.getType();
-    // this.getDeptHandoverType();
+		this.getTreeData();
   }
+	userId:any;
   listOfData: any[] = []; //表格数据
   promptContent: string; //操作提示框提示信息
   ifSuccess: boolean; //操作成功/失败
@@ -64,6 +55,7 @@ export class PersonageDocumentComponent implements OnInit{
   modal: boolean = false; //新增/编辑模态框
   add: boolean; //true:新增；false:编辑
   validateForm: FormGroup; //新增/编辑表单
+	validateTreeForm: FormGroup; //新增/编辑表单
   coopId: number; //表格中执行操作的id
   department: ""; //所属科室
 	hosId: number;
@@ -88,32 +80,233 @@ export class PersonageDocumentComponent implements OnInit{
   // 初始化增删改按钮
   coopBtns: any = {};
 	viewData: any = []; //科室单查看数据
+	nodes: any = [];
+	
+	// 新增一级目录
+	addModal:boolean = false;
+	treeType:any;
+	addTree(type){
+		if(type==2){
+			if(!this.treeItem){
+				this.message.error('请先选择目录！')
+				return
+			}
+		}else if(type==1){
+			this.treeItem = null
+			this.parentNode = null
+		}
+		this.treeType = type
+		this.add = true
+		this.initAddForm();
+	}	
+	
+	// 编辑目录
+	editTree(type){
+		if(!this.treeItem){
+			this.message.error('请先选择目录！')
+			return
+		}
+		this.treeType = type
+		this.add = false
+		this.initAddForm('edit');
+	}
+	
+	hideAddModal(){
+		this.addModal = false
+	}
+	
+	// 点击数节点
+	treeItem:any; //当前节点
+	parentNode:any; //父级节点
+	activedNode:any;
+	nodeClick(data: NzFormatEmitEvent): void{
+		this.treeItem = data.node.origin
+		this.parentNode = data.node.parentNode ? data.node.parentNode.origin : null
+		// console.log(123,this.treeItem)
+		// console.log(456,this.parentNode)
+		this.getList();
+	}
+	
+	openFolder(data: NzTreeNode | Required<NzFormatEmitEvent>): void {
+		console.log(9998, data)
+	}
+		
+	// 删除目录
+	treeDel(){
+		if(!this.treeItem){
+			this.message.error('请先选择目录！')
+			return
+		}
+		this.delTreeModal = true;
+	}
+	// 取消删除目录
+	delTreeModal:boolean = false;
+	hideTreeModal() {
+	  this.delTreeModal = false;
+	}
+	// 确认删除目录
+	confirmTree() {
+	  var that = this;
+	  that.btnLoading = true;
+	  that.mainService
+	    .coopData(
+	      "rmvData",
+	      "documentFolder",
+	      [that.treeItem.id]
+	    )
+	    .subscribe((data) => {
+	      that.btnLoading = false;
+	      that.delTreeModal = false;
+				if (data.status==200) {
+					that.showPromptModal("删除", true, "");
+					this.treeItem = null
+					this.parentNode = null
+					this.getTreeData();
+				} else {
+					that.showPromptModal("删除", false, data.msg);
+				}
+
+	    });
+	}
+	// 获取目录数据
+	defaultExpandedKeys:any = [];
+	getTreeData(){
+		let query = {
+			idx: 0,
+			sum: 9999,
+			documentFolder:{
+				personal: 1,
+				createUser: this.userId,
+				hosId: this.hosId
+			}
+		}
+		this.mainService
+		  .getFetchDataList("data", "documentFolder", query)
+		  .subscribe((res) => {
+		    let data = res.list;
+				data = data.map(v => ({...v, parentId: v.parent ? v.parent.id : undefined, title: v.folderName, key: v.id}));
+				this.nodes = this.tool.tranListToTreeDataLeaf(data, undefined, "parentId");
+				this.defaultExpandedKeys = [this.nodes.length>0?this.nodes[0].key:null]
+			});
+	}
+	
+	// 初始化新增form表单
+	initAddForm(type:any = 'add') {
+		this.validateTreeForm = this.fb.group({
+			folderName: [type=='edit' ? this.treeItem.folderName : null, [Validators.required]],
+			parent: [null, []],
+		});
+		if(this.treeType==2){
+			this.validateTreeForm.addControl(
+			  "parent",
+			  new FormControl(null)
+			);
+			this.validateTreeForm.controls.parent.setValue(this.treeItem.folderName);
+		}else{
+			this.validateTreeForm.removeControl("parent");
+		}
+		setTimeout(_=>{
+			this.addModal = true
+		},50)
+	}
+	
+	// 新增/编辑树
+	submitAddForm(): void {
+	  for (const i in this.validateTreeForm.controls) {
+	    this.validateTreeForm.controls[i].markAsDirty();
+	    this.validateTreeForm.controls[i].updateValueAndValidity();
+	  }
+	  if (this.validateTreeForm.invalid) return;
+	  this.btnLoading = true;
+		let postData = {
+			documentFolder:{
+				personal: 1,
+				createUser: this.userId,
+				hosId: this.hosId,
+				folderName: this.validateTreeForm.value.folderName,
+				parent:{
+					id:''
+				},
+				id:null,
+			}
+		};
+	  if (this.treeType==1) {
+	    delete postData.documentFolder.parent
+			delete postData.documentFolder.id
+	  } else if(this.treeType==2) {
+			postData.documentFolder.parent.id = this.treeItem.id
+		} else if(this.treeType==3) {
+			postData.documentFolder.id = this.treeItem.id
+			delete postData.documentFolder.parent
+		}
+	  this.mainService
+	    .coopData(this.add ? "addData" : "updData", "documentFolder", postData)
+	    .subscribe((result) => {
+	      this.hideAddModal();
+	      this.btnLoading = false;
+	      if (result["status"] == 200) {
+					this.treeItem = null
+					this.parentNode = null
+					this.getTreeData();
+	        this.showPromptModal(this.add ? "新增" : "编辑", true, "");
+	      } else {
+	        this.showPromptModal(
+	          this.add ? "新增" : "编辑",
+	          false,
+	          result["msg"]
+	        );
+	      }
+	    });
+	}
+	
   // 模板导出
-  excelExport(){
-    this.maskFlag = this.message.loading("下载模板中..", {
+  excelExport(e, item){
+    this.maskFlag = this.message.loading("下载中..", {
       nzDuration: 0,
     }).messageId;
-    this.mainService.exportExcel("department", {}).subscribe(
+    this.mainService.documentExport(item.fileToken).subscribe(
       (data) => {
         this.message.remove(this.maskFlag);
         this.maskFlag = false;
-        this.message.success('下载模板成功');
+        this.message.success('下载成功');
+				let type = null
+				if(item.fileType=='xls'){
+					console.log(1)
+					type = 'application/vnd.ms-excel'
+				}else if(item.fileType=='xlsx'){
+					type = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+				}else if(item.fileType=='doc'){
+					type = 'application/msword'
+				}else if(item.fileType=='docx'){
+					type = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+				}else if(item.fileType=='pdf'){
+					type = 'application/pdf'
+				}else if(item.fileType=='ppt'){
+					type = 'application/vnd.ms-powerpoint'
+				}else if(item.fileType=='pptx'){
+					type = 'application/vnd.openxmlformats-officedocument.presentationml.presentation'
+				}else if(item.fileType=='png'){
+					type = 'image/png'
+				}else if(item.fileType=='gif'){
+					type = 'image/gif'
+				}else if(item.fileType=='jpeg' || item.fileType=='jpg'){
+					type = 'image/jpeg'
+				}
         var file = new Blob([data], {
-          type: "application/vnd.ms-excel",
+          type: type,
         });
-        //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";
+        a.download = item.fileName;
         document.body.appendChild(a);
         a.click();
       },
       (err) => {
         this.message.remove(this.maskFlag);
         this.maskFlag = false;
-        this.message.error('下载模板失败');
+        this.message.error('下载失败');
       }
     );
   }
@@ -125,19 +318,39 @@ export class PersonageDocumentComponent implements OnInit{
     this.isShow = false;
   }
   // 触发
-  excelImport() {
+	uploadType:any;
+	itemId:any;
+  excelImport(id, type) {
+		if(!this.treeItem && type==1){
+			this.message.error('请先选择目录！')
+			return
+		}
+		this.uploadType = type
+		this.itemId = id
     this.isShow = true;
   }
+	maskFlag:any;
   submitExcelImport({fileList}){
     this.isShow = false;
     const formData = new FormData();
     fileList.forEach((file: any) => {
       formData.append('file', file);
+			formData.append('filename', file.name);
     });
-    this.maskFlag = this.message.loading("正在导入中..", {
+		let url = null
+		let title = null
+		if(this.uploadType==1){
+			url = this.mainService.documentImport(this.treeItem.id, 1);
+			title = '上传'
+		}else{
+			url = this.mainService.documentUpdateFile(this.itemId);
+			title = '更新'
+		}
+    this.maskFlag = this.message.loading(`正在${title}中..`, {
       nzDuration: 0,
     }).messageId;
-    const req = new HttpRequest('Post', this.mainService.returnImportExcelUrl('department'), formData, {
+
+    const req = new HttpRequest('Post', url, formData, {
       reportProgress: true
     });
     this.http
@@ -148,18 +361,18 @@ export class PersonageDocumentComponent implements OnInit{
           if(res.body.status == 200){
             this.message.remove(this.maskFlag);
             this.maskFlag = false;
-            this.message.success('导入成功');
+            this.message.success(`${title}成功`);
             this.getList();
           }else{
             this.message.remove(this.maskFlag);
             this.maskFlag = false;
-            this.showPromptModal("导入", false, res.body.msg);
+            this.showPromptModal(`${title}`, false, res.body.msg);
           }
         },
         () => {
           this.message.remove(this.maskFlag);
           this.maskFlag = false;
-          this.message.error('导入失败');
+          this.message.error(`${title}失败`);
         },
       );
   }
@@ -171,90 +384,14 @@ export class PersonageDocumentComponent implements OnInit{
   }
   // 打开父级科室下拉框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) {
+  delList(e,data) {
     this.coopData = data;
-    this.showDelModal1();
+    this.showDelModal(e,data);
   }
   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;
@@ -263,43 +400,27 @@ export class PersonageDocumentComponent implements OnInit{
   // 重置
   reset() {
     this.pageIndex = 1;
-    this.department = null;
-    this.batchNumber = "";
-		this.dateRange = [];
-		this.startDate = "";
-		this.endDate = "";
     this.getList();
   }
   // 表格数据
   loading1 = false;
+	fileName:any;
   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
+      documentFile: {
+				hosId: this.hosId,
+				fileName: this.fileName,
+				personal: 1,
+				createUser: this.userId,
+				folderId: this.treeItem && this.treeItem.id || undefined
       },
     };
-		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)
+      .getFetchDataList("data", "documentFile", data)
       .subscribe((data) => {
         this.loading1 = false;
         that.listOfData = data.list;
@@ -319,174 +440,6 @@ export class PersonageDocumentComponent implements OnInit{
 	  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();
@@ -687,57 +640,6 @@ export class PersonageDocumentComponent implements OnInit{
 
   // 编辑
   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;
@@ -748,6 +650,7 @@ export class PersonageDocumentComponent implements OnInit{
       this.promptModalShow = true;
     }, 100);
     this.getList();
+		this.getTreeData();
   }
 
   delModal: boolean = false; //删除模态框
@@ -759,15 +662,10 @@ export class PersonageDocumentComponent implements OnInit{
    * @param flag true是批量删除，false是单个删除
    * @param id
    */
-  showDelModal(e, flag, id) {
+  showDelModal(e, id) {
     e.stopPropagation();
     this.delModal = true;
-    this.coopFlag = flag;
-    if (flag) {
-      this.coopIds = id;
-    } else {
-      this.coopId = id;
-    }
+    this.coopId = id;
   }
   hideDelModal() {
     this.delModal = false;
@@ -779,54 +677,130 @@ export class PersonageDocumentComponent implements OnInit{
     that.mainService
       .coopData(
         "rmvData",
-        "department",
-        this.coopFlag ? this.coopIds : [that.coopId]
+        "documentFile",
+        [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);
-          }
+        if (data.status==200) {
+          that.showPromptModal("删除", true, "");
         } else {
-          that.showPromptModal("删除", false, "");
+          that.showPromptModal("删除", false, data.msg);
         }
       });
   }
 
   // 查看
-  detail(e, id) {
-    e.stopPropagation();
+  detail(item) {
+		this.coopData = item;
 		var that = this;
 		let data = {
 			idx: 0,
 			sum: 9999,
-			drugsConfigure: {
+			documentFile: {
 			  hosId: this.hosId,
-			  drugListId: id
+			  fileCode: item.fileCode
 			}
 		};
 		this.loading1 = true;
 		that.mainService
-		  .getFetchDataList("data", "drugsConfigure", data)
+		  .getFetchDataList("data", "documentFile", data)
 		  .subscribe((data) => {
 		    this.loading1 = false;
 				this.modal = true
 		    that.viewData = data.list;
-		    // that.listLength = data.totalNum;
 		  });
   }
-
+	
+	// 删除历史
+	delHistory(e,data){
+		this.coopData = data;
+		this.showHistoryModal(e,data);
+	}
+	
+	HistoryId:any;
+	showHistoryModal(e, id) {
+	  e.stopPropagation();
+	  this.delModal = true;
+	  this.HistoryId = id;
+	}
+	hideHistoryModal() {
+	  this.delModal = false;
+	}
+	// 确认删除
+	confirmHistory() {
+	  var that = this;
+	  that.btnLoading = true;
+	  that.mainService
+	    .coopData(
+	      "rmvData",
+	      "documentFile",
+	      [that.HistoryId]
+	    )
+	    .subscribe((data) => {
+	      that.btnLoading = false;
+	      that.delModal = false;
+	      if (data.status==200) {
+	        that.showPromptModal("删除", true, "");
+					this.detail(this.coopData)
+	      } else {
+	        that.showPromptModal("删除", false, data.msg);
+	      }
+	    });
+	}
+	
+	// 下载历史
+	excelHistory(item){
+		this.maskFlag = this.message.loading("下载中..", {
+		  nzDuration: 0,
+		}).messageId;
+		this.mainService.documentExport(item.fileToken).subscribe(
+		  (data) => {
+		    this.message.remove(this.maskFlag);
+		    this.maskFlag = false;
+		    this.message.success('下载成功');
+				let type = null
+				if(item.fileType=='xls'){
+					type = 'application/vnd.ms-excel'
+				}else if(item.fileType=='xlsx'){
+					type = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+				}else if(item.fileType=='doc'){
+					type = 'application/msword'
+				}else if(item.fileType=='docx'){
+					type = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+				}else if(item.fileType=='pdf'){
+					type = 'application/pdf'
+				}else if(item.fileType=='ppt'){
+					type = 'application/vnd.ms-powerpoint'
+				}else if(item.fileType=='pptx'){
+					type = 'application/vnd.openxmlformats-officedocument.presentationml.presentation'
+				}else if(item.fileType=='png'){
+					type = 'image/png'
+				}else if(item.fileType=='gif'){
+					type = 'image/gif'
+				}else if(item.fileType=='jpeg' || item.fileType=='.jpg'){
+					type = 'image/jpeg'
+				}
+		    var file = new Blob([data], {
+		      type: type,
+		    });
+		    var fileURL = URL.createObjectURL(file);
+		    var a = document.createElement("a");
+		    a.href = fileURL;
+		    a.target = "_blank";
+		    a.download = item.fileName + item.fileType;
+		    document.body.appendChild(a);
+		    a.click();
+		  },
+		  (err) => {
+		    this.message.remove(this.maskFlag);
+		    this.maskFlag = false;
+		    this.message.error('下载失败');
+		  }
+		);
+	}
+	
   // 选中表格中科室
   mapOfCheckedId: { [key: string]: boolean } = {};
   checkedDepIds = []; //已选中科室id
@@ -855,41 +829,4 @@ export class PersonageDocumentComponent implements OnInit{
     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/specimen-search/specimen-search.component.html

@@ -121,7 +121,7 @@
         </div>
         <div class="list-template__searchItem">
           <span class="label">收取时间：</span>
-          <nz-range-picker nzShowTime (nzOnCalendarChange)="onCalendarChangeDate($event)" [(ngModel)]="searchCriteria.dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
+          <nz-range-picker nzShowTime [(ngModel)]="searchCriteria.dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
         </div>
 
       </div>

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

@@ -3,7 +3,7 @@ import { MainService } from "../../services/main.service";
 import { ToolService } from "../../services/tool.service";
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
-import { format, subDays, endOfDay } from "date-fns";
+import { format, subDays, endOfDay, startOfDay } from "date-fns";
 @Component({
   selector: "app-specimen-search",
   templateUrl: "./specimen-search.component.html",
@@ -123,22 +123,13 @@ export class SpecimenSearchComponent implements OnInit {
   startDate: string; //发起时间开始
   endDate: string; //发起时间结束
 	changeDate(result?): void {
-	  if (!result) {
-	    this.startDate = this.endDate = "";
+	  if (result.length==0) {
+	    this.startDate = this.endDate = null;
 	    return;
 	  }
-	  this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
-	  this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
-	}
-	onCalendarChangeDate(dateArr){
-	  console.log(dateArr)
-	  if(dateArr.length == 2){
-	    let dateStart = new Date(dateArr[0]);
-	    let dateEnd = new Date(dateArr[1]);
-	    dateStart.setHours(0,0,0);
-	    dateEnd.setHours(23,59,59);
-	    this.searchCriteria.dateRange = [dateStart,dateEnd];
-	  }
+	  this.startDate = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+	  this.endDate = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+	  this.searchCriteria.dateRange = [this.startDate,this.endDate]
 	}
   // 重置
   reset() {
@@ -313,15 +304,13 @@ export class SpecimenSearchComponent implements OnInit {
         speState: this.searchCriteria.speState
           ? { id: this.searchCriteria.speState }
           : undefined,
+				startArriveTime: this.startDate || undefined,
+				endArriveTime: this.endDate || undefined,
       },
     };
     if (field && sort) {
       postData.specimen.orderBy = sort === "ascend" ? field : `${field} desc`;
     }
-    if (this.startDate && this.endDate) {
-      postData.specimen.startArriveTime = this.startDate;
-      postData.specimen.endArriveTime = this.endDate;
-    }
     this.loading1 = true;
     this.mainService
       .getFetchDataList("simple/data", "specimen", postData)

src/app/views/task-inventory/task-inventory-routing.module.ts

@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { TaskInventoryComponent } from './task-inventory.component';
+
+
+const routes: Routes = [{
+  path: '',
+  component: TaskInventoryComponent
+}];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class TaskInventoryRoutingModule { }

src/app/views/task-inventory/task-inventory.component.html

@@ -0,0 +1,143 @@
+<div class="list-template">
+  <div class="content list-template__content">
+		<div class="list-left">
+			<div class="tree-content">
+				<div class="margin-bottom">
+					<nz-year-picker [(ngModel)]="year" [nzAllowClear]="false" (ngModelChange)="onChange($event)" nzPlaceHolder="请选择年份"></nz-year-picker>
+				</div>
+				<div class="item" (click)="itemClick(data, index)" [ngClass]="selectIndex == index ? 'activeClass' : ''" *ngFor="let data of month let index = index;">{{data.name}}</div>
+			</div>
+		</div>
+		<div class="list-right">
+			<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="25%">月度任务标题</th>
+			        <th nzWidth="25%">月度任务状态</th>
+			        <th nzWidth="50%">工作情况</th>
+			      </tr>
+			    </thead>
+			    <tbody v-if="listOfData && listOfData.length>0">
+			      <tr *ngFor="let data of listOfData let index = index;">
+			        <td>{{ data.taskTitle }}</td>
+			        <td>{{ data.state && data.state.name||'-'}}</td>
+							<td>
+								<div *ngFor="let item of data.taskListDTOS;">
+									{{item.taskContent}}、
+									{{item.state && item.state.name}}、
+									{{item.executorDTO && item.executorDTO.name}}
+								</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>文档名称</th>
+								<th>文档格式</th>
+                <th>上传者</th>
+                <th>版本号</th>
+                <th>大小</th>
+                <th>上传时间</th>
+        				<th>操作</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of viewData">
+								<td>{{ data.fileName }}</td>
+								<td>{{ data.fileType||'-' }}</td>
+                <td>{{ data.createUserDTO?data.createUserDTO.name:'-' }}</td>
+                <td>{{ data.fileVersion||'-' }}</td>
+                <td>{{ data.docSize||'0' }}</td>
+                <td>{{ data.createTime|date:'yyyy-MM-dd HH:mm:ss'}}</td>
+								<td>
+								  <div class="coop">
+										<!-- <span *ngIf="coopBtns.del" (click)="delHistory(data)">删除</span> -->
+										<span *ngIf="coopBtns.download" (click)="excelHistory(data)">下载</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>
+  <!-- 删除模态框 -->
+  <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+    (confirmDelEvent)="confirmDel()" content="您确认要删除文档吗？"></app-dialog-delete>
+		
+	<!-- 删除模态框 -->
+	<app-dialog-delete [delModal]="delHistoryModal" (hideDelModalEvent)="hideHistoryModal()" [btnLoading]="btnLoading"
+		(confirmDelEvent)="confirmHistory()" 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-upload-file [isShow]="isShow" (hideFormHand)="hideExcelImport($event)" *ngIf="isShow" (submitFormHand)="submitExcelImport($event)"></app-upload-file>
+
+<!-- 删除树结构模态框 -->
+  <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" 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/task-inventory/task-inventory.component.less

@@ -0,0 +1,191 @@
+@import "../../../../src/theme.less";
+.list-template{
+	background: #eee;
+	.content{
+		display: flex;
+		.list-left{
+			width: 18%;
+			margin-right: 15px;
+			height: 100vh;
+			overflow-y: auto;
+			overflow-x: hidden;
+			background: #fff;
+			padding: 10px;
+			.tree-content{
+				.margin-bottom{
+					margin-bottom: 10px;
+				}
+				.item{
+					padding: 10px 0;
+					text-align: center;
+					cursor: pointer;
+				}
+				.activeClass{
+					background: #49B856;
+					color: #fff;
+				}
+			}
+		}
+		
+		.list-right{
+			width: 82%;
+			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;
+
+  .modalBody {
+    width: 60%;
+    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: 40%;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        // max-height: 500px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 8px;
+						.ant-select{
+							width: 100% !important;
+						}
+						.ant-input-number{
+							width: 100% !important;
+						}
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+					.address{
+					  position: relative;
+					  .addressList{
+					    position: absolute;
+					    bottom: 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;
+					      }
+					    }
+					  }
+					}
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+						.ant-input-number{
+							width: 100% !important;
+						}
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

src/app/views/task-inventory/task-inventory.component.ts

@@ -0,0 +1,146 @@
+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 { forkJoin, Subject } from "rxjs";
+import { debounceTime } from "rxjs/operators";
+import { NzMessageService } from "ng-zorro-antd";
+import { format, getYear } from 'date-fns';
+
+@Component({
+  selector: "app-task-inventory",
+  templateUrl: "./task-inventory.component.html",
+  styleUrls: ["./task-inventory.component.less"],
+})
+export class TaskInventoryComponent 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
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopId: number; //表格中执行操作的id
+  dept: any; //所属科室
+  drugCode; //编号
+  name; //名称
+  userType: any; //用户类型
+  hosId: any; //院区（搜索）
+  userGroup; //所属组
+  userGroup1; //所属组(搜索)
+  userTypes: Array<any>; //所有用户类型
+  alldepart: any = []; //所有所属科室
+  alldepart1: any = []; //所有所属科室(搜索)
+  hospitals1: any = []; //院区列表(搜索)
+	drugTypeData: any = []; //药品类型
+  allUserGroup: Array<any>; //所有用户组
+  allUserGroup1: Array<any>; //用户组(搜索)
+  allUserRole: Array<any>; //所有角色
+  pageIndex: number = 1; //页码
+  listLength: number = 10; //总条数
+  pageSize: number = 10; //每页条数
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+
+  btnLoading: boolean = false; //提交按钮loading状态
+  wxRequired = false; //新增或编辑用户的时候，微信号是否必填
+  searchTaskSubject = new Subject(); //防抖
+	searchParentDeptSubject = new Subject();
+	specimenName:any = null;
+	containPosition:any = null;
+	placeList:any = [];
+	systemList:any = [];
+	apparatusList:any = [];
+	specimenNameList:any = [];
+	addressLoading:any = false;
+	month:any = [];
+	
+  ngOnInit() {
+		for(let i=1; i<13; i++){
+			this.month.push({
+				name:i + '月',
+				value: i
+			})
+		}
+		this.year = this.yearTime;
+		console.log(2222,this.year)
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+		this.hosId = this.tool.getCurrentHospital().id;
+		this.getList();
+  }
+	
+	yearTime:any = format(new Date(), 'yyyy');
+	onChange(result: Date): void {
+		this.yearTime = format(result, 'yyyy');
+		console.log('onChange: ', this.yearTime);
+	}
+	
+	// 选择月份
+	selectIndex:any = 0;
+	itemData:any = 1;
+	itemClick(data, index){
+		this.selectIndex = index;
+		this.itemData = data.value;
+		this.getList();
+	}
+	
+  // 初始化增删改按钮
+  coopBtns: any = {};
+  // 表格数据
+  loading1 = false;
+	state:any;
+	priority:any;
+	monthTask:any;
+	executor:any;
+	year:any;
+  getList() {
+		let num = this.itemData<10 ? '0'+ this.itemData : this.itemData
+    let data = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      monthTask: {
+				operationType: 'taskDetails',
+        yearMonth: this.yearTime + '-' + num
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("data", "monthTask", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        this.listOfData = data.list;
+        this.listLength = data.totalNum;
+      });
+  }
+
+	// 展示信息提示框（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();
+	}
+}
+

src/app/views/task-inventory/task-inventory.module.ts

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

src/app/views/task-list/task-list-routing.module.ts

@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { TaskListComponent } from './task-list.component';
+
+
+const routes: Routes = [{
+  path: '',
+  component: TaskListComponent
+}];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class TaskListRoutingModule { }

src/app/views/task-list/task-list.component.html

@@ -0,0 +1,227 @@
+<div class="list-template">
+  <div class="content 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" nzShowSearch nzPlaceHolder="请选择状态" [(ngModel)]="state">
+						<ng-container *ngFor="let option of stateList">
+							<nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+						</ng-container>
+					</nz-select>
+				</div>
+				<div class="list-template__searchItem">
+					<span class="label">月度任务：</span>
+					<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择月度任务" [(ngModel)]="monthTask">
+						<ng-container *ngFor="let option of monthlyData">
+							<nz-option [nzLabel]="option.taskTitle" [nzValue]="option.id"></nz-option>
+						</ng-container>
+					</nz-select>
+				</div>
+				<div class="list-template__searchItem">
+					<span class="label">优先级：</span>
+					<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择优先级" [(ngModel)]="priority">
+						<ng-container *ngFor="let option of priorityData">
+							<nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+						</ng-container>
+					</nz-select>
+				</div>
+				<div class="list-template__searchItem">
+					<span class="label">执行人：</span>
+					<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+						(nzOnSearch)="changeUser($event)" nzAllowClear nzPlaceHolder="请选择执行人员" [(ngModel)]="executor">
+						<ng-container *ngFor="let option of dutyUser">
+							<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 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>任务内容</th>
+						<th>月度任务标题</th>
+						<th>预计完成时间</th>
+						<th>优先级</th>
+						<th>状态</th>
+						<th>开始时间</th>
+						<th>结束时间</th>
+						<th>执行人</th>
+						<th nzWidth="240px">操作</th>
+					</tr>
+				</thead>
+				<tbody v-if="listOfData && listOfData.length>0">
+					<tr *ngFor="let data of listOfData let index = index;">
+						<td>{{ data.taskContent || '-' }}</td>
+						<td>{{ data.monthTaskDTO.taskTitle || '-' }}</td>
+						<td>{{ data.estimatedCompletionTime|date:'yyyy-MM-dd HH:mm:ss' }}</td>
+						<td>{{ data.priority && data.priority.name||'-'}}</td>
+						<td>{{ data.state && data.state.name||'-'}}</td>
+						<td>{{ data.startTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+						<td>{{ data.endTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+						<td>{{ data.executorDTO && data.executorDTO.name||'-' }}</td>
+						<td>
+							<div class="coop">
+								<span *ngIf="coopBtns.startTask && data.state && data.state.value==1" (click)="startTask(data)">开始任务</span>
+								<span *ngIf="coopBtns.accomplish && data.state && data.state.value==2" (click)="accomplish(data)">完成任务</span>
+								<span *ngIf="coopBtns.record && data.state && data.state.value==2" (click)="record(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>文档名称</th>
+								<th>文档格式</th>
+                <th>上传者</th>
+                <th>版本号</th>
+                <th>大小</th>
+                <th>上传时间</th>
+        				<th>操作</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of viewData">
+								<td>{{ data.fileName }}</td>
+								<td>{{ data.fileType||'-' }}</td>
+                <td>{{ data.createUserDTO?data.createUserDTO.name:'-' }}</td>
+                <td>{{ data.fileVersion||'-' }}</td>
+                <td>{{ data.docSize||'0' }}</td>
+                <td>{{ data.createTime|date:'yyyy-MM-dd HH:mm:ss'}}</td>
+								<td>
+								  <div class="coop">
+										<!-- <span *ngIf="coopBtns.del" (click)="delHistory(data)">删除</span> -->
+										<span *ngIf="coopBtns.download" (click)="excelHistory(data)">下载</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>
+  <!-- 删除模态框 -->
+  <app-dialog-delete [delModal]="startModal" (hideDelModalEvent)="hideStartModal()" [btnLoading]="btnLoading"
+    (confirmDelEvent)="confirmStart()" content="您确认要开始任务吗？"></app-dialog-delete>
+		
+	<!-- 删除模态框 -->
+	<app-dialog-delete [delModal]="delHistoryModal" (hideDelModalEvent)="hideHistoryModal()" [btnLoading]="btnLoading"
+		(confirmDelEvent)="confirmHistory()" 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-upload-file [isShow]="isShow" (hideFormHand)="hideExcelImport($event)" *ngIf="isShow" (submitFormHand)="submitExcelImport($event)"></app-upload-file>
+
+<!-- 删除树结构模态框 -->
+  <app-dialog-delete [delModal]="delTreeModal" (hideDelModalEvent)="hideTreeModal()" [btnLoading]="btnLoading"
+    (confirmDelEvent)="confirmTree()" content="您确认要删除目录吗？"></app-dialog-delete>
+		
+<!-- 任务记录 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="allocationModal">
+  <div class="modalBody">
+    <div class="title">任务记录<i class="icon_transport transport-guanbi" (click)="hideAllocationModal()"></i>
+    </div>
+    <div class="content">
+      <form nz-form [formGroup]="validateAllocationForm" class="addForm" (ngSubmit)="submitAllocationForm()">
+				<nz-form-item>
+				  <nz-form-label class="margin-label" [nzSm]="6" [nzXs]="24" nzRequired nzFor="taskConclusion">任务记录</nz-form-label>
+				  <nz-form-control nzErrorTip="请输入任务记录!">
+				    <nz-input-group>
+							<textarea formControlName="taskConclusion" nz-input rows="3" placeholder="请输入任务记录"></textarea>
+						</nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="manHour">工时</nz-form-label>
+				  <nz-form-control nzErrorTip="请输入工时!">
+				    <nz-input-group>
+							<nz-input-number
+								formControlName="manHour"
+								[nzMin]="0"
+								[nzPrecision]="0"
+								[nzMax]="999999"
+								[nzStep]="1"
+								[nzPlaceHolder]="'请输入工时'"
+							 ></nz-input-number>
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitAllocationForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideAllocationModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 完成任务 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="accomplishModal">
+  <div class="modalBody">
+    <div class="title">完成任务<i class="icon_transport transport-guanbi"></i>
+    </div>
+    <div class="content padding-bottom">
+			<div class="item">
+				<div class="label"><span class="sign">*</span>任务总结:</div>
+				<textarea [(ngModel)]="taskConclusion" nz-input rows="3" placeholder="请输入任务总结"></textarea>
+			</div>
+			<div class="item">
+				<div class="label"><span class="sign">*</span>总工时:</div>
+				<nz-input-number
+					[(ngModel)]="manHour"
+					[nzMin]="0"
+					[nzPrecision]="0"
+					[nzMax]="999999"
+					[nzStep]="1"
+					[nzPlaceHolder]="'请输入工时'"
+				 ></nz-input-number>
+			</div>
+			
+		</div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitAccomplishForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideAccomplishModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/views/task-list/task-list.component.less

@@ -0,0 +1,185 @@
+@import "../../../../src/theme.less";
+.width-105{
+	width: 105px !important;
+}
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 60%;
+    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: 40%;
+      height: auto;
+			
+			.padding-bottom{
+				padding-bottom: 20px !important;
+				.item{
+					margin-bottom: 5px;
+					.label{
+						margin-bottom: 5px;
+						text-align: left;
+						.sign{
+							color: red;
+							font-size: 15px;
+						}
+					}
+					.ant-input-number{
+						width: 100% !important;
+					}
+				}
+			}
+			
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        // max-height: 500px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 8px;
+						.ant-select{
+							width: 100% !important;
+						}
+						.ant-input-number{
+							width: 100% !important;
+						}
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+						.margin-label{
+							margin-bottom: 5px !important;
+						}
+						.ant-calendar-picker{
+							width: 100% !important;
+						}
+						.ant-input-number{
+							width: 100% !important;
+						}
+          }
+					.address{
+					  position: relative;
+					  .addressList{
+					    position: absolute;
+					    bottom: 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;
+					      }
+					    }
+					  }
+					}
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+						.ant-input-number{
+							width: 100% !important;
+						}
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

src/app/views/task-list/task-list.component.ts

@@ -0,0 +1,386 @@
+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 { forkJoin, Subject } from "rxjs";
+import { debounceTime } from "rxjs/operators";
+import { NzMessageService } from "ng-zorro-antd";
+
+@Component({
+  selector: "app-task-list",
+  templateUrl: "./task-list.component.html",
+  styleUrls: ["./task-list.component.less"],
+})
+export class TaskListComponent 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
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+	validateAllocationForm: FormGroup; //新增/编辑表单
+  coopId: number; //表格中执行操作的id
+  dept: any; //所属科室
+  drugCode; //编号
+  name; //名称
+  userType: any; //用户类型
+  hosId: any; //院区（搜索）
+  userGroup; //所属组
+  userGroup1; //所属组(搜索)
+  userTypes: Array<any>; //所有用户类型
+  alldepart: any = []; //所有所属科室
+  alldepart1: any = []; //所有所属科室(搜索)
+  hospitals1: any = []; //院区列表(搜索)
+	drugTypeData: any = []; //药品类型
+  allUserGroup: Array<any>; //所有用户组
+  allUserGroup1: Array<any>; //用户组(搜索)
+  allUserRole: Array<any>; //所有角色
+  pageIndex: number = 1; //页码
+  listLength: number = 10; //总条数
+  pageSize: number = 10; //每页条数
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+
+  btnLoading: boolean = false; //提交按钮loading状态
+  wxRequired = false; //新增或编辑用户的时候，微信号是否必填
+  searchTaskSubject = new Subject(); //防抖
+	searchParentDeptSubject = new Subject();
+	specimenName:any = null;
+	containPosition:any = null;
+	placeList:any = [];
+	systemList:any = [];
+	apparatusList:any = [];
+	specimenNameList:any = [];
+	addressLoading:any = false;
+	month:any = [];
+	
+  ngOnInit() {
+		for(let i=1; i<13; i++){
+			this.month.push({
+				name:i + '月'
+			})
+		}
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+		this.hosId = this.tool.getCurrentHospital().id;
+		this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
+			this.isLoading = true;
+			this.getAllUser(e[0])
+		});
+		this.searchTaskSubject.pipe(debounceTime(500)).subscribe((e) => {
+			this.isLoading = true;
+			this.getmonthlyData(e[0])
+		});
+		
+		this.getList();
+		this.getAllUser('');
+		this.getStateDic();
+		this.getPriorityData();
+		this.getmonthlyData('');
+  }
+	
+	// 选择月份
+	selectIndex:any;
+	itemData:any;
+	itemClick(data, index){
+		this.selectIndex = index;
+		this.itemData = data;
+	}
+	
+  // 初始化增删改按钮
+  coopBtns: any = {};
+  // 搜索
+  search() {
+    this.pageIndex = 1;
+    this.getList();
+  }
+	
+  // 重置
+  reset() {
+    this.pageIndex = 1;
+    this.state = null;
+    this.priority = null;
+    this.monthTask = null;
+    this.executor = null;
+    this.getList();
+  }
+	
+  // 表格数据
+  loading1 = false;
+	state:any;
+	priority:any;
+	monthTask:any;
+	executor:any;
+  getList() {
+    let data = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      monthTaskList: {
+        priority: {
+        	id: '',
+        },
+        state: {
+					id: '',
+				},
+				monthTask:this.monthTask || undefined,
+        executor: this.executor || undefined,
+      },
+    };
+		if(this.priority){
+			data.monthTaskList.priority.id = this.priority
+		}else{
+			delete data.monthTaskList.priority
+		}
+		if(this.state){
+			data.monthTaskList.state.id = this.state
+		}else{
+			delete data.monthTaskList.state
+		}
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("data", "monthTaskList", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        this.listOfData = data.list;
+        this.listLength = data.totalNum;
+      });
+  }
+	
+	// 获取月度任务
+	monthlyData:any=[];
+	getmonthlyData(name){
+		let data = {
+		  idx: 0,
+		  sum: 20,
+		  monthTask: {
+				taskTitle: name || undefined,
+		  },
+		};
+		this.mainService
+		  .getFetchDataList("data", "monthTask", data)
+		  .subscribe((data) => {
+		    this.isLoading = false;
+		    this.monthlyData = data.list;
+		  });
+	}
+	
+	// 获取责任人
+	dutyUser:any= [];
+	getAllUser(name) {
+	  let data:any = {
+	    user: {
+				name,
+	      hosIds: this.hosId,
+	    },
+	    idx: 0,
+	    sum: 20,
+	  };
+	  this.mainService
+	    .getFetchDataList("data", "user", data)
+	    .subscribe((data) => {
+				this.isLoading = false
+				this.dutyUser = data.list
+	    });
+	}
+	
+	// 搜索责任人
+	isLoading = false;
+	changeUser(e,type) {
+	  this.searchParentDeptSubject.next([e,type]);
+	}
+	
+	// 搜索月度任务
+	changeTask(e,type) {
+	  this.searchTaskSubject.next([e,type]);
+	}
+	
+	// 获取优先级
+	priorityData:any = [];
+	getPriorityData(){
+		let postData = {
+		  idx: 0,
+		  sum: 9999,
+		  priority: {},
+		};
+		this.isLoading = true;
+		this.mainService
+		.getFetchDataList("simple/data", "priority", postData)
+		.subscribe((data) => {
+			this.isLoading = false;
+			if (data.status == 200) {
+				this.priorityData = data.list;
+			}
+		});
+	}
+	
+	// 获取状态
+	stateList:any = [];
+	getStateDic(){
+		this.mainService.getDictionary("list", "month_task_list_state").subscribe((res) => {
+			this.stateList = res
+		});
+	}
+	
+	// 开始任务
+	startModal:boolean = false
+	startTask(data){
+		this.coopId = data.id;
+		this.startModal = true
+	}
+	
+	hideStartModal(){
+		this.startModal = false
+	}
+	
+	// 确认开始任务
+	confirmStart() {
+	  let that = this;
+		let query = {
+			monthTaskList:{
+				id: this.coopId,
+				operationType: 'start'
+			}
+		}
+	  that.btnLoading = true;
+	  that.mainService
+	    .apiPublicData('updData', 'monthTaskList', query)
+	    .subscribe((data) => {
+	      that.btnLoading = false;
+	      that.hideStartModal();
+	      if (data["status"] == 200) {
+	        that.showPromptModal("操作", true, "");
+	      } else {
+	        that.showPromptModal("操作", false, data["msg"]);
+	      }
+	    });
+	}
+	
+	// 任务记录
+	allocationModal:boolean = false;
+	record(data){
+		this.coopId = data.id;
+		this.initAllocationForm();
+		this.allocationModal = true
+	}
+	
+	hideAllocationModal() {
+	  this.allocationModal = false;
+		this.initAllocationForm();
+	}
+	
+	// 初始化新增form表单
+	initAllocationForm() {
+	  this.validateAllocationForm = this.fb.group({
+	    taskConclusion: [null, [Validators.required]],
+			manHour: [null, [Validators.required]],
+	  });
+	}
+		
+	// 任务记录提交
+	submitAllocationForm(): void {
+	  var that = this;
+		for (const i in that.validateAllocationForm.controls) {
+		  that.validateAllocationForm.controls[i].markAsDirty();
+		  that.validateAllocationForm.controls[i].updateValueAndValidity();
+		}
+		if (that.validateAllocationForm.invalid) return;
+	  let data = {
+			monthTaskList:{
+				taskConclusion: this.validateAllocationForm.value.taskConclusion,
+				manHour: this.validateAllocationForm.value.manHour,
+				id:this.coopId,
+				operationType: 'record'
+			}
+	  };
+	
+		that.btnLoading = true;
+	  that.mainService
+	    .dataPost("updData", "monthTaskList", data)
+	    .subscribe((data) => {
+	      that.btnLoading = false;
+	      that.hideAllocationModal();
+	      if (data.status == 200) {
+	        that.showPromptModal("记录", true, "");
+	      } else {
+	        that.showPromptModal("记录", false, data.msg);
+	      }
+	    });
+	}
+	
+	// 任务完成
+	accomplishModal:boolean = false;
+	taskConclusion:any;
+	manHour:any;
+	accomplish(data){
+		this.coopId = data.id;
+		this.taskConclusion = null;
+		this.accomplishModal = true
+	}
+	
+	// 任务完成提交
+	submitAccomplishForm(){
+		if(!this.taskConclusion){
+			this.message.error('任务总结不能为空！')
+			return
+		}
+		if(!this.manHour){
+			this.message.error('总工时不能为空！')
+			return
+		}
+		let data = {
+			monthTaskList:{
+				taskConclusion: this.taskConclusion,
+				manHour: this.manHour,
+				operationType: 'done',
+				id:this.coopId
+			}
+		};
+		this.btnLoading = true;
+		this.mainService
+		  .dataPost("updData", "monthTaskList", data)
+		  .subscribe((data) => {
+		    this.btnLoading = false;
+		    this.hideAccomplishModal();
+		    if (data.status == 200) {
+		      this.showPromptModal("操作", true, "");
+		    } else {
+		      this.showPromptModal("操作", false, data.msg);
+		    }
+		  });
+	}
+	
+	hideAccomplishModal(){
+		this.accomplishModal = 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();
+	}
+}
+

src/app/views/task-list/task-list.module.ts

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

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-contr(ngModelChange)ol>
+          </nz-form-control>
         </nz-form-item>
         <nz-form-item>
           <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="account">用户名</nz-form-label>

src/assets/iconfont/demo_index.html

@@ -55,15 +55,15 @@
           <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>
+              <span class="icon icon_transport">&#xe675;</span>
+                <div class="name">添加hover</div>
+                <div class="code-name">&amp;#xe675;</div>
               </li>
           
             <li class="dib">
-              <span class="icon icon_transport">&#xe672;</span>
-                <div class="name">新增</div>
-                <div class="code-name">&amp;#xe672;</div>
+              <span class="icon icon_transport">&#xe688;</span>
+                <div class="name">任务管理</div>
+                <div class="code-name">&amp;#xe688;</div>
               </li>
           
             <li class="dib">
@@ -1104,9 +1104,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'icon_transport';
-  src: url('iconfont.woff2?t=1748055150475') format('woff2'),
-       url('iconfont.woff?t=1748055150475') format('woff'),
-       url('iconfont.ttf?t=1748055150475') format('truetype');
+  src: url('iconfont.woff2?t=1748483326469') format('woff2'),
+       url('iconfont.woff?t=1748483326469') format('woff'),
+       url('iconfont.ttf?t=1748483326469') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -1133,20 +1133,20 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
-            <span class="icon icon_transport transport-renwuguanli"></span>
+            <span class="icon icon_transport transport-tianjiahover"></span>
             <div class="name">
-              任务管理
+              添加hover
             </div>
-            <div class="code-name">.transport-renwuguanli
+            <div class="code-name">.transport-tianjiahover
             </div>
           </li>
           
           <li class="dib">
-            <span class="icon icon_transport transport-xinzeng"></span>
+            <span class="icon icon_transport transport-renwuguanli"></span>
             <div class="name">
-              新增
+              任务管理
             </div>
-            <div class="code-name">.transport-xinzeng
+            <div class="code-name">.transport-renwuguanli
             </div>
           </li>
           
@@ -2709,18 +2709,18 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#transport-renwuguanli"></use>
+                  <use xlink:href="#transport-tianjiahover"></use>
                 </svg>
-                <div class="name">任务管理</div>
-                <div class="code-name">#transport-renwuguanli</div>
+                <div class="name">添加hover</div>
+                <div class="code-name">#transport-tianjiahover</div>
             </li>
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#transport-xinzeng"></use>
+                  <use xlink:href="#transport-renwuguanli"></use>
                 </svg>
-                <div class="name">新增</div>
-                <div class="code-name">#transport-xinzeng</div>
+                <div class="name">任务管理</div>
+                <div class="code-name">#transport-renwuguanli</div>
             </li>
           
             <li class="dib">

src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "icon_transport"; /* Project id 4543613 */
-  src: url('iconfont.woff2?t=1748055150475') format('woff2'),
-       url('iconfont.woff?t=1748055150475') format('woff'),
-       url('iconfont.ttf?t=1748055150475') format('truetype');
+  src: url('iconfont.woff2?t=1748483326469') format('woff2'),
+       url('iconfont.woff?t=1748483326469') format('woff'),
+       url('iconfont.ttf?t=1748483326469') format('truetype');
 }
 
 .icon_transport {
@@ -13,12 +13,12 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.transport-renwuguanli:before {
-  content: "\e688";
+.transport-tianjiahover:before {
+  content: "\e675";
 }
 
-.transport-xinzeng:before {
-  content: "\e672";
+.transport-renwuguanli:before {
+  content: "\e688";
 }
 
 .transport-wendangguanli:before {

src/assets/iconfont/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "transport-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "2488133",
+      "name": "添加hover",
+      "font_class": "tianjiahover",
+      "unicode": "e675",
+      "unicode_decimal": 58997
+    },
     {
       "icon_id": "6899011",
       "name": "任务管理",
@@ -12,13 +19,6 @@
       "unicode": "e688",
       "unicode_decimal": 59016
     },
-    {
-      "icon_id": "7366981",
-      "name": "新增",
-      "font_class": "xinzeng",
-      "unicode": "e672",
-      "unicode_decimal": 58994
-    },
     {
       "icon_id": "26851705",
       "name": "文档管理",