科室排序

src/app/views/new-statistics/distribution-inspection-statistics/department-business-statistics/department-business-statistics.component.html

@@ -5,7 +5,7 @@
       <nz-range-picker [(ngModel)]="dateRange" [nzAllowClear]="false" (ngModelChange)="changeDate($event)" (nzOnCalendarChange)="onCalendarChangeDate($event)">
       </nz-range-picker>
     </div>
-		
+
 		<div class="searchDataItem">
 		  <span class="label">科室</span>：
 		  <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
@@ -34,8 +34,8 @@
   <nz-table class="table" [ngStyle]="{ width: widthValue + 'px' }" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl" [nzWidthConfig]="widthConfig" nzBordered>
     <thead (nzSortChange)="sort($event)" nzSingleSort>
       <tr>
-				<th rowspan="2" *ngIf="parent==1">父级科室(编码)</th>
-        <th rowspan="2">科室(编码)</th>
+				<th rowspan="2" *ngIf="parent==1" nzShowSort nzSortKey="parentOrders" [(nzSort)]="sortCurrent.parentOrders">父级科室(编码)</th>
+        <th rowspan="2" nzShowSort nzSortKey="orders" [(nzSort)]="sortCurrent.orders">科室(编码)</th>
         <th rowspan="2" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
         <th rowspan="2" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">积分总和</th>
         <th rowspan="2" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>

src/app/views/new-statistics/distribution-inspection-statistics/department-quality-control-statistics/department-quality-control-statistics.component.html

@@ -34,8 +34,8 @@
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-			<th nzWidth="9%" *ngIf="parent==1">父级科室(编码)</th>
-      <th nzWidth="9%">科室(编码)</th>
+			<th nzWidth="9%" *ngIf="parent==1" nzShowSort nzSortKey="parentOrders" [(nzSort)]="sortCurrent.parentOrders">父级科室(编码)</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="orders" [(nzSort)]="sortCurrent.orders">科室(编码)</th>
       <th nzWidth="9%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
       <th nzWidth="9%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
       <th nzWidth="9%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.html

@@ -33,7 +33,7 @@
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="12%">科室(编码)</th>
+      <th nzWidth="12%" nzShowSort nzSortKey="orders" [(nzSort)]="sortCurrent.orders">科室(编码)</th>
       <th nzWidth="11%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
       <th nzWidth="11%" nzShowSort nzSortKey="evaCount" [(nzSort)]="sortCurrent.evaCount">评价总工单数</th>
       <th nzWidth="11%" nzShowSort nzSortKey="eva1" [(nzSort)]="sortCurrent.eva1">一星评价数</th>

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-source-statistics/distribution-department-source-statistics.component.html

@@ -34,8 +34,8 @@
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-			<th nzWidth="20%" *ngIf="parent==1">父级科室(编码)</th>
-      <th nzWidth="20%">科室(编码)</th>
+			<th nzWidth="20%" *ngIf="parent==1" nzShowSort nzSortKey="parentOrders" [(nzSort)]="sortCurrent.parentOrders">父级科室(编码)</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="orders" [(nzSort)]="sortCurrent.orders">科室(编码)</th>
       <th nzWidth="15%" nzShowSort nzSortKey="service" [(nzSort)]="sortCurrent.service">服务台建单数</th>
       <th nzWidth="15%" nzShowSort nzSortKey="nurse" [(nzSort)]="sortCurrent.nurse">护士端建单数</th>
       <th nzWidth="15%" nzShowSort nzSortKey="system" [(nzSort)]="sortCurrent.system">系统自动建单数</th>

src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.html

@@ -37,8 +37,8 @@
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-			<th nzWidth="9%" *ngIf="parent==1">父级科室(编码)</th>
-      <th nzWidth="10%">科室名称(编码)</th>
+			<th nzWidth="9%" *ngIf="parent==1" nzShowSort nzSortKey="parentOrders" [(nzSort)]="sortCurrent.parentOrders">父级科室(编码)</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="orders" [(nzSort)]="sortCurrent.orders">科室名称(编码)</th>
       <th nzWidth="10%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
       <th nzWidth="10%" nzShowSort nzSortKey="degreeCount" [(nzSort)]="sortCurrent.degreeCount">评价工单数</th>
       <th nzWidth="10%" nzShowSort nzSortKey="oneStar" [(nzSort)]="sortCurrent.oneStar">一星</th>

src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.html

@@ -37,8 +37,8 @@
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-			<th nzWidth="9%" *ngIf="parent==1">父级科室(编码)</th>
-      <th nzWidth="10%">科室名称(编码)</th>
+			<th nzWidth="9%" *ngIf="parent==1" nzShowSort nzSortKey="parentOrders" [(nzSort)]="sortCurrent.parentOrders">父级科室(编码)</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="orders" [(nzSort)]="sortCurrent.orders">科室名称(编码)</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
       <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>

src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-statistics.component.html

@@ -37,8 +37,8 @@
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-			<th nzWidth="10%" *ngIf="parent==1">父级科室(编码)</th>
-      <th nzWidth="20%">科室名称(编码)</th>
+			<th nzWidth="10%" *ngIf="parent==1" nzShowSort nzSortKey="parentOrders" [(nzSort)]="sortCurrent.parentOrders">父级科室(编码)</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="orders" [(nzSort)]="sortCurrent.orders">科室名称(编码)</th>
       <th nzWidth="16%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
       <th nzWidth="16%" nzShowSort nzSortKey="phoneCount" [(nzSort)]="sortCurrent.phoneCount">电话报修数</th>
       <th nzWidth="16%" nzShowSort nzSortKey="wechatCount" [(nzSort)]="sortCurrent.wechatCount">微信报修数</th>

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

@@ -59,6 +59,7 @@
           <tr class="thead">
             <th nzWidth="5%" nzShowCheckbox [(nzChecked)]="isAllDisplayDataChecked"
               (nzCheckedChange)="checkAll($event)"></th>
+            <th nzWidth="5%">排序号</th>
             <th nzWidth="10%">科室名称</th>
             <th nzWidth="10%">父级科室名称</th>
             <th nzWidth="10%">别名</th>
@@ -67,12 +68,13 @@
             <th nzWidth="10%">科室类型</th>
             <th nzWidth="10%">交接类型</th>
             <th nzWidth="10%">科室位置</th>
-            <th nzWidth="15%">操作</th>
+            <th nzWidth="10%">操作</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData" (click)="selectedListData(data.id)">
             <td nzShowCheckbox [(nzChecked)]="mapOfCheckedId[data.id]" (nzCheckedChange)="refreshStatus()"></td>
+            <td>{{ data.orders }}</td>
             <td>{{ data.dept||'无' }}</td>
             <td>{{ data.parent?data.parent.dept:'无' }}</td>
             <td>{{ data.deptalias||'无' }}</td>
@@ -113,6 +115,14 @@
       <overlay-scrollbars #osComponentRef1 class="content">
         <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
           <nz-form-item>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="orders">排序号</nz-form-label>
+            <nz-form-control nzErrorTip="请填写排序号!">
+              <nz-input-group>
+                <nz-input-number class="w100" formControlName="orders" nzPlaceHolder="请输入排序号" [nzMin]="0" [nzStep]="1" [nzPrecision]="0"></nz-input-number>
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
             <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="parentOfficeName">父级科室</nz-form-label>
             <nz-form-control nzErrorTip="请填写父级科室!">
               <nz-select nzAllowClear [nzDropdownMatchSelectWidth]="false" formControlName="parentOfficeName" nzShowSearch

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

@@ -435,6 +435,7 @@ export class OfficeManagementComponent implements OnInit {
     this.startTime2Hourdis = () => [];
     this.startTime2Mindis = () => [];
     this.validateForm = this.fb.group({
+      orders: [null],
       parentOfficeName: [null],
       officeName: [null, [Validators.required]],
       deptalias: [null],
@@ -532,6 +533,7 @@ export class OfficeManagementComponent implements OnInit {
     let deptsPhone = this.deptPhones.map((item) => item.phone).join();
     let data: any = {
       department: {
+        orders: that.validateForm.value.orders || undefined,
         dept: that.validateForm.value.officeName,
         deptalias: that.validateForm.value.deptalias,
         hospital: { id: that.add ? that.tool.getCurrentHospital().id : that.hospital },
@@ -653,6 +655,7 @@ export class OfficeManagementComponent implements OnInit {
         }
       });
     }
+    this.validateForm.controls.orders.setValue(data.orders);
     this.validateForm.controls.officeName.setValue(data.dept);
     this.validateForm.controls.deptalias.setValue(data.deptalias);
     this.validateForm.controls.officeNo.setValue(data.pcode);