修复工时管理bug

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

@@ -105,7 +105,7 @@
            <nz-form-label nzRequired nzFor="handleGroup" [nzSpan]="6">处理组</nz-form-label>
            <nz-form-control nzErrorTip="请选择处理组!" [nzSpan]="18">
              <nz-input-group>
-           		<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择处理组" formControlName="handleGroup">
+           		<nz-select class="formItem" (ngModelChange)="changeGroup($event)" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择处理组" formControlName="handleGroup">
            		  <ng-container *ngFor="let option of allUserGroup">
            		    <nz-option *ngIf="!isDeptLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
            		  </ng-container>
@@ -131,7 +131,7 @@
           <nz-form-label nzRequired nzFor="handleUser" [nzSpan]="6">处理人</nz-form-label>
           <nz-form-control nzErrorTip="请选择处理人!" [nzSpan]="18">
             <nz-input-group>
-          		<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp3($event)" nzServerSearch nzShowSearch nzPlaceHolder="请选择处理人" formControlName="handleUser">
+          		<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择处理人" formControlName="handleUser">
           		  <ng-container *ngFor="let option of userData">
           		    <nz-option *ngIf="!isDeptLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
           		  </ng-container>

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

@@ -44,8 +44,8 @@ export class ConfigurationDeptUserComponent implements OnInit {
 			this.getDeparts(e);
 		});
 		this.searchParentUserSubject.pipe(debounceTime(500)).subscribe((e) => {
-			this.isDeptLoading = true;
-			this.getUser(e);
+			// this.isDeptLoading = true;
+			// this.getUser(e);
 		});
 		
     // 优先级
@@ -57,7 +57,7 @@ export class ConfigurationDeptUserComponent implements OnInit {
     this.getPriorityList();
 		this.getMalfunction()
 		this.getDeparts('')
-		this.getUser('');
+		// this.getUser('');
 		this.getGrop()
   }
 
@@ -90,9 +90,7 @@ export class ConfigurationDeptUserComponent implements OnInit {
 	  let data = {
 	    department: {
 	      dept,
-	      hospital: {
-	        id: this.hosId
-	      },
+				cascadeHosId: this.currentHospital.id,
 	    },
 	    idx: 0,
 	    sum: 20,
@@ -136,6 +134,12 @@ export class ConfigurationDeptUserComponent implements OnInit {
 		})
 	}
 	
+	// 选择处理组
+	changeGroup(e){
+		this.validatePriorityForm.controls.handleUser.setValue(null)
+		this.getUser(e)
+	}
+	
 	// 获取处理组
 	getGrop(){
 		let groupData = {
@@ -154,13 +158,14 @@ export class ConfigurationDeptUserComponent implements OnInit {
 	}
 	
 	// 获取处理人
-	getUser(name){
+	getUser(groupId){
 		let data = {
 			idx: 0,
-			sum: 20,
+			sum: 9999,
 			user: {
-				name:name,
+				// name:name,
 				hospital: { id: this.hosId || "" },
+				groupdata:{id:groupId || ""}
 			},
 		};
 		this.mainService
@@ -218,7 +223,7 @@ export class ConfigurationDeptUserComponent implements OnInit {
     console.log(this.validatePriorityForm.value);
     this.btnLoading = true;
     let postData:any = {};
-		let malfunction = this.validatePriorityForm.value.malfunction
+		let malfunction = this.validatePriorityForm.value.malfunction?this.validatePriorityForm.value.malfunction:[]
     if (this.add) {
       //增加
       postData = {
@@ -273,7 +278,7 @@ export class ConfigurationDeptUserComponent implements OnInit {
 			  malfunction: [this.validatePriorityForm.value.malfunction, []],//故障
 			  handleGroup: [this.validatePriorityForm.value.handleGroup, [Validators.required]],//处理组
 				binding:['0',[Validators.required]],//是否绑定人员
-			  handleUser: [this.validatePriorityForm.value.handleUser, []],//处理人
+			  handleUser: [null, []],//处理人
 			});
 		}
 	}

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

@@ -104,5 +104,5 @@
 
 <!-- 删除模态框 -->
 <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading" 
-  (confirmDelEvent)="confirmDel()" (cancelDelEvent)="cancelDel()" content="确定要删除吗？" confirmTxt="是" cancelTxt="否">
+  (confirmDelEvent)="confirmDel()" (cancelDelEvent)="cancelDel()" [content]="delContent" confirmTxt="是" cancelTxt="否">
 </app-dialog-delete>

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

@@ -95,9 +95,8 @@ export class ConfigurationManHourComponent implements OnInit {
   activeCategory1:any = {};
   activeCategory2:any = {};
   activeCategory3:any = {};
-	listType:any = 1;
   clickCategory(item, type:number){
-		this.listType = type
+		this.coopType = type
     switch(type){
       case 1:
         this.categoryList2 = [];
@@ -135,11 +134,21 @@ export class ConfigurationManHourComponent implements OnInit {
 	confirmDel() {
 	  let that = this;
 	  that.btnLoading = true;
+		let delId = null
+		console.log(222,this.coopType)
+		if(this.coopType==1){
+			delId = this.activeCategory1.id
+		}else{
+			delId = this.activeCategory2.id
+		}
 	  that.mainService
-	    .coopTypeConfig('rmvData', 'workHourManagement', [this['activeCategory' + this.listType].id])
+	    .coopTypeConfig('rmvData', 'workHourManagement', [delId])
 	    .subscribe((data) => {
 	      that.btnLoading = false;
 	      that.hideDelModal();
+				if(this.coopType==1){
+					this.categoryList2 = []
+				}
 	      if (data["status"] == 200) {
 	        that.showPromptModal("删除", true, "");
 	      } else {
@@ -198,7 +207,13 @@ export class ConfigurationManHourComponent implements OnInit {
 	
 	// 删除工时
 	delModal: boolean = false; //删除模态框
+	delContent: string = null; //删除模态框
 	delCategoryModal(type:number){
+		if(type==1){
+			this.delContent = '此操作会删除当前大类下的小类,确定要删除吗？'
+		}else{
+			this.delContent = '确定要删除吗？'
+		}
 		this.coopType = type;
 		this.delModal = true
 	}

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

@@ -71,6 +71,8 @@ export class wangEditorComponent implements OnInit {
 					this.isLoading = false
 					let url = location.origin + '/file' + res.body.data.relativeFilePath
 					insertImgFn(url,url,url)
+				}else if(res.status==500 && res.body){
+					this.message.error(res.body.error)
 				}
 			});
 		}
@@ -94,6 +96,8 @@ export class wangEditorComponent implements OnInit {
 					this.isLoading = false
 					let url = location.origin + '/file' + res.body.data.relativeFilePath
 					insertVideoFn(url)
+				}else if(res.status==500 && res.body){
+					this.message.error(res.body.error)
 				}
 			});
 		}
@@ -117,19 +121,19 @@ export class wangEditorComponent implements OnInit {
 	      'italic',  // 斜体
 	      'underline',  // 下划线
 	      'head',  // 标题
+				'image',  // 插入图片
+				'video',  // 插入视频
 	      'fontName',  // 字体
 	      'fontSize',  // 字号
 	      'strikeThrough',  // 删除线
 	      'foreColor',  // 文字颜色
 	      'backColor',  // 背景颜色
-	      'link',  // 插入链接
+	      // 'link',  // 插入链接
 	      'list',  // 列表
 	      'justify',  // 对齐方式
 	      'quote',  // 引用
 	      // 'emoticon',  // 表情
 	      // 'table',  // 表格
-	      'image',  // 插入图片
-	      'video',  // 插入视频
 	      // 'code',  // 插入代码
 	      'undo',  // 撤销
 	      'redo'  // 重复

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

@@ -9,19 +9,19 @@
 				</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">
+				  <nz-form-label nzRequired nzFor="title" [nzSm]="2" [nzXs]="24">标题</nz-form-label>
+				  <nz-form-control nzErrorTip="请输入标题!" [nzSm]="22" [nzXs]="24">
 						<input nz-input formControlName="title"  placeholder="请输入标题" nzSize="default" />
 				  </nz-form-control>
 				</nz-form-item>
 				
 				<nz-form-item class="form-item" *ngIf="add">
-				  <nz-form-label nzFor="content" [nzSm]="4" [nzXs]="24">内容</nz-form-label>
+				  <nz-form-label nzFor="content" [nzSm]="2" [nzXs]="24">内容</nz-form-label>
 					<app-wang-editor (changeContent)="changeContent($event)"></app-wang-editor>
 				</nz-form-item>
 				
 				<nz-form-item class="form-item" *ngIf="!add && isContentShow">
-				  <nz-form-label nzFor="content" [nzSm]="4" [nzXs]="24">内容</nz-form-label>
+				  <nz-form-label nzFor="content" [nzSm]="2" [nzXs]="24">内容</nz-form-label>
 					<app-wang-editor (changeContent)="changeContent($event)" [content]="detailContent"></app-wang-editor>
 				</nz-form-item>
 			</div>
@@ -39,7 +39,7 @@
 				
 				<nz-form-item class="form-item">
 				  <nz-form-label nzRequired nzFor="knowledgeClass" [nzSm]="6" [nzXs]="24">知识分类</nz-form-label>
-					<nz-form-control nzErrorTip="请选择!" [nzSm]="16" [nzXs]="24">
+					<nz-form-control nzErrorTip="请选择!" [nzSm]="24" [nzXs]="24">
 						<nz-radio-group formControlName="knowledgeClass" (ngModelChange)="radioChnage($event)">
 						  <label nz-radio [nzValue]="item.id" *ngFor="let item of dicData">{{item.name}}</label>
 						</nz-radio-group>

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

@@ -84,7 +84,7 @@ h3{
 		}
 		.form-title-box{
 			display: flex;
-			margin-left: 94px;
+			margin-left: 13px;
 			.form-title{
 				color: #000;
 				margin-right: 40px;

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

@@ -170,6 +170,9 @@ export class RepositoryManageAddComponent implements OnInit {
 							token:i.token
 						}
 					})
+				}else{
+					this.fileAllData = []
+					this.fileData = []
 				}
 			});
 	}
@@ -395,21 +398,16 @@ export class RepositoryManageAddComponent implements OnInit {
 	// 上传图片
 	uploadFile(id){
 		let url = `/service/common/common/uploadAttachment/solution/${id}/${id}`
-		const formData = new FormData()
 		for(let i of this.fileData){//新上传的附件
+			const formData = new FormData()
 			let item = this.fileAllData.find(t=>t.id == i.uid) //之前的附件
 			if(!item){
-				if(i.originFileObj){
-					formData.append('file', i.originFileObj);
-					formData.append('filename', i.originFileObj.name);
-				}else{
-					formData.append('file', i as any);
-					formData.append('filename', i.name);
-				}
+				formData.append('file', i as any);
+				formData.append('filename', i.name);
 				
 				const req = new HttpRequest('POST', url, formData, {
-					reportProgress: true,
-					withCredentials: true
+					reportProgress: false,
+					withCredentials: false
 				});
 				this.http.request(req).subscribe((res) => {
 				    
@@ -448,11 +446,12 @@ export class RepositoryManageAddComponent implements OnInit {
   }
 	
 	beforeUpload = (file: UploadFile) => {
-		console.log(888,file)
-		let type = file.name.split('.')
-		const isPic = (type[1] === 'xlsx' || type[1] === 'pdf' || 
-		type[1] === 'xls' || type[1] === 'ppt' || type[1] === 'pptx' ||
-		type[1] === 'txt' || type[1] === 'doc' || type[1] === 'docx');
+		let index = file.name.lastIndexOf('.')
+		let type = file.name.slice(index + 1)
+		console.log('type===',type)
+		const isPic = (type === 'xlsx' || type === 'pdf' || 
+		type === 'xls' || type === 'ppt' || type === 'pptx' ||
+		type === 'txt' || type === 'doc' || type === 'docx');
 		if (!isPic) {
 			this.message.error('只能上传PDF、word、ppt、excel、txt等文件类型格式!');
 			return false;
@@ -462,8 +461,7 @@ export class RepositoryManageAddComponent implements OnInit {
 	};
 	
 	// 删除附件
-	removeFile = (file) =>  {
-		console.log(111,file)
+	removeFile = (file:any) =>  {
 		let item = this.fileAllData.find(i=>i.id == file.uid)
 		let index = this.fileData.findIndex(i=>i.uid == file.uid)
 		if(item){ //附件在数据库
@@ -475,7 +473,6 @@ export class RepositoryManageAddComponent implements OnInit {
 					} 
 				});
 		}else{//附件不在数据库
-			console.log(555, index)
 			if(index!=-1){
 				this.fileData.splice(index, 1)
 			}

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

@@ -101,15 +101,15 @@
 						 </div>
 					 </div>
 				 </div>
-				 <div class="view-item right-box" *ngIf="lookData&&lookData.title"> 
+				 <div class="view-item right-box" *ngIf="solutionLogs"> 
 					 <nz-steps [nzCurrent]="stepLength" nzDirection="vertical" nzSize="small">
-						<ng-container *ngFor="let item of lookData.solutionLogs; let index = index">
+						<ng-container *ngFor="let item of solutionLogs; let index = index">
 						    <nz-step
 						      [nzDescription]="tpl"
 						    >
 						    </nz-step>
 						    <ng-template #tpl>
-									<div *ngIf="index==lookData.solutionLogs.length-1" class="step-size">
+									<div *ngIf="index==solutionLogs.length-1" class="step-size">
 										<div>
 											<span style="color: #49B856;">{{item.operationStatus.name}}</span>
 											&nbsp;&nbsp;&nbsp;
@@ -118,7 +118,7 @@
 										<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 *ngIf="index!=solutionLogs.length-1" class="step-size">
 										<div>
 											<span>{{item.operationStatus.name}}</span>
 											&nbsp;&nbsp;&nbsp;

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

@@ -84,6 +84,7 @@ export class RepositoryManageComponent implements OnInit {
 	editModal:boolean = false; //编辑时弹框
 	isSpinning: boolean = false; //页面loading状态
 	detailData:any;
+	solutionLogs:any;
 	lookData:any;
 	versionsData: any = []; //审核版本数据
 	fileData: any = []; //上传的附件数据
@@ -184,7 +185,6 @@ export class RepositoryManageComponent implements OnInit {
 	versionsClick(data, index){
 		this.vIndex = index
 		this.lookData = data
-		this.stepLength = this.lookData.solutionLogs.length
 		let content = data.content
 		if(content){
 			this.richText = this.sanitizer.bypassSecurityTrustHtml(content);
@@ -329,7 +329,8 @@ export class RepositoryManageComponent implements OnInit {
 					}
 				}
 				this.lookData = data[0]
-				this.stepLength = this.lookData.solutionLogs.length
+				this.solutionLogs = data[0].solutionLogs
+				this.stepLength = this.solutionLogs.length
 				this.isSpinning = false
 			});
 	}
@@ -377,7 +378,8 @@ export class RepositoryManageComponent implements OnInit {
 					i.time = format(i.operationTime, 'yyyy-MM-dd HH:mm') 
 				}
 				this.lookData = data[0]
-				this.stepLength = this.lookData.solutionLogs.length
+				this.solutionLogs = data[0].solutionLogs
+				this.stepLength = this.solutionLogs.length
 				this.isSpinning = false
 			});