科室增加交接类型

src/app/views/office-detail/office-detail.component.html

@@ -11,22 +11,29 @@
         <div class="left" nz-col nzSpan="12">
           <div class="item display_flex  justify-content_space-between align-items_flex-start">
             <span>科室类型</span>
-            <span>{{officeInfo.type?officeInfo.type.name:'无'}}</span>
+            <span>{{officeInfo.type?.name}}</span>
+          </div>
+          <div class="item display_flex  justify-content_space-between align-items_flex-start">
+            <span>交接类型</span>
+            <span>{{officeInfo.deptHandoverType?.name}}</span>
           </div>
           <div class="item display_flex  justify-content_space-between align-items_flex-start">
             <span>科室位置</span>
-            <span>{{
-              officeInfo.building?officeInfo.building.buildingName:'-'}}栋{{officeInfo.floor?officeInfo.floor.floorName:'-'}}层{{officeInfo.address}}</span>
+            <span>
+              {{ officeInfo.building?.buildingName }}
+              <ng-container *ngIf="officeInfo.building?.buildingName">{{ officeInfo.floor?.floorName }}层</ng-container>
+              {{ officeInfo.address }}
+            </span>
           </div>
         </div>
         <div class="right" nz-col nzSpan="12">
           <div class="item display_flex  justify-content_space-between align-items_flex-start">
             <span>科室电话</span>
-            <span>{{officeInfo.manyPhone?officeInfo.manyPhone:'无'}}</span>
+            <span>{{officeInfo.manyPhone || ''}}</span>
           </div>
           <div class="item display_flex  justify-content_space-between align-items_flex-start">
             <span>父级科室</span>
-            <span>{{officeInfo.parent?officeInfo.parent.dept:'无'}}</span>
+            <span>{{officeInfo.parent?.dept}}</span>
           </div>
         </div>
       </div>

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

@@ -3,7 +3,7 @@
     <div class="list-template__top" nz-row>
       <div nz-col nzLg='14' class="list-template__searchBox">
         <div class="list-template__searchItem">
-          <span class="label">院区</span>：
+          <span class="label">院区：</span>
           <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择院区" [(ngModel)]="hospital">
             <ng-container *ngFor="let option of hospitals1">
               <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
@@ -32,6 +32,13 @@
             <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of types"></nz-option>
           </nz-select>
         </div>
+        <div class="list-template__searchItem">
+          <span class="label">交接类型：</span>
+          <nz-select [nzDropdownMatchSelectWidth]="false" style="width: 135px;" nzShowSearch nzAllowClear
+            nzPlaceHolder="请选择交接类型" [(ngModel)]="deptHandoverType">
+            <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of deptHandoverTypes"></nz-option>
+          </nz-select>
+        </div>
       </div>
       <div nz-col nzLg="10" class="list-template__btns">
         <button class="btn default" (click)='search()'>搜索</button>
@@ -56,8 +63,9 @@
             <th nzWidth="10%">科室编码</th>
             <th nzWidth="10%">科室电话</th>
             <th nzWidth="10%">科室类型</th>
-            <th nzWidth="15%">科室位置</th>
-            <th nzWidth="20%">操作</th>
+            <th nzWidth="10%">交接类型</th>
+            <th nzWidth="10%">科室位置</th>
+            <th nzWidth="15%">操作</th>
           </tr>
         </thead>
         <tbody>
@@ -72,6 +80,7 @@
               </div>
             </td>
             <td>{{ data.type?data.type.name:'无' }}</td>
+            <td>{{ data.deptHandoverType?data.deptHandoverType.name:'无' }}</td>
             <td>{{ data.building?data.building.buildingName:'-'
               }}栋{{data.floor?data.floor.floorName:'-'}}层{{data.address}}</td>
             <td>
@@ -195,6 +204,15 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="deptHandoverType">交接类型</nz-form-label>
+            <nz-form-control nzErrorTip="请选择交接类型!">
+              <nz-select [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear
+                formControlName="deptHandoverType" nzPlaceHolder="请选择交接类型">
+                <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of deptHandoverTypes"></nz-option>
+              </nz-select>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
             <nz-form-label [nzSm]="24" [nzXs]="24">服务时间</nz-form-label>
             <nz-form-control nzErrorTip="不能为空!">
               <nz-time-picker nzFormat="HH:mm" formControlName="startTime1" [nzDisabledHours]="startTime1Hourdis"

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

@@ -48,6 +48,7 @@ export class OfficeManagementComponent implements OnInit {
     this.initForm();
     this.getAllHospital();
     this.getType();
+    this.getDeptHandoverType();
   }
   listOfData: any[] = []; //表格数据
   promptContent: string; //操作提示框提示信息
@@ -63,6 +64,7 @@ export class OfficeManagementComponent implements OnInit {
   num; //编码
   deptalias; //别名
   type; //类型
+  deptHandoverType; //类型
   pageIndex: number = 1; //页码
   listLength: number = 10; //总条数
   pageSize: number = 10; //每页条数
@@ -147,6 +149,7 @@ export class OfficeManagementComponent implements OnInit {
     this.pageIndex = 1;
     this.hospital = this.tool.getCurrentHospital().id;
     this.type = null;
+    this.deptHandoverType = null;
     this.name = "";
     this.num = "";
     this.deptalias = "";
@@ -164,6 +167,7 @@ export class OfficeManagementComponent implements OnInit {
         dept: that.name || "",
         pcode: that.num || "",
         type: { id: that.type || "" },
+        deptHandoverType: { id: that.deptHandoverType || "" },
         deptalias: that.deptalias || "",
       },
     };
@@ -289,6 +293,16 @@ export class OfficeManagementComponent implements OnInit {
     });
   }
 
+  // 获取科室汇总交接类型
+  deptHandoverTypes: Array<any> = [];
+  getDeptHandoverType() {
+    var that = this;
+    that.mainService.getDictionary("list", "dept_handover_type").subscribe((data) => {
+      console.log(data);
+      that.deptHandoverTypes = data;
+    });
+  }
+
   // 新增弹框
   showModal() {
     this.initForm();
@@ -322,6 +336,7 @@ export class OfficeManagementComponent implements OnInit {
       floor: [null, [Validators.required]],
       officeAddress: [null, [Validators.required]],
       officeType: [null, [Validators.required]],
+      deptHandoverType: [null],
       startTime1: [null],
       endTime1: [null],
       dynamicCode1: [null],
@@ -420,6 +435,7 @@ export class OfficeManagementComponent implements OnInit {
         floor: { id: that.validateForm.value.floor - 0 },
         address: that.validateForm.value.officeAddress,
         type: { id: that.validateForm.value.officeType },
+        deptHandoverType: { id: that.validateForm.value.deptHandoverType },
       },
     };
     if (this.validateForm.value.parentOfficeName) {
@@ -533,6 +549,7 @@ export class OfficeManagementComponent implements OnInit {
     this.validateForm.controls.deptalias.setValue(data.deptalias);
     this.validateForm.controls.officeNo.setValue(data.pcode);
     this.validateForm.controls.officeType.setValue(data.type.id + "");
+    this.validateForm.controls.deptHandoverType.setValue(data.deptHandoverType.id + "");
     this.changeHosp(data);
     this.validateForm.controls.officeAddress.setValue(data.address);
   }