diff --git a/src/app/examiner/examiner-new-one/examiner-new-one.component.html b/src/app/examiner/examiner-new-one/examiner-new-one.component.html
index 75a1628..2b6a73d 100644
--- a/src/app/examiner/examiner-new-one/examiner-new-one.component.html
+++ b/src/app/examiner/examiner-new-one/examiner-new-one.component.html
@@ -4,27 +4,49 @@
  * @Author: sueRimn
  * @Date: 2020-12-11 16:34:26
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-12-11 17:42:09
+ * @LastEditTime: 2020-12-13 09:43:19
 -->
 <div class="content">
     <div class="contentLeft">
         <div class="header">
-            <form #form="ngForm">
+            <form (ngSubmit)="onSubmit(form.value)" #form="ngForm">
                 <div class="queryBox">
                     <div class="queryField">
                         <div><label style="margin-right: 10px;">单位名称:</label></div>
-                        <div><input type="text"  name="identityCard" autocomplete="off" placeholder="请填写"></div>
+                        <div><input type="text"  name="companyName" [(ngModel)]="companyName" autocomplete="off" placeholder="请填写"></div>
                       </div>
                       <div class="queryField">
                         <div><label style="margin-right: 10px;">统一社会信用代码:</label></div>
-                        <div><input type="text"  name="identityCard" autocomplete="off" placeholder="请填写"></div>
+                        <div><input type="text"  name="shehui" [(ngModel)]="shehui" autocomplete="off" placeholder="请填写"></div>
                       </div>
-                      <div class="queryField">
-                        <div><label style="margin-right: 10px;">辖区中队:</label></div>
-                        <div><input type="text"  name="identityCard" autocomplete="off" placeholder="请填写">
-                            <mat-checkbox style="margin-left: 10px;">包含下级</mat-checkbox>
-                            <button mat-raised-button  style="background-color: #07CDCF;margin-left: 90px;">查询</button>
-                            <button mat-raised-button  style=" background-color: #FF8678;margin-left: 10px;">重置</button>
+                      <div class="queryField ordiv">
+                        <div><label style="margin-right: 10px;position: relative;top: 5px;" >辖区中队:</label></div>
+                        <div>
+                            <input (click)="stopclose($event)" readonly   autocomplete="off" [(ngModel)]="js" name="js"  (focus)="openorganizationbox()" placeholder="请填写">
+                            <mat-checkbox style="margin-left: 6px;" [(ngModel)]="jscheck" name="jscheck">包含下级</mat-checkbox>
+                            <div class="organizationbox" *ngIf="isorganizationbox">
+                                <div (click)="closediv()" class="closediv"><mat-icon>clear</mat-icon></div>
+                                <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
+                                    <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding  (click)='add(node)' class="organizationlist">
+                                        <button type="button" mat-icon-button disabled ></button>
+                                        <li>{{node.name}}</li>
+                                    </mat-tree-node>
+                                    <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding  (click)='add(node)'  class="organizationlist">
+                                        <button 
+                                            type="button" 
+                                            mat-icon-button 
+                                            matTreeNodeToggle
+                                            [attr.aria-label]="'toggle ' + node.name">
+                                        <mat-icon class="mat-icon-rtl-mirror">
+                                            {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
+                                        </mat-icon>
+                                        </button>
+                                        <li>{{node.name}}</li>
+                                    </mat-tree-node>
+                                </mat-tree>  
+                            </div>
+                            <button mat-raised-button  style="background-color: #07CDCF;margin-left: 90px;" color="primary">查询</button>
+                            <button mat-raised-button  style=" background-color: #FF8678;margin-left: 10px;" (click)="reset()">重置</button>
                         </div>
                       </div>
                       
@@ -32,8 +54,61 @@
             </form>
         </div>
         <div class="contenttable">
-            <table></table>
+            <table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
+                <ng-container matColumnDef="checked">
+                    <th mat-header-cell *matHeaderCellDef> 
+                    </th>
+                    <td mat-cell *matCellDef="let element">
+                        <mat-checkbox id={{element.id}} (change)="checkChange($event,element)" [(ngModel)]="element.checked"></mat-checkbox>      
+                    </td>
+                </ng-container>
+                <ng-container matColumnDef="unitname">
+                    <th mat-header-cell *matHeaderCellDef>单位名称</th>
+                    <td mat-cell *matCellDef="let element">{{element.name}}</td>
+                </ng-container>
+                <ng-container matColumnDef="jurisdictionsquadron">
+                    <th mat-header-cell *matHeaderCellDef>辖区中队</th>
+                    <td mat-cell *matCellDef="let element">{{element.organizationName}}</td>
+                </ng-container>
+        
+                <ng-container matColumnDef="unittype">
+                    <th mat-header-cell *matHeaderCellDef>单位类型</th>
+                    <td mat-cell *matCellDef="let element">{{element.buildingTypes.length != 0 ? element.buildingTypes[0].name : ''}}</td>
+                </ng-container>
+                <ng-container matColumnDef="scc">
+                    <th mat-header-cell *matHeaderCellDef>统一社会信用代码</th>
+                    <td mat-cell *matCellDef="let element">{{element.usci}}</td>
+                </ng-container>
+                <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+                <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+            </table>
+            <mat-paginator [length]="length"
+                [pageSize]="pageSize"
+                [pageSizeOptions]="pageSizeOptions"
+                (page)="chagePage($event)">
+            </mat-paginator>
+        </div>
+    </div>
+    <div class="contentRight">
+        <div class="rightone">
+            <span>所选单位</span>
+        </div>
+        <div class="righttwo">
+            <table >
+                <thead>
+                    <th style="width: 60%;">单位名称</th>
+                    <th style="width: 40%;">操作</th>
+                </thead>
+                <tbody>
+                    <tr *ngFor="let item of selectedunitArr">
+                        <td>{{item.name}}</td>
+                        <td (click)="deleteWork($event)" id={{item.id}} style="color: #FF8678;cursor:pointer;">删除</td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+        <div class="rightthree">
+            <button mat-raised-button  style="background-color: #07CDCF;margin-left: 100px;width: 120px;" color="primary" (click)="nextClick()">下一步</button>
         </div>
     </div>
-    <div class="contentRight"></div>
 </div>
diff --git a/src/app/examiner/examiner-new-one/examiner-new-one.component.scss b/src/app/examiner/examiner-new-one/examiner-new-one.component.scss
index ac8deaa..b83683c 100644
--- a/src/app/examiner/examiner-new-one/examiner-new-one.component.scss
+++ b/src/app/examiner/examiner-new-one/examiner-new-one.component.scss
@@ -1,3 +1,4 @@
+
 table {
     width: 100%;
     text-align: center;
@@ -18,13 +19,73 @@ table {
       margin: 20px 20px 10px 50px;
       background-color: #FFFFFF;
       border-radius: 16px ;
+      .contenttable{
+        width: 1200px;
+        //margin-right: 40px;
+        margin-left: 30px;
+        //background-color: none;
+        table{
+          width: 100%;
+          margin-top: 15px;
+          background-color:transparent;
+          font-size: 16px;
+          th{
+            background-color: #F5FDFE;
+            color: #000000;
+            font-size: 15px;
+          }
+          td{font-size: 15px;}
+          .mat-table{
+            background-color:transparent;
+          }
+      }
+      mat-paginator{
+          width: 100%;
+          // margin-top: 30px;
+      }
+      }
     }
+    
     .contentRight{
       width: 320px;
       height: 850px;
       margin: 20px 20px 10px 10px;
       background-color: #FFFFFF;
       border-radius: 16px ;
+      display: flex;
+      flex-direction: column;
+      .rightone{
+        width: 100%;
+        margin:30px 20px;
+        span{
+          font-size: 20px;
+        }
+      }
+      .righttwo{
+        height: 670px;
+        width:280px;
+        margin-left: 20px;
+        overflow-y: auto;
+        table{
+          th,td{
+            height: 48px;
+            font-size: 15px;
+          }
+          thead{
+            background-color: #F5FDFE;
+          }
+          table tbody{
+            height: 570px;
+            overflow-y:scroll;
+            tr{
+              table-layout:fixed
+            }
+          }
+        }
+      }
+      ::-webkit-scrollbar {
+        width:2px;
+        }
     }
   }
   .header {
@@ -67,36 +128,60 @@ table {
           border-radius: 8px;
           outline:0 none !important;
          }
+         
       }
+      .ordiv{
+        position: relative;
+        .organizationbox{
+          button{
+            color: #000000;
+            position: relative;
+            bottom: 5px;
+          }
+            width:450px;
+            height: 200px;
+            background: white;
+            position: absolute;
+            top: 48px;
+            left: 27px;
+            z-index: 999;
+            border: 1px solid grey;
+            overflow-y: auto;
+            li{
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+            }
+            mat-tree-node{
+                cursor: pointer;
+                white-space:pre;
+            }
+            mat-tree-node:hover{
+                background:  rgba(225, 225, 225, 0.8);
+            }
+            .closediv{
+                z-index: 100;
+                position: absolute;
+                right: 0;
+                top: 0;
+                width: 30px;
+                height: 30px;
+                cursor: pointer;
+                line-height: 30px;
+                text-align: center;
+            }
+            .closediv:hover{
+                background:rgba(225, 225, 225, 0.8);
+            }
+        }
+
+    }
       .headerright{
         float: right;
       }
     } //queryBox
   }
-  .centertable{
-    width: 1632px;
-    margin-right: 40px;
-    margin-left: 40px;
-    background-color: #FFFFFF;
-    table{
-      td,th{
-        height: 48px;
-        font-size: 18px;
-      }
-      td{
-        border-bottom: 1px solid #F2F5F6;
-      }
-      thead{
-        background-color:#F5FDFE;
-      }
-      .green{
-        color: #07CDCF;
-    }
-    .red{
-        color: #FF8678;
-    }
-    }
-  }
+
   
   .operationSpan{
     margin: 0 10px;
diff --git a/src/app/examiner/examiner-new-one/examiner-new-one.component.ts b/src/app/examiner/examiner-new-one/examiner-new-one.component.ts
index 6940fe3..665ceb5 100644
--- a/src/app/examiner/examiner-new-one/examiner-new-one.component.ts
+++ b/src/app/examiner/examiner-new-one/examiner-new-one.component.ts
@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-11 16:34:26
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-12-12 09:13:04
+ * @LastEditTime: 2020-12-13 10:13:54
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -30,9 +30,13 @@ export class ExaminerNewOneComponent implements OnInit {
   constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,private tree: TreeService,public dialog: MatDialog,public snackBar: MatSnackBar) { }
 
   ngOnInit(): void {
-    //this.getAllKeyUnit();
+    this.getunitdata();
+    this.getOrganizations();
+    this.getUnittype();
+    this.getAllKeyUnit();
   }
 
+  removeClass=document.getElementsByClassName("mat-form-field-underline")
   private _transformer = (node, level: number) => {   //初始化tree
     return {
       expandable: !!node.children && node.children.length > 0,
@@ -62,7 +66,7 @@ export class ExaminerNewOneComponent implements OnInit {
   pageSizeOptions: number[] = [10] //设置每页条数
   PageNumber:any //第几页
   
-  displayedColumns: string[] = ['checked','Follow','unitname','integrity','jurisdictionsquadron', 'unittype','scc', 'time','operation'];
+  displayedColumns: string[] = ['checked','unitname','jurisdictionsquadron', 'unittype','scc'];
   tabledataSource:any
   allorganizations:any
   oldDataSource:any; //原始表格数据
@@ -213,9 +217,9 @@ export class ExaminerNewOneComponent implements OnInit {
       Sort: this.integritySort ? 'integrityscore' : '',
       SortType: this.integritySort || '',
     }
-    console.log(paramsdata)
+    //console.log(paramsdata)
     this.http.get("/api/Companies",{params:paramsdata}).subscribe((data:any)=>{
-      console.log(data)
+      //console.log(data)
       this.length = data.totalCount
       this.allKeyUnitInfo = data
       // data.items.sort( (a,b) => {
@@ -224,9 +228,21 @@ export class ExaminerNewOneComponent implements OnInit {
       data.items.forEach( (item,index) => {
         item.integrity = this.wanzhengduArr[index]
       })
-      console.log(789,data.items)
+      //console.log(789,data.items)
       this.tabledataSource = new MatTableDataSource(data.items);
+      //console.log(this.tabledataSource)
+      if(this.selectedunitArr.length!=0){
+        for(var i=0;i<this.tabledataSource.filteredData.length;i++){
+          for(var j=0;j<this.selectedunitArr.length;j++){
+            if(this.tabledataSource.filteredData[i].id==this.selectedunitArr[j].id){
+              this.tabledataSource.filteredData[i].checked=this.selectedunitArr[j].checked
+            }
+          }
+        }
+      }
     })
+    //console.log(this.tabledataSource)
+    
   }
   //得到当前单位信息
   getunitdata(){
@@ -289,10 +305,45 @@ export class ExaminerNewOneComponent implements OnInit {
       }
     )
   }
-  selectedunitArr:any =[] //选中单位的数组
+  selectedunitArr:any =JSON.parse(localStorage.getItem("checkedWork"))||[] //选中单位的数组
+  deleteByid=""//根据id取消选中
   //勾选框事件
   checkChange(e,element){
+    console.log(e,element)
     element.checked = e.checked
+    if(element.checked){
+      this.selectedunitArr.push(element)
+    }
+    else{
+      for(var i=0;i<this.selectedunitArr.length;i++){
+        if(this.selectedunitArr[i].id==element.companyIntegrityScore.companyId){
+          this.selectedunitArr.splice(i,1)
+        }
+      }
+    }
+    console.log(this.selectedunitArr)
+    
+  }
+  //删除某一个单位信息
+  deleteWork(e){
+    console.log(e.target.id)
+    console.log(this.tabledataSource.data)
+    for(var i=0;i<this.selectedunitArr.length;i++){
+      if(this.selectedunitArr[i].id==e.target.id){
+        this.selectedunitArr.splice(i,1)
+      }
+    }
+    for(var i=0;i<this.tabledataSource.data.length;i++){
+      if(this.tabledataSource.data[i].id==e.target.id){
+        this.tabledataSource.data[i].checked=false
+      }
+    }
+  }
+  //下一步事件
+  nextClick(){
+    //console.log(this.selectedunitArr)
+    localStorage.setItem("checkedWork",JSON.stringify(this.selectedunitArr) )
+    this.router.navigateByUrl("/examiner/create-test-score")
   }
   //编辑单位信息
   editunit(){
@@ -391,5 +442,7 @@ export class ExaminerNewOneComponent implements OnInit {
   closediv(){
     this.isorganizationbox = false
   }
+  
+
 
 }