From 2f5380e816106539f0f89bc3ec90fafdd7560833 Mon Sep 17 00:00:00 2001
From: jingbowen <970029315@qq.com>
Date: Tue, 14 Feb 2023 16:27:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/adduser/adduser.component.html                  | 9 ++++++++-
 .../system-management/user/adduser/adduser.component.ts  | 3 ++-
 .../user/edituser/edituser.component.html                | 8 ++++++++
 .../user/edituser/edituser.component.ts                  | 3 ++-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/app/system-management/user/adduser/adduser.component.html b/src/app/system-management/user/adduser/adduser.component.html
index 1b0a396..d050b44 100644
--- a/src/app/system-management/user/adduser/adduser.component.html
+++ b/src/app/system-management/user/adduser/adduser.component.html
@@ -60,6 +60,13 @@
         </nz-input-group>
       </nz-form-control>
     </nz-form-item>
-
+    <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="备注">备注</nz-form-label>
+      <nz-form-control>
+        <nz-input-group>
+          <input nz-input type="text" formControlName="remarks" placeholder="请输入备注" />
+        </nz-input-group>
+      </nz-form-control>
+    </nz-form-item>
   </form>
 </div>
\ No newline at end of file
diff --git a/src/app/system-management/user/adduser/adduser.component.ts b/src/app/system-management/user/adduser/adduser.component.ts
index 82ba289..7c4353c 100644
--- a/src/app/system-management/user/adduser/adduser.component.ts
+++ b/src/app/system-management/user/adduser/adduser.component.ts
@@ -22,7 +22,8 @@ export class AdduserComponent implements OnInit {
       organization: [null, [Validators.required]],
       role: [[], [Validators.required]],
       role2: [[]],
-      phonenum: [null, [Validators.required]]
+      phonenum: [null, [Validators.required]],
+      remarks:[null]
     });
 
     this.getAllRoles()
diff --git a/src/app/system-management/user/edituser/edituser.component.html b/src/app/system-management/user/edituser/edituser.component.html
index 3a5cf28..2abeda5 100644
--- a/src/app/system-management/user/edituser/edituser.component.html
+++ b/src/app/system-management/user/edituser/edituser.component.html
@@ -60,6 +60,14 @@
         </nz-input-group>
       </nz-form-control>
     </nz-form-item>
+    <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="备注">备注</nz-form-label>
+      <nz-form-control>
+        <nz-input-group>
+          <input [(ngModel)]="data.remarks" nz-input type="text" formControlName="remarks" placeholder="请输入备注" />
+        </nz-input-group>
+      </nz-form-control>
+    </nz-form-item>
   </form>
   <div class="btnbox">
     <button [nzLoading]="isLoading" nz-button nzType="default" (click)="cancel()">取消</button>
diff --git a/src/app/system-management/user/edituser/edituser.component.ts b/src/app/system-management/user/edituser/edituser.component.ts
index 951de92..c383fb4 100644
--- a/src/app/system-management/user/edituser/edituser.component.ts
+++ b/src/app/system-management/user/edituser/edituser.component.ts
@@ -37,7 +37,8 @@ export class EdituserComponent implements OnInit {
       organization: [null, [Validators.required]],
       role: [roleData1, [Validators.required]],
       role2: [roleData2],
-      phonenum: [null, [Validators.required]]
+      phonenum: [null, [Validators.required]],
+      remarks: [null]
     });
     if (this.listOfData.length == 0) {
       this.getAllRoles()