优化

src/app/views/blood-search/blood-search.component.html

@@ -10,6 +10,30 @@
           <span class="label">发血时间：</span>
           <nz-range-picker [(ngModel)]="searchCriteria.dateRange"></nz-range-picker>
         </div>
+        <div class="list-template__searchItem">
+          <span class="label">状态：</span>
+          <nz-select
+            [nzDropdownMatchSelectWidth]="false"
+            class="formItem"
+            nzServerSearch
+            nzShowSearch
+            nzAllowClear
+            nzPlaceHolder="请选择状态"
+            [(ngModel)]="searchCriteria.state"
+            (nzOpenChange)="changeSearch1($event)"
+          >
+            <ng-container *ngFor="let data of types">
+              <nz-option
+                *ngIf="!isLoading1"
+                nzLabel="{{ data.name }}"
+                nzValue="{{ data.id }}"
+              ></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading1" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
       </div>
       <div nz-col nzXl="8" class="list-template__btns">
         <button nz-button class="btn default" (click)='reset()'>重置</button>
@@ -24,10 +48,11 @@
             <th nzWidth="2%">#</th>
             <th nzWidth="7%">医嘱号</th>
             <th nzWidth="7%">血袋号</th>
+            <th nzWidth="6%">状态</th>
             <th nzWidth="7%">申请科室</th>
             <th nzWidth="7%">血液类型</th>
-            <th nzWidth="7%">ABO血型</th>
-            <th nzWidth="7%">RH(血型)</th>
+            <th nzWidth="4%">ABO血型</th>
+            <th nzWidth="4%">RH(血型)</th>
             <th nzWidth="7%">血量(单位)</th>
             <th nzWidth="7%">患者姓名（住院号）</th>
             <th nzWidth="7%">发血时间</th>
@@ -43,6 +68,7 @@
             <td>{{i+1}}</td>
             <td>{{ data.applyCode || '无'}}</td>
             <td>{{ data.bloodCode || '无'}}</td>
+            <td>{{ data.state?.name }}</td>
             <td>{{ data.applyDeptDTO ? data.applyDeptDTO.dept :'无' }}</td>
             <td>{{ data.type ? data.type.name : "无" }}</td>
             <td>{{ data.aboType || '无' }}</td>

src/app/views/blood-search/blood-search.component.ts

@@ -17,6 +17,7 @@ export class BloodSearchComponent implements OnInit {
     //搜索条件
     bloodCode: "", //血袋号
     dateRange: [],
+    state: null,
   };
   deptList = []; // 院区下的配送人员列表(搜索框)
   hosId;
@@ -31,12 +32,29 @@ export class BloodSearchComponent implements OnInit {
     });
     this.getHospital();
   }
+  // 搜索类型
+  isLoading1 = false;
+  types = []; // 类型列表(搜索框)
+  searchTypes() {
+    this.isLoading1 = true;
+    this.mainService.getDictionary("list", "blood_trans_state").subscribe((res) => {
+      this.isLoading1 = false;
+      this.types = res;
+    });
+  }
+  // 打开搜索框
+  changeSearch1(flag) {
+    if (flag) {
+      this.searchTypes();
+    }
+  }
   // 重置
   reset() {
     this.searchCriteria = {
       //搜索条件
       bloodCode: "",
       dateRange: [],
+      state: null,
     };
     this.getList(1);
   }
@@ -135,6 +153,7 @@ export class BloodSearchComponent implements OnInit {
       sum: this.pageSize,
       blood: {
         hosId: this.hosId,
+        state: this.searchCriteria.state ? { id: this.searchCriteria.state } : undefined,
       },
     };
     if (this.searchCriteria.dateRange.length) {

src/app/views/data-dictionary/data-dictionary.component.html

@@ -95,15 +95,15 @@
             <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="name">名称</nz-form-label>
             <nz-form-control nzErrorTip="请输入名称!">
               <nz-input-group>
-                <input nz-input formControlName="name" placeholder="请输入名称" />
+                <input nz-input formControlName="name" placeholder="请输入名称" (input)="changeValue()" />
               </nz-input-group>
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
             <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="value">值</nz-form-label>
-            <nz-form-control nzErrorTip="请输入值!">
+            <nz-form-control [nzErrorTip]="checkedDictionary.type === 'dictionary' ? '' : '请输入值!'">
               <nz-input-group>
-                <input nz-input formControlName="value" placeholder="请输入值" />
+                <input nz-input formControlName="value" placeholder="请输入值" [disabled]="checkedDictionary.type === 'dictionary'" [readonly]="checkedDictionary.type === 'dictionary'" />
               </nz-input-group>
             </nz-form-control>
           </nz-form-item>

src/app/views/data-dictionary/data-dictionary.component.less

@@ -4,6 +4,11 @@
   height: 100%;
 }
 
+input[readonly]{
+  border: 1px solid #d9d9d9!important;
+  background-color: #f5f5f5!important;
+}
+
 .groupManagement {
   width: 100%;
   height: 100%;

src/app/views/data-dictionary/data-dictionary.component.ts

@@ -236,6 +236,13 @@ export class DataDictionaryComponent implements OnInit {
 
   }
 
+  // 数据字典修改name，value自动变化，且value禁止修改
+  changeValue(){
+    if(this.checkedDictionary.type === 'dictionary'){
+      this.validateForm.controls.value.setValue(this.validateForm.value.name);
+    }
+  }
+
   // 新增/编辑提交
   submitForm(): void {
     for (const i in this.validateForm.controls) {

src/app/views/drug-search/drug-search.component.html

@@ -32,6 +32,30 @@
             </nz-option>
           </nz-select>
         </div>
+        <div class="list-template__searchItem">
+          <span class="label">状态：</span>
+          <nz-select
+            [nzDropdownMatchSelectWidth]="false"
+            class="formItem"
+            nzServerSearch
+            nzShowSearch
+            nzAllowClear
+            nzPlaceHolder="请选择状态"
+            [(ngModel)]="searchCriteria.drugsState"
+            (nzOpenChange)="changeSearch1($event)"
+          >
+            <ng-container *ngFor="let data of types">
+              <nz-option
+                *ngIf="!isLoading1"
+                nzLabel="{{ data.name }}"
+                nzValue="{{ data.id }}"
+              ></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading1" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
       </div>
       <div nz-col nzXl="8" class="list-template__btns">
         <button nz-button class="btn default" (click)="showDelModal('您确认要清空药品吗？')" *ngIf="currentUserAccount == 'dsadmin'">清空药品</button>

src/app/views/drug-search/drug-search.component.ts

@@ -18,6 +18,7 @@ export class DrugSearchComponent implements OnInit {
     packid: "", //请领单号
     launch: null, //发药科室
     target: null, //发药科室
+    drugsState: null,
   };
   deptList = []; // 院区下的配送人员列表(搜索框)
   hosId;
@@ -87,6 +88,22 @@ export class DrugSearchComponent implements OnInit {
     }, 100);
     this.getList(0);
   }
+  // 搜索类型
+  isLoading1 = false;
+  types = []; // 类型列表(搜索框)
+  searchTypes() {
+    this.isLoading1 = true;
+    this.mainService.getDictionary("list", "drug_state").subscribe((res) => {
+      this.isLoading1 = false;
+      this.types = res;
+    });
+  }
+  // 打开搜索框
+  changeSearch1(flag) {
+    if (flag) {
+      this.searchTypes();
+    }
+  }
   // 重置
   reset() {
     this.searchCriteria = {
@@ -94,6 +111,7 @@ export class DrugSearchComponent implements OnInit {
       packid: "",
       launch: null,
       target: null,
+      drugsState: null,
     };
     this.getList(1);
   }
@@ -163,6 +181,7 @@ export class DrugSearchComponent implements OnInit {
       sum: this.pageSize,
       drugsBag: {
         hosId: this.hosId,
+        drugsState: this.searchCriteria.drugsState ? { id: this.searchCriteria.drugsState } : undefined,
       },
     };
     if (this.searchCriteria.target) {

src/app/views/hushijiandan/hushijiandan.component.html

@@ -2320,14 +2320,14 @@
                           </div>
                           <div
                             *ngIf="isAssign && item.gdState.value == 2"
-                            class="btn flex_1 revocation borderR"
+                            class="btn flex_1 revocation borderR primary"
                             (click)="allotWorker(item.id, item.gdState.id)"
                           >
                             指派
                           </div>
                           <div
                             *ngIf="isAssign && item.gdState.value == 4"
-                            class="btn flex_1 revocation borderR"
+                            class="btn flex_1 revocation borderR primary"
                             (click)="allotWorker(item.id, item.gdState.id, 1)"
                           >
                             指派

src/app/views/hushijiandan/hushijiandan.component.less

@@ -1547,6 +1547,10 @@
                         border-bottom: 0;
                         line-height: 32px;
                         border-radius: 0;
+                        &.primary{
+                          color: #fff;
+                          background-color: @primary-color;
+                        }
                       }
                     }
                   }

src/app/views/inspect-search/inspect-search.component.html

@@ -23,6 +23,30 @@
             </nz-option>
           </nz-select>
         </div>
+        <div class="list-template__searchItem">
+          <span class="label">状态：</span>
+          <nz-select
+            [nzDropdownMatchSelectWidth]="false"
+            class="formItem"
+            nzServerSearch
+            nzShowSearch
+            nzAllowClear
+            nzPlaceHolder="请选择状态"
+            [(ngModel)]="searchCriteria.inspectState"
+            (nzOpenChange)="changeSearch1($event)"
+          >
+            <ng-container *ngFor="let data of types">
+              <nz-option
+                *ngIf="!isLoading1"
+                nzLabel="{{ data.name }}"
+                nzValue="{{ data.id }}"
+              ></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading1" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
       </div>
       <div nz-col nzXl="8" class="list-template__btns">
         <button nz-button class="btn default" (click)='reset()'>重置</button>

src/app/views/inspect-search/inspect-search.component.ts

@@ -18,6 +18,7 @@ export class InspectSearchComponent implements OnInit {
     inspectCode: "",
     hospital: null,
     workerId: null,
+    inspectState: null,
   };
   workerSearch = []; // 院区下的配送人员列表(搜索框)
   allHospital: any = []; //院区下拉框
@@ -32,6 +33,22 @@ export class InspectSearchComponent implements OnInit {
     });
     this.getAllHospital();
   }
+  // 搜索类型
+  isLoading1 = false;
+  types = []; // 类型列表(搜索框)
+  searchTypes() {
+    this.isLoading1 = true;
+    this.mainService.getDictionary("list", "inspect_state").subscribe((res) => {
+      this.isLoading1 = false;
+      this.types = res;
+    });
+  }
+  // 打开搜索框
+  changeSearch1(flag) {
+    if (flag) {
+      this.searchTypes();
+    }
+  }
   // 重置
   reset() {
     this.searchCriteria = {
@@ -40,6 +57,7 @@ export class InspectSearchComponent implements OnInit {
       inspectCode: "",
       hospital: this.allHospital[0] ? this.allHospital[0]["id"] + "" : null,
       workerId: null,
+      inspectState: null,
     };
     this.getList(1);
   }
@@ -113,6 +131,7 @@ export class InspectSearchComponent implements OnInit {
       patientName: this.searchCriteria.patientName,
       inspectCode: this.searchCriteria.inspectCode,
       workerId: this.searchCriteria.workerId,
+      inspectState: this.searchCriteria.inspectState || undefined,
     };
     this.loading1 = true;
     this.mainService

src/app/views/jp-search/jp-search.component.html

@@ -32,6 +32,30 @@
             </nz-option>
           </nz-select>
         </div>
+        <div class="list-template__searchItem">
+          <span class="label">状态：</span>
+          <nz-select
+            [nzDropdownMatchSelectWidth]="false"
+            class="formItem"
+            nzServerSearch
+            nzShowSearch
+            nzAllowClear
+            nzPlaceHolder="请选择状态"
+            [(ngModel)]="searchCriteria.jpstate"
+            (nzOpenChange)="changeSearch1($event)"
+          >
+            <ng-container *ngFor="let data of types">
+              <nz-option
+                *ngIf="!isLoading1"
+                nzLabel="{{ data.name }}"
+                nzValue="{{ data.id }}"
+              ></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading1" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
       </div>
       <div nz-col nzXl="8" class="list-template__btns">
         <button nz-button class="btn default" (click)='reset()'>重置</button>

src/app/views/jp-search/jp-search.component.ts

@@ -17,6 +17,7 @@ export class JpSearchComponent implements OnInit {
     id: "", //静配标识
     launch: null, //发药科室
     target: null, //发药科室
+    jpstate: null,
   };
   deptList = []; // 院区下的配送人员列表(搜索框)
   hosId;
@@ -31,6 +32,22 @@ export class JpSearchComponent implements OnInit {
     });
     this.getHospital();
   }
+  // 搜索类型
+  isLoading1 = false;
+  types = []; // 类型列表(搜索框)
+  searchTypes() {
+    this.isLoading1 = true;
+    this.mainService.getDictionary("list", "jp_state").subscribe((res) => {
+      this.isLoading1 = false;
+      this.types = res;
+    });
+  }
+  // 打开搜索框
+  changeSearch1(flag) {
+    if (flag) {
+      this.searchTypes();
+    }
+  }
   // 重置
   reset() {
     this.searchCriteria = {
@@ -38,6 +55,7 @@ export class JpSearchComponent implements OnInit {
       id: "",
       launch: null,
       target: null,
+      jpstate: null,
     };
     this.getList(1);
   }
@@ -107,6 +125,7 @@ export class JpSearchComponent implements OnInit {
       sum: this.pageSize,
       jPBag: {
         hosId: this.hosId,
+        jpstate: this.searchCriteria.jpstate ? { id: this.searchCriteria.jpstate } : undefined,
       },
     };
     if (this.searchCriteria.target) {

src/app/views/patient-search/patient-search.component.html

@@ -10,6 +10,31 @@
           <span class="label">床号：</span>
           <input nz-input class="formItem" placeholder="请输入床号" [(ngModel)]="searchCriteria.bedNum" />
         </div>
+        <div class="list-template__searchItem">
+          <span class="label">当前科室：</span>
+          <nz-select
+            [nzDropdownMatchSelectWidth]="false"
+            class="formItem"
+            nzServerSearch
+            nzShowSearch
+            nzAllowClear
+            nzPlaceHolder="请选择当前科室"
+            [(ngModel)]="searchCriteria.department"
+            (nzOnSearch)="changeInp($event, 'search')"
+            (nzOpenChange)="changeSearch($event)"
+          >
+            <ng-container *ngFor="let data of departmentSearch">
+              <nz-option
+                *ngIf="!isLoading"
+                nzLabel="{{ data.dept }}"
+                nzValue="{{ data.id }}"
+              ></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
       </div>
       <div nz-col nzXl="8" class="list-template__btns">
         <button nz-button class="btn default" (click)='reset()'>重置</button>

src/app/views/patient-search/patient-search.component.ts

@@ -1,6 +1,8 @@
 import { Component, OnInit } from "@angular/core";
 import { MainService } from "src/app/services/main.service";
 import { ToolService } from "src/app/services/tool.service";
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
 
 @Component({
   selector: "app-patient-search",
@@ -15,15 +17,71 @@ export class PatientSearchComponent implements OnInit {
     patientName: "",
     bedNum: "",
     hospital: null,
+    department: null,
   };
   allHospital: any = []; //院区下拉框
   listOfData: any[] = []; //表格数据
   pageIndex: number = 1; //表格当前页码
   pageSize: number = 10; //表格每页展示条数
   listLength: number = 10; //表格总数据量
+  changeInpSubject = new Subject();
   ngOnInit() {
+    this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+      this.searchDepartment(v[0], v[1]);
+    });
     this.getAllHospital();
   }
+  // 选择院区
+  changeHospital(id, type) {
+    if (type === "search") {
+      this.searchCriteria.department = null;
+    }
+  }
+  // 搜索科室
+  departmentSearch = []; // 院区下的科室列表(搜索框)
+  deptKey = "";
+  isLoading = false;
+  searchDepartment(dept, type) {
+    let data = {
+      department: {
+        dept,
+        hospital: {
+          id: this.searchCriteria.hospital,
+        },
+      },
+      idx: 0,
+      sum: 10,
+    };
+    this.mainService
+      .getFetchDataList("data", "department", data)
+      .subscribe((data) => {
+        if (data.status == 200) {
+          if (type === "search") {
+            if (this.deptKey === dept) {
+              this.isLoading = false;
+              this.departmentSearch = data.list;
+            }
+          }
+        }
+      });
+  }
+  changeInp(dept, type) {
+    if (!dept) {
+      return;
+    }
+    if (dept === "no") {
+      dept = "";
+    }
+    this.deptKey = dept;
+    this.isLoading = true;
+    this.changeInpSubject.next([dept, type]);
+  }
+  // 打开搜索框
+  changeSearch(flag) {
+    if (flag) {
+      this.changeInp("no", "search");
+    }
+  }
   // 重置
   reset() {
     this.searchCriteria = {
@@ -31,6 +89,7 @@ export class PatientSearchComponent implements OnInit {
       patientName: "",
       bedNum: "",
       hospital: this.allHospital[0] ? this.allHospital[0]["id"] + "" : null,
+      department: null,
     };
     this.getList(1);
   }
@@ -65,6 +124,7 @@ export class PatientSearchComponent implements OnInit {
       hosId: this.searchCriteria.hospital,
       patientName: this.searchCriteria.patientName,
       bedNum: this.searchCriteria.bedNum,
+      department: this.searchCriteria.department || undefined,
     };
     this.loading1 = true;
     this.mainService.listMsgByMain('listPatient',postData).subscribe((data) => {

src/app/views/timing-message-sending/timing-message-sending.component.html

@@ -143,6 +143,15 @@
               </nz-select>
             </nz-form-control>
           </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="content">发送内容</nz-form-label>
+            <nz-form-control nzErrorTip="请填写发送内容!" class="textarea">
+              <textarea formControlName="content" nz-input rows="6" placeholder="请填写发送内容"></textarea>
+              <p>[$各类日期$]可添加<span *ngFor="let item of variableNames1; let last = last;" (click)="writeIn(item, $event)"><strong>{{item}}</strong><em *ngIf="!last">、</em><em *ngIf="last">。</em></span></p>
+              <p>[$业务统计$]可添加<span *ngFor="let item of variableNames2; let last = last;" (click)="writeIn(item, $event)"><strong>{{item}}</strong><em *ngIf="!last">、</em><em *ngIf="last">。</em></span></p>
+              <p>[$工单数统计$]可添加<span *ngFor="let item of variableNames3; let last = last;" (click)="writeIn(item, $event)"><strong>{{item}}</strong><em *ngIf="!last">、</em><em *ngIf="last">。</em></span></p>
+            </nz-form-control>
+          </nz-form-item>
         </form>
       </overlay-scrollbars>
       <div class=" display_flex justify-content_flex-center">

src/app/views/timing-message-sending/timing-message-sending.component.less

@@ -10,6 +10,23 @@
   width: 410px !important;
 }
 
+.textarea{
+  p{
+    margin: 0;
+    color: #777;
+    line-height: 1.5;
+    margin-top: 8px;
+    strong{
+      font-weight: normal;
+      cursor: pointer;
+      color: #266CA4;
+    }
+    em{
+      font-style: normal;
+    }
+  }
+}
+
 .save {
   position: fixed;
   left: 0;
@@ -101,7 +118,7 @@
   // 新增
   &.add {
     .modalBody {
-      width: 480px;
+      width: 600px;
       height: auto;
 
       .content {

src/app/views/timing-message-sending/timing-message-sending.component.ts

@@ -31,6 +31,9 @@ export class TimingMessageSendingComponent implements OnInit {
     private tool: ToolService
   ) {}
 
+  variableNames1 = ['[$当天日期$]', '[$统计日期范围$]',];
+  variableNames2 = ['[$配送标本数量$]', '[$服务患者数量$]', '[$配送药品数量$]', '[$配送静配药品数量$]', '[$配送血制品数量$]',];
+  variableNames3 = [];
   userInfo: any = JSON.parse(localStorage.getItem("user")) || {}; //登录用户信息
   hosId;
   createUser = "";
@@ -55,10 +58,37 @@ export class TimingMessageSendingComponent implements OnInit {
 
   ngOnInit() {
     this.hosId = this.tool.getCurrentHospital().id;
+    this.get_statistics_date_type();
     this.getList();
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.initForm();
   }
+
+  // 统计分类
+  get_statistics_date_type() {
+    this.mainService
+      .getDictionary("list", "statistics_date_type")
+      .subscribe((data) => {
+        this.variableNames3 = data.map(v => `[$${v.name}$]`);
+      });
+  }
+  // 写入
+  writeIn(content, event){
+    var element = event.target.parentElement.parentElement.parentElement.querySelector("textarea");
+    if (element.selectionStart || element.selectionStart == '0') {
+        var startPos = element.selectionStart;
+        var endPos = element.selectionEnd;
+        this.validateForm.controls.content.setValue(element.value.substring(0, startPos) + content + element.value.substring(endPos));
+        element.focus();
+        setTimeout(() => {
+          element.setSelectionRange(startPos + content.length, startPos + content.length);
+        },0)
+    } else {
+        var val = element.value + content;
+        this.validateForm.controls.content.setValue(val);
+        element.focus();
+    }
+  }
   changeForm(flag) {
     if (flag) {
       this.changeInp("no", "form");
@@ -155,6 +185,7 @@ export class TimingMessageSendingComponent implements OnInit {
       executeTime: [null, [Validators.required]], //定时发送时间
       active: [false, [Validators.required]], //是否启用
       userIds: [null, [Validators.required]], //接收人
+      content: ['', [Validators.required]], //发送内容
     });
   }
   //修改重复策略
@@ -209,7 +240,7 @@ export class TimingMessageSendingComponent implements OnInit {
       executeTime: new Date(this.validateForm.value.executeTime).getTime(),
       userIds: this.validateForm.value.userIds.join(),
       active: this.validateForm.value.active,
-      content: this.dataContent.content,
+      content: this.validateForm.value.content,
       key: this.dataContent.key,
       id: this.dataContent.id,
       timeStep: this.validateForm.value.timeStep,
@@ -250,6 +281,7 @@ export class TimingMessageSendingComponent implements OnInit {
     this.validateForm.controls.executeTime.setValue(new Date(data.executeTime)); //定时发送时间
     this.validateForm.controls.title.setValue(data.title); //标题
     this.validateForm.controls.active.setValue(data.active); //是否启用
+    this.validateForm.controls.content.setValue(data.content); //发送内容
     this.timeStepChange(data.timeStep);
     this.validateForm.controls.timeStep.setValue(data.timeStep); //重复策略
     if (data.timeStep == "year") {

src/app/views/worker-statistics-detail/worker-statistics-detail.component.html

@@ -3,6 +3,7 @@
     <div>
       工单详情
       <label class="isFiveOrder" nz-checkbox [ngModel]="isFiveOrder" (ngModelChange)="changeIsFiveOrder($event)">执行时长五分钟以内工单</label>
+      <label class="isFiveOrder" nz-checkbox [ngModel]="specialClose" (ngModelChange)="changeSpecialClose($event)">特殊关闭工单</label>
     </div>
     <i class="icon_transport transport-guanbi" (click)="close()"></i>
   </div>

src/app/views/worker-statistics-detail/worker-statistics-detail.component.ts

@@ -23,6 +23,7 @@ export class WorkerStatisticsDetailComponent implements OnInit {
   listLength: number = 0; //总数据条目数
   pageSize: number = 10; //每页条数
   isFiveOrder: boolean = false; //是否执行时长五分钟以内工单
+  specialClose: boolean = false; //特殊关闭工单
   constructor(
     private mainService: MainService,
     private tool: ToolService,
@@ -46,11 +47,13 @@ export class WorkerStatisticsDetailComponent implements OnInit {
   changeIsFiveOrder(e: boolean) {
     this.isFiveOrder = e;
     this.pageIndex = 1;
-    if (e) {
-      this.getOrdersByPerson(this.hosId, this.currentPersonId);
-    } else {
-      this.getOrdersByPerson(this.hosId, this.currentPersonId);
-    }
+    this.getOrdersByPerson(this.hosId, this.currentPersonId);
+  }
+  // 是否特殊关闭工单
+  changeSpecialClose(e: boolean) {
+    this.specialClose = e;
+    this.pageIndex = 1;
+    this.getOrdersByPerson(this.hosId, this.currentPersonId);
   }
   //获取选中配送人员的工单列表
   getOrdersByPerson(
@@ -68,6 +71,9 @@ export class WorkerStatisticsDetailComponent implements OnInit {
     if(this.isFiveOrder){
       postData.difLong = true;
     }
+    if(this.specialClose){
+      postData.specialClose = 1;
+    }
     if(this.type === 'workerStatistics'){
       postData.groupId = this.groupId === 'null' ? undefined : this.groupId;
       postData.worker = currentPersonId;

src/app/views/worker-statistics/worker-statistics.component.html

@@ -57,6 +57,9 @@
         </button>
       </div>
     </div>
+    <div class="list-template__checkBoxes">
+      <nz-checkbox-group [(ngModel)]="checkOptionsOne" (ngModelChange)="getList(1, sortCurrentKey, sortCurrentValue)"></nz-checkbox-group>
+    </div>
     <div class="list-template__bottom">
       <nz-table
         class="list-template__nzTable"

src/app/views/worker-statistics/worker-statistics.component.ts

@@ -55,6 +55,10 @@ export class WorkerStatisticsComponent implements OnInit {
   promptInfo: string; //操作结果提示信息
   promptModalShow: boolean; //操作提示框是否展示
 
+  checkOptionsOne: Array<any> = [
+    { label: "特殊关闭不统计积分", value: "1", checked: false },
+  ];
+
   // 初始化增删改按钮
   coopBtns: any = {};
   searchData: any = {}; // 综合统计页面带过来的参数
@@ -118,6 +122,7 @@ export class WorkerStatisticsComponent implements OnInit {
       startTime: this.startDate + " " + "00:00:00",
       endTime: this.endDate + " " + "23:59:59",
       groupId: this.group || "",
+      specialClose: this.checkOptionsOne[0].checked ? 0 : undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData[this.sortCurrentKey] = this.sortCurrentValue === "ascend" ? `asc` : `desc`;
@@ -178,6 +183,7 @@ export class WorkerStatisticsComponent implements OnInit {
       endTime: this.searchData.dateRange.end,
       hosId: this.searchData.hosId,
       groupId: this.group || "",
+      specialClose: this.checkOptionsOne[0].checked ? 0 : undefined,
     };
     if (field && sort) {
       postData[field] = sort === "ascend" ? `asc` : `desc`;