From a7fdba960ff5e5f0da4aeca1685c150ae66e4b22 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Wed, 19 Jul 2023 09:24:10 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E9=A2=84=E6=A1=88=E6=8E=A8?=
 =?UTF-8?q?=E6=BC=94=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../six-familiarize/six-familiarize.component.scss    |  2 +-
 .../plan-deduction/add-plan/add-plan.component.html   |  6 ++++++
 .../plan-deduction/add-plan/add-plan.component.scss   |  3 ++-
 .../plan-deduction/add-plan/add-plan.component.ts     |  7 ++++++-
 .../plan-deduction/plan-deduction.component.ts        | 11 ++++++-----
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/app/plan-management/entry-plan-look/six-familiarize/six-familiarize.component.scss b/src/app/plan-management/entry-plan-look/six-familiarize/six-familiarize.component.scss
index d3a5447..205493d 100644
--- a/src/app/plan-management/entry-plan-look/six-familiarize/six-familiarize.component.scss
+++ b/src/app/plan-management/entry-plan-look/six-familiarize/six-familiarize.component.scss
@@ -46,7 +46,7 @@
     .textbox {
       height: 32px;
       line-height: 32px;
-      width: 50%;
+      width: 100%;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
diff --git a/src/app/plan-management/plan-deduction/add-plan/add-plan.component.html b/src/app/plan-management/plan-deduction/add-plan/add-plan.component.html
index ab30e99..1e680a1 100644
--- a/src/app/plan-management/plan-deduction/add-plan/add-plan.component.html
+++ b/src/app/plan-management/plan-deduction/add-plan/add-plan.component.html
@@ -17,6 +17,12 @@
                     <nz-spin *ngIf="isLoading"></nz-spin>
                 </ng-template>
             </div>
+            <div>
+                <span class="name">创建机构:</span>
+                <nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" [nzNodes]="nodes" nzShowSearch
+                    nzPlaceHolder="请选择创建人" [(ngModel)]="orid">
+                </nz-tree-select>
+            </div>
         </div>
     </div>
     <!-- <div class="mask" *ngIf="isLoading">
diff --git a/src/app/plan-management/plan-deduction/add-plan/add-plan.component.scss b/src/app/plan-management/plan-deduction/add-plan/add-plan.component.scss
index e4e584f..2e4c7a9 100644
--- a/src/app/plan-management/plan-deduction/add-plan/add-plan.component.scss
+++ b/src/app/plan-management/plan-deduction/add-plan/add-plan.component.scss
@@ -28,7 +28,8 @@
           flex: 1;
         }
 
-        nz-select{
+        nz-select,
+        nz-tree-select {
           width: 72.5%;
         }
       }
diff --git a/src/app/plan-management/plan-deduction/add-plan/add-plan.component.ts b/src/app/plan-management/plan-deduction/add-plan/add-plan.component.ts
index 98bee9d..26bbb0c 100644
--- a/src/app/plan-management/plan-deduction/add-plan/add-plan.component.ts
+++ b/src/app/plan-management/plan-deduction/add-plan/add-plan.component.ts
@@ -21,6 +21,7 @@ export class AddPlanComponent implements OnInit {
 
   ngOnInit(): void {
     console.log("传递的数据", this.data);
+    this.nodes = this.data;
     this.getCompanies();
   }
 
@@ -28,7 +29,7 @@ export class AddPlanComponent implements OnInit {
 
   planname;
   unitid;
-
+  orid;
   optionList: string[] = [];
   PageNumber = 1;
   PageSize = 10;
@@ -67,9 +68,12 @@ export class AddPlanComponent implements OnInit {
     this.getCompanies($event);
   }
 
+  nodes;
+
   save() {
     console.log(1, this.planname);
     console.log(2, this.unitid);
+    console.log(3, this.orid);
     // return;
     if (!this.planname || !this.unitid) {
       this.snackBar.open("请输入完整", "确定", {
@@ -84,6 +88,7 @@ export class AddPlanComponent implements OnInit {
       planCategory: 9, //temp
       planMode: 2,
       planType: 1,
+      exCreatorId: this.orid ? this.orid : "",
     };
     this.http
       .post(`/api/PlanComponents2D?companyId=${this.unitid}`, body)
diff --git a/src/app/plan-management/plan-deduction/plan-deduction.component.ts b/src/app/plan-management/plan-deduction/plan-deduction.component.ts
index 380fbba..f381a9a 100644
--- a/src/app/plan-management/plan-deduction/plan-deduction.component.ts
+++ b/src/app/plan-management/plan-deduction/plan-deduction.component.ts
@@ -85,9 +85,9 @@ export class PlanDeductionComponent implements OnInit {
   PageNumber: any = 1; //第几页
   getTabledataSource() {
     let params: any = {
-      // Name: this.name || "",
-      // CompnayName: this.companyname || "",
-      // CommitterOrganizationId: this.orId || "",
+      Name: this.name || "",
+      CompanyName: this.companyname || "",
+      CommitterOrganizationId: this.orId || "",
       PlanCategory: 9,
       PageNumber: this.PageNumber,
       PageSize: this.pageSize,
@@ -121,14 +121,15 @@ export class PlanDeductionComponent implements OnInit {
   //重置
   reset() {
     this.name = "";
-    this.orId = this.organizationId;
-    this.time = null;
+    this.companyname = "";
+    this.orId = "";
     this.onSubmit();
   }
 
   add() {
     const dialogRef = this.dialog.open(AddPlanComponent, {
       width: "400px",
+      data: this.nodes,
     });
     dialogRef.afterClosed().subscribe((data) => {
       if (data) {