From 585cd513d670bc765b11bd5d5911df40b54f3188 Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Wed, 17 Mar 2021 16:55:27 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E6=B7=BB=E5=8A=A0=E6=8B=92?= =?UTF-8?q?=E7=BB=9D=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wait-examineer.component.ts | 19 +++++++++++++++---- .../add-unit-two-type-statistics.component.ts | 2 +- .../all-plan/all-plan.component.ts | 7 +++---- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts index 21f6ee9..9e18892 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-25 16:13:50 * @LastEditors: sueRimn - * @LastEditTime: 2021-03-17 14:08:07 + * @LastEditTime: 2021-03-17 15:52:08 */ import { Component, Inject, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; @@ -670,6 +670,7 @@ export class remark{ itemId:this.shenheTable[0].itemId, verifyState:5, contentType:11, + remark:this.remark, title:this.shenheTable[0].title+'基本信息' } this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{ @@ -683,6 +684,7 @@ export class remark{ itemId:this.shenheTable[0].itemId, verifyState:5, contentType:this.shenheTable[0].contentType, + remark:this.remark, title:this.shenheTable[0].title } this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{ @@ -692,12 +694,20 @@ export class remark{ }else{ //预案审核拒绝 if(this.shenheTable[0].verifyState==0){ - this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`,{auditStatus:32}).subscribe(data=>{ + let refbody={ + auditOpinion:this.remark, + auditStatus:32 + } + this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`,refbody).subscribe(data=>{ this.snackBar.open('操作成功!','确定',config); this.dialogRef.close() }) }else if(this.shenheTable[0].verifyState==3){ - this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:4}).subscribe(data=>{ + let refbody={ + auditOpinion:this.remark, + auditStatus:4 + } + this.http.put(`/api/PlanAudits/${this.radioid}`,refbody).subscribe(data=>{ this.snackBar.open('操作成功!','确定',config); this.dialogRef.close() }) @@ -713,6 +723,7 @@ export class remark{ var bodyre={ id:this.shenheTable[i].id, itemId:this.shenheTable[i].itemId, + remark:this.remark, verifyState:5 } this.companyrefuseList.push(bodyre) @@ -726,7 +737,7 @@ export class remark{ var carts={ planComponentId:this.shenheTable[i].itemId, auditStatus:this.shenheTable[i].verifyState==3?4:32, - auditOpinion:'' + auditOpinion:this.remark } this.refuseList.push(carts) } diff --git a/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts b/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts index 7824e31..44b78c4 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts +++ b/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts @@ -33,7 +33,7 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit { id:this.lastId, //organizationId:'1' } - this.data.getData(paramsdata,this.data.zuzhiorBuilding=="zhi"?`/api/StatisticsAnalysis/Companies/Organizations/${this.lastId}`:`/api/StatisticsAnalysis/Companies/BuildingTypes/${this.lastId}`) + this.data.getData(this.data.zuzhiorBuilding=="zhi"?paramsdata:null,this.data.zuzhiorBuilding=="zhi"?`/api/StatisticsAnalysis/Companies/Organizations/${this.lastId}`:`/api/StatisticsAnalysis/Companies/BuildingTypes/${this.lastId}`) this.setTimeoutObj = window.setTimeout(()=>{ this.tabledata=JSON.parse(JSON.stringify(this.data.allDate)) console.log(this.tabledata) diff --git a/src/app/statistic-analysis/all-plan/all-plan.component.ts b/src/app/statistic-analysis/all-plan/all-plan.component.ts index 78cf94f..d26e0ae 100644 --- a/src/app/statistic-analysis/all-plan/all-plan.component.ts +++ b/src/app/statistic-analysis/all-plan/all-plan.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-03-15 11:32:30 * @LastEditors: sueRimn - * @LastEditTime: 2021-03-17 10:30:42 + * @LastEditTime: 2021-03-17 16:18:52 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -77,7 +77,6 @@ export class AllPlanComponent implements OnInit { //查看详情 lookPlan(e){ - console.log(e) if(e.planMode == 0){ console.log(e.attachmentUrls) var index=e.attachmentUrls[0].indexOf("\/") @@ -132,8 +131,8 @@ export class AllPlanComponent implements OnInit { if(e.planMode == 2){ //如果是在线编辑 let id = e.id sessionStorage.setItem("planId",id) - /* sessionStorage.setItem("companyId",this.companyId) - sessionStorage.setItem("buildingTypeId",this.unittypeId) */ + sessionStorage.setItem("companyId",e.company.id) + sessionStorage.setItem("buildingTypeId",e.company.buildingTypes[0].id) sessionStorage.setItem("editable","0") sessionStorage.setItem("planName",e.name) let companyId = sessionStorage.getItem("companyId")