From 317ffeb82143570a13fa60a1fd12c14e900d634f Mon Sep 17 00:00:00 2001
From: chenjingyu <bobsun@hotmail.com>
Date: Tue, 29 Dec 2020 09:34:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=9F=A5=E7=9C=8B=E9=A2=84=E6=A1=88=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=AE=A1=E6=A0=B8=E9=A2=84=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/plan-management/pass-plan/pass-plan.component.html | 2 +-
 src/app/plan-management/pass-plan/pass-plan.component.ts   | 3 +++
 src/app/plan-management/plan-management-routing.module.ts  | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/plan-management/pass-plan/pass-plan.component.html b/src/app/plan-management/pass-plan/pass-plan.component.html
index 296cb52..38ebbd4 100644
--- a/src/app/plan-management/pass-plan/pass-plan.component.html
+++ b/src/app/plan-management/pass-plan/pass-plan.component.html
@@ -122,7 +122,7 @@
           <ng-container matColumnDef="operation">
               <th mat-header-cell *matHeaderCellDef>操作</th>
               <td mat-cell *matCellDef="let element">
-                  <span  (click)="routerTo(element)" style="color: blue;cursor: pointer;">查看预案</span>
+                  <span  (click)="routerTo(element)" style="color: blue;cursor: pointer;">{{url=='1'?'审核预案':'查看预案'}} </span>
               </td>
           </ng-container>
           <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
diff --git a/src/app/plan-management/pass-plan/pass-plan.component.ts b/src/app/plan-management/pass-plan/pass-plan.component.ts
index db73627..45a4ec8 100644
--- a/src/app/plan-management/pass-plan/pass-plan.component.ts
+++ b/src/app/plan-management/pass-plan/pass-plan.component.ts
@@ -46,6 +46,7 @@ export class PassPlanComponent implements OnInit {
   allorganizations:any //所有组织机构
   allunittype:any //所有单位类型
   tabledataSource:any //表格数据
+  url
 
   preparelevels:any
   ngOnInit(): void {
@@ -80,6 +81,8 @@ export class PassPlanComponent implements OnInit {
         {name:"中队",value:"8"}
       ]
     }
+    this.url=window.location.href.substring(window.location.href.length-1,window.location.href.length)
+    //console.log(this.url)
   }
 
   allPlanInfo:any //存储所有预案信息
diff --git a/src/app/plan-management/plan-management-routing.module.ts b/src/app/plan-management/plan-management-routing.module.ts
index 81230d6..1fbaee1 100644
--- a/src/app/plan-management/plan-management-routing.module.ts
+++ b/src/app/plan-management/plan-management-routing.module.ts
@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 10:59:48
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-12-28 09:10:49
+ * @LastEditTime: 2020-12-29 09:29:35
  */
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
@@ -18,6 +18,7 @@ import {OnetwoEntryPlanComponent} from './onetwo-entry-plan/onetwo-entry-plan.co
 const routes: Routes = [
   { path: 'entryPlan', component: EntryPlanComponent},
   { path: 'openPlan', component: OpenPlanComponent},
+  { path: 'passPlan1', component: PassPlanComponent},
   { path: 'passPlan', component: PassPlanComponent},
   { path: 'entryPlandetail', component: EntryPlanLookComponent},
   { path: 'webLook', component: WebLookComponent},

From 4d8abf3b4740b52246edd8cf67051eb3370e3ee9 Mon Sep 17 00:00:00 2001
From: chenjingyu <bobsun@hotmail.com>
Date: Tue, 29 Dec 2020 11:42:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E6=94=B9=E5=90=8D?=
 =?UTF-8?q?=E6=8D=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../key-unit-management.component.ts                 | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.ts b/src/app/key-unit/key-unit-management/key-unit-management.component.ts
index 4d195fc..eb1b536 100644
--- a/src/app/key-unit/key-unit-management/key-unit-management.component.ts
+++ b/src/app/key-unit/key-unit-management/key-unit-management.component.ts
@@ -714,7 +714,7 @@ export class CreateUnit {
 })
 export class upname{
   constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef<upname>,@Inject(MAT_DIALOG_DATA) public data: any) {}
-  unitname//修改后的名称
+  unitname:string//修改后的名称
   oldname=this.data.name//原名
   oldid=this.data.id
 
@@ -736,14 +736,10 @@ export class upname{
     else{
       let paramsdata:any = {
         id:this.oldid,
-        name: this.unitname,
-        buildingTypes:[{
-          id:this.data.buildingTypes[0].id,
-          name:this.data.buildingTypes[0].name
-        }]
+        name: this.unitname
       }
-      
-      this.http.put(`/api/Companies/${this.oldid}`,paramsdata).subscribe((data:any)=>{
+      console.log(paramsdata)
+      this.http.put(`/api/Companies/${this.oldid}/UpdateName`,paramsdata).subscribe((data:any)=>{
         this.snackBar.open("修改名字成功",'确定',config); 
       },err => {
         this.snackBar.open(err,'确定',config);