绩效ID

src/app/views/clinical-users-management/clinical-users-management.component.html

@@ -65,23 +65,25 @@
           <tr class="thead">
             <th nzWidth="5%">序号</th>
             <th nzWidth="10%">姓名</th>
-            <th nzWidth="10%">用户名</th>
+            <th nzWidth="5%">用户名</th>
+            <th nzWidth="10%">绩效ID</th>
             <th nzWidth="5%">性别</th>
             <th nzWidth="10%">手机号码</th>
             <th nzWidth="15%">所属科室</th>
             <th nzWidth="15%">所属组</th>
             <th nzWidth="10%">用户类型</th>
-            <th nzWidth="20%">操作</th>
+            <th nzWidth="15%">操作</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let index=index;">
             <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
-            <td>{{ data.name||'-' }}</td>
-            <td>{{ data.account||'-' }}</td>
-            <td>{{data.gender?data.gender.name:'-'}}</td>
-            <td>{{ data.phone||'-' }}</td>
-            <td>{{ data.dept?data.dept.dept:'-' }}</td>
+            <td>{{ data.name }}</td>
+            <td>{{ data.account }}</td>
+            <td>{{ data.gradeId }}</td>
+            <td>{{data.gender?data.gender.name:''}}</td>
+            <td>{{ data.phone }}</td>
+            <td>{{ data.dept?data.dept.dept:'' }}</td>
             <td>
               <div *ngIf="data.group&&data.group.length">
                 <div *ngFor="let gro of data.group;let i=index;">
@@ -138,6 +140,14 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="gradeId">绩效ID</nz-form-label>
+          <nz-form-control nzErrorTip="请填写绩效ID!">
+            <nz-input-group>
+              <input type="gradeId" nz-input formControlName="gradeId" placeholder="请填写绩效ID" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
           <nz-form-label [nzSm]="6" [nzXs]="24" [nzRequired]="wxRequired" nzFor="weixin">微信</nz-form-label>
           <nz-form-control nzErrorTip="请填写微信!">
             <nz-input-group>

src/app/views/clinical-users-management/clinical-users-management.component.ts

@@ -277,6 +277,7 @@ export class ClinicalUsersManagementComponent implements OnInit {
     this.validateForm = this.fb.group({
       name: [null, [Validators.required]],
       account: [null, [Validators.required]],
+      gradeId: [null],
       usertype: [this.userType + '', [Validators.required]],
       dept: [null, [Validators.required]],
       deptPhone: [null, [Validators.required]],
@@ -327,6 +328,7 @@ export class ClinicalUsersManagementComponent implements OnInit {
       user: {
         name: that.validateForm.value.name,
         account: that.validateForm.value.account,
+        gradeId: that.validateForm.value.gradeId,
         gender: { id: that.validateForm.value.gender, key: "user_gender" },
         usertype: { id: that.validateForm.value.usertype },
         dept: { id: that.validateForm.value.dept },
@@ -418,6 +420,7 @@ export class ClinicalUsersManagementComponent implements OnInit {
             }
             this.validateForm.controls.name.setValue(data.name);
             this.validateForm.controls.account.setValue(data.account);
+            this.validateForm.controls.gradeId.setValue(data.gradeId);
             this.validateForm.controls.usertype.setValue(data.usertype.id + "");
             if (data.dept) {
               this.validateForm.controls.dept.setValue(data.dept.id);

src/app/views/users-management/users-management.component.html

@@ -54,23 +54,25 @@
           <tr class="thead">
             <th nzWidth="5%">序号</th>
             <th nzWidth="10%">姓名</th>
-            <th nzWidth="10%">用户名</th>
+            <th nzWidth="5%">用户名</th>
+            <th nzWidth="10%">绩效ID</th>
             <th nzWidth="5%">性别</th>
             <th nzWidth="10%">手机号码</th>
             <th nzWidth="15%">所属科室</th>
             <th nzWidth="15%">所属组</th>
             <th nzWidth="10%">用户类型</th>
-            <th nzWidth="20%">操作</th>
+            <th nzWidth="15%">操作</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let index=index;">
             <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
-            <td>{{ data.name||'-' }}</td>
-            <td>{{ data.account||'-' }}</td>
-            <td>{{data.gender?data.gender.name:'-'}}</td>
-            <td>{{ data.phone||'-' }}</td>
-            <td>{{ data.dept?data.dept.dept:'-' }}</td>
+            <td>{{ data.name }}</td>
+            <td>{{ data.account }}</td>
+            <td>{{ data.gradeId }}</td>
+            <td>{{data.gender?data.gender.name:''}}</td>
+            <td>{{ data.phone }}</td>
+            <td>{{ data.dept?data.dept.dept:'' }}</td>
             <td>
               <div *ngIf="data.group&&data.group.length">
                 <div *ngFor="let gro of data.group;let i=index;">
@@ -127,6 +129,14 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="gradeId">绩效ID</nz-form-label>
+          <nz-form-control nzErrorTip="请填写绩效ID!">
+            <nz-input-group>
+              <input type="gradeId" nz-input formControlName="gradeId" placeholder="请填写绩效ID" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
           <nz-form-label [nzSm]="6" [nzXs]="24" [nzRequired]="wxRequired" nzFor="weixin">微信</nz-form-label>
           <nz-form-control nzErrorTip="请填写微信!">
             <nz-input-group>

src/app/views/users-management/users-management.component.ts

@@ -352,6 +352,7 @@ export class UsersManagementComponent implements OnInit {
     this.validateForm = this.fb.group({
       name: [null, [Validators.required]],
       account: [null, [Validators.required]],
+      gradeId: [null],
       usertype: [null, [Validators.required]],
       companyId: [null],
       dept: [null, [Validators.required]],
@@ -411,6 +412,7 @@ export class UsersManagementComponent implements OnInit {
       user: {
         name: that.validateForm.value.name,
         account: that.validateForm.value.account,
+        gradeId: that.validateForm.value.gradeId,
         gender: { id: that.validateForm.value.gender, key: "user_gender" },
         usertype: this.userTypes.find(v => v.value == that.validateForm.value.usertype),
         dept: { id: that.validateForm.value.dept },
@@ -534,6 +536,7 @@ export class UsersManagementComponent implements OnInit {
               }
               this.validateForm.controls.name.setValue(data.name);
               this.validateForm.controls.account.setValue(data.account);
+              this.validateForm.controls.gradeId.setValue(data.gradeId);
               this.validateForm.controls.usertype.setValue(data.usertype.value);
               if (data.dept) {
                 this.validateForm.controls.dept.setValue(data.dept.id);