From 68ceccd606172ce59f87b27a9e12712f6ead7ebb Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Tue, 18 Oct 2022 11:27:24 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E7=BB=84=E7=BB=87=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84=E5=A2=9E=E5=8A=A0level=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/addor/addor.component.html          | 12 +++++++-----
 .../organization/addor/addor.component.ts            |  5 ++++-
 .../organization/editor/editor.component.html        | 12 +++++++-----
 .../organization/editor/editor.component.ts          |  4 ++++
 .../organization/organization.component.ts           |  6 ++++--
 5 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/app/system-management/organization/addor/addor.component.html b/src/app/system-management/organization/addor/addor.component.html
index a1b3557..b533483 100644
--- a/src/app/system-management/organization/addor/addor.component.html
+++ b/src/app/system-management/organization/addor/addor.component.html
@@ -8,13 +8,15 @@
         </nz-input-group>
       </nz-form-control>
     </nz-form-item>
-    <!-- <nz-form-item>
+    <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="级别">级别</nz-form-label>
       <nz-form-control>
-        <nz-input-group>
-          <input nz-input type="text" formControlName="code" placeholder="请输入编码" />
-        </nz-input-group>
+        <nz-select formControlName="OrgnizationLevel" nzPlaceHolder="请选择级别">
+          <nz-option *ngFor="let item of OrgnizationLevel;let key = index" [nzValue]="key" [nzLabel]="item">
+          </nz-option>
+        </nz-select>
       </nz-form-control>
-    </nz-form-item> -->
+    </nz-form-item>
     <nz-form-item>
       <nz-form-control>
         <label nz-checkbox formControlName="isGasStation">是否为加油站</label>
diff --git a/src/app/system-management/organization/addor/addor.component.ts b/src/app/system-management/organization/addor/addor.component.ts
index 7ac58b8..9ba7d78 100644
--- a/src/app/system-management/organization/addor/addor.component.ts
+++ b/src/app/system-management/organization/addor/addor.component.ts
@@ -15,11 +15,14 @@ export class AddorComponent implements OnInit {
   ngOnInit(): void {
     this.validateForm = this.fb.group({
       name: [null, [Validators.required]],
-      // code: [null, [Validators.required]],
+      OrgnizationLevel: [null, [Validators.required]],
       isGasStation: [false],
       isParticipationAudit: [true]
     });
   }
+
+  OrgnizationLevel = ['无', '总公司', '省公司', '区域', '油站']
+
   destroyModal(): void {
     this.modal.destroy({ data: 'this the result data' });
   }
diff --git a/src/app/system-management/organization/editor/editor.component.html b/src/app/system-management/organization/editor/editor.component.html
index b930f1b..d7e9e42 100644
--- a/src/app/system-management/organization/editor/editor.component.html
+++ b/src/app/system-management/organization/editor/editor.component.html
@@ -8,13 +8,15 @@
         </nz-input-group>
       </nz-form-control>
     </nz-form-item>
-    <!-- <nz-form-item>
+    <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="级别">级别</nz-form-label>
       <nz-form-control>
-        <nz-input-group>
-          <input [(ngModel)]="datacopy.code" nz-input type="text" formControlName="code" placeholder="请输入编码" />
-        </nz-input-group>
+        <nz-select [(ngModel)]="datacopy.level" formControlName="OrgnizationLevel" nzPlaceHolder="请选择级别">
+          <nz-option *ngFor="let item of OrgnizationLevel;let key = index" [nzValue]="key" [nzLabel]="item">
+          </nz-option>
+        </nz-select>
       </nz-form-control>
-    </nz-form-item> -->
+    </nz-form-item>
     <nz-form-item>
       <nz-form-control>
         <label [(ngModel)]="datacopy.isGasStation" nz-checkbox formControlName="isGasStation">是否为加油站</label>
diff --git a/src/app/system-management/organization/editor/editor.component.ts b/src/app/system-management/organization/editor/editor.component.ts
index f464a95..6eae504 100644
--- a/src/app/system-management/organization/editor/editor.component.ts
+++ b/src/app/system-management/organization/editor/editor.component.ts
@@ -15,13 +15,17 @@ export class EditorComponent implements OnInit {
 
   datacopy: any
   isParticipationAudit
+
+  OrgnizationLevel = ['无', '总公司', '省公司', '区域', '油站']
   ngOnInit(): void {
     this.validateForm = this.fb.group({
       name: [null, [Validators.required]],
+      OrgnizationLevel: [null, [Validators.required]],
       isGasStation: [],
       isParticipationAudit: []
     });
     this.datacopy = JSON.parse(JSON.stringify(this.data))
+    // console.log(this.datacopy)
     this.isParticipationAudit = !this.datacopy.isSkipAudit
   }
   destroyModal(): void {
diff --git a/src/app/system-management/organization/organization.component.ts b/src/app/system-management/organization/organization.component.ts
index d8cbb27..19ddfa0 100644
--- a/src/app/system-management/organization/organization.component.ts
+++ b/src/app/system-management/organization/organization.component.ts
@@ -111,7 +111,8 @@ export class OrganizationComponent implements OnInit {
               parentId: node ? Number(node.key) : null,
               displayName: instance.validateForm.value.name,
               isGasStation: instance.validateForm.value.isGasStation,
-              isSkipAudit: !instance.validateForm.value.isParticipationAudit
+              isSkipAudit: !instance.validateForm.value.isParticipationAudit,
+              level: instance.validateForm.value.OrgnizationLevel,
             }
             this.http.post('/api/services/app/Organization/Create', body).subscribe(data => {
               resolve(data)
@@ -154,7 +155,8 @@ export class OrganizationComponent implements OnInit {
               parentId: node.origin.parentId,
               displayName: instance.validateForm.value.name,
               isGasStation: instance.validateForm.value.isGasStation,
-              isSkipAudit: !instance.validateForm.value.isParticipationAudit
+              isSkipAudit: !instance.validateForm.value.isParticipationAudit,
+              level: instance.validateForm.value.OrgnizationLevel
             }
             this.http.put('/api/services/app/Organization/Update', body).subscribe(data => {
               resolve(data)