[合并]合并代码

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

@@ -121,17 +121,8 @@
             <div *ngFor="let item of planTemplateData;let key = index">
                 <div *ngIf="selectedItem == item.groupName">
                     <!-- <p>{{item.groupName}}</p> -->
-                    <div class="centerBox" *ngIf="item.groupName!='单位概况'">
+                    <div class="centerBox" *ngIf="item.groupName!='单位概况'&&item.groupName!='交通水源'&&item.groupName!='重点图示'&&item.groupName!='预案附件'">
-                        <mat-accordion multi>
+                        <span>111</span>
-                            <mat-expansion-panel expanded disabled>
-                                <mat-expansion-panel-header collapsedHeight='40px' expandedHeight='40px'
-                                    class="panelhead">
-                                    <mat-panel-title>
-                                        <span>11111</span>
-                                    </mat-panel-title>
-                                </mat-expansion-panel-header>
-                            </mat-expansion-panel>
-                        </mat-accordion>
                     </div>
                 </div>
             </div>

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

@@ -120,6 +120,12 @@
             .centerBox{
                 width: 100%;
                 height: 100%;
+                .paneltitle{
+                    width: 100%;
+                    font-size: 16px;
+                    color: #2196f3;
+                    display: flex;
+                }
             }
         }
     }

src/app/plan-management/entry-plan-look/entry-plan-look.component.ts

@@ -203,7 +203,7 @@ export class EntryPlanLookComponent implements OnInit {
       }
       else if (e.planType == 16) {
         if(e.attachmentUrls==null){
-          window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}`)
+          window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}`)
         }
         else{
           let body = JSON.stringify("");
@@ -910,7 +910,7 @@ export class AddPlanone {
             this.planData=plandata
             this.dialogRef.close(plandata);
             //console.log(plandata)
-            window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.data.companyId}&planName=${this.planData.name}&unitName=${this.data.unitName}`)
+            window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.data.companyId}&planName=${this.planData.name}&unitName=${this.data.unitName}&planCategory=${this.selectedPLanLevel}`)
           })
         }else{
           this.snackBar.open('请先创建模板!','确定',config);