[修改]2021-12-29上海内网更新修改

src/app/plan-audit/plan-record/plan-record.component.html

@@ -125,7 +125,7 @@
                             {{item.planType=='1'?'二维预案':item.planType=='2'?'三维预案':item.planType=='4'?'其它预案':item.planType=='16'?'文本预案':''}}
                           </td>
                         <td style="width: 15%;">{{item.title}}</td>
-                        <td style="width: 5%;" [ngClass]="{'green': item.operation == '1','red':item.operation == '2','blue':item.operation == '0'}">{{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}</td>
+                        <td style="width: 5%;" [ngClass]="{'green': item.operation == '0','red':item.operation == '2','yellow':item.operation == '1'}">{{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}</td>
                         <td style="width: 20%;">{{item.organizationName}}</td>
                         <td style="width: 10%;" [ngClass]="{'green': item.verifyState == '1'||item.verifyState == '4','red':item.verifyState == '2'||item.verifyState == '5'}">{{item.verifyState=='0'?'待初审':item.verifyState=='1'?
                           '初审通过':item.verifyState=='2'?'初审驳回':item.verifyState=='3'?'待终审':item.verifyState=='4'?'终审通过':'终审驳回'}}</td>

src/app/plan-audit/plan-record/plan-record.component.scss

@@ -304,7 +304,7 @@ th,td{
 }
 .green{color: #00C756;}
 .red{color: #FF4D4D;}
-.blue{color: #2196F3;}
+.yellow{color: #FFC94B;}
 .twoD {
     width: 100%;
     box-sizing: border-box;

src/app/plan-audit/wait-examineer/wait-examineer.component.html

@@ -84,7 +84,7 @@
               </td>
               <td style="width: 15%;">{{item.title}}</td>
               <td style="width: 5%;"
-                [ngClass]="{'green': item.operation == '1','red':item.operation == '2','blue':item.operation == '0'}">
+                [ngClass]="{'green': item.operation == '0','red':item.operation == '2','yellow':item.operation == '1'}">
                 {{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}</td>
               <td style="width: 20%;">{{item.organizationName}}</td>
               <td style="width: 10%;"

src/app/plan-audit/wait-examineer/wait-examineer.component.scss

@@ -285,8 +285,8 @@ td {
 .red {
     color: #ff4d4d;
 }
-.blue {
-    color: #2196f3;
+.yellow {
+    color: #FFC94B;
 }
 .accordingin {
     margin: 5px;

src/app/plan-management/create-plan-online-five/addattinf.html

@@ -0,0 +1,33 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2021-05-26 14:54:36
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2021-06-01 10:25:05
+-->
+<div class="box">
+    <div class="top">
+        <span>新增分组</span>
+    </div>
+    
+    <div class="center" *ngIf="this.data.element.surveyName=='建筑信息'">
+        <div class="group" *ngFor="let item of addAttinfBuild" >
+            <mat-checkbox class="example-margin" color='primary' [(ngModel)]="item.completed" >{{item.propertyName}}</mat-checkbox>
+        </div>
+    </div>
+    <div class="center" *ngIf="this.data.surveyName=='消防设施'">
+        <div class="group" *ngFor="let item of addAttinfFile" >
+            <mat-checkbox class="example-margin" color='primary' [(ngModel)]="item.completed" >{{item.name}}</mat-checkbox>
+        </div>
+    </div>
+    <div class="center" *ngIf="this.data.facilityItems!=null">
+        <div class="group" *ngFor="let item of facilityItems" >
+            <mat-checkbox class="example-margin" color='primary' [(ngModel)]="item.completed" >{{item.name}}</mat-checkbox>
+        </div>
+    </div>
+    <div class="bottom">
+        <button mat-raised-button color="primary" (click)='defineClick()'>确定</button>
+        <button mat-raised-button style="margin-left: 20px;" (click)="close()">取消</button>
+    </div>
+</div>

src/app/plan-management/create-plan-online-five/addgroup.scss

@@ -0,0 +1,41 @@
+.box{
+    height: 100%;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    .top{
+        width: 100%;
+        height: 40px;
+        text-align: center;
+        span{
+            font-size: 18px;
+        }
+    }
+    .center{
+        overflow: auto;
+        width: 100%;
+        height: 80%;
+        .group{
+            height: 35px;
+            //margin-left: 20px;
+            .example-margin {
+                margin: 0 10px;
+            }
+            input{
+                top: 2px;
+            }
+            span{
+                margin-left: 8px;
+            }
+        }
+    }
+    .bottom{
+        width: 100%;
+        margin-top: 20px;
+        button{
+            width: 80px;
+            height: 36px;
+            font-size: 16px;
+        }
+    }
+}

src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html

@@ -660,12 +660,7 @@
                     </div> -->
                     <div class="keyImg"
                         *ngIf="item.groupName == '重点图示' || item.groupName == '交通水源' || item.groupName == '预案附件'">
-                        <!-- <div class="titleItem" style="width: 100%;
-                        background-color: #2196F3;
-                        text-align: center;
-                        color: white;">
-                            <span>{{item.groupName}}</span>
-                        </div> -->
+                        
                         <div style="border: 1px solid #e8e9e9;width: 100%;" class="keyImgItem"
                             *ngFor="let i of item.attribute;let key = index">
                             <div class="keyImgTitle" style="height: 30px;
@@ -721,7 +716,7 @@
                                     opacity: 1;
                                     height: 40px;
                                     line-height: 40px;">{{itemunit.name}}</span>
-                                    <img src="../../../assets/images/update.png" *ngIf="haveNew!=undefined" (click)='unitZdyaaa()'>
+                                    <!-- <img src="../../../assets/images/update.png" *ngIf="haveNew!=undefined&&pattern == 'edit'" (click)='unitZdyaaa()'> -->
                                 </div>
                                 <div class="unitbody" *ngFor="let element of itemunit.body;let elei=index" style=" height: 100%;
                                 width: 100%;
@@ -738,9 +733,10 @@
                                             line-height: 40px;
                                             color: #ffffff;">{{element.surveyName}}</span>
                                             <!-- <img src="../../../assets/images/deletered.png" > -->
+                                            <img src="../../../assets/images/delyello.png" *ngIf="haveNew!=undefined&&pattern == 'edit'">
+                                            <!-- <img src="../../../assets/images/updatabai.png" (click)='addBuildingmb(element)' *ngIf="pattern == 'edit'&&(element.surveyName=='建筑信息'||element.surveyName=='消防设施')"> -->
                                             <img src="../../../assets/images/addbai.png"
                                                 (click)='unitadd(element.surveyName,uniti,elei)' *ngIf="pattern == 'edit'">
-                                            <img src="../../../assets/images/delyello.png" *ngIf="haveNew!=undefined">
                                         </div>
                                         <div class="body">
                                             <!-- 进攻通道 -->

src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts

@@ -59,7 +59,9 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
   blockyl = true
   zaixianDr=false
   haveNew=false
+  //index
   ngOnInit(): void {
+    //this.index = this.getArrayIndex(this.planTemplateData,'单位概况')
     this.haveNew=this.route.snapshot.queryParams.haveNew
     console.log(this.route.snapshot.queryParams.wordChange)
     this.planLevel = this.route.snapshot.queryParams.planCategory
@@ -446,6 +448,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
   buildingsData = []
   buildDataName
   buildZong
+  basicCategoryId
   //获得所有建筑信息
   async getAllBuildingsInfo() {
     let index = this.getArrayIndex(this.planTemplateData,'单位概况')
@@ -466,6 +469,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
           }).subscribe((buildingsData: any) => {
             //console.log(buildingsData)
             this.buildingsData.push(buildingsData[0])
+            //this.basicCategoryId=buildingsData[0].basicCategoryId
             resolve(this.buildingsData)
           })
         }
@@ -1908,6 +1912,28 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
     })
     
   }
+  //建筑信息和消防设施模板信息添加
+  addBuildingmb(element){
+    let index = this.getArrayIndex(this.planTemplateData,'单位概况')
+    console.log(element,this.buildingsData)
+    const dialogRef = this.dialog.open(adddwsurveys, {//调用open方法打开对话框并且携带参数过去
+      width: '290px',
+      height:'460px',
+      disableClose:true,
+      data:{element:element,buildingID:this.buildingsData[0].basicCategoryId}
+    });
+    dialogRef.afterClosed().subscribe(result => {
+      console.log(result)
+      if(result!=undefined){
+        this.planTemplateData[index].building[this.clicki].body.forEach(item => {
+          if(item.surveyName==element.surveyName){
+            element.attinf=result
+          }
+        });
+      }
+      
+    })
+  }
 }
 
 
@@ -2121,4 +2147,162 @@ export class updataHl{
     this.dialogRef.close(result);
   }
 }
+//建筑跟消防设施添加模板数据
+@Component({
+  selector: 'adddwsurveys',
+  templateUrl: './addattinf.html',
+  styleUrls: ['./addgroup.scss']
+})
+export class adddwsurveys{
+  constructor(private http: HttpClient,public dialogRef: MatDialogRef<adddwsurveys>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
+  addAttinfBuild=[]
+  buildnewDate=[]
+  addAttinfFile
+  filenewDate=[]
+  facilityItems
+  ngOnInit(): void{
+    this.getinf()
+    console.log(this.data)
+    
+  }
+
+  async getinf(){
+       if(this.data.element.surveyName=='建筑信息'&&this.data.element.attinf==undefined){
+        this.addAttinfBuild=[]
+        let paramsdata:any ={
+          categoryId:this.data.buildingID
+        }
+        this.http.get("/api/BasicGroups",{params:paramsdata}).subscribe((data:any)=>{
+          data.forEach(buildDate => {
+            this.addAttinfBuild.push(...buildDate.propertyInfos)
+            
+          });
+          this.addAttinfBuild.forEach(element => {
+            element.completed=false
+            element.olddata=element.propertyValue
+          });
+          console.log(this.addAttinfBuild)
+        })
+      }else if(this.data.element.surveyName=='建筑信息'&&this.data.element.attinf!=undefined){
+        this.buildnewDate=[] //接受接口返回的新数据
+        this.addAttinfBuild=this.data.element.attinf //模板传过来的数据
+        this.addAttinfBuild=JSON.parse(JSON.stringify(this.addAttinfBuild))
+        let paramsdata:any ={
+          categoryId:this.data.buildingId
+        }
+        /* 请求接口，做差异化对比 */
+        let restlt=await new Promise((resolve) => {
+          this.http.get("/api/BasicGroups",{params:paramsdata}).subscribe((data:any)=>{
+            data.forEach((buildDate,buildi,buildarr) => {
+              this.buildnewDate.push(...buildarr[buildi].propertyInfos)
+              resolve(data)
+            });
+            this.buildnewDate.forEach(element => {
+              element.completed=false
+              element.olddata=element.propertyValue
+            });
+          })
+        }) 
+          this.buildnewDate=JSON.parse(JSON.stringify(this.buildnewDate))
+          //差异化比较
+          let temp=0
+          this.buildnewDate.forEach((buildval,buindi,buildarr)=>{
+            temp=0
+            this.addAttinfBuild.forEach((addval,addi,addarr)=>{
+              if(buildval.propertyName==addval.propertyName){
+                temp++
+              }
+            })
+            if(temp==0){
+              //模板数据少于接口数据
+              console.log(buildval)
+              this.addAttinfBuild.push(buildval)
+            }
+          })
+          this.addAttinfBuild.forEach((addval,addi,addarr)=>{
+            temp=0
+            this.buildnewDate.forEach((buildval,buindi,buildarr)=>{
+              if(buildarr[buindi].propertyName==addarr[addi].propertyName){
+                temp++
+              }
+            })
+            if(temp==0){
+              console.log(addarr[addi])
+              //模板数据多了
+              this.addAttinfBuild.splice(addi,1)
+            }
+          })
+          console.log(this.buildnewDate)
+          console.log(this.addAttinfBuild)
+        
+      }else if(this.data.surveyName=='消防设施'&&this.data.attinf==undefined){
+        let paramsdata:any ={
+          categoryId:this.data.newleftTabledata[this.data.leftclicki].facilityCategoryId
+        }
+        this.http.get("/api/FacilityGroups",{params:paramsdata}).subscribe((data:any)=>{
+          console.log(data)
+          this.addAttinfFile=data
+          this.addAttinfFile.forEach(element => {
+            element.completed=false
+            element.value=''
+          });
+          console.log(this.addAttinfFile)
+        })
+      }else if(this.data.surveyName=='消防设施'&&this.data.attinf!=undefined){
+        this.filenewDate=[]
+        this.addAttinfFile=this.data.attinf
+        this.addAttinfFile=JSON.parse(JSON.stringify(this.addAttinfFile))
+        let paramsdata:any ={
+          categoryId:this.data.newleftTabledata[this.data.leftclicki].facilityCategoryId
+        }
+        let restlt=await new Promise((resolve) => {
+          this.http.get("/api/FacilityGroups",{params:paramsdata}).subscribe((data:any)=>{
+            data.forEach((buildDate,buildi,buildarr) => {
+              this.filenewDate.push(buildDate)
+              resolve(data)
+            });
+            this.filenewDate.forEach(element => {
+              element.completed=false
+              //element.olddata=element.propertyValue
+            });
+          })
+        }) 
+          this.filenewDate=JSON.parse(JSON.stringify(this.filenewDate))
+          let temp=0
+          this.filenewDate.forEach((buildval,buindi,buildarr)=>{
+            temp=0
+            this.addAttinfFile.forEach((addval,addi,addarr)=>{
+              if(buildval.name==addval.name){
+                temp++
+              }
+            })
+            if(temp==0){
+              console.log(buildval)
+              this.addAttinfFile.push(buildval)
+            }
+          })
+          this.addAttinfFile.forEach((addval,addi,addarr)=>{
+            temp=0
+            this.filenewDate.forEach((buildval,buindi,buildarr)=>{
+              if(buildarr[buindi].name==addarr[addi].name){
+                temp++
+              }
+            })
+            if(temp==0){
+              console.log(addarr[addi])
+              this.addAttinfFile.splice(addi,1)
+            }
+          })
+      }
+    
+  }
+  //取消按钮
+close(){
+  this.dialogRef.close(undefined);
+}
+//确定按钮
+defineClick(){
+  this.dialogRef.close(this.data.element.surveyName=='建筑信息'?this.addAttinfBuild:this.data.element.surveyName=='消防设施'?this.addAttinfFile:this.facilityItems)
+}
+}
 

src/app/plan-management/entry-plan-look/AddPlanone.html

@@ -61,7 +61,7 @@
                             <input style="width: 175px;" type="file" name="" id="uploadFile" *ngIf="isup" (change)="filechange($event)">
                             <span *ngIf="uploadover" style="font-size: 13px;">(已上传)</span>
                         </div>
-                        <div *ngIf="inputword&&selectedPLanLevel=='5'">
+                        <div *ngIf="inputword">
                           <mat-radio-button value="2" style="margin-right: 10px;">模板在线编制</mat-radio-button>
                           <!-- <button mat-raised-button *ngIf="isinput" (click)='createWord()'>在线编制预案</button> -->
                         </div>

src/app/plan-management/meet-plan/meet-plan.component.html

@@ -6,7 +6,7 @@
             <div class="queryField">
               <label style="margin-right: 10px;">预案名称:</label>
               <mat-form-field class="example-full-width">
-                <input matInput placeholder="请输入单位名称" name="companyName"  autocomplete="off" [(ngModel)]="unitname">
+                <input matInput placeholder="请输入预案名称" name="companyName"  autocomplete="off" [(ngModel)]="unitname">
               </mat-form-field>
             </div>
             <div class="queryField" >

src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html

@@ -13,7 +13,7 @@
             <div class="queryField">
               <label style="margin-right: 10px;">预案名称:</label>
               <mat-form-field class="example-full-width">
-                <input matInput placeholder="请输入单位名称" name="companyName"  autocomplete="off" [(ngModel)]="unitname">
+                <input matInput placeholder="请输入预案名称" name="companyName"  autocomplete="off" [(ngModel)]="unitname">
               </mat-form-field>
             </div>
             <div class="queryField" >

src/app/plan-management/open-plan/open-plan.component.html

@@ -47,10 +47,22 @@
         </mat-form-field>
       </div>
       <div class="queryField" *ngIf="!padMore">
-        <input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='true' [(ngModel)]="IsNewData">
-        <label style="margin-right: 10px;margin-left: 2px;">新增</label>
-        <input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='false' [(ngModel)]="IsNewData">
-        <label style="margin-right: 10px;margin-left: 2px;">维护更新</label>
+        <label style="margin-right: 10px;">单位状态:</label>
+    <mat-form-field>
+        <mat-select placeholder='请选择单位状态' [(ngModel)]="IsNewCompanyData" name="IsNewCompanyData">
+            <mat-option value='true'>新增</mat-option>
+            <mat-option value="false">维护更新</mat-option>
+        </mat-select>
+    </mat-form-field>
+      </div>
+      <div class="queryField" *ngIf="!padMore">
+        <label style="margin-right: 10px;">预案状态:</label>
+    <mat-form-field>
+        <mat-select placeholder='请选择预案状态' [(ngModel)]="IsNewData" name="IsNewData">
+            <mat-option value='true'>新增</mat-option>
+            <mat-option value="false">维护更新</mat-option>
+        </mat-select>
+    </mat-form-field>
       </div>
       
       <div class="queryField" *ngIf="pcfind" >

src/app/plan-management/open-plan/open-plan.component.ts

@@ -115,6 +115,7 @@ export class OpenPlanComponent implements OnInit {
 
   allPlanInfo: any //存储所有预案信息
   //获得所有预案信息
+  IsNewCompanyData=true
   getAllPlanInfo() {
     let paramsdata: any = {
       CompanyName: this.companyName || '',
@@ -129,6 +130,7 @@ export class OpenPlanComponent implements OnInit {
       PageSize: this.pageSizeOptions[0],
       Sort: '',
       IsNewData:this.IsNewData,
+      IsNewCompanyData:this.IsNewCompanyData
     }
     this.http.get("/api/PublicPlans", { params: paramsdata }).subscribe((data: any) => {
       // console.log(111,data)
@@ -291,6 +293,8 @@ export class OpenPlanComponent implements OnInit {
     this.pageEvent.pageIndex = 0
     this.PageNumber = 1
     this.getAllPlanInfo();
+    this.IsNewCompanyData=true
+    this.IsNewData=true
 
   }
 }

src/app/plan-management/pass-plan/pass-plan.component.html

@@ -110,10 +110,22 @@
           </mat-form-field>
         </div>
         <div class="queryField" *ngIf="!padMore&&!pcMore">
-          <input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='true' [(ngModel)]="IsNewData">
-          <label style="margin-right: 10px;margin-left: 2px;">新增</label>
-          <input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='false' [(ngModel)]="IsNewData">
-          <label style="margin-right: 10px;margin-left: 2px;">维护更新</label>
+          <label style="margin-right: 10px;">单位状态:</label>
+      <mat-form-field>
+          <mat-select placeholder='请选择单位状态' [(ngModel)]="IsNewCompanyData" name="IsNewCompanyData">
+              <mat-option value='true'>新增</mat-option>
+              <mat-option value="false">维护更新</mat-option>
+          </mat-select>
+      </mat-form-field>
+        </div>
+        <div class="queryField" *ngIf="!padMore&&!pcMore">
+          <label style="margin-right: 10px;">预案状态:</label>
+      <mat-form-field>
+          <mat-select placeholder='请选择预案状态' [(ngModel)]="IsNewData" name="IsNewData">
+              <mat-option value='true'>新增</mat-option>
+              <mat-option value="false">维护更新</mat-option>
+          </mat-select>
+      </mat-form-field>
         </div>
   
       </div>

src/app/plan-management/pass-plan/pass-plan.component.ts

@@ -116,6 +116,7 @@ export class PassPlanComponent implements OnInit {
   }
 
   allPlanInfo: any //存储所有预案信息
+  IsNewCompanyData=true //单位是新增还是维护更新
   //获得所有预案信息
   getAllPlanInfo() {
     let reservePlanType
@@ -139,6 +140,7 @@ export class PassPlanComponent implements OnInit {
       Sort: '',
       PlanCategories: this.planCategory,
       IsNewData:this.IsNewData,
+      IsNewCompanyData:this.IsNewCompanyData
     }
     this.http.get("/api/ApprovedPlans", { params: paramsdata }).subscribe((data: any) => {
       this.length = data.totalCount
@@ -451,6 +453,8 @@ export class PassPlanComponent implements OnInit {
   planCategory = []//预案级别
   //重置
   reset() {
+    this.IsNewData=true
+    this.IsNewCompanyData=true
     this.companyName = ''
     this.js = ''
     this.jsId = ''

src/app/plan-management/plan-management.module.ts

@@ -74,12 +74,13 @@ import { newTitle } from './create-plan-online-five/create-plan-online-five.comp
 import { disaster } from './create-plan-online-five/create-plan-online-five.component'
 import { updataHl } from './create-plan-online-five/create-plan-online-five.component'
 import {ChangeUrl} from  './entry-plan-look/entry-plan-look.component'
+import {adddwsurveys} from './create-plan-online-five/create-plan-online-five.component'
 
 @NgModule({
   declarations: [EntryPlanComponent, PassPlanComponent, OpenPlanComponent, EntryPlanLookComponent, AddPlanone, PlanType, AuditSatus, PlanLevel, DownloadFile, AuditResult, ChangeName,
     WebLookComponent, OnetwoEntryPlanComponent, newunitComponent, MeetPlanComponent, newunitMeet, TypePlanComponent, newunitType, PsViewer, onetwoAuditResult, meetAuditResult,
     typeAuditResult, MaintainUpComponent, GkPsViewer, GkhtmlPsViewer, UnitInfo, ReinforcePlanComponent, state, ImgDetails, CreatePlanOnlineFiveComponent, CreatePlanOnlineThreeComponent,
-     OpenPlanToolDialog,yinYong,newTitle,disaster,updataHl,ChangeUrl],
+     OpenPlanToolDialog,yinYong,newTitle,disaster,updataHl,ChangeUrl,adddwsurveys],
   imports: [
     CommonModule,
     PlanManagementRoutingModule,

src/app/plan-management/reinforce-plan/reinforce-plan.component.html

@@ -79,10 +79,22 @@
           </mat-form-field>
         </div>
         <div class="queryField" *ngIf="!padMore">
-          <input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='true' [(ngModel)]="IsNewData">
-          <label style="margin-right: 10px;margin-left: 2px;">新增</label>
-          <input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='false' [(ngModel)]="IsNewData">
-          <label style="margin-right: 10px;margin-left: 2px;">维护更新</label>
+          <label style="margin-right: 10px;">单位状态:</label>
+      <mat-form-field>
+          <mat-select placeholder='请选择单位状态' [(ngModel)]="IsNewCompanyData" name="IsNewCompanyData">
+              <mat-option value='true'>新增</mat-option>
+              <mat-option value="false">维护更新</mat-option>
+          </mat-select>
+      </mat-form-field>
+        </div>
+        <div class="queryField" *ngIf="!padMore">
+          <label style="margin-right: 10px;">预案状态:</label>
+      <mat-form-field>
+          <mat-select placeholder='请选择预案状态' [(ngModel)]="IsNewData" name="IsNewData">
+              <mat-option value='true'>新增</mat-option>
+              <mat-option value="false">维护更新</mat-option>
+          </mat-select>
+      </mat-form-field>
         </div>
         <div class="queryField" style="width: 100%;text-align: center;" *ngIf="pcfind">
           <button mat-raised-button color="primary" type="submit">查询</button>

src/app/plan-management/reinforce-plan/reinforce-plan.component.ts

@@ -114,6 +114,7 @@ export class ReinforcePlanComponent implements OnInit {
 
   allPlanInfo:any //存储所有预案信息
   //获得所有预案信息
+  IsNewCompanyData=true//单位维护更新或者新增
   getAllPlanInfo(){
     let paramsdata:any = {
       CompanyName: this.companyName || '',
@@ -130,6 +131,7 @@ export class ReinforcePlanComponent implements OnInit {
       PageSize:  this.pageSizeOptions[0],
       Sort: '',
       IsNewData:this.IsNewData,
+      IsNewCompanyData:this.IsNewCompanyData
     }
     this.http.get("/api/ApprovedPlans/GetReinforcementPlanComponents",{params:paramsdata}).subscribe((data:any)=>{
       // console.log('增援预案列表',data)
@@ -215,6 +217,8 @@ export class ReinforcePlanComponent implements OnInit {
   plcheck:boolean //编制级别勾选框
   //重置
   reset(){
+    this.IsNewData=true
+    this.IsNewCompanyData=true
     this.companyName = ''
     this.js = ''
     this.jsId = ''

src/app/plan-management/type-plan/type-plan.component.html

@@ -6,7 +6,7 @@
             <div class="queryField">
               <label style="margin-right: 10px;">预案名称:</label>
               <mat-form-field class="example-full-width">
-                <input matInput placeholder="请输入单位名称" name="companyName"  autocomplete="off" [(ngModel)]="unitname">
+                <input matInput placeholder="请输入预案名称" name="companyName"  autocomplete="off" [(ngModel)]="unitname">
               </mat-form-field>
             </div>
             <div class="queryField" >