白求恩优化

src/app/components/configurationCenter/configuration-drug/configuration-drug.component.html

@@ -80,7 +80,7 @@
 
                   <!-- 终点科室支持核对 -->
                   <div class="display_flex align-items_center mb8">
-                    <nz-form-label class="label">终点科室支持核对</nz-form-label>
+                    <nz-form-label class="label" nzRequired>终点科室支持核对</nz-form-label>
                     <nz-checkbox-group [(ngModel)]="item.postData.drugsEndCheck" (ngModelChange)="changeDrugsEndCheck($event)"></nz-checkbox-group>
                   </div>
                   <ng-container *ngIf="item.postData.drugsEndCheck[0].checked">
@@ -127,6 +127,11 @@
 									  <nz-form-label class="label">交接后，剩余药包是否建单</nz-form-label>
 									  <nz-checkbox-group [(ngModel)]="item.postData.drugsResidueCreateOrder"></nz-checkbox-group>
 									</div>
+                  <!-- 是否开启紧急配送建单 -->
+									<div class="display_flex align-items_center mb8">
+									  <nz-form-label class="label">是否开启紧急配送建单</nz-form-label>
+									  <nz-checkbox-group [(ngModel)]="item.postData.urgentCreateOrder"></nz-checkbox-group>
+									</div>
                 </div>
                 <!-- 自动建单配置 -->
                 <div *ngIf="tabModalName=='automaticOrderCreation'">

src/app/components/configurationCenter/configuration-drug/configuration-drug.component.ts

@@ -74,6 +74,7 @@ export class ConfigurationDrugComponent implements OnInit {
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
 				sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
 				drugsResidueCreateOrder: [{ label:'是否开启', value: 0 }],//交接后，剩余药包是否建单
+				urgentCreateOrder: [{ label:'是否开启', value: 0 }],//是否开启紧急配送建单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
 				autoCreateState: undefined // 药品自动建单状态
 			}
@@ -100,6 +101,7 @@ export class ConfigurationDrugComponent implements OnInit {
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
 				sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
         drugsResidueCreateOrder: [{ label:'是否开启', value: 0 }],//交接后，剩余药包是否建单
+        urgentCreateOrder: [{ label:'是否开启', value: 0 }],//是否开启紧急配送建单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
 				autoCreateState: undefined // 药品自动建单状态
 			}
@@ -126,6 +128,7 @@ export class ConfigurationDrugComponent implements OnInit {
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
         sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
         drugsResidueCreateOrder: [{ label:'是否开启', value: 0 }],//交接后，剩余药包是否建单
+        urgentCreateOrder: [{ label:'是否开启', value: 0 }],//是否开启紧急配送建单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
 				autoCreateState: undefined // 药品自动建单状态
 			}
@@ -152,6 +155,7 @@ export class ConfigurationDrugComponent implements OnInit {
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
         sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
         drugsResidueCreateOrder: [{ label:'是否开启', value: 0 }],//交接后，剩余药包是否建单
+        urgentCreateOrder: [{ label:'是否开启', value: 0 }],//是否开启紧急配送建单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
 				autoCreateState: undefined // 药品自动建单状态
 			}
@@ -178,6 +182,7 @@ export class ConfigurationDrugComponent implements OnInit {
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
         sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
         drugsResidueCreateOrder: [{ label:'是否开启', value: 0 }],//交接后，剩余药包是否建单
+        urgentCreateOrder: [{ label:'是否开启', value: 0 }],//是否开启紧急配送建单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
 				autoCreateState: undefined // 药品自动建单状态
 			}
@@ -241,6 +246,11 @@ export class ConfigurationDrugComponent implements OnInit {
       return;
     }
 
+    if(!this.activeDictionary.postData.drugsEndCheck[0].checked){
+      this.msg.create("warning", "终点科室支持核对必填！");
+      return;
+    }
+
     if(this.activeDictionary.postData.drugsEndCheck[0].checked && !this.activeDictionary.postData.drugsEndCheckScanIds.filter(v => v.checked).length){
       this.msg.create("warning", "请选择终点科室的核对方式！");
       return;
@@ -273,6 +283,7 @@ export class ConfigurationDrugComponent implements OnInit {
 			showDrugsBagDetails: this.activeDictionary.postData.showDrugsBagDetails[0].checked ? 1 : 0,
 			sendingMergeOrder: this.activeDictionary.postData.sendingMergeOrder[0].checked ? 1 : 0,
 			drugsResidueCreateOrder: this.activeDictionary.postData.drugsResidueCreateOrder[0].checked ? 1 : 0,
+			urgentCreateOrder: this.activeDictionary.postData.urgentCreateOrder[0].checked ? 1 : 0,
 			autoCreate: this.activeDictionary.postData.autoCreate[0].checked ? 1 : 0,
 			autoCreateState:{
 				id:this.activeDictionary.postData.autoCreateState || undefined
@@ -377,6 +388,7 @@ export class ConfigurationDrugComponent implements OnInit {
 					this.activeDictionary.postData.showDrugsBagDetails[0].checked = this.configs.showDrugsBagDetails == 1;
 					this.activeDictionary.postData.sendingMergeOrder[0].checked = this.configs.sendingMergeOrder == 1;
 					this.activeDictionary.postData.drugsResidueCreateOrder[0].checked = this.configs.drugsResidueCreateOrder == 1;
+					this.activeDictionary.postData.urgentCreateOrder[0].checked = this.configs.urgentCreateOrder == 1;
 					this.activeDictionary.postData.autoCreate[0].checked = this.configs.autoCreate == 1;
 					this.activeDictionary.postData.autoCreateState = this.configs.autoCreateState && this.configs.autoCreateState.id || undefined;
 				}

src/app/components/configurationCenter/configuration-message/configuration-message.component.html

@@ -63,7 +63,7 @@
         </div>
       </div>
       <div class="message_body">
-        <div class="message_body_list" *ngFor="let item of tabs;let i = index;" [hidden]="item.hidden && i != currentIndex">
+        <div class="message_body_list" *ngFor="let item of tabs;let i = index;" [hidden]="i != currentIndex">
           <div class="message_body_list_title" *ngIf="!(i == 1)">
             <span>通知标题：</span><input nz-input placeholder="请输入通知标题" [(ngModel)]="item.processTitle" [disabled]="item.disable" />
           </div>

src/app/components/configurationCenter/configuration-message/configuration-message.component.ts

@@ -113,7 +113,7 @@ export class ConfigurationMessageComponent implements OnInit {
           processContent: this.editData.shortMessageContent,
           checkboxFlag: this.editData.shortMessageFlag,
           disable: !this.editData.shortMessageFlag,
-          hidden: true,
+          hidden: false,
         },
         {
           tabName: "微信",
@@ -130,7 +130,31 @@ export class ConfigurationMessageComponent implements OnInit {
         "[$建单人$]",
       ];
 
-      this.currentIndex = 2;
+      if(data.noticeCode === 'pil_sign_user'){
+        // 驻点人员
+        this.varArr = [
+          "[$患者信息$]",
+          "[$建单人$]",
+        ];
+      }else if(data.noticeCode === 'spe_bag_remove'){
+        // 支助人员
+        this.varArr = [
+          "[$工单单号$]",
+          "[$申请科室$]",
+          "[$起点科室$]",
+          "[$终点科室$]",
+          "[$发起时间$]",
+          "[$执行人$]",
+          "[$状态$]",
+          "[$任务类型$]",
+          "[$总积分$]",
+          "[$执行时长$]",
+          "[$患者信息$]",
+          "[$删除原因$]",
+        ];
+      }
+
+      this.currentIndex = 1;
     }else if(this.wechatConfigTypeValue === 'mdv2_handle'){
       // 运维
       this.tabs = [

src/app/components/configurationCenter/configuration-specimen/configuration-special-specimen-marking/configuration-special-specimen-marking.component.html

@@ -0,0 +1,119 @@
+<div class="content priority">
+  <div class="contentInner">
+    <div class="list-template" id="wechatTable">
+      <div class="list-template__content">
+        <div class="list-template__bottom">
+          <div class="list-template__top" nz-row>
+            <div nz-col nzXl='17' class="list-template__searchBox">
+            </div>
+            <div nz-col nzXl="7" class="list-template__btns">
+              <button nz-button class="btn default" (click)="addWechatModal()">新增</button>
+            </div>
+          </div>
+          <nz-table class="list-template__nzTable" [nzData]="dataList" nzSize="middle" [nzShowPagination]="false"
+            [nzLoading]="loading1">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="20%">科室</th>
+                <th nzWidth="16%">检验项目</th>
+                <th nzWidth="16%">标本类型</th>
+                <th nzWidth="16%">试管类型</th>
+                <th nzWidth="16%">标记类型</th>
+                <th nzWidth="16%">操作</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of dataList;let i = index">
+                <td>{{data.startDeptDTO?.dept}}</td>
+                <td>{{data.checkItem}}</td>
+                <td>{{data.stype?.name}}</td>
+                <td>{{data.tubeType?.name}}</td>
+                <td>{{data.urgent == 1 ? '标记加急' : ''}}</td>
+                <td>
+                  <div class="coop">
+                    <span (click)="showDelModal(data,'您确认要删除吗？','删除','del')">删除</span>
+                    <span (click)="editWechat(data)">编辑</span>
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>
+
+<!-- 删除模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+(confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+
+<!-- 新增/编辑模态框 -->
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modalWechat">
+  <div class="modalBody">
+    <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hideWechatModal()"></i></div>
+    <div class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm">
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="stype">标本类型</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择标本类型!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="stype" nzPlaceHolder="请选择标本类型" nzServerSearch>
+              <ng-container *ngFor="let data of typeList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [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>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="checkItem">检验项目</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入检验项目!">
+            <nz-input-group>
+              <input formControlName="checkItem" nz-input placeholder="请输入检验项目">
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzFor="startDept"><span class="visibility_hidden">囧</span>申请科室</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择申请科室!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="startDept" nzPlaceHolder="请选择申请科室" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeDeptInp($event)" (nzOpenChange)="openChangeDept($event)" (ngModelChange)="setIsSelecting(true)">
+              <ng-container *ngFor="let option of deptList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzFor="tubeType"><span class="visibility_hidden">囧</span>试管类型</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择试管类型!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="tubeType" nzPlaceHolder="请选择试管类型" nzServerSearch>
+              <nz-option *ngFor="let data of tubeTypeList" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="urgent">标记类型</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择标记类型!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="urgent" nzPlaceHolder="请选择标记类型" nzServerSearch>
+              <nz-option nzLabel="标记加急" [nzValue]="1"></nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class=" display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitWechatForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideWechatModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/components/configurationCenter/configuration-specimen/configuration-special-specimen-marking/configuration-special-specimen-marking.component.less

@@ -0,0 +1,303 @@
+@import "../../../../../../src/theme.less";
+:host {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  background-color: #F0F2F5;
+  .list-template__nzTable,
+  .list-template__bottom{
+    padding: 0!important;
+    border: none!important;
+    background: #fff!important;
+  }
+  .list-template{
+    width: 100%!important;
+    height: 100%!important;
+    padding: 0!important;
+  }
+  .circleWrap{
+    position: relative;
+    .circle{
+      width: 8px;
+      height: 8px;
+      border-radius: 50%;
+      position: absolute;
+      top: 50%;
+      left: -8px;
+      transform: translate(-50%,-50%);
+      &.red{
+        background-color: red;
+      }
+    }
+  }
+  .content{
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    border: 1px solid #EEF3F9;
+    &.priority{
+      background-color: #fff;
+      .contentInner{
+        padding: 0 16px 16px;
+        border: 1px solid #E8EBEF;
+      }
+    }
+    .contentItem{
+      padding: 4px 16px;
+      cursor: pointer;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      &.active{
+        color: @primary-color;
+        background-color: #F0F6ED;
+        border-radius: 4px;
+      }
+    }
+    .contentInner{
+      flex: 1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 0 16px;
+      gap: 16px;
+      .contentHead{
+        height: 45px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        gap: 16px;
+        padding: 0 16px;
+        font-size: 16px;
+        font-weight: bold;
+        border-bottom: 1px solid #D9D9D9;
+        .title{
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+        .btns{
+          flex-shrink: 0;
+        }
+      }
+      .contentBody{
+        padding: 0 8px;
+        margin: 4px 0;
+        flex: 1;
+      }
+      .address{
+        flex: 1;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .addressAssign{
+        flex: 3;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .list-template__searchItem {
+        .label {
+          color: #333;
+          display: inline-block;
+          width: 70px;
+          text-align-last: justify;
+          text-align: justify;
+          &.label--big {
+            width: 100px;
+          }
+        }
+        .formItem {
+          width: 135px;
+        }
+      }
+    }
+    .contentBtns{
+      margin-bottom: 16px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+
+  .save {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 99;
+
+    .tips{
+      margin-bottom: 16px!important;
+    }
+
+    .modalBody {
+      width: 350px;
+      background: #fff;
+      border-radius: 5px;
+      padding: 10px 20px;
+      color: #333;
+
+      .title {
+        width: 100%;
+        text-align: center;
+        font-size: 18px;
+        position: relative;
+
+        i {
+          position: absolute;
+          right: 0;
+          top: 0;
+          font-size: 20px;
+          color: #666;
+          cursor: pointer;
+          padding: 0 5px;
+        }
+      }
+
+      .content {
+        width: 310px;
+        background: #f9fafb;
+        border: 1px solid #e5e9ed;
+        border-radius: 5px;
+        overflow: hidden;
+        margin-top: 12px;
+        padding: 16px 0;
+
+        .busyList{
+          display: flex;
+          margin-bottom: 8px;
+          .busyContent{
+            margin-right: 8px;
+            flex: 1;
+          }
+        }
+
+        & > div {
+          text-align: center;
+          margin: 0;
+
+          &.icon {
+            // margin-top: 17px;
+
+            i {
+              color: #34b349;
+              font-size: 30px !important;
+
+              &.transport-wenhao {
+                color: #f5a523;
+              }
+
+              &.transport-shibai {
+                color: #ff3a52;
+              }
+            }
+          }
+
+          &.defeat {
+            color: #333;
+            font-size: 14px;
+          }
+
+          &:nth-child(3) {
+            font-size: 14px;
+            color: #666;
+          }
+        }
+        .workAssignmentTips {
+          font-size: 12px;
+        }
+      }
+
+      button {
+        margin-top: 10px;
+
+        &.btn {
+          margin-left: 8px;
+        }
+      }
+    }
+
+    // 新增
+    &.add {
+      .modalBody {
+        width: 480px;
+        height: auto;
+
+        .content {
+          width: 100%;
+          height: auto;
+          padding: 16px;
+          max-height: 497px;
+          overflow-y: auto;
+
+          .addForm {
+            .ant-form-item {
+              margin-bottom: 0;
+
+              .ant-form-item-label {
+                text-align: left;
+              }
+
+              .desc {
+                margin-top: 5px;
+              }
+            }
+
+            .datesControl {
+              margin-top: -16px;
+
+              .ant-form-item-label {
+                line-height: 40px;
+              }
+            }
+
+            .timer {
+              .ant-form-item-label {
+                width: 100%;
+                text-align: left;
+              }
+
+              .numInp {
+                margin-right: 5px;
+              }
+
+              .line {
+                margin-right: 5px;
+              }
+            }
+
+            .timer2 {
+              .ant-form-item-label {
+                line-height: 20px;
+              }
+            }
+          }
+
+          .editForm {
+            .ant-form-item {
+              margin-bottom: 15px;
+
+              .ant-form-item-label {
+                line-height: 14px;
+                text-align: left;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

src/app/components/configurationCenter/configuration-specimen/configuration-special-specimen-marking/configuration-special-specimen-marking.component.ts

@@ -0,0 +1,283 @@
+import { Component, OnInit, Input } from "@angular/core";
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { Validators, FormGroup, FormBuilder } from '@angular/forms';
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+import { MainService } from 'src/app/services/main.service';
+
+@Component({
+  selector: "app-configuration-special-specimen-marking",
+  templateUrl: "./configuration-special-specimen-marking.component.html",
+  styleUrls: ["./configuration-special-specimen-marking.component.less"],
+})
+export class ConfigurationSpecialSpecimenMarkingComponent implements OnInit {
+  constructor(
+    private mainService: MainService,
+    private fb: FormBuilder,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  coopData: any = {}; //当前操作列
+  hosId: any = this.tool.getCurrentHospital().id;
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    this.getTypes();
+    this.getTubeTypeList();
+    this.getList();
+  }
+
+  // 新增弹框
+  modelName = ""; //模态框名称
+  modalWechat: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  addWechatModal() {
+    this.modelName = "新增";
+    this.add = true; //新增
+    this.modalWechat = true;
+    this.initWechatForm();
+  }
+  //关闭新增/编辑弹框
+  hideWechatModal() {
+    this.modalWechat = false;
+  }
+
+  // 防抖
+  isLoading = false;
+  isSelecting:boolean = false; // 是否在选中状态
+  searchTimer(fun, e) {
+    if (this.isSelecting) {
+      this.isSelecting = false; // 重置标志
+      return; // 跳过处理
+    }
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  // 设置标志
+  setIsSelecting(flag){
+    this.isSelecting = flag; // 设置标志
+  }
+
+  openChangeDept(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getDeptList();
+  }
+
+  // 科室搜索
+  changeDeptInp(e) {
+    this.searchTimer(this.getDeptList, e);
+  }
+
+  // 获取申请科室
+  deptList: any = [];
+  getDeptList(e = undefined) {
+    let postData = {
+      idx: 0,
+      sum: 20,
+      department: {
+        searchType: 1,// 简单查询
+        cascadeHosId: this.hosId,
+        dept: e,
+      }
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "department", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.deptList = data.list || [];
+      });
+  }
+
+  // 编辑
+  editWechat(data) {
+    console.log(data);
+    this.modelName = "编辑";
+    this.add = false;
+    this.modalWechat = true;
+    this.initWechatForm();
+    this.coopData = data;
+    this.validateForm.controls.stype.setValue(data.stype ? data.stype.id : null);
+    this.validateForm.controls.checkItem.setValue(data.checkItem);
+    this.validateForm.controls.startDept.setValue(data.startDeptDTO ? data.startDeptDTO.id : null);
+    this.validateForm.controls.tubeType.setValue(data.tubeType ? data.tubeType.id : null);
+    this.validateForm.controls.urgent.setValue(data.urgent);
+
+    data.startDeptDTO && (this.deptList = [data.startDeptDTO]);
+  }
+
+  // 新增/编辑表单提交
+  btnLoading: boolean = false; //提交按钮loading状态
+  submitWechatForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) {
+      return;
+    }
+    console.log(this.validateForm.value);
+    this.btnLoading = true;
+    let postData:any = {};
+
+    if (this.add) {
+      //增加
+      postData = {
+        // speUrgentMarkConfig: {
+          hosId: this.hosId,
+          stype: this.validateForm.value.stype ? { id: this.validateForm.value.stype } : undefined,
+          checkItem: this.validateForm.value.checkItem || undefined,
+          startDept: this.validateForm.value.startDept || undefined,
+          tubeType: this.validateForm.value.tubeType ? { id: this.validateForm.value.tubeType } : undefined,
+          urgent: this.validateForm.value.urgent || undefined,
+        // }
+      };
+    } else {
+      //编辑
+      postData = {
+        // speUrgentMarkConfig: {
+          ...this.coopData,
+          stype: this.validateForm.value.stype ? { id: this.validateForm.value.stype } : undefined,
+          checkItem: this.validateForm.value.checkItem || undefined,
+          startDept: this.validateForm.value.startDept || undefined,
+          tubeType: this.validateForm.value.tubeType ? { id: this.validateForm.value.tubeType } : undefined,
+          urgent: this.validateForm.value.urgent || undefined,
+        // }
+      };
+    }
+    this.mainService
+      .simplePost("addData", "speUrgentMarkConfig", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        this.hideWechatModal();
+        let msg = "";
+        if (this.add) {
+          msg = "新增";
+        } else {
+          msg = "修改";
+        }
+        if (result.status == 200) {
+          this.showPromptModal(msg, true, '');
+        } else {
+          this.showPromptModal(msg, false, result.msg);
+        }
+      });
+  }
+
+  // 初始化新增form表单
+  validateForm: FormGroup; //新增/编辑表单
+  initWechatForm() {
+    this.validateForm = this.fb.group({
+      stype: [null, [Validators.required]],
+      checkItem: [null, [Validators.required]],
+      startDept: [null],
+      tubeType: [null],
+      urgent: [null, [Validators.required]],
+    });
+  }
+
+  // 获取列表
+  loading1:boolean = false;
+  dataList: any[] = []; //表格数据
+  getList() {
+    let data = {
+      idx: 0,
+      sum: 9999,
+      speUrgentMarkConfig: {
+        hosId: this.hosId,
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "speUrgentMarkConfig", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.dataList = data.list || [];
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 获取试管类型
+  tubeTypeList: any = [];
+  getTubeTypeList() {
+    this.mainService.getDictionary('list', 'specimen_tube_type').subscribe((data) => {
+      this.isLoading = false;
+      this.tubeTypeList = data || [];
+    });
+  }
+
+  // 获取标本类型
+  typeList: any = [];
+  getTypes() {
+    this.mainService.getDictionary('list', 'specimen_type').subscribe((data) => {
+      this.isLoading = false;
+      this.typeList = data || [];
+    });
+  }
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    this.btnLoading = true;
+    if (this.confirmDelType === "del") {
+      //删除
+      this.mainService
+        .simplePost("rmvData", "speUrgentMarkConfig", [this.coopData.id])
+        .subscribe((data) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.status == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList();
+  }
+}

src/app/components/configurationCenter/configuration-specimen/configuration-special-specimen-marking/configuration-special-specimen-marking.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { ConfigurationSpecialSpecimenMarkingComponent } from './configuration-special-specimen-marking.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    ConfigurationSpecialSpecimenMarkingComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    ConfigurationSpecialSpecimenMarkingComponent,
+  ]
+})
+export class ConfigurationSpecialSpecimenMarkingModule { }

src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.html

@@ -16,6 +16,9 @@
               <div class="item" (click)="tabModal('automaticOrderCreation')" [ngClass]="{'items':tabModalName=='automaticOrderCreation'}">
                 自动建单配置
               </div>
+              <div class="item" (click)="tabModal('specialSpecimenMarking')" [ngClass]="{'items':tabModalName=='specialSpecimenMarking'}">
+                特殊标本标记
+              </div>
             </div>
             <div class="list" *ngIf="!loading">
               <!-- 特性配置 -->
@@ -192,8 +195,12 @@
               <div *ngIf="tabModalName=='automaticOrderCreation'">
                 <!-- 自动建单 -->
               </div>
+              <!-- 特殊标本标记 -->
+              <div *ngIf="tabModalName=='specialSpecimenMarking'">
+                <app-configuration-special-specimen-marking></app-configuration-special-specimen-marking>
+              </div>
               <div class="bottom">
-                <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>
+                <button *ngIf="tabModalName != 'specialSpecimenMarking'" class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>
               </div>
             </div>
             <div class="list" *ngIf="loading">

src/app/components/configurationCenter/configuration-specimen/configuration-specimen.module.ts

@@ -5,6 +5,7 @@ import { ShareModule } from 'src/app/share/share.module';
 
 import { ConfigurationSpecimenComponent } from './configuration-specimen.component';
 import { ConfigurationSpecimenReturnModule } from './configuration-specimen-return/configuration-specimen-return.module';
+import { ConfigurationSpecialSpecimenMarkingModule } from './configuration-special-specimen-marking/configuration-special-specimen-marking.module';
 
 
 @NgModule({
@@ -15,6 +16,7 @@ import { ConfigurationSpecimenReturnModule } from './configuration-specimen-retu
     CommonModule,
     ShareModule,
     ConfigurationSpecimenReturnModule,
+    ConfigurationSpecialSpecimenMarkingModule,
   ],
   exports: [
     ConfigurationSpecimenComponent,

src/app/share/specimen-package-list-modal/specimen-package-list-modal.component.html

@@ -22,14 +22,14 @@
           <tr class="thead">
             <th nzWidth="13%">包号</th>
             <th nzWidth="6%">打包人</th>
-            <th nzWidth="15%">打包时间</th>
+            <th nzWidth="14%">打包时间</th>
             <th nzWidth="6%">标本数</th>
             <th nzWidth="6%">收取人</th>
-            <th nzWidth="15%">收取时间</th>
+            <th nzWidth="14%">收取时间</th>
             <th nzWidth="6%">送达人</th>
-            <th nzWidth="15%">送达时间</th>
-            <th nzWidth="8%">状态</th>
-            <th nzWidth="10%">操作</th>
+            <th nzWidth="14%">送达时间</th>
+            <th nzWidth="6%">状态</th>
+            <th nzWidth="15%">操作</th>
           </tr>
         </thead>
         <tbody>
@@ -47,6 +47,7 @@
               <div class="coop">
                 <span (click)="printPackageByConfig(data)" *ngIf="data.status.value !== '0'">补打</span>
                 <span (click)="toSpecimenPackage(data)" *ngIf="data.status.value === '0' || data.status.value === '1'">修改</span>
+                <span (click)="showDelModal(data, '您确认要删除吗？', '删除', 'del')" *ngIf="data.status.value === '0' || data.status.value === '1'">删除</span>
               </div>
             </td>
           </tr>
@@ -67,6 +68,15 @@
   </div>
 </div>
 
+<!-- 模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+(confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>
+
 <!-- 打印的内容 -->
 <div id="print-section-package" hidden>
   <!-- 80mm*80mm -->

src/app/share/specimen-package-list-modal/specimen-package-list-modal.component.ts

@@ -152,6 +152,63 @@ export class SpecimenPackageListModalComponent implements OnInit {
         }
       });
   }
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  coopData: any; //当前操作列
+  showDelModal(
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  btnLoading:boolean = false;
+  // 确认删除
+  confirmDel() {
+    this.btnLoading = true;
+    if (this.confirmDelType === "del") {
+      //删除
+      this.mainService
+        .simplePost("rmvData", "pathologyPackInfo", [this.coopData.id])
+        .subscribe((data) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.status == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getSpecimenPackageList(1);
+  }
 }
 
 

src/app/views/specimen-package/specimen-package.component.html

@@ -75,7 +75,8 @@
             <td class="clickable" (click)="detail($event, data.gdid)">{{ data.gdDTO?.gdcode }}</td>
             <td>
               <div class="coop">
-                <span (click)="showLogs(data)">查看日志</span>
+                <span *ngIf="coopBtns.lookLog" (click)="showLogs(data)">查看日志</span>
+                <span *ngIf="coopBtns.del && (data.status.value === '0' || data.status.value === '1')" (click)="showDelModal(data, '您确认要删除吗？', '删除', 'del')">删除</span>
               </div>
             </td>
           </tr>
@@ -102,5 +103,9 @@
   (closeModelHs)="closeModelLog($event)"
 ></app-specimen-package-log-prompt-modal>
 
+<!-- 模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+(confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+
 <!-- 查看详情 -->
 <router-outlet></router-outlet>

src/app/views/specimen-package/specimen-package.component.ts

@@ -237,4 +237,43 @@ export class SpecimenPackageComponent implements OnInit {
     e.stopPropagation();
     this.router.navigateByUrl(`/main/specimenPackage/orderDetail/${id}`);
   }
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    this.btnLoading = true;
+    if (this.confirmDelType === "del") {
+      //删除
+      this.mainService
+        .simplePost("rmvData", "pathologyPackInfo", [this.coopData.id])
+        .subscribe((data) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.status == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }
+  }
 }

src/common.less

@@ -1,3 +1,6 @@
+.visibility_hidden{
+  visibility: hidden;
+}
 textarea{
   margin-bottom: 0!important;
 }