seimin 6 days ago
parent
commit
c42de0799b

+ 4 - 4
src/app/views/qrcode-configuration/qrcode-configuration.component.html

@@ -8,7 +8,7 @@
8 8
             [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择关联科室"
9 9
             [(ngModel)]="searchDto.deptId">
10 10
             <ng-container *ngFor="let option of deptList">
11
-              <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
11
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.dept + '(' + option.pcode + ')'" [nzValue]="option.id"></nz-option>
12 12
             </ng-container>
13 13
             <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
14 14
               <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -33,7 +33,7 @@
33 33
           <tr class="thead">
34 34
             <th nzWidth="5%">序号</th>
35 35
             <th nzWidth="19%">地点名称</th>
36
-            <th nzWidth="19%">关联科室</th>
36
+            <th nzWidth="19%">关联科室(科室编码)</th>
37 37
             <th nzWidth="19%">地点编码</th>
38 38
             <th nzWidth="19%">地点电话</th>
39 39
             <th nzWidth="19%">操作</th>
@@ -43,7 +43,7 @@
43 43
           <tr *ngFor="let data of listOfData;let index=index;">
44 44
             <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
45 45
             <td>{{ data.name }}</td>
46
-            <td>{{ data.deptDTO?.dept }}</td>
46
+            <td>{{ data.deptDTO?.dept }}<ng-container *ngIf="data.deptDTO?.pcode">({{ data.deptDTO.pcode }})</ng-container></td>
47 47
             <td>{{ data.placeCode}}</td>
48 48
             <td>{{ data.phones}}</td>
49 49
             <td>
@@ -83,7 +83,7 @@
83 83
           <nz-form-control nzErrorTip="请选择关联科室!">
84 84
             <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="deptId" nzShowSearch nzAllowClear nzPlaceHolder="请选择关联科室" nzServerSearch (nzOnSearch)="changeInp($event)" (nzOpenChange)="openOtherTasktype($event)" [nzDisabled]="tabTypeListDisabled">
85 85
               <ng-container *ngFor="let data of deptList">
86
-                <nz-option *ngIf="!isLoading" [nzLabel]="data.dept" [nzValue]="data.id">
86
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.dept + '(' + data.pcode + ')'" [nzValue]="data.id">
87 87
                 </nz-option>
88 88
               </ng-container>
89 89
               <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>

+ 1 - 1
src/app/views/qrcode-configuration/qrcode-configuration.service.ts

@@ -73,7 +73,7 @@ export class QRCodeConfigurationService {
73 73
     };
74 74
     return this.mainService.getFetchDataList("data", "department", postData).pipe(map((v:any) => {
75 75
       if(Array.isArray(v.list)){
76
-        v.list = v.list.map(vv => ({id: vv.id, dept: vv.dept}));
76
+        v.list = v.list.map(vv => ({id: vv.id, dept: vv.dept, pcode: vv.pcode}));
77 77
       }else{
78 78
         v.list = [];
79 79
       }