拉取代码

src/app/services/main.service.ts

@@ -845,5 +845,11 @@ export class MainService {
 	    headers: this.headers,
 	  });
 	}
-
+	//删除附件图片
+	removeAttachment(token) {
+	  return this.http.post(host.host + `/common/common/removeAttachment/${token}`,{}, {
+	    headers: this.headers,
+	  });
+	}
+	
 }

src/app/share/wang-editor/wang-editor.component.ts

@@ -1,4 +1,4 @@
-import { Component, ElementRef, Output, OnInit, EventEmitter } from '@angular/core';
+import { Component, ElementRef, Output, Input, OnInit, EventEmitter } from '@angular/core';
 import WangEditor from 'wangeditor';
 @Component({
   selector: 'app-wang-editor',
@@ -7,6 +7,7 @@ import WangEditor from 'wangeditor';
 })
 export class wangEditorComponent implements OnInit {
 	@Output() changeContent = new EventEmitter();
+	@Input() content: string;
 	editor: any;
 	constructor(
 
@@ -16,6 +17,8 @@ export class wangEditorComponent implements OnInit {
 		this.editor = new WangEditor('#editorMenu', '#editor');
 		this.setEditorConfig()
 		this.editor.create();
+		// 设置内容
+		this.setContent()
   }
 	
 	// 编辑器相关配置设置
@@ -136,14 +139,13 @@ export class wangEditorComponent implements OnInit {
 	
 	  // 编辑器失去焦点触发事件
 	  editorOnBlur = (html) => {
-	    // console.log(html);
 			this.changeContent.emit(html)
 	  }
 	
 	  // 设置编辑器显示内容
-	//   setContent() {
-	//     this.editor.txt.html(this.textareaValue);
-	//   }
+	  setContent() {
+	    this.editor.txt.html(this.content);
+	  }
 	
 	//   // 获取编辑器内容，带html
 	//   getContent() {

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

@@ -563,13 +563,11 @@ const routes: Routes = [
         path: "inspectionExecute",
         loadChildren: () => import("../inspection-execute/inspection-execute.module").then((m) => m.InspectionExecuteModule),
       },
-<<<<<<< HEAD
 			// 故障管理-知识库管理
 			{
 			  path: "repositoryManage",
 			  loadChildren: () => import("../repository-manage/repository-manage.module").then((m) => m.RepositoryManageModule),
 			},
-=======
       // 三方公司
       {
         path: "tripartiteCompany",
@@ -585,7 +583,6 @@ const routes: Routes = [
         path: "assetsProductManagement",
         loadChildren: () => import("../assets-product-management/assets-product-management.module").then((m) => m.AssetsProductManagementModule),
       },
->>>>>>> ce9c995986db1c27e0fa1c88d63814fae0b91dcd
     ],
   },
 ];

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

@@ -1,6 +1,6 @@
 <div class="detail-box">
   <div class="modalBody">
-    <!-- <overlay-scrollbars #osComponentRef1 class="content"> -->
+    <overlay-scrollbars #osComponentRef1 class="content">
      <form nz-form [formGroup]="validateForm" class="addForm">
 <!--     	<nz-form-item class="form-item">
      	  <nz-form-label nzRequired nzFor="code">编号</nz-form-label>
@@ -14,11 +14,12 @@
 					<input nz-input formControlName="version"  placeholder="请输入版本号" nzSize="default" />
 			  </nz-form-control>
 			</nz-form-item> -->
-<!-- 			<nz-form-item class="form-title-box">
-			  <div class="form-title">知识库编号：9998</div>
-			  <div class="form-title">版本号：V1</div>
-			</nz-form-item> -->
 			<div class="left-form-box">
+				<nz-form-item class="form-title-box" *ngIf="!add">
+					<div class="form-title">知识库编号：{{solutionNumber}}</div>
+					<div class="form-title">版本号：V{{versionNumber}}</div>
+				</nz-form-item>
+				
 				<nz-form-item class="form-item">
 				  <nz-form-label nzRequired nzFor="title" [nzSm]="4" [nzXs]="24">标题</nz-form-label>
 				  <nz-form-control nzErrorTip="请输入标题!" [nzSm]="20" [nzXs]="24">
@@ -27,7 +28,8 @@
 				</nz-form-item>
 				<nz-form-item class="form-item">
 				  <nz-form-label nzFor="content" [nzSm]="4" [nzXs]="24">内容</nz-form-label>
-					<app-wang-editor (changeContent)="changeContent($event)"></app-wang-editor>
+					<app-wang-editor *ngIf="add || detailContent==''" (changeContent)="changeContent($event)"></app-wang-editor>
+					<app-wang-editor *ngIf="!add && detailContent" (changeContent)="changeContent($event)" [content]="detailContent"></app-wang-editor>
 				</nz-form-item>
 			</div>
 			
@@ -71,12 +73,10 @@
 				  <nz-form-label nzRequired nzFor="malfunction" [nzSm]="6" [nzXs]="24">关联故障现象</nz-form-label>
 				  <nz-form-control nzErrorTip="请选择关联故障现象!" [nzSm]="16" [nzXs]="24">
 				    <nz-input-group>
-							<nz-tree-select
-							  [nzNodes]="malfunctionData"
-								nzShowSearch 
-								nzPlaceHolder="请选择关联故障现象" 
-								formControlName="malfunction">
-							</nz-tree-select>
+							<nz-cascader [nzOptions]="malfunctionData" 
+								formControlName="malfunction" 
+								nzPlaceHolder="请选择关联故障现象">
+							</nz-cascader>
 						</nz-input-group>
 				  </nz-form-control>
 				</nz-form-item>
@@ -106,6 +106,7 @@
 							[nzCustomRequest]="customReq"
 						  nzName="file"
 							[(nzFileList)]="fileData"
+							[(nzRemove)]="removeFile"
 						  [nzBeforeUpload]="beforeUpload"
 						  (nzChange)="handleChange($event)"
 						>
@@ -117,14 +118,18 @@
 			</div>
 			
      </form>
-    <!-- </overlay-scrollbars> -->
+    </overlay-scrollbars>
  
   </div>
 	<div class="display_flex justify-content_flex-center form-btn">
-	  <button class="btn" nz-button nzType="primary" (click)="submitForm(1)" [nzLoading]="btnLoading1">保存</button>
-		<button class="btn" nz-button nzType="primary" (click)="submitForm(2)" [nzLoading]="btnLoading2">暂存</button>
+	  <button *ngIf="optType!='upgrade'" class="btn" nz-button nzType="primary" (click)="submitForm(1)" [nzLoading]="btnLoading1">保存</button>
+		<button *ngIf="optType!='upgrade'" class="btn" nz-button nzType="primary" (click)="submitForm(2)" [nzLoading]="btnLoading2">暂存</button>
+		<button *ngIf="optType=='upgrade'" class="btn" nz-button nzType="primary" (click)="submitForm(3)" [nzLoading]="btnLoading2">升级知识</button>
 		<button class="btn cancel" nz-button nzType="default" (click)="back()">取消</button>
 	</div>
+	<div class="mask-style" *ngIf="isSpinning">
+		<nz-spin nzSimple class="spin-style"></nz-spin>
+	</div>
 </div>
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"

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

@@ -83,6 +83,7 @@ h3{
 		}
 		.form-title-box{
 			display: flex;
+			margin-left: 94px;
 			.form-title{
 				color: #000;
 				margin-right: 40px;
@@ -103,6 +104,9 @@ h3{
 		.ant-select{
 			width: 100%;
 		}
+		.ant-cascader{
+			width: 100%;
+		}
 	}
 	
 	.form-btn{
@@ -114,4 +118,36 @@ h3{
 		  }
 		}
 	}
+	/deep/ .cdk-overlay-pane{
+		top: 160px !important;
+	}
+	
+	.mask-style{
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 999;
+		display: flex;
+		background: rgba(0,0,0,0.2);
+		align-items: center;
+		justify-content: center;
+	}
+	.spin-style{
+		z-index:9999;
+	}
+	.sign{
+		width: 8px;
+		height: 8px;
+		border-radius: 50%;
+		background: red;
+		display: inline-block;
+	}
+	.red{
+		color: red;
+	}
+	.green{
+		color: #34b349;
+	}
 }

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

@@ -20,6 +20,7 @@ import { HttpEventType, HttpEvent, HttpRequest, HttpResponse, HttpClient } from
   styleUrls: ["./repository-manage-add.component.less"],
 })
 export class RepositoryManageAddComponent implements OnInit {
+	currentHospital; //当前院区
   @ViewChild("osComponentRef1", {
     read: OverlayScrollbarsComponent,
     static: false,
@@ -41,16 +42,23 @@ export class RepositoryManageAddComponent implements OnInit {
 			this.getProduct(e[0]);
     });
 		this.detailId = this.route.snapshot.params.id;
+		this.optType = this.route.snapshot.queryParams.type  //upgrade:升级
 		if(this.detailId==0){
-			this.add = true
+			this.add = true //新增
 		}else{
-			this.add = false
+			this.add = false //编辑
 		}
+		this.getDicData()
 		this.hosId = this.tool.getCurrentHospital().id;
     this.coopBtns = this.tool.initCoopBtns(this.route);
+		this.currentHospital = this.tool.getCurrentHospital();
 		this.initForm();
     this.getAllHospital();
   }
+	detailData:any;
+	solutionNumber;
+	versionNumber;
+	optType:null;
 	classItem:null;
 	detailId:null; //列表数据
 	deptId:null; //选中的科室id
@@ -79,6 +87,7 @@ export class RepositoryManageAddComponent implements OnInit {
   btnLoading1: boolean = false; //确认按钮loading状态
 	btnLoading2: boolean = false; //确认按钮loading状态
   printLoading: boolean = false; //批量打印按钮loading状态
+	isSpinning: boolean = false; //页面loading状态
   deptPhones: any = []; //新添加的科室电话列表
   isAddDeptsPhone = true; //添加新的科室电话是否禁用
   deptsPhoneId = 1; //科室电话自增id
@@ -96,148 +105,73 @@ export class RepositoryManageAddComponent implements OnInit {
   // 初始化增删改按钮
   coopBtns: any = {};
 	deptName:null;
+	detailContent:null;
   //搜索父级科室
 	isDeptLoading = false;
-	isSpinning = false;
 	delGrantModal = false;
 	showInsp = false;
   changeInp(e, type) {
     this.searchParentDeptSubject.next([e, type]);
   }
 
-  // 表格数据
-  loading1 = false;
-  getList() {
-    var that = this;
-    let data = {
-    	idx: 0,
-    	sum: 9999,
-    	drugsConfigure: {
-    	  hosId: this.hosId,
-				deptId :this.deptId?this.deptId:null,
-    	  batchId: this.detailId
-    	}
-    };
-    this.loading1 = true;
-    that.mainService
-      .getFetchDataList("data", "drugsConfigure", data)
-      .subscribe((data) => {
-        this.loading1 = false;
-        that.listOfData = data.list;
-      });
-  }
-	
-	// 发药科室列表
-	getDispensingDept(e,type){
+	// 获取详情
+	getDetail(){
+		this.isSpinning = true
 		var that = this;
-		let data = {
-			idx: 0,
-			sum: 9999,
-			drugsConfigure: {
-			  hosId: this.hosId,
-				deptId :e,
-				batchId:''
+		let query = {
+			idx: that.pageIndex - 1,
+			sum: that.pageSize,
+			solution: {
+				hosId: this.hosId,
+				id:this.detailId,
+				operationType:'lookOver',
 			}
 		};
-		if(type=='dept'){
-			data.drugsConfigure.batchId = this.detailId
-		}else{
-			delete data.drugsConfigure.batchId
-		}
-		let deptData = this.hospitals1.find(i=>i.id==e)
+	
 		that.mainService
-		  .getFetchDataList("data", "drugsConfigure", data)
-		  .subscribe((res) => {
-				if(res.list.length==0){
-					this.message.error(`您选择的科室“	${deptData.dept}”时间段内没有消耗药品无法添加发药单。`)
-				}else{
-					this.getDeptData(e,'all','load')
+			.getFetchDataList("data", "solution", query)
+			.subscribe((res) => {
+				this.getFile()
+				let data = res.list[0]
+				this.detailData = data
+				this.solutionNumber = data.solutionNumber
+				this.versionNumber = data.versionNumber
+				this.detailContent = data.content || ''
+				let item = this.dicData.find(i=>i.id == this.detailData.type.id)
+				if(item){
+					this.classItem = item.value
 				}
-		  });
-	}
-	
-	// 科室点击
-	deptClick(e,item,index){
-		e.stopPropagation();
-		this.deptId = item.applyDeptDTO.id
-		this.deptName = item.applyDeptDTO.dept
-		this.deptIndex = index
-		this.getList()
-	}
-	
-	// 科室删除
-	deptDel(e,item,index){
-		e.stopPropagation();
-		this.delModal = true;
-		this.coopId = item.applyDept;
-	}
-	
-	hideDelModal() {
-	  this.delModal = false;
-	}
-	
-	// 选择楼栋
-	buildingChange(e){
-		this.deptId = null
-		this.deptName = null
-		this.deptIndex = null
-		this.listOfData=[]
-		this.showInsp = true
-		this.getDeptData(e,'','')
-	}
-	
-	// 根据楼栋查询科室
-	getDeptData(e,type,initial){
-		var that = this;
-		let data = {
-		  idx: 0,
-		  sum: 99999,
-		  drugsList: {
-				hosId: this.hosId,
-				buildingId:e,
-				batch:{
-					id:this.detailId
+				this.validateForm.controls.title.setValue(data.title || '');
+				this.validateForm.controls.content.setValue(data.content || '');
+				this.validateForm.controls.repairVisible.setValue(data.repairVisible+'' || '');
+				this.validateForm.controls.knowledgeClass.setValue(data.type.id || '');
+				if(data.inspectionForm){
+					this.validateForm.controls.polling.setValue(data.inspectionForm.id || '');
 				}
-		  },
-		};
-		if(type=='all'){
-			delete data.drugsList.buildingId
-		}else{
-			data.drugsList.buildingId = e
-		}
-		if(this.showInsp){
-			this.isSpinning = true
-		}
-		that.mainService
-		  .getFetchDataList("data", "drugsList", data)
-		  .subscribe((res) => {
+				this.validateForm.controls.assetProductId.setValue(data.assetProductId || '');
 				this.isSpinning = false
-		    that.deptList = res.list;
-				if(initial=='load'){
-					if(res.list.length>0){
-						this.deptId = res.list[0].applyDeptDTO.id
-						this.deptName = res.list[0].applyDeptDTO.dept
-						this.deptIndex = 0
-					}
-					this.getList()
+			});
+	}
+	fileAllData=null;
+	getFile(){
+		this.mainService
+			.getPreviewImage('solution', this.detailId)
+			.subscribe((res:any)=> {
+				if(res.data.length>0){
+					this.fileAllData = res.data
+					this.fileData = res.data.map(i=>{
+						return{
+							uid:i.id,
+							name:i.name,
+							token:i.token
+						}
+					})
 				}
-		  });
+			});
 	}
 	
-	// 选择科室
-	addDeptId=''
-	deptChange(e){
-		this.addDeptId = e
-		
-	}
-	// 添加科室
-	addDept(){
-		if(this.addDeptId){
-			this.showInsp = true
-			this.getDispensingDept(this.addDeptId,'dept')
-		}else{
-			this.message.error('请先选择发药科室')
-		}
+	hideDelModal() {
+	  this.delModal = false;
 	}
 	
 	// 获取产品
@@ -258,40 +192,34 @@ export class RepositoryManageAddComponent implements OnInit {
 		  });
 	}
 	
-	// 获取所有科室
-  getDeparts() {
-    let data = {
-      batchId:this.detailId
-    };
-    this.mainService
-      .getConsumeDept(data)
-      .subscribe((res) => {
-				this.hospitals1 = res.data
-      });
-  }
-	
   // 获取所有院区
   getAllHospital() {
 		this.getPolling()
 		this.getProduct('')
 		this.getMalfunction()
-		this.getDicData()
   }
 	
 	// 获取故障现象数据
 	getMalfunction(){
+		if(!this.currentHospital.type || (this.currentHospital.type && this.currentHospital.type.value !== '6')){
+		  this.malfunctionData = [];
+		  return;
+		};
 		let postData = {
-		  building: {
-		    cascadeHosId: this.hosId,
+		  category: {
+		    dutyIds: this.currentHospital.type.value === '6' ? this.currentHospital.id.toString()  : undefined,
 		  },
-		  idx: 0,
-		  sum: 20,
 		};
-		this.mainService
-		  .getFetchDataList("data", "building", postData)
-		  .subscribe((result) => {
-				this.malfunctionData = result.data
-		  });
+		this.mainService.incidentPost("listIncidentCategory", postData).subscribe(res => {
+		  let incidentCategoryList = res.data || [];
+		  incidentCategoryList = incidentCategoryList.map(v => ({...v, parentId: v.parent ? v.parent.id : undefined, label: v.category, value: v.id}));
+		  this.malfunctionData = this.tool.tranListToTreeDataLeaf(incidentCategoryList, undefined, "parentId");
+			
+			if(this.detailData && this.detailData.categoryId){
+				let malfunctionId = this.tool.tranListToTreeDataFindIdsLeaf(this.malfunctionData,this.detailData.categoryId);
+				this.validateForm.controls.malfunction.setValue(malfunctionId);
+			}
+		})
 	}
 	
 	// 获取巡检列表
@@ -318,6 +246,12 @@ export class RepositoryManageAddComponent implements OnInit {
 	getDicData(){
 		this.mainService.getDictionary("list", "solution_type").subscribe((res) => {
 			this.dicData = res
+			if(!this.add){
+				this.getDetail()
+			}
+			if(this.optType=='upgrade'){
+				this.getDetail()
+			}
 		});
 		this.mainService.getDictionary("list", "solution_status").subscribe((res) => {
 			this.typeDic = res
@@ -327,29 +261,15 @@ export class RepositoryManageAddComponent implements OnInit {
 	// 选择知识库分类
 	radioChnage(e){
 		let item = this.dicData.find(i=>i.id == this.validateForm.value.knowledgeClass)
-		this.classItem = item.value
+		if(item){
+			this.classItem = item.value
+		}
 	}
 	
-	
-	
 	hideGrantModal(){
 		this.delGrantModal = false;
 	}
 	
-	// 增加/减少
-	rowData = null;
-	itemClick(e, data, type){
-		e.stopPropagation();
-		this.rowId = data.id
-		this.rowData = data
-		if(type=='add'){
-			this.add = true
-		}else{
-			this.add = false
-		}
-		this.modal = true
-		this.initForm();
-	}
 	
 	// 富文本内容
 	editOrData=null;
@@ -365,19 +285,51 @@ export class RepositoryManageAddComponent implements OnInit {
 		  that.validateForm.controls[i].updateValueAndValidity();
 		}
 		if (that.validateForm.invalid) return;
+
+		if(this.classItem==1){
+			if(!this.validateForm.value.malfunction){
+				this.message.error(`请选择关联故障现象`)
+				return
+			}
+		}else if(this.classItem==2){
+			if(!this.validateForm.value.polling){
+				this.message.error(`请选择关联巡检表`)
+				return
+			}
+		}
+		let operationType = null
+		if(this.optType=='edit'){
+			operationType = 'edit'
+		}else if(this.optType=='upgrade'){
+			operationType = 'upgrade'
+		}
 	  let data = {
-			...this.validateForm.value,
+			title:this.validateForm.value.title,
+			repairVisible:this.validateForm.value.repairVisible,
 			content:this.editOrData,
 			id:'',
 			hosId:this.hosId,
 			inspectionForm:{
-				id:this.validateForm.value.polling
+				id:'' //巡检
 			},
 			type:{
 				id:this.validateForm.value.knowledgeClass
 			},
-			buttonType:type==1?'confirm':'ts'
+			assetProductId:this.validateForm.value.assetProductId,
+			categoryId:'', //故障
+			buttonType:type==1?'confirm':'ts',
+			operationType: operationType
 	  };
+		if(this.classItem==1){
+			data.categoryId = this.validateForm.value.malfunction[2]
+			delete data.inspectionForm
+		}else if(this.classItem==2){
+			data.inspectionForm.id = this.validateForm.value.polling
+			delete data.categoryId
+		}else{
+			delete data.inspectionForm
+			delete data.categoryId
+		}
 		if(this.add){
 			delete data.id
 		}else{
@@ -385,31 +337,35 @@ export class RepositoryManageAddComponent implements OnInit {
 		}
 		if(type==1){
 			that.btnLoading1 = true;
+		}else if(type==2){
+			that.btnLoading2 = true;
 		}else{
 			that.btnLoading2 = true;
 		}
 		
 	  that.mainService
-	    .simplePost("addData", "solution", data)
+	    .simplePost(this.add?"addData":"updData", "solution", data)
 	    .subscribe((res) => {
 				if(type==1){
 					that.btnLoading1 = false;
+				}else if(type==2){
+					that.btnLoading2 = false;
 				}else{
 					that.btnLoading2 = false;
 				}
 				if(this.fileData.length>0){
-					this.uploadFile(res.data.id)
 					if (res.status == 200) {
-					  that.showPromptModal(that.add ? "增加" : "减少", true, "");
+						this.uploadFile(res.data.id)
+					  that.showPromptModal("操作", true, "");
 					} else {
-					  that.showPromptModal(that.add ? "增加" : "减少", false, res.msg);
+					  that.showPromptModal("操作", false, res.msg);
 					}
 					that.hideModal();
 				}else{
 					if (res.status == 200) {
-					  that.showPromptModal(that.add ? "增加" : "减少", true, "");
+					  that.showPromptModal("操作", true, "");
 					} else {
-					  that.showPromptModal(that.add ? "增加" : "减少", false, res.msg);
+					  that.showPromptModal("操作", false, res.msg);
 					}
 					that.hideModal();
 				}
@@ -418,21 +374,27 @@ export class RepositoryManageAddComponent implements OnInit {
 	
 	// 上传图片
 	uploadFile(id){
-		console.log(555,this.fileData)
 		let url = `/service/common/common/uploadAttachment/solution/${id}/${id}`
-		
-		for(let i of this.fileData){
-			console.log(54545,i)
-			const formData = new FormData();
-			formData.append('file', i.originFileObj);
-			formData.append('filename', i.originFileObj.name);
-			const req = new HttpRequest('POST', url, formData, {
-				reportProgress: true,
-				withCredentials: true
-			});
-			this.http.request(req).subscribe((res) => {
-			    
-			});
+		for(let i of this.fileData){//新上传的附件
+			let item = this.fileAllData.find(t=>t.id == i.uid) //之前的附件
+			if(!item){
+				const formData = new FormData();
+				if(i.originFileObj){
+					formData.append('file', i.originFileObj);
+					formData.append('filename', i.originFileObj.name);
+				}else{
+					formData.append('file', i);
+					formData.append('filename', i.name);
+				}
+				
+				const req = new HttpRequest('POST', url, formData, {
+					reportProgress: true,
+					withCredentials: true
+				});
+				this.http.request(req).subscribe((res) => {
+				    
+				});
+			}
 		}
 	}
 	
@@ -448,7 +410,6 @@ export class RepositoryManageAddComponent implements OnInit {
 	}
 	
   hideModal() {
-		this.initForm();
     this.modal = false;
   }
   // 初始化新增form表单
@@ -459,10 +420,10 @@ export class RepositoryManageAddComponent implements OnInit {
 			version: [null, []],
 			content: [null, []],
 			assetProductId: [null,[]],
-			repairVisible: [null, [Validators.required]],
+			repairVisible: ['1', [Validators.required]],
 			knowledgeClass: [null, [Validators.required]],
-			polling: [null, [Validators.required]],
-			
+			polling: [null,],
+			malfunction:[null,],
 		});
   }
 	
@@ -470,9 +431,9 @@ export class RepositoryManageAddComponent implements OnInit {
 	avatarUrl: string;
 	avatarUrl1: string;
 	beforeUpload = (file: File) => {
+		console.log(888,file)
 	  return new Observable((observer: Observer<boolean>) => {
 			let type = file.name.split('.')
-			console.log(888,type[1])
 	    const isPic = (type[1] === 'xlsx' || type[1] === 'pdf' || 
 			type[1] === 'xls' || type[1] === 'ppt' || type[1] === 'txt');
 	    if (!isPic) {
@@ -493,7 +454,7 @@ export class RepositoryManageAddComponent implements OnInit {
 	
 	// 附件上传
 	handleChange(info: { file: UploadFile }): void {
-		// console.log(999,this.fileData)
+
 	}
 	
 	private getBase64(img: File, callback: (img: string) => void): void {
@@ -503,17 +464,29 @@ export class RepositoryManageAddComponent implements OnInit {
 	}
 	
 	// 删除附件
-	removeFile = (file: File) =>  {
+	removeFile = (file) =>  {
+		console.log(111,file)
+		let item = this.fileAllData.find(i=>i.id == file.uid)
+		let index = this.fileData.findIndex(i=>i.uid == file.uid)
+		if(item){ //附件在数据库
+			this.mainService
+				.removeAttachment(file.token)
+				.subscribe((res:any=[]) => {
+					if (res.status == 200) {
+						this.getFile()
+					} 
+				});
+		}else{//附件不在数据库
+			console.log(555, index)
+			if(index!=-1){
+				this.fileData.splice(index, 1)
+			}
+		}
 		
-		// let index = this.fileData.findIndex(i=>i.uid==e.uid)
-		// this.fileData.splice(index, 1)
 	}
 	
 	// 自定义上传
 	customReq = (item: UploadXHRArgs) => {
-		// this.fileData.push(item.file)
-		// console.log(2222,this.fileData);
-	  // Create a FormData here to store files and other parameters.
 	  const formData = new FormData();
 	  // tslint:disable-next-line:no-any
 	  formData.append('file', item.file as any);
@@ -543,6 +516,7 @@ export class RepositoryManageAddComponent implements OnInit {
 	};
 	
 	closeModel(){
+		this.initForm();
 		this.back()
 	}
 	

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

@@ -47,7 +47,7 @@
 						<td>{{ data.status ? data.status.name : '-' }}</td>
             <td>
               <div class="coop">
-								<span *ngIf="coopBtns.edit && (data.status.name=='暂存' || data.status.name=='待修改')" (click)="edit($event,data)">编辑</span>
+								<span *ngIf="coopBtns.edit && (data.status.name=='暂存' || data.status.name=='待整改')" (click)="edit($event,data)">编辑</span>
 								<span *ngIf="coopBtns.look" (click)="look($event,data)">查看</span>
 								<span *ngIf="coopBtns.upgrade && data.status.name=='已发布'" (click)="upgrade($event,data)">升级</span>
 								<span *ngIf="coopBtns.audit && data.status.name=='待审核'" (click)="audit($event,data)">审核</span>
@@ -70,49 +70,79 @@
   <!-- 新增/编辑模态框 -->
   <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>
-      <overlay-scrollbars #osComponentRef1 class="content">
-       <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
-       	<nz-form-item>
-       	  <nz-form-label nzRequired nzFor="dispensingTime">发药时间区间</nz-form-label>
-       	  <nz-form-control nzErrorTip="请选择发药时间区间!">
-       	    <nz-input-group>
-       				<nz-range-picker formControlName="dispensingTime" 
-							[nzShowTime]="{ nzFormat: 'yyyy-MM-dd HH:mm:ss' }" nzFormat="yyyy-MM-dd HH:mm:ss"
-							(ngModelChange)="formChangeDate($event)"></nz-range-picker>
-       			</nz-input-group>
-       	  </nz-form-control>
-       	</nz-form-item>
-       	<nz-form-item>
-       	  <nz-form-label nzRequired nzFor="department">取药科室</nz-form-label>
-       	  <nz-form-control nzErrorTip="请选择取药科室!">
-       	    <nz-input-group>
-       				<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp($event)" nzServerSearch nzShowSearch nzPlaceHolder="请选择申请科室" formControlName="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>
-       			</nz-input-group>
-       	  </nz-form-control>
-       	</nz-form-item>
-				<nz-form-item>
-				  <nz-form-label>加载所有消耗科室</nz-form-label>
-					<nz-form-control>
-						<label nz-checkbox formControlName="loadAllConsumeDept">
-							<span>是否开启</span>
-						</label>
-					</nz-form-control>
-				</nz-form-item>
-       </form>
-      </overlay-scrollbars>
+      <div class="title">{{optType=='audit'?'审核':'查看'}}</div>
+      <!-- <overlay-scrollbars #osComponentRef1 class="content"> -->
+       <div class="view-box">
+				 <div class="view-item left-box">
+					 <div class="item-left-list" 
+					 [ngClass]="{'activeClass': index == vIndex}"
+					 *ngFor="let item of detailData let index=index;" (click)="versionsClick(item, index)">V{{item.versionNumber}}</div>
+				 </div>
+				 <div class="view-item center-box" *ngIf="lookData&&lookData.title">
+					 <div class="title">{{lookData.title}}</div>
+					 <div class="title-sign">
+						 <div class="width-180">知识分类：{{lookData.type.name}}</div>
+						 <div>报修可见：{{lookData.repairVisible=='1'?'是':'否'}}</div>
+						 <div>版本号：V{{lookData.versionNumber || ''}}</div>
+					 </div>
+					 <div class="title-sign">
+						 <div class="width-180" *ngIf="lookData.type.name=='故障现象'">关联故障：{{lookData.incidentCategory?lookData.incidentCategory.mutiCategory: ''}}</div>
+						 <div class="width-180" *ngIf="lookData.type.name=='日常巡检'">关联巡检：{{lookData.inspectionForm?lookData.inspectionForm.name: ''}}</div>
+						 <div>关联产品：{{lookData.assetProduct?lookData.assetProduct.name:''}}</div>
+					 </div>
+					 <div class="content-class" [innerHTML]="richText"></div>
+					 <div class="file-box" *ngIf="fileData.length>0">
+						 <div>附件列表：</div>
+						 <div>
+							 <div class="file-class" *ngFor="let item of fileData" (click)="fileClick(item)">
+								 {{item.name}}
+								<span nz-icon nzType="download" nzTheme="outline" class="download-icon"></span>
+							 </div>
+						 </div>
+					 </div>
+				 </div>
+				 <div class="view-item right-box" *ngIf="lookData&&lookData.title"> 
+					 <nz-steps [nzCurrent]="stepLength" nzDirection="vertical" nzSize="small">
+						<ng-container *ngFor="let item of lookData.solutionLogs; let index = index">
+						    <nz-step
+						      [nzDescription]="tpl"
+						    >
+						    </nz-step>
+						    <ng-template #tpl>
+									<div *ngIf="index==lookData.solutionLogs.length-1" class="step-size">
+										<div>
+											<span style="color: #49B856;">{{item.operationStatus.name}}</span>
+											&nbsp;&nbsp;&nbsp;
+											<span style="color:#333;">{{item.operationUser.name}}</span>
+										</div>
+										<div style="color:#333;">{{ item.time }}</div>
+										<div class="back-class" nz-tooltip [nzTooltipTitle]="item.rejectedReason" *ngIf="item.operationStatus.name=='审核驳回'">(驳回原因)</div>
+									</div>
+									<div *ngIf="index!=lookData.solutionLogs.length-1" class="step-size">
+										<div>
+											<span>{{item.operationStatus.name}}</span>
+											&nbsp;&nbsp;&nbsp;
+											<span>{{item.operationUser.name}}</span>
+										</div>
+										<div>{{ item.time }}</div>
+										<div class="back-class" nz-tooltip [nzTooltipTitle]="item.rejectedReason" *ngIf="item.operationStatus.name=='审核驳回'">(驳回原因)</div>
+									</div>
+						    </ng-template>
+						  </ng-container>
+					 </nz-steps>
+				 </div>
+			 </div>
+      <!-- </overlay-scrollbars> -->
       <div class="display_flex justify-content_flex-center">
-        <button class="btn" nz-button nzType="primary" (click)="submitForm()" [nzLoading]="btnLoading">{{add ? '保存并配置' : '保存'}}</button>
-				<button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
-      </div>
+        <button class="btn" *ngIf="optType=='audit' && vIndex==0" nz-button nzType="primary" (click)="submitForm(1)" [nzLoading]="btnLoading1">通过</button>
+				<button class="btn" *ngIf="optType=='audit' && vIndex==0" nz-button nzType="primary" (click)="submitForm(2)" [nzLoading]="btnLoading2">驳回</button>
+				<button class="btn cancel" *ngIf="optType=='audit'" nz-button nzType="default" (click)="hideModal()">取消</button>
+				<button class="btn" *ngIf="optType=='look'" nz-button nzType="primary" (click)="hideModal()">知道了</button>
+				
+			</div>
+			<div class="mask-style" *ngIf="isSpinning">
+				<nz-spin nzSimple class="spin-style"></nz-spin>
+			</div>
     </div>
   </div>
   <!-- 删除模态框 -->
@@ -126,6 +156,21 @@
 	<!-- 恢复模态框 -->
 	<app-dialog-delete [delModal]="renewModal" (hideDelModalEvent)="hideDelModal3()" [btnLoading]="btnLoading"
 		(confirmDelEvent)="confirmDel3()" content="您确认要恢复此知识库吗？"></app-dialog-delete>
+		
+	<!-- 审核通过模态框 -->
+	<app-dialog-delete [delModal]="auditModal" (hideDelModalEvent)="hideDelModal4()" [btnLoading]="btnLoading"
+		(confirmDelEvent)="confirmDel4()" content="您确认通过此知识库的审核吗？"></app-dialog-delete>
+	
+	<!-- 审核驳回模态框 -->
+	<nz-modal [(nzVisible)]="rejectModal" nzTitle="您确认驳回此知识库吗？" (nzOnCancel)="rejectCancel()" (nzOnOk)="rejectOk()">
+		<textarea
+			nz-input
+			[(ngModel)]="rejectData"
+			placeholder="请输入整改意见"
+			[nzAutosize]="{ minRows: 2, maxRows: 6 }"
+			
+		></textarea>
+	</nz-modal>
 			
   <!-- 编辑模态框 -->
   <app-dialog-delete [delModal]="editModal" (hideDelModalEvent)="hideDelModal1()" [btnLoading]="saveLoading"
@@ -134,5 +179,5 @@
 </div>
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
-  [info]="promptInfo"></app-prompt-modal>
+  [info]="promptInfo" (closeModel)="closeModel()"></app-prompt-modal>
 

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

@@ -34,7 +34,7 @@
   z-index: 99;
 
   .modalBody {
-    width: 350px;
+    width: 70%;
     background: #fff;
     border-radius: 5px;
     padding: 10px 20px;
@@ -45,7 +45,7 @@
       text-align: center;
       font-size: 18px;
       position: relative;
-
+			margin-bottom: 10px;
       i {
         position: absolute;
         right: 0;
@@ -56,7 +56,6 @@
         padding: 0 5px;
       }
     }
-
     .content {
       width: 100%;
       height: 117px;
@@ -108,12 +107,96 @@
     }
   }
 
-  // 新增
+  // 查看/审核
   &.add {
     .modalBody {
-      width: 420px;
+      width: 70%;
       height: auto;
-
+				.mask-style{
+					width: 100%;
+					height: 100%;
+					position: fixed;
+					top: 0;
+					left: 0;
+					z-index: 999;
+					display: flex;
+					background: rgba(0,0,0,0.2);
+					align-items: center;
+					justify-content: center;
+				}
+				.spin-style{
+					z-index:9999;
+				}
+			.view-box{
+				height: 400px;
+				display: flex;
+				border: 1px solid #eee;
+				.left-box{
+					flex: 1;
+					font-size: 14px;
+					border-right: 1px solid #E9E9E9;
+					.item-left-list{
+						display: flex;
+						align-items: center;
+						height: 35px;
+						padding-left: 10px;
+						cursor: pointer;
+					}
+				}
+				.center-box{
+					flex: 6;
+					padding: 0 20px 20px 20px;
+					border-right: 1px solid #E9E9E9;
+					height: auto;
+					overflow-y: auto;
+					.title{
+						margin: 10px 0 10px 0;
+						font-weight: bold;
+						font-size: 20px;
+						color: #000000;
+						font-style: normal;
+						text-transform: none;
+					}
+					.title-sign{
+						display: flex;
+						font-weight: 400;
+						font-size: 12px;
+						color: #555555;
+						margin-bottom: 5px;
+						.width-180{
+							width: 160px;
+						}
+						div{
+							margin-right: 60px;
+						}
+					}
+					.content-class{
+						margin-top: 20px;
+					}
+					.file-box{
+						margin-top: 30px;
+						font-size: 14px;
+						.file-class{
+							color: #1890FF;
+							text-decoration: underline;
+							margin-left: 10px;
+							cursor: pointer;
+						}
+						.download-icon{
+							margin-left: 8px;
+						}
+					}
+				}
+				.right-box{
+					flex: 1.6;
+					padding: 10px;
+					font-size: 14px;
+					.back-class{
+						color: red;
+						cursor: pointer;
+					}
+				}
+			}
       .content {
         width: 100%;
         height: auto;
@@ -227,16 +310,14 @@
           }
         }
       }
-
-      button {
-        &:nth-child(1) {
-          margin-right: 20px;
-        }
-      }
     }
   }
 }
 
+.activeClass{
+	background: #F0F6ED;
+}
+
 .monad{
 	margin-top: 20px;
 	.monad-list{

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

@@ -1,5 +1,6 @@
 import { Component, OnInit, ViewChild } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
+import { DomSanitizer } from '@angular/platform-browser';
 import {
   FormBuilder,
   Validators,
@@ -36,20 +37,17 @@ export class RepositoryManageComponent implements OnInit {
     private mainService: MainService,
     private tool: ToolService,
     private http: HttpClient,
+		private sanitizer: DomSanitizer
   ) {}
-
   ngOnInit() {
     this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
-			this.isDeptLoading = true;
-			this.getDeparts(e);
+			
     });
 		this.hosId = this.tool.getCurrentHospital().id;
     this.coopBtns = this.tool.initCoopBtns(this.route);
-    this.initForm();
 		this.getList();
-    // this.getAllHospital();
-    // this.getDeptHandoverType();
   }
+	richText:any;
   listOfData: any[] = []; //表格数据
   promptContent: string; //操作提示框提示信息
   ifSuccess: boolean; //操作成功/失败
@@ -68,10 +66,14 @@ export class RepositoryManageComponent implements OnInit {
   deptalias; //别名
   type; //类型
   deptHandoverType; //类型
+	vIndex:number = 0;//版本号下标
+	stepLength: number = 0; //步骤条
   pageIndex: number = 1; //页码
   listLength: number = 10; //总条数
   pageSize: number = 10; //每页条数
   btnLoading: boolean = false; //确认按钮loading状态
+	btnLoading1: boolean = false; //审核通过按钮loading状态
+	btnLoading2: boolean = false; //审核驳回按钮loading状态
   printLoading: boolean = false; //批量打印按钮loading状态
   deptPhones: any = []; //新添加的科室电话列表
   isAddDeptsPhone = true; //添加新的科室电话是否禁用
@@ -80,12 +82,19 @@ export class RepositoryManageComponent implements OnInit {
   hospitals1: any = []; //科室列表(搜索)
 	rowData: object = {}; //打印选择列表
 	editModal:boolean = false; //编辑时弹框
+	isSpinning: boolean = false; //页面loading状态
+	detailData:any;
+	lookData:any;
+	versionsData: any = []; //审核版本数据
+	fileData: any = []; //上传的附件数据
   searchParentDeptSubject = new Subject();
   // 初始化增删改按钮
   coopBtns: any = {};
 	saveLoading:boolean = false;
 	taskTypeData:{id:''};
-	
+	rejectModal:boolean = false;
+	rejectData:null;
+	optType:string = '';
   // 导入---end
   //搜索父级科室
 	isDeptLoading = false;
@@ -126,7 +135,6 @@ export class RepositoryManageComponent implements OnInit {
 		  .subscribe((data) => {
 		    that.saveLoading = false;
 		    that.hideModal();
-		    that.initForm();
 		    if (data.status == 200) {
 					this.editModal = false;
 		      that.showPromptModal("编辑", true, "");
@@ -172,146 +180,105 @@ export class RepositoryManageComponent implements OnInit {
       });
   }
 	
-	// 获取所有科室
-  getDeparts(dept) {
-    var that = this;
-    let data = {
-      department: {
-        dept,
-        hospital: {
-          id: this.hosId
-        },
-				type:{
-					id:''
-				}
-      },
-      idx: 0,
-      sum: 20,
-    };
-		that.mainService.getDictionary("list", "dept_type").subscribe((res) => {
-		  let typeData = res.find(i=>i.value=='pharmacyRoom');
-			if(typeData){
-				data.department.type.id = typeData.id
-			}
-			that.mainService
-			  .getFetchDataList("data", "department", data)
-			  .subscribe((data) => {
-					setTimeout(_=>{
-						this.hospitals1 = data.list
-						that.isDeptLoading = false;
-					},500)
-			  });
-		});
-  }
+	// 版本号点击
+	versionsClick(data, index){
+		this.vIndex = index
+		this.lookData = data
+		this.stepLength = this.lookData.solutionLogs.length
+		this.richText = this.sanitizer.bypassSecurityTrustHtml(data.content);
+	}
 	
-  // 获取所有院区
-  getAllHospital() {
-		this.getDeparts('')
-    this.getList();
-  }
+	// 点击附件
+	fileClick(data){
+		console.log(222,data)
+		let a: any = document.createElement('a') // 创建一个元素
+		a.style = 'display: none' // 不能在页面中被看到，把他隐藏起来
+		a.style.height = '0px' // 给个0高度，避免影响页面布局
+		a.download = data.name; 
+		a.href = data.url // 文件url地址
+		document.body.appendChild(a)  //  将其绑定在body上才能发挥作用
+		a.click() // 触发a标签的click事件
+		document.body.removeChild(a) // 删除该元素
+	}
 
-  // 获取科室汇总交接类型
-  deptHandoverTypes: Array<any> = [];
-  getDeptHandoverType() {
-    var that = this;
-    that.mainService.getDictionary("list", "dept_handover_type").subscribe((data) => {
-      console.log(data);
-      that.deptHandoverTypes = data;
-    });
+  hideModal() {
+    this.modal = false;
   }
 	
-	// 获取任务id
-	getTaskTypesId() {
-		this.mainService.getDictionary("list", "ordinary_field").subscribe((data) => {
-			this.taskTypeData = data.find(i=>i.value=='infusionSolutions')
-			this.getConfig();
-		});
+	// 审核通过
+	confirmDel4() {
+		let data: any = {
+			id:this.rowId,
+			operationType: 'approve'
+		};
+		this.btnLoading1 = true;
+		this.mainService
+			.simplePost("updData", "solution", data)
+			.subscribe((data) => {
+				this.btnLoading1 = false;
+				this.hideDelModal4()
+				if (data.status == 200) {
+					this.showPromptModal("审核", true, "");
+				} else {
+					this.showPromptModal("审核", false, data.msg);
+				}
+			});
 	}
 	
-	// 获取配置
-	getConfig() {
-	  let postData = {
-	    idx: 0,
-	    sum: 10,
-	    taskTypeConfig: {
-				hosId:this.hosId,
-				taskType:this.taskTypeData.id
-	    }
-	  };
-	  this.mainService
-		.getFetchDataList("simple/data", "taskTypeConfig", postData)
-		.subscribe((result) => {
-			if (result.status == 200) {
-				let data = result.list[0] || {};
-				this.validateForm.controls.department.setValue(data.pharmacyDept || '');
-				this.add = true;
-				this.modal = true;
-				this.isAddDeptsPhone = true;
-			}
-		});
+	hideDelModal4() {
+	  this.auditModal = false;
+	}
+	
+	// 审核驳回
+	rejectCancel(){
+		this.rejectModal = false
+	}
+	
+	// 审核驳回
+	rejectOk(){
+		if(this.rejectData==null){
+			this.message.error('请输入整改意见')
+			return
+		}
+		let data: any = {
+			id:this.rowId,
+			operationType: 'approve',
+			rejectReason:this.rejectData
+		};
+		this.btnLoading2 = true;
+		this.mainService
+			.simplePost("updData", "solution", data)
+			.subscribe((data) => {
+				this.btnLoading2 = false;
+				this.rejectCancel()
+				if (data.status == 200) {
+					this.showPromptModal("驳回", true, "");
+				} else {
+					this.showPromptModal("驳回", false, data.msg);
+				}
+			});
+	}
+	
+	closeModel(){
+		this.hideModal()
 	}
 	
-  // 新增弹框
-  showModal() {
-    this.initForm();
-		this.getTaskTypesId()
-  }
-  hideModal() {
-    this.modal = false;
-    this.initForm();
-  }
-  // 初始化新增form表单
-	loadStartTime = '';
-	loadEndTime = '';
-  initForm() {
-    this.validateForm = this.fb.group({
-      dispensingTime: [null, [Validators.required]],
-      department: [null, [Validators.required]],
-			loadAllConsumeDept: [true,[]]
-    });
-		let date = new Date();
-		this.loadStartTime = format(subDays(date, 1), "yyyy-MM-dd") +' '+'08:00:00'
-		this.loadEndTime = format(date, "yyyy-MM-dd") +' '+'08:00:00'
-		this.validateForm.controls.dispensingTime.setValue([this.loadStartTime, this.loadEndTime]);
-  }
-
   // 表单提交
-  submitForm(): void {
+	auditModal = false;
+  submitForm(type): 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: any = {
-			hosId:this.hosId,
-			pharmacy:this.validateForm.value.department,
-			loadAllConsumeDept:this.validateForm.value.loadAllConsumeDept?1:0
-    };
-  
-    if (!that.add) {
-			this.editModal = true
-    }else{
-			that.btnLoading = true;
-			that.mainService
-			  .simplePost("addData", "drugsBatch", 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);
-			    }
-			  });
+		if(type==1){
+			this.auditModal = true
+		}else{
+			this.rejectData = null
+			this.rejectModal = true
 		}
   }
 	
 	// 升级
 	upgrade(e, data){
 		e.stopPropagation();
-		this.router.navigateByUrl(`/dispensingDetail/${data.id}`);
+		this.router.navigateByUrl(`/repositoryManageAdd/${data.id}?type=upgrade`);
 	}
 	
 	// 新增
@@ -322,13 +289,94 @@ export class RepositoryManageComponent implements OnInit {
 	// 查看
 	look(e, data){
 		e.stopPropagation();
+		this.optType = 'look'
+		this.rowId = data.id
+		this.vIndex = 0
+		this.modal = true
+		var that = this;
+		let query = {
+			idx: that.pageIndex - 1,
+			sum: that.pageSize,
+			solution: {
+				hosId: this.hosId,
+				operationType:'lookOver',
+				solutionNumber:data.solutionNumber
+			}
+		};
+		this.isSpinning = true
+		that.mainService
+			.getFetchDataList("data", "solution", query)
+			.subscribe((res) => {
+				this.getFile()
+				let data = res.list
+				this.detailData = data
+				this.richText = this.sanitizer.bypassSecurityTrustHtml(data[0].content);
+				for(let i of data){
+					if(i.solutionLogs.length>0){
+						for(let t of i.solutionLogs){
+							t.time = format(t.operationTime, 'yyyy-MM-dd HH:mm')
+						}
+					}
+				}
+				this.lookData = data[0]
+				this.stepLength = this.lookData.solutionLogs.length
+				this.isSpinning = false
+			});
+	}
+	
+	getFile(){
+		this.mainService
+			.getPreviewImage('solution', this.rowId)
+			.subscribe((res:any)=> {
+				this.fileData = res.data.map((v) =>{
+					return{
+						name: v.name,
+						url: location.origin + '/file' + v.relativeFilePath
+					}
+				});
+			});
+	}
+	
+	// 审核
+	rowId=null;
+	audit(e, data){
+		e.stopPropagation();
+		this.rowId = data.id
+		this.vIndex = 0
+		this.optType = 'audit'
 		this.modal = true
+		var that = this;
+		let query = {
+			idx: that.pageIndex - 1,
+			sum: that.pageSize,
+			solution: {
+				hosId: this.hosId,
+				operationType:'lookOver',
+				solutionNumber:data.solutionNumber
+			}
+		};
+		this.isSpinning = true
+		that.mainService
+			.getFetchDataList("data", "solution", query)
+			.subscribe((res) => {
+				this.getFile()
+				let data = res.list
+				this.detailData = data
+				this.richText = this.sanitizer.bypassSecurityTrustHtml(data[0].content);
+				for(let i of data[0].solutionLogs){
+					i.time = format(i.operationTime, 'yyyy-MM-dd HH:mm') 
+				}
+				this.lookData = data[0]
+				this.stepLength = this.lookData.solutionLogs.length
+				this.isSpinning = false
+			});
+	
 	}
 	
 	// 编辑
 	edit(e, data) {
 	  e.stopPropagation();
-	  this.router.navigateByUrl(`/repositoryManageAdd/${data.id}`);
+	  this.router.navigateByUrl(`/repositoryManageAdd/${data.id}?type=edit`);
 	}
 	
 	// 停用
@@ -343,21 +391,21 @@ export class RepositoryManageComponent implements OnInit {
 	confirmDel2() {
 	  var that = this;
 	  that.btnLoading = true;
-	  that.mainService
-	    .coopTypeConfig(
-	      "rmvData",
-	      "drugsBatch",
-	       [that.coopId]
-	    )
-	    .subscribe((data) => {
-	      that.btnLoading = false;
-	      that.pauseModal = false;
-	      if (data.status==200) {
-	        that.showPromptModal("停用", true, "");
-	      } else {
-	        that.showPromptModal("停用", false, data.data[0].msg);
-	      }
-	    });
+		let data: any = {
+			id:this.coopId,
+			operationType: 'deactivate'
+		};
+		this.mainService
+			.simplePost("updData", "solution", data)
+			.subscribe((data) => {
+				that.btnLoading = false;
+				that.pauseModal = false;
+				if (data.status == 200) {
+					this.showPromptModal("停用", true, "");
+				} else {
+					this.showPromptModal("停用", false, data.msg);
+				}
+			});
 	}
 	
 	hideDelModal2() {
@@ -376,35 +424,28 @@ export class RepositoryManageComponent implements OnInit {
 	// 确认恢复
 	confirmDel3() {
 	  var that = this;
-	  that.btnLoading = true;
-	  that.mainService
-	    .coopTypeConfig(
-	      "rmvData",
-	      "drugsBatch",
-	       [that.coopId]
-	    )
-	    .subscribe((data) => {
-	      that.btnLoading = false;
-	      that.renewModal = false;
-	      if (data.status==200) {
-	        that.showPromptModal("恢复", true, "");
-	      } else {
-	        that.showPromptModal("停用", false, data.data[0].msg);
-	      }
-	    });
+		that.btnLoading = true;
+		let data: any = {
+			id:this.coopId,
+			operationType: 'recover'
+		};
+		this.mainService
+			.simplePost("updData", "solution", data)
+			.subscribe((data) => {
+				that.btnLoading = false;
+				that.renewModal = false;
+				if (data.status == 200) {
+					this.showPromptModal("恢复", true, "");
+				} else {
+					this.showPromptModal("恢复", false, data.msg);
+				}
+			});
 	}
 	
 	hideDelModal3() {
 	  this.renewModal = false;
 	}
 	
-	// 审核
-	audit(e, data){
-		e.stopPropagation();
-		this.modal = true
-		// this.router.navigateByUrl(`/dispensingDetail/${data.id}`);
-	}
-	
 
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   showPromptModal(con, success, promptInfo?) {