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

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,
+        name: this.unitname
-        buildingTypes:[{
-          id:this.data.buildingTypes[0].id,
-          name:this.data.buildingTypes[0].name
-        }]
       }
-      
+      console.log(paramsdata)
-      this.http.put(`/api/Companies/${this.oldid}`,paramsdata).subscribe((data:any)=>{
+      this.http.put(`/api/Companies/${this.oldid}/UpdateName`,paramsdata).subscribe((data:any)=>{
         this.snackBar.open("修改名字成功",'确定',config); 
       },err => {
         this.snackBar.open(err,'确定',config);

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>

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 //存储所有预案信息

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},