shaojiahao
/
ShangHaiYuan-AnXin
2
0
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

zhuzhou
邵佳豪 4 years ago
parent
3c18ca7a98 44bda8715b
commit
4864f5761e
5 changed files with 240 additions and 170 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/app/key-unit/key-unit-management/key-unit-management.component.ts
  2. 4
      src/app/plan-audit/plan-audit.module.ts
  3. 8
      src/app/plan-audit/wait-examineer/remark.html
  4. 18
      src/app/plan-audit/wait-examineer/wait-examineer.component.scss
  5. 376
      src/app/plan-audit/wait-examineer/wait-examineer.component.ts

4
src/app/key-unit/key-unit-management/key-unit-management.component.ts
Unescape View File

@ -844,7 +844,7 @@ export class companyAuditResult{
createTime=''
organizationName=this.data.element.organizationName
verifyTime=''
remark=''
remark=this.data.element.contentVerify.remark
verifyOrganizationName
verifyState=100
ngOnInit(): void {
@ -852,7 +852,7 @@ export class companyAuditResult{
this.createTime=this.data.element.contentVerify.createTime
//this.organizationName=this.data.element.organizationName
this.verifyTime=this.data.element.contentVerify.verifyTime
this.remark=this.data.element.remark
//this.remark=this.data.element.remark
this.verifyState=this.data.element.contentVerify.verifyState
this.verifyOrganizationName=this.data.element.contentVerify.verifyOrganizationName
}

4
src/app/plan-audit/plan-audit.module.ts
Unescape View File

@ -51,7 +51,7 @@ import {ViewUnitDetailsPlanComponent} from '../key-unit/view-unit-details-plan/v
import {KeyUnitModule} from '../key-unit/key-unit.module';
import { PlanRecordComponent } from './plan-record/plan-record.component';
import { BasicInfoComponent } from './basic-info/basic-info.component';
import { WaitExamineerComponent } from './wait-examineer/wait-examineer.component';
import { WaitExamineerComponent,remark } from './wait-examineer/wait-examineer.component';
import { WaterAuditComponent } from './water-audit/water-audit.component';
import { FireforceAuditComponent } from './fireforce-audit/fireforce-audit.component';
import { LinkageforcesAuditComponent } from './linkageforces-audit/linkageforces-audit.component'
@ -76,7 +76,7 @@ import { ViewDetailsComponent } from './view-details/view-details.component'
declarations: [DetachmentLevelComponent, PlanAuditComponent, PlanPassComponent,PlanOpen, PlanRecordComponent, BasicInfoComponent,
WaitExamineerComponent,AllaroundComponent,ImgDetails,FireFacilitiesComponent,ImagesData2,previewBigImg2,PlanListComponent,OpenPlanToolDialog,
KeySiteLookComponent,KeySiteImgs2,FunctionPartitionComponent,CadDrawComponent,RealisticPictureLookComponent,previewImg3,show3D, WaterAuditComponent,
FireforceAuditComponent, LinkageforcesAuditComponent, ViewDetailsComponent,recordshow3D],
FireforceAuditComponent, LinkageforcesAuditComponent, ViewDetailsComponent,recordshow3D,remark],
imports: [
CommonModule,
PlanAuditRoutingModule,

8
src/app/plan-audit/wait-examineer/remark.html
Unescape View File

@ -4,17 +4,17 @@
* @Author: sueRimn
* @Date: 2021-03-17 09:20:34
* @LastEditors: sueRimn
* @LastEditTime: 2021-03-17 09:43:49
* @LastEditTime: 2021-03-17 11:04:31
-->
<div class="remarkbox">
<div class="remarkhead">
<span>审批意见</span>
</div>
<div class="remarktext">
<textarea placeholder="请填写审批意见"></textarea>
<textarea placeholder="请填写审批意见" [(ngModel)]="remark"></textarea>
</div>
<div class="remarkbottom">
<button mat-raised-button color="primary">确定</button>
<button mat-raised-button>取消</button>
<button mat-raised-button color="primary" style="margin-left: 100px;" (click)='define()'>确定</button>
<button mat-raised-button style="margin-left: 20px;" (click)='close()'>取消</button>
</div>
</div>

18
src/app/plan-audit/wait-examineer/wait-examineer.component.scss
Unescape View File

@ -252,4 +252,22 @@ th,td{
margin-left: 40%;
}
}
.remarktext{
width: 100%;
margin-top: 20px;
textarea{
width: 420px;
height: 110px;
outline:none;
}
}
.remarkbottom{
width: 100%;
margin-top: 22px;
button{
width: 100px;
height: 36px;
font-size: 17px;
}
}
}

376
src/app/plan-audit/wait-examineer/wait-examineer.component.ts
Unescape View File

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-25 16:13:50
* @LastEditors: sueRimn
* @LastEditTime: 2021-03-17 10:32:49
* @LastEditTime: 2021-03-17 14:08:07
*/
import { Component, Inject, OnInit } from '@angular/core';
import { FormControl } from '@angular/forms';
@ -333,7 +333,7 @@ export class WaitExamineerComponent implements OnInit {
//打开三维预案弹窗
oopen3Dshow(){
this.dialog.open(show3D,{width:'1650px',height:'850px',data:{url:this.thirdPartyURL,twoOrthree:this.twoOrthree}});
this.dialog.open(show3D,{width:'1650px',height:'850px',data:{url:this.thirdPartyURL,twoOrthree:this.twoOrthree,radioid:this.radioid}});
}
//变更数据和全部数据切换按钮
buttonChange(){
@ -351,89 +351,14 @@ export class WaitExamineerComponent implements OnInit {
if(this.shenheTable.length==0){
this.snackBar.open('请勾选要审核的条目!','确定',config);
}
//else{this.dialog.open(remark,{width:'460px',height:'260px',data:{shenhedata:this.shenheTable}});}
//单个审核
else if(this.shenheTable.length == 1){
//重点单位审核
if(this.shenheTable[0].contentType == 11){
let body:any = {
id:this.shenheTable[0].id,
itemId:this.shenheTable[0].itemId,
verifyState:4,
contentType:11,
title:this.shenheTable[0].title+'基本信息'
}
this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.getAlltabledate()
})
}else if(this.shenheTable[0].contentType == 12 || this.shenheTable[0].contentType == 13 || this.shenheTable[0].contentType == 14){
console.log(1111,this.shenheTable[0])
let body:any = {
id:this.shenheTable[0].id,
itemId:this.shenheTable[0].itemId,
verifyState:4,
contentType:this.shenheTable[0].contentType,
title:this.shenheTable[0].title
}
this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.showtype = -1
this.getAlltabledate()
})
}else{
//预案审核
if(this.shenheTable[0].verifyState==0){
this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`,{auditStatus:16}).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.getAlltabledate()
})
}else if(this.shenheTable[0].verifyState==3){
this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:2}).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.getAlltabledate()
})
}
}
this.shenheTable=[]
}
//批量审核
else{
let isTrue = window.confirm('确定同意选中条目的审核吗？')
if(isTrue){
if(this.shenheTable[0].contentType==11||this.shenheTable[0].contentType==12){ //批量审批水源和重点单位
for(var i=0;i<this.shenheTable.length;i++){
var body={
id:this.shenheTable[i].id,
itemId:this.shenheTable[i].itemId,
verifyState:4
}
companyAgreeList.push(body)
}
this.http.put(`/api/ContentVerifies/Batch`,companyAgreeList).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.getAlltabledate()
})
}else{ //批量审核预案
for(var i=0;i<this.shenheTable.length;i++){
var cart={
planComponentId:this.shenheTable[i].itemId,
auditStatus:this.shenheTable[i].verifyState==3?2:16,
auditOpinion:''
}
agreeList.push(cart)
}
this.http.put(`/api/PlanAudits/Batch`,agreeList).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.getAlltabledate()
})
}
const dialogRef =this.dialog.open(remark,{width:'460px',height:'290px',data:{shenhedata:this.shenheTable,type:1,radioid:this.radioid}});
dialogRef.afterClosed().subscribe(result => {
this.shenheTable=[]
}
}
this.getAlltabledate()
});
}
}
//拒绝操作
refuse(){
@ -445,86 +370,12 @@ export class WaitExamineerComponent implements OnInit {
if(this.shenheTable.length==0){
this.snackBar.open('请选择要审核的预案!','确定',config);
}
//单个审核拒绝
else if(this.shenheTable.length==1){
let isTrue = window.confirm('确定拒绝选中条目的审核吗？')
if(isTrue){
//重点单位审核拒绝
if(this.shenheTable[0].contentType == 11){
let body:any = {
id:this.shenheTable[0].id,
itemId:this.shenheTable[0].itemId,
verifyState:5,
contentType:11,
title:this.shenheTable[0].title+'基本信息'
}
this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.getAlltabledate()
})
}else if(this.shenheTable[0].contentType == 12 || this.shenheTable[0].contentType == 13 || this.shenheTable[0].contentType == 14){
let body:any = {
id:this.shenheTable[0].id,
itemId:this.shenheTable[0].itemId,
verifyState:5,
contentType:this.shenheTable[0].contentType,
title:this.shenheTable[0].title
}
this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
this.showtype = -1
this.snackBar.open('操作成功!','确定',config);
this.getAlltabledate()
})
}else{
//预案审核拒绝
if(this.shenheTable[0].verifyState==0){
this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`,{auditStatus:32}).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.getAlltabledate()
})
}else if(this.shenheTable[0].verifyState==3){
this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:4}).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.getAlltabledate()
})
}
}
this.shenheTable=[]
}
}
//批量审核
else{
let isTrue = window.confirm('确定拒绝选中条目的审核吗？')
if(isTrue){
if(this.shenheTable[0].contentType==11||this.shenheTable[0].contentType==12){ //批量审批水源和重点单位
for(var i=0;i<this.shenheTable.length;i++){
var body={
id:this.shenheTable[i].id,
itemId:this.shenheTable[i].itemId,
verifyState:5
}
companyrefuseList.push(body)
}
this.http.put(`/api/ContentVerifies/Batch`,companyrefuseList).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.getAlltabledate()
})
}else{
for(var i=0;i<this.shenheTable.length;i++){
var cart={
planComponentId:this.shenheTable[i].itemId,
auditStatus:this.shenheTable[i].verifyState==3?4:32,
auditOpinion:''
}
refuseList.push(cart)
}
this.http.put(`/api/PlanAudits/Batch`,refuseList).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.getAlltabledate()
})
}
const dialogRef =this.dialog.open(remark,{width:'460px',height:'290px',data:{shenhedata:this.shenheTable,type:2,radioid:this.radioid}});
dialogRef.afterClosed().subscribe(result => {
this.shenheTable=[]
}
this.getAlltabledate()
});
}
//this.shenheTable=[]
@ -692,9 +543,210 @@ export class show3D{
styleUrls: ['./wait-examineer.component.scss']
})
export class remark{
constructor(private sanitizer: DomSanitizer,public dialogRef: MatDialogRef<show3D>,@Inject(MAT_DIALOG_DATA) public data,public dialog: MatDialog) {}
constructor(private http:HttpClient,private sanitizer: DomSanitizer,public dialogRef: MatDialogRef<remark>,@Inject(MAT_DIALOG_DATA) public data,public dialog: MatDialog,public snackBar: MatSnackBar) {}
ngOnInit(): void {
console.log(this.data)
this.shenheTable=this.data.shenhedata
this.radioid=this.data.radioid
}
companyrefuseList=[]
refuseList=[]
shenheTable=[]
companyAgreeList=[]
agreeList=[]
remark
radioid
//取消
close(){
this.dialogRef.close()
}
//确定
define(){
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
if(this.data.type==1){
//同意操作
console.log(this.shenheTable)
//单个审核
if(this.shenheTable.length == 1){
//重点单位审核
if(this.shenheTable[0].contentType == 11){
let body:any = {
id:this.shenheTable[0].id,
itemId:this.shenheTable[0].itemId,
verifyState:4,
contentType:11,
remark:this.remark||'',
title:this.shenheTable[0].title+'基本信息'
}
this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.dialogRef.close()
//this.getAlltabledate()
})
}else if(this.shenheTable[0].contentType == 12 || this.shenheTable[0].contentType == 13 || this.shenheTable[0].contentType == 14){
console.log(1111,this.shenheTable[0])
let body:any = {
id:this.shenheTable[0].id,
itemId:this.shenheTable[0].itemId,
verifyState:4,
contentType:this.shenheTable[0].contentType,
remark:this.remark||'',
title:this.shenheTable[0].title
}
this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
//this.showtype = -1
this.dialogRef.close()
//this.getAlltabledate()
})
}else{
//预案审核
if(this.shenheTable[0].verifyState==0){
let body:any={
auditStatus:16,
auditOpinion:this.remark||''
}
this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`,body).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.dialogRef.close()
//this.getAlltabledate()
})
}else if(this.shenheTable[0].verifyState==3){
let body:any={
auditStatus:2,
auditOpinion:this.remark||''
}
this.http.put(`/api/PlanAudits/${this.radioid}`,body).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.dialogRef.close()
//this.getAlltabledate()
})
}
}
this.shenheTable=[]
}
//批量审核
else{
if(this.shenheTable[0].contentType==11||this.shenheTable[0].contentType==12){ //批量审批水源和重点单位
for(var i=0;i<this.shenheTable.length;i++){
var body={
id:this.shenheTable[i].id,
itemId:this.shenheTable[i].itemId,
verifyState:4,
remark:this.remark
}
this.companyAgreeList.push(body)
}
this.http.put(`/api/ContentVerifies/Batch`,this.companyAgreeList).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.dialogRef.close()
//this.getAlltabledate()
})
}else{ //批量审核预案
for(var i=0;i<this.shenheTable.length;i++){
var cart={
planComponentId:this.shenheTable[i].itemId,
auditStatus:this.shenheTable[i].verifyState==3?2:16,
auditOpinion:this.remark||''
}
this.agreeList.push(cart)
}
this.http.put(`/api/PlanAudits/Batch`,this.agreeList).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.dialogRef.close()
//this.getAlltabledate()
})
}
this.shenheTable=[]
}
}
else{
//单个审核拒绝
if(this.shenheTable.length==1){
//重点单位审核拒绝
if(this.shenheTable[0].contentType == 11){
let body:any = {
id:this.shenheTable[0].id,
itemId:this.shenheTable[0].itemId,
verifyState:5,
contentType:11,
title:this.shenheTable[0].title+'基本信息'
}
this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.dialogRef.close()
//this.getAlltabledate()
})
}else if(this.shenheTable[0].contentType == 12 || this.shenheTable[0].contentType == 13 || this.shenheTable[0].contentType == 14){
let body:any = {
id:this.shenheTable[0].id,
itemId:this.shenheTable[0].itemId,
verifyState:5,
contentType:this.shenheTable[0].contentType,
title:this.shenheTable[0].title
}
this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
//this.showtype = -1
this.snackBar.open('操作成功!','确定',config);
this.dialogRef.close()
})
}else{
//预案审核拒绝
if(this.shenheTable[0].verifyState==0){
this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`,{auditStatus:32}).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.dialogRef.close()
//this.getAlltabledate()
})
}else if(this.shenheTable[0].verifyState==3){
this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:4}).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.dialogRef.close()
//this.getAlltabledate()
})
}
}
this.shenheTable=[]
}
//批量审核
else{
if(this.shenheTable[0].contentType==11||this.shenheTable[0].contentType==12){ //批量审批水源和重点单位
for(var i=0;i<this.shenheTable.length;i++){
var bodyre={
id:this.shenheTable[i].id,
itemId:this.shenheTable[i].itemId,
verifyState:5
}
this.companyrefuseList.push(bodyre)
}
this.http.put(`/api/ContentVerifies/Batch`,this.companyrefuseList).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.dialogRef.close()
//this.getAlltabledate()
})
}else{
for(var i=0;i<this.shenheTable.length;i++){
var carts={
planComponentId:this.shenheTable[i].itemId,
auditStatus:this.shenheTable[i].verifyState==3?4:32,
auditOpinion:''
}
this.refuseList.push(carts)
}
this.http.put(`/api/PlanAudits/Batch`,this.refuseList).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.dialogRef.close()
//this.getAlltabledate()
})
}
this.shenheTable=[]
}
}
}
}
Write Preview
Loading…
Cancel
Save