From 4948a6bbe1acde67a55949d3d05e4548aefa1e2c Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Thu, 7 Jan 2021 09:16:25 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E9=A2=84=E6=A1=88=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=9F=A5=E8=AF=A2=E6=9B=B4=E6=94=B9=E4=B8=BA=E5=A4=9A?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entry-plan/entry-plan.component.html               | 10 +++++-----
 .../plan-management/entry-plan/entry-plan.component.ts |  8 ++++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/app/plan-management/entry-plan/entry-plan.component.html b/src/app/plan-management/entry-plan/entry-plan.component.html
index f6e2d15..56e7756 100644
--- a/src/app/plan-management/entry-plan/entry-plan.component.html
+++ b/src/app/plan-management/entry-plan/entry-plan.component.html
@@ -52,11 +52,11 @@
             <div class="queryField">
               <label style="margin-right: 10px;">预案类型:</label>
               <mat-form-field>
-                <mat-select name="reservePlanType" [(ngModel)]="reservePlanType" placeholder='请选择预案类型'>
-                  <mat-option value="8">卡片预案</mat-option>
-                  <mat-option value="1">二维预案</mat-option>
-                  <mat-option value="2">三维预案</mat-option>
-                  <mat-option value="4">其他预案</mat-option>
+                <mat-select name="reservePlanType" [(ngModel)]="reservePlanType" placeholder='请选择预案类型' [multiple]="true">
+                  <mat-option value=8>卡片预案</mat-option>
+                  <mat-option value=1>二维预案</mat-option>
+                  <mat-option value=2>三维预案</mat-option>
+                  <mat-option value=4>其他预案</mat-option>
                 </mat-select>
               </mat-form-field>
             </div>
diff --git a/src/app/plan-management/entry-plan/entry-plan.component.ts b/src/app/plan-management/entry-plan/entry-plan.component.ts
index 4bf5c7a..74af56b 100644
--- a/src/app/plan-management/entry-plan/entry-plan.component.ts
+++ b/src/app/plan-management/entry-plan/entry-plan.component.ts
@@ -283,16 +283,20 @@ export class EntryPlanComponent implements OnInit {
   closediv(){
     this.isorganizationbox = false
   }
-
   allPlanInfo:any //存储所有预案信息
   //获得所有预案信息
   getAllPlanInfo(){
+    let reservePlanType
+    this.reservePlanType ? reservePlanType = JSON.parse(JSON.stringify(this.reservePlanType)) : reservePlanType = ''
+    if(this.reservePlanType && this.reservePlanType.length != 0){
+      reservePlanType = eval(this.reservePlanType.join("|"))
+    } 
     let paramsdata:any = {
       CompanyName: this.companyName || '',
       OrganizationId: this.jsId || '',
       HasChildrenOrganization:this.jscheck || '',
       BuildingTypeId:  this.unittype || '',
-      PlanType: this.reservePlanType || '',
+      PlanType: reservePlanType || '',
       AuditStatus: this.toExamine || '',
       PlanLevel:  this.preparelevel || '',
       HasChildrenPlanLevel: this.plcheck || '',